From 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Wed, 9 Jun 2021 22:54:21 -0500 Subject: 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 --- asm/pokemon_square.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm/pokemon_square.s') diff --git a/asm/pokemon_square.s b/asm/pokemon_square.s index 7434269..9083e46 100644 --- a/asm/pokemon_square.s +++ b/asm/pokemon_square.s @@ -438,7 +438,7 @@ _0801A1BC: mov r0, r8 ldr r1, _0801A204 add r2, sp, 0x4 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] adds r1, r6, 0 bl sub_8013800 @@ -906,7 +906,7 @@ _0801A588: mov r0, r8 ldr r1, _0801A5D0 add r2, sp, 0x4 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] adds r1, r6, 0 bl sub_8013800 @@ -1666,7 +1666,7 @@ _0801AB90: ldr r1, _0801AC08 adds r0, r5, 0 add r2, sp, 0x4 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r4, _0801AC0C ldr r0, [r4] adds r0, 0x54 -- cgit v1.2.3