Merge

.github/workflows/build.yaml

@@ -20,6 +20,8 @@ jobs:
         uses: cargo-bins/cargo-binstall@main
       - name: Install pigment64
         run: cargo binstall pigment64 -y
+      - name: Install crunch64-cli
+        run: cargo binstall crunch64-cli -y
       - name: Setup Flips
         run: |
           curl -L https://dl.smwcentral.net/11474/floating.zip -o floating.zip

.gitignore

@@ -56,5 +56,4 @@ build/
 *.backup
 *.crash
 
-/tools/Yay0compress
 /tools/n64crc

.vscode/settings.json

@@ -70,4 +70,6 @@
         "-l 120"
     ],
     "search.useIgnoreFiles": false,
+    "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
+    "workbench.editor.labelFormat": "short",
 }

Jenkinsfile

@@ -19,6 +19,7 @@ pipeline {
                 sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
                 sh 'pip install -U -r requirements.txt'
                 sh 'cargo install pigment64'
+                sh 'cargo install crunch64-cli'
                 sh './configure'
             }
         }

src/battle/actors.yaml

@@ -1730,8 +1730,8 @@
     shadowOffset: 0
 - BlackNinjakoopa:
     level: 17
-    nameMsg: MSG_EnemyName_BlueNinjakoopa
-    tattleMsg: MSG_EnemyTattle_BlueNinjakoopa
+    nameMsg: MSG_EnemyName_BlackNinjakoopa
+    tattleMsg: MSG_EnemyTattle_BlackNinjakoopa
     walkSound: [ SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_ACTOR_JUMP

src/battle/partner/sushie.c

@@ -818,7 +818,7 @@ EvtScript N(bellyFlop) = {
         Else
             Call(GetMenuSelection, LVar0, LVar1, LVar2)
             Switch(LVar2)
-                CaseEq(167)
+                CaseEq(MOVE_BELLY_FLOP1)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
                     Wait(1)
@@ -829,7 +829,7 @@ EvtScript N(bellyFlop) = {
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
                     Wait(1)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
-                CaseEq(168)
+                CaseEq(MOVE_BELLY_FLOP2)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.05), Float(1.05), Float(1.0))
                     Wait(1)
@@ -840,7 +840,7 @@ EvtScript N(bellyFlop) = {
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.2), Float(1.2), Float(1.0))
                     Wait(1)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.25), Float(1.25), Float(1.0))
-                CaseEq(169)
+                CaseEq(MOVE_BELLY_FLOP3)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.1), Float(1.1), Float(1.0))
                     Wait(1)

src/pause/pause_tabs.c

@@ -213,7 +213,7 @@ void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[0]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 25) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_STATS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -231,7 +231,7 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3
     hud_element_set_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[1]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 26) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_BADGES) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -249,7 +249,7 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[2]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 27) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_ITEMS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -267,7 +267,7 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[3]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 28) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_PARTY) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -285,7 +285,7 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s
     hud_element_set_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[4]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 29) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_SPIRITS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -303,7 +303,7 @@ void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 h
     hud_element_set_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[5]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 30) {
+        if (gPauseTabsWindowIDs[menu->col] == WIN_PAUSE_TAB_MAP) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }