summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/asm.inc.h6
-rw-r--r--include/menu.h10
-rw-r--r--include/mori_debug_menu.h4
-rw-r--r--src/clear_save_data_menu.c2
-rw-r--r--src/main_menu.c10
-rw-r--r--src/menu.c12
-rw-r--r--src/mori_debug_menu.c24
-rw-r--r--src/pokedex.c4
-rw-r--r--src/starter_choose.c9
-rw-r--r--src/title_screen.c16
-rw-r--r--src/wallclock.c6
11 files changed, 52 insertions, 51 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index fc7093437..567c8708e 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -19,11 +19,11 @@ void sub_80408BC();
void current_map_music_set__default_for_battle(u16);
// asm/rom_8040EB4.o
-void StoreWordInTwoHalfwords(u32, u8 *);
-void LoadWordFromTwoHalfwords(u32, u8 *);
+void StoreWordInTwoHalfwords(u16 *, u32);
+void LoadWordFromTwoHalfwords(u16 *, u32);
// asm/daycare.o
-u8 daycare_count_pokemon(u32);
+u8 daycare_count_pokemon(u8 *);
void sub_8041324(struct BoxPokemon *, void *);
void sub_8041790(int i);
u16 sub_8041870(u16);
diff --git a/include/menu.h b/include/menu.h
index 7dfe418a9..6805591df 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -3,6 +3,12 @@
#include "text.h"
+struct MenuAction
+{
+ u8 *text;
+ u8 (*func)(void);
+};
+
void InitMenuWindow(const struct WindowConfig *);
void MultistepInitMenuWindowBegin(struct WindowConfig *);
bool32 MultistepInitMenuWindowContinue(void);
@@ -36,8 +42,8 @@ u8 MoveMenuCursor4(s8);
void sub_807274C(u8, u8, u8, u8, u8 * const [][2], u8, u32);
s8 sub_80727CC(void);
u8 sub_807288C(u8);
-void PrintMenuItems(u8, u8, u8, u8 * const [][2]);
-void PrintMenuItemsReordered(u8, u8, u8, u8 * const [][2], u8*);
+void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
+void PrintMenuItemsReordered(u8, u8, u8, const struct MenuAction[], u8*);
void InitYesNoMenu(u8, u8, u8);
void DisplayYesNoMenu(u8, u8, u32);
s8 ProcessMenuInputNoWrap_(void);
diff --git a/include/mori_debug_menu.h b/include/mori_debug_menu.h
index 0d1f49d3b..f1dc0de93 100644
--- a/include/mori_debug_menu.h
+++ b/include/mori_debug_menu.h
@@ -1,7 +1,7 @@
#ifndef GUARD_MORI_DEBUG_MENU_H
#define GUARD_MORI_DEBUG_MENU_H
-s8 sub_8083D4C(void);
+bool8 sub_8083D4C(void);
u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr);
s8 MoriDebugMenu_Egg(void);
s8 MoriDebugMenu_MaleEgg(void);
@@ -11,7 +11,7 @@ s8 MoriDebugMenu_MoveTutor(void);
s8 MoriDebugMenu_BreedEgg(void);
s8 MoriDebugMenu_LongName(void);
s8 MoriDebugMenu_PokeblockCase(void);
-s8 MoriDebugMenuProcessInput(void);
+bool8 MoriDebugMenuProcessInput(void);
s8 InitMoriDebugMenu(void);
#endif // GUARD_MORI_DEBUG_MENU_H
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 7e00223ce..8865eeb57 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -11,7 +11,7 @@
extern u8 gSystemText_ClearAllSaveDataPrompt[];
extern u8 gSystemText_ClearingData[];
-extern u8 *gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
static void VBlankCB_ClearSaveDataScreen(void);
static void Task_InitMenu(u8);
diff --git a/src/main_menu.c b/src/main_menu.c
index 02aabbb64..274386b03 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -57,9 +57,9 @@ extern const struct SpritePalette gMonPaletteTable[];
extern struct SpriteTemplate gUnknown_02024E8C;
extern void * const gUnknown_081FAF4C[];
extern u16 gUnknown_081E795C[];
-extern u8 * const gUnknown_081E79B0[][2];
-extern u8 * const gMalePresetNames[][2];
-extern u8 * const gFemalePresetNames[][2];
+extern const struct MenuAction gUnknown_081E79B0[];
+extern const struct MenuAction gMalePresetNames[];
+extern const struct MenuAction gFemalePresetNames[];
extern const u8 gUnknown_081E764C[];
extern const u8 gUnknown_081E768C[];
@@ -1645,9 +1645,9 @@ static void SetPresetPlayerName(u8 index)
u8 *name;
if (gSaveBlock2.playerGender == MALE)
- name = gMalePresetNames[index][0];
+ name = gMalePresetNames[index].text;
else
- name = gFemalePresetNames[index][0];
+ name = gFemalePresetNames[index].text;
for (i = 0; i < 7; i++)
gSaveBlock2.playerName[i] = name[i];
diff --git a/src/menu.c b/src/menu.c
index 3b0440afb..62237794b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -39,7 +39,7 @@ EWRAM_DATA u16 gMenuTextWindowTileOffset = 0;
EWRAM_DATA u16 gMenuTextWindowContentTileOffset = 0;
EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0;
-extern const u8 *gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
void InitMenuWindow(const struct WindowConfig *winConfig)
{
@@ -540,25 +540,25 @@ u8 sub_807288C(u8 column)
return gMenu.columnXCoords[column];
}
-void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, u8 * const menuItems[][2])
+void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[])
{
u8 i;
for (i = 0; i < menuItemCount; i++)
- MenuPrint(menuItems[i][0], left, top + 2 * i);
+ MenuPrint(menuItems[i].text, left, top + 2 * i);
}
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, u8 * const menuItems[][2], u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], u8 *order)
{
u8 i;
for (i = 0; i < menuItemCount; i++)
- MenuPrint(menuItems[order[i]][0], left, top + 2 * i);
+ MenuPrint(menuItems[order[i]].text, left, top + 2 * i);
}
void InitYesNoMenu(u8 left, u8 top, u8 a3)
{
- PrintMenuItems(left + 1, top + 1, 2, (void *)gUnknown_08376D74);
+ PrintMenuItems(left + 1, top + 1, 2, gUnknown_08376D74);
InitMenu(0, left + 1, top + 1, 2, 0, a3);
}
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index b8fe92b9a..fd253d0a6 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -8,29 +8,23 @@
extern u8 (*gCallback_03004AE8)(void);
-struct DebugMenuAction
-{
- u8 *text;
- u8 (*func)(void);
-};
-
extern u8 gUnknown_0839B24D[];
extern u8 gUnknown_0839B255[];
extern u8 gUnknown_0839B257[];
-extern struct DebugMenuAction gMoriDebugMenuActions[];
+extern const struct MenuAction gMoriDebugMenuActions[];
extern u8 gSpeciesNames[][11];
-s8 sub_8083D4C(void)
+bool8 sub_8083D4C(void)
{
- if ( gMain.newKeys & 1 )
+ if ( gMain.newKeys & A_BUTTON )
{
sub_8071C20();
- return 1;
+ return TRUE;
}
else
- return 0;
+ return FALSE;
}
u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
@@ -127,7 +121,7 @@ s8 MoriDebugMenu_PokeblockCase(void)
return 1;
}
-s8 MoriDebugMenuProcessInput(void)
+bool8 MoriDebugMenuProcessInput(void)
{
s8 choice = ProcessMenuInput();
@@ -135,12 +129,12 @@ s8 MoriDebugMenuProcessInput(void)
{
default:
gCallback_03004AE8 = gMoriDebugMenuActions[choice].func;
- return 0;
+ return FALSE;
case -2:
- return 0;
+ return FALSE;
case -1:
sub_8071C20();
- return 1;
+ return TRUE;
}
}
diff --git a/src/pokedex.c b/src/pokedex.c
index 8d574ed57..aa832a681 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -70,7 +70,7 @@ extern u8 gUnknown_08E96738[];
extern u8 gUnknown_08E9C6DC[];
extern u8 gUnknown_08E96888[];
extern u8 gUnknown_08E96994[];
-extern u8 gUnknown_083A05CC[];
+extern struct SpriteSheet gUnknown_083A05CC;
extern struct SpritePalette gUnknown_083A05DC[];
extern u8 gUnknown_0839FA7C[];
extern u8 gUnknown_0839F67C[];
@@ -771,7 +771,7 @@ bool8 sub_808D344(u8 a)
ResetSpriteData();
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 8;
- LoadCompressedObjectPic(gUnknown_083A05CC);
+ LoadCompressedObjectPic(&gUnknown_083A05CC);
LoadSpritePalettes(gUnknown_083A05DC);
sub_808E978(a);
gMain.state++;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index f21ddde1c..341f73e4c 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -11,6 +11,7 @@
#include "task.h"
#include "trig.h"
#include "decompress.h"
+#include "sprite.h"
struct MonCoords
{
@@ -22,8 +23,8 @@ extern const u8 gStarterChoose_PokeballCoords[][2];
extern u8 gUnknown_083F66F0[];
extern u8 gBirchBagTilemap[];
extern u8 gBirchGrassTilemap[];
-extern u8 gUnknown_083F7794[];
-extern u8 gUnknown_083F77A4[];
+extern struct SpriteSheet gUnknown_083F7794;
+extern struct SpriteSheet gUnknown_083F77A4;
extern u8 gUnknown_083F62EC[];
extern const u8 gStarterChoose_LabelCoords[][2];
extern u16 gStarterMons[];
@@ -116,8 +117,8 @@ void CB2_ChooseStarter(void)
ResetPaletteFade();
FreeAllSpritePalettes();
LoadPalette(gUnknown_083F62EC, 0, 0x40);
- LoadCompressedObjectPic(gUnknown_083F7794);
- LoadCompressedObjectPic(gUnknown_083F77A4);
+ LoadCompressedObjectPic(&gUnknown_083F7794);
+ LoadCompressedObjectPic(&gUnknown_083F77A4);
LoadSpritePalettes(gUnknown_083F77B4);
SetUpWindowConfig(&gWindowConfig_81E6C3C);
InitMenuWindow(&gWindowConfig_81E6CE4);
diff --git a/src/title_screen.c b/src/title_screen.c
index 6100fbdc5..9282978de 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -25,12 +25,12 @@ extern u8 gUnknown_08393BF8[];
extern u16 gUnknown_08393E64[];
extern struct SpriteTemplate gSpriteTemplate_8393ECC;
extern struct SpriteTemplate gSpriteTemplate_8393EE4;
-extern u8 gUnknown_08393EFC[];
+extern struct SpriteSheet gUnknown_08393EFC;
extern struct SpriteTemplate gSpriteTemplate_8393F74;
-extern u8 gUnknown_08393F8C[];
-extern u8 gUnknown_08393F9C[];
+extern struct SpriteSheet gUnknown_08393F8C;
+extern const struct SpritePalette gUnknown_08393F9C[];
extern struct SpriteTemplate gSpriteTemplate_8393FC0;
-extern u8 gUnknown_08393FD8[];
+extern struct SpriteSheet gUnknown_08393FD8;
extern u8 gUnknown_08E9D8CC[];
extern u8 gUnknown_08E9F624[];
extern u8 gUnknown_08E9F7E4[];
@@ -253,11 +253,11 @@ void CB2_InitTitleScreen(void)
ResetSpriteData();
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 14;
- LoadCompressedObjectPic(gUnknown_08393EFC);
- LoadCompressedObjectPic(gUnknown_08393F8C);
- LoadCompressedObjectPic(gUnknown_08393FD8);
+ LoadCompressedObjectPic(&gUnknown_08393EFC);
+ LoadCompressedObjectPic(&gUnknown_08393F8C);
+ LoadCompressedObjectPic(&gUnknown_08393FD8);
LoadPalette(gUnknown_08E9F624, 0x100, 0x1C0);
- LoadSpritePalette(gUnknown_08393F9C);
+ LoadSpritePalette(&gUnknown_08393F9C[0]);
gMain.state = 2;
break;
case 2:
diff --git a/src/wallclock.c b/src/wallclock.c
index abfc4a12a..e3b79efea 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -15,12 +15,12 @@ extern u16 gSpecialVar_0x8004;
extern u16 gMiscClockMale_Pal[];
extern u16 gMiscClockFemale_Pal[];
extern u8 gMiscClock_Gfx[];
-extern u8 gUnknown_083F7A90[];
+extern struct SpriteSheet gUnknown_083F7A90;
extern struct SpritePalette gUnknown_083F7AA0;
extern u8 gUnknown_08E95774[];
extern u8 gUnknown_08E954B0[];
extern u8 gOtherText_CorrectTimePrompt[];
-extern u8 * const gUnknown_08376D74[][2];
+extern const struct MenuAction gUnknown_08376D74[];
extern s8 gClockHandCoords[][2];
extern struct SpriteTemplate gSpriteTemplate_83F7AD8;
@@ -122,7 +122,7 @@ static void LoadWallClockGraphics(void)
ResetSpriteData();
ResetPaletteFade();
FreeAllSpritePalettes();
- LoadCompressedObjectPic(gUnknown_083F7A90);
+ LoadCompressedObjectPic(&gUnknown_083F7A90);
LoadSpritePalettes(&gUnknown_083F7AA0);
SetUpWindowConfig(&gWindowConfig_81E6C3C);
InitMenuWindow(&gWindowConfig_81E6CE4);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 09:56:32 +0000