From e67c51b155f2fe189d643929bc4cb155565fad3f Mon Sep 17 00:00:00 2001 From: Robin Allen Date: Thu, 4 Jun 2020 22:54:50 +0100 Subject: [PATCH] Give names to KaleidoScope_Update & KaleidoScope_Draw (#185) --- .../{func_808262B8.s => KaleidoScope_Draw.s} | 2 +- .../{func_80826CB4.s => KaleidoScope_Update.s} | 2 +- src/code/z_kaleido_scope_call.c | 12 ++++++------ .../actors/ovl_kaleido_scope/z_kaleido_scope.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename asm/non_matchings/overlays/actors/ovl_kaleido_scope/{func_808262B8.s => KaleidoScope_Draw.s} (99%) rename asm/non_matchings/overlays/actors/ovl_kaleido_scope/{func_80826CB4.s => KaleidoScope_Update.s} (99%) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Draw.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s rename to asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Draw.s index f9259fdeb9..c4b52d9863 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Draw.s @@ -1,4 +1,4 @@ -glabel func_808262B8 +glabel KaleidoScope_Draw /* 12A98 808262B8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 12A9C 808262BC AFBF001C */ sw $ra, 0x001C($sp) /* 12AA0 808262C0 AFB10018 */ sw $s1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s rename to asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s index 5a4c7436ef..0c94146e6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s @@ -1,4 +1,4 @@ -glabel func_80826CB4 +glabel KaleidoScope_Update /* 13494 80826CB4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 13498 80826CB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 1349C 80826CBC AFB10020 */ sw $s1, 0x0020($sp) diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index bc864386a1..0a1bf96c84 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -7,8 +7,8 @@ float D_80161398; u32 D_8016139C; void* D_801613A0; -extern void func_80826CB4(GlobalContext*); // KaleidoScope_Update -extern void func_808262B8(GlobalContext*); // KaleidoScope_Draw +extern void KaleidoScope_Update(GlobalContext*); +extern void KaleidoScope_Draw(GlobalContext*); void KaleidoScopeCall_LoadPlayer() { if ((u32)gKaleidoMgrCurOvl != (u32)&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]) { @@ -28,12 +28,12 @@ void KaleidoScopeCall_LoadPlayer() { void KaleidoScopeCall_Init(GlobalContext* globalCtx) { // Kaleidoscope replacement construct osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); - sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(func_80826CB4); - sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(func_808262B8); + sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update); + sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw); - LOG_ADDRESS("kaleido_scope_move", func_80826CB4, "../z_kaleido_scope_call.c", 98); + LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update, "../z_kaleido_scope_call.c", 98); LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, "../z_kaleido_scope_call.c", 99); - LOG_ADDRESS("kaleido_scope_draw", func_808262B8, "../z_kaleido_scope_call.c", 100); + LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw, "../z_kaleido_scope_call.c", 100); LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, "../z_kaleido_scope_call.c", 101); func_8006ECF4(globalCtx); } diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c index 45b58bb37a..7be43b4f6d 100644 --- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c @@ -76,7 +76,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Draw.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s") @@ -88,7 +88,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s")