diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /src/debug_menu.c | |
parent | eaa141c612dd1689936a21bd57018a55ff686b69 (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/debug_menu.c')
-rw-r--r-- | src/debug_menu.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/debug_menu.c b/src/debug_menu.c index 54f25d9..c0c8b68 100644 --- a/src/debug_menu.c +++ b/src/debug_menu.c @@ -6,24 +6,24 @@ extern struct DebugMenu *gUnknown_203B3EC; -const struct unkData gUnknown_80E7D40 = +const struct UnkTextStruct2 gUnknown_80E7D40 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 + 0x00, 0x00, + 0x00, 0x00, + NULL }; -const struct unkData gUnknown_80E7D58 = +const struct UnkTextStruct2 gUnknown_80E7D58 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, - 0x09, 0x00, 0x0b, 0x00, - 0x0b, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 + 0x09, 0x0b, + 0x0b, 0x00, + NULL }; extern const char dungeons_string[]; @@ -55,16 +55,14 @@ ALIGNED(4) const char field_map_string[] = _("Field Map"); ALIGNED(4) const char field_string[] = _("Field"); ALIGNED(4) const char dungeons_string[] = _("Dungeons"); -ALIGNED(4) const char debug_fill0[] = _("pksdir0"); -ALIGNED(4) const char debug_fill1[] = _("pksdir0"); -ALIGNED(4) const char debug_fill2[] = _("pksdir0"); -ALIGNED(4) const char debug_fill3[] = _("pksdir0"); -ALIGNED(4) const char debug_fill4[] = _("pksdir0"); -ALIGNED(4) const char debug_fill5[] = _("pksdir0"); -ALIGNED(4) const char debug_fill6[] = _("pksdir0"); - +ALIGNED(4) const char debug_menu_fill0[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill1[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill2[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill3[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill4[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill5[] = _("pksdir0"); +ALIGNED(4) const char debug_menu_fill6[] = _("pksdir0"); -extern void sub_800641C(struct unkData *, u32, u32); extern void ResetUnusedInputStruct(void); extern u8 sub_8012FD8(struct DebugMenu *); @@ -73,9 +71,9 @@ extern void sub_80976F8(u8); extern void sub_803A3BC(void); extern void sub_803A3A0(void); -extern void SetMenuItems(void *menu, struct unkData *, u32, const struct unkData *, const struct MenuItem *entries, u32, u32, u32); +extern void SetMenuItems(void *menu, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *entries, u32, u32, u32); extern void sub_8035CF4(struct DebugMenu *, u32, u32); -extern void sub_8035CC0(struct unkData *, u32); +extern void sub_8035CC0(struct UnkTextStruct2 *, u32); void CreateDebugMenu(void) { |