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/code_802B640.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/code_802B640.s') diff --git a/asm/code_802B640.s b/asm/code_802B640.s index 683a582..cdef6e2 100644 --- a/asm/code_802B640.s +++ b/asm/code_802B640.s @@ -1297,7 +1297,7 @@ _0802BFE8: adds r1, r0, 0 mov r0, r8 mov r2, r9 - bl sub_800D158 + bl ExpandPlaceholdersBuffer ldr r0, [r7] ldr r3, [r0, 0x38] movs r0, 0 -- cgit v1.2.3