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/code_8012A18_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/code_8012A18_1.c')
| -rw-r--r-- | src/code_8012A18_1.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c index 62dc64d..e91d971 100644 --- a/src/code_8012A18_1.c +++ b/src/code_8012A18_1.c @@ -3,16 +3,17 @@ #include "file_system.h" #include "memory.h" #include "input.h" - -extern void sub_800641C(u32, u32, u32); +#include "text.h" struct unkStruct_203B200 { + // size: 0x50 u32 unk0; u32 unk4; u8 *pokeName; s32 state; /* 0x10 */ struct MenuItem menus[3]; + u8 fill[0x50 - 0x28]; }; extern struct unkStruct_203B200 *gUnknown_203B200; extern const char *gUnknown_80D4920; @@ -94,7 +95,7 @@ u32 sub_801602C(u32 r0, u8 *name) { ResetUnusedInputStruct(); sub_800641C(0, 1, 1); - gUnknown_203B200 = MemoryAlloc(0x50, 8); + gUnknown_203B200 = MemoryAlloc(sizeof(struct unkStruct_203B200), 8); gUnknown_203B200->unk0 = r0; gUnknown_203B200->pokeName = name; switch(r0) @@ -139,8 +140,6 @@ u32 sub_8016080(void) return 0; } -extern void MemoryFree(void *); - void sub_80160D8(void) { if(gUnknown_203B200 != NULL) |