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

@@ -96,7 +96,7 @@ sub_8090208:
adds r1, r2
ldr r2, [r1]
adds r1, r3, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
pop {r0}
bx r0
.align 2, 0
@@ -123,7 +123,7 @@ sub_8090228:
ldr r2, [r0]
ldrb r3, [r4, 0x1]
adds r0, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _0809026E
.align 2, 0
_08090250: .4byte gDungeons
@@ -137,7 +137,7 @@ _0809025C:
ldr r2, [r0]
ldrb r3, [r4, 0x1]
adds r0, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
_0809026E:
pop {r4,r5}
pop {r0}
@@ -834,7 +834,7 @@ _080907DA:
bne _0809080C
ldr r1, _08090808
adds r0, r7, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
movs r0, 0
b _0809080E
.align 2, 0