Rename functions/data names

MokhaLeee · Oct 30, 2024 · a785ee1 · a785ee1
1 parent d185507
commit a785ee1
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/asm/opanim.s b/asm/opanim.s
@@ -4052,15 +4052,15 @@ sub_80BDB24: @ 0x080BDB24
 	adds r4, r0, #0
 	adds r5, r1, #0
 	adds r1, r2, #0
-	ldr r0, _080BDB3C @ =gUnk_08DB9378
+	ldr r0, _080BDB3C @ =ProcScr_08DB9378
 	bl Proc_Start
 	strh r4, [r0, #0x2c]
 	strh r5, [r0, #0x2a]
 	pop {r4, r5}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080BDB3C: .4byte gUnk_08DB9378
+_080BDB3C: .4byte ProcScr_08DB9378
 
 	thumb_func_start sub_80BDB40
 sub_80BDB40: @ 0x080BDB40
@@ -4147,8 +4147,8 @@ _080BDB66:
 	.align 2, 0
 _080BDBE0: .4byte gPal
 
-	thumb_func_start sub_80BDBE4
-sub_80BDBE4: @ 0x080BDBE4
+	thumb_func_start Proc_08DB9398_Loop
+Proc_08DB9398_Loop: @ 0x080BDBE4
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	ldr r0, [r4, #0x30]
@@ -4199,7 +4199,7 @@ sub_80BDC2C: @ 0x080BDC2C
 	adds r6, r2, #0
 	mov r8, r3
 	ldr r1, [sp, #0x1c]
-	ldr r0, _080BDC60 @ =gUnk_08DB9398
+	ldr r0, _080BDC60 @ =ProcScr_08DB9398
 	bl Proc_Start
 	adds r5, r0, #0
 	movs r0, #1
@@ -4214,7 +4214,7 @@ sub_80BDC2C: @ 0x080BDC2C
 	bl CpuFastSet
 	b _080BDC92
 	.align 2, 0
-_080BDC60: .4byte gUnk_08DB9398
+_080BDC60: .4byte ProcScr_08DB9398
 _080BDC64: .4byte gPal
 _080BDC68: .4byte 0x020072BC
 _080BDC6C:

diff --git a/data/data_0843943C.s b/data/data_0843943C.s
@@ -1128,8 +1128,8 @@ Pal_TitleSprites:	@ 0x086BC444
 Img_TitleSprites:	@ 0x086BC4E4
 	.incbin "FireEmblem7J.base.gba", 0x6BC4E4, 0x6BF118 - 0x6BC4E4
 
-	.global SpirteAnim_TitleScreen
-SpirteAnim_TitleScreen:	@ 0x086BF118
+	.global SpirteAnim_TitleText
+SpirteAnim_TitleText:	@ 0x086BF118
 	.incbin "FireEmblem7J.base.gba", 0x6BF118, 0x6BF37C - 0x6BF118
 
 	.global Pal_OpAnimCloud
@@ -1180,14 +1180,14 @@ gUnk_086C261C:	@ 0x086C261C
 gUnk_086C38F4:	@ 0x086C38F4
 	.incbin "FireEmblem7J.base.gba", 0x6C38F4, 0x6C3CF8 - 0x6C38F4
 
-	.global Pal_Title_086C3CF8
-Pal_Title_086C3CF8:	@ 0x086C3CF8
+	.global Pal_TitleTextFlame
+Pal_TitleTextFlame:	@ 0x086C3CF8
 	.incbin "FireEmblem7J.base.gba", 0x6C3CF8, 0x6C3D18 - 0x6C3CF8
 
-	.global Img_Title_086C3D18
-Img_Title_086C3D18:	@ 0x086C3D18
+	.global Img_TitleTextFlame
+Img_TitleTextFlame:	@ 0x086C3D18
 	.incbin "FireEmblem7J.base.gba", 0x6C3D18, 0x6C40D0 - 0x6C3D18
 
-	.global Tsa_Title_086C40D0
-Tsa_Title_086C40D0:	@ 0x086C40D0
+	.global Tsa_TitleTextFlame
+Tsa_TitleTextFlame:	@ 0x086C40D0
 	.incbin "FireEmblem7J.base.gba", 0x6C40D0, 0x6C44D4 - 0x6C40D0
diff --git a/data/data_op.s b/data/data_op.s
@@ -230,12 +230,12 @@ gUnk_08DB92C8:	@ 0x08DB92C8
 gUnk_08DB9320:	@ 0x08DB9320
 	.incbin "FireEmblem7J.base.gba", 0xDB9320, 0xDB9378 - 0xDB9320
 
-	.global gUnk_08DB9378
-gUnk_08DB9378:	@ 0x08DB9378
+	.global ProcScr_08DB9378
+ProcScr_08DB9378:	@ 0x08DB9378
 	.incbin "FireEmblem7J.base.gba", 0xDB9378, 0xDB9398 - 0xDB9378
 
-	.global gUnk_08DB9398
-gUnk_08DB9398:	@ 0x08DB9398
+	.global ProcScr_08DB9398
+ProcScr_08DB9398:	@ 0x08DB9398
 	.incbin "FireEmblem7J.base.gba", 0xDB9398, 0xDB93B0 - 0xDB9398
 
 	.global gUnk_08DB93B0

diff --git a/include/gbafe/opanim.h b/include/gbafe/opanim.h
@@ -80,7 +80,7 @@
 // sub_80BD9B8
 // sub_80BDB24
 // sub_80BDB40
-// sub_80BDBE4
+// Proc_08DB9398_Loop
 void sub_80BDC2C(void * a, const u16 * pal, int pal_bank, int size, ProcPtr parent);
 // sub_80BDCC0
 // sub_80BDCFC

diff --git a/include/gbafe/titlescreen.h b/include/gbafe/titlescreen.h
@@ -44,7 +44,7 @@ void StartTitleScreen_WithMusic(ProcPtr parent);
 void StartTitleScreen_FlagFalse(ProcPtr parent);
 void StartTitleScreen_FlagTrue(ProcPtr parent);
 
-void Title_StartFlameAnim(struct ProcTitle * proc);
+void Title_StartTextFlame(struct ProcTitle * proc);
 void TitleFlame_Init(struct Proc * proc);
 void TitleFlame_Loop(struct Proc * proc);
 

diff --git a/include/gbafe/unk-data.h b/include/gbafe/unk-data.h
@@ -595,7 +595,7 @@ extern u8 Img_TitleAxe[];
 extern u8 Tsa_TitleAxe[];
 extern u16 Pal_TitleSprites[];
 extern u8 Img_TitleSprites[];
-extern u16 SpirteAnim_TitleScreen[];
+extern u16 SpirteAnim_TitleText[];
 // ??? Pal_OpAnimCloud
 // ??? Img_OpAnimCloud
 // ??? Tsa_OpAnimCloud
@@ -608,9 +608,9 @@ extern u16 SpirteAnim_TitleScreen[];
 // ??? gUnk_086C25FC
 // ??? gUnk_086C261C
 // ??? gUnk_086C38F4
-extern u16 Pal_Title_086C3CF8[];
-extern u8 Img_Title_086C3D18[];
-extern u8 Tsa_Title_086C40D0[];
+extern u16 Pal_TitleTextFlame[];
+extern u8 Img_TitleTextFlame[];
+extern u8 Tsa_TitleTextFlame[];
 // ??? gUnk_086C44D4
 // ??? gUnk_086C44EC
 // ??? gUnk_086C450C
@@ -2328,8 +2328,8 @@ extern uintptr_t ProcScr_08DB9208[];
 // ??? gUnk_08DB9248
 // ??? gUnk_08DB92C8
 // ??? gUnk_08DB9320
-// ??? gUnk_08DB9378
-// ??? gUnk_08DB9398
+// ??? ProcScr_08DB9378
+// ??? ProcScr_08DB9398
 // ??? gUnk_08DB93B0
 // ??? ProcScr_08DB93D0
 // ??? gUnk_08DB93F0

diff --git a/src/titlescreen.c b/src/titlescreen.c
@@ -67,7 +67,7 @@ void Title_InitSpriteAnim(struct ProcTitle * proc, bool anim_en)
     ApplyPalettes(Pal_TitleSprites, 0x10, 5);
     Decompress(Img_TitleSprites, OBJ_VRAM0);
 
-    ap_scr = SpirteAnim_TitleScreen;
+    ap_scr = SpirteAnim_TitleText;
 
     proc->approcs[0] = StartSpriteAnimProc(ap_scr, x + 0x78, 0x48, 0x800, 0, 0xA);
     proc->approcs[1] = StartSpriteAnimProc(ap_scr, x + 0x78, 0x48, 0x400, 1, 0xA);
@@ -151,7 +151,7 @@ void Title_InitDisp(struct ProcTitle * proc)
 
     EnableBgSync(BG3_SYNC_BIT | BG2_SYNC_BIT | BG1_SYNC_BIT);
 
-    Title_StartFlameAnim(proc);
+    Title_StartTextFlame(proc);
 }
 
 void Title_StartBmBgfxAnim(struct ProcTitle * proc)
@@ -247,7 +247,7 @@ void Title_BmBgfxAnimOUT(struct ProcTitle * proc)
 void Title_RefrainSprites(struct ProcTitle * proc)
 {
     SetOnHBlankA(NULL);
-    Title_StartFlameAnim(proc);
+    Title_StartTextFlame(proc);
 }
 
 void Title_IDLE(struct ProcTitle * proc)
@@ -318,10 +318,10 @@ struct ProcCmd CONST_DATA ProcScr_TitleFlame[] = {
     PROC_END,
 };
 
-void Title_StartFlameAnim(struct ProcTitle * proc)
+void Title_StartTextFlame(struct ProcTitle * proc)
 {
     SetDispEnable(1, 1, 1, 1, 1);
-    StartSpriteAnimProc(SpirteAnim_TitleScreen, 0x78, 0x848, 0, 0x7, 0xA);
+    StartSpriteAnimProc(SpirteAnim_TitleText, 0x78, 0x848, 0, 0x7, 0xA);
     SetWinEnable(0, 0, 1);
     SetWin0Layers(0, 0, 0, 0, 0);
     SetWObjLayers(1, 0, 0, 0, 1);
@@ -341,9 +341,9 @@ void Title_StartFlameAnim(struct ProcTitle * proc)
 
     SetBgOffset(BG_1, -8, -0x30);
 
-    ApplyPalette(Pal_Title_086C3CF8, 0xC);
-    Decompress(Img_Title_086C3D18, (void *)BG_VRAM + 0x5000);
-    TmApplyTsa(gBg0Tm, Tsa_Title_086C40D0, 0xC280);
+    ApplyPalette(Pal_TitleTextFlame, 0xC);
+    Decompress(Img_TitleTextFlame, (void *)BG_VRAM + 0x5000);
+    TmApplyTsa(gBg0Tm, Tsa_TitleTextFlame, 0xC280);
     EnableBgSync(BG0_SYNC_BIT);
 
     InitScanlineEffect();