Animation Cleanup: En_S* (#1517)

* cleanup

* more cleanup

* anim S cleanup

* fix another function

* missed one

* missed another small thing

* oops

2 files changed, 43 insertions, 19 deletions

diff --git a/src/code/z_message_nes.c b/src/code/z_message_nes.c
index dd64889cc..108146d3a 100644
--- a/src/code/z_message_nes.c
+++ b/src/code/z_message_nes.c
@@ -101,17 +101,17 @@ void Message_LoadPluralRupeesNES(PlayState* play, s16* decodedBufPos, s32* offse
 #define RUPEES_STR_SPA "Rupia(s)"
 
 char sRupeesTextLocalization[LANGUAGE_MAX - 1][8] = {
-    RUPEES_STR_EN,  // EN
-    RUPEES_STR_DE,  // DE
-    RUPEES_STR_FR,  // FR
-    RUPEES_STR_SPA, // SPA
+    RUPEES_STR_EN,  // LANGUAGE_ENG
+    RUPEES_STR_DE,  // LANGUAGE_GER
+    RUPEES_STR_FR,  // LANGUAGE_FRE
+    RUPEES_STR_SPA, // LANGUAGE_SPA
 };
 
 u8 sRupeesTextLength[LANGUAGE_MAX - 1] = {
-    sizeof(RUPEES_STR_EN) - 1,
-    sizeof(RUPEES_STR_DE) - 1,
-    sizeof(RUPEES_STR_FR) - 1,
-    sizeof(RUPEES_STR_SPA) - 1,
+    sizeof(RUPEES_STR_EN) - 1,  // LANGUAGE_ENG
+    sizeof(RUPEES_STR_DE) - 1,  // LANGUAGE_GER
+    sizeof(RUPEES_STR_FR) - 1,  // LANGUAGE_FRE
+    sizeof(RUPEES_STR_SPA) - 1, // LANGUAGE_SPA
 };
 
 void Message_LoadLocalizedRupeesNES(PlayState* play, s16* decodedBufPos, s32* offset, f32* arg3) {
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 7d0340e14..af404c7aa 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -163,16 +163,32 @@ static Gfx sScreenFillSetupDL[] = {
 };
 
 s16 D_801BF9B0 = 0;
-f32 D_801BF9B4[] = { 100.0f, 109.0f };
+f32 D_801BF9B4[] = {
+    100.0f, // LANGUAGE_JPN
+    109.0f, // LANGUAGE_ENG
+    // Data missing for other languages?
+};
 s16 D_801BF9BC[] = {
     0x226, // EQUIP_SLOT_B
     0x2A8, // EQUIP_SLOT_C_LEFT
     0x2A8, // EQUIP_SLOT_C_DOWN
     0x2A8, // EQUIP_SLOT_C_RIGHT
 };
-s16 D_801BF9C4[] = { 0x9E, 0x9B };
-s16 D_801BF9C8[] = { 0x17, 0x16 };
-f32 D_801BF9CC[] = { -380.0f, -350.0f };
+s16 D_801BF9C4[] = {
+    0x9E, // LANGUAGE_JPN
+    0x9B, // LANGUAGE_ENG
+    // Data missing for other languages?
+};
+s16 D_801BF9C8[] = {
+    0x17, // LANGUAGE_JPN
+    0x16, // LANGUAGE_ENG
+    // Data missing for other languages?
+};
+f32 D_801BF9CC[] = {
+    -380.0f, // LANGUAGE_JPN
+    -350.0f, // LANGUAGE_ENG
+    // Data missing for other languages?
+};
 s16 D_801BF9D4[] = {
     0xA7,  // EQUIP_SLOT_B
     0xE3,  // EQUIP_SLOT_C_LEFT
@@ -3861,12 +3877,20 @@ void Interface_SetOrthoView(InterfaceContext* interfaceCtx) {
 }
 
 void Interface_DrawItemButtons(PlayState* play) {
-    static TexturePtr cUpLabelTextures[] = {
-        gTatlCUpENGTex, gTatlCUpENGTex, gTatlCUpGERTex, gTatlCUpFRATex, gTatlCUpESPTex,
+    static TexturePtr sCUpLabelTextures[LANGUAGE_MAX] = {
+        gTatlCUpENGTex, // LANGUAGE_JPN
+        gTatlCUpENGTex, // LANGUAGE_ENG
+        gTatlCUpGERTex, // LANGUAGE_GER
+        gTatlCUpFRATex, // LANGUAGE_FRE
+        gTatlCUpESPTex, // LANGUAGE_SPA
     };
-    static s16 startButtonLeftPos[] = {
+    static s16 sStartButtonLeftPos[LANGUAGE_MAX] = {
         // Remnant of OoT
-        130, 136, 136, 136, 136,
+        130, // LANGUAGE_JPN
+        136, // LANGUAGE_ENG
+        136, // LANGUAGE_GER
+        136, // LANGUAGE_FRE
+        136, // LANGUAGE_SPA
     };
     static s16 D_801BFAF4[] = {
         0x1D, // EQUIP_SLOT_B
@@ -3952,9 +3976,9 @@ void Interface_DrawItemButtons(PlayState* play) {
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
-            gDPLoadTextureBlock_4b(OVERLAY_DISP++, cUpLabelTextures[gSaveContext.options.language], G_IM_FMT_IA, 32, 12,
-                                   0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
-                                   G_TX_NOLOD, G_TX_NOLOD);
+            gDPLoadTextureBlock_4b(OVERLAY_DISP++, sCUpLabelTextures[gSaveContext.options.language], G_IM_FMT_IA, 32,
+                                   12, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                                   G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
             gSPTextureRectangle(OVERLAY_DISP++, 0x03DC, 0x0048, 0x045C, 0x0078, G_TX_RENDERTILE, 0, 0, 1 << 10,
                                 1 << 10);
         }