Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decompile unk_020910D8 -> hatch_egg_task #348

Merged
merged 4 commits into from
Nov 3, 2024
Merged

Decompile unk_020910D8 -> hatch_egg_task #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fc4164
Decompile unk_020910D8 -> hatch_egg_task
tgsm Oct 28, 2024
7d1c0f8
hatch_egg_task: Fix build error, resolve review comments
tgsm Oct 28, 2024
604d061
hatch_egg_task: Name _02106048
tgsm Oct 31, 2024
b176065
Overlay 95: Name init, main, and exit functions for hatch egg app
tgsm Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions asm/include/overlay_95.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 0 additions & 27 deletions asm/include/unk_020910D8.inc
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions asm/overlay_95.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
218 changes: 0 additions & 218 deletions asm/unk_020910D8.s
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions include/unk_020910D8.h → include/hatch_egg_task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef POKEHEARTGOLD_UNK_020910D8_H
#define POKEHEARTGOLD_UNK_020910D8_H
#ifndef POKEHEARTGOLD_HATCH_EGG_TASK_H
#define POKEHEARTGOLD_HATCH_EGG_TASK_H

#include "options.h"
#include "player_data.h"
Expand All @@ -15,4 +15,4 @@ typedef struct UnkStruct_02091240 {

void CallTask_HatchEggInParty(TaskManager *taskman, UnkStruct_02091240 *a1);

#endif // POKEHEARTGOLD_UNK_020910D8_H
#endif // POKEHEARTGOLD_HATCH_EGG_TASK_H
10 changes: 10 additions & 0 deletions include/overlay_95.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef POKEHEARTGOLD_OVERLAY_95_H
#define POKEHEARTGOLD_OVERLAY_95_H

#include "overlay_manager.h"

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
2 changes: 1 addition & 1 deletion main.lsf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ Static main
Object src/use_item_on_mon.o
Object src/mail_misc.o
Object src/unk_02091054.o
Object asm/unk_020910D8.o
Object src/hatch_egg_task.o
Object asm/unk_02091278.o
Object asm/unk_020912AC.o
Object src/dex_mon_measures.o
Expand Down
Loading