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/makuhita_dojo.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/makuhita_dojo.c')
| -rw-r--r-- | src/makuhita_dojo.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/makuhita_dojo.c b/src/makuhita_dojo.c index d35a659..b01e1a6 100644 --- a/src/makuhita_dojo.c +++ b/src/makuhita_dojo.c @@ -4,11 +4,7 @@ #include "input.h" #include "constants/species.h" #include "memory.h" - -struct unkData -{ - u8 unk0[24]; -}; +#include "text.h" struct unkStruct_203B318 { @@ -28,16 +24,13 @@ struct unkStruct_203B318 u8 unk66; u8 unk67; struct OpenedFile** unk68; - struct unkData unk6C[4]; + struct UnkTextStruct2 unk6C[4]; }; extern u8 gUnknown_202E5D8[]; extern u8 gUnknown_202E1C8[]; extern struct unkStruct_203B318 *gUnknown_203B318; -extern struct unkData gUnknown_80E0760; - -extern void sub_800641C(struct unkData *, u32, u32); -extern void sub_8006518(struct unkData *); +extern struct UnkTextStruct2 gUnknown_80E0760; extern void sub_8030208(); extern void sub_8030258(); @@ -56,7 +49,7 @@ u32 CreateMakuhitaShop(u32 param_1) ResetUnusedInputStruct(); sub_800641C(0,1,1); - gUnknown_203B318 = MemoryAlloc(0xcc,8); + gUnknown_203B318 = MemoryAlloc(sizeof(struct unkStruct_203B318),8); gUnknown_203B318->unk10 = -1; gUnknown_203B318->unk0 = param_1; switch(param_1) { |