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
This commit is contained in:
Seth Barberee
2021-06-09 22:54:21 -05:00
committed by GitHub
parent eaa141c612
commit 377bd14ea6
152 changed files with 55612 additions and 52652 deletions

View File

@@ -8732,7 +8732,7 @@ _08011406:
ldr r1, _0801147C
ldr r2, [r6]
add r0, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
movs r0, 0
str r0, [sp]
movs r0, 0xC