From 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Jun 2021 22:54:21 -0500 Subject: 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 --- src/felicity_bank.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/felicity_bank.c') diff --git a/src/felicity_bank.c b/src/felicity_bank.c index 8a2aae8..28550dd 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -10,12 +10,10 @@ extern u8 gUnknown_202E5D8[]; extern u8 gUnknown_202E1C8[]; extern struct unkStruct_203B204 *gUnknown_203B204; -extern struct unkData gUnknown_80DB6DC; -extern struct unkData gUnknown_80DB6F4; -extern struct unkData gUnknown_80DB70C; +extern struct UnkTextStruct2 gUnknown_80DB6DC; +extern struct UnkTextStruct2 gUnknown_80DB6F4; +extern struct UnkTextStruct2 gUnknown_80DB70C; -extern void sub_800641C(struct unkData *, u32, u32); -extern void sub_8006518(struct unkData *); extern void sub_8016B24(); extern void sub_80169BC(); extern void Felicity_DepositMoney(); @@ -115,17 +113,17 @@ void sub_801645C(void) switch(gUnknown_203B204->currState) { case 2: - gUnknown_203B204->unkA8[0].unk0[0] = 0x80; - gUnknown_203B204->unkA8[1].unk0[0] = 0x80; - gUnknown_203B204->unkA8[2].unk0[0] = 0x80; + gUnknown_203B204->unkA8[0].fill00[0] = 0x80; + gUnknown_203B204->unkA8[1].fill00[0] = 0x80; + gUnknown_203B204->unkA8[2].fill00[0] = 0x80; gUnknown_203B204->unkA8[3] = gUnknown_80DB6F4; ResetUnusedInputStruct(); sub_800641C(gUnknown_203B204->unkA8, 1, 0); break; case 8: case 11: - gUnknown_203B204->unkA8[0].unk0[0] = 0x80; - gUnknown_203B204->unkA8[1].unk0[0] = 0x80; + gUnknown_203B204->unkA8[0].fill00[0] = 0x80; + gUnknown_203B204->unkA8[1].fill00[0] = 0x80; gUnknown_203B204->unkA8[3] = gUnknown_80DB6F4; gUnknown_203B204->unkA8[2] = gUnknown_80DB70C; ResetUnusedInputStruct(); -- cgit v1.2.3