diff options
Diffstat (limited to 'data/maps/PetalburgWoods/scripts.inc')
| -rw-r--r-- | data/maps/PetalburgWoods/scripts.inc | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 57e4d1478..4762d29c8 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -1,9 +1,9 @@ PetalburgWoods_MapScripts:: @ 815CC9C - map_script 3, PetalburgWoods_MapScript1_15CCA2 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgWoods_MapScript1_15CCA2 .byte 0 PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 - call PetalburgWoods_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 @@ -11,26 +11,26 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 call PetalburgWoods_EventScript_15CDE6 applymovement 4, PetalburgWoods_Movement_15CE89 waitmovement 0 - msgbox PetalburgWoods_Text_194D92, 4 + msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT closemessage playbgm MUS_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 - msgbox PetalburgWoods_Text_194DED, 4 + msgbox PetalburgWoods_Text_194DED, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_15CEB0 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_194E6B, 4 + msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_15CE9E waitmovement 0 - msgbox PetalburgWoods_Text_194E9A, 4 + msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 - msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -44,28 +44,28 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 call PetalburgWoods_EventScript_15CDE6 applymovement 4, PetalburgWoods_Movement_15CE8E waitmovement 0 - applymovement 255, PetalburgWoods_Movement_1A083F + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox PetalburgWoods_Text_194D92, 4 + msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT closemessage playbgm MUS_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 - msgbox PetalburgWoods_Text_194DED, 4 + msgbox PetalburgWoods_Text_194DED, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_15CEBF waitmovement 0 - applymovement 4, PetalburgWoods_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_194E6B, 4 + msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_15CEA4 waitmovement 0 - msgbox PetalburgWoods_Text_194E9A, 4 - applymovement 255, PetalburgWoods_Movement_1A0841 + msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -77,35 +77,35 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 applymovement 4, PetalburgWoods_Movement_15CE73 waitmovement 0 - msgbox PetalburgWoods_Text_194D71, 4 + msgbox PetalburgWoods_Text_194D71, MSGBOX_DEFAULT closemessage return PetalburgWoods_EventScript_15CDFA:: @ 815CDFA - msgbox PetalburgWoods_Text_194FA4, 4 + msgbox PetalburgWoods_Text_194FA4, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 removeobject 3 - applymovement 255, PetalburgWoods_Movement_1A0845 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox PetalburgWoods_Text_19507E, 4 - giveitem_std ITEM_GREAT_BALL + msgbox PetalburgWoods_Text_19507E, MSGBOX_DEFAULT + giveitem ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE3F:: @ 815CE3F - msgbox PetalburgWoods_Text_195182, 4 + msgbox PetalburgWoods_Text_195182, MSGBOX_DEFAULT goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE4D:: @ 815CE4D - msgbox PetalburgWoods_Text_19510A, 4 + msgbox PetalburgWoods_Text_19510A, MSGBOX_DEFAULT applymovement 4, PetalburgWoods_Movement_15CEA8 waitmovement 0 - msgbox PetalburgWoods_Text_195153, 4 + msgbox PetalburgWoods_Text_195153, MSGBOX_DEFAULT closemessage return @@ -128,7 +128,7 @@ PetalburgWoods_Movement_15CE73:: @ 815CE73 delay_16 face_up delay_16 - end_movement + step_end PetalburgWoods_Movement_15CE80:: @ 815CE80 walk_fast_right @@ -139,14 +139,14 @@ PetalburgWoods_Movement_15CE80:: @ 815CE80 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end PetalburgWoods_Movement_15CE89:: @ 815CE89 delay_16 face_player walk_down walk_down - end_movement + step_end PetalburgWoods_Movement_15CE8E:: @ 815CE8E delay_16 @@ -155,7 +155,7 @@ PetalburgWoods_Movement_15CE8E:: @ 815CE8E walk_down walk_down walk_in_place_fastest_right - end_movement + step_end PetalburgWoods_Movement_15CE95:: @ 815CE95 walk_fast_left @@ -166,7 +166,7 @@ PetalburgWoods_Movement_15CE95:: @ 815CE95 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end PetalburgWoods_Movement_15CE9E:: @ 815CE9E walk_fast_right @@ -174,13 +174,13 @@ PetalburgWoods_Movement_15CE9E:: @ 815CE9E walk_fast_down walk_fast_left walk_in_place_fastest_up - end_movement + step_end PetalburgWoods_Movement_15CEA4:: @ 815CEA4 walk_fast_down walk_fast_right walk_in_place_fastest_up - end_movement + step_end PetalburgWoods_Movement_15CEA8:: @ 815CEA8 walk_in_place_fastest_down @@ -190,18 +190,18 @@ PetalburgWoods_Movement_15CEA8:: @ 815CEA8 delay_16 delay_16 face_up - end_movement + step_end PetalburgWoods_Movement_15CEB0:: @ 815CEB0 walk_fast_down walk_fast_down - end_movement + step_end PetalburgWoods_Movement_15CEB3:: @ 815CEB3 lock_facing_direction walk_up unlock_facing_direction - end_movement + step_end PetalburgWoods_Movement_15CEB7:: @ 815CEB7 walk_fast_up @@ -211,72 +211,72 @@ PetalburgWoods_Movement_15CEB7:: @ 815CEB7 walk_fast_up delay_16 delay_16 - end_movement + step_end PetalburgWoods_Movement_15CEBF:: @ 815CEBF walk_fast_down walk_fast_down walk_fast_down - end_movement + step_end PetalburgWoods_Movement_15CEC3:: @ 815CEC3 walk_down walk_down delay_16 delay_16 - end_movement + step_end PetalburgWoods_Movement_15CEC8:: @ 815CEC8 walk_down - end_movement + step_end PetalburgWoods_EventScript_15CECA:: @ 815CECA - msgbox PetalburgWoods_Text_1953AC, 2 + msgbox PetalburgWoods_Text_1953AC, MSGBOX_NPC end PetalburgWoods_EventScript_15CED3:: @ 815CED3 - msgbox PetalburgWoods_Text_19542B, 2 + msgbox PetalburgWoods_Text_19542B, MSGBOX_NPC end PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B - msgbox PetalburgWoods_Text_19549E, 4 - giveitem_std ITEM_MIRACLE_SEED + msgbox PetalburgWoods_Text_19549E, MSGBOX_DEFAULT + giveitem ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MIRACLE_SEED release end PetalburgWoods_EventScript_15CF0B:: @ 815CF0B - msgbox PetalburgWoods_Text_195503, 4 + msgbox PetalburgWoods_Text_195503, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_15CF15:: @ 815CF15 - msgbox PetalburgWoods_Text_1955B0, 3 + msgbox PetalburgWoods_Text_1955B0, MSGBOX_SIGN end PetalburgWoods_EventScript_15CF1E:: @ 815CF1E - msgbox PetalburgWoods_Text_1956A6, 3 + msgbox PetalburgWoods_Text_1956A6, MSGBOX_SIGN end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 - msgbox PetalburgWoods_Text_195232, 6 + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + msgbox PetalburgWoods_Text_195232, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 - msgbox PetalburgWoods_Text_1952CC, 6 + msgbox PetalburgWoods_Text_1952CC, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 - msgbox PetalburgWoods_Text_195356, 6 + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + msgbox PetalburgWoods_Text_195356, MSGBOX_AUTOCLOSE end |