summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-05-06 15:02:51 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-05-06 15:02:51 -0400
commitb230178cdb0f4261cb9a608ec94183c5873f59fa (patch)
tree22435cb64b001eda648ccd5c3261ddfdca7605e1 /data/maps
parentd3127e359447688e37cad222ae1586c6ec202ab0 (diff)
Sync prof_birch.inc
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/scripts.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc4
-rw-r--r--data/maps/Route101/map.json2
-rw-r--r--data/maps/Route101/scripts.inc2
-rw-r--r--data/maps/Route103/map.json2
-rw-r--r--data/maps/Route103/scripts.inc2
6 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 92ba90cb8..5fdb9e18d 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -108,7 +108,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_19134D, MSGBOX_DEFAULT
- call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
+ call ProfBirch_EventScript_RatePokedex
msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, MSGBOX_DEFAULT
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 5465da371..945f5d35a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
call Common_EventScript_SetupRivalGfxId
- call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
+ call ProfBirch_EventScript_UpdateLocation
end
LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
@@ -106,7 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
lock
faceplayer
- goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
+ goto_if_unset FLAG_UNKNOWN_BIRCH_380, ProfBirch_EventScript_AskRatePokedex
compare VAR_BIRCH_LAB_STATE, 5
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, MSGBOX_DEFAULT
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 58f046257..40f032962 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -84,7 +84,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route101_EventScript_1A037F",
+ "script": "ProfBirch_EventScript_AskRatePokedex",
"flag": "FLAG_HIDE_BIRCH_ROUTE101"
},
{
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 9c1f249a3..60e67565d 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -4,7 +4,7 @@ Route101_MapScripts:: @ 814E924
.byte 0
Route101_MapScript1_14E92F:: @ 814E92F
- call Route101_EventScript_1A02F4
+ call ProfBirch_EventScript_UpdateLocation
end
Route101_MapScript2_14E935:: @ 814E935
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 02f9b30c3..940e6d7a4 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -162,7 +162,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route103_EventScript_1A037F",
+ "script": "ProfBirch_EventScript_AskRatePokedex",
"flag": "FLAG_HIDE_BIRCH_ROUTE103"
},
{
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 6747c140c..637a2a85a 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -4,7 +4,7 @@ Route103_MapScripts:: @ 814EB81
Route103_MapScript1_14EB87:: @ 814EB87
call Common_EventScript_SetupRivalGfxId
- call Route103_EventScript_1A02F4
+ call ProfBirch_EventScript_UpdateLocation
end
Route103_EventScript_14EB92:: @ 814EB92