summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pokenav_main_menu.c4
-rw-r--r--src/pokenav_match_call_data.c123
-rwxr-xr-xsrc/pokenav_unk_3.c10
-rwxr-xr-xsrc/pokenav_unk_4.c22
4 files changed, 18 insertions, 141 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index ea15a5198..10544d6a9 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -642,10 +642,10 @@ void sub_81C7AC0(s32 a0)
BeginNormalPaletteFade(structPtr->unk14, -2, 16, 0, RGB_BLACK);
break;
case 2:
- BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); //out
+ BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
break;
case 3:
- BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK); //in
+ BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK);
break;
}
}
diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c
index 34cc41bd2..91dbe4005 100644
--- a/src/pokenav_match_call_data.c
+++ b/src/pokenav_match_call_data.c
@@ -157,129 +157,6 @@ static void MatchCall_BufferCallMessageText(const match_call_text_data_t *, u8 *
static void MatchCall_BufferCallMessageTextByRematchTeam(const match_call_text_data_t *, u16, u8 *);
static void MatchCall_GetNameAndDescByRematchIdx(u32, const u8 **, const u8 **);
-extern const u8 MatchCall_Text_MrStone1[];
-extern const u8 MatchCall_Text_MrStone2[];
-extern const u8 MatchCall_Text_MrStone3[];
-extern const u8 MatchCall_Text_MrStone4[];
-extern const u8 MatchCall_Text_MrStone5[];
-extern const u8 MatchCall_Text_MrStone6[];
-extern const u8 MatchCall_Text_MrStone7[];
-extern const u8 MatchCall_Text_MrStone8[];
-extern const u8 MatchCall_Text_MrStone9[];
-extern const u8 MatchCall_Text_MrStone10[];
-extern const u8 MatchCall_Text_MrStone11[];
-
-extern const u8 MatchCall_Text_Norman1[];
-extern const u8 MatchCall_Text_Norman2[];
-extern const u8 MatchCall_Text_Norman3[];
-extern const u8 MatchCall_Text_Norman4[];
-extern const u8 MatchCall_Text_Norman5[];
-extern const u8 MatchCall_Text_Norman6[];
-extern const u8 MatchCall_Text_Norman7[];
-extern const u8 MatchCall_Text_Norman8[];
-extern const u8 MatchCall_Text_Norman9[];
-
-extern const u8 MatchCall_Text_Mom1[];
-extern const u8 MatchCall_Text_Mom2[];
-extern const u8 MatchCall_Text_Mom3[];
-
-extern const u8 MatchCall_Text_Steven1[];
-extern const u8 MatchCall_Text_Steven2[];
-extern const u8 MatchCall_Text_Steven3[];
-extern const u8 MatchCall_Text_Steven4[];
-extern const u8 MatchCall_Text_Steven5[];
-extern const u8 MatchCall_Text_Steven6[];
-extern const u8 MatchCall_Text_Steven7[];
-
-extern const u8 MatchCall_Text_May1[];
-extern const u8 MatchCall_Text_May2[];
-extern const u8 MatchCall_Text_May3[];
-extern const u8 MatchCall_Text_May4[];
-extern const u8 MatchCall_Text_May5[];
-extern const u8 MatchCall_Text_May6[];
-extern const u8 MatchCall_Text_May7[];
-extern const u8 MatchCall_Text_May8[];
-extern const u8 MatchCall_Text_May9[];
-extern const u8 MatchCall_Text_May10[];
-extern const u8 MatchCall_Text_May11[];
-extern const u8 MatchCall_Text_May12[];
-extern const u8 MatchCall_Text_May13[];
-extern const u8 MatchCall_Text_May14[];
-extern const u8 MatchCall_Text_May15[];
-
-extern const u8 MatchCall_Text_Brendan1[];
-extern const u8 MatchCall_Text_Brendan2[];
-extern const u8 MatchCall_Text_Brendan3[];
-extern const u8 MatchCall_Text_Brendan4[];
-extern const u8 MatchCall_Text_Brendan5[];
-extern const u8 MatchCall_Text_Brendan6[];
-extern const u8 MatchCall_Text_Brendan7[];
-extern const u8 MatchCall_Text_Brendan8[];
-extern const u8 MatchCall_Text_Brendan9[];
-extern const u8 MatchCall_Text_Brendan10[];
-extern const u8 MatchCall_Text_Brendan11[];
-extern const u8 MatchCall_Text_Brendan12[];
-extern const u8 MatchCall_Text_Brendan13[];
-extern const u8 MatchCall_Text_Brendan14[];
-extern const u8 MatchCall_Text_Brendan15[];
-
-extern const u8 MatchCall_Text_Wally1[];
-extern const u8 MatchCall_Text_Wally2[];
-extern const u8 MatchCall_Text_Wally3[];
-extern const u8 MatchCall_Text_Wally4[];
-extern const u8 MatchCall_Text_Wally5[];
-extern const u8 MatchCall_Text_Wally6[];
-extern const u8 MatchCall_Text_Wally7[];
-
-extern const u8 MatchCall_Text_Scott1[];
-extern const u8 MatchCall_Text_Scott2[];
-extern const u8 MatchCall_Text_Scott3[];
-extern const u8 MatchCall_Text_Scott4[];
-extern const u8 MatchCall_Text_Scott5[];
-extern const u8 MatchCall_Text_Scott6[];
-extern const u8 MatchCall_Text_Scott7[];
-
-extern const u8 MatchCall_Text_Roxanne1[];
-extern const u8 MatchCall_Text_Roxanne2[];
-extern const u8 MatchCall_Text_Roxanne3[];
-extern const u8 MatchCall_Text_Roxanne4[];
-
-extern const u8 MatchCall_Text_Brawly1[];
-extern const u8 MatchCall_Text_Brawly2[];
-extern const u8 MatchCall_Text_Brawly3[];
-extern const u8 MatchCall_Text_Brawly4[];
-
-extern const u8 MatchCall_Text_Wattson1[];
-extern const u8 MatchCall_Text_Wattson2[];
-extern const u8 MatchCall_Text_Wattson3[];
-extern const u8 MatchCall_Text_Wattson4[];
-
-extern const u8 MatchCall_Text_Flannery1[];
-extern const u8 MatchCall_Text_Flannery2[];
-extern const u8 MatchCall_Text_Flannery3[];
-extern const u8 MatchCall_Text_Flannery4[];
-
-extern const u8 MatchCall_Text_Winona1[];
-extern const u8 MatchCall_Text_Winona2[];
-extern const u8 MatchCall_Text_Winona3[];
-extern const u8 MatchCall_Text_Winona4[];
-
-extern const u8 MatchCall_Text_TateLiza1[];
-extern const u8 MatchCall_Text_TateLiza2[];
-extern const u8 MatchCall_Text_TateLiza3[];
-extern const u8 MatchCall_Text_TateLiza4[];
-
-extern const u8 MatchCall_Text_Juan1[];
-extern const u8 MatchCall_Text_Juan2[];
-extern const u8 MatchCall_Text_Juan3[];
-extern const u8 MatchCall_Text_Juan4[];
-
-extern const u8 MatchCall_Text_Sidney[];
-extern const u8 MatchCall_Text_Phoebe[];
-extern const u8 MatchCall_Text_Glacia[];
-extern const u8 MatchCall_Text_Drake[];
-extern const u8 MatchCall_Text_Wallace[];
-
// .rodata
static const match_call_text_data_t sMrStoneTextScripts[] = {
diff --git a/src/pokenav_unk_3.c b/src/pokenav_unk_3.c
index 183c2e424..6a5fb3f8a 100755
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_unk_3.c
@@ -16,7 +16,7 @@
#include "constants/songs.h"
// naming multi-purpose fields
-#define isSpecialTrainer id1 // Gym Leaders, for example. As opposed to regular NPC
+#define isSpecialTrainer id1 // Entries with their own match call header in pokenav_match_call_data.c
#define mapSec id2
#define headerId data
@@ -332,7 +332,7 @@ bool32 ShouldDrawRematchPokeballIcon(int index)
int GetMatchCallTrainerPic(int index)
{
- int var0;
+ int headerId;
struct Pokenav3Struct *state = GetSubstructPtr(5);
if (!state->matchCallEntries[index].isSpecialTrainer)
{
@@ -340,15 +340,15 @@ int GetMatchCallTrainerPic(int index)
return gTrainers[index].trainerPic;
}
- var0 = state->matchCallEntries[index].headerId;
- index = MatchCall_GetRematchTableIdx(var0);
+ headerId = state->matchCallEntries[index].headerId;
+ index = MatchCall_GetRematchTableIdx(headerId);
if (index != REMATCH_TABLE_ENTRIES)
{
index = GetTrainerIdxByRematchIdx(index);
return gTrainers[index].trainerPic;
}
- index = MatchCall_GetOverrideFacilityClass(var0);
+ index = MatchCall_GetOverrideFacilityClass(headerId);
return gFacilityClassToPicIndex[index];
}
diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c
index bc98d4f75..37ff1d90c 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_unk_4.c
@@ -34,7 +34,7 @@ struct Pokenav4Struct
u8 unkF;
u16 locWindowId;
u16 infoBoxWindowId;
- u16 msgBoxWindowId; //windowId
+ u16 msgBoxWindowId;
s16 unk16;
u8 unused18;
u8 unk19;
@@ -157,16 +157,16 @@ const struct BgTemplate gUnknown_0862278C[3] =
static const LoopedTask sMatchCallLoopTaskFuncs[] =
{
- [POKENAV_MC_FUNC_NONE] = NULL,
- [POKENAV_MC_FUNC_DOWN] = MatchCallListCursorDown,
- [POKENAV_MC_FUNC_UP] = MatchCallListCursorUp,
- [POKENAV_MC_FUNC_PG_DOWN] = MatchCallListPageDown,
- [POKENAV_MC_FUNC_PG_UP] = MatchCallListPageUp,
- [POKENAV_MC_FUNC_SELECT] = SelectMatchCallEntry,
- [POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR] = MoveMatchCallOptionsCursor,
- [POKENAV_MC_FUNC_CANCEL] = CancelMatchCallSelection,
- [POKENAV_MC_FUNC_CALL_MSG] = DoMatchCallMessage,
- [POKENAV_MC_FUNC_NEARBY_MSG] = DoTrainerCloseByMessage,
+ [POKENAV_MC_FUNC_NONE] = NULL,
+ [POKENAV_MC_FUNC_DOWN] = MatchCallListCursorDown,
+ [POKENAV_MC_FUNC_UP] = MatchCallListCursorUp,
+ [POKENAV_MC_FUNC_PG_DOWN] = MatchCallListPageDown,
+ [POKENAV_MC_FUNC_PG_UP] = MatchCallListPageUp,
+ [POKENAV_MC_FUNC_SELECT] = SelectMatchCallEntry,
+ [POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR] = MoveMatchCallOptionsCursor,
+ [POKENAV_MC_FUNC_CANCEL] = CancelMatchCallSelection,
+ [POKENAV_MC_FUNC_CALL_MSG] = DoMatchCallMessage,
+ [POKENAV_MC_FUNC_NEARBY_MSG] = DoTrainerCloseByMessage,
[POKENAV_MC_FUNC_10] = sub_81CB888,
[POKENAV_MC_FUNC_SHOW_CHECK_PAGE] = ShowCheckPage,
[POKENAV_MC_FUNC_CHECK_PAGE_UP] = ShowCheckPageUp,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 19:09:20 +0000