Game-Decompilation/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-18 16:39:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give names to KaleidoScope_Update & KaleidoScope_Draw (#185)

Browse Source
This commit is contained in:
Robin Allen 2020-06-04 22:54:50 +01:00 committed by GitHub
parent c78d93ad78
commit e67c51b155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s → asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Draw.s
View File

@ -1,4 +1,4 @@
glabel func_808262B8 glabel KaleidoScope_Draw
/* 12A98 808262B8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 12A98 808262B8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98
/* 12A9C 808262BC AFBF001C */ sw $ra, 0x001C($sp) /* 12A9C 808262BC AFBF001C */ sw $ra, 0x001C($sp)
/* 12AA0 808262C0 AFB10018 */ sw $s1, 0x0018($sp) /* 12AA0 808262C0 AFB10018 */ sw $s1, 0x0018($sp)

2
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s → asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s
View File

@ -1,4 +1,4 @@
glabel func_80826CB4 glabel KaleidoScope_Update
/* 13494 80826CB4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 13494 80826CB4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78
/* 13498 80826CB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 13498 80826CB8 AFBF0024 */ sw $ra, 0x0024($sp)
/* 1349C 80826CBC AFB10020 */ sw $s1, 0x0020($sp) /* 1349C 80826CBC AFB10020 */ sw $s1, 0x0020($sp)

12
src/code/z_kaleido_scope_call.c
View File

@ -7,8 +7,8 @@ float D_80161398;
u32 D_8016139C; u32 D_8016139C;
void* D_801613A0; void* D_801613A0;
extern void func_80826CB4(GlobalContext*); // KaleidoScope_Update extern void KaleidoScope_Update(GlobalContext*);
extern void func_808262B8(GlobalContext*); // KaleidoScope_Draw extern void KaleidoScope_Draw(GlobalContext*);
void KaleidoScopeCall_LoadPlayer() { void KaleidoScopeCall_LoadPlayer() {
if ((u32)gKaleidoMgrCurOvl != (u32)&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]) { if ((u32)gKaleidoMgrCurOvl != (u32)&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]) {
@ -28,12 +28,12 @@ void KaleidoScopeCall_LoadPlayer() {
void KaleidoScopeCall_Init(GlobalContext* globalCtx) { void KaleidoScopeCall_Init(GlobalContext* globalCtx) {
// Kaleidoscope replacement construct // Kaleidoscope replacement construct
osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n");
sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(func_80826CB4); sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update);
sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(func_808262B8); 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_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); LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, "../z_kaleido_scope_call.c", 101);
func_8006ECF4(globalCtx); func_8006ECF4(globalCtx);
} }

4
src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.c
View File

@ -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_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") #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_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") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80829960.s")