diff options
Diffstat (limited to 'data/maps/Route110_TrickHouseEntrance/scripts.inc')
| -rw-r--r-- | data/maps/Route110_TrickHouseEntrance/scripts.inc | 151 |
1 files changed, 72 insertions, 79 deletions
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 22750f536..b2aa22f6c 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -7,17 +7,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_0x40B5, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 compare VAR_0x40C1, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 compare VAR_0x40A6, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 compare VAR_0x40A7, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 switch VAR_0x40A7 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 @@ -28,7 +28,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_0x40A5, 1 compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_269AED + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_0x40A7, 2 end @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_0x40A7, 0 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B + call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B75 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F + call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B89 compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B93 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D + call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D compare VAR_0x4044, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7 return Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 @@ -140,7 +133,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 - turnobject 255, 3 + turnobject EVENT_OBJ_ID_PLAYER, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 @@ -213,7 +206,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 @@ -243,26 +236,26 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement 255, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE + call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E00 compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E09 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E12 compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B + call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E24 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D + call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -351,27 +344,27 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269EEF + goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 - goto_eq Route110_TrickHouseEntrance_EventScript_269F1B + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B compare VAR_0x4044, 3 - goto_eq Route110_TrickHouseEntrance_EventScript_269F47 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47 compare VAR_0x4044, 4 - goto_eq Route110_TrickHouseEntrance_EventScript_269F73 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73 compare VAR_0x4044, 5 - goto_eq Route110_TrickHouseEntrance_EventScript_269F9F + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F compare VAR_0x4044, 6 - goto_eq Route110_TrickHouseEntrance_EventScript_269FCB + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB compare VAR_0x4044, 7 - goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7 end Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -379,9 +372,9 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -389,9 +382,9 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -399,9 +392,9 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -409,9 +402,9 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F giveitem_std ITEM_TM12 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -419,9 +412,9 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB giveitem_std ITEM_MAGNET compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -429,9 +422,9 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -450,9 +443,9 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A09A + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -505,7 +498,7 @@ Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A126 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -513,9 +506,9 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 - applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 @@ -587,7 +580,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_26A220 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end @@ -612,7 +605,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 @@ -623,7 +616,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 @@ -634,7 +627,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 @@ -645,7 +638,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 @@ -656,7 +649,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 @@ -667,7 +660,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 @@ -678,7 +671,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 @@ -689,7 +682,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 @@ -735,11 +728,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A429 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_0x40A5, 1 end |