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/unk_menu_203B360_1.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/unk_menu_203B360_1.c')
-rw-r--r-- | src/unk_menu_203B360_1.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/unk_menu_203B360_1.c b/src/unk_menu_203B360_1.c index 1b84f52..743b134 100644 --- a/src/unk_menu_203B360_1.c +++ b/src/unk_menu_203B360_1.c @@ -1,13 +1,5 @@ #include "global.h" - -struct unkData -{ - u8 unk0[14]; - u16 unkD; - u16 unk10; - u16 unk12; - u8 *unk14; -}; +#include "text.h" struct unkStruct_203B360 { @@ -16,7 +8,7 @@ struct unkStruct_203B360 u32 unk4; u32 unk8; u8 fill8[0x148 - 0xC]; - struct unkData unk148[4]; + struct UnkTextStruct2 unk148[4]; u16 unk1A8; u16 unk1AA; u16 unk1AC; |