From 7dca612936fda9254239e0e350a45c56a766053a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:47:07 -0400 Subject: Fix indentation in .inc files --- data/maps/SSAnne_Kitchen/scripts.inc | 84 ++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'data/maps/SSAnne_Kitchen/scripts.inc') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 79aa88852..727531dfa 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -1,63 +1,63 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 - .byte 0 + .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - loadword 0, gUnknown_81733F8 - callstd 2 - end + loadword 0, gUnknown_81733F8 + callstd 2 + end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - loadword 0, gUnknown_8173429 - callstd 2 - end + loadword 0, gUnknown_8173429 + callstd 2 + end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - loadword 0, gUnknown_8173462 - callstd 2 - end + loadword 0, gUnknown_8173462 + callstd 2 + end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE - lock - faceplayer - loadword 0, gUnknown_8173570 - callstd 4 - random 3 - copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 - compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C - compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 - release - end + lock + faceplayer + loadword 0, gUnknown_8173570 + callstd 4 + random 3 + copyvar VAR_0x8008, VAR_RESULT + compare_var_to_value VAR_0x8008, 0 + call_if 1, EventScript_160B03 + compare_var_to_value VAR_0x8008, 1 + call_if 1, EventScript_160B0C + compare_var_to_value VAR_0x8008, 2 + call_if 1, EventScript_160B15 + release + end EventScript_160B03:: @ 8160B03 - loadword 0, gUnknown_817359F - callstd 4 - return + loadword 0, gUnknown_817359F + callstd 4 + return EventScript_160B0C:: @ 8160B0C - loadword 0, gUnknown_81735DF - callstd 4 - return + loadword 0, gUnknown_81735DF + callstd 4 + return EventScript_160B15:: @ 8160B15 - loadword 0, gUnknown_8173611 - callstd 4 - return + loadword 0, gUnknown_8173611 + callstd 4 + return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - loadword 0, gUnknown_81734A0 - callstd 2 - end + loadword 0, gUnknown_81734A0 + callstd 2 + end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - loadword 0, gUnknown_81734D3 - callstd 2 - end + loadword 0, gUnknown_81734D3 + callstd 2 + end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - loadword 0, gUnknown_817353E - callstd 2 - end + loadword 0, gUnknown_817353E + callstd 2 + end -- cgit v1.2.3 From 119693e1816563b66b19eef216f08cab65a644ba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 09:38:19 -0400 Subject: propagate msgbox macro --- data/maps/SSAnne_Kitchen/scripts.inc | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'data/maps/SSAnne_Kitchen/scripts.inc') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 727531dfa..b1b60056d 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -2,25 +2,21 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - loadword 0, gUnknown_81733F8 - callstd 2 + msgbox gUnknown_81733F8, 2 end SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - loadword 0, gUnknown_8173429 - callstd 2 + msgbox gUnknown_8173429, 2 end SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - loadword 0, gUnknown_8173462 - callstd 2 + msgbox gUnknown_8173462, 2 end SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE lock faceplayer - loadword 0, gUnknown_8173570 - callstd 4 + msgbox gUnknown_8173570 random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 @@ -33,31 +29,25 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE end EventScript_160B03:: @ 8160B03 - loadword 0, gUnknown_817359F - callstd 4 + msgbox gUnknown_817359F return EventScript_160B0C:: @ 8160B0C - loadword 0, gUnknown_81735DF - callstd 4 + msgbox gUnknown_81735DF return EventScript_160B15:: @ 8160B15 - loadword 0, gUnknown_8173611 - callstd 4 + msgbox gUnknown_8173611 return SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - loadword 0, gUnknown_81734A0 - callstd 2 + msgbox gUnknown_81734A0, 2 end SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - loadword 0, gUnknown_81734D3 - callstd 2 + msgbox gUnknown_81734D3, 2 end SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - loadword 0, gUnknown_817353E - callstd 2 + msgbox gUnknown_817353E, 2 end -- cgit v1.2.3