Misc Matches using debug (#2388)

1 files changed, 9 insertions, 223 deletions

diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp
index 1b5aa62fe4..2f2eb3dc01 100644
--- a/src/d/d_msg_scrn_talk.cpp
+++ b/src/d/d_msg_scrn_talk.cpp
@@ -1,5 +1,4 @@
 //
-// Generated By: dol2asm
 // Translation Unit: msg/scrn/d_msg_scrn_talk
 //
 
@@ -17,161 +16,6 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "dol2asm.h"
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap();
-extern "C" void __dt__14dMsgScrnTalk_cFv();
-extern "C" void exec__14dMsgScrnTalk_cFv();
-extern "C" void drawSelf__14dMsgScrnTalk_cFv();
-extern "C" void arwAnimeInit__14dMsgScrnTalk_cFv();
-extern "C" void arwAnimeMove__14dMsgScrnTalk_cFv();
-extern "C" void dotAnimeInit__14dMsgScrnTalk_cFv();
-extern "C" void dotAnimeMove__14dMsgScrnTalk_cFv();
-extern "C" void setSelectString__14dMsgScrnTalk_cFPcPcPc();
-extern "C" void setSelectRubyString__14dMsgScrnTalk_cFPcPcPc();
-extern "C" void isSelect__14dMsgScrnTalk_cFv();
-extern "C" void selectAnimeInit__14dMsgScrnTalk_cFUcUcfUc();
-extern "C" void selectAnimeMove__14dMsgScrnTalk_cFUcUcb();
-extern "C" void selectAnimeEnd__14dMsgScrnTalk_cFv();
-extern "C" void fukiScale__14dMsgScrnTalk_cFf();
-extern "C" void fukiTrans__14dMsgScrnTalk_cFff();
-extern "C" void fukiAlpha__14dMsgScrnTalk_cFf();
-extern "C" void fukiPosCalc__14dMsgScrnTalk_cFUc();
-extern "C" extern char const* const msg_scrn_d_msg_scrn_talk__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoExt_getMesgFont__Fv();
-extern "C" void mDoLib_project__FP3VecP3Vec();
-extern "C" void dComIfGp_getSubHeap2D__Fi();
-extern "C" void
-drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc();
-extern "C" void getActor__12dMsgObject_cFv();
-extern "C" void __ct__17dMsgScrn3Select_cFv();
-extern "C" void isSelect__17dMsgScrn3Select_cFv();
-extern "C" void setString__17dMsgScrn3Select_cFPcPcPc();
-extern "C" void setRubyString__17dMsgScrn3Select_cFPcPcPc();
-extern "C" void translate__17dMsgScrn3Select_cFff();
-extern "C" void draw__17dMsgScrn3Select_cFff();
-extern "C" void selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc();
-extern "C" void selAnimeMove__17dMsgScrn3Select_cFUcUcb();
-extern "C" void selAnimeEnd__17dMsgScrn3Select_cFv();
-extern "C" void getTextBoxWidth__17dMsgScrn3Select_cFv();
-extern "C" void getFontSize__17dMsgScrn3Select_cFv();
-extern "C" void getRubyFontSize__17dMsgScrn3Select_cFv();
-extern "C" void getCharSpace__17dMsgScrn3Select_cFv();
-extern "C" void getRubyCharSpace__17dMsgScrn3Select_cFv();
-extern "C" void getTextBoxGlobalPosX__17dMsgScrn3Select_cFi();
-extern "C" void getTextBoxGlobalPosY__17dMsgScrn3Select_cFi();
-extern "C" void __ct__15dMsgScrnArrow_cFv();
-extern "C" void draw__15dMsgScrnArrow_cFv();
-extern "C" void setPos__15dMsgScrnArrow_cFff();
-extern "C" void arwAnimeInit__15dMsgScrnArrow_cFv();
-extern "C" void arwAnimeMove__15dMsgScrnArrow_cFv();
-extern "C" void dotAnimeInit__15dMsgScrnArrow_cFv();
-extern "C" void dotAnimeMove__15dMsgScrnArrow_cFv();
-extern "C" void __ct__14dMsgScrnBase_cFv();
-extern "C" void __dt__14dMsgScrnBase_cFv();
-extern "C" void init__14dMsgScrnBase_cFv();
-extern "C" void multiDraw__14dMsgScrnBase_cFv();
-extern "C" void draw__14dMsgScrnBase_cFv();
-extern "C" void drawOutFont__14dMsgScrnBase_cFfff();
-extern "C" void fontAlpha__14dMsgScrnBase_cFf();
-extern "C" void isTalkNow__14dMsgScrnBase_cFv();
-extern "C" void __ct__15dMsgScrnLight_cFUcUc();
-extern "C" void draw__15dMsgScrnLight_cFPffffffUc();
-extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
-extern "C" void reinit__8CPaneMgrFv();
-extern "C" void getGlobalPosX__8CPaneMgrFv();
-extern "C" void getGlobalPosY__8CPaneMgrFv();
-extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor();
-extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs();
-extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
-extern "C" void setAlphaRate__13CPaneMgrAlphaFf();
-extern "C" void getAlphaRate__13CPaneMgrAlphaFv();
-extern "C" bool __eq__4cXyzCFRC3Vec();
-extern "C" void alloc__7JKRHeapFUli();
-extern "C" void free__7JKRHeapFPv();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void getBounds__7J2DPaneFv();
-extern "C" void __ct__9J2DScreenFv();
-extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
-extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
-extern "C" void setString__10J2DTextBoxFsPCce();
-extern "C" void _savegpr_21();
-extern "C" void _savegpr_26();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_21();
-extern "C" void _restgpr_26();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80399BB0 = "zelda_message_window_new.blo";
-SECTION_DEAD static char const* const stringBase_80399BCD = "zelda_message_window_text_seirei.blo";
-SECTION_DEAD static char const* const stringBase_80399BF2 = "zelda_message_window_text.blo";
-SECTION_DEAD static char const* const stringBase_80399C10 = "";
-#pragma pop
-
-/* 803C13C8-803C1420 01E4E8 0058+00 2/2 0/0 0/0 .data            __vt__14dMsgScrnTalk_c */
-SECTION_DATA extern void* __vt__14dMsgScrnTalk_c[22] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)draw__14dMsgScrnBase_cFv,
-    (void*)__dt__14dMsgScrnTalk_cFv,
-    (void*)exec__14dMsgScrnTalk_cFv,
-    (void*)multiDraw__14dMsgScrnBase_cFv,
-    (void*)drawSelf__14dMsgScrnTalk_cFv,
-    (void*)setSelectString__14dMsgScrnTalk_cFPcPcPc,
-    (void*)setSelectRubyString__14dMsgScrnTalk_cFPcPcPc,
-    (void*)arwAnimeInit__14dMsgScrnTalk_cFv,
-    (void*)arwAnimeMove__14dMsgScrnTalk_cFv,
-    (void*)dotAnimeInit__14dMsgScrnTalk_cFv,
-    (void*)dotAnimeMove__14dMsgScrnTalk_cFv,
-    (void*)isSelect__14dMsgScrnTalk_cFv,
-    (void*)selectAnimeInit__14dMsgScrnTalk_cFUcUcfUc,
-    (void*)selectAnimeMove__14dMsgScrnTalk_cFUcUcb,
-    (void*)selectAnimeEnd__14dMsgScrnTalk_cFv,
-    (void*)fukiScale__14dMsgScrnTalk_cFf,
-    (void*)fukiTrans__14dMsgScrnTalk_cFff,
-    (void*)fukiAlpha__14dMsgScrnTalk_cFf,
-    (void*)fontAlpha__14dMsgScrnBase_cFf,
-    (void*)fukiPosCalc__14dMsgScrnTalk_cFUc,
-};
-
-/* 80454D00-80454D04 003300 0004+00 2/2 0/0 0/0 .sdata2          @4086 */
-SECTION_SDATA2 static f32 lit_4086 = 18.0f;
-
-/* 80454D04-80454D08 003304 0004+00 3/3 0/0 0/0 .sdata2          @4087 */
-SECTION_SDATA2 static u8 lit_4087[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-
-/* 80454D08-80454D0C 003308 0004+00 1/1 0/0 0/0 .sdata2          @4088 */
-SECTION_SDATA2 static f32 lit_4088 = -10.0f;
-
-/* 80454D0C-80454D10 00330C 0004+00 1/1 0/0 0/0 .sdata2          @4089 */
-SECTION_SDATA2 static f32 lit_4089 = 6.0f / 5.0f;
 
 /* 80246FF0-80247A90 241930 0AA0+00 0/0 1/1 0/0 .text __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap */
 dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
@@ -341,7 +185,6 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
     }
 }
 
-
 /* 80247A90-80247D34 2423D0 02A4+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnTalk_cFv */
 dMsgScrnTalk_c::~dMsgScrnTalk_c() {
     delete mpScreen;
@@ -383,10 +226,6 @@ dMsgScrnTalk_c::~dMsgScrnTalk_c() {
     dComIfGp_getMsgCommonArchive()->removeResourceAll();
 }
 
-/* ############################################################################################## */
-/* 80454D10-80454D14 003310 0004+00 2/2 0/0 0/0 .sdata2          @4197 */
-SECTION_SDATA2 static f32 lit_4197 = 1.0f;
-
 /* 80247D34-80247E4C 242674 0118+00 1/0 0/0 0/0 .text            exec__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::exec() {
     if (isTalkNow()) {
@@ -406,24 +245,15 @@ void dMsgScrnTalk_c::exec() {
     }
 }
 
-
-/* ############################################################################################## */
-/* 80454D14-80454D18 003314 0004+00 1/1 0/0 0/0 .sdata2          @4278 */
-SECTION_SDATA2 static f32 lit_4278 = 4.0f / 5.0f;
-
-/* 80454D18-80454D1C 003318 0004+00 1/1 0/0 0/0 .sdata2          @4279 */
-SECTION_SDATA2 static f32 lit_4279 = -1.0f;
-
 /* 80247E4C-802480F0 24278C 02A4+00 1/0 0/0 0/0 .text            drawSelf__14dMsgScrnTalk_cFv */
-// NONMATCHING - regalloc
 void dMsgScrnTalk_c::drawSelf() {
-    CharInfo_c* pCharInfo;
-    J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
-    grafContext->setup2D();
-    pCharInfo = mCharInfoPtr;
-    if (*(s16*)(pCharInfo + 150) > 0) {
+    J2DGrafContext* grafContext[1];
+    grafContext[0] = dComIfGp_getCurrentGrafPort();
+    grafContext[0]->setup2D();
+    s16* pLen = (s16*)(mCharInfoPtr + 150);
+    if (*pLen > 0) {
         f32 dVar10 = mpTm_c[0]->getAlphaRate();
-        for (int i = 0; i < *(s16*)(pCharInfo + 150); i++) {
+        for (int i = 0; i < *pLen; i++) {
             if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) {
                 if (field_0xf8[i] >= 0.0f) {
                     f32 fVar1;
@@ -465,7 +295,7 @@ void dMsgScrnTalk_c::drawSelf() {
         }
     }
     drawOutFont(0.0f, 0.0f, 1.0f);
-    mpTxScreen->draw(0.0f, 0.0f, grafContext);
+    mpTxScreen->draw(0.0f, 0.0f, grafContext[0]);
     if (mpSelect_c != NULL) {
         mpSelect_c->draw(0.0f, 0.0f);
     }
@@ -560,50 +390,6 @@ void dMsgScrnTalk_c::fukiAlpha(f32 param_1) {
     }
 }
 
-/* ############################################################################################## */
-/* 80454D1C-80454D20 00331C 0004+00 1/1 0/0 0/0 .sdata2          @4489 */
-SECTION_SDATA2 static f32 lit_4489 = 608.0f;
-
-/* 80454D20-80454D24 003320 0004+00 1/1 0/0 0/0 .sdata2          @4490 */
-SECTION_SDATA2 static f32 lit_4490 = 448.0f;
-
-/* 80454D24-80454D28 003324 0004+00 1/1 0/0 0/0 .sdata2          @4491 */
-SECTION_SDATA2 static f32 lit_4491 = 0.5f;
-
-/* 80454D28-80454D2C 003328 0004+00 1/1 0/0 0/0 .sdata2          @4492 */
-SECTION_SDATA2 static f32 lit_4492 = 50.0f;
-
-/* 80454D2C-80454D30 00332C 0004+00 1/1 0/0 0/0 .sdata2          @4493 */
-SECTION_SDATA2 static f32 lit_4493 = 105.0f;
-
-/* 80454D30-80454D34 003330 0004+00 1/1 0/0 0/0 .sdata2          @4494 */
-SECTION_SDATA2 static f32 lit_4494 = 486.0f;
-
-/* 80454D34-80454D38 003334 0004+00 1/1 0/0 0/0 .sdata2          @4495 */
-SECTION_SDATA2 static f32 lit_4495 = 230.0f;
-
-/* 80454D38-80454D3C 003338 0004+00 1/1 0/0 0/0 .sdata2          @4496 */
-SECTION_SDATA2 static f32 lit_4496 = 235.0f;
-
-/* 80454D3C-80454D40 00333C 0004+00 1/1 0/0 0/0 .sdata2          @4497 */
-SECTION_SDATA2 static f32 lit_4497 = 355.0f;
-
-/* 80454D40-80454D44 003340 0004+00 1/1 0/0 0/0 .sdata2          @4498 */
-SECTION_SDATA2 static f32 lit_4498 = 209.0f;
-
-/* 80454D44-80454D48 003344 0004+00 1/1 0/0 0/0 .sdata2          @4499 */
-SECTION_SDATA2 static f32 lit_4499 = -190.0f;
-
-/* 80454D48-80454D50 003348 0004+04 1/1 0/0 0/0 .sdata2          @4500 */
-SECTION_SDATA2 static f32 lit_4500[1 + 1 /* padding */] = {
-    190.0f,
-    /* padding */
-    0.0f,
-};
-
-/* 80454D50-80454D58 003350 0008+00 1/1 0/0 0/0 .sdata2          @4502 */
-SECTION_SDATA2 static f64 lit_4502 = 4503601774854144.0 /* cast s32 to float */;
-
 /* 8024835C-80248954 242C9C 05F8+00 1/0 0/0 0/0 .text            fukiPosCalc__14dMsgScrnTalk_cFUc */
 void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) {
     msg_class* msgActor = dMsgObject_c::getActor();
@@ -659,7 +445,7 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) {
     switch (field_0x488) {
     case 1:
         dVar15 = g_MsgObject_HIO_c.mBoxPos[2][0];
-        field_0xf0 = 235.0f - (mpScreen->search('n_all')->getBounds().i.y +
+        field_0xf0 = 105.0f - (mpScreen->search('n_all')->getBounds().i.y +
                                mpScreen->search('n_all')->getBounds().f.y) / 2;
         if (mpSelect_c != NULL) {
             mpSelect_c->translate(486.0f, 230.0f);
@@ -667,7 +453,7 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) {
         break;
     case 2:
         dVar15 = g_MsgObject_HIO_c.mBoxPos[1][0];
-        field_0xf0 = 105.0f - (mpScreen->search('n_all')->getBounds().i.y +
+        field_0xf0 = 235.0f - (mpScreen->search('n_all')->getBounds().i.y +
                                mpScreen->search('n_all')->getBounds().f.y) / 2;
         if (mpSelect_c != NULL) {
             mpSelect_c->translate(486.0f, 355.0f);