diff options
Diffstat (limited to 'data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc')
| -rw-r--r-- | data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc | 105 |
1 files changed, 51 insertions, 54 deletions
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index da6ec9c0b..1b3a35399 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,51 +3,51 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A7AE0 + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 - compare_var_to_value VAR_0x4001, 0 - goto_if eq, EventScript_16C00E + compare VAR_TEMP_1, 0 + goto_if_eq EventScript_16C00E goto EventScript_16BD3E end EventScript_16BCF6:: @ 816BCF6 - setvar VAR_0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD2C + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD2C checkitem ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD32 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD32 checkitem ITEM_LEMONADE, 1 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_16BD38 + compare VAR_RESULT, TRUE + call_if_eq EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C - addvar VAR_0x4001, 1 + addvar VAR_TEMP_1, 1 return EventScript_16BD32:: @ 816BD32 - addvar VAR_0x4001, 2 + addvar VAR_TEMP_1, 2 return EventScript_16BD38:: @ 816BD38 - addvar VAR_0x4001, 4 + addvar VAR_TEMP_1, 4 return EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C00C + compare VAR_RESULT, NO + goto_if_eq EventScript_16C00C textcolor 3 message Text_195D5F waitmessage textcolor 1 - switch VAR_0x4001 + switch VAR_TEMP_1 case 1, EventScript_16BDAE case 2, EventScript_16BDDA case 3, EventScript_16BE06 @@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7 EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19 EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL - goto_if TRUE, EventScript_16C018 + goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -150,22 +147,22 @@ EventScript_16BF7C:: @ 816BF7C getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C002 - additem VAR_0x8009, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C002 + additem VAR_0x8009 textcolor 3 playfanfare MUS_FANFA1 - message Text_195DAD + message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare - giveitem VAR_0x8009, 1, 8 + putitemaway VAR_0x8009 call EventScript_1A6675 - compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER - call_if eq, EventScript_16BFDE - compare_var_to_value VAR_0x8008, ITEM_SODA_POP - call_if eq, EventScript_16BFEA - compare_var_to_value VAR_0x8008, ITEM_LEMONADE - call_if eq, EventScript_16BFF6 + compare VAR_0x8008, ITEM_FRESH_WATER + call_if_eq EventScript_16BFDE + compare VAR_0x8008, ITEM_SODA_POP + call_if_eq EventScript_16BFEA + compare VAR_0x8008, ITEM_LEMONADE + call_if_eq EventScript_16BFF6 release end @@ -204,11 +201,11 @@ EventScript_16C018:: @ 816C018 end CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022 - msgbox gUnknown_8195F98, 2 + msgbox gUnknown_8195F98, MSGBOX_NPC end CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B - msgbox gUnknown_8196017, 3 + msgbox gUnknown_8196017, MSGBOX_SIGN end CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 @@ -221,8 +218,8 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 EventScript_16C045:: @ 816C045 multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE - copyvar VAR_0x4001, VAR_RESULT - switch VAR_0x4001 + copyvar VAR_TEMP_1, VAR_RESULT + switch VAR_TEMP_1 case 0, EventScript_16C083 case 1, EventScript_16C094 case 2, EventScript_16C0A5 @@ -231,19 +228,19 @@ EventScript_16C045:: @ 816C045 end EventScript_16C083:: @ 816C083 - setvar VAR_0x4000, ITEM_FRESH_WATER + setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 goto EventScript_16C0CB end EventScript_16C094:: @ 816C094 - setvar VAR_0x4000, ITEM_SODA_POP + setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 goto EventScript_16C0CB end EventScript_16C0A5:: @ 816C0A5 - setvar VAR_0x4000, ITEM_LEMONADE + setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 goto EventScript_16C0CB end @@ -261,22 +258,22 @@ EventScript_16C0C4:: @ 816C0C4 return EventScript_16C0CB:: @ 816C0CB - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C131 - checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16C13F - compare_var_to_value VAR_0x4001, 0 - call_if eq, EventScript_16C0B6 - compare_var_to_value VAR_0x4001, 1 - call_if eq, EventScript_16C0BD - compare_var_to_value VAR_0x4001, 2 - call_if eq, EventScript_16C0C4 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C131 + checkitemspace VAR_TEMP_0, 1 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_16C13F + compare VAR_TEMP_1, 0 + call_if_eq EventScript_16C0B6 + compare VAR_TEMP_1, 1 + call_if_eq EventScript_16C0BD + compare VAR_TEMP_1, 2 + call_if_eq EventScript_16C0C4 updatemoneybox 0, 0, 0 - getitemname 0, VAR_0x4000 + getitemname 0, VAR_TEMP_0 playse SE_JIHANKI msgbox gUnknown_8196076 - additem VAR_0x4000, 1 + additem VAR_TEMP_0 goto EventScript_16C125 end |