Name pushTitle_8c015fd6

Also fixes build
lhsazevedo · Apr 4, 2024 · 3e18c9a · 3e18c9a
1 parent aeadb18
commit 3e18c9a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 23 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -1,6 +1,6 @@
 set -e
 
-sh4objtest=sh4objtest
+sh4objtest=$HOME/.config/composer/vendor/bin/sh4objtest
 
 ASMSH_FLAGS="-debug=d -cpu=sh4 -endian=little -sjis"
 
@@ -51,8 +51,8 @@ $sh4objtest "tests/_012100_8c012f44.php" "build/_012100_8c012f44_c.obj"
 
 # _004384_8c011120
 # TODO: Integrate
-assemble  src/asm/_004384_8c011120.src
-compile  src/non_matching/_004384_8c011120.c
+assemble  src/asm/decompiled/_004384_8c011120.src
+compile  src/_004384_8c011120.c
 
 $sh4objtest "tests/004384_8c011120/4338_initDatQueue_8c011124.php" "build/_004384_8c011120_src.obj"
 $sh4objtest "tests/004384_8c011120/4338_initDatQueue_8c011124.php" "build/_004384_8c011120_c.obj"

diff --git a/src/_004384_8c011120.c b/src/_004384_8c011120.c
@@ -1,7 +1,6 @@
 #include <shinobi.h>
 #include <string.h>
 #include "_019100_8c014a9c_tasks.h"
-#include "scif.h"
 
 /* struct QueuedDat {
     char *basedir;

diff --git a/src/_012100_8c012f44.c b/src/_012100_8c012f44.c
@@ -425,7 +425,7 @@ void task_8c012f44()
             init_8c03bd80 = 1;
             init_8c03bd84 = 0;
         } else {
-            FUN_8c015fd6(1);
+            pushTitle_8c015fd6(1);
         }
     }
 }
@@ -629,7 +629,7 @@ void task_8c013388(Task *task, void *state) {
                 freeTask_8c014b66(task);
                 initSoundMidiAdx_8c010e18();
                 var_8c2260a8 = 1;
-                FUN_8c015fd6(0);
+                pushTitle_8c015fd6(0);
             }
             break;
         }

diff --git a/src/_023224_8c015ab8_title.c b/src/_023224_8c015ab8_title.c
@@ -410,7 +410,7 @@ void task_title_8c015ab8(Task* task, void *state) {
 }
 
 /* Matched */
-void FUN_8c015fd6 (Bool direct) {
+void pushTitle_8c015fd6 (Bool direct) {
     Task* created_task;
     void* created_state;
     FUN_8c0128cc(0);

diff --git a/src/asm/_010700_8c0129cc.src b/src/asm/_010700_8c0129cc.src
@@ -33,7 +33,7 @@
           .IMPORT     _var_8c157a78
           .IMPORT     _var_8c157a7c
           .IMPORT     _var_queuesAreInitialized_8c157a60
-          .IMPORT     _FUN_8c015fd6
+          .IMPORT     _pushTitle_8c015fd6
           .IMPORT     _FUN_8c02239c
           .IMPORT     _var_tasks_8c1ba5e8
           .IMPORT     _execTasks_8c014b42
@@ -618,7 +618,7 @@ LP_GEN_43727:
           .DATA.L _var_8c157a78
           .DATA.L _var_8c157a7c
           .DATA.L _var_queuesAreInitialized_8c157a60
-          .DATA.L _FUN_8c015fd6
+          .DATA.L _pushTitle_8c015fd6
           .DATA.L _FUN_8c02239c
           .DATA.L _var_tasks_8c1ba5e8
           .DATA.L _execTasks_8c014b42
@@ -742,7 +742,7 @@ LAB_8c012f10:
 LP_GEN_94405:
           .DATA.W H'0708 ; LP_GEN_94405+0
           .DATA.L _push_fadeout_8c022b60
-          .DATA.L _FUN_8c015fd6
+          .DATA.L _pushTitle_8c015fd6
           .DATA.L _FUN_8c02239c
           .DATA.L _var_tasks_8c1ba5e8
           .DATA.L _execTasks_8c014b42

diff --git a/src/asm/_045468_8c01b19c.src b/src/asm/_045468_8c01b19c.src
@@ -71,7 +71,7 @@
           .IMPORT     _const_8c0383a4
           .IMPORT     _const_8c0383d0
           .IMPORT     _FUN_8c016182
-          .IMPORT     _FUN_8c015fd6
+          .IMPORT     _pushTitle_8c015fd6
           .IMPORT     _menuTextboxText_8c02af1c
           .IMPORT     _const_8c0383e8
           .IMPORT     _const_8c038414
@@ -931,7 +931,7 @@ LP_GEN_43539:
           .DATA.L _vmsLcd_8c01c8fc ; H'8C01B848
           .DATA.L _var_8c1ba36c ; H'8C01B84C
           .DATA.L _FUN_8c016182 ; H'8C01B850
-          .DATA.L _FUN_8c015fd6 ; H'8C01B854
+          .DATA.L _pushTitle_8c015fd6 ; H'8C01B854
           .DATA.L _menuTextboxText_8c02af1c ; H'8C01B858
 LAB_8c01b85c:
           MOV.L       LP_GEN_14610+2,R2
@@ -1138,7 +1138,7 @@ LP_GEN_14610:
           .DATA.L _FUN_8c0187d0 ; H'8C01B9F4
           .DATA.L _FUN_8c017e18 ; H'8C01B9F8
           .DATA.L _FUN_8c016182 ; H'8C01B9FC
-          .DATA.L _FUN_8c015fd6 ; H'8C01BA00
+          .DATA.L _pushTitle_8c015fd6 ; H'8C01BA00
 LAB_8c01ba04:
           MOV.L       @(H'38,R14),R5
           MOV         R14,R4

diff --git a/src/asm/_055292_8c01d7fc.src b/src/asm/_055292_8c01d7fc.src
@@ -53,7 +53,7 @@
           .IMPORT     _FUN_8c017ef2
           .IMPORT     _FUN_8c0172dc
           .IMPORT     _FUN_8c0173e6
-          .IMPORT     _FUN_8c015fd6
+          .IMPORT     _pushTitle_8c015fd6
           .IMPORT     _njSetBackColor
           .IMPORT     _FUN_8c0128cc
           .IMPORT     _task_8c012f44
@@ -1005,7 +1005,7 @@ LP_GEN_50614:
           .DATA.L _FUN_8c0172dc ; H'8C01DF24
           .DATA.L _FUN_8c0173e6 ; H'8C01DF28
           .DATA.L _FUN_8c01f954 ; H'8C01DF2C
-          .DATA.L _FUN_8c015fd6 ; H'8C01DF30
+          .DATA.L _pushTitle_8c015fd6 ; H'8C01DF30
 LAB_8c01df34:
           MOV.L       LP_GEN_43538+10,R3
           MOV.W       LP_GEN_43538,R4

diff --git a/src/asm/_062400_8c01f3c0.src b/src/asm/_062400_8c01f3c0.src
@@ -31,7 +31,7 @@
           .IMPORT     _init_8c045290
           .IMPORT     _FUN_8c016182
           .IMPORT     _var_8c1ba34c
-          .IMPORT     _FUN_8c015fd6
+          .IMPORT     _pushTitle_8c015fd6
           .IMPORT     _init_8c044c08
           .IMPORT     _FUN_8c0128cc
           .IMPORT     _task_8c012f44
@@ -767,7 +767,7 @@ LP_GEN_28976:
           .DATA.L _FUN_8c016182 ; H'8C01F944
           .DATA.L _var_8c1ba34c ; H'8C01F948
           .DATA.L _FUN_8c01e24e ; H'8C01F94C
-          .DATA.L _FUN_8c015fd6 ; H'8C01F950
+          .DATA.L _pushTitle_8c015fd6 ; H'8C01F950
 _FUN_8c01f954:
           MOV.L       R14,@-R15
           STS.L       PR,@-R15

diff --git a/src/asm/decompiled/_012100_8c012f44.src b/src/asm/decompiled/_012100_8c012f44.src
@@ -8,7 +8,7 @@
           .IMPORT     _var_8c1bb8c4
           .IMPORT     _init_8c03bd80
           .IMPORT     _init_8c03bd84
-          .IMPORT     _FUN_8c015fd6
+          .IMPORT     _pushTitle_8c015fd6
           .IMPORT     _var_demo_8c1bb8d0
           .IMPORT     _var_8c18ad1c
           .IMPORT     _var_8c228708
@@ -311,7 +311,7 @@ LP_GEN_99840:
           .DATA.L _var_8c1bb8c4
           .DATA.L _init_8c03bd80
           .DATA.L _init_8c03bd84
-          .DATA.L _FUN_8c015fd6
+          .DATA.L _pushTitle_8c015fd6
           .DATA.L _var_demo_8c1bb8d0
           .DATA.L _var_8c18ad1c
           .DATA.L _var_8c228708
@@ -917,7 +917,7 @@ LP_GEN_65923:
           .DATA.L _freeTask_8c014b66
           .DATA.L _initSoundMidiAdx_8c010e18
           .DATA.L _var_8c2260a8
-          .DATA.L _FUN_8c015fd6
+          .DATA.L _pushTitle_8c015fd6
           .DATA.L _var_gdErr_8c18ad14
           .DATA.L H'00100000
           .DATA.L _njSetTextureMemorySize

diff --git a/src/asm/decompiled/_023224_8c015ab8_title.src b/src/asm/decompiled/_023224_8c015ab8_title.src
@@ -38,7 +38,7 @@
           .IMPORT     _FUN_8c010bae
           .IMPORT     _FUN_8c0128cc
           .EXPORT     _task_title_8c015ab8
-          .EXPORT     _FUN_8c015fd6
+          .EXPORT     _pushTitle_8c015fd6
           .SECTION    P,CODE,ALIGN=4
 _task_title_8c015ab8:            ; function: task_title_8c015ab8
                                  ; frame size=?
@@ -715,7 +715,7 @@ L52:
           RTS
           MOV.L       @R15+,R14
 
-_FUN_8c015fd6:                   ; function: FUN_8c015fd6
+_pushTitle_8c015fd6:                   ; function: pushTitle_8c015fd6
                                  ; frame size=44
           MOV.L       R14,@-R15
           STS.L       PR,@-R15

diff --git a/tests/_012100_8c012f44.php b/tests/_012100_8c012f44.php
@@ -329,7 +329,7 @@ public function test_task_8c013388_field0x08Is1_PvmBoolIs1()
         $this->shouldCall('_freeTask_8c014b66')->with($taskPtr);
         $this->shouldCall('_initSoundMidiAdx_8c010e18');
         $this->shouldWriteTo('_var_8c2260a8', 1);
-        $this->shouldCall('_FUN_8c015fd6');
+        $this->shouldCall('_pushTitle_8c015fd6');
 
         $this->call('_task_8c013388')
             ->with($taskPtr, 0)