Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-02 11:02:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More trainer card documentation

Browse Source
This commit is contained in:
PikalaxALT 2022-03-11 13:44:03 -05:00
parent 0b2879913f
commit efcce87a32
92 changed files with 194 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/overlay_01.s
View File

@ -37,7 +37,7 @@ ov01_021E5924: ; 0x021E5924
mov r1, #0
ldr r5, _021E5B9C ; =0x00DCE6A1
str r1, [sp, #4]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r6]
add r4, r0, #0
cmp r1, #3
@ -331,7 +331,7 @@ _021E5BE0: .word 0x00000578
thumb_func_start ov01_021E5BE4
ov01_021E5BE4: ; 0x021E5BE4
push {r4, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
bl ov01_021E5ED4
cmp r0, #0
@ -366,7 +366,7 @@ ov01_021E5C24: ; 0x021E5C24
push {r3, r4, r5, r6, r7, lr}
add r6, r1, #0
ldr r5, _021E5E7C ; =0x002AAACF
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r0, [r4, #0x2c]
bl ov01_021F50F0

2
asm/overlay_100.s
View File

@ -1435,7 +1435,7 @@ _021E6428:
ov100_Phone_OvyInit: ; 0x021E642C
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #0
bl sub_0200616C

10
asm/overlay_101.s
View File

@ -14,7 +14,7 @@
ov101_021E7740: ; 0x021E7740
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, _021E7790 ; =SDK_OVERLAY_OVY_26_ID
mov r1, #2
@ -12472,7 +12472,7 @@ _021ED7E4:
ov101_TownMap_OvyInit: ; 0x021ED7F8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, _021ED8A4 ; =SDK_OVERLAY_OVY_100_ID
mov r1, #2
@ -14532,7 +14532,7 @@ _021EE8E4: .word 0x00030100
ov101_021EE8E8: ; 0x021EE8E8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #2
add r5, r0, #0
mov r0, #3
@ -16531,7 +16531,7 @@ _021EF844: .word 0x00000941
ov101_021EF848: ; 0x021EF848
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #3
mov r1, #0x5b
@ -26616,7 +26616,7 @@ _021F447C: .word 0x0000099F
ov101_021F4480: ; 0x021F4480
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #2
add r5, r0, #0
mov r0, #3

2
asm/overlay_102.s
View File

@ -193,7 +193,7 @@ ov102_021E7888: ; 0x021E7888
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
bl sub_02090D70
str r0, [r4, #4]

2
asm/overlay_103.s
View File

@ -21,7 +21,7 @@ ov103_021EC940: ; 0x021EC940
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #8]
ldr r0, [r0]
bl Sav2_PlayerData_GetOptionsAddr

2
asm/overlay_104.s
View File

@ -24,7 +24,7 @@ ov104_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #0x59
ldrb r1, [r5]

2
asm/overlay_105.s
View File

@ -22,7 +22,7 @@ ov105_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
add r0, r4, #0
ldrb r1, [r5]

4
asm/overlay_108.s
View File

@ -7,7 +7,7 @@
ov108_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -5979,7 +5979,7 @@ _021E8862:
lsl r2, r2, #0xe
bl CreateHeap
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x53
add r6, r0, #0
add r0, r4, #0

2
asm/overlay_109.s
View File

@ -34,7 +34,7 @@ _021E5912:
mov r0, #0x60
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #0x10]
add r0, r4, #0
bl ov109_021E5A70

2
asm/overlay_110.s
View File

@ -35,7 +35,7 @@ _021E5912:
mov r0, #0x61
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0
str r0, [r4, #0x10]
mov r0, #0x4a

2
asm/overlay_111.s
View File

@ -699,7 +699,7 @@ ov111_021E5E34: ; 0x021E5E34
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021E5E46
bl GF_AssertFail

4
asm/overlay_112.s
View File

@ -3946,7 +3946,7 @@ ov112_021E76CC: ; 0x021E76CC
add r5, r0, #0
bl memset
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r5, #0x20]
add r0, r5, #0
@ -26674,7 +26674,7 @@ _021F2DE0: .word 0xFFFFFBFF
ov112_021F2DE4: ; 0x021F2DE4
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021F2DF4
bl GF_AssertFail

2
asm/overlay_113.s
View File

@ -34,7 +34,7 @@ _021E5912:
mov r0, #0x98
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov113_021E5A7C

14
asm/overlay_12.s
View File

@ -10,7 +10,7 @@ ov12_022378C0: ; 0x022378C0
sub sp, #0x24
add r4, r1, #0
add r6, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r4]
add r5, r0, #0
cmp r1, #0xf
@ -755,7 +755,7 @@ ov12_02237F18: ; 0x02237F18
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r7, r0, #0
bl sub_02026E8C
add r5, r0, #0
@ -1320,7 +1320,7 @@ ov12_0223843C: ; 0x0223843C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r3, _02238778 ; =0x0000244C
mov r2, #0x67
ldr r1, [r4, r3]
@ -4771,7 +4771,7 @@ ov12_0223A0D4: ; 0x0223A0D4
bl OverlayManager_CreateAndGetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r2, _0223A20C ; =0x00002490
mov r0, #0
@ -4970,7 +4970,7 @@ ov12_0223A260: ; 0x0223A260
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r4, #0x2c]
mov r1, #4
tst r1, r0
@ -5163,7 +5163,7 @@ _0223A3EA:
ov12_0223A3F0: ; 0x0223A3F0
push {r4, r5, r6, r7, lr}
sub sp, #0xc
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r7, r0, #0
ldr r0, [r7]
mov r1, #4
@ -5405,7 +5405,7 @@ _0223A5E0: .word 0x000001B2
thumb_func_start ov12_0223A5E4
ov12_0223A5E4: ; 0x0223A5E4
push {r4, r5, r6, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x66
lsl r1, r1, #2
ldr r6, [r0, r1]

2
asm/overlay_121.s
View File

@ -232,7 +232,7 @@ _021E5AE8: .word 0x0000025E
ov121_021E5AEC: ; 0x021E5AEC
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #1
add r4, r0, #0
mov r0, #3

2
asm/overlay_122.s
View File

@ -5106,7 +5106,7 @@ _021E8090: .word 0x04001000
ov122_021E8094: ; 0x021E8094
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021E80A4
bl GF_AssertFail

2
asm/overlay_124.s
View File

@ -26,7 +26,7 @@ _02260C42:
mul r0, r1
add r4, r4, r0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r5, #0xc]
mov r0, #0

2
asm/overlay_14.s
View File

@ -21,7 +21,7 @@ ov14_021E5900: ; 0x021E5900
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
ldr r0, [r0]
bl GetStoragePCPointer

2
asm/overlay_15.s
View File

@ -46,7 +46,7 @@ ov15_BagApp_init: ; 0x021F9380
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x8d
lsl r1, r1, #2
str r0, [r4, r1]

2
asm/overlay_16.s
View File

@ -803,7 +803,7 @@ ov16_0220196C: ; 0x0220196C
mov r0, #0x82
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov16_02201A34

2
asm/overlay_17.s
View File

@ -69,7 +69,7 @@ _02201C22:
mov r0, #0x83
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov17_02201D30

2
asm/overlay_18.s
View File

@ -262,7 +262,7 @@ ov18_021E5AA0: ; 0x021E5AA0
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
ldr r0, _021E5B50 ; =0x0000085C
mov r1, #5

6
asm/overlay_36.s
View File

@ -20,7 +20,7 @@ ov36_021E5900: ; 0x021E5900
thumb_func_start ov36_021E5918
ov36_021E5918: ; 0x021E5918
push {r3, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r0, #8]
mov r0, #0x4b
bl ov36_021E5BC8
@ -63,7 +63,7 @@ ov36_021E5948: ; 0x021E5948
thumb_func_start ov36_021E5960
ov36_021E5960: ; 0x021E5960
push {r4, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r4, [r0, #8]
mov r0, #0x4b
add r1, r4, #0
@ -110,7 +110,7 @@ ov36_021E599C: ; 0x021E599C
thumb_func_start ov36_021E59B4
ov36_021E59B4: ; 0x021E59B4
push {r3, r4, r5, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r4, [r0, #8]
add r0, r4, #0
bl Sav2_SysInfo_get

4
asm/overlay_37.s
View File

@ -82,7 +82,7 @@ _021E5916:
add r3, r0, #0
bl sub_0200FA24
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #8]
mov r0, #0x4e
mov r1, #0x27
@ -302,7 +302,7 @@ ov37_021E5B94: ; 0x021E5B94
bl OverlayManager_GetData
add r6, r0, #0
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r7]
cmp r0, #3

2
asm/overlay_39_thumb.s
View File

@ -2410,7 +2410,7 @@ ov39_02228140: ; 0x02228140
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
mov r0, #0x7c
bl BgConfig_Alloc

8
asm/overlay_41.s
View File

@ -2083,7 +2083,7 @@ ov41_02246DE0: ; 0x02246DE0
bl Main_SetVBlankIntrCB
bl HBlankInterruptDisable
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r5, #0xc]
ldr r1, _02246EF4 ; =0x000006DC
@ -2188,7 +2188,7 @@ ov41_02246F08: ; 0x02246F08
add r4, r0, #0
add r0, r7, #0
mov r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r5]
cmp r1, #0xc
bhi _02246FD6
@ -2470,7 +2470,7 @@ ov41_02247150: ; 0x02247150
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #0x1b
lsl r0, r0, #6
@ -12399,7 +12399,7 @@ ov41_0224BA10: ; 0x0224BA10
bl Main_SetVBlankIntrCB
bl HBlankInterruptDisable
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r0, [r4]
ldr r1, [r4, #4]

2
asm/overlay_43.s
View File

@ -24,7 +24,7 @@ ov43_02229EE0: ; 0x02229EE0
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x9f
lsl r1, r1, #2
str r0, [r4, r1]

10
asm/overlay_44.s
View File

@ -843,7 +843,7 @@ ov44_0222A4B4: ; 0x0222A4B4
_0222A4C8:
b _0222A600
_0222A4CA:
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
bl sub_02039998
cmp r0, #0
@ -1156,7 +1156,7 @@ ov44_0222A758: ; 0x0222A758
add r4, r0, #0
bl ov44_0222A68C
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
mov r0, #0xd3
lsl r0, r0, #2
@ -18241,7 +18241,7 @@ _02232EA4: .word ov44_0223688C
ov44_02232EA8: ; 0x02232EA8
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, _02232F5C ; =SDK_OVERLAY_OVY_42_ID
mov r1, #2
@ -18325,7 +18325,7 @@ ov44_02232F64: ; 0x02232F64
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r7, r0, #0
ldr r0, [r5]
cmp r0, #4
@ -18482,7 +18482,7 @@ ov44_022330A8: ; 0x022330A8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r0, #0
add r1, r0, #0
bl Main_SetVBlankIntrCB

2
asm/overlay_45_thumb.s
View File

@ -33,7 +33,7 @@ _02229F18:
sub r1, r1, #1
bne _02229F18
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r0, [r4, #4]
mov r1, #0x6f

8
asm/overlay_46.s
View File

@ -22,7 +22,7 @@ ov46_02258800: ; 0x02258800
add r5, r0, #0
bl memset
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r0, [r4]
ldr r1, _0225891C ; =0x0000047D
@ -148,7 +148,7 @@ ov46_0225892C: ; 0x0225892C
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
ldr r0, [r4]
cmp r0, #0xf
@ -581,7 +581,7 @@ ov46_02258CB4: ; 0x02258CB4
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0]
mov r1, #0x77
str r0, [r4]
@ -680,7 +680,7 @@ ov46_02258DA8: ; 0x02258DA8
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
ldr r0, [r4]
cmp r0, #0xa

6
asm/overlay_47.s
View File

@ -8,7 +8,7 @@ ov47_02258800: ; 0x02258800
push {r3, r4, r5, r6, lr}
sub sp, #4
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -82,7 +82,7 @@ ov47_02258898: ; 0x02258898
bl OverlayManager_GetData
add r7, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r4]
cmp r0, #4
@ -215,7 +215,7 @@ ov47_022589A8: ; 0x022589A8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
mov r0, #0
add r1, r0, #0

6
asm/overlay_48.s
View File

@ -8,7 +8,7 @@ ov48_02258800: ; 0x02258800
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -135,7 +135,7 @@ ov48_02258920: ; 0x02258920
bl OverlayManager_GetData
add r7, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r4]
cmp r0, #6
@ -243,7 +243,7 @@ ov48_022589FC: ; 0x022589FC
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r0, #0
add r1, r0, #0
bl Main_SetVBlankIntrCB

6
asm/overlay_49.s
View File

@ -2587,7 +2587,7 @@ ov49_02259AA4: ; 0x02259AA4
push {r3, r4, r5, lr}
sub sp, #8
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #0x3a
add r5, r0, #0
mov r0, #3
@ -2806,7 +2806,7 @@ ov49_02259C90: ; 0x02259C90
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r5]
cmp r0, #8
bhi _02259D58
@ -3106,7 +3106,7 @@ ov49_02259EF8: ; 0x02259EF8
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldrb r1, [r4, #1]
str r1, [r0, #0x18]
mov r0, #0

2
asm/overlay_53.s
View File

@ -28,7 +28,7 @@ ov53_OakSpeech_OvyInit: ; 0x021E5900
mov r0, #0x50
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr

2
asm/overlay_54.s
View File

@ -7,7 +7,7 @@
ov54_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #3
mov r1, #0x26

4
asm/overlay_55.s
View File

@ -28,7 +28,7 @@ _021E5920:
ov55_021E5924: ; 0x021E5924
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #1
add r5, r0, #0
mov r0, #3
@ -85,7 +85,7 @@ ov55_021E598C: ; 0x021E598C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r6]
cmp r0, #4

2
asm/overlay_56.s
View File

@ -23,7 +23,7 @@ ov56_021E5C20: ; 0x021E5C20
mov r0, #0x29
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #0x1c]
ldrh r0, [r0]
ldr r1, _021E5C98 ; =0x0000FFFF

2
asm/overlay_57.s
View File

@ -38,7 +38,7 @@ ov57_022378DC: ; 0x022378DC
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
mov r0, #0xb4
mov r1, #0x34

2
asm/overlay_58.s
View File

@ -45,7 +45,7 @@ ov58_022378E4: ; 0x022378E4
mov r0, #0x85
str r0, [r4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov58_02237B40

4
asm/overlay_59.s
View File

@ -34,7 +34,7 @@ _02237D52:
mov r0, #0x86
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov59_02237E94
@ -5682,7 +5682,7 @@ _0223A8F2:
mov r0, #0x86
str r0, [r4]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #4]
add r0, r4, #0
bl ov59_0223A9E4

4
asm/overlay_61.s
View File

@ -33,7 +33,7 @@ ChooseStarterApplication_OvyInit: ; 0x021E5900
str r1, [r4, #4]
bl GF_ExpHeap_FndInitAllocator
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r5, #4]
bl Options_GetFrame
@ -767,7 +767,7 @@ ChooseStarterApplication_OvyExit: ; 0x021E5F74
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
mov r0, #0
bl TextFlags_SetCanABSpeedUpPrint

2
asm/overlay_63.s
View File

@ -38,7 +38,7 @@ ov63_0221BE20: ; 0x0221BE20
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
mov r0, #0
mov r1, #0x1b

2
asm/overlay_64.s
View File

@ -44,7 +44,7 @@ ov64_021E5900: ; 0x021E5900
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
bl Sav2_HOF_GetNumRecords
mov r1, #0x6e

4
asm/overlay_65.s
View File

@ -1816,7 +1816,7 @@ ov65_0221CD74: ; 0x0221CD74
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r4, #0x68]
str r1, [r0, #0x24]
add r0, r4, #0
@ -2212,7 +2212,7 @@ ov65_0221D0EC: ; 0x0221D0EC
push {r4, r5, r6, lr}
add r5, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
mov r2, #6
ldr r0, _0221D1B0 ; =0x00000674

2
asm/overlay_67.s
View File

@ -7,7 +7,7 @@
ov67_021E5900: ; 0x021E5900
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #2
add r5, r0, #0
mov r0, #3

2
asm/overlay_68.s
View File

@ -23,7 +23,7 @@ ov68_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
add r0, r4, #0
bl ov68_021E5A58

2
asm/overlay_69.s
View File

@ -52,7 +52,7 @@ _021E5960:
lsl r0, r0, #8
str r1, [r5, r0]
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
bl sub_0202CA44
str r0, [r5, #4]

2
asm/overlay_70.s
View File

@ -1983,7 +1983,7 @@ ov70_02238818: ; 0x02238818
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0
str r0, [r4]
add r0, r4, #0

2
asm/overlay_71.s
View File

@ -37,7 +37,7 @@ _02246970:
b _02246B06
_022469A6:
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
mov r0, #0
str r0, [r4, #4]

2
asm/overlay_72.s
View File

@ -1091,7 +1091,7 @@ ov72_02238144: ; 0x02238144
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0
str r0, [r4]
add r0, r4, #0

4
asm/overlay_73.s
View File

@ -55,7 +55,7 @@ _021E5916:
bl BgConfig_Alloc
str r0, [r4]
add r0, r7, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #8]
ldr r1, [r0]
ldr r0, _021E5AA0 ; =0x00004A0C
@ -5114,7 +5114,7 @@ ov73_021E8148: ; 0x021E8148
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0
str r0, [r4]
add r0, r4, #0

16
asm/overlay_74_thumb.s
View File

@ -3192,7 +3192,7 @@ ov74_MainMenu_AppInit: ; 0x02228920
mov r1, #0
bl sub_0200FBF4
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Save_MysteryGift_get
@ -4241,7 +4241,7 @@ ov74_02229200: ; 0x02229200
bl BgConfig_Alloc
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #8]
bl Sav2_PlayerData_GetProfileAddr
@ -5611,7 +5611,7 @@ ov74_02229D1C: ; 0x02229D1C
cmp r0, #0
bne _02229D48
bl ov74_0222CD7C
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
add r1, r4, #0
bl sub_02038148
@ -6216,7 +6216,7 @@ ov74_0222A174: ; 0x0222A174
add r0, r6, #0
add r4, #0x8c
add r5, #0xdc
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [sp]
add r0, r4, #0
@ -7893,7 +7893,7 @@ _0222AEE8:
mov r1, #0x1d
str r1, [r4, r0]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr
@ -14267,7 +14267,7 @@ _0222E216: ; jump table
.short _0222E79C - _0222E216 - 2 ; case 30
_0222E254:
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r0, #8]
ldr r0, _0222E5A4 ; =0x00002BA4
str r1, [r4, r0]
@ -16942,7 +16942,7 @@ _0222F7F6: ; jump table
.short _0222FB2C - _0222F7F6 - 2 ; case 30
_0222F834:
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [r0, #8]
ldr r0, _0222FB50 ; =0x00002BA4
str r1, [r4, r0]
@ -24546,7 +24546,7 @@ ov74_02233230: ; 0x02233230
mov r1, #0
bl sub_0200FBF4
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #0x10]
bl Sav2_PlayerData_GetProfileAddr

4
asm/overlay_75.s
View File

@ -29,7 +29,7 @@ ov75_02246960: ; 0x02246960
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #4]
bl Sav2_PlayerData_GetOptionsAddr
@ -825,7 +825,7 @@ ov75_02246F0C: ; 0x02246F0C
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
mov r0, #0x74
bl BgConfig_Alloc

2
asm/overlay_76.s
View File

@ -54,7 +54,7 @@ _021E5936:
str r0, [r2]
bl ov76_021E5DA4
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #0x10]
mov r0, #0
str r0, [r4, #0x14]

2
asm/overlay_78.s
View File

@ -21,7 +21,7 @@ ov78_021E5900: ; 0x021E5900
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
ldr r0, [r5]
bl Save_GetLeadMonIdxForBugContest

2
asm/overlay_81.s
View File

@ -41,7 +41,7 @@ ov81_0223DD60: ; 0x0223DD60
str r0, [r4, #0x4c]
str r5, [r4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r3, #0x6f
mov r2, #0xf
ldr r1, [r0]

2
asm/overlay_82.s
View File

@ -32,7 +32,7 @@ ov82_0223DD60: ; 0x0223DD60
str r0, [r5, #0x48]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
add r0, r5, #0
ldr r1, [r4]

4
asm/overlay_83.s
View File

@ -28,7 +28,7 @@ ov83_0223DD60: ; 0x0223DD60
str r0, [r5, #0x4c]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r1, [r4]
ldr r0, _0223DE48 ; =0x0000050C
@ -9985,7 +9985,7 @@ ov83_02242FE8: ; 0x02242FE8
str r0, [r5, #0x4c]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
mov r0, #0xaf
ldr r1, [r4]

2
asm/overlay_84.s
View File

@ -34,7 +34,7 @@ ov84_0223DD60: ; 0x0223DD60
str r0, [r1]
add r0, r4, #0
str r4, [r5]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
add r0, r5, #0
ldr r1, [r4]

4
asm/overlay_85.s
View File

@ -8,7 +8,7 @@ ov85_021E5900: ; 0x021E5900
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r5, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
mov r0, #1
add r1, r0, #0
@ -6453,7 +6453,7 @@ ov85_021E88AC: ; 0x021E88AC
sub sp, #0xc
add r5, r1, #0
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
ldr r0, [r5]
cmp r0, #0

2
asm/overlay_86.s
View File

@ -50,7 +50,7 @@ ov86_021E5900: ; 0x021E5900
bl BgConfig_Alloc
str r0, [r5, #0xc]
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
mov r0, #0x89
ldr r1, [r4]

2
asm/overlay_87.s
View File

@ -27,7 +27,7 @@ ov87_021E5900: ; 0x021E5900
str r0, [r4, #0x58]
add r0, r5, #0
str r5, [r4]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r1, #0x5a
add r2, r5, #0

6
asm/overlay_88.s
View File

@ -8,7 +8,7 @@ ov88_02258800: ; 0x02258800
push {r4, r5, lr}
sub sp, #0xc
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #5
add r5, r0, #0
mov r0, #3
@ -102,7 +102,7 @@ ov88_022588C4: ; 0x022588C4
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
ldr r0, [r5]
cmp r0, #4
@ -255,7 +255,7 @@ ov88_022589FC: ; 0x022589FC
bl OverlayManager_GetData
add r4, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r0, #2
lsl r0, r0, #8
add r0, r4, r0

2
asm/overlay_89.s
View File

@ -50,7 +50,7 @@ ov89_02258800: ; 0x02258800
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
ldr r0, [r0]
bl ov45_0222A2C8

6
asm/overlay_91.s
View File

@ -7,7 +7,7 @@
ov91_0225C540: ; 0x0225C540
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #3
mov r1, #0x6a
@ -48,7 +48,7 @@ ov91_0225C58C: ; 0x0225C58C
bl OverlayManager_GetData
add r4, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
add r0, r4, #0
add r0, #8
@ -588,7 +588,7 @@ ov91_0225C9EC: ; 0x0225C9EC
bl OverlayManager_GetData
add r6, r0, #0
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r4]
cmp r0, #0
beq _0225CA0A

2
asm/overlay_92.s
View File

@ -689,7 +689,7 @@ ov92_0225CAB4: ; 0x0225CAB4
str r0, [sp, #4]
bl memset
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, [sp, #4]
ldr r6, [sp, #4]
add r1, #0x88

6
asm/overlay_93_thumb_1.s
View File

@ -7,7 +7,7 @@
ov93_0225C540: ; 0x0225C540
push {r3, r4, r5, lr}
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #3
mov r1, #0x75
@ -36,7 +36,7 @@ ov93_0225C574: ; 0x0225C574
bl OverlayManager_GetData
add r5, r0, #0
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r6, r0, #0
add r0, r5, #0
bl ov93_0225C730
@ -348,7 +348,7 @@ ov93_0225C768: ; 0x0225C768
add r1, #0x98
str r0, [r1]
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
add r0, r5, #0
bl ov93_022626FC

2
asm/overlay_93_thumb_2.s
View File

@ -5435,7 +5435,7 @@ ov93_02262598: ; 0x02262598
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
mov r0, #1
pop {r3, r4, r5, pc}

2
asm/overlay_95.s
View File

@ -2609,7 +2609,7 @@ ov95_021E6D70: ; 0x021E6D70
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
ldr r0, [r0, #0x10]
bl Options_GetTextFrameDelay

2
asm/overlay_96.s
View File

@ -28,7 +28,7 @@ PokeathlonCourseApplication_OvyInit: ; 0x021E5900
lsl r0, r0, #2
str r1, [r4, r0]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r2, #0x7e
lsl r2, r2, #2
add r5, sp, #4

6
asm/overlay_97.s
View File

@ -103,7 +103,7 @@ _0221E66E:
cmp r0, #0
beq _0221E68A
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r1, r0, #0
add r0, r4, #0
bl ov97_0221E98C
@ -150,7 +150,7 @@ ov97_0221E69C: ; 0x0221E69C
ov97_0221E6DC: ; 0x0221E6DC
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
_0221E6E6:
add r0, r5, #0
@ -173,7 +173,7 @@ ov97_0221E700: ; 0x0221E700
push {r4, r5, r6, r7, lr}
sub sp, #0x24
add r4, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r7, r0, #0
add r0, r4, #0
mov r1, #0x34

8
asm/overlay_99.s
View File

@ -12,7 +12,7 @@ ov99_021E5900: ; 0x021E5900
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021E591C
bl GF_AssertFail
@ -1829,7 +1829,7 @@ ov99_021E677C: ; 0x021E677C
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021E6798
bl GF_AssertFail
@ -3993,7 +3993,7 @@ ov99_021E7818: ; 0x021E7818
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bl GX_DisableEngineBLayers
bl GX_DisableEngineALayers
@ -5363,7 +5363,7 @@ ov99_021E8304: ; 0x021E8304
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
bne _021E831E
bl GF_AssertFail

23
asm/overlay_trainer_card_main.s
View File

@ -1,3 +1,4 @@
#include "constants/sndseq.h"
.include "asm/macros.inc"
.include "global.inc"
@ -53,7 +54,7 @@ TrainerCardMainApp_OvyInit: ; 0x021E5AC0
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r1, r4, #0
add r1, #0xe4
str r0, [r1]
@ -203,7 +204,7 @@ _021E5C2C:
ldr r0, _021E5D6C ; =0x000033A0
add r0, r4, r0
bl ov51_021E7DA4
ldr r0, _021E5D70 ; =0x00000694
ldr r0, _021E5D70 ; =SEQ_SE_DP_CARD3
bl PlaySE
ldr r0, _021E5D74 ; =0x0000311C
add r0, r4, r0
@ -308,7 +309,7 @@ _021E5D60: .word 0x0000343A
_021E5D64: .word 0x00000678
_021E5D68: .word 0x00003424
_021E5D6C: .word 0x000033A0
_021E5D70: .word 0x00000694
_021E5D70: .word SEQ_SE_DP_CARD3
_021E5D74: .word 0x0000311C
_021E5D78: .word 0x000033CC
_021E5D7C: .word 0x00000674
@ -1671,7 +1672,7 @@ _021E68B0:
ldr r2, [r4, r0]
add r2, #0x80
str r2, [r4, r0]
ldr r0, _021E69DC ; =0x00000695
ldr r0, _021E69DC ; =SEQ_SE_DP_CARD5
bl PlaySE
ldr r0, _021E69D4 ; =0x00003436
ldrb r1, [r4, r0]
@ -1807,7 +1808,7 @@ _021E69C4:
nop
_021E69D4: .word 0x00003436
_021E69D8: .word 0x000030FC
_021E69DC: .word 0x00000695
_021E69DC: .word SEQ_SE_DP_CARD5
_021E69E0: .word 0x00003394
_021E69E4: .word 0x000030F4
_021E69E8: .word 0x0000343A
@ -1878,7 +1879,7 @@ ov51_021E6A54: ; 0x021E6A54
lsl r0, r0, #0x1e
lsr r0, r0, #0x1f
bne _021E6A8E
ldr r0, _021E6AA8 ; =0x000005DC
ldr r0, _021E6AA8 ; =SEQ_SE_DP_SELECT
bl PlaySE
mov r0, #4
pop {r3, pc}
@ -1886,7 +1887,7 @@ _021E6A7C:
mov r0, #2
tst r0, r1
beq _021E6A8E
mov r0, #0x25
mov r0, #SEQ_SE_GS_GEARCANCEL>>6
lsl r0, r0, #6
bl PlaySE
mov r0, #5
@ -1904,7 +1905,7 @@ _021E6A98:
_021E6A9C: .word gSystem
_021E6AA0: .word 0x000030F4
_021E6AA4: .word 0x0000343A
_021E6AA8: .word 0x000005DC
_021E6AA8: .word SEQ_SE_DP_SELECT
thumb_func_end ov51_021E6A54
thumb_func_start ov51_021E6AAC
@ -1924,7 +1925,7 @@ _021E6ABE:
beq _021E6AD8
mov r0, #1
str r0, [r4]
mov r0, #0x25
mov r0, #SEQ_SE_GS_GEARCANCEL>>6
lsl r0, r0, #6
bl PlaySE
mov r0, #5
@ -1945,7 +1946,7 @@ _021E6AD8:
beq _021E6B02
mov r0, #1
str r0, [r4]
ldr r0, _021E6B38 ; =0x000005DC
ldr r0, _021E6B38 ; =SEQ_SE_DP_SELECT
bl PlaySE
mov r0, #4
pop {r3, r4, r5, pc}
@ -1974,7 +1975,7 @@ _021E6B28: .word _021E7DB8
_021E6B2C: .word 0x000030F4
_021E6B30: .word 0x0000343A
_021E6B34: .word ov51_021E7DBC
_021E6B38: .word 0x000005DC
_021E6B38: .word SEQ_SE_DP_SELECT
_021E6B3C: .word ov51_021E7DC0
_021E6B40: .word gSystem + 0x40
thumb_func_end ov51_021E6AAC

6
asm/overlay_trainer_card_signature.s
View File

@ -90,17 +90,17 @@ _021E80D6:
add r3, r0, #0
bl sub_0200FA24
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
bl Save_TranerCard_get
bl TrainerCard_GetSignature
ldr r1, _021E8238 ; =0x00005B98
str r0, [r4, r1]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
bl Sav2_GameStats_get
str r0, [r4, #8]
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
bl Sav2_PlayerData_GetOptionsAddr
str r0, [r4, #0xc]
add r0, r4, #0

2
asm/unk_02019014.s
View File

@ -434,7 +434,7 @@ sub_020192D0: ; 0x020192D0
add r5, r0, #0
bl MI_CpuFill8
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r5]
ldr r1, _02019358 ; =0x0000047D
mov r0, #0xb

2
asm/unk_0203DE74.s
View File

@ -21,7 +21,7 @@ _021D4158:
sub_0203DE74: ; 0x0203DE74
push {r3, r4, r5, lr}
add r5, r0, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
add r0, r5, #0
bl sub_0203DFE0

2
asm/unk_020658D4.s
View File

@ -190,7 +190,7 @@ sub_020659CC: ; 0x020659CC
add r0, r4, #0
add r0, #0xec ; ->followMon.unk8
str r1, [r0]
add r4, #0xf0 ; ->followMon.unkC
add r4, #0xf0 ; ->followMon.parentData
add r0, r5, #0
str r1, [r4]
bl MapObject_GetCurrentX

2
asm/unk_02078E30.s
View File

@ -1703,7 +1703,7 @@ sub_02079BD8: ; 0x02079BD8
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r1, _02079CC8 ; =0x00000654
str r0, [r4, r1]
mov r0, #0xc

10
asm/unk_02082908.s
View File

@ -108,7 +108,7 @@ _0208291E:
ldr r0, [r4, r0]
bl sub_020831A4
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r1, r0, #0
add r0, r4, #0
bl sub_02083160
@ -743,7 +743,7 @@ sub_02082EE8: ; 0x02082EE8
bl OverlayManager_GetData
add r4, r0, #0
ldr r0, [sp, #0x10]
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #0x56
lsl r0, r0, #2
@ -1253,7 +1253,7 @@ sub_02083334: ; 0x02083334
sub sp, #0x10
add r4, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r7, r0, #0
ldr r0, _020834E4 ; =0x0000045C
mov r1, #4
@ -1468,7 +1468,7 @@ sub_020834FC: ; 0x020834FC
sub sp, #0x14
add r5, r0, #0
add r0, r1, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r4, r0, #0
ldr r0, [r4, #0x44]
cmp r0, #0
@ -2993,7 +2993,7 @@ _02084122:
add r0, r5, r0
bl sub_02083F18
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x46
lsl r1, r1, #2
ldrh r2, [r5, r1]

2
asm/unk_020850F4.s
View File

@ -32,7 +32,7 @@ sub_020850F4: ; 0x020850F4
add r4, r0, #0
bl memset
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
add r5, r0, #0
mov r0, #0xee
lsl r0, r0, #2

4
asm/unk_02087A78.s
View File

@ -17,7 +17,7 @@
thumb_func_start sub_02087A78
sub_02087A78: ; 0x02087A78
push {r3, lr}
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #0x14]
pop {r3, pc}
.balign 4, 0
@ -50,7 +50,7 @@ sub_02087A8C: ; 0x02087A8C
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4, #0x28]
ldr r0, [r0, #0xc]
ldr r1, _02087B00 ; =0x00004170

2
asm/unk_02088288.s
View File

@ -83,7 +83,7 @@ sub_02088298: ; 0x02088298
add r4, r0, #0
bl memset
add r0, r6, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
mov r1, #0x8b
lsl r1, r1, #2
str r0, [r4, r1]

2
asm/unk_020915B0.s
View File

@ -97,7 +97,7 @@ sub_02091634: ; 0x02091634
lsl r2, r2, #0xc
bl CreateHeap
add r0, r4, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
mov r1, #0x30
bl sub_020915F0

2
asm/unk_02091CDC.s
View File

@ -30,7 +30,7 @@ App_DeleteSave_Init: ; 0x02091CDC
mov r0, #0
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #0x30]
mov r0, #1

2
asm/unk_020921A4.s
View File

@ -30,7 +30,7 @@ sub_020921A4: ; 0x020921A4
mov r0, #0
str r0, [r4, #4]
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
ldr r0, [r0, #8]
str r0, [r4, #0x34]
mov r0, #1

2
asm/unk_020965A4.s
View File

@ -26,7 +26,7 @@ sub_020965A4: ; 0x020965A4
add r0, r4, #0
bl sub_02096884
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
cmp r0, #0
bne _020965DC

2
asm/unk_02097B78.s
View File

@ -26,7 +26,7 @@ sub_02097B78: ; 0x02097B78
add r4, r0, #0
bl MI_CpuFill8
add r0, r5, #0
bl OverlayManager_GetField18
bl OverlayManager_GetParentWork
str r0, [r4]
mov r0, #1
pop {r3, r4, r5, pc}

2
global.inc
View File

@ -1284,7 +1284,7 @@
.public OverlayManager_CreateAndGetData
.public OverlayManager_FreeData
.public OverlayManager_GetData
.public OverlayManager_GetField18
.public OverlayManager_GetParentWork
.public OverlayManager_delete
.public OverlayManager_new
.public OverlayManager_run

6
include/overlay_manager.h
View File

@ -21,18 +21,18 @@ struct OVY_MANAGER {
OVY_MGR_TEMPLATE template;
int exec_state;
int proc_state;
void *unk_18;
void *parentWork;
void *data;
u32 unk_20;
u32 unk_24;
};
OVY_MANAGER *OverlayManager_new(const OVY_MGR_TEMPLATE *template, void *a1, HeapID heapId);
OVY_MANAGER *OverlayManager_new(const OVY_MGR_TEMPLATE *template, void *parentWork, HeapID heapId);
void OverlayManager_delete(OVY_MANAGER *man);
void *OverlayManager_CreateAndGetData(OVY_MANAGER *man, u32 size, HeapID heapId);
void *OverlayManager_GetData(OVY_MANAGER *man);
void OverlayManager_FreeData(OVY_MANAGER *man);
void *OverlayManager_GetField18(OVY_MANAGER *man);
void *OverlayManager_GetParentWork(OVY_MANAGER *man);
BOOL OverlayManager_run(OVY_MANAGER *man);
#endif //POKEHEARTGOLD_OVERLAY_MANAGER_H

6
include/overlay_trainer_card.h
View File

@ -8,9 +8,9 @@
typedef struct {
u8 unk0[4];
u8 unk4a:4;
u8 unk4b:1;
u8 signatureExists:1;
u8 unk5[0x63];
u8 unk68[0x600];
u8 signature[0x600];
u8 unk668[6];
SAVEDATA *saveData;
u32 reqUpdateSignature;
@ -20,7 +20,7 @@ typedef struct {
HeapID heap_id;
u8 unk4[4];
OVY_MANAGER *ov_mgr;
Ov50_021E5A3C *unkC;
Ov50_021E5A3C *parentData;
void *unk10;
} TrainerCardAppState;

8
src/overlay_manager.c
View File

@ -1,13 +1,13 @@
#include "overlay_manager.h"
OVY_MANAGER *OverlayManager_new(const OVY_MGR_TEMPLATE *template, void *a1, HeapID heapId) {
OVY_MANAGER *OverlayManager_new(const OVY_MGR_TEMPLATE *template, void *parentWork, HeapID heapId) {
OVY_MANAGER *ret;
ret = AllocFromHeap(heapId, sizeof(OVY_MANAGER));
ret->template = *template;
ret->exec_state = 0;
ret->proc_state = 0;
ret->unk_18 = a1;
ret->parentWork = parentWork;
ret->data = NULL;
ret->unk_20 = 0;
ret->unk_24 = 0;
@ -35,8 +35,8 @@ void OverlayManager_FreeData(OVY_MANAGER *man) {
man->data = NULL;
}
void *OverlayManager_GetField18(OVY_MANAGER *man) {
return man->unk_18;
void *OverlayManager_GetParentWork(OVY_MANAGER *man) {
return man->parentWork;
}
BOOL OverlayManager_run(OVY_MANAGER *man) {

38
src/overlay_trainer_card.c
View File

@ -17,10 +17,10 @@ enum {
};
static BOOL isSubprocFinished(OVY_MANAGER **man);
static int TCardAppRunStep_Init(TrainerCardAppState *a0);
static int TCardAppRunStep_Exec(TrainerCardAppState *a0);
static int TCardAppRunStep_SignatureInit(TrainerCardAppState *a0);
static int TCardAppRunStep_SignatureExec(TrainerCardAppState *a0);
static int TCardAppRunStep_Init(TrainerCardAppState *work);
static int TCardAppRunStep_Exec(TrainerCardAppState *work);
static int TCardAppRunStep_SignatureInit(TrainerCardAppState *work);
static int TCardAppRunStep_SignatureExec(TrainerCardAppState *work);
static BOOL isSubprocFinished(OVY_MANAGER **man) {
if (*man && OverlayManager_run(*man)) {
@ -32,14 +32,14 @@ static BOOL isSubprocFinished(OVY_MANAGER **man) {
}
BOOL TrainerCardApp_OvyInit(OVY_MANAGER *man, int *state) {
void *ptr = OverlayManager_GetField18(man);
void *ptr = OverlayManager_GetParentWork(man);
CreateHeap(3, HEAP_ID_TRAINER_CARD, 0x1000);
TrainerCardAppState *data = OverlayManager_CreateAndGetData(man, sizeof(TrainerCardAppState), HEAP_ID_TRAINER_CARD);
MI_CpuFill8(data, 0, sizeof(TrainerCardAppState));
data->heap_id = HEAP_ID_TRAINER_CARD;
data->unkC = ptr;
data->parentData = ptr;
data->unk10 = ptr;
return TRUE;
}
@ -75,7 +75,7 @@ BOOL TrainerCardApp_OvyExit(OVY_MANAGER *man, int *state) {
return TRUE;
}
static int TCardAppRunStep_Init(TrainerCardAppState *a0) {
static int TCardAppRunStep_Init(TrainerCardAppState *work) {
static const OVY_MGR_TEMPLATE template = {
TrainerCardMainApp_OvyInit,
TrainerCardMainApp_OvyExec,
@ -83,39 +83,39 @@ static int TCardAppRunStep_Init(TrainerCardAppState *a0) {
FS_OVERLAY_ID(OVY_51)
};
a0->ov_mgr = OverlayManager_new(&template, a0->unkC, a0->heap_id);
work->ov_mgr = OverlayManager_new(&template, work->parentData, work->heap_id);
return TRAINERCARD_RUN_EXEC;
}
static int TCardAppRunStep_Exec(TrainerCardAppState *a0) {
if (!isSubprocFinished(&a0->ov_mgr)) {
static int TCardAppRunStep_Exec(TrainerCardAppState *work) {
if (!isSubprocFinished(&work->ov_mgr)) {
return TRAINERCARD_RUN_EXEC;
} else if (a0->unkC->reqUpdateSignature != 0) {
} else if (work->parentData->reqUpdateSignature != 0) {
return TRAINERCARD_RUN_SIGNATURE_INIT;
} else {
return TRAINERCARD_RUN_EXIT;
}
}
static int TCardAppRunStep_SignatureInit(TrainerCardAppState *a0) {
static int TCardAppRunStep_SignatureInit(TrainerCardAppState *work) {
const OVY_MGR_TEMPLATE template = {
SignBackOfTrainerCardApp_OvyInit,
SignBackOfTrainerCardApp_OvyExec,
SignBackOfTrainerCardApp_OvyExit,
FS_OVERLAY_ID(OVY_52)
};
a0->ov_mgr = OverlayManager_new(&template, a0->unkC->saveData, a0->heap_id);
work->ov_mgr = OverlayManager_new(&template, work->parentData->saveData, work->heap_id);
return TRAINERCARD_RUN_SIGNATURE_EXEC;
}
static int TCardAppRunStep_SignatureExec(TrainerCardAppState *a0) {
void *ptr;
if (!isSubprocFinished(&a0->ov_mgr)) {
static int TCardAppRunStep_SignatureExec(TrainerCardAppState *work) {
struct SaveTrainerCard *ptr;
if (!isSubprocFinished(&work->ov_mgr)) {
return TRAINERCARD_RUN_SIGNATURE_EXEC;
}
ptr = Save_TranerCard_get(a0->unkC->saveData);
a0->unkC->unk4b = TrainerCard_SignatureExists(ptr);
MI_CpuCopy8(TrainerCard_GetSignature(ptr), a0->unkC->unk68, sizeof(a0->unkC->unk68));
ptr = Save_TranerCard_get(work->parentData->saveData);
work->parentData->signatureExists = TrainerCard_SignatureExists(ptr);
MI_CpuCopy8(TrainerCard_GetSignature(ptr), work->parentData->signature, sizeof(work->parentData->signature));
return TRAINERCARD_RUN_INIT;
}