Work on d_menu_dmap (#2073)

* Move some J2DPicture inlines to header

* Work on d_menu_dmap

* JASBasicInst OK

* JASCalc cleanup

3 files changed, 9 insertions, 87 deletions

diff --git a/libs/JSystem/JAudio2/JASBasicInst.cpp b/libs/JSystem/JAudio2/JASBasicInst.cpp
index ffeff4c682..286a38cd75 100644
--- a/libs/JSystem/JAudio2/JASBasicInst.cpp
+++ b/libs/JSystem/JAudio2/JASBasicInst.cpp
@@ -1,52 +1,10 @@
 //
-// Generated By: dol2asm
-// Translation Unit: JASBasicInst
+// JASBasicInst
 //
 
 #include "JSystem/JAudio2/JASBasicInst.h"
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__12JASBasicInstFv();
-extern "C" void __dt__12JASBasicInstFv();
-extern "C" void getParam__12JASBasicInstCFiiP12JASInstParam();
-extern "C" void setKeyRegionCount__12JASBasicInstFUlP7JKRHeap();
-extern "C" void setOsc__12JASBasicInstFiPCQ213JASOscillator4Data();
-extern "C" void getKeyRegion__12JASBasicInstFi();
-extern "C" void __dt__Q212JASBasicInst7TKeymapFv();
-extern "C" void __dt__7JASInstFv();
-extern "C" void __ct__Q212JASBasicInst7TKeymapFv();
-extern "C" void getType__12JASBasicInstCFv();
-
-//
-// External References:
-//
-
-extern "C" void bzero__7JASCalcFPvUl();
-extern "C" void* __nwa__FUlP7JKRHeapi();
-extern "C" void __dl__FPv();
-extern "C" void __destroy_new_array();
-extern "C" void __construct_new_array();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_29();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-
-// /* 803C76FC-803C7710 02481C 0014+00 3/3 2/2 0/0 .data            __vt__7JASInst */
-SECTION_DATA extern void* __vt__7JASInst[5];
 
 /* 80298014-8029807C 292954 0068+00 0/0 2/2 0/0 .text            __ct__12JASBasicInstFv */
 JASBasicInst::JASBasicInst() {
@@ -116,21 +74,3 @@ JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int param_0) {
 /* 80298250-8029828C 292B90 003C+00 2/2 0/0 0/0 .text            __dt__Q212JASBasicInst7TKeymapFv */
 JASBasicInst::TKeymap::~TKeymap() {
 }
-
-/* 8029828C-802982D4 292BCC 0048+00 1/0 0/0 0/0 .text            __dt__7JASInstFv */
-// If not here, default placement is after JASBasicInst::JASBasicInst
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-//asm JASInst::~JASInst() {
-asm void __dt__7JASInstFv() {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASBasicInst/__dt__7JASInstFv.s"
-}
-#pragma pop
-
-/* 802982D4-802982E0 292C14 000C+00 1/1 0/0 0/0 .text            __ct__Q212JASBasicInst7TKeymapFv */
-JASBasicInst::TKeymap::TKeymap() {
-    field_0x0 = -1;
-}
-
diff --git a/libs/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/JAudio2/JASCalc.cpp
index 83ae399076..d8c71836aa 100644
--- a/libs/JSystem/JAudio2/JASCalc.cpp
+++ b/libs/JSystem/JAudio2/JASCalc.cpp
@@ -1,30 +1,12 @@
 //
-// Generated By: dol2asm
-// Translation Unit: JASCalc
+// JASCalc
 //
 
 #include "JSystem/JAudio2/JASCalc.h"
-#include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "math.h"
 #include "limits.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 8028F2E8-8028F318 289C28 0030+00 0/0 1/1 0/0 .text            imixcopy__7JASCalcFPCsPCsPsUl */
 void JASCalc::imixcopy(const s16 *s1, const s16 *s2, s16 *dst, u32 n) {
     for (n; n != 0; n--) {
@@ -154,7 +136,7 @@ void JASCalc::bzero(void *dest, u32 size) {
 
 /* ############################################################################################## */
 /* 8039ABB8-8039AFB8 027218 0400+00 0/0 4/4 0/0 .rodata          CUTOFF_TO_IIR_TABLE__7JASCalc */
-SECTION_RODATA s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
+s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
     0x0F5C, 0x0A3D, 0x4665, 0x1E73,
     0x0F5E, 0x0A3D, 0x4664, 0x1E73,
     0x0F63, 0x0A3C, 0x4661, 0x1E71,
@@ -284,7 +266,6 @@ SECTION_RODATA s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
     0x7E3B, 0x0029, 0x011B, 0x007A,
     0x7FFF, 0x0000, 0x0000, 0x0000,
 };
-COMPILER_STRIP_GATE(0x8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE);
 
 // currently required because of missing functions
 // JASCalc::hannWindow(short *, unsigned long)
diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp
index 5c304db5fd..f7c2b7cc16 100644
--- a/libs/JSystem/JUtility/JUTException.cpp
+++ b/libs/JSystem/JUtility/JUTException.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
+#include "JSystem/JUtility/JUTDirectFile.h"
 #include "math.h"
 #include "stdio.h"
 #include "stdlib.h"
@@ -997,7 +998,7 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
         return false;
     }
 
-    int result = 0;
+    bool result = 0;
     do {
         char* src = buffer;
         int found_section = 0;
@@ -1012,11 +1013,10 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
                         break;
                 }
 
-                char* dst = section_name;
                 int i = 0;
                 char* src = buffer + 1;
-                for (; *src != '\0'; i++, dst++, src++) {
-                    *dst = *src;
+                for (; *src != '\0'; i++, src++) {
+                    section_name[i] = *src;
                     if (*src == ' ' || i == 0xf)
                         break;
                 }
@@ -1100,7 +1100,8 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
     }
 
 end:
-    bool bresult = (file.fclose() & 0xFF) != 0;
+    file.fclose();
+    bool bresult = result != false;
     return bresult;
 }
 #else