summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/pokenav.h20
-rw-r--r--include/strings.h14
-rw-r--r--ld_script.txt38
-rw-r--r--src/pokenav_conditions_1.c (renamed from src/pokenav_unk_6.c)4
-rw-r--r--src/pokenav_conditions_2.c (renamed from src/pokenav_unk_7.c)0
-rw-r--r--src/pokenav_conditions_3.c (renamed from src/pokenav_unk_8.c)0
-rwxr-xr-xsrc/pokenav_match_call_1.c (renamed from src/pokenav_unk_3.c)0
-rwxr-xr-xsrc/pokenav_match_call_2.c (renamed from src/pokenav_unk_4.c)0
-rw-r--r--src/pokenav_menu_handler_1.c (renamed from src/pokenav_unk_1.c)0
-rw-r--r--src/pokenav_menu_handler_2.c (renamed from src/pokenav_unk_2.c)0
-rwxr-xr-xsrc/pokenav_region_map.c (renamed from src/pokenav_unk_5.c)0
-rw-r--r--src/pokenav_ribbons_1.c (renamed from src/pokenav_unk_9.c)0
-rw-r--r--src/pokenav_ribbons_2.c (renamed from src/pokenav_unk_10.c)0
-rw-r--r--sym_bss.txt6
14 files changed, 39 insertions, 43 deletions
diff --git a/include/pokenav.h b/include/pokenav.h
index 37699c13f..fe5616618 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -297,7 +297,7 @@ bool32 WaitForPokenavShutdownFade(void);
void sub_81C7834(void *func1, void *func2);
void ShutdownPokenav(void);
-// pokenav_unk_1.c
+// pokenav_menu_handler_1.c
bool32 PokenavCallback_Init_0(void);
bool32 PokenavCallback_Init_4(void);
bool32 PokenavCallback_Init_5(void);
@@ -310,7 +310,7 @@ int GetPokenavCursorPos(void);
int GetCurrentMenuItemId(void);
u16 GetHelpBarTextId(void);
-// pokenav_unk_2.c
+// pokenav_menu_handler_2.c
bool32 sub_81C9924(void);
bool32 sub_81C9940(void);
void CreateMenuHandlerLoopedTask(s32 ltIdx);
@@ -318,7 +318,7 @@ bool32 sub_81C99C0(void);
void sub_81C99D4(void);
void sub_81CAADC(void);
-// pokenav_unk_3.c
+// pokenav_match_call_1.c
bool32 PokenavCallback_Init_11(void);
u32 sub_81CAB24(void);
void sub_81CAB38(void);
@@ -340,13 +340,13 @@ int GetIndexDeltaOfNextCheckPageDown(int index);
int GetIndexDeltaOfNextCheckPageUp(int index);
bool32 IsRematchEntryRegistered(int index);
-// pokenav_unk_4.c
+// pokenav_match_call_2.c
bool32 sub_81CB260(void);
void CreateMatchCallLoopedTask(s32 index);
u32 sub_81CB2CC(void);
void sub_81CB2E0(void);
-// pokenav_unk_5.c
+// pokenav_region_map.c
u32 PokenavCallback_Init_6(void);
void sub_81CC524(void);
u32 sub_81CC554(void);
@@ -355,7 +355,7 @@ void sub_81CC62C(s32);
u32 sub_81CC65C(void);
void sub_81CC670(void);
-// pokenav_unk_6.c
+// pokenav_conditions_1.c
u32 PokenavCallback_Init_7(void);
u32 PokenavCallback_Init_9(void);
u32 sub_81CD070(void);
@@ -374,14 +374,14 @@ u16 sub_81CDD48(void);
void *sub_81CDCB4(u8 id);
void *sub_81CDCD4(u8 id);
-// pokenav_unk_7.c
+// pokenav_conditions_2.c
bool32 sub_81CDDD4(void);
void sub_81CDE2C(s32);
u32 sub_81CDE64(void);
void sub_81CECA0(void);
u8 sub_81CEF14(void);
-// pokenav_unk_8.c
+// pokenav_conditions_3.c
u32 PokenavCallback_Init_8(void);
u32 PokenavCallback_Init_10(void);
u32 sub_81CEFDC(void);
@@ -392,7 +392,7 @@ void sub_81CF3A0(s32);
u32 sub_81CF3D0(void);
void sub_81CF3F8(void);
-// pokenav_unk_9.c
+// pokenav_ribbons_1.c
u32 PokenavCallback_Init_12(void);
u32 PokenavCallback_Init_14(void);
u32 sub_81CFA34(void);
@@ -403,7 +403,7 @@ void sub_81CFE40(s32);
u32 sub_81CFE70(void);
void sub_81CFE98(void);
-// pokenav_unk_10.c
+// pokenav_ribbons_2.c
u32 PokenavCallback_Init_13(void);
u32 sub_81D04A0(void);
void sub_81D04B8(void);
diff --git a/include/strings.h b/include/strings.h
index eda1c55e4..5178a0087 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2914,8 +2914,11 @@ extern const u8 gText_NumberRegistered[];
extern const u8 gText_NumberOfBattles[];
extern const u8 gText_Unknown[];
extern const u8 gText_TrainerCloseBy[];
+extern const u8 gText_Call[];
+extern const u8 gText_Check[];
+extern const u8 gText_Cancel6[];
-// pokenav_unk_2
+// Pokenav Menu Handler
extern const u8 gText_CheckMapOfHoenn[];
extern const u8 gText_CheckPokemonInDetail[];
extern const u8 gText_CallRegisteredTrainer[];
@@ -2932,15 +2935,8 @@ extern const u8 gText_FindToughPokemon[];
extern const u8 gText_ReturnToConditionMenu[];
extern const u8 gText_NoRibbonWinners[];
-// pokenav_unk_4
-extern const u8 gText_Call[];
-extern const u8 gText_Check[];
-extern const u8 gText_Cancel6[];
-
-// pokenav_unk_8
+// Pokenav Ribbons
extern const u8 gText_NumberF700[];
-
-// pokenav_unk_10
extern const u8 gText_RibbonsF700[];
// use_pokeblock
diff --git a/ld_script.txt b/ld_script.txt
index b7cb97a17..a4f2bc3dc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -307,16 +307,16 @@ SECTIONS {
src/pokenav.o(.text);
src/pokenav_main_menu.o(.text);
src/pokenav_match_call_ui.o(.text);
- src/pokenav_unk_1.o(.text);
- src/pokenav_unk_2.o(.text);
- src/pokenav_unk_3.o(.text);
- src/pokenav_unk_4.o(.text);
- src/pokenav_unk_5.o(.text);
- src/pokenav_unk_6.o(.text);
- src/pokenav_unk_7.o(.text);
- src/pokenav_unk_8.o(.text);
- src/pokenav_unk_9.o(.text);
- src/pokenav_unk_10.o(.text);
+ src/pokenav_menu_handler_1.o(.text);
+ src/pokenav_menu_handler_2.o(.text);
+ src/pokenav_match_call_1.o(.text);
+ src/pokenav_match_call_2.o(.text);
+ src/pokenav_region_map.o(.text);
+ src/pokenav_conditions_1.o(.text);
+ src/pokenav_conditions_2.o(.text);
+ src/pokenav_conditions_3.o(.text);
+ src/pokenav_ribbons_1.o(.text);
+ src/pokenav_ribbons_2.o(.text);
src/pokenav_match_call_data.o(.text);
src/menu_specialized.o(.text);
src/ereader_helpers.o(.text);
@@ -664,15 +664,15 @@ SECTIONS {
src/pokenav.o(.rodata);
src/pokenav_main_menu.o(.rodata);
src/pokenav_match_call_ui.o(.rodata);
- src/pokenav_unk_1.o(.rodata);
- src/pokenav_unk_2.o(.rodata);
- src/pokenav_unk_3.o(.rodata);
- src/pokenav_unk_4.o(.rodata);
- src/pokenav_unk_5.o(.rodata);
- src/pokenav_unk_7.o(.rodata);
- src/pokenav_unk_8.o(.rodata);
- src/pokenav_unk_9.o(.rodata);
- src/pokenav_unk_10.o(.rodata);
+ src/pokenav_menu_handler_1.o(.rodata);
+ src/pokenav_menu_handler_2.o(.rodata);
+ src/pokenav_match_call_1.o(.rodata);
+ src/pokenav_match_call_2.o(.rodata);
+ src/pokenav_region_map.o(.rodata);
+ src/pokenav_conditions_2.o(.rodata);
+ src/pokenav_conditions_3.o(.rodata);
+ src/pokenav_ribbons_1.o(.rodata);
+ src/pokenav_ribbons_2.o(.rodata);
src/pokenav_match_call_data.o(.rodata);
src/menu_specialized.o(.rodata);
src/ereader_helpers.o(.rodata);
diff --git a/src/pokenav_unk_6.c b/src/pokenav_conditions_1.c
index b16aec16e..70c309992 100644
--- a/src/pokenav_unk_6.c
+++ b/src/pokenav_conditions_1.c
@@ -147,9 +147,9 @@ u32 sub_81CD110(struct PokenavSub11 *structPtr)
u32 sub_81CD19C(struct PokenavSub11 *structPtr)
{
if (structPtr->unk6300 == 0)
- return 100002;
+ return POKENAV_MENU_2;
else
- return 100010;
+ return POKENAV_MENU_A;
}
void sub_81CD1C0(void)
diff --git a/src/pokenav_unk_7.c b/src/pokenav_conditions_2.c
index 11fdaa425..11fdaa425 100644
--- a/src/pokenav_unk_7.c
+++ b/src/pokenav_conditions_2.c
diff --git a/src/pokenav_unk_8.c b/src/pokenav_conditions_3.c
index 9b6ce432b..9b6ce432b 100644
--- a/src/pokenav_unk_8.c
+++ b/src/pokenav_conditions_3.c
diff --git a/src/pokenav_unk_3.c b/src/pokenav_match_call_1.c
index 28e84b50b..28e84b50b 100755
--- a/src/pokenav_unk_3.c
+++ b/src/pokenav_match_call_1.c
diff --git a/src/pokenav_unk_4.c b/src/pokenav_match_call_2.c
index aaa1767aa..aaa1767aa 100755
--- a/src/pokenav_unk_4.c
+++ b/src/pokenav_match_call_2.c
diff --git a/src/pokenav_unk_1.c b/src/pokenav_menu_handler_1.c
index 44176176d..44176176d 100644
--- a/src/pokenav_unk_1.c
+++ b/src/pokenav_menu_handler_1.c
diff --git a/src/pokenav_unk_2.c b/src/pokenav_menu_handler_2.c
index 94b816b6d..94b816b6d 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_menu_handler_2.c
diff --git a/src/pokenav_unk_5.c b/src/pokenav_region_map.c
index be30ca94d..be30ca94d 100755
--- a/src/pokenav_unk_5.c
+++ b/src/pokenav_region_map.c
diff --git a/src/pokenav_unk_9.c b/src/pokenav_ribbons_1.c
index 63b4adb30..63b4adb30 100644
--- a/src/pokenav_unk_9.c
+++ b/src/pokenav_ribbons_1.c
diff --git a/src/pokenav_unk_10.c b/src/pokenav_ribbons_2.c
index 2789b1244..2789b1244 100644
--- a/src/pokenav_unk_10.c
+++ b/src/pokenav_ribbons_2.c
diff --git a/sym_bss.txt b/sym_bss.txt
index c2a60404e..b08b0d445 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -47,9 +47,9 @@
.include "src/multiboot.o"
.include "src/mirage_tower.o"
.include "src/berry_fix_program.o"
- .include "src/pokenav_unk_7.o"
- .include "src/pokenav_unk_10.o"
- .include "src/ereader_helpers.o"
+ .include "src/pokenav_conditions_2.o"
+ .include "src/pokenav_ribbons_2.o"
+ .include "src/ereader_helpers.o"
.include "src/faraway_island.o"
.include "src/m4a_1.o"
.include "src/agb_flash.o"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 16:08:06 +0000