From 5775f36bd5e3db67a938db5fbcec58b9c1bac82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Mon, 22 Jul 2024 16:54:39 +0200 Subject: [PATCH] More names --- asm/code_8098468.s | 4 ++-- asm/code_8098BDC.s | 4 ++-- asm/code_809D148.s | 10 +++++----- asm/ground_effect.s | 4 ++-- asm/ground_lives.s | 12 ++++++------ asm/ground_map_1.s | 20 ++++++++++---------- asm/ground_object.s | 10 +++++----- asm/ground_script.s | 10 +++++----- include/ground_map.h | 4 ++-- src/code_809D148.c | 8 ++++---- src/ground_map.c | 26 +++++++++++++------------- src/ground_map_1.c | 12 ++++++------ src/ground_script.c | 20 ++++++++++---------- 13 files changed, 72 insertions(+), 72 deletions(-) diff --git a/asm/code_8098468.s b/asm/code_8098468.s index 2f23b1b5b..21f0abff7 100644 --- a/asm/code_8098468.s +++ b/asm/code_8098468.s @@ -111,7 +111,7 @@ _08098522: bl sub_809C5C4 bl sub_809A560 bl sub_809CB50 - bl sub_80A4A7C + bl AllocGroundMapAction bl nullsub_117 bl sub_80AD990 bl sub_80A77F8 @@ -539,7 +539,7 @@ _08098988: bhi _08098990 b _080985DC _08098990: - bl sub_80A4AC4 + bl FreeGroundMapAction bl nullsub_118 bl sub_80A78F0 bl sub_80ABBD4 diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index e6fa232a0..39a196645 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -450,7 +450,7 @@ sub_80993F0: movs r0, 0 movs r1, 0 bl sub_8005838 - bl sub_80A4A7C + bl AllocGroundMapAction mov r7, sp add r0, sp, 0x8 mov r8, r0 @@ -662,7 +662,7 @@ _08099620: .4byte gGameOptionsRef _08099624: movs r0, 0x10 bl FadeOutAllMusic - bl sub_80A4AC4 + bl FreeGroundMapAction bl sub_8099768 bl nullsub_103 add sp, 0x28 diff --git a/asm/code_809D148.s b/asm/code_809D148.s index d3b488498..fe3112245 100644 --- a/asm/code_809D148.s +++ b/asm/code_809D148.s @@ -8,8 +8,8 @@ - thumb_func_start sub_809D600 -sub_809D600: + thumb_func_start InitActionWithParams +InitActionWithParams: push {r4-r7,lr} mov r7, r8 push {r7} @@ -22,7 +22,7 @@ sub_809D600: asrs r4, 16 lsls r5, 24 asrs r5, 24 - bl sub_809D5B8 + bl InitAction str r6, [r7] mov r0, r8 str r0, [r7, 0x4] @@ -45,12 +45,12 @@ _0809D63C: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_809D600 + thumb_func_end InitActionWithParams thumb_func_start sub_809D648 sub_809D648: push {lr} - bl sub_809D5B8 + bl InitAction pop {r0} bx r0 thumb_func_end sub_809D648 diff --git a/asm/ground_effect.s b/asm/ground_effect.s index ff56b8e2d..c4fe28480 100644 --- a/asm/ground_effect.s +++ b/asm/ground_effect.s @@ -621,7 +621,7 @@ _080AD01A: adds r0, r4, 0 adds r2, r5, 0 mov r3, r10 - bl sub_809D600 + bl InitActionWithParams ldr r2, [r7, 0x8] cmp r2, 0 bne _080AD04C @@ -641,7 +641,7 @@ _080AD048: _080AD04C: adds r0, r4, 0 movs r1, 0 - bl sub_809D6D8 + bl SetPredefinedScript ldr r3, _080AD07C adds r0, r4, 0 movs r1, 0 diff --git a/asm/ground_lives.s b/asm/ground_lives.s index a15f4f4c7..283bb41f4 100644 --- a/asm/ground_lives.s +++ b/asm/ground_lives.s @@ -1722,7 +1722,7 @@ _080A8508: adds r0, r4, 0 adds r2, r5, 0 ldr r3, [sp, 0x14] - bl sub_809D600 + bl InitActionWithParams ldr r0, _080A8548 ldr r2, [r0] movs r1, 0xCB @@ -1754,7 +1754,7 @@ _080A855C: adds r0, r4, 0 adds r2, r5, 0 ldr r3, [sp, 0x14] - bl sub_809D600 + bl InitActionWithParams _080A8566: ldr r3, [sp, 0x10] ldr r2, [r3, 0xC] @@ -1766,7 +1766,7 @@ _080A8566: _080A8574: adds r0, r4, 0 movs r1, 0x1 - bl sub_809D6D8 + bl SetPredefinedScript ldr r0, [sp, 0x10] ldr r2, [r0, 0x10] cmp r2, 0 @@ -1776,7 +1776,7 @@ _080A8574: _080A8588: adds r0, r4, 0 movs r1, 0x2 - bl sub_809D6D8 + bl SetPredefinedScript ldr r1, [sp, 0x10] ldr r2, [r1, 0x14] cmp r2, 0 @@ -1786,14 +1786,14 @@ _080A8588: _080A859C: adds r0, r4, 0 movs r1, 0x3 - bl sub_809D6D8 + bl SetPredefinedScript ldr r3, [sp, 0x10] ldr r2, [r3, 0x8] cmp r2, 0 beq _080A8630 adds r0, r4, 0 movs r1, 0 - bl sub_809D6D8 + bl SetPredefinedScript ldr r0, [sp, 0x20] cmp r0, 0 bne _080A860C diff --git a/asm/ground_map_1.s b/asm/ground_map_1.s index 89de79db2..1492e5171 100644 --- a/asm/ground_map_1.s +++ b/asm/ground_map_1.s @@ -101,7 +101,7 @@ _080A4E08: _080A4E38: .4byte gUnknown_81176A4 _080A4E3C: .4byte gUnknown_3001B70 _080A4E40: .4byte 0x0000055c -_080A4E44: .4byte gUnknown_3001B6C +_080A4E44: .4byte gGroundMapAction _080A4E48: .4byte gUnknown_8117324 _080A4E4C: lsls r0, r5, 1 @@ -258,7 +258,7 @@ _080A4F30: .align 2, 0 _080A4FA0: .4byte gUnknown_3001B70 _080A4FA4: .4byte gUnknown_8117324 -_080A4FA8: .4byte gUnknown_3001B6C +_080A4FA8: .4byte gGroundMapAction _080A4FAC: cmp r0, 0xAA beq _080A500C @@ -467,7 +467,7 @@ _080A5138: _080A514C: .4byte gUnknown_8117700 _080A5150: .4byte gUnknown_3001B70 _080A5154: .4byte 0x0000055c -_080A5158: .4byte gUnknown_3001B6C +_080A5158: .4byte gGroundMapAction _080A515C: .4byte gUnknown_8117324 _080A5160: lsls r0, r5, 1 @@ -1272,7 +1272,7 @@ sub_80A56F0: str r1, [r2, 0x4] bx lr .align 2, 0 -_080A5700: .4byte gUnknown_3001B6C +_080A5700: .4byte gGroundMapAction thumb_func_end sub_80A56F0 thumb_func_start sub_80A5704 @@ -1293,7 +1293,7 @@ sub_80A5704: str r1, [r0] bx lr .align 2, 0 -_080A5724: .4byte gUnknown_3001B6C +_080A5724: .4byte gGroundMapAction thumb_func_end sub_80A5704 thumb_func_start sub_80A5728 @@ -1305,7 +1305,7 @@ sub_80A5728: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080A5734: .4byte gUnknown_3001B6C +_080A5734: .4byte gGroundMapAction thumb_func_end sub_80A5728 thumb_func_start sub_80A5738 @@ -1322,7 +1322,7 @@ sub_80A5738: adds r0, r1 bx lr .align 2, 0 -_080A5750: .4byte gUnknown_3001B6C +_080A5750: .4byte gGroundMapAction _080A5754: .4byte gUnknown_811BAF4 thumb_func_end sub_80A5738 @@ -1451,7 +1451,7 @@ _080A5832: b _080A5856 .align 2, 0 _080A5838: .4byte gUnknown_3001B70 -_080A583C: .4byte gUnknown_3001B6C +_080A583C: .4byte gGroundMapAction _080A5840: .4byte gUnknown_811BAF4 _080A5844: .4byte 0xffff8800 _080A5848: .4byte 0xffffb000 @@ -1678,7 +1678,7 @@ GroundMap_Action: pop {r0} bx r0 .align 2, 0 -_080A59D4: .4byte gUnknown_3001B6C +_080A59D4: .4byte gGroundMapAction _080A59D8: .4byte gUnknown_8117770 thumb_func_end GroundMap_Action @@ -1734,7 +1734,7 @@ _080A5A32: b _080A5E46 .align 2, 0 _080A5A34: .4byte gUnknown_3001B70 -_080A5A38: .4byte gUnknown_3001B6C +_080A5A38: .4byte gGroundMapAction _080A5A3C: cmp r0, 0xA8 beq _080A5AF4 diff --git a/asm/ground_object.s b/asm/ground_object.s index 78652c170..df3283665 100644 --- a/asm/ground_object.s +++ b/asm/ground_object.s @@ -733,7 +733,7 @@ _080AC0C0: adds r0, r4, 0 adds r2, r5, 0 mov r3, r10 - bl sub_809D600 + bl InitActionWithParams adds r6, r4, 0 mov r1, r8 ldr r2, [r1, 0xC] @@ -751,7 +751,7 @@ _080AC0C0: _080AC0F2: adds r0, r6, 0 movs r1, 0x1 - bl sub_809D6D8 + bl SetPredefinedScript adds r1, r4, 0 mov r3, r8 ldr r2, [r3, 0x10] @@ -762,7 +762,7 @@ _080AC0F2: _080AC108: adds r0, r1, 0 movs r1, 0x2 - bl sub_809D6D8 + bl SetPredefinedScript mov r0, r8 ldr r2, [r0, 0x14] cmp r2, 0 @@ -772,14 +772,14 @@ _080AC108: _080AC11C: adds r0, r4, 0 movs r1, 0x3 - bl sub_809D6D8 + bl SetPredefinedScript mov r1, r8 ldr r2, [r1, 0x8] cmp r2, 0 beq _080AC140 adds r0, r4, 0 movs r1, 0 - bl sub_809D6D8 + bl SetPredefinedScript ldr r3, _080AC164 adds r0, r4, 0 movs r1, 0 diff --git a/asm/ground_script.s b/asm/ground_script.s index c43e41ce7..42588da72 100644 --- a/asm/ground_script.s +++ b/asm/ground_script.s @@ -1704,12 +1704,12 @@ _0809E98E: bl _call_via_r2 _0809E9A2: adds r0, r4, 0 - bl sub_809D568 + bl InitScriptData b _0809E9D6 _0809E9AA: adds r0, r7, 0 adds r0, 0x24 - bl sub_809D568 + bl InitScriptData b _0809E9D6 _0809E9B4: movs r0, 0x4 @@ -3930,7 +3930,7 @@ _0809FE04: cmp r0, 0x1 bne _0809FE16 adds r0, r1, 0 - bl sub_809D568 + bl InitScriptData _0809FE16: mov r0, r9 ldr r1, [r0] @@ -4028,7 +4028,7 @@ _0809FED0: cmp r0, 0x1 bne _0809FEEE adds r0, r1, 0 - bl sub_809D568 + bl InitScriptData _0809FEEE: mov r3, r9 ldr r2, [r3] @@ -6697,7 +6697,7 @@ GroundScript_ExecuteTrigger: adds r0, r5, 0 movs r2, 0 movs r3, 0 - bl sub_809D600 + bl InitActionWithParams movs r0, 0 add r1, sp, 0x4 adds r2, r4, 0 diff --git a/include/ground_map.h b/include/ground_map.h index 2ac30fd40..d8045059d 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -11,8 +11,8 @@ extern unkStruct_3001B70 *gUnknown_3001B70; void GroundMap_Reset(void); -void sub_80A4A7C(void); -void sub_80A4AC4(void); +void AllocGroundMapAction(void); +void FreeGroundMapAction(void); void sub_80A4B38(void); void sub_80A4B54(void); diff --git a/src/code_809D148.c b/src/code_809D148.c index 5a4921799..8a7e4ee70 100644 --- a/src/code_809D148.c +++ b/src/code_809D148.c @@ -442,7 +442,7 @@ s32 sub_809D52C(void *a0) return 0; } -void sub_809D568(ScriptData *a0) +void InitScriptData(ScriptData *a0) { s32 i; @@ -466,7 +466,7 @@ void sub_809D568(ScriptData *a0) } } -void sub_809D5B8(Action *a0) +void InitAction(Action *a0) { s32 i; @@ -480,6 +480,6 @@ void sub_809D5B8(Action *a0) a0->predefinedScripts[i] = NULL; } - sub_809D568(&a0->scriptData); - sub_809D568(&a0->scriptData2); + InitScriptData(&a0->scriptData); + InitScriptData(&a0->scriptData2); } diff --git a/src/ground_map.c b/src/ground_map.c index 265416fb5..b07deb84c 100644 --- a/src/ground_map.c +++ b/src/ground_map.c @@ -6,42 +6,42 @@ #include "ground_script.h" #include "memory.h" -IWRAM_DATA GroundMapAction *gUnknown_3001B6C = {0}; +IWRAM_DATA GroundMapAction *gGroundMapAction = {0}; IWRAM_DATA unkStruct_3001B70 *gUnknown_3001B70 = {0}; -extern const u8 gUnknown_811736C[]; +extern const CallbackData gUnknown_811736C; extern const DebugLocation gUnknown_8117538[]; -extern void sub_809D600(void *, const u8 *, u32, u32, u32); +extern void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s16 group, s8 sector); extern void sub_809D648(void *); extern void sub_80A2D00(unkStruct_3001B70 *); -extern void sub_809D754(GroundMapAction *, const DebugLocation *); +extern void InitActionScriptData(GroundMapAction *, const DebugLocation *); extern void sub_80A2D68(unkStruct_3001B70 *); extern void sub_80A2D88(unkStruct_3001B70 *); -void sub_80A4A7C(void) +void AllocGroundMapAction(void) { - gUnknown_3001B6C = MemoryAlloc(sizeof(GroundMapAction), 6); - gUnknown_3001B6C->groundMapId = -1; - sub_809D600(gUnknown_3001B6C, gUnknown_811736C, 0, -1, -1); + gGroundMapAction = MemoryAlloc(sizeof(GroundMapAction), 6); + gGroundMapAction->groundMapId = -1; + InitActionWithParams(&gGroundMapAction->action, &gUnknown_811736C, 0, -1, -1); sub_80A5E8C(0); GroundMap_Reset(); } -void sub_80A4AC4(void) +void FreeGroundMapAction(void) { GroundMap_Reset(); sub_80A5EBC(); - sub_809D648(gUnknown_3001B6C); - MemoryFree(gUnknown_3001B6C); - gUnknown_3001B6C = NULL; + sub_809D648(gGroundMapAction); + MemoryFree(gGroundMapAction); + gGroundMapAction = NULL; } void GroundMap_Reset(void) { sub_80015C0(0, 0x37); sub_80015C0(0, 0x38); - sub_809D754(gUnknown_3001B6C, gUnknown_8117538); + InitActionScriptData(gGroundMapAction, gUnknown_8117538); if (gUnknown_3001B70 != NULL) { sub_80A2D00(gUnknown_3001B70); diff --git a/src/ground_map_1.c b/src/ground_map_1.c index 2901de140..d857a379b 100644 --- a/src/ground_map_1.c +++ b/src/ground_map_1.c @@ -4,7 +4,7 @@ #include "ground_map_1.h" #include "ground_script.h" -extern GroundMapAction *gUnknown_3001B6C; +extern GroundMapAction *gGroundMapAction; extern const u8 gUnknown_8117594[]; extern const u8 gUnknown_81175EC[]; @@ -39,7 +39,7 @@ void GroundMap_ExecuteEvent(s16 scriptIndex, u32 param_2) if (iVar2 != 0) script.state = 5; - GroundScript_ExecutePP(&gUnknown_3001B6C->action, 0, &script, &gUnknown_81175E0); + GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_81175E0); } void GroundMap_ExecuteStation(s16 param_1, s16 param_2, s8 param_3, u32 param_4) @@ -60,7 +60,7 @@ void GroundMap_ExecuteStation(s16 param_1, s16 param_2, s8 param_3, u32 param_4) if (iVar4 != 0) script.state = 5; - GroundScript_ExecutePP(&gUnknown_3001B6C->action, 0, &script, &gUnknown_8117644); + GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_8117644); } void GroundMap_ExecuteEnter(s16 param_1) @@ -75,18 +75,18 @@ void GroundMap_ExecuteEnter(s16 param_1) script.state = 2; script.group = 0; script.sector = 0; - GroundScript_ExecutePP(&gUnknown_3001B6C->action, 0, &script, &gUnknown_8117698); + GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_8117698); } UNUSED static u8 sub_80A4D14(void) { - return sub_809D678(&gUnknown_3001B6C->action); + return sub_809D678(&gGroundMapAction->action); } bool8 sub_80A4D2C(s16 param_1) { s32 iVar1 = param_1; - return sub_809D968(&gUnknown_3001B6C->action, iVar1); + return sub_809D968(&gGroundMapAction->action, iVar1); } bool8 sub_80A4D48(s16 index) diff --git a/src/ground_script.c b/src/ground_script.c index 420b3ed70..59cb00bcd 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -17,7 +17,7 @@ extern u8 gUnknown_811656C[]; extern DebugLocation gUnknown_81165C8; extern void sub_809D520(void *); -extern void sub_809D568(void *); +extern void InitScriptData(void *); extern u8 sub_80AC378(void); extern u8 sub_80AD290(void); extern u8 sub_80A8B74(void); @@ -34,7 +34,7 @@ typedef struct FunctionScript extern FunctionScript gFunctionScriptTable[]; -void sub_809D6D8(Action *param_1, s16 index, ScriptCommand *param_3) +void SetPredefinedScript(Action *param_1, s16 index, ScriptCommand *param_3) { param_1->predefinedScripts[index] = param_3; } @@ -67,17 +67,17 @@ void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index) } } -bool8 sub_809D754(Action *param_1, DebugLocation *unused) +bool8 InitActionScriptData(Action *param_1, DebugLocation *unused) { - sub_809D568(¶m_1->scriptData); - sub_809D568(¶m_1->scriptData2); + InitScriptData(¶m_1->scriptData); + InitScriptData(¶m_1->scriptData2); return TRUE; } bool8 sub_809D770(Action *param_1, DebugLocation *unused) { - sub_809D568(¶m_1->scriptData); - sub_809D568(¶m_1->scriptData2); + InitScriptData(¶m_1->scriptData); + InitScriptData(¶m_1->scriptData2); param_1->scriptData.savedState = 4; return TRUE; } @@ -95,7 +95,7 @@ bool8 GroundScript_ExecutePP(Action *action, s32 *param_2, ScriptInfoSmall *para break; } if (action->scriptData.state == 5) { - sub_809D568(&action->scriptData2); + InitScriptData(&action->scriptData2); } break; case 5: @@ -115,13 +115,13 @@ bool8 GroundScript_ExecutePP(Action *action, s32 *param_2, ScriptInfoSmall *para break; case 1: _0809D84A: - sub_809D568(&action->scriptData2); + InitScriptData(&action->scriptData2); break; default: // "execute script type error %d" at ../ground/ground_script.c:708 FatalError(&gUnknown_8116588, gUnknown_8116594, param_3->state); } - sub_809D568(&action->scriptData); + InitScriptData(&action->scriptData); if (param_2 != NULL) { action->unkC.raw = param_2[0]; }