Merge pull request #225 from robojumper/d_gfx

d_gfx mostly OK

2 files changed, 39 insertions, 31 deletions

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index fd559e4b..f86ffcfa 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -217,8 +217,15 @@ d/d_font_manager.cpp:
 	.bss        start:0x80597608 end:0x80597740
 
 d/d_gfx.cpp:
-	.text       start:0x800541F0 end:0x80054B00 align:16
-	.sbss       start:0x80575110 end:0x805751A8
+	.text       start:0x800541F0 end:0x8005486C align:16
+	.sbss       start:0x80575110 end:0x80575118
+	.sdata2     start:0x80576F38 end:0x80576F50
+
+d/d_gfx_measures.cpp:
+	.text       start:0x80054870 end:0x80054B00 align:16
+	.sdata      start:0x80571C50 end:0x80571C58
+	.sbss       start:0x80575118 end:0x805751A8
+	.sdata2     start:0x80576F50 end:0x80576F60
 
 d/d_heap.cpp:
 	.text       start:0x80054B00 end:0x80054F30 align:16
@@ -507,6 +514,7 @@ toBeSorted/nand_request_thread.cpp:
 toBeSorted/nand_result_tracker.cpp:
 	.text       start:0x800BD610 end:0x800BD8C0 align:16
 	.rodata     start:0x804E4C50 end:0x804E4C90
+	.data       start:0x80510B70 end:0x80510B88
 	.sbss       start:0x805753D8 end:0x805753E0
 
 d/flag/flag_managers.cpp:
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index b4dfc78f..8bf8ce41 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -544,14 +544,14 @@ fn_800161B0 = .text:0x800161B0; // type:function size:0x10
 fn_800161C0 = .text:0x800161C0; // type:function size:0x34
 defaultSet__3d2dFv = .text:0x80016200; // type:function size:0xF4
 draw__3d2dFv = .text:0x80016300; // type:function size:0x28
-fn_80016330 = .text:0x80016330; // type:function size:0x28
+drawBefore__3d2dFv = .text:0x80016330; // type:function size:0x28
 fn_80016360 = .text:0x80016360; // type:function size:0x54
 fn_800163C0 = .text:0x800163C0; // type:function size:0x248
 fn_80016610 = .text:0x80016610; // type:function size:0x14
-fn_80016630 = .text:0x80016630; // type:function size:0x58
+create__3d2dFPQ23EGG4Heap = .text:0x80016630; // type:function size:0x58
 fn_80016690 = .text:0x80016690; // type:function size:0xC
 fn_800166A0 = .text:0x800166A0; // type:function size:0x58
-fn_80016700 = .text:0x80016700; // type:function size:0x160
+create__3d3dFPQ23EGG4Heap = .text:0x80016700; // type:function size:0x160
 fn_80016860 = .text:0x80016860; // type:function size:0x28
 createLightTextures__3d3dFv = .text:0x80016890; // type:function size:0x98
 fn_80016930 = .text:0x80016930; // type:function size:0x2C
@@ -2202,16 +2202,16 @@ getFontPath__10dFontMng_cFUc = .text:0x80053FF0; // type:function size:0xB4
 create__10dFontMng_cFv = .text:0x800540B0; // type:function size:0xB4
 __sinit_\d_font_manager_cpp = .text:0x80054170; // type:function size:0x58 scope:local
 __arraydtor$3926 = .text:0x800541D0; // type:function size:0x1C scope:local
-fn_800541F0 = .text:0x800541F0; // type:function size:0xD4
-fn_800542D0 = .text:0x800542D0; // type:function size:0x70
-fn_80054340 = .text:0x80054340; // type:function size:0x54
-fn_800543A0 = .text:0x800543A0; // type:function size:0x3C
-fn_800543E0 = .text:0x800543E0; // type:function size:0x124
-InitModelHeapMaybe = .text:0x80054510; // type:function size:0x38
-ThisCopiesScreenForTransparency = .text:0x80054550; // type:function size:0x31C
-fn_80054870 = .text:0x80054870; // type:function size:0x25C
-fn_80054AD0 = .text:0x80054AD0; // type:function size:0x10
-NeedsScreenAdjustment = .text:0x80054AE0; // type:function size:0x14
+__ct__6dGfx_cFv = .text:0x800541F0; // type:function size:0xD4
+getTextureBuffer__6dGfx_cFv = .text:0x800542D0; // type:function size:0x70
+releaseTextureBuffer__6dGfx_cFv = .text:0x80054340; // type:function size:0x54
+drawBefore__6dGfx_cFv = .text:0x800543A0; // type:function size:0x3C
+drawLetterbox__6dGfx_cFv = .text:0x800543E0; // type:function size:0x124
+create__6dGfx_cFPQ23EGG4Heap = .text:0x80054510; // type:function size:0x38
+drawCapTexture__6dGfx_cFPQ23EGG13TextureBufferPQ34nw4r2ut5Color = .text:0x80054550; // type:function size:0x31C
+initGfxConstants__6dGfx_cFv = .text:0x80054870; // type:function size:0x25C
+isTvMode4To3__6dGfx_cFv = .text:0x80054AD0; // type:function size:0x10
+isTvModeWidescreen__6dGfx_cFv = .text:0x80054AE0; // type:function size:0x14
 __dt__14dHeapAllocatorFv = .text:0x80054B00; // type:function size:0x40 scope:weak
 onAlloc__14dHeapAllocatorFPQ23EGG12HeapAllocArg = .text:0x80054B40; // type:function size:0x20
 init__5dHeapFPCcUlPQ23EGG4Heap = .text:0x80054B60; // type:function size:0x64
@@ -2830,9 +2830,9 @@ EGG__ConfigurationData__onBeginFrame = .text:0x800643D0; // type:function size:0
 dSys_c__endFrame = .text:0x800643E0; // type:function size:0x48
 EGG__ConfigurationData__onEndFrame = .text:0x80064430; // type:function size:0x4
 dSys_c__setBlack = .text:0x80064440; // type:function size:0x80
-setFrameRate__4dSysFUl = .text:0x800644C0; // type:function size:0x10
-getFrameRate__4dSysFv = .text:0x800644D0; // type:function size:0x10
-setClearColor__4dSysF6mColor = .text:0x800644E0; // type:function size:0x60
+setFrameRate__6dSys_cFUc = .text:0x800644C0; // type:function size:0x10
+getFrameRate__6dSys_cFv = .text:0x800644D0; // type:function size:0x10
+setClearColor__6dSys_cFQ34nw4r2ut5Color = .text:0x800644E0; // type:function size:0x60
 dSys_c__getClearColor = .text:0x80064540; // type:function size:0x14
 dSys_c__create = .text:0x80064560; // type:function size:0x3BC
 setPosParam__Q23EGG14CoreControllerFff = .text:0x80064920; // type:function size:0x8
@@ -28242,7 +28242,7 @@ sMsgWindowFlags = .rodata:0x804E3C30; // type:object size:0x1004 scope:local
 lbl_804E4C50 = .rodata:0x804E4C50; // type:object size:0x18
 lbl_804E4C68 = .rodata:0x804E4C68; // type:object size:0xC data:string
 lbl_804E4C74 = .rodata:0x804E4C74; // type:object size:0xC data:string
-lbl_804E4C80 = .rodata:0x804E4C80; // type:object size:0x10
+lbl_804E4C80 = .rodata:0x804E4C80; // type:object size:0xC data:string
 lbl_804E4C90 = .rodata:0x804E4C90; // type:object size:0x18
 lbl_804E4CA8 = .rodata:0x804E4CA8; // type:object size:0x10 align:4 data:float
 lbl_804E4CB8 = .rodata:0x804E4CB8; // type:object size:0x10 align:4 data:float
@@ -39233,7 +39233,7 @@ lbl_80571C38 = .sdata:0x80571C38; // type:object size:0x8 data:string
 status_1__4dDyl = .sdata:0x80571C40; // type:object size:0x4 data:4byte
 status_2__4dDyl = .sdata:0x80571C44; // type:object size:0x4 data:4byte
 lbl_80571C48 = .sdata:0x80571C48; // type:object size:0x8
-lbl_80571C50 = .sdata:0x80571C50; // type:object size:0x4 align:4 data:float
+g_CurrentScreenTo4x3WidthScale__6dGfx_c = .sdata:0x80571C50; // type:object size:0x4 align:4 data:float
 lbl_80571C58 = .sdata:0x80571C58; // type:object size:0x8 data:byte
 m_current_ex__Q24dPad4ex_c = .sdata:0x80571C60; // type:object size:0x4 data:4byte
 lbl_80571C68 = .sdata:0x80571C68; // type:object size:0x8
@@ -41353,7 +41353,7 @@ Initialized__4dDyl = .sbss:0x805750F4; // type:object size:0x1 data:byte
 DVD__4dDyl = .sbss:0x805750F8; // type:object size:0x4 data:4byte
 mFaderColor = .sbss:0x80575100; // type:object size:0x4 scope:local data:byte
 @GUARD@getFontPath__10dFontMng_cFUc@TEMP_FONT_NAME = .sbss:0x80575108; // type:object size:0x1 scope:local data:byte
-sInstance__6dGfx_c = .sbss:0x80575110; // type:object size:0x8 data:4byte
+sInstance__6dGfx_c = .sbss:0x80575110; // type:object size:0x4 data:4byte
 g_CurrentScreenWidth_s32__6dGfx_c = .sbss:0x80575118; // type:object size:0x4 data:4byte
 g_CurrentScreenHeight_s32__6dGfx_c = .sbss:0x8057511C; // type:object size:0x4 data:4byte
 g_CurrentScreenWidthLimit_s32__6dGfx_c = .sbss:0x80575120; // type:object size:0x4 data:4byte
@@ -41417,12 +41417,12 @@ sGuideColor2__19daPlayerModelBase_c = .sbss:0x80575214; // type:object size:0x4
 sGuideColor3__19daPlayerModelBase_c = .sbss:0x80575218; // type:object size:0x4 data:4byte
 RootActorParams = .sbss:0x80575220; // type:object size:0x4 scope:local data:4byte
 ms_configuration_p__6dSys_c = .sbss:0x80575228; // type:object size:0x4 data:4byte
-dSys_c__ms_RootHeapMem1 = .sbss:0x8057522C; // type:object size:0x4 data:4byte
-dSys_c__ms_RootHeapMem2 = .sbss:0x80575230; // type:object size:0x4 data:4byte
-dSystem__s_OrgMEM1ArenaLo = .sbss:0x80575234; // type:object size:0x4 data:4byte
-dSystem__s_NewMEM1ArenaLo = .sbss:0x80575238; // type:object size:0x4 data:4byte
-dSystem__s_OrgMEM1ArenaHi = .sbss:0x8057523C; // type:object size:0x4 data:4byte
-dSystem__s_NewMEM1ArenaHi = .sbss:0x80575240; // type:object size:0x8 data:4byte
+ms_RootHeapMem1__6dSys_c = .sbss:0x8057522C; // type:object size:0x4 data:4byte
+ms_RootHeapMem2__6dSys_c = .sbss:0x80575230; // type:object size:0x4 data:4byte
+s_OrgMEM1ArenaLo__7dSystem = .sbss:0x80575234; // type:object size:0x4 data:4byte
+s_NewMEM1ArenaLo__7dSystem = .sbss:0x80575238; // type:object size:0x4 data:4byte
+s_OrgMEM1ArenaHi__7dSystem = .sbss:0x8057523C; // type:object size:0x4 data:4byte
+s_NewMEM1ArenaHi__7dSystem = .sbss:0x80575240; // type:object size:0x8 data:4byte
 dSystem__myDylinkInitPhase = .sbss:0x80575248; // type:object size:0x8
 sInstance__18ArcCallbackHandler = .sbss:0x80575250; // type:object size:0x8 data:4byte
 aspectRatio = .sbss:0x80575258; // type:object size:0x4 align:4 data:float
@@ -42962,10 +42962,10 @@ lbl_80576F1C = .sdata2:0x80576F1C; // type:object size:0x4 align:4 data:float
 @6125 = .sdata2:0x80576F28; // type:object size:0x4 scope:local align:4 data:float
 @6126 = .sdata2:0x80576F2C; // type:object size:0x4 scope:local align:4 data:float
 @6129 = .sdata2:0x80576F30; // type:object size:0x8 scope:local align:8 data:double
-lbl_80576F38 = .sdata2:0x80576F38; // type:object size:0x4 align:4 data:float
-lbl_80576F3C = .sdata2:0x80576F3C; // type:object size:0x4 align:4 data:float
-lbl_80576F40 = .sdata2:0x80576F40; // type:object size:0x4 align:4 data:float
-lbl_80576F48 = .sdata2:0x80576F48; // type:object size:0x8 align:8 data:double
+@16332 = .sdata2:0x80576F38; // type:object size:0x4 scope:local align:4 data:float
+@16333 = .sdata2:0x80576F3C; // type:object size:0x4 scope:local align:4 data:float
+@16334 = .sdata2:0x80576F40; // type:object size:0x4 scope:local align:4 data:float
+@16368 = .sdata2:0x80576F48; // type:object size:0x8 scope:local align:8 data:double
 lbl_80576F50 = .sdata2:0x80576F50; // type:object size:0x4 align:4 data:float
 lbl_80576F58 = .sdata2:0x80576F58; // type:object size:0x8 align:8 data:double
 lbl_80576F60 = .sdata2:0x80576F60; // type:object size:0x4 align:4 data:float