Decomp ModelRender (#139)

* decomp ModelRender

* fix ModelRender function name

* fix other ModelRender references

* reloc vtables

* fix ModelRender obect size

* fix matches

* match 100%

4 files changed, 24 insertions, 19 deletions

diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt
index 5d53bcbc..fdd47cf9 100644
--- a/config/eur/arm9/overlays/ov000/delinks.txt
+++ b/config/eur/arm9/overlays/ov000/delinks.txt
@@ -111,7 +111,7 @@ src/00_Core/Player/LinkStateDamage.cpp:
 
 src/00_Core/Player/LinkStateFollow.cpp:
     .text       start:0x020a8f74 end:0x020a92a4
-    .data       start:0x020e575c end:0x020e58e8
+    .data       start:0x020e575c end:0x020e57f0
 
 src/00_Core/Player/LinkStateInteract.cpp:
     .text       start:0x020aa32c end:0x020abd78
@@ -153,3 +153,7 @@ src/00_Core/Save/AdventureFlags.cpp:
 
 src/00_Core/Game/GameModePlay.cpp:
     .text       start:0x02079d28 end:0x02079ddc
+
+src/00_Core/Render/ModelRender.cpp:
+    .text       start:0x020a956c end:0x020a99e0
+    .data       start:0x020e5818 end:0x020e5860
\ No newline at end of file
diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt
index 29d455ef..971f6546 100644
--- a/config/eur/arm9/overlays/ov000/relocs.txt
+++ b/config/eur/arm9/overlays/ov000/relocs.txt
@@ -4799,18 +4799,18 @@ from:0x020a92f8 kind:load to:0x020e57f0 module:overlay(0)
 from:0x020a9524 kind:load to:0x027e0d78 module:dtcm
 from:0x020a9538 kind:arm_call to:0x0202ea0c module:main
 from:0x020a9560 kind:arm_call to:0x0202ea0c module:main
-from:0x020a9584 kind:load to:0x020e5820 module:overlay(0)
-from:0x020a95a0 kind:load to:0x020e5820 module:overlay(0)
+from:0x020a9584 kind:load to:0x020e5818 add:8 module:overlay(0)
+from:0x020a95a0 kind:load to:0x020e5818 add:8 module:overlay(0)
 from:0x020a95b2 kind:thumb_call_arm to:0x0202ea18 module:main
 from:0x020a95b8 kind:thumb_call to:0x020b3ea8 module:overlay(0)
-from:0x020a95c0 kind:load to:0x020e5820 module:overlay(0)
+from:0x020a95c0 kind:load to:0x020e5818 add:8 module:overlay(0)
 from:0x020a95d2 kind:thumb_call_arm to:0x0202ea18 module:main
 from:0x020a95d8 kind:thumb_call to:0x020b3ea8 module:overlay(0)
 from:0x020a95de kind:thumb_call_arm to:0x0202ea0c module:main
-from:0x020a95e8 kind:load to:0x020e5820 module:overlay(0)
+from:0x020a95e8 kind:load to:0x020e5818 add:8 module:overlay(0)
 from:0x020a95fa kind:thumb_call_arm to:0x0202ea18 module:main
 from:0x020a9600 kind:thumb_call to:0x020b3ea8 module:overlay(0)
-from:0x020a9608 kind:load to:0x020e5820 module:overlay(0)
+from:0x020a9608 kind:load to:0x020e5818 add:8 module:overlay(0)
 from:0x020a9620 kind:load to:0x020189dc module:main
 from:0x020a9664 kind:arm_call to:0x020183b4 module:main
 from:0x020a9670 kind:arm_call to:0x020079d8 module:main
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 95d61cf2..4ed2a2d1 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -1992,26 +1992,26 @@ _ZN11ModelRenderD1Ev kind:function(thumb,size=0x20) addr:0x020a95a4
 _ZN11ModelRenderD0Ev kind:function(thumb,size=0x28) addr:0x020a95c4
 _ZN11ModelRenderD2Ev kind:function(thumb,size=0x20) addr:0x020a95ec
 _ZN11ModelRender14GetLcdcAddressEv kind:function(arm,size=0x8) addr:0x020a960c
-_ZN11ModelRender8vfunc_0cEP9ItemModel kind:function(arm,size=0x10) addr:0x020a9614
-_ZN11ModelRender19func_ov000_020a9624Ei kind:function(arm,size=0x2c) addr:0x020a9624
+_ZN11ModelRender28Init_ModelRender_UnkStruct_4EP9ItemModel kind:function(arm,size=0x10) addr:0x020a9614
+_ZN11ModelRender16UnkGetBoneMatrixEi kind:function(arm,size=0x2c) addr:0x020a9624
 _ZN11ModelRender12SetTransformEP5Vec3pP5Mat3pS1_ kind:function(arm,size=0x84) addr:0x020a9650
 _ZN11ModelRender22SetRotationTranslationEP5Mat3pP5Vec3p kind:function(arm,size=0x6c) addr:0x020a96d4
 _ZN11ModelRender14SetTranslationEP5Vec3p kind:function(arm,size=0x24) addr:0x020a9740
 _ZN11ModelRender20PushGeometryCommandsEv kind:function(arm,size=0x6c) addr:0x020a9764
-_ZN11ModelRender8vfunc_20Ev kind:function(arm,size=0x10) addr:0x020a97d0
+_ZN11ModelRender18ExecRenderCommandsEv kind:function(arm,size=0x10) addr:0x020a97d0
 _ZN11ModelRender8vfunc_24EP24UnkStruct_ov000_020c0c08 kind:function(arm,size=0x18) addr:0x020a97e0
 _ZN11ModelRender8vfunc_28Ev kind:function(arm,size=0x6c) addr:0x020a97f8
 _ZN11ModelRender8vfunc_2cEv kind:function(arm,size=0x2c) addr:0x020a9864
 _ZN11ModelRender8vfunc_34Ev kind:function(arm,size=0x2c) addr:0x020a9890
 _ZN11ModelRender8vfunc_30Ev kind:function(arm,size=0x2c) addr:0x020a98bc
-_ZN11ModelRender19func_ov000_020a98e8Ei kind:function(arm,size=0x24) addr:0x020a98e8
-_ZN11ModelRender19func_ov000_020a990cEi kind:function(arm,size=0x2c) addr:0x020a990c
-_ZN11ModelRender19func_ov000_020a9938Ei kind:function(thumb,size=0x28) addr:0x020a9938
-_ZN11ModelRender19func_ov000_020a9960EPv kind:function(arm,size=0x8) addr:0x020a9960
+_ZN11ModelRender14GetObjectIndexEPc kind:function(arm,size=0x24) addr:0x020a98e8
+_ZN11ModelRender16GetMaterialIndexEPc kind:function(arm,size=0x2c) addr:0x020a990c
+_ZN11ModelRender20InitBoneMatrixArraysEj kind:function(thumb,size=0x28) addr:0x020a9938
+_ZN11ModelRender22SetUnkBoneMatrixArray1EP31ModelRender_UnkBoneMatrixStruct kind:function(arm,size=0x8) addr:0x020a9960
 _ZN11ModelRender8vfunc_38Ev kind:function(arm,size=0x2c) addr:0x020a9968
-_ZN11ModelRender8vfunc_3cEv kind:function(arm,size=0x4) addr:0x020a9994
-_ZN11ModelRender19func_ov000_020a9998Eii kind:function(arm,size=0x28) addr:0x020a9998
-_ZN11ModelRender19func_ov000_020a99c0Ev kind:function(arm,size=0x20) addr:0x020a99c0
+_ZN11ModelRender8vfunc_3cEP23ModelRenderCommandsData kind:function(arm,size=0x4) addr:0x020a9994
+_ZN11ModelRender22UnkInit_Struct4_ParamsEhh kind:function(arm,size=0x28) addr:0x020a9998
+_Z19func_ov000_020a99c0P23ModelRenderCommandsData kind:function(arm,size=0x20) addr:0x020a99c0
 func_ov000_020a99e0 kind:function(thumb,size=0x40) addr:0x020a99e0
 func_ov000_020a9a20 kind:function(thumb,size=0x20) addr:0x020a9a20
 func_ov000_020a9a40 kind:function(thumb,size=0x28) addr:0x020a9a40
@@ -4797,7 +4797,8 @@ data_ov000_020e5778 kind:data(any) addr:0x020e5778
 _ZTV15LinkStateFollow kind:data(any) addr:0x020e57a4
 data_ov000_020e57f0 kind:data(any) addr:0x020e57f0
 data_ov000_020e5808 kind:data(any) addr:0x020e5808
-data_ov000_020e5820 kind:data(any) addr:0x020e5820
+_ZTV11ModelRender kind:data(any) addr:0x020e5818
+data_ov000_020e5868_pad kind:data(any) addr:0x020e5860
 data_ov000_020e5868 kind:data(any) addr:0x020e5868
 data_ov000_020e5878 kind:data(any) addr:0x020e5878
 data_ov000_020e58e8 kind:data(any) addr:0x020e58e8
diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index 5f15907d..b5cfcfa7 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -802,7 +802,7 @@ func_02018ae8 kind:function(arm,size=0x68) addr:0x02018ae8
 func_02018b50 kind:function(arm,size=0x78) addr:0x02018b50
 func_02018bc8 kind:function(arm,size=0x74) addr:0x02018bc8
 func_02018c3c kind:function(arm,size=0x54) addr:0x02018c3c
-func_02018c90 kind:function(arm,size=0x14) addr:0x02018c90
+UnkInit_ModelRender_Struct4_Params kind:function(arm,size=0x14) addr:0x02018c90
 func_02018ca4 kind:function(arm,size=0x14) addr:0x02018ca4
 func_02018cb8 kind:function(arm,size=0x8) addr:0x02018cb8
 func_02018cc0 kind:function(arm,size=0xc) addr:0x02018cc0
@@ -847,7 +847,7 @@ func_0201987c kind:function(arm,size=0x40) addr:0x0201987c
 func_020198bc kind:function(arm,size=0x48) addr:0x020198bc
 func_02019904 kind:function(arm,size=0x17c) addr:0x02019904
 func_02019a80 kind:function(arm,size=0x68) addr:0x02019a80
-func_02019ae8 kind:function(arm,size=0xdc) addr:0x02019ae8
+ExecModelRenderCommands kind:function(arm,size=0xdc) addr:0x02019ae8
 func_02019bc4 kind:function(arm,size=0x28) addr:0x02019bc4
 func_02019bec kind:function(arm,size=0x28) addr:0x02019bec
 func_02019c14 kind:function(arm,size=0x308) addr:0x02019c14