Name pseudo-random functions in Asset Queues

lhsazevedo · Jul 6, 2024 · 4511b46 · 4511b46
1 parent 8763f8e
commit 4511b46
Show file tree

Hide file tree

Showing 27 changed files with 144 additions and 144 deletions.
diff --git a/misc/organize/drawSprite_8c014f54.c b/misc/organize/drawSprite_8c014f54.c
@@ -24,7 +24,7 @@ void drawSprite_8c014f54(ResourceGroup *struct1_r4, int texture_id, float x, flo
         /* 0x8c014f76 */
         dat_section_base = (int *) struct1_r4->contents_0x08;
     } else {
-        /* Melhor até agora */
+        /* Melhor at? agora */
         dat_section_base = ((int *) struct1_r4->contents_0x08) + texture_id;
         dat_section_base = ((int *) struct1_r4->contents_0x08) + *dat_section_base;
 

diff --git a/scripts/run_tests.docker.sh b/scripts/run_tests.docker.sh
@@ -217,23 +217,23 @@ $sh4objtest "tests/011120/8240_AsqRequestNjPvmPairs_12030.php" "build/output/011
 $sh4objtest "tests/011120/8446_AsqFreeNjPvmPairs_120fe.php" "build/output/011120_asset_queues_src.obj"
 $sh4objtest "tests/011120/8446_AsqFreeNjPvmPairs_120fe.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8544_AsqFUN_12160.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8544_AsqFUN_12160.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8544_AsqSetSeedA_12160.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8544_AsqSetSeedA_12160.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8550_AsqFUN_12166.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8550_AsqFUN_12166.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8550_AsqGetRandomA_12166.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8550_AsqGetRandomA_12166.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8568_AsqFUN_12178.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8568_AsqFUN_12178.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8568_AsqGetRandomInRangeA_12178.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8568_AsqGetRandomInRangeA_12178.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8610_AsqFUN_121a2.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8610_AsqFUN_121a2.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8610_AsqSetSeedB_121a2.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8610_AsqSetSeedB_121a2.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8616_AsqFUN_121a8.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8616_AsqFUN_121a8.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8616_AsqGetRandomB_121a8.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8616_AsqGetRandomB_121a8.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8638_AsqFUN_121be.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8638_AsqFUN_121be.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8638_AsqGetRandomInRangeB_121be.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8638_AsqGetRandomInRangeB_121be.php" "build/output/011120_asset_queues_c.obj"
 
 $sh4objtest "tests/011120/8680_AsqFUN_121e8.php" "build/output/011120_asset_queues_src.obj"
 $sh4objtest "tests/011120/8680_AsqFUN_121e8.php" "build/output/011120_asset_queues_c.obj"
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -1,6 +1,6 @@
 set -e
 
-sh4objtest=sh4objtest
+sh4objtest=~/.config/composer/vendor/bin/sh4objtest
 
 ASMSH_FLAGS="-define=UNIT_TESTING=1 -debug=d -cpu=sh4 -endian=little -sjis"
 
@@ -217,23 +217,23 @@ $sh4objtest "tests/011120/8240_AsqRequestNjPvmPairs_12030.php" "build/output/011
 $sh4objtest "tests/011120/8446_AsqFreeNjPvmPairs_120fe.php" "build/output/011120_asset_queues_src.obj"
 $sh4objtest "tests/011120/8446_AsqFreeNjPvmPairs_120fe.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8544_AsqFUN_12160.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8544_AsqFUN_12160.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8544_AsqSetSeedA_12160.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8544_AsqSetSeedA_12160.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8550_AsqFUN_12166.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8550_AsqFUN_12166.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8550_AsqGetRandomA_12166.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8550_AsqGetRandomA_12166.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8568_AsqFUN_12178.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8568_AsqFUN_12178.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8568_AsqGetRandomInRangeA_12178.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8568_AsqGetRandomInRangeA_12178.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8610_AsqFUN_121a2.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8610_AsqFUN_121a2.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8610_AsqSetSeedB_121a2.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8610_AsqSetSeedB_121a2.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8616_AsqFUN_121a8.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8616_AsqFUN_121a8.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8616_AsqGetRandomB_121a8.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8616_AsqGetRandomB_121a8.php" "build/output/011120_asset_queues_c.obj"
 
-$sh4objtest "tests/011120/8638_AsqFUN_121be.php" "build/output/011120_asset_queues_src.obj"
-$sh4objtest "tests/011120/8638_AsqFUN_121be.php" "build/output/011120_asset_queues_c.obj"
+$sh4objtest "tests/011120/8638_AsqGetRandomInRangeB_121be.php" "build/output/011120_asset_queues_src.obj"
+$sh4objtest "tests/011120/8638_AsqGetRandomInRangeB_121be.php" "build/output/011120_asset_queues_c.obj"
 
 $sh4objtest "tests/011120/8680_AsqFUN_121e8.php" "build/output/011120_asset_queues_src.obj"
 $sh4objtest "tests/011120/8680_AsqFUN_121e8.php" "build/output/011120_asset_queues_c.obj"
diff --git a/src/011120_asset_queues.c b/src/011120_asset_queues.c
@@ -124,8 +124,8 @@ STATIC QueuedPvm* var_pvmQueueRear_8c157ac0;
 STATIC QueuedPvm* var_pvmQueueTail_8c157ac4;
 STATIC int var_pvmQueueIsIdle_8c157ac8;
 
-STATIC int var_8c157acc;
-STATIC int var_8c157ad0;
+STATIC int var_seed_8c157acc;
+STATIC int var_seed_8c157ad0;
 
 /* ===================
  * Initialized Globals
@@ -1268,40 +1268,40 @@ void AsqFreeNjPvmPairs_120fe(NjPvmPair **pairsPtr) {
 }
 
 /* Tested */
-void AsqFUN_12160(int p1) {
-    var_8c157acc = p1;
+void AsqSetSeedA_12160(int seed) {
+    var_seed_8c157acc = seed;
 }
 
 /* Tested */
-int AsqFUN_12166() {
-    var_8c157acc = var_8c157acc * 5 + 13;
-    return var_8c157acc;
+int AsqGetRandomA_12166() {
+    var_seed_8c157acc = var_seed_8c157acc * 5 + 13;
+    return var_seed_8c157acc;
 }
 
 /* Tested */
-int AsqFUN_12178(unsigned int p1) {
+int AsqGetRandomInRangeA_12178(unsigned int p1) {
     if (p1) {
-        return AsqFUN_12166() % p1;
+        return AsqGetRandomA_12166() % p1;
     }
 
     return 0;
 }
 
 /* Tested */
-void AsqFUN_121a2(int p1) {
-    var_8c157ad0 = p1;
+void AsqSetSeedB_121a2(int seed) {
+    var_seed_8c157ad0 = seed;
 }
 
 /* Tested */
-int AsqFUN_121a8() {
-    var_8c157ad0 = (var_8c157ad0 >> 1) * 7 + 0xb;
-    return var_8c157ad0;
+int AsqGetRandomB_121a8() {
+    var_seed_8c157ad0 = (var_seed_8c157ad0 >> 1) * 7 + 0xb;
+    return var_seed_8c157ad0;
 }
 
 /* Tested */
-int AsqFUN_121be(unsigned int p1) {
+int AsqGetRandomInRangeB_121be(unsigned int p1) {
     if (p1) {
-        return AsqFUN_121a8() % p1;
+        return AsqGetRandomB_121a8() % p1;
     }
 
     return 0;

diff --git a/src/011120_asset_queues.h b/src/011120_asset_queues.h
@@ -79,16 +79,16 @@ NjPvmPair* AsqRequestNjPvmPairs_12030(char *basedir, NjPvmPairFilenames *pairs,
 
 void AsqFreeNjPvmPairs_120fe(NjPvmPair **pairsPtr);
 
-void AsqFUN_12160(int p1);
+void AsqSetSeedA_12160(int p1);
 
-int AsqFUN_12166();
+int AsqGetRandomA_12166();
 
-int AsqFUN_12178(unsigned int p1);
+int AsqGetRandomInRangeA_12178(unsigned int p1);
 
-void AsqFUN_121a2(int p1);
+void AsqSetSeedB_121a2(int p1);
 
-int AsqFUN_121a8();
+int AsqGetRandomB_121a8();
 
-int AsqFUN_121be(unsigned int p1);
+int AsqGetRandomInRangeB_121be(unsigned int p1);
 
 void AsqFUN_121e8();
diff --git a/src/012f44.c b/src/012f44.c
@@ -522,8 +522,8 @@ void FUN_8c01306e(void)
     clearTasks_8c014a9c(var_tasks_8c1bb448, 0x20);
 
     njRandomSeed(var_seed_8c157a64);
-    AsqFUN_12160(var_seed_8c157a64);
-    AsqFUN_121a2(var_seed_8c157a64);
+    AsqSetSeedA_12160(var_seed_8c157a64);
+    AsqSetSeedB_121a2(var_seed_8c157a64);
 
     FUN_8c0128cc(1);
 
@@ -574,7 +574,7 @@ void FUN_8c01328c() {
         var_8c1bb868 = var_8c1bc824->field_0x00;
         var_8c228704 = var_8c1bc824->field_0x04;
         var_8c1bb8c8 = var_8c1bc824->field_0x08;
-        var_seed_8c157a64 = AsqFUN_12166();
+        var_seed_8c157a64 = AsqGetRandomA_12166();
     } else if ((var_demo_8c1bb8d0 == 2) && (var_8c1bb8d4 != 0)) {
         var_8c227dd4 = init_8c0460b0[var_8c1bb868 - 0x26];
         FUN_8c01895e();
@@ -583,8 +583,8 @@ void FUN_8c01328c() {
     }
 
     njRandomSeed(var_seed_8c157a64);
-    AsqFUN_12160(var_seed_8c157a64);
-    AsqFUN_121a2(var_seed_8c157a64);
+    AsqSetSeedA_12160(var_seed_8c157a64);
+    AsqSetSeedB_121a2(var_seed_8c157a64);
     AsqFUN_121e8();
     var_8c227da0 = (char) var_8c1ba292;
     var_8c227da8 = 0;
@@ -601,16 +601,16 @@ void FUN_8c013310(int p1) {
         var_8c1bb868 = p1;
         var_8c228704 = 0;
         var_8c1bb8c8 = (char) var_8c1ba291;
-        var_seed_8c157a64 = AsqFUN_12166();
+        var_seed_8c157a64 = AsqGetRandomA_12166();
     } else if (var_demo_8c1bb8d0 == 2 && var_8c1bb8d4 != 0) {
         var_8c227dd4 = init_8c0460b0[var_8c1bb868 - 0x26];
     } else {
         var_8c227dd4 = 0;
     }
 
     njRandomSeed(var_seed_8c157a64);
-    AsqFUN_12160(var_seed_8c157a64);
-    AsqFUN_121a2(var_seed_8c157a64);
+    AsqSetSeedA_12160(var_seed_8c157a64);
+    AsqSetSeedB_121a2(var_seed_8c157a64);
     AsqFUN_121e8();
     var_8c227da0 = (char) var_8c1ba292;
     var_8c227da8 = 0;

diff --git a/src/020528.c b/src/020528.c
@@ -25,7 +25,7 @@ void FUN_8c020528()
     if (var_demo_8c1bb8d0 != 2) {
         pushTask_8c014ae8(var_tasks_8c1ba5e8, &FUN_8c020214, &created_task, &created_state, 0);
         var_8c2264b8.field_0x00 = 0;
-        var_8c2264b8.field_0x04 = AsqFUN_121be(300) + 0x96;
+        var_8c2264b8.field_0x04 = AsqGetRandomInRangeB_121be(300) + 0x96;
         var_8c2264b8.field_0x08 = 3;
         var_8c2264b8.field_0x0c = 1;
         var_8c2264b8.field_0x14 = 0;

diff --git a/src/asm/01614c.src b/src/asm/01614c.src
@@ -39,7 +39,7 @@
           .IMPORT     _pushTask_8c014ae8
           .IMPORT     _init_8c04429c
           .IMPORT     _var_8c1bc824
-          .IMPORT     _AsqFUN_12166
+          .IMPORT     _AsqGetRandomA_12166
           .IMPORT     _FUN_8c0128cc
           .IMPORT     _var_8c1bc828
           .IMPORT     _var_8c225fa8
@@ -1008,7 +1008,7 @@ LP_GEN_94139:
           .DATA.L H'000C0000 ; H'8C016854
           .DATA.L _const_8c0360b0 ; H'8C016858
           .DATA.L H'000A0000 ; H'8C01685C
-          .DATA.L _AsqFUN_12166 ; H'8C016860
+          .DATA.L _AsqGetRandomA_12166 ; H'8C016860
           .DATA.L _FUN_8c0128cc ; H'8C016864
           .DATA.L _FUN_8c01666a ; H'8C016868
           .DATA.L _var_8c1bc828 ; H'8C01686C

diff --git a/src/asm/016d2c.src b/src/asm/016d2c.src
@@ -32,7 +32,7 @@
           .IMPORT     _var_8c1bb8bc
           .IMPORT     _var_8c1bb8dc
           .IMPORT     _var_8c1bb8f8
-          .IMPORT     _AsqFUN_121be
+          .IMPORT     _AsqGetRandomInRangeB_121be
           .IMPORT     _var_8c225fbc
           .IMPORT     _var_8c1bb8fc
           .IMPORT     _init_8c03bd80
@@ -47,7 +47,7 @@
           .IMPORT     _var_8c225fb0
           .IMPORT     _switchToMainMenuTask_8c01a09a
           .IMPORT     _menuTextboxText_8c02af1c
-          .IMPORT     _AsqFUN_12166
+          .IMPORT     _AsqGetRandomA_12166
           .IMPORT     _var_8c1bb8c0
           .IMPORT     _setTaskAction_8c014b3e
           .IMPORT     _var_demo_8c1bb8d0
@@ -1216,7 +1216,7 @@ LP_GEN_78741:
           .DATA.L _var_8c1bb8dc ; H'8C01757C
           .DATA.L _var_8c1bb8f8 ; H'8C017580
           .DATA.L __modls ; H'8C017584
-          .DATA.L _AsqFUN_121be ; H'8C017588
+          .DATA.L _AsqGetRandomInRangeB_121be ; H'8C017588
           .DATA.L _var_8c225fbc ; H'8C01758C
 _drawCoursesButtons_8c017590:
           MOV.L       R14,@-R15
@@ -1868,7 +1868,7 @@ LP_GEN_86103:
           .DATA.L _menuTextboxText_8c02af1c ; H'8C017A90
           .DATA.L H'C0C00000 ; H'8C017A94
           .DATA.L H'C0E00000 ; H'8C017A98
-          .DATA.L _AsqFUN_12166 ; H'8C017A9C
+          .DATA.L _AsqGetRandomA_12166 ; H'8C017A9C
           .DATA.L _var_8c1bb8c0 ; H'8C017AA0
           .DATA.L _var_8c225fbc ; H'8C017AA4
 LAB_8c017aa8:
@@ -2218,7 +2218,7 @@ LP_GEN_85439:
           .DATA.L _menuTextboxText_8c02af1c ; H'8C017D44
           .DATA.L H'C0C00000 ; H'8C017D48
           .DATA.L H'C0E00000 ; H'8C017D4C
-          .DATA.L _AsqFUN_12166 ; H'8C017D50
+          .DATA.L _AsqGetRandomA_12166 ; H'8C017D50
 _FUN_8c017d54:
           MOV.L       R14,@-R15
           MOV.L       R13,@-R15

diff --git a/src/asm/020214.src b/src/asm/020214.src
@@ -1,5 +1,5 @@
 ; 8c020214
-          .IMPORT     _AsqFUN_121be
+          .IMPORT     _AsqGetRandomInRangeB_121be
           .IMPORT     _var_midiHandles_8c0fcd28
           .IMPORT     _sdMidiPlay
           .IMPORT     _var_8c22870c
@@ -8,7 +8,7 @@
           .IMPORT     _freeTask_8c014b66
           .IMPORT     _var_8c1bbc4c
           .IMPORT     _var_8c2264bc
-          .IMPORT     _AsqFUN_121a8
+          .IMPORT     _AsqGetRandomB_121a8
           .IMPORT     _vib_8c010f7a
           .IMPORT     _var_demo_8c1bb8d0
           .IMPORT     _var_8c226410
@@ -163,7 +163,7 @@ LP_GEN_12106:
           .DATA.W H'012C ; H'8C02030E
           .DATA.W H'0096 ; H'8C020310
           .RES.W 1 ; H'8C020312
-          .DATA.L _AsqFUN_121be ; H'8C020314
+          .DATA.L _AsqGetRandomInRangeB_121be ; H'8C020314
           .DATA.L _var_midiHandles_8c0fcd28 ; H'8C020318
           .DATA.L _sdMidiPlay ; H'8C02031C
           .DATA.L _var_8c22870c ; H'8C020320
@@ -173,7 +173,7 @@ LP_GEN_12106:
           .DATA.L H'3DBDA12F ; H'8C020330
           .DATA.L _var_8c1bbc4c ; H'8C020334
           .DATA.L _var_8c2264bc ; H'8C020338
-          .DATA.L _AsqFUN_121a8 ; H'8C02033C
+          .DATA.L _AsqGetRandomB_121a8 ; H'8C02033C
           .DATA.L _vib_8c010f7a ; H'8C020340
           .DATA.L _var_demo_8c1bb8d0 ; H'8C020344
 LAB_8c020348:
@@ -435,7 +435,7 @@ LP_GEN_85437:
           .DATA.L _var_8c228710 ; H'8C02050C
           .DATA.L _var_8c2285e4 ; H'8C020510
           .DATA.L _var_8c227d9c ; H'8C020514
-          .DATA.L _AsqFUN_121a8 ; H'8C020518
+          .DATA.L _AsqGetRandomB_121a8 ; H'8C020518
           .DATA.L _var_vibport_8c1ba354 ; H'8C02051C
           .DATA.L _var_8c1ba293 ; H'8C020520
           .DATA.L _vib_8c010fae ; H'8C020524

diff --git a/src/asm/026710.src b/src/asm/026710.src
@@ -12,7 +12,7 @@
           .IMPORT     _njCos
           .IMPORT     _njSin
           .IMPORT     _init_8c0461c8
-          .IMPORT     _AsqFUN_12166
+          .IMPORT     _AsqGetRandomA_12166
           .IMPORT     _FUN_8c02df3c
           .IMPORT     _njSqrt
           .IMPORT     _acosf
@@ -658,7 +658,7 @@ LP_GEN_22736:
           .DATA.L H'47800000 ; H'8C026B88
           .DATA.L _init_8c0461c8 ; H'8C026B8C
           .DATA.L H'461C3C00 ; H'8C026B90
-          .DATA.L _AsqFUN_12166 ; H'8C026B94
+          .DATA.L _AsqGetRandomA_12166 ; H'8C026B94
           .DATA.L H'4F800000 ; H'8C026B98
           .DATA.L H'40200000 ; H'8C026B9C
           .DATA.L _FUN_8c02df3c ; H'8C026BA0
@@ -1840,7 +1840,7 @@ LP_GEN_50256:
           .DATA.L _FUN_8c02e51c ; H'8C027464
           .DATA.L _var_8c1bbddc ; H'8C027468
           .DATA.L _freeTask_8c014b66 ; H'8C02746C
-          .DATA.L _AsqFUN_12166 ; H'8C027470
+          .DATA.L _AsqGetRandomA_12166 ; H'8C027470
           .DATA.L H'41000000 ; H'8C027474
           .DATA.L _FUN_8c02f0c8 ; H'8C027478
 LAB_8c02747c: