move core1/code_1E820.c to hasm

README.md

@@ -1,4 +1,4 @@
-# banjo (94.9689%)
+# banjo (94.9890%)
 
 <img src="./progress/progress_total.svg">
 

decompressed.us.v10.yaml

@@ -184,7 +184,7 @@ segments:
   - [0xF36820, c, code_1D5D0]                #DONE
   - [0xF375B0, c, done/code_1E360]           #DONE
   - [0xF37930, c, code_1E6E0]                #DONE
-  - [0xF37A70, c, code_1E820]
+  - [0xF37A70, hasm, code_1E820]
   - [0xF37B10, c, done/audio/n_sl]           #DONE
   - [0xF37BA0, c, done/audio/n_synthesizer]  #DONE
   - [0xF38580, c, done/audio/event]          #DONE
@@ -385,7 +385,7 @@ segments:
   - [0xF52660, .data, code_1BE90]
   - [0xF52670, .data, code_1D5D0]
   - [0xF52690, .data, done/code_1E360]
-  - [0xF526A0, .data, code_1E820]
+  - [0xF526A0, bin, data_F526A0] # .data, code_1E820]
   - [0xF526B0, .data, done/audio/n_sl]
   - [0xF526C0, .data, done/audio/n_drvrNew]
   - [0xF52850, .data, done/audio/n_env]

progress/progress_core1.svg

@@ -17,7 +17,7 @@
         <text x="22.0" y="14">core1</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">90.3213%</text>
+        <text x="78.5" y="15" fill="#010101" fill-opacity=".3">90.4597%</text>
-        <text x="77.5" y="14">90.3213%</text>
+        <text x="77.5" y="14">90.4597%</text>
     </g>
 </svg>

progress/progress_total.svg

@@ -9,7 +9,7 @@
     </mask>
     <g mask="url(#anybadge_1)">
         <path fill="#555" d="M0 0h150v20H0z"/>
-        <path fill="#17e000" d="M150 0h67v20H150z"/>
+        <path fill="#16e000" d="M150 0h67v20H150z"/>
         <path fill="url(#b)" d="M0 0h217v20H0z"/>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
         <text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
     </g>
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.9689%</text>
+        <text x="184.5" y="15" fill="#010101" fill-opacity=".3">94.9890%</text>
-        <text x="183.5" y="14">94.9689%</text>
+        <text x="183.5" y="14">94.9890%</text>
     </g>
 </svg>

src/core1/code_136D0.c

@@ -2,6 +2,17 @@
 #include "functions.h"
 #include "variables.h"
 
+extern u8 core2_VRAM[];
+extern u8 core2_VRAM_END[];
+extern u8 core2_ROM_START[];
+extern u8 core2_ROM_END[];
+extern u8 core2_TEXT_START[];
+extern u8 core2_TEXT_END[];
+extern u8 core2_DATA_START[];
+extern u8 core2_RODATA_END[];
+extern u8 core2_BSS_START[];
+extern u8 core2_BSS_END[];
+
 typedef struct struct_2a_s{
     char *name;
     u32 ram_start;
@@ -134,35 +145,16 @@ s32 func_802512FC(void){
     D_80282800 = 0;
 }
 
-#ifdef NONMATCHING
-//this matches, but requires core2 section address to be linked to core
-//needed for shiftability
-extern u8 core2_VRAM_START[]; //core2 RAM start
-extern u8 core2_VRAM_END[]; //core2 RAM end
-
-extern u8 core2_us_v10_rzip_ROM_START[];
-extern u8 core2_us_v10_rzip_ROM_END[];
-extern u8 core2_TEXT_START[];
-extern u8 core2_TEXT_END[];
-extern u8 core2_DATA_START[];
-extern u8 core2_DATA_END[];
-extern u8 core2_BSS_START[];
-extern u8 core2_BSS_END[];
-
 void func_80251308(void){
     func_802512FC();
     func_80253050(0, 
-        core2_VRAM_START, core2_VRAM_END,
+        core2_VRAM, core2_VRAM_END,
-        core2_us_v10_rzip_ROM_START, core2_us_v10_rzip_ROM_END,
+        core2_ROM_START, core2_ROM_END,
         core2_TEXT_START, core2_TEXT_END,
-        core2_DATA_START, core2_DATA_END,
+        core2_DATA_START, core2_RODATA_END,
         core2_BSS_START, core2_BSS_END
     );
     func_802511C4();
 }
 
-#else
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_136D0/func_80251308.s")
-#endif
-
 void func_802513A4(void){}

src/core1/code_1E820.c

@@ -1,12 +0,0 @@
-#include <ultra64.h>
-#include "functions.h"
-#include "variables.h"
-
-s64 D_80376E70 = 0xAB8D9F7781280783;
-
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_1E820/func_8025C240.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_1E820/func_8025C288.s")
-
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_1E820/func_8025C29C.s")
-

src/core2/code_78E50.c

@@ -24,7 +24,7 @@ f32 D_80381EB8;
 f32 D_80381EBC;
 s32 D_80381EC0;
 s32 D_80381EC4;
-char D_80381EC8[8];
+char code_78E50_ItemValueString[8];
 struct7s D_80381ED0;
 
 /* .code */
@@ -78,9 +78,9 @@ void func_802FFF34(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
 
     sp10C = -1;
     sp108 = *vtx;
-    D_80381EC8[0] = '\0';
+    code_78E50_ItemValueString[0] = '\0';
-    strIToA(D_80381EC8, MIN(9, itemPrint_getValue(item_id)));
+    strIToA(code_78E50_ItemValueString, MIN(9, itemPrint_getValue(item_id)));
-    print_bold_spaced(0x4E, (s32) (func_802FB0E4(arg1) + -16.0f + 4.0f), (char *) &D_80381EC8);
+    print_bold_spaced(0x4E, (s32) (func_802FB0E4(arg1) + -16.0f + 4.0f), (char *) &code_78E50_ItemValueString);
     if(1); //fake
     if (D_80381EB0[D_80381EC4] != NULL) {
         gSPDisplayList((*gfx)++, D_8036A278);