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 /asm/items.s | |
| 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 'asm/items.s')
| -rw-r--r-- | asm/items.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/items.s b/asm/items.s index 59454e0..87c7dc7 100644 --- a/asm/items.s +++ b/asm/items.s @@ -47,7 +47,7 @@ _08090E50: ldr r2, [r0] ldrb r3, [r5, 0x1] mov r0, sp - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08090EC4 .align 2, 0 _08090E68: .4byte gUnknown_8109770 @@ -61,7 +61,7 @@ _08090E70: adds r0, r2 ldr r2, [r0] mov r0, sp - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08090EC4 .align 2, 0 _08090E88: .4byte gUnknown_8109778 @@ -76,7 +76,7 @@ _08090E90: adds r2, r0, 0 mov r0, sp adds r1, r4, 0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08090EC4 .align 2, 0 _08090EAC: .4byte gUnknown_810977C @@ -99,7 +99,7 @@ _08090EC4: ldr r1, _08090F30 adds r0, r6, 0 mov r2, sp - bl sub_800D158 + bl ExpandPlaceholdersBuffer mov r0, sp adds r1, r6, 0 movs r2, 0x50 @@ -118,7 +118,7 @@ _08090EE2: ldr r1, _08090F34 adds r0, r6, 0 mov r2, sp - bl sub_800D158 + bl ExpandPlaceholdersBuffer mov r0, sp adds r1, r6, 0 movs r2, 0x50 @@ -218,7 +218,7 @@ _08090F9C: str r2, [sp] adds r0, r5, 0 adds r2, r6, 0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08090FDE .align 2, 0 _08090FC4: .4byte gUnknown_8109794 @@ -231,7 +231,7 @@ _08090FC8: adds r0, r5, 0 adds r2, r6, 0 add r3, sp, 0x4 - bl sub_800D158 + bl ExpandPlaceholdersBuffer _08090FDE: add sp, 0x2C pop {r4-r6} |