improve call_if macros

This commit is contained in:
Melody
2018-12-21 21:32:45 -05:00
parent ac2e4adf2d
commit 55005f1588
175 changed files with 1245 additions and 1400 deletions
@@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
compare VAR_0x4092, 6
call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A
checkflag FLAG_0x112
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
end
LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
@@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
compare VAR_0x4092, 3
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE
compare VAR_0x4092, 5
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6
compare VAR_0x4092, 6
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2
end
LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
@@ -152,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A
waitmovement 0
compare VAR_0x8008, 1
call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981
call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981
playbgm MUS_BOY_SUP, 1
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997
compare VAR_0x8008, 2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2
msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT
closemessage
compare VAR_0x8008, 0
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1
compare VAR_0x8008, 1
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3
compare VAR_0x8008, 2
call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5
playse SE_KAIDAN
removeobject 7
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN