diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /data/maps/MtPyre_Summit/scripts.inc | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'data/maps/MtPyre_Summit/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_Summit/scripts.inc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 36b72ad12..90e41c233 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D593 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D59E - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D5AA - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D5BF - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq MtPyre_Summit_EventScript_15D611 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq MtPyre_Summit_EventScript_15D61A release end @@ -186,20 +186,20 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB + setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage - applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 + applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmovement 0 delay 40 - applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839 + applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0839 waitmovement 0 delay 10 .ifdef SAPPHIRE @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -243,19 +243,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -265,11 +265,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D75E - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D769 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -277,11 +277,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D77F - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D78A - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 |