Overlay 95: Name init, main, and exit functions for hatch egg app

This commit is contained in:
tgsm 2024-11-01 19:09:07 -05:00 committed by PikalaxALT
parent 604d061fc7
commit b17606595f
4 changed files with 18 additions and 18 deletions

View File

@ -168,6 +168,6 @@
.public NNS_GfdDefaultFuncAllocTexVram
.public NNS_GfdDefaultFuncAllocPlttVram
.public gSystem
.public ov95_021E6D70
.public ov95_021E6E88
.public ov95_021E6F0C
.public HatchEggApp_Init
.public HatchEggApp_Main
.public HatchEggApp_Exit

View File

@ -2587,8 +2587,8 @@ _021E6D68: .word 0x00000815
_021E6D6C: .word 0x0000FFFF
thumb_func_end ov95_021E6B74
thumb_func_start ov95_021E6D70
ov95_021E6D70: ; 0x021E6D70
thumb_func_start HatchEggApp_Init
HatchEggApp_Init: ; 0x021E6D70
push {r4, r5, lr}
sub sp, #0xc
add r5, r0, #0
@ -2699,10 +2699,10 @@ ov95_021E6D70: ; 0x021E6D70
pop {r4, r5, pc}
.balign 4, 0
_021E6E84: .word ov95_021E5B24
thumb_func_end ov95_021E6D70
thumb_func_end HatchEggApp_Init
thumb_func_start ov95_021E6E88
ov95_021E6E88: ; 0x021E6E88
thumb_func_start HatchEggApp_Main
HatchEggApp_Main: ; 0x021E6E88
push {r3, r4, r5, lr}
add r4, r1, #0
bl OverlayManager_GetData
@ -2768,10 +2768,10 @@ _021E6F04:
pop {r3, r4, r5, pc}
.balign 4, 0
_021E6F08: .word 0x000001EA
thumb_func_end ov95_021E6E88
thumb_func_end HatchEggApp_Main
thumb_func_start ov95_021E6F0C
ov95_021E6F0C: ; 0x021E6F0C
thumb_func_start HatchEggApp_Exit
HatchEggApp_Exit: ; 0x021E6F0C
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetData
@ -2838,7 +2838,7 @@ ov95_021E6F0C: ; 0x021E6F0C
mov r0, #1
pop {r3, r4, r5, pc}
.balign 4, 0
thumb_func_end ov95_021E6F0C
thumb_func_end HatchEggApp_Exit
thumb_func_start ov95_021E6FC4
ov95_021E6FC4: ; 0x021E6FC4

View File

@ -3,8 +3,8 @@
#include "overlay_manager.h"
BOOL ov95_021E6D70(OVY_MANAGER *manager, int *state);
BOOL ov95_021E6E88(OVY_MANAGER *manager, int *state);
BOOL ov95_021E6F0C(OVY_MANAGER *manager, int *state);
BOOL HatchEggApp_Init(OVY_MANAGER *manager, int *state);
BOOL HatchEggApp_Main(OVY_MANAGER *manager, int *state);
BOOL HatchEggApp_Exit(OVY_MANAGER *manager, int *state);
#endif

View File

@ -26,9 +26,9 @@ typedef struct HatchEggTaskData {
FS_EXTERN_OVERLAY(OVY_95);
static const OVY_MGR_TEMPLATE sApplication_HatchEgg = {
.init = ov95_021E6D70,
.exec = ov95_021E6E88,
.exit = ov95_021E6F0C,
.init = HatchEggApp_Init,
.exec = HatchEggApp_Main,
.exit = HatchEggApp_Exit,
.ovy_id = FS_OVERLAY_ID(OVY_95),
};