summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/map_constants.asm4
-rw-r--r--data/maps/scenes.asm2
-rw-r--r--maps.asm4
-rw-r--r--maps/Route17.asm4
-rw-r--r--maps/Route17Route18Gate.asm (renamed from maps/Route1718Gate.asm)16
-rw-r--r--maps/Route18.asm4
-rw-r--r--maps/Route29.asm2
-rw-r--r--maps/Route29Route46Gate.asm (renamed from maps/Route2946Gate.asm)24
-rw-r--r--maps/Route46.asm4
-rw-r--r--maps/blockdata.asm4
-rw-r--r--maps/map_headers.asm4
-rw-r--r--maps/second_map_headers.asm4
-rw-r--r--wram.asm2
13 files changed, 39 insertions, 39 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 1af46ee36..3fe6d543d 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -402,7 +402,7 @@ ENDM
mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23
mapgroup ROUTE_16_GATE, 4, 5 ; 24
mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 ; 25
- mapgroup ROUTE_17_18_GATE, 4, 5 ; 26
+ mapgroup ROUTE_17_ROUTE_18_GATE, 4, 5 ; 26
newgroup ; 22
@@ -453,7 +453,7 @@ ENDM
mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12
- mapgroup ROUTE_29_46_GATE, 4, 5 ; 13
+ mapgroup ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13
newgroup ; 25
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index 3d9600407..eebdcfd1b 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -17,7 +17,7 @@ MapScenes:: ; 4d01e
scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID
scene_def SAFFRON_TRAIN_STATION, wSaffronTrainStationSceneID
scene_def ROUTE_16_GATE, wRoute16GateSceneID
- scene_def ROUTE_17_18_GATE, wRoute1718GateSceneID
+ scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID
scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID
scene_def WILLS_ROOM, wWillsRoomSceneID
scene_def KOGAS_ROOM, wKogasRoomSceneID
diff --git a/maps.asm b/maps.asm
index 8303732c9..b43210ed5 100644
--- a/maps.asm
+++ b/maps.asm
@@ -132,7 +132,7 @@ INCLUDE "maps/CeladonCafe.asm"
INCLUDE "maps/Route16FuchsiaSpeechHouse.asm"
INCLUDE "maps/Route16Gate.asm"
INCLUDE "maps/Route7SaffronGate.asm"
-INCLUDE "maps/Route1718Gate.asm"
+INCLUDE "maps/Route17Route18Gate.asm"
SECTION "Map Scripts 8", ROMX
@@ -170,7 +170,7 @@ INCLUDE "maps/ElmsHouse.asm"
INCLUDE "maps/Route26HealSpeechHouse.asm"
INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm"
INCLUDE "maps/Route27SandstormHouse.asm"
-INCLUDE "maps/Route2946Gate.asm"
+INCLUDE "maps/Route29Route46Gate.asm"
SECTION "Map Scripts 10", ROMX
diff --git a/maps/Route17.asm b/maps/Route17.asm
index c8be61da2..0f8d17b3a 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -140,8 +140,8 @@ Route17_MapEventHeader:
.Warps:
db 2
- warp_def 17, 82, 1, ROUTE_17_18_GATE
- warp_def 17, 83, 2, ROUTE_17_18_GATE
+ warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE
+ warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE
.CoordEvents:
db 0
diff --git a/maps/Route1718Gate.asm b/maps/Route17Route18Gate.asm
index 9a8a076dd..6596d3809 100644
--- a/maps/Route1718Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,7 +1,7 @@
const_value set 2
- const ROUTE1718GATE_OFFICER
+ const ROUTE17ROUTE18GATE_OFFICER
-Route1718Gate_MapScriptHeader:
+Route17Route18Gate_MapScriptHeader:
.SceneScripts:
db 1
scene_script .DummyScene
@@ -12,8 +12,8 @@ Route1718Gate_MapScriptHeader:
.DummyScene:
end
-Route1718GateOfficerScript:
- jumptextfaceplayer Route1718GateOfficerText
+Route17Route18GateOfficerScript:
+ jumptextfaceplayer Route17Route18GateOfficerText
UnknownScript_0x73611:
checkitem BICYCLE
@@ -21,7 +21,7 @@ UnknownScript_0x73611:
end
UnknownScript_0x73617:
- showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15
+ showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
spriteface PLAYER, UP
opentext
writetext UnknownText_0x7364d
@@ -35,7 +35,7 @@ MovementData_0x73629:
turn_head LEFT
step_end
-Route1718GateOfficerText:
+Route17Route18GateOfficerText:
text "CYCLING ROAD"
line "Uphill Starts Here"
done
@@ -51,7 +51,7 @@ UnknownText_0x7364d:
line "BICYCLE to go on."
done
-Route1718Gate_MapEventHeader:
+Route17Route18Gate_MapEventHeader:
; filler
db 0, 0
@@ -72,4 +72,4 @@ Route1718Gate_MapEventHeader:
.ObjectEvents:
db 1
- object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route1718GateOfficerScript, -1
+ object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 04a0cc843..0487cc797 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -83,8 +83,8 @@ Route18_MapEventHeader:
.Warps:
db 2
- warp_def 2, 6, 3, ROUTE_17_18_GATE
- warp_def 2, 7, 4, ROUTE_17_18_GATE
+ warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE
+ warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE
.CoordEvents:
db 0
diff --git a/maps/Route29.asm b/maps/Route29.asm
index cd91a1f3e..6d564f083 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -421,7 +421,7 @@ Route29_MapEventHeader:
.Warps:
db 1
- warp_def 27, 1, 3, ROUTE_29_46_GATE
+ warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE
.CoordEvents:
db 2
diff --git a/maps/Route2946Gate.asm b/maps/Route29Route46Gate.asm
index c90aa3150..e3366fae7 100644
--- a/maps/Route2946Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,21 +1,21 @@
const_value set 2
- const ROUTE2946GATE_OFFICER
- const ROUTE2946GATE_YOUNGSTER
+ const ROUTE29ROUTE46GATE_OFFICER
+ const ROUTE29ROUTE46GATE_YOUNGSTER
-Route2946Gate_MapScriptHeader:
+Route29Route46Gate_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
-Route2946GateOfficerScript:
- jumptextfaceplayer Route2946GateOfficerText
+Route29Route46GateOfficerScript:
+ jumptextfaceplayer Route29Route46GateOfficerText
-Route2946GateYoungsterScript:
- jumptextfaceplayer Route2946GateYoungsterText
+Route29Route46GateYoungsterScript:
+ jumptextfaceplayer Route29Route46GateYoungsterText
-Route2946GateOfficerText:
+Route29Route46GateOfficerText:
text "You can't climb"
line "ledges."
@@ -24,7 +24,7 @@ Route2946GateOfficerText:
cont "take a shortcut."
done
-Route2946GateYoungsterText:
+Route29Route46GateYoungsterText:
text "Different kinds of"
line "#MON appear"
cont "past here."
@@ -36,7 +36,7 @@ Route2946GateYoungsterText:
line "everywhere."
done
-Route2946Gate_MapEventHeader:
+Route29Route46Gate_MapEventHeader:
; filler
db 0, 0
@@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader:
.ObjectEvents:
db 2
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route2946GateOfficerScript, -1
- object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route2946GateYoungsterScript, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
+ object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 36dad82d3..3ecab00f1 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -256,8 +256,8 @@ Route46_MapEventHeader:
.Warps:
db 3
- warp_def 7, 33, 1, ROUTE_29_46_GATE
- warp_def 8, 33, 2, ROUTE_29_46_GATE
+ warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE
+ warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE
warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
.CoordEvents:
diff --git a/maps/blockdata.asm b/maps/blockdata.asm
index 8ee9d2aa5..3214b7971 100644
--- a/maps/blockdata.asm
+++ b/maps/blockdata.asm
@@ -210,7 +210,7 @@ Route34IlexForestGate_BlockData:
Route6SaffronGate_BlockData:
Route40BattleTowerGate_BlockData:
Route2Gate_BlockData:
-Route2946Gate_BlockData:
+Route29Route46Gate_BlockData:
Route5SaffronGate_BlockData:
INCBIN "maps/NorthSouthGate.blk"
@@ -276,7 +276,7 @@ Route15FuchsiaGate_BlockData:
Route8SaffronGate_BlockData:
Route16Gate_BlockData:
Route7SaffronGate_BlockData:
-Route1718Gate_BlockData:
+Route17Route18Gate_BlockData:
Route31VioletGate_BlockData:
INCBIN "maps/EastWestGate.blk"
diff --git a/maps/map_headers.asm b/maps/map_headers.asm
index ac0007f0d..563eaf4ac 100644
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -424,7 +424,7 @@ MapGroup_Celadon:
map_header Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route1718Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
MapGroup_Cianwood:
@@ -475,7 +475,7 @@ MapGroup_NewBark:
map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route2946Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE
MapGroup_Saffron:
diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm
index 6982df6d1..8b6bbdfc5 100644
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -629,7 +629,7 @@ ENDM
map_header_2 Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $0, 0
map_header_2 Route16Gate, ROUTE_16_GATE, $0, 0
map_header_2 Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $0, 0
- map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0
+ map_header_2 Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $0, 0
map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0
map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0
map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0
@@ -661,7 +661,7 @@ ENDM
map_header_2 Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $0, 0
map_header_2 Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $0, 0
map_header_2 Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $0, 0
- map_header_2 Route2946Gate, ROUTE_29_46_GATE, $0, 0
+ map_header_2 Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $0, 0
map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0
map_header_2 SaffronGym, SAFFRON_GYM, $0, 0
map_header_2 SaffronMart, SAFFRON_MART, $0, 0
diff --git a/wram.asm b/wram.asm
index 5b445e5ba..3f4c1ecb8 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2440,7 +2440,7 @@ wTrainerHouseB1FSceneID:: db ; d979
wVictoryRoadGateSceneID:: db ; d97a
wSaffronTrainStationSceneID:: db ; d97b
wRoute16GateSceneID:: db ; d97c
-wRoute1718GateSceneID:: db ; d97d
+wRoute17Route18GateSceneID:: db ; d97d
wIndigoPlateauPokecenter1FSceneID:: db ; d97e
wWillsRoomSceneID:: db ; d97f
wKogasRoomSceneID:: db ; d980
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 17:39:23 +0000