Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a8df7ed
bmg header improvements
Yanis002 Jul 18, 2025
f8d5521
match stuff
Yanis002 Jul 18, 2025
82d88d0
more documentation from the essay and finally match func_020372f0
Yanis002 Jul 18, 2025
da23e39
finally match data sections (s/o to lago) and trying to make progress…
Yanis002 Jul 18, 2025
45bf333
match some vtables!!!
Yanis002 Jul 18, 2025
9335f8a
out of the vtable trap
Yanis002 Jul 19, 2025
08cdf28
cleanup functions declarations
Yanis002 Jul 19, 2025
845be69
relocs and symbols changes
Yanis002 Jul 19, 2025
75726d6
BMG.hpp: unk_14 -> pFile
Yanis002 Jul 19, 2025
ae2a35a
file reset
Yanis002 Jul 19, 2025
9f63493
updated symbols
Yanis002 Jul 19, 2025
52f57e7
add missing declarations
Yanis002 Jul 19, 2025
adcf6e2
merge back progress from backup
Yanis002 Jul 19, 2025
2d22661
merge back progress from backup 2
Yanis002 Jul 19, 2025
f3efc24
merge back progress from backup 3
Yanis002 Jul 19, 2025
dbdd05e
headers + config updates
Yanis002 Jul 19, 2025
02f67ca
random fixes
Yanis002 Jul 19, 2025
bc9706b
merge back progress from backup 4
Yanis002 Jul 19, 2025
26fe791
unk_14 -> pFile 2 (forgot to commit the source)
Yanis002 Jul 19, 2025
804d0e2
merge back progress from backup 5
Yanis002 Jul 19, 2025
51ab132
headers update
Yanis002 Jul 19, 2025
8652346
fixes
Yanis002 Jul 19, 2025
88117a9
symbol renames + sync us with eu
Yanis002 Jul 19, 2025
08791f4
vfunc sync + fix issues with MessageManager.cpp
Yanis002 Jul 19, 2025
9c75346
symbol fixes + fix vtable offsets
Yanis002 Jul 19, 2025
2540278
fix build issues on eur
Yanis002 Jul 19, 2025
266c913
Merge remote-tracking branch 'upstream/main' into bmg2
Yanis002 Jul 19, 2025
dba64df
accidental mistake
Yanis002 Jul 19, 2025
0e15ae6
dsd fix thumb-nop
Yanis002 Jul 19, 2025
1c74095
progress on UnkStruct_02032f0c
Yanis002 Jul 19, 2025
372acda
remove SectionDAT1
Yanis002 Jul 21, 2025
d041854
match func_0203643c and random progress
Yanis002 Jul 21, 2025
e645bad
vtables fixing
Yanis002 Jul 22, 2025
7cc1ac8
remove useless thing
Yanis002 Jul 22, 2025
59e25cc
split 7750 and 86d8
Yanis002 Jul 22, 2025
daeee07
reorder delinks
Yanis002 Jul 22, 2025
6a32dc0
documented something
Yanis002 Jul 22, 2025
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
77 changes: 45 additions & 32 deletions config/eur/arm9/delinks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,33 @@
.data start:0x020572e0 end:0x02058e20 kind:data align:32
.bss start:0x02058e20 end:0x020773c0 kind:bss align:32

src/Main/Actor/ActorType.cpp:
src/Main/Game/GameMode.cpp:
complete
.text start:0x0203e784 end:0x0203e8a0
.bss start:0x02069180 end:0x02069188
.text start:0x0202c0a8 end:0x0202c0cc
.data start:0x0205762c end:0x02057650

src/Main/Game/Game.cpp:
.text start:0x0202c6c8 end:0x0202d0cc
.rodata start:0x020561f4 end:0x020562d4

src/Main/Message/BmgRelatedFunctions.cpp:
.text start:0x0202d3bc end:0x0202d56c

src/Main/Unknown/UnkStruct_02063220.cpp:
.text start:0x0202f3f0 end:0x0202f8e8
.rodata start:0x020562e0 end:0x02056300
.data start:0x0205772c end:0x02057808

src/Main/System/OverlayManager.cpp:
complete
.text start:0x0202ff44 end:0x0203003c

libs/cpp/src/__register_global_object.cpp:
complete
.text start:0x0204f8d4 end:0x0204f8f4
.bss start:0x02076da8 end:0x02076dac

src/Main/Message/BmgRelatedFunctions.cpp:
.text start:0x0202d3bc end:0x0202d56c
src/Main/Unknown/UnkStruct_0206322c.cpp:
.text start:0x02030354 end:0x020306c0

src/Main/Unknown/UnkStruct_02032f0c.cpp:
.text start:0x02032f0c end:0x02033d40
.data start:0x020579c0 end:0x02057a00

src/Main/Unknown/UnkStruct_02035064.cpp:
.text start:0x02035064 end:0x02035370
Expand All @@ -37,42 +45,47 @@ src/Main/Message/BMG.cpp:
.data start:0x02057b78 end:0x02057cb8
.rodata start:0x02056958 end:0x020569e0

src/Main/DTCM/UnkStruct_027e05f8_2.cpp:
complete
.text start:0x0203744c end:0x020374b4
.init start:0x02050cb4 end:0x02050ce0
.ctor start:0x02057260 end:0x02057264
.dtcm start:0x027e05f8 end:0x027e060c

src/Main/Unknown/UnkStruct_02037750.cpp:
.text start:0x02037750 end:0x020387e0
.data start:0x02057cb8 end:0x02057d70
.text start:0x02037750 end:0x020386d8
.data start:0x02057cb8 end:0x02057d34

src/Main/Unknown/UnkStruct_020386d8.cpp:
.text start:0x020386d8 end:0x020387e0
.data start:0x02057d34 end:0x02057d70

src/Main/Unknown/UnkStruct_02038aa0.cpp:
.text start:0x0203881c end:0x02039578
.data start:0x02057d88 end:0x02057e14

src/Main/Unknown/UnkStruct_020397f8.cpp:
.text start:0x020397f8 end:0x0203c358
.data start:0x02057e14 end:0x02057ed0

src/Main/Message/func_0203c358.cpp:
.text start:0x0203c358 end:0x0203c72c
.data start:0x02057f0c end:0x02057f88

src/Main/Message/func_0203c72c.cpp:
.text start:0x0203c72c end:0x0203c8a8
.data start:0x02057f88 end:0x02058004

src/Main/Unknown/UnkStruct_0203dae0.cpp:
.text start:0x0203dae0 end:0x0203e784
.data start:0x0205804c end:0x02058088

src/Main/Unknown/UnkStruct_0206322c.cpp:
.text start:0x02030354 end:0x020306c0

src/Main/Unknown/UnkStruct_02063220.cpp:
.text start:0x0202f3f0 end:0x0202f8e8
.rodata start:0x020562e0 end:0x02056300
.data start:0x0205772c end:0x02057808

src/Main/Game/Game.cpp:
.text start:0x0202c6c8 end:0x0202d0cc
.rodata start:0x020561f4 end:0x020562d4

src/Main/Game/GameMode.cpp:
src/Main/Actor/ActorType.cpp:
complete
.text start:0x0202c0a8 end:0x0202c0cc
.data start:0x0205762c end:0x02057650
.text start:0x0203e784 end:0x0203e8a0
.bss start:0x02069180 end:0x02069188

src/Main/DTCM/UnkStruct_027e05f8_2.cpp:
libs/cpp/src/__register_global_object.cpp:
complete
.text start:0x0203744c end:0x020374b4
.init start:0x02050cb4 end:0x02050ce0
.ctor start:0x02057260 end:0x02057264
.dtcm start:0x027e05f8 end:0x027e060c
.text start:0x0204f8d4 end:0x0204f8f4
.bss start:0x02076da8 end:0x02076dac
8 changes: 4 additions & 4 deletions config/eur/arm9/overlays/ov000/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3295,7 +3295,7 @@ _ZN18UnkStruct_027e103c19func_ov000_020cfa70Eii kind:function(arm,size=0x40) add
_ZN18UnkStruct_027e103c19func_ov000_020cfab0Ev kind:function(arm,size=0xc) addr:0x020cfab0
_ZN18UnkStruct_027e103c19func_ov000_020cfabcEii kind:function(arm,size=0x2c) addr:0x020cfabc
_ZN18UnkStruct_027e103c19func_ov000_020cfae8Eii kind:function(arm,size=0x38) addr:0x020cfae8
_ZN18UnkStruct_027e103c19func_ov000_020cfb20Ei kind:function(arm,size=0x18) addr:0x020cfb20
_ZN18UnkStruct_027e103c19func_ov000_020cfb20EPv kind:function(arm,size=0x18) addr:0x020cfb20
_ZN18UnkStruct_027e103c19func_ov000_020cfb38Ev kind:function(arm,size=0x10) addr:0x020cfb38
_ZN18UnkStruct_027e103c19func_ov000_020cfb48Ev kind:function(arm,size=0x10) addr:0x020cfb48
_ZN18UnkStruct_027e103c19func_ov000_020cfb58Ev kind:function(arm,size=0x10) addr:0x020cfb58
Expand Down Expand Up @@ -3337,9 +3337,9 @@ func_ov000_020d0530 kind:function(arm,size=0x1c) addr:0x020d0530
func_ov000_020d054c kind:function(arm,size=0x48) addr:0x020d054c
func_ov000_020d0594 kind:function(arm,size=0x48) addr:0x020d0594
func_ov000_020d05dc kind:function(arm,size=0x30) addr:0x020d05dc
func_ov000_020d060c kind:function(arm,size=0x30) addr:0x020d060c
_ZN28UnkClass_func_ov000_020d0644C1Ev kind:function(arm,size=0x30) addr:0x020d060c
func_ov000_020d063c kind:function(arm,size=0x8) addr:0x020d063c
func_ov000_020d0644 kind:function(arm,size=0x2c) addr:0x020d0644
_ZN28UnkClass_func_ov000_020d064419func_ov000_020d0644Eiiiii kind:function(arm,size=0x2c) addr:0x020d0644
func_ov000_020d0670 kind:function(arm,size=0x120) addr:0x020d0670
func_ov000_020d0790 kind:function(arm,size=0x74) addr:0x020d0790
func_ov000_020d0804 kind:function(arm,size=0x44) addr:0x020d0804
Expand Down Expand Up @@ -3610,7 +3610,7 @@ func_ov000_020d7524 kind:function(arm,size=0x68) addr:0x020d7524
func_ov000_020d758c kind:function(arm,size=0x3c) addr:0x020d758c
func_ov000_020d75c8 kind:function(arm,size=0x14) addr:0x020d75c8
func_ov000_020d75dc kind:function(arm,size=0x208) addr:0x020d75dc
func_ov000_020d77e4 kind:function(arm,size=0x9c) addr:0x020d77e4
_ZN18UnkStruct_020eec9c19func_ov000_020d77e4Ei kind:function(arm,size=0x9c) addr:0x020d77e4
func_ov000_020d7880 kind:function(arm,size=0x20) addr:0x020d7880
func_ov000_020d78a0 kind:function(arm,size=0x1e4) addr:0x020d78a0
func_ov000_020d7a84 kind:function(arm,size=0x50) addr:0x020d7a84
Expand Down
2 changes: 1 addition & 1 deletion config/eur/arm9/overlays/ov040/relocs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ from:0x02187cd4 kind:arm_call to:0x02033cbc module:main
from:0x02187d64 kind:arm_call to:0x020334b4 module:main
from:0x02187d98 kind:arm_call to:0x0203b814 module:main
from:0x02187dac kind:load to:0x02068e8c module:main
from:0x02187db0 kind:load to:0x020579f8 module:main
from:0x02187db0 kind:load to:0x020579f0 add:8 module:main
from:0x02187dc0 kind:load to:0x02039d74 module:main
from:0x02187dfc kind:arm_call_thumb to:0x0202ab48 module:main
from:0x02187e20 kind:arm_call_thumb to:0x0202ab48 module:main
Expand Down
46 changes: 23 additions & 23 deletions config/eur/arm9/relocs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4121,13 +4121,13 @@ from:0x02032e4c kind:arm_call_thumb to:0x02032f94 module:main
from:0x02032e54 kind:arm_call to:0x0202ea0c module:main
from:0x02032e78 kind:load to:0x027e05f4 module:dtcm
from:0x02032ea4 kind:arm_call_thumb to:0x0202ab48 module:main
from:0x02032ec0 kind:load to:0x020579f8 module:main
from:0x02032ec0 kind:load to:0x020579f0 add:8 module:main
from:0x02032eec kind:arm_call_thumb to:0x0202ab48 module:main
from:0x02032f08 kind:load to:0x020579f8 module:main
from:0x02032f08 kind:load to:0x020579f0 add:8 module:main
from:0x02032f50 kind:thumb_call_arm to:0x020078f4 module:main
from:0x02032f5c kind:thumb_call_arm to:0x020078f4 module:main
from:0x02032f68 kind:thumb_call_arm to:0x020078c0 module:main
from:0x02032f80 kind:load to:0x020579c8 module:main
from:0x02032f80 kind:load to:0x020579c0 add:8 module:main
from:0x02032f8c kind:thumb_call_arm to:0x0202ea0c module:main
from:0x02032fb0 kind:load to:0x02035428 module:main
from:0x02033068 kind:arm_call to:0x02033cbc module:main
Expand Down Expand Up @@ -4634,16 +4634,16 @@ from:0x0203771c kind:load to:0x027e077c module:dtcm
from:0x02037720 kind:load to:0x02056be4 module:main
from:0x02037748 kind:load to:0x027e0c54 module:dtcm
from:0x0203774c kind:load to:0x027e0618 module:dtcm
from:0x02037790 kind:load to:0x02057d00 module:main
from:0x02037790 kind:load to:0x02057cf8 add:8 module:main
from:0x020377b8 kind:arm_call to:0x02036d4c module:main
from:0x020377c4 kind:load to:0x02057d00 module:main
from:0x020377c4 kind:load to:0x02057cf8 add:8 module:main
from:0x020377c8 kind:load to:0x027e0c68 module:dtcm
from:0x020377f0 kind:arm_call to:0x02036d4c module:main
from:0x020377f8 kind:arm_call to:0x0202ea0c module:main
from:0x02037804 kind:load to:0x02057d00 module:main
from:0x02037804 kind:load to:0x02057cf8 add:8 module:main
from:0x02037808 kind:load to:0x027e0c68 module:dtcm
from:0x02037830 kind:arm_call to:0x02036d4c module:main
from:0x0203783c kind:load to:0x02057d00 module:main
from:0x0203783c kind:load to:0x02057cf8 add:8 module:main
from:0x02037840 kind:load to:0x027e0c68 module:dtcm
from:0x0203787c kind:arm_call to:0x02037724 module:main
from:0x020378c0 kind:arm_call_thumb to:0x02114810 module:overlay(9)
Expand Down Expand Up @@ -4715,11 +4715,11 @@ from:0x0203866c kind:arm_call to:0x02036f68 module:main
from:0x020386b0 kind:load to:0x027e0c68 module:dtcm
from:0x020386e8 kind:arm_call to:0x02037750 module:main
from:0x02038704 kind:arm_call to:0x020376c0 module:main
from:0x02038710 kind:load to:0x02057d3c module:main
from:0x02038710 kind:load to:0x02057d34 add:8 module:main
from:0x02038714 kind:load to:0x027e0d0c module:dtcm
from:0x02038728 kind:arm_call to:0x02037750 module:main
from:0x02038744 kind:arm_call to:0x020376c0 module:main
from:0x02038750 kind:load to:0x02057d3c module:main
from:0x02038750 kind:load to:0x02057d34 add:8 module:main
from:0x02038754 kind:load to:0x027e0d0c module:dtcm
from:0x02038760 kind:arm_call to:0x02037844 module:main
from:0x02038778 kind:arm_call to:0x020385d0 module:main
Expand All @@ -4729,7 +4729,7 @@ from:0x020387c8 kind:load to:0x027e0c68 module:dtcm
from:0x020387d4 kind:arm_call to:0x0203780c module:main
from:0x02038808 kind:arm_call_thumb to:0x0202ab48 module:main
from:0x02038824 kind:arm_call to:0x02032e7c module:main
from:0x02038854 kind:load to:0x02057e0c module:main
from:0x02038854 kind:load to:0x02057e04 add:8 module:main
from:0x02038890 kind:arm_call to:0x02038804 module:main
from:0x02038940 kind:load to:0x027e0d38 module:dtcm
from:0x02038944 kind:load to:0x027e0c68 module:dtcm
Expand All @@ -4740,7 +4740,7 @@ from:0x02038a8c kind:arm_call to:0x02038804 module:main
from:0x02038aa6 kind:thumb_call to:0x0203dae0 module:main
from:0x02038aba kind:thumb_call_arm to:0x0203881c module:main
from:0x02038ac4 kind:thumb_call to:0x020387e0 module:main
from:0x02038af8 kind:load to:0x02057d90 module:main
from:0x02038af8 kind:load to:0x02057d88 add:8 module:main
from:0x02038b00 kind:thumb_call to:0x0203dbe0 module:main
from:0x02038b0c kind:thumb_call to:0x0203dbe0 module:main
from:0x02038b12 kind:thumb_call_arm to:0x0202ea0c module:main
Expand Down Expand Up @@ -4825,7 +4825,7 @@ from:0x0203979a kind:thumb_call_arm to:0x020350b4 module:main
from:0x020397ac kind:thumb_call_arm to:0x020351b8 module:main
from:0x020397be kind:thumb_call_arm to:0x020351b8 module:main
from:0x020397d0 kind:thumb_call_arm to:0x020351b8 module:main
from:0x020397dc kind:load to:0x02057e5c module:main
from:0x020397dc kind:load to:0x02057e54 add:8 module:main
from:0x02039802 kind:thumb_call to:0x02038aa0 module:main
from:0x02039816 kind:thumb_call_arm to:0x02035064 module:main
from:0x02039820 kind:thumb_call_arm to:0x02035064 module:main
Expand All @@ -4847,7 +4847,7 @@ from:0x020399de kind:thumb_call_arm to:0x020350b4 module:main
from:0x020399f0 kind:thumb_call_arm to:0x020351b8 module:main
from:0x02039a02 kind:thumb_call_arm to:0x020351b8 module:main
from:0x02039a14 kind:thumb_call_arm to:0x020351b8 module:main
from:0x02039a20 kind:load to:0x02057e5c module:main
from:0x02039a20 kind:load to:0x02057e54 add:8 module:main
from:0x02039a42 kind:thumb_call to:0x02038b28 module:main
from:0x02039a54 kind:thumb_call_arm to:0x0203dcfc module:main
from:0x02039aa0 kind:arm_call to:0x02038d20 module:main
Expand Down Expand Up @@ -5177,7 +5177,7 @@ from:0x0203c334 kind:arm_call to:0x020350ac module:main
from:0x0203c33c kind:arm_call to:0x020350ac module:main
from:0x0203c344 kind:arm_call_thumb to:0x02038b1c module:main
from:0x0203c360 kind:thumb_call to:0x02038aa0 module:main
from:0x0203c394 kind:load to:0x02057f14 module:main
from:0x0203c394 kind:load to:0x02057f0c add:8 module:main
from:0x0203c3a2 kind:thumb_call to:0x02038b28 module:main
from:0x0203c3c0 kind:thumb_call_arm to:0x0203fc78 module:main
from:0x0203c3dc kind:thumb_call_arm to:0x0203d318 module:main
Expand Down Expand Up @@ -5209,7 +5209,7 @@ from:0x0203c7c0 kind:arm_call to:0x020d0644 module:overlay(0)
from:0x0203c7e0 kind:arm_call to:0x020d0644 module:overlay(0)
from:0x0203c800 kind:arm_call to:0x020d0644 module:overlay(0)
from:0x0203c820 kind:arm_call to:0x020d0644 module:overlay(0)
from:0x0203c830 kind:load to:0x02057f90 module:main
from:0x0203c830 kind:load to:0x02057f88 add:8 module:main
from:0x0203c834 kind:load to:0x0203c83c module:main
from:0x0203c838 kind:load to:0x020d060c module:overlay(0)
from:0x0203c858 kind:arm_call to:0x0204f754 module:main
Expand Down Expand Up @@ -5275,14 +5275,14 @@ from:0x0203d19c kind:arm_call to:0x0203cfb8 module:main
from:0x0203d1a4 kind:arm_call to:0x0203cfb8 module:main
from:0x0203d1ac kind:arm_call to:0x0203ceb8 module:main
from:0x0203d1c8 kind:arm_call to:0x0203cdf4 module:main
from:0x0203d1e8 kind:load to:0x0205803c module:main
from:0x0203d1ec kind:load to:0x02058024 module:main
from:0x0203d1e8 kind:load to:0x02058034 add:8 module:main
from:0x0203d1ec kind:load to:0x0205801c add:8 module:main
from:0x0203d1fc kind:arm_call to:0x0202ea0c module:main
from:0x0203d228 kind:arm_call to:0x02032fa4 module:main
from:0x0203d240 kind:arm_call to:0x0203d168 module:main
from:0x0203d250 kind:load to:0x02068ed0 module:main
from:0x0203d26c kind:load to:0x0205803c module:main
from:0x0203d270 kind:load to:0x0205800c module:main
from:0x0203d26c kind:load to:0x02058034 add:8 module:main
from:0x0203d270 kind:load to:0x02058004 add:8 module:main
from:0x0203d280 kind:arm_call to:0x0202ea0c module:main
from:0x0203d2ac kind:arm_call to:0x02032fa4 module:main
from:0x0203d2c4 kind:arm_call to:0x0203d168 module:main
Expand Down Expand Up @@ -5362,15 +5362,15 @@ from:0x0203db3a kind:thumb_call_arm to:0x0202e9dc module:main
from:0x0203db42 kind:thumb_call_arm to:0x0203d1d0 module:main
from:0x0203db56 kind:thumb_call_arm to:0x0202e9dc module:main
from:0x0203db5e kind:thumb_call_arm to:0x0203d254 module:main
from:0x0203db6c kind:load to:0x02058054 module:main
from:0x0203db6c kind:load to:0x0205804c add:8 module:main
from:0x0203db74 kind:load to:0x027e0ce0 module:dtcm
from:0x0203db9c kind:thumb_call to:0x02032f94 module:main
from:0x0203dba4 kind:load to:0x02058054 module:main
from:0x0203dba4 kind:load to:0x0205804c add:8 module:main
from:0x0203dbcc kind:thumb_call to:0x02032f94 module:main
from:0x0203dbd2 kind:thumb_call_arm to:0x0202ea0c module:main
from:0x0203dbdc kind:load to:0x02058054 module:main
from:0x0203dbdc kind:load to:0x0205804c add:8 module:main
from:0x0203dc04 kind:thumb_call to:0x02032f94 module:main
from:0x0203dc0c kind:load to:0x02058054 module:main
from:0x0203dc0c kind:load to:0x0205804c add:8 module:main
from:0x0203dc50 kind:arm_call to:0x0203d1b4 module:main
from:0x0203dc84 kind:arm_call to:0x0203ddfc module:main
from:0x0203dcc8 kind:arm_call to:0x02032fa4 module:main
Expand Down
Loading