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
@@ -5,8 +5,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
lock
faceplayer
goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152
checkflag FLAG_0x156
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172
call_if_unset FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A172
switch VAR_0x40B7
case 0, SlateportCity_PokemonFanClub_EventScript_209ED2
case 1, SlateportCity_PokemonFanClub_EventScript_209EE5
@@ -22,18 +21,13 @@ SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
setvar VAR_TEMP_2, 0
checkflag FLAG_0x0CC
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0
checkflag FLAG_0x0CB
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0
checkflag FLAG_0x0CA
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0
checkflag FLAG_0x0C9
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0
checkflag FLAG_0x0C8
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0
call_if_set FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_209FD0
call_if_set FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_209FD0
call_if_set FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_209FD0
call_if_set FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_209FD0
call_if_set FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_209FD0
compare VAR_TEMP_2, 5
call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA
call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA
compare VAR_0x40B7, 2
goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B
msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
@@ -48,16 +42,11 @@ SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B
SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT
setvar VAR_TEMP_1, 0
checkflag FLAG_0x0CC
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B
checkflag FLAG_0x0CB
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A124
checkflag FLAG_0x0CA
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A10D
checkflag FLAG_0x0C9
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0F6
checkflag FLAG_0x0C8
call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF
call_if_unset FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_20A13B
call_if_unset FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_20A124
call_if_unset FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_20A10D
call_if_unset FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_20A0F6
call_if_unset FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_20A0DF
bufferleadmonspeciesname 0
switch VAR_TEMP_1
case 0, SlateportCity_PokemonFanClub_EventScript_209FD6
@@ -145,7 +134,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5
SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF
specialvar VAR_RESULT, CheckLeadMonCool
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0
call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0
return
SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0
@@ -155,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0
SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6
specialvar VAR_RESULT, CheckLeadMonBeauty
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107
call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107
return
SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107
@@ -165,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107
SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D
specialvar VAR_RESULT, CheckLeadMonCute
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E
call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E
return
SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E
@@ -175,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E
SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124
specialvar VAR_RESULT, CheckLeadMonSmart
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135
call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135
return
SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135
@@ -185,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135
SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B
specialvar VAR_RESULT, CheckLeadMonTough
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C
call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C
return
SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C