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/wonder_mail_5.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/wonder_mail_5.s')
| -rw-r--r-- | asm/wonder_mail_5.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/wonder_mail_5.s b/asm/wonder_mail_5.s index 1669b8d..cad53b3 100644 --- a/asm/wonder_mail_5.s +++ b/asm/wonder_mail_5.s @@ -56,7 +56,7 @@ _08031B2C: ldr r1, _08031B8C ldrb r2, [r5, 0x5] add r0, sp, 0x4 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] str r6, [sp] @@ -71,7 +71,7 @@ _08031B2C: adds r2, r0, 0 add r0, sp, 0x4 adds r1, r4, 0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] str r6, [sp] @@ -136,7 +136,7 @@ _08031BC2: ldrb r2, [r4, 0x5] ldr r0, [sp, 0xD8] ldr r1, _08031C2C - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] mov r0, r8 @@ -167,7 +167,7 @@ _08031C30: adds r0, r5, 0 ldr r1, _08031C54 mov r2, r9 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] mov r1, r8 @@ -194,7 +194,7 @@ _08031C70: adds r0, r5, 0 ldr r1, _08031C98 _08031C7E: - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] mov r2, r8 @@ -214,7 +214,7 @@ _08031C9C: adds r2, r0, 0 adds r0, r5, 0 ldr r1, _08031CD0 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x10] mov r2, r8 |