diff options
| author | Robin Allen <r@foon.uk> | 2020-06-04 22:54:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 17:54:50 -0400 |
| commit | e67c51b155f2fe189d643929bc4cb155565fad3f (patch) | |
| tree | ca15b0c12a6a23b78374e9219648e8a5f7c03a1e /src | |
| parent | c78d93ad78a6ed237676838f98f9b82aa1c43234 (diff) | |
Give names to KaleidoScope_Update & KaleidoScope_Draw (#185)
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_kaleido_scope_call.c | 12 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index bc864386a..0a1bf96c8 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 45b58bb37..7be43b4f6 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") |