Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-13 20:26:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve pointers, part 10

Browse Source
This commit is contained in:
Nomura
2023-01-05 12:17:06 +01:00
parent 889f2a1313
commit d8dff06091
12 changed files with 733 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/overlay001/ov1_021D0D80.s
View File

@@ -14,7 +14,7 @@ ov1_021D0D80: ; 0x021D0D80
str r1, [r0, #4]
bx lr
nop
_021D0D8C: .word 0x021D0DA0
_021D0D8C: .word Unk_ov1_021D0DA0
thumb_func_end ov1_021D0D80
.section .sinit, 4

92
asm/overlay005/ov5_021DDBE8.s
View File

@@ -1,7 +1,39 @@
.include "macros/function.inc"
.include "overlay005/ov5_021DDBE8.inc"
.extern ov5_021E24A8
.extern ov5_021E2338
.extern ov5_021E261C
.extern ov5_021E2748
.extern ov5_021E2944
.extern ov5_021E2A4C
.extern ov5_021E2B54
.extern ov5_021E2EB0
.extern ov5_021E31A4
.extern ov5_021E3560
.extern ov5_021E3AD0
.extern ov5_021E3D8C
.extern ov5_021E5760
.extern ov5_021E5784
.extern ov5_021E57A8
.extern ov5_021E57CC
.extern ov5_021E57F0
.extern ov5_021E5814
.extern ov5_021E5838
.extern ov5_021E585C
.extern ov5_021E6178
.extern ov5_021E619C
.extern ov5_021E61C0
.extern ov5_021E61E4
.extern ov5_021E6208
.extern ov5_021E4E14
.extern ov5_021E4F7C
.extern ov5_021E4738
.extern ov5_021E4B3C
.extern ov5_021E4260
.extern ov5_021E44C0
.text
@@ -36,7 +68,7 @@ _021DDC1C:
str r0, [r4, #0x18]
pop {r4, r5, r6, pc}
nop
_021DDC24: .word 0x021F9A74
_021DDC24: .word Unk_ov5_021F9A74
thumb_func_end ov5_021DDBE8
thumb_func_start ov5_021DDC28
@@ -2751,7 +2783,7 @@ _021DEFC0:
bl sub_0200D9E8
pop {r4, pc}
; .align 2, 0
_021DF020: .word 0x02202120
_021DF020: .word Unk_ov5_02202120
_021DF024: .word 0x06840000
_021DF028: .word 0xC0320C04
_021DF02C: .word 0x04000064
@@ -2774,7 +2806,7 @@ _021DF046:
strb r1, [r0, #3]
pop {r3, pc}
; .align 2, 0
_021DF050: .word 0x02202120
_021DF050: .word Unk_ov5_02202120
thumb_func_end ov5_021DF038
thumb_func_start ov5_021DF054
@@ -2791,7 +2823,7 @@ _021DF062:
ldrb r0, [r0, #2]
pop {r3, pc}
nop
_021DF06C: .word 0x02202120
_021DF06C: .word Unk_ov5_02202120
thumb_func_end ov5_021DF054
thumb_func_start ov5_021DF070
@@ -2805,7 +2837,7 @@ ov5_021DF070: ; 0x021DF070
_021DF07E:
pop {r3, pc}
; .align 2, 0
_021DF080: .word 0x02202120
_021DF080: .word Unk_ov5_02202120
thumb_func_end ov5_021DF070
thumb_func_start ov5_021DF084
@@ -2840,7 +2872,7 @@ _021DF092:
str r1, [r0, #0]
pop {r3, pc}
; .align 2, 0
_021DF0C8: .word 0x02202120
_021DF0C8: .word Unk_ov5_02202120
thumb_func_end ov5_021DF084
thumb_func_start ov5_021DF0CC
@@ -2920,7 +2952,7 @@ _021DF128:
add sp, #8
pop {r3, r4, r5, pc}
nop
_021DF170: .word 0x02202120
_021DF170: .word Unk_ov5_02202120
_021DF174: .word ov5_021DF3E8
_021DF178: .word ov5_021DF414
thumb_func_end ov5_021DF0CC
@@ -2966,7 +2998,7 @@ _021DF1C2:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
_021DF1C8: .word 0x02202120
_021DF1C8: .word Unk_ov5_02202120
thumb_func_end ov5_021DF17C
thumb_func_start ov5_021DF1CC
@@ -2999,7 +3031,7 @@ _021DF1FE:
mov r0, #0
pop {r3, pc}
nop
_021DF204: .word 0x02202120
_021DF204: .word Unk_ov5_02202120
thumb_func_end ov5_021DF1CC
thumb_func_start ov5_021DF208
@@ -3017,7 +3049,7 @@ _021DF21C:
mov r0, #0
pop {r3, pc}
; .align 2, 0
_021DF220: .word 0x02202120
_021DF220: .word Unk_ov5_02202120
thumb_func_end ov5_021DF208
thumb_func_start ov5_021DF224
@@ -3045,7 +3077,7 @@ _021DF232:
str r2, [r0, #0xc]
pop {r3, pc}
; .align 2, 0
_021DF254: .word 0x02202120
_021DF254: .word Unk_ov5_02202120
thumb_func_end ov5_021DF224
thumb_func_start ov5_021DF258
@@ -3258,7 +3290,7 @@ _021DF402:
str r1, [r2, #0x10]
pop {r3, r4, r5, pc}
nop
_021DF410: .word 0x02202120
_021DF410: .word Unk_ov5_02202120
thumb_func_end ov5_021DF3E8
thumb_func_start ov5_021DF414
@@ -3283,7 +3315,7 @@ _021DF42E:
str r1, [r2, #0x14]
pop {r3, r4, r5, pc}
nop
_021DF43C: .word 0x02202120
_021DF43C: .word Unk_ov5_02202120
thumb_func_end ov5_021DF414
.rodata
@@ -3331,7 +3363,37 @@ Unk_ov5_021F9A4C: ; 0x021F9A4C
.global Unk_ov5_021F9A74
Unk_ov5_021F9A74: ; 0x021F9A74
.incbin "incbin/overlay5_rodata.bin", 0x1160, 0x7C
.word ov5_021E24A8
.word ov5_021E2338
.word ov5_021E261C
.word ov5_021E2748
.word ov5_021E2944
.word ov5_021E2A4C
.word ov5_021E2B54
.word ov5_021E2EB0
.word ov5_021E31A4
.word ov5_021E3560
.word ov5_021E3AD0
.word ov5_021E3D8C
.word ov5_021E5760
.word ov5_021E5784
.word ov5_021E57A8
.word ov5_021E57CC
.word ov5_021E57F0
.word ov5_021E5814
.word ov5_021E5838
.word ov5_021E585C
.word ov5_021E6178
.word ov5_021E619C
.word ov5_021E61C0
.word ov5_021E61E4
.word ov5_021E6208
.word ov5_021E4E14
.word ov5_021E4F7C
.word ov5_021E4738
.word ov5_021E4B3C
.word ov5_021E4260
.word ov5_021E44C0
.bss

12
asm/overlay005/ov5_021F2D20.s
View File

@@ -702,7 +702,11 @@ ov5_021F326C: ; 0x021F326C
.global Unk_ov5_022004EC
Unk_ov5_022004EC: ; 0x022004EC
.incbin "incbin/overlay5_rodata.bin", 0x7BD8, 0x7BEC - 0x7BD8
.incbin "incbin/overlay5_rodata.bin", 0x7BD8, 0x4
.word ov5_021F2F0C
.word ov5_021F2FA0
.word ov5_021F2FAC
.word ov5_021F308C
.global Unk_ov5_02200500
Unk_ov5_02200500: ; 0x02200500
@@ -710,7 +714,11 @@ Unk_ov5_02200500: ; 0x02200500
.global Unk_ov5_02200514
Unk_ov5_02200514: ; 0x02200514
.incbin "incbin/overlay5_rodata.bin", 0x7C00, 0x7C14 - 0x7C00
.incbin "incbin/overlay5_rodata.bin", 0x7C00, 0x4
.word ov5_021F31B4
.word ov5_021F3238
.word ov5_021F3244
.word ov5_021F326C
.global Unk_ov5_02200528
Unk_ov5_02200528: ; 0x02200528

18
asm/overlay005/ov5_021F5A10.s
View File

@@ -853,15 +853,27 @@ Unk_ov5_02200B7C: ; 0x02200B7C
.global Unk_ov5_02200B84
Unk_ov5_02200B84: ; 0x02200B84
.incbin "incbin/overlay5_rodata.bin", 0x8270, 0x8284 - 0x8270
.incbin "incbin/overlay5_rodata.bin", 0x8270, 0x4
.word ov5_021F5DE4
.word ov5_021F5D38
.word ov5_021F5E58
.word ov5_021F5D54
.global Unk_ov5_02200B98
Unk_ov5_02200B98: ; 0x02200B98
.incbin "incbin/overlay5_rodata.bin", 0x8284, 0x8298 - 0x8284
.incbin "incbin/overlay5_rodata.bin", 0x8284, 0x4
.word ov5_021F5C70
.word ov5_021F5D38
.word ov5_021F5CD4
.word ov5_021F5D54
.global Unk_ov5_02200BAC
Unk_ov5_02200BAC: ; 0x02200BAC
.incbin "incbin/overlay5_rodata.bin", 0x8298, 0x82AC - 0x8298
.incbin "incbin/overlay5_rodata.bin", 0x8298, 0x4
.word ov5_021F5EE0
.word ov5_021F5D38
.word ov5_021F5F24
.word ov5_021F5D54
.global Unk_ov5_02200BC0
Unk_ov5_02200BC0: ; 0x02200BC0

243
asm/overlay005/ov5_021FAF40.s
View File

@@ -1,10 +1,119 @@
.include "macros/function.inc"
.extern ov5_021EBA0C
.extern ov5_021EC3F0
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern sub_02067870
.extern sub_02067890
.extern sub_02067950
.extern sub_02067968
.extern sub_02067998
.extern ov5_021EBA0C
.extern ov5_021EBF50
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021ECA70
.extern ov5_021ECA90
.extern ov5_021ECABC
.extern ov5_021ECAC4
.extern ov5_021ECAF0
.extern ov5_021EBA0C
.extern ov5_021EC454
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021EC824
.extern ov5_021EC8EC
.extern ov5_021EC858
.extern ov5_021EC86C
.extern ov5_021EC898
.extern ov5_021EB2EC
.extern ov5_021EB398
.extern ov5_021EB314
.extern ov5_021EB328
.extern ov5_021EB354
.extern ov5_021EBA0C
.extern ov5_021EC4BC
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021EC734
.extern ov5_021EC75C
.extern ov5_021EC760
.extern ov5_021EC778
.extern ov5_021EC790
.extern ov5_021EBA0C
.extern ov5_021EC15C
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021EC938
.extern ov5_021EC9E8
.extern ov5_021EC95C
.extern ov5_021EC970
.extern ov5_021EC9A0
.extern ov5_021EB2EC
.extern ov5_021EB438
.extern ov5_021EB314
.extern ov5_021EB328
.extern ov5_021EB354
.extern ov5_021EC7B8
.extern ov5_021EC75C
.extern ov5_021EC760
.extern ov5_021EC778
.extern ov5_021EC7D0
.extern ov5_021EB7F8
.extern ov5_021EB8B8
.extern ov5_021EB834
.extern ov5_021EB848
.extern ov5_021EB874
.extern ov5_021EB2EC
.extern ov5_021EB944
.extern ov5_021EB314
.extern ov5_021EB328
.extern ov5_021EB354
.extern ov5_021EB2EC
.extern ov5_021EB720
.extern ov5_021EB314
.extern ov5_021EB328
.extern ov5_021EB354
.extern ov5_021EB2EC
.extern ov5_021EB40C
.extern ov5_021EB314
.extern ov5_021EB328
.extern ov5_021EB354
.extern ov5_021ECB34
.extern ov5_021ECB58
.extern ov5_021ECB78
.extern ov5_021ECAC4
.extern ov5_021ECAF0
.extern ov5_021EBA0C
.extern ov5_021EC5C0
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021EBA0C
.extern ov5_021EC554
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021EBA0C
.extern ov5_021EBAD0
.extern ov5_021EBA34
.extern ov5_021EBA60
.extern ov5_021EBA8C
.extern ov5_021ECE18
.extern ov5_021ECE30
.extern ov5_021ECE34
.extern ov5_021ECE38
.extern ov5_021ECE3C
.rodata
.global Unk_ov5_021FAF40
Unk_ov5_021FAF40: ; 0x021FAF40
.incbin "incbin/overlay5_rodata.bin", 0x262C, 0x2634 - 0x262C
@@ -19,87 +128,171 @@ Unk_ov5_021FAF50: ; 0x021FAF50
.global Unk_ov5_021FAF60
Unk_ov5_021FAF60: ; 0x021FAF60
.incbin "incbin/overlay5_rodata.bin", 0x264C, 0x2660 - 0x264C
.word ov5_021EBA0C
.word ov5_021EC3F0
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FAF74
Unk_ov5_021FAF74: ; 0x021FAF74
.incbin "incbin/overlay5_rodata.bin", 0x2660, 0x2674 - 0x2660
.word sub_02067870
.word sub_02067890
.word sub_02067950
.word sub_02067968
.word sub_02067998
.global Unk_ov5_021FAF88
Unk_ov5_021FAF88: ; 0x021FAF88
.incbin "incbin/overlay5_rodata.bin", 0x2674, 0x2688 - 0x2674
.word ov5_021EBA0C
.word ov5_021EBF50
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FAF9C
Unk_ov5_021FAF9C: ; 0x021FAF9C
.incbin "incbin/overlay5_rodata.bin", 0x2688, 0x269C - 0x2688
.word ov5_021ECA70
.word ov5_021ECA90
.word ov5_021ECABC
.word ov5_021ECAC4
.word ov5_021ECAF0
.global Unk_ov5_021FAFB0
Unk_ov5_021FAFB0: ; 0x021FAFB0
.incbin "incbin/overlay5_rodata.bin", 0x269C, 0x26B0 - 0x269C
.word ov5_021EBA0C
.word ov5_021EC454
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FAFC4
Unk_ov5_021FAFC4: ; 0x021FAFC4
.incbin "incbin/overlay5_rodata.bin", 0x26B0, 0x26C4 - 0x26B0
.word ov5_021EC824
.word ov5_021EC8EC
.word ov5_021EC858
.word ov5_021EC86C
.word ov5_021EC898
.global Unk_ov5_021FAFD8
Unk_ov5_021FAFD8: ; 0x021FAFD8
.incbin "incbin/overlay5_rodata.bin", 0x26C4, 0x26D8 - 0x26C4
.word ov5_021EB2EC
.word ov5_021EB398
.word ov5_021EB314
.word ov5_021EB328
.word ov5_021EB354
.global Unk_ov5_021FAFEC
Unk_ov5_021FAFEC: ; 0x021FAFEC
.incbin "incbin/overlay5_rodata.bin", 0x26D8, 0x26EC - 0x26D8
.word ov5_021EBA0C
.word ov5_021EC4BC
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FB000
Unk_ov5_021FB000: ; 0x021FB000
.incbin "incbin/overlay5_rodata.bin", 0x26EC, 0x2700 - 0x26EC
.word ov5_021EC734
.word ov5_021EC75C
.word ov5_021EC760
.word ov5_021EC778
.word ov5_021EC790
.global Unk_ov5_021FB014
Unk_ov5_021FB014: ; 0x021FB014
.incbin "incbin/overlay5_rodata.bin", 0x2700, 0x2714 - 0x2700
.word ov5_021EBA0C
.word ov5_021EC15C
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FB028
Unk_ov5_021FB028: ; 0x021FB028
.incbin "incbin/overlay5_rodata.bin", 0x2714, 0x2728 - 0x2714
.word ov5_021EC938
.word ov5_021EC9E8
.word ov5_021EC95C
.word ov5_021EC970
.word ov5_021EC9A0
.global Unk_ov5_021FB03C
Unk_ov5_021FB03C: ; 0x021FB03C
.incbin "incbin/overlay5_rodata.bin", 0x2728, 0x273C - 0x2728
.word ov5_021EB2EC
.word ov5_021EB438
.word ov5_021EB314
.word ov5_021EB328
.word ov5_021EB354
.global Unk_ov5_021FB050
Unk_ov5_021FB050: ; 0x021FB050
.incbin "incbin/overlay5_rodata.bin", 0x273C, 0x2750 - 0x273C
.word ov5_021EC7B8
.word ov5_021EC75C
.word ov5_021EC760
.word ov5_021EC778
.word ov5_021EC7D0
.global Unk_ov5_021FB064
Unk_ov5_021FB064: ; 0x021FB064
.incbin "incbin/overlay5_rodata.bin", 0x2750, 0x2764 - 0x2750
.word ov5_021EB7F8
.word ov5_021EB8B8
.word ov5_021EB834
.word ov5_021EB848
.word ov5_021EB874
.global Unk_ov5_021FB078
Unk_ov5_021FB078: ; 0x021FB078
.incbin "incbin/overlay5_rodata.bin", 0x2764, 0x2778 - 0x2764
.word ov5_021EB2EC
.word ov5_021EB944
.word ov5_021EB314
.word ov5_021EB328
.word ov5_021EB354
.global Unk_ov5_021FB08C
Unk_ov5_021FB08C: ; 0x021FB08C
.incbin "incbin/overlay5_rodata.bin", 0x2778, 0x278C - 0x2778
.word ov5_021EB2EC
.word ov5_021EB720
.word ov5_021EB314
.word ov5_021EB328
.word ov5_021EB354
.global Unk_ov5_021FB0A0
Unk_ov5_021FB0A0: ; 0x021FB0A0
.incbin "incbin/overlay5_rodata.bin", 0x278C, 0x27A0 - 0x278C
.word ov5_021EB2EC
.word ov5_021EB40C
.word ov5_021EB314
.word ov5_021EB328
.word ov5_021EB354
.global Unk_ov5_021FB0B4
Unk_ov5_021FB0B4: ; 0x021FB0B4
.incbin "incbin/overlay5_rodata.bin", 0x27A0, 0x27B4 - 0x27A0
.word ov5_021ECB34
.word ov5_021ECB58
.word ov5_021ECB78
.word ov5_021ECAC4
.word ov5_021ECAF0
.global Unk_ov5_021FB0C8
Unk_ov5_021FB0C8: ; 0x021FB0C8
.incbin "incbin/overlay5_rodata.bin", 0x27B4, 0x27C8 - 0x27B4
.word ov5_021EBA0C
.word ov5_021EC5C0
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FB0DC
Unk_ov5_021FB0DC: ; 0x021FB0DC
.incbin "incbin/overlay5_rodata.bin", 0x27C8, 0x27DC - 0x27C8
.word ov5_021EBA0C
.word ov5_021EC554
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FB0F0
Unk_ov5_021FB0F0: ; 0x021FB0F0
.incbin "incbin/overlay5_rodata.bin", 0x27DC, 0x27F0 - 0x27DC
.word ov5_021EBA0C
.word ov5_021EBAD0
.word ov5_021EBA34
.word ov5_021EBA60
.word ov5_021EBA8C
.global Unk_ov5_021FB104
Unk_ov5_021FB104: ; 0x021FB104
@@ -179,7 +372,11 @@ Unk_ov5_021FB3EC: ; 0x021FB3EC
.global Unk_ov5_021FB470
Unk_ov5_021FB470: ; 0x021FB470
.incbin "incbin/overlay5_rodata.bin", 0x2B5C, 0x2B70 - 0x2B5C
.word ov5_021ECE18
.word ov5_021ECE30
.word ov5_021ECE34
.word ov5_021ECE38
.word ov5_021ECE3C
.global Unk_ov5_021FB484
Unk_ov5_021FB484: ; 0x021FB484

244
asm/overlay012/ov12_02226998.s
View File

@@ -1,6 +1,125 @@
.include "macros/function.inc"
.extern ov12_02226B1C
.extern ov12_0222AE68
.extern ov12_0222FE30
.extern ov12_0222D56C
.extern ov12_02230CEC
.extern ov12_02231010
.extern ov12_022312A4
.extern ov12_02231650
.extern ov12_02231950
.extern ov12_02231C1C
.extern ov12_0222777C
.extern ov12_02232378
.extern ov12_022329E0
.extern ov12_02232CA8
.extern ov12_02233454
.extern ov12_02233734
.extern ov12_022339C4
.extern ov12_0222CC54
.extern ov12_02234008
.extern ov12_0222D7C0
.extern ov12_0222DB60
.extern ov12_0222DEFC
.extern ov12_0222E2F8
.extern ov12_0222E61C
.extern ov12_0222EC90
.extern ov12_0222A1AC
.extern ov12_0222A34C
.extern ov12_0222A410
.extern ov12_0222A5C0
.extern ov12_022346A4
.extern ov12_02234A10
.extern ov12_022348C8
.extern ov12_02234D98
.extern ov12_022269C0
.extern ov12_022269EC
.extern ov12_02226A3C
.extern ov12_02226A88
.extern ov12_02227408
.extern ov12_0222B194
.extern ov12_0222B45C
.extern ov12_0222B68C
.extern ov12_0222F770
.extern ov12_0222F9E4
.extern ov12_02227534
.extern ov12_022300C4
.extern ov12_022303D0
.extern ov12_0222B9E0
.extern ov12_0222BAE4
.extern ov12_0222BCF4
.extern ov12_0222BE48
.extern ov12_02230754
.extern ov12_02230804
.extern ov12_0222BFA8
.extern ov12_02230A8C
.extern ov12_0222C0C0
.extern ov12_0222C3C0
.extern ov12_02231444
.extern ov12_0222C5FC
.extern ov12_02231E7C
.extern ov12_0222C6D4
.extern ov12_0222C8F8
.extern ov12_0222CA2C
.extern ov12_0223249C
.extern ov12_022326AC
.extern ov12_02232024
.extern ov12_02233178
.extern ov12_02227828
.extern ov12_0222797C
.extern ov12_02227CBC
.extern ov12_02226CB0
.extern ov12_02233CD4
.extern ov12_02228168
.extern ov12_0222CB90
.extern ov12_02228214
.extern ov12_02233F30
.extern ov12_02227F30
.extern ov12_02234214
.extern ov12_02226EB0
.extern ov12_022271D8
.extern ov12_022342C4
.extern ov12_022344D0
.extern ov12_0223464C
.extern ov12_0222CFA0
.extern ov12_022282BC
.extern ov12_02228394
.extern ov12_02228520
.extern ov12_022287CC
.extern ov12_02228A0C
.extern ov12_0222E1A8
.extern ov12_02228B40
.extern ov12_02228C6C
.extern ov12_0222E810
.extern ov12_0222EAA0
.extern ov12_02228E00
.extern ov12_02228EC0
.extern ov12_022290DC
.extern ov12_022291AC
.extern ov12_02229304
.extern ov12_02229B28
.extern ov12_02229E54
.extern ov12_02229638
.extern ov12_02229810
.extern ov12_02229908
.extern ov12_0222EFB0
.extern ov12_0222F2F8
.extern ov12_0222A00C
.extern ov12_02229C5C
.extern ov12_0222A604
.extern ov12_0222A8F4
.extern ov12_0222AC40
.extern ov12_02228FB4
.extern ov12_0222AB50
.extern ov12_0222F5EC
.extern ov12_022351A4
.extern ov12_022351D0
.extern ov12_022351FC
.extern ov12_02235228
.text
@@ -17,7 +136,7 @@ _022269A0:
ldr r0, [r0, r1]
bx lr
; .align 2, 0
_022269A8: .word 0x02239EEC
_022269A8: .word Unk_ov12_02239EEC
thumb_func_end ov12_02226998
thumb_func_start ov12_022269AC
@@ -32,7 +151,7 @@ _022269B4:
ldr r0, [r0, r1]
bx lr
; .align 2, 0
_022269BC: .word 0x02239E68
_022269BC: .word Unk_ov12_02239E68
thumb_func_end ov12_022269AC
.rodata
@@ -44,9 +163,124 @@ Unk_ov12_02239E64: ; 0x02239E64
.global Unk_ov12_02239E68
Unk_ov12_02239E68: ; 0x02239E68
.incbin "incbin/overlay12_rodata.bin", 0x18D4, 0x1958 - 0x18D4
.word ov12_02226B1C
.word ov12_0222AE68
.word ov12_0222FE30
.word ov12_0222D56C
.word ov12_02230CEC
.word ov12_02231010
.word ov12_022312A4
.word ov12_02231650
.word ov12_02231950
.word ov12_02231C1C
.word ov12_0222777C
.word ov12_02232378
.word ov12_022329E0
.word ov12_02232CA8
.word ov12_02233454
.word ov12_02233734
.word ov12_022339C4
.word ov12_0222CC54
.word ov12_02234008
.word ov12_0222D7C0
.word ov12_0222DB60
.word ov12_0222DEFC
.word ov12_0222E2F8
.word ov12_0222E61C
.word ov12_0222EC90
.word ov12_0222A1AC
.word ov12_0222A34C
.word ov12_0222A410
.word ov12_0222A5C0
.word ov12_022346A4
.word ov12_02234A10
.word ov12_022348C8
.word ov12_02234D98
.global Unk_ov12_02239EEC
Unk_ov12_02239EEC: ; 0x02239EEC
.incbin "incbin/overlay12_rodata.bin", 0x1958, 0x150
.word ov12_022269C0
.word ov12_022269EC
.word ov12_02226A3C
.word ov12_02226A88
.word ov12_02227408
.word ov12_0222B194
.word ov12_0222B45C
.word ov12_0222B68C
.word ov12_0222F770
.word ov12_0222F9E4
.word ov12_02227534
.word ov12_022300C4
.word ov12_022303D0
.word ov12_0222B9E0
.word ov12_0222BAE4
.word ov12_0222BCF4
.word ov12_0222BE48
.word ov12_02230754
.word ov12_02230804
.word ov12_0222BFA8
.word ov12_02230A8C
.word ov12_0222C0C0
.word ov12_0222C3C0
.word ov12_02231444
.word ov12_0222C5FC
.word ov12_02231E7C
.word ov12_0222C6D4
.word ov12_0222C8F8
.word ov12_0222CA2C
.word ov12_0223249C
.word ov12_022326AC
.word ov12_02232024
.word ov12_02233178
.word ov12_02227828
.word ov12_0222797C
.word ov12_02227CBC
.word ov12_02226CB0
.word ov12_02233CD4
.word ov12_02228168
.word ov12_0222CB90
.word ov12_02228214
.word ov12_02233F30
.word ov12_02227F30
.word ov12_02234214
.word ov12_02226EB0
.word ov12_022271D8
.word ov12_022342C4
.word ov12_022344D0
.word ov12_0223464C
.word ov12_0222CFA0
.word ov12_022282BC
.word ov12_02228394
.word ov12_02228520
.word ov12_022287CC
.word ov12_02228A0C
.word ov12_0222E1A8
.word ov12_02228B40
.word ov12_02228C6C
.word ov12_0222E810
.word ov12_0222EAA0
.word ov12_02228E00
.word ov12_02228EC0
.word ov12_022290DC
.word ov12_022291AC
.word ov12_02229304
.word ov12_02229B28
.word ov12_02229E54
.word ov12_02229638
.word ov12_02229810
.word ov12_02229908
.word ov12_0222EFB0
.word ov12_0222F2F8
.word ov12_0222A00C
.word ov12_02229C5C
.word ov12_0222A604
.word ov12_0222A8F4
.word ov12_0222AC40
.word ov12_02228FB4
.word ov12_0222AB50
.word ov12_0222F5EC
.word ov12_022351A4
.word ov12_022351D0
.word ov12_022351FC
.word ov12_02235228

59
asm/overlay017/ov17_0223F7E4.s
View File

@@ -13,6 +13,7 @@
.extern Unk_ov18_022533C8
.extern Unk_ov18_022532BC
.text
@@ -403,7 +404,7 @@ _0223FADA:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
; .align 2, 0
_0223FAE8: .word 0x02253558
_0223FAE8: .word Unk_ov17_02253558
_0223FAEC: .word 0x0000FFFF
_0223FAF0: .word ov17_022411E4
_0223FAF4: .word ov17_02241220
@@ -512,7 +513,7 @@ _0223FBB6:
ldr r0, [sp]
pop {r3, r4, r5, r6, r7, pc}
nop
_0223FBBC: .word 0x02253558
_0223FBBC: .word Unk_ov17_02253558
thumb_func_end ov17_0223FAF8
thumb_func_start ov17_0223FBC0
@@ -2778,7 +2779,7 @@ _02240CEE:
blx r2
pop {r4, r5, r6, pc}
; .align 2, 0
_02240CF4: .word 0x02253558
_02240CF4: .word Unk_ov17_02253558
_02240CF8: .word 0x021BF67C
_02240CFC: .word 0x00000CF3
_02240D00: .word 0x000005DC
@@ -2964,7 +2965,7 @@ _02240E54:
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
; .align 2, 0
_02240E5C: .word 0x02253558
_02240E5C: .word Unk_ov17_02253558
_02240E60: .word 0x00000123
_02240E64: .word 0x0225323C
thumb_func_end ov17_02240D04
@@ -3153,7 +3154,7 @@ _02240FB2:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
_02240FBC: .word 0x02253558
_02240FBC: .word Unk_ov17_02253558
_02240FC0: .word 0x02253240
thumb_func_end ov17_02240EA4
@@ -3536,7 +3537,7 @@ _02241258:
bl sub_0200DA58
pop {r3, r4, r5, r6, r7, pc}
; .align 2, 0
_02241268: .word 0x02253558
_02241268: .word Unk_ov17_02253558
_0224126C: .word 0x0000FFFF
thumb_func_end ov17_02241220
@@ -3645,5 +3646,47 @@ Unk_ov17_022534B8: ; 0x022534B8
.global Unk_ov17_02253558
Unk_ov17_02253558: ; 0x02253558
.incbin "incbin/overlay17_rodata.bin", 0x7CC, 0xC0
.short 0x9
.short 0x0
.short 0x1, 0xFFFF, 0x0, 0xFFFF
.short 0x2, 0x1, 0x3, 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.word ov17_0223FBD4
.word 0x0
.short 0xB
.short 0x1
.short 0xFFFF, 0xFFFF, 0x4, 0xFFFF
.short 0x2, 0x1, 0x3, 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.word 0x0
.short 0xB
.short 0x1
.short 0x2, 0xFFFF, 0x4, 0xFFFF
.short 0x2, 0x1, 0x3, 0x0
.word Unk_ov17_022532D0
.word Unk_ov17_02253288
.word Unk_ov17_02253230
.word ov17_02240D04
.word ov17_02240E68
.word ov17_0223FCAC
.word ov17_0223FFF4
.short 0xB
.short 0x1
.short 0x3, 0xFFFF, 0x4, 0xFFFF
.short 0x2, 0x1, 0x3, 0x0
.word Unk_ov17_022532A8
.word Unk_ov17_02253268
.word Unk_ov17_02253234
.word ov17_02240EA4
.word ov17_02240FC4
.word ov17_0223FF38
.word ov17_02240094

20
asm/overlay017/ov17_02247A48.s
View File

@@ -34,7 +34,7 @@ ov17_02247A48: ; 0x02247A48
add sp, #0xc
pop {r3, r4, pc}
; .align 2, 0
_02247A7C: .word 0x02254488
_02247A7C: .word Unk_ov17_02254488
_02247A80: .word 0x00000123
_02247A84: .word 0x000004FC
thumb_func_end ov17_02247A48
@@ -3260,5 +3260,21 @@ Unk_ov17_02254470: ; 0x02254470
.global Unk_ov17_02254488
Unk_ov17_02254488: ; 0x02254488
.incbin "incbin/overlay17_rodata.bin", 0x16FC, 0xCC
.word ov17_02247A88, ov17_02247A9C, ov17_02247AAC
.word ov17_02247AB0, ov17_02247AC4, 0x0
.word ov17_02247AEC, ov17_02247B00, 0x0
.word ov17_02247D68, ov17_02247D7C, 0x0
.word ov17_02247E78, ov17_02247E8C, 0x0
.word ov17_02247E78, ov17_02247EDC, 0x0
.word ov17_02247E78, ov17_02247F2C, 0x0
.word ov17_02248138, ov17_0224814C, 0x0
.word ov17_02248258, ov17_0224826C, 0x0
.word ov17_0224840C, ov17_02248420, 0x0
.word ov17_022485E8, ov17_022485FC, 0x0
.word ov17_022486E4, ov17_022486F8, 0x0
.word ov17_022487E8, ov17_022487FC, 0x0
.word ov17_02248D28, ov17_02248D3C, 0x0
.word ov17_02248E58, ov17_02248E6C, 0x0
.word ov17_02248FBC, ov17_02248FD0, 0x0
.word ov17_0224924C, ov17_02249260, 0x0

5
asm/overlay017/ov17_0224A0FC.s
View File

@@ -5647,7 +5647,7 @@ _0224CB46:
pop {r3, r4, r5, pc}
; .align 2, 0
_0224CB70: .word 0x00000B1B
_0224CB74: .word 0x022546C4
_0224CB74: .word Unk_ov17_022546C4
_0224CB78: .word 0xFFFFEB80
_0224CB7C: .word 0xFFFFBADC
thumb_func_end ov17_0224CB00
@@ -6208,7 +6208,8 @@ Unk_ov17_022546C0: ; 0x022546C0
.global Unk_ov17_022546C4
Unk_ov17_022546C4: ; 0x022546C4
.incbin "incbin/overlay17_rodata.bin", 0x1938, 0x1940 - 0x1938
.word Unk_ov17_02254938
.word Unk_ov17_022548D4
.global Unk_ov17_022546CC
Unk_ov17_022546CC: ; 0x022546CC

10
asm/overlay073/ov73_021D0D80.s
View File

@@ -2,6 +2,9 @@
.include "overlay073/ov73_021D0D80.inc"
.extern Unk_ov57_021D0F80
.extern ov73_021D3250
.extern ov73_021D3280
.extern ov73_021D3404
.text
@@ -4571,7 +4574,7 @@ _021D3240:
pop {r4, r5, r6, pc}
nop
_021D3248: .word 0x020F2DAC
_021D324C: .word 0x021D3820
_021D324C: .word Unk_ov73_021D3820
thumb_func_end ov73_021D2318
.rodata
@@ -4615,7 +4618,10 @@ Unk_ov73_021D3810: ; 0x021D3810
.global Unk_ov73_021D3820
Unk_ov73_021D3820: ; 0x021D3820
.incbin "incbin/overlay73_rodata.bin", 0x5C, 0x6C - 0x5C
.word ov73_021D3250
.word ov73_021D3280
.word ov73_021D3404
.word 0xFFFFFFFF
.global Unk_ov73_021D3830
Unk_ov73_021D3830: ; 0x021D3830

65
asm/overlay097/ov97_0222D30C.s
View File

@@ -1,7 +1,8 @@
.include "macros/function.inc"
.include "overlay097/ov97_0222D30C.inc"
.extern ov97_022383C4
.extern Unk_ov97_0223D7AC
.text
@@ -576,7 +577,7 @@ _0222D73A:
add sp, #0x14
pop {r3, r4, r5, r6, pc}
; .align 2, 0
_0222D758: .word 0x0223E5A8
_0222D758: .word Unk_ov97_0223E5A8
thumb_func_end ov97_0222D6F8
thumb_func_start ov97_0222D75C
@@ -666,7 +667,7 @@ _0222D7EA:
pop {r3, r4, r5, r6, pc}
nop
_0222D80C: .word 0x000015D4
_0222D810: .word 0x0223E598
_0222D810: .word Unk_ov97_0223E598
thumb_func_end ov97_0222D798
thumb_func_start ov97_0222D814
@@ -721,7 +722,7 @@ _0222D85A:
pop {r3, r4, r5, r6, pc}
; .align 2, 0
_0222D87C: .word 0x000015D4
_0222D880: .word 0x0223E568
_0222D880: .word Unk_ov97_0223E568
thumb_func_end ov97_0222D814
thumb_func_start ov97_0222D884
@@ -776,7 +777,7 @@ _0222D8CA:
pop {r3, r4, r5, r6, pc}
; .align 2, 0
_0222D8EC: .word 0x000015D4
_0222D8F0: .word 0x0223E578
_0222D8F0: .word Unk_ov97_0223E578
thumb_func_end ov97_0222D884
thumb_func_start ov97_0222D8F4
@@ -821,7 +822,7 @@ _0222D928:
add sp, #0x14
pop {r4, r5, pc}
; .align 2, 0
_0222D948: .word 0x0223E588
_0222D948: .word Unk_ov97_0223E588
thumb_func_end ov97_0222D8F4
thumb_func_start ov97_0222D94C
@@ -1044,7 +1045,7 @@ _0222DADE:
pop {r3, r4, r5, r6, pc}
; .align 2, 0
_0222DB00: .word 0x000005C8
_0222DB04: .word 0x0223E5F0
_0222DB04: .word Unk_ov97_0223E5F0
thumb_func_end ov97_0222DA84
thumb_func_start ov97_0222DB08
@@ -1398,7 +1399,7 @@ _0222DDC4:
pop {r3, r4, r5, r6, r7, pc}
; .align 2, 0
_0222DDC8: .word 0x000001A5
_0222DDCC: .word 0x0223E5D0
_0222DDCC: .word Unk_ov97_0223E5D0
thumb_func_end ov97_0222DD1C
thumb_func_start ov97_0222DDD0
@@ -1481,7 +1482,7 @@ _0222DE52:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
_0222DE74: .word 0x0223E568
_0222DE74: .word Unk_ov97_0223E568
thumb_func_end ov97_0222DDD0
thumb_func_start ov97_0222DE78
@@ -5808,7 +5809,7 @@ _02230206:
_02230210: .word 0x0000004D
_02230214: .word 0x021D742C
_02230218: .word 0x00000061
_0223021C: .word 0x0223D7AC
_0223021C: .word Unk_ov97_0223D7AC
_02230220: .word 0x000015D4
thumb_func_end ov97_022301BC
@@ -6080,7 +6081,10 @@ _0223040C: .word 0x021BF67C
.global Unk_ov97_0223D71C
Unk_ov97_0223D71C: ; 0x0223D71C
.incbin "incbin/overlay97_rodata.bin", 0xA8, 0xB8 - 0xA8
.word ov97_0222E2DC
.word ov97_0222F75C
.word ov97_022301BC
.word 0xFFFFFFFF
.global Unk_ov97_0223D72C
Unk_ov97_0223D72C: ; 0x0223D72C
@@ -6100,35 +6104,58 @@ Unk_ov97_0223D758: ; 0x0223D758
.global Unk_ov97_0223E568
Unk_ov97_0223E568: ; 0x0223E568
.incbin "incbin/overlay97_data.bin", 0x628, 0x638 - 0x628
.word 0x12, ov97_0222DA18
.word 0x13, ov97_0222D75C
.global Unk_ov97_0223E578
Unk_ov97_0223E578: ; 0x0223E578
.incbin "incbin/overlay97_data.bin", 0x638, 0x648 - 0x638
.word 0x12, ov97_0222D984
.word 0x13, ov97_0222D75C
.global Unk_ov97_0223E588
Unk_ov97_0223E588: ; 0x0223E588
.incbin "incbin/overlay97_data.bin", 0x648, 0x658 - 0x648
.word 0x12, ov97_0222D9BC
.word 0x13, ov97_0222D9F0
.global Unk_ov97_0223E598
Unk_ov97_0223E598: ; 0x0223E598
.incbin "incbin/overlay97_data.bin", 0x658, 0x668 - 0x658
.word 0x12, ov97_0222D474
.word 0x13, ov97_0222D75C
.global Unk_ov97_0223E5A8
Unk_ov97_0223E5A8: ; 0x0223E5A8
.incbin "incbin/overlay97_data.bin", 0x668, 0x678 - 0x668
.word 0x12, ov97_0222D4D8
.word 0x13, ov97_0222D94C
.global Unk_ov97_0223E5B8
Unk_ov97_0223E5B8: ; 0x0223E5B8
.incbin "incbin/overlay97_data.bin", 0x678, 0x690 - 0x678
.word 0xC, ov97_0222DA84
.word 0xD, ov97_0222DB08
.word 0xE, ov97_0222DB40
.global Unk_ov97_0223E5D0
Unk_ov97_0223E5D0: ; 0x0223E5D0
.incbin "incbin/overlay97_data.bin", 0x690, 0x6B0 - 0x690
.word 0x0
.word ov97_022383C4
.word 0x0
.word 0x0
.short 0x0
.short 0x3
.byte 0x0
.byte 0xC
.byte 0x0
.byte 0x10
.short 0x2F
.short 0x80
.word 0x0
.global Unk_ov97_0223E5F0
Unk_ov97_0223E5F0: ; 0x0223E5F0
.incbin "incbin/overlay97_data.bin", 0x6B0, 0x20
.word 0xF, ov97_0222D798
.word 0x14, ov97_0222D884
.word 0x10, ov97_0222D814
.word 0x11, ov97_0222DA64
.bss

60
asm/unk_020933F8.s
View File

@@ -1,7 +1,22 @@
.include "macros/function.inc"
.include "include/unk_020933F8.inc"
.extern ov17_0224F4D4
.extern ov17_0224F754
.extern ov17_0224F86C
.extern ov17_0223CB1C
.extern ov17_0223CDDC
.extern ov17_0223CF8C
.extern ov22_02256174
.extern ov22_022562EC
.extern ov22_02256600
.extern ov17_0223B140
.extern ov17_0223B444
.extern ov17_0223B580
.extern ov17_0223DAD0
.extern ov17_0223DDD4
.extern ov17_0223DF0C
.text
@@ -252,12 +267,12 @@ _020935C8:
; .align 2, 0
_020935CC: .word 0x00000171
_020935D0: .word 0x000019B8
_020935D4: .word 0x020F55FC
_020935D8: .word 0x020F55EC
_020935D4: .word Unk_020F55FC
_020935D8: .word Unk_020F55EC
_020935DC: .word 0x00000121
_020935E0: .word 0x020F561C
_020935E4: .word 0x020F560C
_020935E8: .word 0x020F55DC
_020935E0: .word Unk_020F561C
_020935E4: .word Unk_020F560C
_020935E8: .word Unk_020F55DC
thumb_func_end sub_02093448
thumb_func_start sub_020935EC
@@ -505,10 +520,10 @@ _020937A0:
nop
_020937A8: .word 0x00000121
_020937AC: .word 0x000019B8
_020937B0: .word 0x020F55FC
_020937B4: .word 0x020F55EC
_020937B8: .word 0x020F561C
_020937BC: .word 0x020F560C
_020937B0: .word Unk_020F55FC
_020937B4: .word Unk_020F55EC
_020937B8: .word Unk_020F561C
_020937BC: .word Unk_020F560C
_020937C0: .word 0x0000012E
thumb_func_end sub_020935EC
@@ -3653,21 +3668,36 @@ Unk_020F55D0: ; 0x020F55D0
.global Unk_020F55DC
Unk_020F55DC: ; 0x020F55DC
.incbin "incbin/arm9_rodata.bin", 0x1099C, 0x109AC - 0x1099C
.word ov17_0224F4D4
.word ov17_0224F754
.word ov17_0224F86C
.word 0x11
.global Unk_020F55EC
Unk_020F55EC: ; 0x020F55EC
.incbin "incbin/arm9_rodata.bin", 0x109AC, 0x109BC - 0x109AC
.word ov17_0223CB1C
.word ov17_0223CDDC
.word ov17_0223CF8C
.word 0x11
.global Unk_020F55FC
Unk_020F55FC: ; 0x020F55FC
.incbin "incbin/arm9_rodata.bin", 0x109BC, 0x109CC - 0x109BC
.word ov22_02256174
.word ov22_022562EC
.word ov22_02256600
.word 0x16
.global Unk_020F560C
Unk_020F560C: ; 0x020F560C
.incbin "incbin/arm9_rodata.bin", 0x109CC, 0x109DC - 0x109CC
.word ov17_0223B140
.word ov17_0223B444
.word ov17_0223B580
.word 0x11
.global Unk_020F561C
Unk_020F561C: ; 0x020F561C
.incbin "incbin/arm9_rodata.bin", 0x109DC, 0x10
.word ov17_0223DAD0
.word ov17_0223DDD4
.word ov17_0223DF0C
.word 0x11