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/kecleon_items_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/kecleon_items_1.c')
| -rw-r--r-- | src/kecleon_items_1.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kecleon_items_1.c b/src/kecleon_items_1.c index f305c6f..0db9bb3 100644 --- a/src/kecleon_items_1.c +++ b/src/kecleon_items_1.c @@ -60,19 +60,19 @@ void sub_8019B08(void) void sub_8019BBC(void) { - int local_c; + int menuAction; - local_c = 0; + menuAction = 0; if (gUnknown_203B210->unk4 != 0) { sub_8019EDC(0); } else { sub_801A2A8(0); } - if ((sub_8012FD8(&gUnknown_203B210->unk84) == 0) && (sub_8013114(&gUnknown_203B210->unk84,&local_c), local_c != 1)) { - gUnknown_203B210->unk30 = local_c; + if ((sub_8012FD8(&gUnknown_203B210->unk84) == 0) && (sub_8013114(&gUnknown_203B210->unk84,&menuAction), menuAction != 1)) { + gUnknown_203B210->unk30 = menuAction; } - switch(local_c){ + switch(menuAction){ case 2: if (gUnknown_203B460->teamMoney == 0) { UpdateKecleonStoreState(0x6); @@ -97,14 +97,14 @@ void sub_8019BBC(void) void sub_8019C78(void) { - int local_c; + int menuAction; - local_c = 0; + menuAction = 0; sub_801A6E8(0); - if ((sub_8012FD8(&gUnknown_203B210->unk84) == '\0') && (sub_8013114(&gUnknown_203B210->unk84,&local_c), local_c != 1)) { - gUnknown_203B210->unk2C = local_c; + if ((sub_8012FD8(&gUnknown_203B210->unk84) == '\0') && (sub_8013114(&gUnknown_203B210->unk84,&menuAction), menuAction != 1)) { + gUnknown_203B210->unk2C = menuAction; } - switch(local_c){ + switch(menuAction){ case 3: sub_8099690(0); if (sub_80914E4(gUnknown_203B210->unk1C.itemIndex) == '\0') { |