Merge pull request pret#1903 from GriffinRichards/frontier-gfx

Fix some frontier gfx, adjacent cleanup
GriffinRichards · Aug 10, 2023 · 60a6c9d · 60a6c9d
2 parents d1c2a30 + 079f2da
commit 60a6c9d
Show file tree

Hide file tree

Showing 21 changed files with 461 additions and 645 deletions.
diff --git a/graphics/battle_frontier/factory_menu1.png b/graphics/battle_frontier/factory_menu1.png
diff --git a/graphics/battle_frontier/factory_menu2.png b/graphics/battle_frontier/factory_menu2.png
diff --git a/graphics/battle_frontier/factory_menu.bin → ...s/battle_frontier/factory_screen/menu.bin b/graphics/battle_frontier/factory_menu.bin → ...s/battle_frontier/factory_screen/menu.bin
diff --git a/graphics/battle_frontier/factory_screen/menu.png b/graphics/battle_frontier/factory_screen/menu.png
diff --git a/graphics/battle_frontier/tourney.pal b/graphics/battle_frontier/tourney.pal
diff --git a/graphics/battle_frontier/tourney_tree.png b/graphics/battle_frontier/tourney_tree.png
diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h
@@ -55,7 +55,7 @@
 #define TRAINER_HILL_OTID 0x10000000
 
 // The full map of each Trainer Hill floor is 16x21.
-// The first 5x21 at the top is the entrance/exit area,
+// The first 16x5 at the top is the entrance/exit area,
 // and the remaining 16x16 is the randomized portion of
 // the room where the trainers are.
 #define HILL_FLOOR_WIDTH         16

diff --git a/include/graphics.h b/include/graphics.h
@@ -5018,9 +5018,9 @@ extern const u32 gPokenavOptions_Gfx[];
 extern const u16 gPokenavOptions_Pal[];
 
 // Battle Factory Screen
-extern const u16 gFrontierFactorySelectMenu_Gfx[];
-extern const u16 gFrontierFactorySelectMenu_Tilemap[];
-extern const u16 gFrontierFactorySelectMenu_Pal[];
+extern const u16 gFrontierFactoryMenu_Gfx[34 * TILE_SIZE_4BPP / 2];
+extern const u16 gFrontierFactoryMenu_Tilemap[];
+extern const u16 gFrontierFactoryMenu_Pal[];
 
 // Object event pals
 extern const u16 gObjectEventPal_Brendan[];

diff --git a/include/script_menu.h b/include/script_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_SCRIPT_MENU_H
 #define GUARD_SCRIPT_MENU_H
 
+#include "constants/script_menu.h"
+
 extern const u8 *const gStdStrings[];
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress);

diff --git a/src/apprentice.c b/src/apprentice.c
@@ -346,11 +346,10 @@ static u16 GetRandomAlternateMove(u8 monId)
     learnset = gLevelUpLearnsets[species];
     j = 0;
 
-    // Despite being open level, level up moves are only read up to level 60
     if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
-        level = 50;
+        level = FRONTIER_MAX_LEVEL_50;
     else // == APPRENTICE_LVL_MODE_OPEN
-        level = 60;
+        level = 60; // Despite being open level, level up moves are only read up to level 60
 
     for (j = 0; learnset[j] != LEVEL_UP_END; j++)
     {
@@ -464,7 +463,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
     const u16 *learnset;
 
     if (PLAYER_APPRENTICE.lvlMode == APPRENTICE_LVL_MODE_50)
-        level = 50;
+        level = FRONTIER_MAX_LEVEL_50;
     else // == APPRENTICE_LVL_MODE_OPEN
         level = 60;
 
@@ -666,11 +665,12 @@ static void Task_ChooseAnswer(u8 taskId)
     case MENU_NOTHING_CHOSEN:
         return;
     case MENU_B_PRESSED:
+        // Only ever true. Answering Apprentice questions is required.
         if (tNoBButton)
             return;
 
         PlaySE(SE_SELECT);
-        gSpecialVar_Result = 0x7F;
+        gSpecialVar_Result = MULTI_B_PRESSED;
         break;
     default:
         gSpecialVar_Result = input;