summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity')
-rw-r--r--data/maps/RustboroCity/events.inc10
-rw-r--r--data/maps/RustboroCity/scripts.inc128
2 files changed, 69 insertions, 69 deletions
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
index 2f14304ba..48d125d0f 100644
--- a/data/maps/RustboroCity/events.inc
+++ b/data/maps/RustboroCity/events.inc
@@ -7,13 +7,13 @@ RustboroCity_EventObjects: @ 85267E0
object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
- object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732
- object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731
+ object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
+ object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
- object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041
+ object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND
object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
- object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814
- object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844
+ object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL
+ object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0
RustboroCity_MapWarps: @ 8526960
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index f4c8d5434..a524e3969 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -50,7 +50,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
waitmovement 0
applymovement 15, RustboroCity_Movement_1E084E
waitmovement 0
- msgbox RustboroCity_Text_1E22A5, 4
+ msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT
closemessage
setflag FLAG_HAS_MATCH_CALL
applymovement 15, RustboroCity_Movement_2725A4
@@ -65,13 +65,13 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
delay 20
applymovement 15, RustboroCity_Movement_2725AA
waitmovement 0
- msgbox RustboroCity_Text_1E2331, 4
+ msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT
closemessage
delay 20
goto RustboroCity_EventScript_1E07BD
RustboroCity_EventScript_1E07AC:: @ 81E07AC
- msgbox RustboroCity_Text_1E2449, 4
+ msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT
closemessage
delay 10
goto RustboroCity_EventScript_1E07BD
@@ -92,13 +92,13 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
special sub_81C72A4
waitstate
delay 20
- msgbox RustboroCity_Text_1E2464, 4
+ msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT
closemessage
applymovement 15, RustboroCity_Movement_1E085D
waitmovement 0
playse SE_KAIDAN
removeobject 15
- setflag FLAG_0x34C
+ setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_0x405A, 7
clearflag FLAG_SPECIAL_FLAG_0x4000
releaseall
@@ -136,24 +136,24 @@ RustboroCity_EventScript_1E085F:: @ 81E085F
faceplayer
checkflag FLAG_0x08E
goto_eq RustboroCity_EventScript_1E0874
- msgbox RustboroCity_Text_1E123F, 4
+ msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E0874:: @ 81E0874
- msgbox RustboroCity_Text_1E12AC, 4
+ msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E087E:: @ 81E087E
lock
faceplayer
- msgbox RustboroCity_Text_1E1407, 4
+ msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E088A:: @ 81E088A
- msgbox RustboroCity_Text_1E1480, 2
+ msgbox RustboroCity_Text_1E1480, MSGBOX_NPC
end
RustboroCity_EventScript_1E0893:: @ 81E0893
@@ -161,12 +161,12 @@ RustboroCity_EventScript_1E0893:: @ 81E0893
faceplayer
checkflag FLAG_BADGE01_GET
goto_eq RustboroCity_EventScript_1E08A8
- msgbox RustboroCity_Text_1E130D, 4
+ msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E08A8:: @ 81E08A8
- msgbox RustboroCity_Text_1E139E, 4
+ msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT
release
end
@@ -175,55 +175,55 @@ RustboroCity_EventScript_1E08B2:: @ 81E08B2
faceplayer
checkflag FLAG_0x0BC
goto_eq RustboroCity_EventScript_1E08C7
- msgbox RustboroCity_Text_1E1520, 4
+ msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E08C7:: @ 81E08C7
- msgbox RustboroCity_Text_1E1589, 4
+ msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT
release
end
RustboroCity_EventScript_1E08D1:: @ 81E08D1
- msgbox RustboroCity_Text_1E1633, 2
+ msgbox RustboroCity_Text_1E1633, MSGBOX_NPC
end
RustboroCity_EventScript_1E08DA:: @ 81E08DA
- msgbox RustboroCity_Text_1E1695, 3
+ msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN
end
RustboroCity_EventScript_1E08E3:: @ 81E08E3
- msgbox RustboroCity_Text_1E20A6, 3
+ msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN
end
RustboroCity_EventScript_1E08EC:: @ 81E08EC
- msgbox RustboroCity_Text_1E2128, 3
+ msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN
end
RustboroCity_EventScript_1E08F5:: @ 81E08F5
- msgbox RustboroCity_Text_1E2167, 3
+ msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN
end
RustboroCity_EventScript_1E08FE:: @ 81E08FE
- msgbox RustboroCity_Text_1E21B3, 3
+ msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN
end
RustboroCity_EventScript_1E0907:: @ 81E0907
- msgbox RustboroCity_Text_1E220B, 3
+ msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN
end
RustboroCity_EventScript_1E0910:: @ 81E0910
- msgbox RustboroCity_Text_1E2253, 3
+ msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN
end
RustboroCity_EventScript_1E0919:: @ 81E0919
- msgbox RustboroCity_Text_1E2296, 3
+ msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN
end
RustboroCity_EventScript_1E0922:: @ 81E0922
lock
faceplayer
- msgbox RustboroCity_Text_1E16F4, 4
+ msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT
applymovement 7, RustboroCity_Movement_2725A2
waitmovement 0
release
@@ -232,7 +232,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922
RustboroCity_EventScript_1E0938:: @ 81E0938
lock
faceplayer
- msgbox RustboroCity_Text_1E174B, 4
+ msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT
applymovement 8, RustboroCity_Movement_2725A2
waitmovement 0
release
@@ -241,7 +241,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938
RustboroCity_EventScript_1E094E:: @ 81E094E
lock
faceplayer
- msgbox RustboroCity_Text_1E1789, 4
+ msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT
release
end
@@ -286,7 +286,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6
end
RustboroCity_EventScript_1E09CD:: @ 81E09CD
- msgbox RustboroCity_Text_1E17FE, 4
+ msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT
closemessage
playbgm MUS_AQA_0, 0
addobject 10
@@ -296,32 +296,32 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
removeobject 10
applymovement 9, RustboroCity_Movement_1E0AB1
waitmovement 0
- msgbox RustboroCity_Text_1E1817, 4
+ msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT
closemessage
applymovement 9, RustboroCity_Movement_1E0AB9
waitmovement 0
fadedefaultbgm
removeobject 9
setobjectxyperm 9, 30, 10
- clearflag FLAG_0x2DC
+ clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_0x08E
setvar VAR_0x405A, 2
setvar VAR_RUSTURF_TUNNEL_STATE, 2
setvar VAR_0x406F, 1
- clearflag FLAG_0x37B
- clearflag FLAG_0x370
- clearflag FLAG_0x36E
- setflag FLAG_0x2E3
- setflag FLAG_0x371
+ clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
+ clearflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+ clearflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+ setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+ setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
releaseall
end
RustboroCity_EventScript_1E0A3B:: @ 81E0A3B
- msgbox RustboroCity_Text_1E1904, 4
+ msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT
return
RustboroCity_EventScript_1E0A44:: @ 81E0A44
- msgbox RustboroCity_Text_1E194D, 4
+ msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT
return
RustboroCity_EventScript_1E0A4D:: @ 81E0A4D
@@ -453,7 +453,7 @@ RustboroCity_EventScript_1E0ADD:: @ 81E0ADD
faceplayer
checkflag FLAG_0x08F
goto_eq RustboroCity_EventScript_1E0AF2
- msgbox RustboroCity_Text_1E1904, 4
+ msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT
release
end
@@ -499,7 +499,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
setflag FLAG_0x09F
setvar VAR_0x405A, 3
moveobjectoffscreen 9
- msgbox RustboroCity_Text_1E183E, 4
+ msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
releaseall
end
@@ -592,14 +592,14 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
call_if 1, RustboroCity_EventScript_1E0D60
compare VAR_TEMP_1, 4
call_if 1, RustboroCity_EventScript_1E0D96
- msgbox RustboroCity_Text_1E194D, 4
+ msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL
compare VAR_RESULT, 0
call_if 1, RustboroCity_EventScript_1E0CD3
- msgbox RustboroCity_Text_1E1A21, 4
+ msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT
closemessage
setflag FLAG_0x090
- setflag FLAG_0x2DC
+ setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setvar VAR_0x405A, 5
delay 30
warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
@@ -608,7 +608,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
end
RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
- msgbox RustboroCity_Text_1E19E5, 4
+ msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT
return
RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
@@ -838,11 +838,11 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
checkflag FLAG_0x120
goto_eq RustboroCity_EventScript_1E1070
setflag FLAG_0x120
- msgbox RustboroCity_Text_1E1A49, 4
+ msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
- msgbox RustboroCity_Text_1E1ADB, 4
+ msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -850,25 +850,25 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
setvar VAR_0x405A, 8
setvar VAR_0x4063, 2
setvar VAR_0x8008, 0
- msgbox RustboroCity_Text_1E1AFA, 5
+ msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq RustboroCity_EventScript_1E1092
- msgbox RustboroCity_Text_1E1BD3, 4
+ msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
call RustboroCity_EventScript_1E10D6
releaseall
end
RustboroCity_EventScript_1E1070:: @ 81E1070
setvar VAR_0x8008, 1
- msgbox RustboroCity_Text_1E1C48, 5
+ msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq RustboroCity_EventScript_1E1092
- msgbox RustboroCity_Text_1E1BD3, 4
+ msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT
releaseall
end
RustboroCity_EventScript_1E1092:: @ 81E1092
- msgbox RustboroCity_Text_1E1C84, 4
+ msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E10DB
case 1, RustboroCity_EventScript_1E10EE
@@ -876,7 +876,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092
end
RustboroCity_EventScript_1E10C1:: @ 81E10C1
- msgbox RustboroCity_Text_1E1CE7, 4
+ msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT
compare VAR_0x8008, 0
call_if 1, RustboroCity_EventScript_1E10D6
releaseall
@@ -888,19 +888,19 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6
return
RustboroCity_EventScript_1E10DB:: @ 81E10DB
- trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1
+ trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E10C1
end
RustboroCity_EventScript_1E10EE:: @ 81E10EE
- trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1
+ trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E10C1
end
RustboroCity_EventScript_1E1101:: @ 81E1101
- trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1
+ trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E10C1
end
@@ -911,35 +911,35 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
checkflag FLAG_0x120
goto_eq RustboroCity_EventScript_1E1174
setflag FLAG_0x120
- msgbox RustboroCity_Text_1E1D7D, 4
+ msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
- msgbox RustboroCity_Text_1E1E11, 4
+ msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
setflag FLAG_0x0FD
setvar VAR_0x405A, 8
setvar VAR_0x4063, 2
- msgbox RustboroCity_Text_1E1E34, 5
+ msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq RustboroCity_EventScript_1E1191
- msgbox RustboroCity_Text_1E1F2F, 4
+ msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
call RustboroCity_EventScript_1E10D6
releaseall
end
RustboroCity_EventScript_1E1174:: @ 81E1174
- msgbox RustboroCity_Text_1E1F76, 5
+ msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq RustboroCity_EventScript_1E1191
- msgbox RustboroCity_Text_1E1F2F, 4
+ msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT
releaseall
end
RustboroCity_EventScript_1E1191:: @ 81E1191
- msgbox RustboroCity_Text_1E1FA9, 4
+ msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT
switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E11D5
case 1, RustboroCity_EventScript_1E11E8
@@ -947,26 +947,26 @@ RustboroCity_EventScript_1E1191:: @ 81E1191
end
RustboroCity_EventScript_1E11C0:: @ 81E11C0
- msgbox RustboroCity_Text_1E2002, 4
+ msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT
compare VAR_0x8008, 0
call_if 1, RustboroCity_EventScript_1E10D6
releaseall
end
RustboroCity_EventScript_1E11D5:: @ 81E11D5
- trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9
+ trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E11C0
end
RustboroCity_EventScript_1E11E8:: @ 81E11E8
- trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9
+ trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E11C0
end
RustboroCity_EventScript_1E11FB:: @ 81E11FB
- trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9
+ trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9
setflag FLAG_0x0D3
goto RustboroCity_EventScript_1E11C0
end
@@ -1028,7 +1028,7 @@ RustboroCity_Movement_1E1230: @ 81E1230
step_end
RustboroCity_EventScript_1E1236:: @ 81E1236
- msgbox RustboroCity_Text_1E249D, 2
+ msgbox RustboroCity_Text_1E249D, MSGBOX_NPC
end
RustboroCity_Text_1E123F: @ 81E123F
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-04 15:38:10 +0000