finally

PAPER_MARIO.u.yaml

@@ -219,7 +219,10 @@ ranges:
   - [0x107830, 0x1086a0, "asm", "code_107830_len_e70", 0x802E5FB0]
   - [0x1086a0, 0x109660, "asm", "code_1086a0_len_fc0", 0x802E6E20]
   - [0x109660, 0x10A9F0, "asm", "code_109660_len_1270", 0x802E7DE0]
-  - [0x10A9F0, 0x163400, "bin", "bin_10A9F0"]
+  - [0x10A9F0, 0x131340, "bin", "bin_10A9F0"]
+  - [0x131340, 0x135EE0, "bin", "bin_131340"]
+  - [0x135EE0, 0x1422A0, "asm", "code_135EE0", 0x80242BA0]
+  - [0x1422A0, 0x163400, "bin", "bin_1422A0"]
   - [0x163400, 0x167570, "asm", "code_163400", 0x80242BA0]
   - [0x167570, 0x168590, "asm", "code_167570", 0x80246D10]
   - [0x168590, 0x169BE0, "asm", "code_168590", 0x80247D30]

papermario/asm/code_163400.s

@@ -1743,7 +1743,6 @@ glabel func_802431A0
 /* 164C78 80244418 4406A000 */  mfc1  $a2, $f20
 /* 164C7C 8024441C 4407A000 */  mfc1  $a3, $f20
 /* 164C80 80244420 0200202D */  daddu $a0, $s0, $zero
-glabel func_80244424
 /* 164C84 80244424 0C019EC8 */  jal   guRotateF
 /* 164C88 80244428 E7BA0010 */   swc1  $f26, 0x10($sp)
 /* 164C8C 8024442C 0200202D */  daddu $a0, $s0, $zero

papermario/asm/code_ddaf0_len_c50.s

@@ -723,6 +723,7 @@ glabel func_80147D70
 /* 0DE540 80147E40 03E00008 */  jr    $ra
 /* 0DE544 80147E44 27BD0108 */   addiu $sp, $sp, 0x108
 
+glabel func_80147E48
 /* 0DE548 80147E48 3C028016 */  lui   $v0, 0x8016
 /* 0DE54C 80147E4C 24429D50 */  addiu $v0, $v0, -0x62b0
 /* 0DE550 80147E50 00042140 */  sll   $a0, $a0, 5

papermario/papermario.ld

@@ -1052,11 +1052,26 @@ SECTIONS
       build/asm/code_109660_len_1270.o(.text802E7DE0);
    }
 
-   /* 0x00000000 10A9F0-163400 [58A10] */
+   /* 0x00000000 10A9F0-131340 [???] */
    .data0010A9F0 0x0010A9F0 : AT(0x10A9F0) {
       build/bin/papermario.10A9F0.bin_10A9F0.o(.data);
    }
 
+   /* 0x00000000 131340-135EE0 [???] */
+   .data00131340 0x00131340 : AT(0x131340) {
+      build/bin/papermario.131340.bin_131340.o(.data);
+   }
+
+   /* 0x80242BA0 135EE0-1422A0 [???] */
+   .text80242BA0_2 0x80242BA0 : AT(0x135EE0) {
+      build/asm/code_135EE0.o(.text80242BA0_2);
+   }
+
+   /* 0x00000000 1422A0-163400 [???] */
+   .data001422A0 0x001422A0 : AT(0x1422A0) {
+      build/bin/papermario.1422A0.bin_1422A0.o(.data);
+   }
+
    /* 0x80242BA0 163400-167570 [4170] */
    .text80242BA0 0x80242BA0 : AT(0x163400) {
       build/asm/code_163400.o(.text80242BA0);

papermario/tools/glabel.py

@@ -8,7 +8,7 @@ def replace_func(match):
         return match
     return "glabel " + match[:-1]
 
-for root, dirs, files in os.walk("papermario/asm"):
+for root, dirs, files in os.walk("asm"):
     for file in files:
         for file in files:
             if file.endswith(".s"):