diff options
Diffstat (limited to 'data/maps/SlateportCity_PokemonFanClub/scripts.inc')
| -rw-r--r-- | data/maps/SlateportCity_PokemonFanClub/scripts.inc | 70 |
1 files changed, 28 insertions, 42 deletions
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 154438ae2..35fcde577 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -4,10 +4,8 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 lock faceplayer - checkflag FLAG_0x155 - goto_if 0, SlateportCity_PokemonFanClub_EventScript_20A152 - checkflag FLAG_0x156 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 + goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152 + call_if_unset FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A172 switch VAR_0x40B7 case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 @@ -23,20 +21,15 @@ 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_eq SlateportCity_PokemonFanClub_EventScript_209F3B + goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -49,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 @@ -86,7 +74,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF @@ -97,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF @@ -108,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF @@ -119,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF @@ -130,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF @@ -146,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 @@ -156,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 @@ -166,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 @@ -176,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 @@ -186,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 @@ -194,8 +182,7 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C return SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - checkflag FLAG_0x156 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 + goto_if_set FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A168 msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release @@ -214,12 +201,11 @@ SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E lock faceplayer - checkflag FLAG_0x116 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE + goto_if_set FLAG_0x116, SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 + goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3 release end @@ -232,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 setflag FLAG_0x116 release end |