summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/map.json10
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/scripts.inc84
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/map.json12
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/scripts.inc248
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/map.json10
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/scripts.inc123
6 files changed, 245 insertions, 242 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json
index 7eee74211..9223872b9 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_1F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_1F_EventScript_211261",
+ "script": "RustboroCity_DevonCorp_1F_EventScript_Employee",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_1F_EventScript_211293",
+ "script": "RustboroCity_DevonCorp_1F_EventScript_StairGuard",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE",
+ "script": "RustboroCity_DevonCorp_1F_EventScript_Greeter",
"flag": "0"
}
],
@@ -85,7 +85,7 @@
"y": 2,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "RustboroCity_DevonCorp_1F_EventScript_211312"
+ "script": "RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay"
},
{
"type": "sign",
@@ -93,7 +93,7 @@
"y": 2,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "RustboroCity_DevonCorp_1F_EventScript_211309"
+ "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay"
}
]
} \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 788a403f2..3ee7e7dc8 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -3,121 +3,121 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245
.byte 0
RustboroCity_DevonCorp_1F_OnTransition: @ 821124B
- call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255
+ call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs
end
-RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255
+RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8211255
setobjectxyperm 2, 14, 2
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
return
-RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261
+RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8211261
lock
faceplayer
- goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211289
- goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_21127F
- msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT
+ goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered
+ goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright
+ msgbox RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F
- msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 821127F
+ msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289
- msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 8211289
+ msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293
+RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8211293
lock
faceplayer
- goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112BA
- goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112C4
- goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112C4
- msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT
+ goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome
+ goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GotRobbed
+ goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_GotRobbed
+ msgbox RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA
- msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 82112BA
+ msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4
- msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 82112C4
+ msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE
+RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 82112CE
lock
faceplayer
- goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112F5
- goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112FF
- goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112FF
- msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT
+ goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp
+ goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed
+ goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed
+ msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5
- msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 82112F5
+ msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF
- msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 82112FF
+ msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309
- msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN
+RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay:: @ 8211309
+ msgbox RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay, MSGBOX_SIGN
end
-RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312
- msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN
+RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay:: @ 8211312
+ msgbox RustboroCity_DevonCorp_1F_Text_ProductDisplay, MSGBOX_SIGN
end
-RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B
+RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp: @ 821131B
.string "Hello and welcome to the DEVON\n"
.string "CORPORATION.\p"
.string "We're proud producers of items and\n"
.string "medicine that enhance your life.$"
-RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B
+RustboroCity_DevonCorp_1F_Text_StaffGotRobbed: @ 821138B
.string "One of our research staff stupidly\n"
.string "got robbed of an important parcel.$"
-RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1
+RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct: @ 82113D1
.string "Hey, those RUNNING SHOES!\n"
.string "They're one of our products!\p"
.string "It makes me happy when I see someone\n"
.string "using something we made.$"
-RustboroCity_DevonCorp_1F_Text_211446: @ 8211446
+RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright: @ 8211446
.string "That stolen parcel…\p"
.string "Well, sure it's important, but it's not\n"
.string "anything that anyone can use.\p"
.string "In my estimation, that robber must not\n"
.string "have been very bright.$"
-RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE
+RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered: @ 82114DE
.string "It sounds like they've recovered\n"
.string "the ripped-off DEVON GOODS.$"
-RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B
+RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter: @ 821151B
.string "I'm sorry, only authorized people\n"
.string "are allowed to enter here.$"
-RustboroCity_DevonCorp_1F_Text_211558: @ 8211558
+RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed: @ 8211558
.string "It's beyond stupid.\n"
.string "How could we get robbed?$"
-RustboroCity_DevonCorp_1F_Text_211585: @ 8211585
+RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere: @ 8211585
.string "Hi, there!\n"
.string "You're always welcome here!$"
-RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC
+RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay: @ 82115AC
.string "Samples of rocks and metal are\n"
.string "displayed in the glass case.\p"
.string "There's a panel with some writing\n"
@@ -131,7 +131,7 @@ RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC
.string "“DEVON is now a manufacturer of a wide\n"
.string "range of industrial products.”$"
-RustboroCity_DevonCorp_1F_Text_211722: @ 8211722
+RustboroCity_DevonCorp_1F_Text_ProductDisplay: @ 8211722
.string "Prototypes and test products fill\n"
.string "the glass display case.\p"
.string "There's a panel with a description…\p"
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json
index 9ab864774..c841406b8 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_21186F",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_211886",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_BallScientist",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavScientist",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 10,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_FossilScientist",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF",
+ "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist",
"flag": "0"
}
],
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 751285a7a..2db001f0d 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -4,305 +4,306 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
RustboroCity_DevonCorp_2F_OnTransition: @ 821185D
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
end
-RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869
+RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 8211869
setvar VAR_FOSSIL_RESURRECTION_STATE, 2
return
-RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
+RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 821186F
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
- msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+ msgbox RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
+RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 8211886
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
- goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6
- msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+ goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls
+ msgbox RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
- msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 82118A6
+ msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
+RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 82118B0
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
- goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0
- msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+ goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_HasPokenav
+ msgbox RustboroCity_DevonCorp_2F_Text_IMadePokenav, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
- msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 82118D0
+ msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
+RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 82118DA
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
- msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
+ msgbox RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
+RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 2
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FossilMonReady
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
- msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_StillRegenerating
+ msgbox RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils, MSGBOX_DEFAULT
checkitem ITEM_ROOT_FOSSIL, 1
- compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211933
+ compare VAR_RESULT, TRUE
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil
checkitem ITEM_CLAW_FOSSIL, 1
- compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211991
+ compare VAR_RESULT, TRUE
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil
release
end
-RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933
+RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933
closemessage
playse SE_PIN
applymovement 5, Common_Movement_ExclamationMark
waitmovement 0
applymovement 5, Common_Movement_Delay48
waitmovement 0
- msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
+ msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil
checkitem ITEM_CLAW_FOSSIL, 1
- compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84
- goto RustboroCity_DevonCorp_2F_EventScript_211974
+ compare VAR_RESULT, TRUE
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil
+ goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
end
-RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
+RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974
bufferitemname 0, ITEM_ROOT_FOSSIL
- msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
takeitem ITEM_ROOT_FOSSIL, 1
setvar VAR_FOSSIL_RESURRECTION_STATE, 1
setvar VAR_WHICH_FOSSIL_REVIVED, 1
release
end
-RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991
+RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991
closemessage
playse SE_PIN
applymovement 5, Common_Movement_ExclamationMark
waitmovement 0
applymovement 5, Common_Movement_Delay48
waitmovement 0
- msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO
+ msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil
checkitem ITEM_ROOT_FOSSIL, 1
- compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84
- goto RustboroCity_DevonCorp_2F_EventScript_2119D2
+ compare VAR_RESULT, TRUE
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ChooseFossil
+ goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
end
-RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
+RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2
bufferitemname 0, ITEM_CLAW_FOSSIL
- msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
takeitem ITEM_CLAW_FOSSIL, 1
setvar VAR_FOSSIL_RESURRECTION_STATE, 1
setvar VAR_WHICH_FOSSIL_REVIVED, 2
release
end
-RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF
- msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 82119EF
+ msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
- msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 82119F9
+ msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
+RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 8211A03
compare VAR_WHICH_FOSSIL_REVIVED, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady
compare VAR_WHICH_FOSSIL_REVIVED, 2
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady
end
-RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A
+@ This whole section has needless duplication and could be condensed considerably
+RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8211A1A
bufferspeciesname 1, SPECIES_LILEEP
- msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
- goto RustboroCity_DevonCorp_2F_EventScript_211A3E
+ msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
+ goto RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep
end
-RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C
+RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 8211A2C
bufferspeciesname 1, SPECIES_ANORITH
- msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT
- goto RustboroCity_DevonCorp_2F_EventScript_211AE1
+ msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
+ goto RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith
end
-RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep:: @ 8211A3E
setvar VAR_TEMP_1, SPECIES_LILEEP
givemon SPECIES_LILEEP, 20, ITEM_NONE
compare VAR_RESULT, 0
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty
compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC
goto Common_EventScript_NoMoreRoomForPokemon
end
-RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
- call RustboroCity_DevonCorp_2F_EventScript_211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty:: @ 8211A6E
+ call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
- goto RustboroCity_DevonCorp_2F_EventScript_211AD7
+ goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
end
-RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
- call RustboroCity_DevonCorp_2F_EventScript_211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC:: @ 8211A96
+ call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC
call Common_EventScript_NameReceivedBoxMon
- goto RustboroCity_DevonCorp_2F_EventScript_211AB9
+ goto RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC
end
-RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9
+RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9
call Common_EventScript_TransferredToPC
- goto RustboroCity_DevonCorp_2F_EventScript_211AD7
+ goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
end
-RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4
bufferspeciesname 1, SPECIES_LILEEP
playfanfare MUS_FANFA4
- message RustboroCity_DevonCorp_2F_Text_2122CB
+ message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
waitmessage
waitfanfare
bufferspeciesname 0, SPECIES_LILEEP
return
-RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep:: @ 8211AD7
setvar VAR_FOSSIL_RESURRECTION_STATE, 0
setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
release
end
-RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith:: @ 8211AE1
setvar VAR_TEMP_1, SPECIES_ANORITH
givemon SPECIES_ANORITH, 20, ITEM_NONE
compare VAR_RESULT, 0
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty
compare VAR_RESULT, 1
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC
goto Common_EventScript_NoMoreRoomForPokemon
end
-RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
- call RustboroCity_DevonCorp_2F_EventScript_211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty:: @ 8211B11
+ call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
call Common_EventScript_GetGiftMonPartySlot
call Common_EventScript_NameReceivedPartyMon
- goto RustboroCity_DevonCorp_2F_EventScript_211B7A
+ goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
end
-RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
- call RustboroCity_DevonCorp_2F_EventScript_211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC:: @ 8211B39
+ call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
+ goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC
call Common_EventScript_NameReceivedBoxMon
- goto RustboroCity_DevonCorp_2F_EventScript_211B5C
+ goto RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC
end
-RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C
+RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C
call Common_EventScript_TransferredToPC
- goto RustboroCity_DevonCorp_2F_EventScript_211B7A
+ goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
end
-RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67
bufferspeciesname 1, SPECIES_ANORITH
playfanfare MUS_FANFA4
- message RustboroCity_DevonCorp_2F_Text_2122CB
+ message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
waitmessage
waitfanfare
bufferspeciesname 0, SPECIES_ANORITH
return
-RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith:: @ 8211B7A
setvar VAR_FOSSIL_RESURRECTION_STATE, 0
setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
release
end
-RustboroCity_DevonCorp_2F_EventScript_211B84:: @ 8211B84
- message RustboroCity_DevonCorp_2F_Text_212092
+RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84
+ message RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne
waitmessage
multichoice 17, 6, MULTI_FOSSIL, 0
switch VAR_RESULT
- case 0, RustboroCity_DevonCorp_2F_EventScript_211BC1
- case 1, RustboroCity_DevonCorp_2F_EventScript_211BC7
- case 2, RustboroCity_DevonCorp_2F_EventScript_211BCD
- case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_211BCD
+ case 0, RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil
+ case 1, RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil
+ case 2, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect
+ case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect
end
-RustboroCity_DevonCorp_2F_EventScript_211BC1:: @ 8211BC1
- goto RustboroCity_DevonCorp_2F_EventScript_2119D2
+RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil:: @ 8211BC1
+ goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
end
-RustboroCity_DevonCorp_2F_EventScript_211BC7:: @ 8211BC7
- goto RustboroCity_DevonCorp_2F_EventScript_211974
+RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil:: @ 8211BC7
+ goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
end
-RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD
+RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD
release
end
-RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
+RustboroCity_DevonCorp_2F_EventScript_PokenavFeatureScientist:: @ 8211BCF
lock
faceplayer
compare VAR_FOSSIL_RESURRECTION_STATE, 1
- call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
+ call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
compare VAR_RUSTBORO_CITY_STATE, 6
- goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1
- msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT
+ goto_if_ge RustboroCity_DevonCorp_2F_EventScript_WorkOnNext
+ msgbox RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1
- msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_2F_EventScript_WorkOnNext:: @ 8211BF1
+ msgbox RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB
+RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon: @ 8211BFB
.string "We're developing a device for talking\n"
.string "with POKéMON.\p"
.string "But we haven't had much success…$"
-RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50
+RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls: @ 8211C50
.string "I'm developing new kinds of\n"
.string "POKé BALLS…\p"
.string "But I haven't made much headway…$"
-RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99
+RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls: @ 8211C99
.string "We finally made new kinds of\n"
.string "POKé BALLS!\p"
.string "The REPEAT BALL makes it easier to\n"
@@ -313,12 +314,12 @@ RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99
.string "the DEVON CORPORATION.\p"
.string "Please give them a try!$"
-RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F
+RustboroCity_DevonCorp_2F_Text_IMadePokenav: @ 8211D9F
.string "I made the POKéNAV!\p"
.string "As an engineer, I feel blessed to have\n"
.string "made something so great!$"
-RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3
+RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav: @ 8211DF3
.string "Oh, wow!\n"
.string "That's a POKéNAV!\p"
.string "It came about as a result of our\n"
@@ -329,18 +330,18 @@ RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3
.string "No, no. I think you'll find out just by\n"
.string "trying the POKéNAV out.$"
-RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0
+RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams: @ 8211EE0
.string "I'm trying to develop a device that\n"
.string "visually reproduces the dreams of\l"
.string "POKéMON…\p"
.string "But it's not going well.$"
-RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48
+RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils: @ 8211F48
.string "I've been trying to develop a device\n"
.string "that resurrects POKéMON from fossils…\p"
.string "And, it's working!$"
-RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6
+RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife: @ 8211FA6
.string "Wait! That thing you have there…\n"
.string "Is that a POKéMON fossil?\p"
.string "Would you like to bring that POKéMON\n"
@@ -348,12 +349,12 @@ RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6
.string "I can with my newly developed\n"
.string "FOSSIL REGENERATOR.$"
-RustboroCity_DevonCorp_2F_Text_212046: @ 8212046
+RustboroCity_DevonCorp_2F_Text_OhIsThatSo: @ 8212046
.string "Oh, is that so?\p"
.string "DEVON's technological expertise\n"
.string "is outstanding, I tell you.$"
-RustboroCity_DevonCorp_2F_Text_212092: @ 8212092
+RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne: @ 8212092
.string "Oh, now that's a surprise!\n"
.string "You have not one, but two, fossils?\p"
.string "Unfortunately, my machine can only\n"
@@ -361,13 +362,13 @@ RustboroCity_DevonCorp_2F_Text_212092: @ 8212092
.string "Would you like to pick one of your\n"
.string "fossils for regeneration?$"
-RustboroCity_DevonCorp_2F_Text_212153: @ 8212153
+RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher: @ 8212153
.string "Excellent!\n"
.string "Let's do this right away.\p"
.string "{PLAYER} handed the {STR_VAR_1} to\n"
.string "the DEVON RESEARCHER.$"
-RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2
+RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime: @ 82121A2
.string "The FOSSIL REGENERATOR, which I made,\n"
.string "is incredible.\p"
.string "But it has one drawback--it takes\n"
@@ -375,27 +376,28 @@ RustboroCity_DevonCorp_2F_Text_2121A2: @ 82121A2
.string "So, uh… How about you go for a stroll\n"
.string "and look around for a while?$"
-RustboroCity_DevonCorp_2F_Text_212251: @ 8212251
+RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife: @ 8212251
.string "Thanks for waiting!\p"
.string "Your fossilized POKéMON has been\n"
.string "brought back to life!\p"
.string "The fossil was an ancient POKéMON.\n"
.string "{STR_VAR_2}, it was!$"
-RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB
+RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher: @ 82122CB
.string "{PLAYER} received {STR_VAR_2} from\n"
.string "the DEVON RESEARCHER.$"
-RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5
+@ Unused
+RustboroCity_DevonCorp_2F_Text_TooManyPokemon: @ 82122F5
.string "Uh-oh, you've got too many POKéMON.\n"
.string "You have no room for this one.$"
-RustboroCity_DevonCorp_2F_Text_212338: @ 8212338
+RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature: @ 8212338
.string "I'm trying to develop a new feature\n"
.string "for the POKéNAV…\p"
.string "But it's not going well.$"
-RustboroCity_DevonCorp_2F_Text_212386: @ 8212386
+RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext: @ 8212386
.string "Well, now what shall I work on\n"
.string "developing next?\p"
.string "Our company allows us to make our\n"
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json
index 0ed5d0b7e..8e0f6d2ae 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_3F/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+ "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1",
+ "script": "RustboroCity_DevonCorp_3F_EventScript_Employee",
"flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RustboroCity_DevonCorp_3F_EventScript_21256C",
+ "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone",
"flag": "0"
}
],
@@ -71,7 +71,7 @@
"y": 5,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+ "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay"
},
{
"type": "sign",
@@ -79,7 +79,7 @@
"y": 7,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "RustboroCity_DevonCorp_3F_EventScript_212600"
+ "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay"
}
]
} \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 3ce08c9f1..b4eee4866 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -1,65 +1,65 @@
RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition
- map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455
- map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame
.byte 0
RustboroCity_DevonCorp_3F_OnTransition: @ 821243D
compare VAR_DEVON_CORP_3F_STATE, 0
- call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449
+ call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos
end
-RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
+RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 8212449
setobjectxyperm 2, 3, 2
setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
return
-RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
- map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
+RustboroCity_DevonCorp_3F_OnWarp: @ 8212455
+ map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast
.2byte 0
-RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
+RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F
turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST
end
-RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
- map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
+RustboroCity_DevonCorp_3F_OnFrame: @ 8212464
+ map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident
.2byte 0
-RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
+RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
lockall
- msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT
closemessage
- applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546
+ applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen
waitmovement 0
delay 80
- applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F
+ applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer
waitmovement 0
- msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT
closemessage
playbgm MUS_TSURETEK, 0
- applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212558
+ applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident
+ applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident
waitmovement 0
- msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT
closemessage
fadedefaultbgm
- applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543
- applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212566
+ applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk
+ applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk
waitmovement 0
- msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT
giveitem_std ITEM_LETTER
- msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
- message RustboroCity_DevonCorp_3F_Text_212820
+ message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav
waitfanfare
setflag FLAG_SYS_POKENAV_GET
setflag FLAG_RECEIVED_POKENAV
setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT
- msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp, MSGBOX_DEFAULT
closemessage
call Common_EventScript_OutOfCenterPartyHeal
- msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT
setflag FLAG_HIDE_ROUTE_116_TUNNELER
clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
@@ -72,6 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
releaseall
end
+@ Unused
RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
walk_up
walk_up
@@ -79,7 +80,7 @@ RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
walk_in_place_fastest_left
step_end
-RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
+RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident: @ 8212534
walk_right
walk_right
walk_right
@@ -96,12 +97,12 @@ RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
walk_in_place_fastest_left
step_end
-RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543
+RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk: @ 8212543
delay_16
walk_in_place_fastest_down
step_end
-RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
+RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen: @ 8212546
walk_right
walk_right
walk_right
@@ -112,7 +113,7 @@ RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
walk_right
step_end
-RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
+RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer: @ 821254F
walk_left
walk_left
walk_left
@@ -123,7 +124,7 @@ RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
walk_left
step_end
-RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
+RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident: @ 8212558
walk_right
walk_right
walk_right
@@ -139,7 +140,7 @@ RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
walk_right
step_end
-RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
+RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk: @ 8212566
delay_16
delay_16
walk_down
@@ -147,57 +148,57 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
walk_in_place_fastest_right
step_end
-RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
+RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C
lock
faceplayer
- goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_2125CC
- goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595
- msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor
+ goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare
+ msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
- msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595
+ msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT
giveitem_std ITEM_EXP_SHARE
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_EXP_SHARE
- msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT
+ msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC
- msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 82125CC
+ msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1
+RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 82125E1
lock
faceplayer
- goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_2125F6
- msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls
+ msgbox RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6
- msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT
+RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 82125F6
+ msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT
release
end
-RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600
- msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN
+RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 8212600
+ msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN
end
-RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
+RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor: @ 8212609
.string "I'm MR. STONE, the PRESIDENT of\n"
.string "the DEVON CORPORATION.\p"
.string "I'd just got word about you!\p"
@@ -212,17 +213,17 @@ RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
.string "I was hoping that you'd deliver a\n"
.string "LETTER to STEVEN in DEWFORD.$"
-RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C
+RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis: @ 821277C
.string "MR. STONE: Now, you should know that\n"
.string "I am a great PRESIDENT.\p"
.string "So, I'd never be so cheap as to ask\n"
.string "a favor for nothing in return.\p"
.string "That's why I want you to have this!$"
-RustboroCity_DevonCorp_3F_Text_212820: @ 8212820
+RustboroCity_DevonCorp_3F_Text_ReceivedPokenav: @ 8212820
.string "{PLAYER} received a POKéNAV.$"
-RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
+RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp: @ 8212837
.string "MR. STONE: That device…\p"
.string "It's a POKéMON NAVIGATOR, or POKéNAV\n"
.string "for short.\p"
@@ -237,20 +238,20 @@ RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
.string "I think it would be best if you rested\n"
.string "up before you go on your way.$"
-RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2
+RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare: @ 82129D2
.string "MR. STONE: Well, then, {PLAYER}{KUN},\n"
.string "go with caution and care!$"
-RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09
+RustboroCity_DevonCorp_3F_Text_CountingOnYou: @ 8212A09
.string "MR. STONE: I'm counting on you!$"
-RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29
+RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter: @ 8212A29
.string "MR. STONE: You delivered my LETTER?\n"
.string "Thank you kindly!\p"
.string "This is my way of thanking you.\n"
.string "It should help you, a TRAINER.$"
-RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
+RustboroCity_DevonCorp_3F_Text_ExplainExpShare: @ 8212A9E
.string "MR. STONE: A POKéMON holding that\n"
.string "EXP. SHARE will be given some of the\l"
.string "EXP Points from battle.\p"
@@ -259,7 +260,7 @@ RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
.string "I would say EXP. SHARE is quite useful\n"
.string "for raising weak POKéMON.$"
-RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
+RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends: @ 8212B78
.string "MR. STONE: Since my youth, I've immersed\n"
.string "myself in work.\p"
.string "Consequently, I'm not familiar with\n"
@@ -267,7 +268,7 @@ RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
.string "But do young people all want to be\n"
.string "TRAINERS in the POKéMON LEAGUE?$"
-RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
+RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere: @ 8212C37
.string "This is the DEVON CORPORATION's\n"
.string "third floor.\p"
.string "Our PRESIDENT's OFFICE is on\n"
@@ -285,24 +286,24 @@ RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
.string "Oh, that's right.\n"
.string "Could you wait here a second?$"
-RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8
+RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe: @ 8212DE8
.string "Our PRESIDENT would like to have\n"
.string "a word with you.\p"
.string "Please come with me.$"
-RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F
+RustboroCity_DevonCorp_3F_Text_PleaseGoAhead: @ 8212E2F
.string "Please, go ahead.$"
-RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41
+RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard: @ 8212E41
.string "If you visit the SHIPYARD in SLATEPORT,\n"
.string "you should go see CAPT. STERN.$"
-RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88
+RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular: @ 8212E88
.string "DEVON's new products, the REPEAT BALL\n"
.string "and TIMER BALL, have become hugely\l"
.string "popular among TRAINERS.$"
-RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9
+RustboroCity_DevonCorp_3F_Text_RareRocksDisplay: @ 8212EE9
.string "It's a collection of rare rocks and\n"
.string "stones assembled by the PRESIDENT.$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 19:54:43 +0000