summaryrefslogtreecommitdiff
path: root/data/maps/Route119
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/Route119
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route119')
-rw-r--r--data/maps/Route119/events.inc40
-rw-r--r--data/maps/Route119/scripts.inc136
2 files changed, 85 insertions, 91 deletions
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
index 1abed81eb..3a7d1422b 100644
--- a/data/maps/Route119/events.inc
+++ b/data/maps/Route119/events.inc
@@ -14,34 +14,34 @@ Route119_EventObjects: @ 852AD6C
object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
- object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851
- object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024
- object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025
- object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026
- object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027
- object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028
- object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029
- object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890
- object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890
- object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923
+ object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL
+ object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL
+ object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC
+ object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1
+ object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE
+ object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY
+ object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1
+ object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+ object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA
+ object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0
object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0
object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0
object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0
object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0
object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
- object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106
+ object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2
object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
- object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989
- object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990
+ object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1
+ object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2
object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
- object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134
- object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147
- object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 786
+ object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET
+ object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2
+ object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT
Route119_MapWarps: @ 852B174
warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
@@ -83,15 +83,15 @@ Route119_MapBGEvents: @ 852B2F4
bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
- bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, 5
- bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6
+ bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM
+ bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL
bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
- bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, 68
- bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87
+ bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL
+ bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER
bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3
Route119_MapEvents:: @ 852B3E4
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index f2e52d50c..87acdeb84 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -24,8 +24,8 @@ Route119_MapScript1_1F444D: @ 81F444D
end
Route119_EventScript_1F4466:: @ 81F4466
- setflag FLAG_0x37D
- clearflag FLAG_0x37C
+ setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
+ clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
setvar VAR_WEATHER_INSTITUTE_STATE, 2
return
@@ -79,7 +79,7 @@ Route119_EventScript_1F4506:: @ 81F4506
return
Route119_EventScript_1F450B:: @ 81F450B
- msgbox Route119_Text_1F49FD, 4
+ msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, Route119_EventScript_1F453A
case 1, Route119_EventScript_1F454A
@@ -87,29 +87,29 @@ Route119_EventScript_1F450B:: @ 81F450B
end
Route119_EventScript_1F453A:: @ 81F453A
- trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98
+ trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
Route119_EventScript_1F454A:: @ 81F454A
- trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98
+ trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
Route119_EventScript_1F455A:: @ 81F455A
- trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98
+ trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98
goto Route119_EventScript_1F456A
end
Route119_EventScript_1F456A:: @ 81F456A
- msgbox Route119_Text_1F4AF3, 4
+ msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT
call Route119_EventScript_1F45FF
- msgbox Route119_Text_1F4B56, 4
+ msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT
goto Route119_EventScript_1F460F
end
Route119_EventScript_1F4585:: @ 81F4585
- msgbox Route119_Text_1F4C9A, 4
+ msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, Route119_EventScript_1F45B4
case 1, Route119_EventScript_1F45C4
@@ -117,24 +117,24 @@ Route119_EventScript_1F4585:: @ 81F4585
end
Route119_EventScript_1F45B4:: @ 81F45B4
- trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24
+ trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
Route119_EventScript_1F45C4:: @ 81F45C4
- trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24
+ trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
Route119_EventScript_1F45D4:: @ 81F45D4
- trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24
+ trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24
goto Route119_EventScript_1F45E4
end
Route119_EventScript_1F45E4:: @ 81F45E4
- msgbox Route119_Text_1F4D4B, 4
+ msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT
call Route119_EventScript_1F45FF
- msgbox Route119_Text_1F4DB5, 4
+ msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT
goto Route119_EventScript_1F460F
end
@@ -169,7 +169,7 @@ Route119_EventScript_1F460F:: @ 81F460F
applymovement 43, Route119_Movement_1F4752
waitmovement 0
addvar VAR_0x40D1, 1
- msgbox Route119_Text_1F4E60, 4
+ msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT
closemessage
compare VAR_TEMP_1, 1
call_if 1, Route119_EventScript_1F46B0
@@ -325,146 +325,140 @@ Route119_Movement_1F4763: @ 81F4763
step_end
Route119_EventScript_1F476B:: @ 81F476B
- msgbox Route119_Text_1F5261, 2
+ msgbox Route119_Text_1F5261, MSGBOX_NPC
end
Route119_EventScript_1F4774:: @ 81F4774
- msgbox Route119_Text_1F530E, 3
+ msgbox Route119_Text_1F530E, MSGBOX_SIGN
end
Route119_EventScript_1F477D:: @ 81F477D
- msgbox Route119_Text_1F5327, 3
+ msgbox Route119_Text_1F5327, MSGBOX_SIGN
end
Route119_EventScript_1F4786:: @ 81F4786
- trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
- msgbox Route119_Text_29D902, 6
+ trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0
+ msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F479D:: @ 81F479D
- trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
- msgbox Route119_Text_29D993, 6
+ trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C
+ msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47B4:: @ 81F47B4
- trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
- msgbox Route119_Text_29DA2C, 6
+ trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14
+ msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47CB:: @ 81F47CB
- trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
- msgbox Route119_Text_29DADB, 6
+ trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC
+ msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47E2:: @ 81F47E2
- trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
- msgbox Route119_Text_29DB7C, 6
+ trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66
+ msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F47F9:: @ 81F47F9
- trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
- msgbox Route119_Text_29DC2B, 6
+ trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20
+ msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4810:: @ 81F4810
- trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
+ trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route119_EventScript_1F485B
- msgbox Route119_Text_29DCC6, 4
+ msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT
release
end
Route119_EventScript_1F483C:: @ 81F483C
special sub_80B4808
waitmovement 0
- msgbox Route119_Text_29DD1C, 4
- setvar VAR_0x8004, 552
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 552
- callstd 8
+ msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT
+ register_matchcall TRAINER_JACKSON_1
release
end
Route119_EventScript_1F485B:: @ 81F485B
- trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
- msgbox Route119_Text_29DDBD, 6
+ trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5
+ msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4872:: @ 81F4872
- trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
+ trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route119_EventScript_1F48BD
- msgbox Route119_Text_29DE88, 4
+ msgbox Route119_Text_29DE88, MSGBOX_DEFAULT
release
end
Route119_EventScript_1F489E:: @ 81F489E
special sub_80B4808
waitmovement 0
- msgbox Route119_Text_29DEF7, 4
- setvar VAR_0x8004, 559
- special SetMatchCallRegisteredFlag
- setorcopyvar VAR_0x8000, 559
- callstd 8
+ msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT
+ register_matchcall TRAINER_CATHERINE_1
release
end
Route119_EventScript_1F48BD:: @ 81F48BD
- trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
- msgbox Route119_Text_29DFAF, 6
+ trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92
+ msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F48D4:: @ 81F48D4
- trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
- msgbox Route119_Text_29E071, 6
+ trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063
+ msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F48EB:: @ 81F48EB
- trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
- msgbox Route119_Text_29E0F6, 6
+ trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1
+ msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4902:: @ 81F4902
- trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
- msgbox Route119_Text_29E19D, 6
+ trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D
+ msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4919:: @ 81F4919
- trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
- msgbox Route119_Text_29E245, 6
+ trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B
+ msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4930:: @ 81F4930
- trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
- msgbox Route119_Text_29E2A3, 6
+ trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288
+ msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4947:: @ 81F4947
- trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
- msgbox Route119_Text_29E3A2, 6
+ trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372
+ msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F495E:: @ 81F495E
- trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
- msgbox Route119_Text_29E492, 6
+ trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F
+ msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F4975:: @ 81F4975
- trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
- msgbox Route119_Text_29E532, 6
+ trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513
+ msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F498C:: @ 81F498C
- trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
- msgbox Route119_Text_29E5CB, 6
+ trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1
+ msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
end
Route119_EventScript_1F49A3:: @ 81F49A3
lock
faceplayer
- msgbox Route119_Text_1F50EB, 4
+ msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
waitmovement 0
@@ -474,7 +468,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3
Route119_EventScript_1F49BA:: @ 81F49BA
lock
faceplayer
- msgbox Route119_Text_1F5147, 4
+ msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
waitmovement 0
@@ -482,15 +476,15 @@ Route119_EventScript_1F49BA:: @ 81F49BA
end
Route119_EventScript_1F49D1:: @ 81F49D1
- msgbox Route119_Text_1F51A2, 2
+ msgbox Route119_Text_1F51A2, MSGBOX_NPC
end
Route119_EventScript_1F49DA:: @ 81F49DA
- msgbox Route119_Text_1F52B9, 2
+ msgbox Route119_Text_1F52B9, MSGBOX_NPC
end
Route119_EventScript_1F49E3:: @ 81F49E3
- msgbox Route119_Text_1F5339, 3
+ msgbox Route119_Text_1F5339, MSGBOX_SIGN
end
Route119_EventScript_1F49EC:: @ 81F49EC