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/game_options.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/game_options.s') diff --git a/asm/game_options.s b/asm/game_options.s index cad1919..aed77bf 100644 --- a/asm/game_options.s +++ b/asm/game_options.s @@ -62,8 +62,8 @@ _08094A3E: bx r1 thumb_func_end GameOptionsNotChange - thumb_func_start sub_8094A44 -sub_8094A44: + thumb_func_start WriteSaveOptions +WriteSaveOptions: push {r4-r7,lr} sub sp, 0x4 adds r4, r0, 0 @@ -167,10 +167,10 @@ _08094AEC: bx r0 .align 2, 0 _08094B14: .4byte gUnknown_203B46C - thumb_func_end sub_8094A44 + thumb_func_end WriteSaveOptions - thumb_func_start sub_8094B18 -sub_8094B18: + thumb_func_start ReadSaveOptions +ReadSaveOptions: push {r4-r6,lr} mov r6, r8 push {r6} @@ -286,7 +286,7 @@ sub_8094B18: bx r0 .align 2, 0 _08094C10: .4byte gUnknown_203B46C - thumb_func_end sub_8094B18 + thumb_func_end ReadSaveOptions thumb_func_start sub_8094C14 sub_8094C14: -- cgit v1.2.3