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

Resolve hardcoded overlay ID pool references

Browse Source
This commit is contained in:
PikalaxALT 2021-08-06 14:22:29 -04:00
parent bcd8962687
commit d30551fc72
11 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/overlay_02.s
View File

@ -3152,7 +3152,7 @@ ov02_02247444: ; 0x02247444
ov02_02247460: ; 0x02247460
push {r4, r5, r6, r7, lr}
sub sp, #0xc
ldr r7, _02247498 ; =0x00000018
ldr r7, _02247498 ; =SDK_OVERLAY_OVY_24_ID
add r5, r0, #0
add r6, r1, #0
add r0, r7, #0
@ -3176,7 +3176,7 @@ ov02_02247460: ; 0x02247460
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
_02247498: .word 0x00000018
_02247498: .word SDK_OVERLAY_OVY_24_ID
thumb_func_end ov02_02247460
thumb_func_start ov02_0224749C

60
asm/overlay_12.s
View File

@ -160,10 +160,10 @@ _022379EE:
str r0, [r4]
b _02237AFA
_022379F4:
ldr r0, _02237B04 ; =0x00000006
ldr r0, _02237B04 ; =SDK_OVERLAY_OVY_6_ID
mov r1, #2
bl HandleLoadOverlay
ldr r0, _02237B08 ; =0x00000007
ldr r0, _02237B08 ; =SDK_OVERLAY_OVY_7_ID
mov r1, #2
bl HandleLoadOverlay
add r0, r6, #0
@ -288,8 +288,8 @@ _02237AFA:
pop {r3, r4, r5, r6, pc}
.align 2, 0
_02237B00: .word SDK_OVERLAY_OVY_5_ID
_02237B04: .word 0x00000006
_02237B08: .word 0x00000007
_02237B04: .word SDK_OVERLAY_OVY_6_ID
_02237B08: .word SDK_OVERLAY_OVY_7_ID
thumb_func_end ov12_022378C0
thumb_func_start ov12_02237B0C
@ -315,23 +315,23 @@ ov12_02237B0C: ; 0x02237B0C
ldrb r0, [r4, r0]
cmp r0, #0
bne _02237B46
ldr r0, _02237B60 ; =0x00000007
ldr r0, _02237B60 ; =SDK_OVERLAY_OVY_7_ID
bl UnloadOverlayByID
b _02237B4C
_02237B46:
ldr r0, _02237B64 ; =0x0000000A
ldr r0, _02237B64 ; =SDK_OVERLAY_OVY_10_ID
bl UnloadOverlayByID
_02237B4C:
ldr r0, _02237B68 ; =0x00000008
ldr r0, _02237B68 ; =SDK_OVERLAY_OVY_8_ID
mov r1, #2
bl HandleLoadOverlay
pop {r4, pc}
nop
_02237B58: .word 0x000023FF
_02237B5C: .word 0x00002445
_02237B60: .word 0x00000007
_02237B64: .word 0x0000000A
_02237B68: .word 0x00000008
_02237B60: .word SDK_OVERLAY_OVY_7_ID
_02237B64: .word SDK_OVERLAY_OVY_10_ID
_02237B68: .word SDK_OVERLAY_OVY_8_ID
thumb_func_end ov12_02237B0C
thumb_func_start ov12_02237B6C
@ -372,18 +372,18 @@ ov12_02237BB8: ; 0x02237BB8
push {r4, r5, r6, lr}
sub sp, #8
add r5, r0, #0
ldr r0, _02237CB0 ; =0x00000008
ldr r0, _02237CB0 ; =SDK_OVERLAY_OVY_8_ID
bl UnloadOverlayByID
ldr r0, _02237CB4 ; =0x00002445
ldrb r0, [r5, r0]
cmp r0, #0
bne _02237BD6
ldr r0, _02237CB8 ; =0x00000007
ldr r0, _02237CB8 ; =SDK_OVERLAY_OVY_7_ID
mov r1, #2
bl HandleLoadOverlay
b _02237BDE
_02237BD6:
ldr r0, _02237CBC ; =0x0000000A
ldr r0, _02237CBC ; =SDK_OVERLAY_OVY_10_ID
mov r1, #2
bl HandleLoadOverlay
_02237BDE:
@ -472,10 +472,10 @@ _02237BDE:
add sp, #8
pop {r4, r5, r6, pc}
.align 2, 0
_02237CB0: .word 0x00000008
_02237CB0: .word SDK_OVERLAY_OVY_8_ID
_02237CB4: .word 0x00002445
_02237CB8: .word 0x00000007
_02237CBC: .word 0x0000000A
_02237CB8: .word SDK_OVERLAY_OVY_7_ID
_02237CBC: .word SDK_OVERLAY_OVY_10_ID
_02237CC0: .word 0x000023FF
thumb_func_end ov12_02237BB8
@ -727,23 +727,23 @@ _02237EE2:
cmp r4, #0
strb r4, [r5, r0]
bne _02237EFA
ldr r0, _02237F10 ; =0x0000000A
ldr r0, _02237F10 ; =SDK_OVERLAY_OVY_10_ID
bl UnloadOverlayByID
ldr r0, _02237F14 ; =0x00000007
ldr r0, _02237F14 ; =SDK_OVERLAY_OVY_7_ID
mov r1, #2
bl HandleLoadOverlay
pop {r3, r4, r5, pc}
_02237EFA:
ldr r0, _02237F14 ; =0x00000007
ldr r0, _02237F14 ; =SDK_OVERLAY_OVY_7_ID
bl UnloadOverlayByID
ldr r0, _02237F10 ; =0x0000000A
ldr r0, _02237F10 ; =SDK_OVERLAY_OVY_10_ID
mov r1, #2
bl HandleLoadOverlay
pop {r3, r4, r5, pc}
nop
_02237F0C: .word 0x00002445
_02237F10: .word 0x0000000A
_02237F14: .word 0x00000007
_02237F10: .word SDK_OVERLAY_OVY_10_ID
_02237F14: .word SDK_OVERLAY_OVY_7_ID
thumb_func_end ov12_02237ED0
thumb_func_start ov12_02237F18
@ -1666,14 +1666,14 @@ _02238748:
_02238756:
add r0, r4, #0
bl sub_0201AB0C
ldr r0, _022387A0 ; =0x00000006
ldr r0, _022387A0 ; =SDK_OVERLAY_OVY_6_ID
bl UnloadOverlayByID
ldr r0, _022387A4 ; =0x00000007
ldr r0, _022387A4 ; =SDK_OVERLAY_OVY_7_ID
bl UnloadOverlayByID
bl sub_02039998
cmp r0, #0
bne _02238776
ldr r0, _022387A8 ; =0x00000012
ldr r0, _022387A8 ; =SDK_OVERLAY_OVY_18_ID
bl UnloadOverlayByID
_02238776:
pop {r3, r4, r5, r6, r7, pc}
@ -1688,9 +1688,9 @@ _02238790: .word 0x00002478
_02238794: .word 0x000023FD
_02238798: .word 0x00002434
_0223879C: .word 0x00000704
_022387A0: .word 0x00000006
_022387A4: .word 0x00000007
_022387A8: .word 0x00000012
_022387A0: .word SDK_OVERLAY_OVY_6_ID
_022387A4: .word SDK_OVERLAY_OVY_7_ID
_022387A8: .word SDK_OVERLAY_OVY_18_ID
thumb_func_end ov12_0223843C
thumb_func_start ov12_022387AC
@ -3922,13 +3922,13 @@ ov12_022399BC: ; 0x022399BC
bl sub_02039998
cmp r0, #0
bne _022399CE
ldr r0, _022399D0 ; =0x00000012
ldr r0, _022399D0 ; =SDK_OVERLAY_OVY_18_ID
mov r1, #2
bl HandleLoadOverlay
_022399CE:
pop {r3, pc}
.align 2, 0
_022399D0: .word 0x00000012
_022399D0: .word SDK_OVERLAY_OVY_18_ID
thumb_func_end ov12_022399BC
thumb_func_start ov12_022399D4

8
asm/overlay_14.s
View File

@ -6658,7 +6658,7 @@ ov14_021E8ACC: ; 0x021E8ACC
ldr r0, [r4, #0x18]
ldr r1, [r1]
bl sub_0207789C
ldr r0, _021E8B14 ; =0x0000000F
ldr r0, _021E8B14 ; =SDK_OVERLAY_OVY_15_ID
mov r1, #2
bl HandleLoadOverlay
ldr r0, _021E8B18 ; =0x022008B8
@ -6671,7 +6671,7 @@ ov14_021E8ACC: ; 0x021E8ACC
pop {r3, r4, pc}
.align 2, 0
_021E8B10: .word 0x021F7D14
_021E8B14: .word 0x0000000F
_021E8B14: .word SDK_OVERLAY_OVY_15_ID
_021E8B18: .word 0x022008B8
thumb_func_end ov14_021E8ACC
@ -6679,7 +6679,7 @@ _021E8B18: .word 0x022008B8
ov14_021E8B1C: ; 0x021E8B1C
push {r4, lr}
add r4, r0, #0
ldr r0, _021E8B38 ; =0x0000000F
ldr r0, _021E8B38 ; =SDK_OVERLAY_OVY_15_ID
bl UnloadOverlayByID
ldr r0, [r4, #0x18]
bl sub_02077904
@ -6689,7 +6689,7 @@ ov14_021E8B1C: ; 0x021E8B1C
mov r0, #0
pop {r4, pc}
.align 2, 0
_021E8B38: .word 0x0000000F
_021E8B38: .word SDK_OVERLAY_OVY_15_ID
thumb_func_end ov14_021E8B1C
thumb_func_start ov14_021E8B3C

8
asm/overlay_16.s
View File

@ -783,7 +783,7 @@ _02201968:
ov16_0220196C: ; 0x0220196C
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, _022019B4 ; =0x00000011
ldr r0, _022019B4 ; =SDK_OVERLAY_OVY_17_ID
mov r1, #2
bl HandleLoadOverlay
bl ov17_02201BC0
@ -810,7 +810,7 @@ ov16_0220196C: ; 0x0220196C
mov r0, #1
pop {r3, r4, r5, pc}
nop
_022019B4: .word 0x00000011
_022019B4: .word SDK_OVERLAY_OVY_17_ID
thumb_func_end ov16_0220196C
thumb_func_start ov16_022019B8
@ -870,12 +870,12 @@ ov16_02201A04: ; 0x02201A04
bl sub_02007294
mov r0, #0x82
bl sub_0201A9C4
ldr r0, _02201A30 ; =0x00000011
ldr r0, _02201A30 ; =SDK_OVERLAY_OVY_17_ID
bl UnloadOverlayByID
mov r0, #1
pop {r3, r4, r5, pc}
nop
_02201A30: .word 0x00000011
_02201A30: .word SDK_OVERLAY_OVY_17_ID
thumb_func_end ov16_02201A04
thumb_func_start ov16_02201A34

4
asm/overlay_30.s
View File

@ -134,7 +134,7 @@ ov30_0225D64C: ; 0x0225D64C
add r5, r0, #0
add r0, r6, #0
bl sub_0201F988
ldr r7, _0225D6EC ; =0x0000007B
ldr r7, _0225D6EC ; =SDK_OVERLAY_OVY_123_ID
add r4, r0, #0
mov r0, #0
add r1, r7, #0
@ -194,7 +194,7 @@ _0225D6E2:
bl FS_UnloadOverlay
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0225D6EC: .word 0x0000007B
_0225D6EC: .word SDK_OVERLAY_OVY_123_ID
_0225D6F0: .word ov30_0225DC28
_0225D6F4: .word ov30_0225DC08
_0225D6F8: .word ov30_0225DC18

16
asm/overlay_44.s
View File

@ -883,7 +883,7 @@ _0222A510:
lsl r2, r1, #9
bl sub_0201A910
_0222A51A:
ldr r0, _0222A608 ; =0x0000002A
ldr r0, _0222A608 ; =SDK_OVERLAY_OVY_42_ID
mov r1, #2
bl HandleLoadOverlay
ldr r0, [r4, #4]
@ -990,7 +990,7 @@ _0222A600:
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
_0222A608: .word 0x0000002A
_0222A608: .word SDK_OVERLAY_OVY_42_ID
thumb_func_end ov44_0222A4B4
thumb_func_start ov44_0222A60C
@ -1139,13 +1139,13 @@ _0222A6F0:
lsl r0, r0, #2
ldr r0, [r5, r0]
bl sub_0200BDA0
ldr r0, _0222A754 ; =0x0000002A
ldr r0, _0222A754 ; =SDK_OVERLAY_OVY_42_ID
bl UnloadOverlayByID
pop {r3, r4, r5, r6, r7, pc}
nop
_0222A74C: .word 0x00000D68
_0222A750: .word 0x00000B0C
_0222A754: .word 0x0000002A
_0222A754: .word SDK_OVERLAY_OVY_42_ID
thumb_func_end ov44_0222A68C
thumb_func_start ov44_0222A758
@ -18243,7 +18243,7 @@ ov44_02232EA8: ; 0x02232EA8
add r4, r0, #0
bl sub_020072A4
add r5, r0, #0
ldr r0, _02232F5C ; =0x0000002A
ldr r0, _02232F5C ; =SDK_OVERLAY_OVY_42_ID
mov r1, #2
bl HandleLoadOverlay
bl sub_02039998
@ -18312,7 +18312,7 @@ _02232EC6:
strb r0, [r4]
pop {r3, r4, r5, pc}
nop
_02232F5C: .word 0x0000002A
_02232F5C: .word SDK_OVERLAY_OVY_42_ID
_02232F60: .word ov44_0223319C
thumb_func_end ov44_02232EA8
@ -18502,12 +18502,12 @@ ov44_022330A8: ; 0x022330A8
bl sub_0201A9C4
mov r0, #0x67
bl sub_0201A9C4
ldr r0, _022330FC ; =0x0000002A
ldr r0, _022330FC ; =SDK_OVERLAY_OVY_42_ID
bl UnloadOverlayByID
mov r0, #1
pop {r3, r4, r5, pc}
nop
_022330FC: .word 0x0000002A
_022330FC: .word SDK_OVERLAY_OVY_42_ID
thumb_func_end ov44_022330A8
thumb_func_start ov44_02233100

16
asm/overlay_57.s
View File

@ -6,16 +6,16 @@
thumb_func_start ov57_022378C0
ov57_022378C0: ; 0x022378C0
push {r3, lr}
ldr r0, _022378D4 ; =0x00000006
ldr r0, _022378D4 ; =SDK_OVERLAY_OVY_6_ID
mov r1, #2
bl HandleLoadOverlay
ldr r0, _022378D8 ; =0x00000007
ldr r0, _022378D8 ; =SDK_OVERLAY_OVY_7_ID
mov r1, #2
bl HandleLoadOverlay
pop {r3, pc}
.align 2, 0
_022378D4: .word 0x00000006
_022378D8: .word 0x00000007
_022378D4: .word SDK_OVERLAY_OVY_6_ID
_022378D8: .word SDK_OVERLAY_OVY_7_ID
thumb_func_end ov57_022378C0
thumb_func_start ov57_022378DC
@ -418,9 +418,9 @@ ov57_02237B20: ; 0x02237B20
bl sub_02021238
mov r0, #0x34
bl sub_0201A9C4
ldr r0, _02237CA0 ; =0x00000006
ldr r0, _02237CA0 ; =SDK_OVERLAY_OVY_6_ID
bl UnloadOverlayByID
ldr r0, _02237CA4 ; =0x00000007
ldr r0, _02237CA4 ; =SDK_OVERLAY_OVY_7_ID
bl UnloadOverlayByID
mov r0, #1
pop {r3, r4, r5, pc}
@ -428,8 +428,8 @@ ov57_02237B20: ; 0x02237B20
_02237C94: .word 0x00000458
_02237C98: .word 0x0000045C
_02237C9C: .word 0x0000040C
_02237CA0: .word 0x00000006
_02237CA4: .word 0x00000007
_02237CA0: .word SDK_OVERLAY_OVY_6_ID
_02237CA4: .word SDK_OVERLAY_OVY_7_ID
thumb_func_end ov57_02237B20
thumb_func_start ov57_02237CA8

8
asm/overlay_81.s
View File

@ -9,7 +9,7 @@ ov81_0223DD60: ; 0x0223DD60
sub sp, #8
add r5, r0, #0
add r6, r1, #0
ldr r0, _0223DE90 ; =0x00000050
ldr r0, _0223DE90 ; =SDK_OVERLAY_OVY_80_ID
mov r1, #2
bl HandleLoadOverlay
bl ov81_02240D2C
@ -143,7 +143,7 @@ _0223DE84:
add sp, #8
pop {r4, r5, r6, pc}
nop
_0223DE90: .word 0x00000050
_0223DE90: .word SDK_OVERLAY_OVY_80_ID
_0223DE94: .word 0x0000048C
_0223DE98: .word ov81_02242BC8
_0223DE9C: .word 0x00000464
@ -675,7 +675,7 @@ _0223E2CE:
bl sub_0201A0FC
mov r0, #0x64
bl sub_0201A9C4
ldr r0, _0223E314 ; =0x00000050
ldr r0, _0223E314 ; =SDK_OVERLAY_OVY_80_ID
bl UnloadOverlayByID
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
@ -683,7 +683,7 @@ _0223E2CE:
_0223E308: .word 0x00000478
_0223E30C: .word 0x0000046C
_0223E310: .word 0x00000464
_0223E314: .word 0x00000050
_0223E314: .word SDK_OVERLAY_OVY_80_ID
thumb_func_end ov81_0223E234
thumb_func_start ov81_0223E318

8
asm/overlay_82.s
View File

@ -8,7 +8,7 @@ ov82_0223DD60: ; 0x0223DD60
push {r4, r5, r6, lr}
add r4, r0, #0
add r6, r1, #0
ldr r0, _0223DE1C ; =0x00000050
ldr r0, _0223DE1C ; =SDK_OVERLAY_OVY_80_ID
mov r1, #2
bl HandleLoadOverlay
bl ov82_0223E9B0
@ -89,7 +89,7 @@ _0223DE0E:
mov r0, #1
pop {r4, r5, r6, pc}
.align 2, 0
_0223DE1C: .word 0x00000050
_0223DE1C: .word SDK_OVERLAY_OVY_80_ID
thumb_func_end ov82_0223DD60
thumb_func_start ov82_0223DE20
@ -282,13 +282,13 @@ ov82_0223DF74: ; 0x0223DF74
bl sub_0201A0FC
mov r0, #0x69
bl sub_0201A9C4
ldr r0, _0223DFB8 ; =0x00000050
ldr r0, _0223DFB8 ; =SDK_OVERLAY_OVY_80_ID
bl UnloadOverlayByID
mov r0, #1
pop {r4, pc}
nop
_0223DFB4: .word 0x04000304
_0223DFB8: .word 0x00000050
_0223DFB8: .word SDK_OVERLAY_OVY_80_ID
thumb_func_end ov82_0223DF74
thumb_func_start ov82_0223DFBC

8
asm/overlay_84.s
View File

@ -8,7 +8,7 @@ ov84_0223DD60: ; 0x0223DD60
push {r4, r5, r6, lr}
add r4, r0, #0
add r6, r1, #0
ldr r0, _0223DEAC ; =0x00000050
ldr r0, _0223DEAC ; =SDK_OVERLAY_OVY_80_ID
mov r1, #2
bl HandleLoadOverlay
bl ov84_0223E5C4
@ -158,7 +158,7 @@ _0223DE9E:
mov r0, #1
pop {r4, r5, r6, pc}
.align 2, 0
_0223DEAC: .word 0x00000050
_0223DEAC: .word SDK_OVERLAY_OVY_80_ID
_0223DEB0: .word 0x000003C2
_0223DEB4: .word 0x0223FA20
thumb_func_end ov84_0223DD60
@ -338,12 +338,12 @@ ov84_0223DFF0: ; 0x0223DFF0
bl sub_0201A0FC
mov r0, #0x6e
bl sub_0201A9C4
ldr r0, _0223E02C ; =0x00000050
ldr r0, _0223E02C ; =SDK_OVERLAY_OVY_80_ID
bl UnloadOverlayByID
mov r0, #1
pop {r3, r4, r5, pc}
.align 2, 0
_0223E02C: .word 0x00000050
_0223E02C: .word SDK_OVERLAY_OVY_80_ID
thumb_func_end ov84_0223DFF0
thumb_func_start ov84_0223E030

16
asm/overlay_96.s
View File

@ -16177,7 +16177,7 @@ _021ED1FC:
mov r1, #0x87
lsl r2, r2, #0x10
bl sub_0201A910
ldr r0, _021ED46C ; =0x00000062
ldr r0, _021ED46C ; =SDK_OVERLAY_OVY_98_ID
mov r1, #2
bl HandleLoadOverlay
mov r0, #0
@ -16438,7 +16438,7 @@ _021ED466:
add sp, #0x118
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_021ED46C: .word 0x00000062
_021ED46C: .word SDK_OVERLAY_OVY_98_ID
_021ED470: .word 0xFFFFE0FF
_021ED474: .word 0x04001000
_021ED478: .word 0x021D116C
@ -16503,7 +16503,7 @@ ov96_021ED48C: ; 0x021ED48C
mov r1, #0
strb r1, [r0, #9]
bl sub_02022D3C
ldr r0, _021ED520 ; =0x00000062
ldr r0, _021ED520 ; =SDK_OVERLAY_OVY_98_ID
bl UnloadOverlayByID
mov r0, #0x87
bl sub_0201A9C4
@ -16511,7 +16511,7 @@ ov96_021ED48C: ; 0x021ED48C
pop {r3, r4, r5, pc}
.align 2, 0
_021ED51C: .word 0x021D116C
_021ED520: .word 0x00000062
_021ED520: .word SDK_OVERLAY_OVY_98_ID
thumb_func_end ov96_021ED48C
thumb_func_start ov96_021ED524
@ -20352,7 +20352,7 @@ _021EF1EA:
mov r1, #0
strb r1, [r0, #9]
bl sub_02022D3C
ldr r0, _021EF238 ; =0x00000062
ldr r0, _021EF238 ; =SDK_OVERLAY_OVY_98_ID
bl UnloadOverlayByID
mov r0, #0x88
bl sub_0201A9C4
@ -20361,7 +20361,7 @@ _021EF1EA:
.align 2, 0
_021EF230: .word 0x0221BA18
_021EF234: .word 0x021D116C
_021EF238: .word 0x00000062
_021EF238: .word SDK_OVERLAY_OVY_98_ID
thumb_func_end ov96_021EF19C
thumb_func_start ov96_021EF23C
@ -20452,7 +20452,7 @@ ov96_021EF2C0: ; 0x021EF2C0
mov r1, #0x88
lsl r2, r2, #0x12
bl sub_0201A910
ldr r0, _021EF390 ; =0x00000062
ldr r0, _021EF390 ; =SDK_OVERLAY_OVY_98_ID
mov r1, #2
mov r6, #0x88
bl HandleLoadOverlay
@ -20533,7 +20533,7 @@ _021EF386:
str r0, [r4, #0x28]
pop {r4, r5, r6, pc}
.align 2, 0
_021EF390: .word 0x00000062
_021EF390: .word SDK_OVERLAY_OVY_98_ID
_021EF394: .word 0xFFFFE0FF
_021EF398: .word 0x04001000
_021EF39C: .word ov96_021EF23C