summaryrefslogtreecommitdiff
path: root/src/debug_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/debug_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/debug_menu_1.c')
-rw-r--r--src/debug_menu_1.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/debug_menu_1.c b/src/debug_menu_1.c
index 705a23f..0104c07 100644
--- a/src/debug_menu_1.c
+++ b/src/debug_menu_1.c
@@ -1,17 +1,12 @@
#include "global.h"
-
-struct subStruct
-{
- u8 unk0;
- u8 unk1;
- u8 unk2;
- u8 unk3;
-};
+#include "pokemon.h"
struct unkStruct_203B3F8
{
- u8 fill0[8];
- struct subStruct *unk8;
+ // size: 0x140
+ u32 state;
+ u32 unk4;
+ struct PokemonStruct *pokemon;
u8 fill4[4];
u32 unk10;
u8 fill14[0x60 - 0x14];
@@ -61,7 +56,7 @@ void sub_803AFE8(void)
default:
break;
case 3:
- gUnknown_203B3F8->unk8->unk3 = gUnknown_203B3F8->unk60;
+ gUnknown_203B3F8->pokemon->unk3 = gUnknown_203B3F8->unk60;
// Fallthrough is needed to match
case 2:
sub_803ACD0(2);