atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add PokéNav too

Browse source
This commit is contained in:
Bassoonian 2023-12-12 23:20:22 +01:00
parent bc2a745171
commit 6365431122
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/graphics.h
View file

@ -4005,7 +4005,7 @@ extern const u32 gBerryPalette_Starf[];
extern const u32 gBerryPic_Enigma[]; extern const u32 gBerryPic_Enigma[];
extern const u32 gBerryPalette_Enigma[]; extern const u32 gBerryPalette_Enigma[];
//pokenav //PokéNav
extern const u16 gPokenavCondition_Pal[]; extern const u16 gPokenavCondition_Pal[];
extern const u32 gPokenavCondition_Gfx[]; extern const u32 gPokenavCondition_Gfx[];
extern const u32 gPokenavCondition_Tilemap[]; extern const u32 gPokenavCondition_Tilemap[];
@ -5011,7 +5011,7 @@ extern const u32 gBerryCrush_Crusher_Gfx[];
extern const u16 gBerryCrush_Crusher_Pal[]; extern const u16 gBerryCrush_Crusher_Pal[];
extern const u32 gBerryCrush_TextWindows_Tilemap[]; extern const u32 gBerryCrush_TextWindows_Tilemap[];
// Pokenav // PokéNav
extern const u32 gPokenavMessageBox_Gfx[]; extern const u32 gPokenavMessageBox_Gfx[];
extern const u32 gPokenavMessageBox_Tilemap[]; extern const u32 gPokenavMessageBox_Tilemap[];
extern const u16 gPokenavMessageBox_Pal[]; extern const u16 gPokenavMessageBox_Pal[];

8
include/pokenav.h
View file

@ -65,8 +65,8 @@ struct PokenavMonList
enum enum
{ {
POKENAV_MODE_NORMAL, // Chosen from Start menu. POKENAV_MODE_NORMAL, // Chosen from Start menu.
POKENAV_MODE_FORCE_CALL_READY, // Pokenav tutorial before calling Mr. Stone POKENAV_MODE_FORCE_CALL_READY, // PokéNav tutorial before calling Mr. Stone
POKENAV_MODE_FORCE_CALL_EXIT, // Pokenav tutorial after calling Mr. Stone POKENAV_MODE_FORCE_CALL_EXIT, // PokéNav tutorial after calling Mr. Stone
}; };
enum enum
@ -232,8 +232,8 @@ enum
[CHECK_PAGE_INTRO_2] = gText_MatchCall##name##_Intro2} [CHECK_PAGE_INTRO_2] = gText_MatchCall##name##_Intro2}
// Pokenav Function IDs // PokéNav Function IDs
// Indices into the LoopedTask tables for each of the main Pokenav features // Indices into the LoopedTask tables for each of the main PokéNav features
enum RegionMapFuncIds enum RegionMapFuncIds
{ {

6
include/strings.h
View file

@ -2949,7 +2949,7 @@ extern const u8 gText_CutenessContest[];
extern const u8 gText_SmartnessContest[]; extern const u8 gText_SmartnessContest[];
extern const u8 gText_ToughnessContest[]; extern const u8 gText_ToughnessContest[];
// Pokenav Match Call // PokéNav Match Call
extern const u8 gText_CallCantBeMadeHere[]; extern const u8 gText_CallCantBeMadeHere[];
extern const u8 gText_NumberRegistered[]; extern const u8 gText_NumberRegistered[];
extern const u8 gText_NumberOfBattles[]; extern const u8 gText_NumberOfBattles[];
@ -2959,7 +2959,7 @@ extern const u8 gText_Call[];
extern const u8 gText_Check[]; extern const u8 gText_Check[];
extern const u8 gText_Cancel6[]; extern const u8 gText_Cancel6[];
// Pokenav Menu Handler // PokéNav Menu Handler
extern const u8 gText_CheckMapOfHoenn[]; extern const u8 gText_CheckMapOfHoenn[];
extern const u8 gText_CheckPokemonInDetail[]; extern const u8 gText_CheckPokemonInDetail[];
extern const u8 gText_CallRegisteredTrainer[]; extern const u8 gText_CallRegisteredTrainer[];
@ -2976,7 +2976,7 @@ extern const u8 gText_FindToughPokemon[];
extern const u8 gText_ReturnToConditionMenu[]; extern const u8 gText_ReturnToConditionMenu[];
extern const u8 gText_NoRibbonWinners[]; extern const u8 gText_NoRibbonWinners[];
// Pokenav // PokéNav
extern const u8 gText_NumberIndex[]; extern const u8 gText_NumberIndex[];
extern const u8 gText_RibbonsF700[]; extern const u8 gText_RibbonsF700[];

2
src/graphics.c
View file

@ -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_Tough_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title_tough.bin");
const u16 gContestResultsTitle_Tilemap[] = INCBIN_U16("graphics/contest/results_screen/title.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 u16 gPokenavCondition_Pal[] = INCBIN_U16("graphics/pokenav/condition/graph.gbapal");
const u32 gPokenavCondition_Gfx[] = INCBIN_U32("graphics/pokenav/condition/graph.4bpp.lz"); const u32 gPokenavCondition_Gfx[] = INCBIN_U32("graphics/pokenav/condition/graph.4bpp.lz");

4
src/pokenav_menu_handler.c
View file

@ -257,7 +257,7 @@ static u32 HandleMainMenuInput(struct Pokenav_Menu *menu)
return POKENAV_MENU_FUNC_NONE; 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) static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu)
{ {
if (UpdateMenuCursorPos(menu)) if (UpdateMenuCursorPos(menu))
@ -287,7 +287,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav_Menu *menu)
return POKENAV_MENU_FUNC_NONE; 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) static u32 HandleMainMenuInputEndTutorial(struct Pokenav_Menu *menu)
{ {
if (UpdateMenuCursorPos(menu)) if (UpdateMenuCursorPos(menu))

2
src/start_menu.c
View file

@ -689,7 +689,7 @@ static bool8 StartMenuPokeNavCallback(void)
PlayRainStoppingSoundEffect(); PlayRainStoppingSoundEffect();
RemoveExtraStartMenuWindows(); RemoveExtraStartMenuWindows();
CleanupOverworldWindowsAndTilemaps(); CleanupOverworldWindowsAndTilemaps();
SetMainCallback2(CB2_InitPokeNav); // Display PokeNav SetMainCallback2(CB2_InitPokeNav); // Display PokéNav
return TRUE; return TRUE;
} }

4
src/use_pokeblock.c
View file

@ -73,10 +73,10 @@ struct UsePokeblockSession
u8 natureText[34]; 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 // Given that this screen is essentially duplicated in the poknav, this struct was probably the same one with
// a more general name/purpose // 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 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 u8 boxId; // Because this screen is never used for the PC this is always set to TOTAL_BOXES_COUNT to refer to party