summaryrefslogtreecommitdiff
path: root/src/main_menu_1.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-06-09 22:54:21 -0500
committerGitHub <noreply@github.com>2021-06-09 22:54:21 -0500
commit377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch)
tree5440970e02a7890791b234aa233e91e5c1d65b40 /src/main_menu_1.c
parenteaa141c612dd1689936a21bd57018a55ff686b69 (diff)
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json * rule tweaking to actually build tool before parsing JSON * delete .inc pokemon for tiny Woods and Thunderwave * silence git complaining about br_ips and ips_patch * use defines for species and pass the header file for species * convert sinister woods * convert MtThunderPeak * convert silent chasm * add trial floor_id w/ tiny woods * change make rule name to fix compile * MtSteel converted and bugfix * convert few floor headers and great canyon pokemon * code cleanup * unify unkData into UnkTextStruct2 * more code cleanup and some text decomp * doc more funcs and decomp/split some stuff * document more save stuff * more save work and move some data * pika sniped UpdateNatureTotal * decomp a litle and convert a few more dungeons * better scanning for json files * mt freeze and peak
Diffstat (limited to 'src/main_menu_1.c')
-rw-r--r--src/main_menu_1.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/main_menu_1.c b/src/main_menu_1.c
index 5363bf9..668df86 100644
--- a/src/main_menu_1.c
+++ b/src/main_menu_1.c
@@ -1,11 +1,7 @@
#include "global.h"
#include "main_menu.h"
#include "menu.h"
-
-struct unkData
-{
- u8 unk0[24];
-};
+#include "text.h"
struct unkStruct_203B34C
{
@@ -16,7 +12,7 @@ struct unkStruct_203B34C
u8 fillC[0x30 - 0xC];
s16 menuIndex;
u8 fill32[0x144 - 0x32];
- struct unkData unk144[4];
+ struct UnkTextStruct2 unk144[4];
/* 0x1A4 */ u32 currMenuChoice;
};
@@ -53,11 +49,11 @@ extern const struct MenuItem gUnknown_80E6030[];
extern u8 sub_803D0D8();
extern s32 sub_8011C34();
extern s32 sub_8095324(u32);
-extern void SetMenuItems(u32 *, struct unkData *, u32, u32 *, const struct MenuItem *, u32, u32, u32);
+extern void SetMenuItems(u32 *, struct UnkTextStruct2 *, u32, u32 *, const struct MenuItem *, u32, u32, u32);
void SetMainMenuItems(void);
extern bool8 SetMainMenuText();
extern void sub_8035CF4(u32 *, u32, u32);
-extern void sub_8035CC0(struct unkData *, u32);
+extern void sub_8035CC0(struct UnkTextStruct2 *, u32);
bool8 SetMainMenuText(void)
{
@@ -210,11 +206,11 @@ void SetMainMenuItems(void)
}
}
-u8 sub_80363E0(void)
+bool8 sub_80363E0(void)
{
if(gUnknown_203B34C == NULL)
- return 0;
+ return FALSE;
if(gUnknown_203B34C->unk0 == 0xC)
- return 0;
- return 1;
+ return FALSE;
+ return TRUE;
}