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 /include/trade_items_menu.h | |
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 'include/trade_items_menu.h')
-rw-r--r-- | include/trade_items_menu.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h index 36e6054..4c7e37c 100644 --- a/include/trade_items_menu.h +++ b/include/trade_items_menu.h @@ -1,10 +1,7 @@ #ifndef GUARD_TRADE_ITEMS_MENU_H #define GUARD_TRADE_ITEMS_MENU_H -struct unkData -{ - u8 unk0[24]; -}; +#include "text.h" struct TradeSubStruct { @@ -28,7 +25,7 @@ struct TradeItemsMenu u32 unk20; u32 unk24; u32 unk28; - struct unkData *unk2C; + struct UnkTextStruct2 *unk2C; u32 unk30; u32 unk34; u8 fill38[0x44 - 0x38]; @@ -36,10 +33,8 @@ struct TradeItemsMenu u8 fill8[0x134 - 0x48]; u32 unk134; u8 fill138[0x184 - 0x138]; - struct unkData unk184[3]; // guessing the size until I know - u8 fill188[0x1E4 - 0x1CC]; - u32 unk1E4; - u8 fill1E8[0x244 - 0x1E8]; + struct UnkTextStruct2 unk184[4]; + struct UnkTextStruct2 unk1E4[4]; // TODO These might be structs... struct TradeSubStruct unk244; |