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/code_8092334.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/code_8092334.s')
| -rw-r--r-- | asm/code_8092334.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_8092334.s b/asm/code_8092334.s index 7eee044..5d66a52 100644 --- a/asm/code_8092334.s +++ b/asm/code_8092334.s @@ -95,7 +95,7 @@ _080928DE: ldr r1, _080928F4 ldrb r2, [r4, 0x5] add r0, sp, 0x14 - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _080928FC .align 2, 0 _080928F0: .4byte gUnknown_81098C4 @@ -152,7 +152,7 @@ _08092944: str r0, [sp] adds r0, r7, 0 adds r2, r6, 0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08092A6A .align 2, 0 _08092964: .4byte gUnknown_81098E0 @@ -232,7 +232,7 @@ _080929E2: mov r1, r8 adds r2, r6, 0 mov r3, r12 - bl sub_800D158 + bl ExpandPlaceholdersBuffer b _08092A6A .align 2, 0 _08092A10: .4byte gUnknown_81098EC @@ -275,7 +275,7 @@ _08092A3E: mov r1, r8 adds r2, r6, 0 mov r3, r12 - bl sub_800D158 + bl ExpandPlaceholdersBuffer _08092A6A: add sp, 0x20 pop {r3} @@ -737,7 +737,7 @@ sub_8092D54: ldr r2, [r0] adds r0, r6, 0 adds r1, r5, 0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer pop {r4-r6} pop {r0} bx r0 |