Add PokéNav too
This commit is contained in:
+1
-1
@@ -1282,7 +1282,7 @@ const u16 gContestResultsTitle_Smart_Tilemap[] = INCBIN_U16("graphics/contest/r
|
||||
const u16 gContestResultsTitle_Tough_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title_tough.bin");
|
||||
const u16 gContestResultsTitle_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title.bin");
|
||||
|
||||
// pokenav
|
||||
// PokéNav
|
||||
|
||||
const u16 gPokenavCondition_Pal[] = INCBIN_U16("graphics/pokenav/condition/graph.gbapal");
|
||||
const u32 gPokenavCondition_Gfx[] = INCBIN_U32("graphics/pokenav/condition/graph.4bpp.lz");
|
||||
|
||||
@@ -257,7 +257,7 @@ static u32 HandleMainMenuInput(struct Pokenav_Menu *menu)
|
||||
return POKENAV_MENU_FUNC_NONE;
|
||||
}
|
||||
|
||||
// Force the player to select Match Call during the call Mr. Stone pokenav tutorial
|
||||
// Force the player to select Match Call during the call Mr. Stone PokéNav tutorial
|
||||
static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu)
|
||||
{
|
||||
if (UpdateMenuCursorPos(menu))
|
||||
@@ -287,7 +287,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu)
|
||||
return POKENAV_MENU_FUNC_NONE;
|
||||
}
|
||||
|
||||
// After calling Mr. Stone during the pokenav tutorial, force player to exit or use Match Call again
|
||||
// After calling Mr. Stone during the PokéNav tutorial, force player to exit or use Match Call again
|
||||
static u32 HandleMainMenuInputEndTutorial(struct Pokenav_Menu *menu)
|
||||
{
|
||||
if (UpdateMenuCursorPos(menu))
|
||||
|
||||
+1
-1
@@ -689,7 +689,7 @@ static bool8 StartMenuPokeNavCallback(void)
|
||||
PlayRainStoppingSoundEffect();
|
||||
RemoveExtraStartMenuWindows();
|
||||
CleanupOverworldWindowsAndTilemaps();
|
||||
SetMainCallback2(CB2_InitPokeNav); // Display PokeNav
|
||||
SetMainCallback2(CB2_InitPokeNav); // Display PokéNav
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+2
-2
@@ -73,10 +73,10 @@ struct UsePokeblockSession
|
||||
u8 natureText[34];
|
||||
};
|
||||
|
||||
// This struct is identical to PokenavMonListItem, the struct used for managing lists of Pokémon in the pokenav
|
||||
// This struct is identical to PokenavMonListItem, the struct used for managing lists of Pokémon in the PokéNav
|
||||
// Given that this screen is essentially duplicated in the poknav, this struct was probably the same one with
|
||||
// a more general name/purpose
|
||||
// TODO: Once the pokenav conditions screens are documented, resolve the above
|
||||
// TODO: Once the PokéNav conditions screens are documented, resolve the above
|
||||
struct UsePokeblockMenuPokemon
|
||||
{
|
||||
u8 boxId; // Because this screen is never used for the PC this is always set to TOTAL_BOXES_COUNT to refer to party
|
||||
|
||||
Reference in New Issue
Block a user