summaryrefslogtreecommitdiff
path: root/maps/Colosseum.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-27 19:33:38 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-27 19:33:38 -0500
commit43b5f90457a9a6c5df6baa561afdcefe2c08456f (patch)
treef06cdf5c0849c0848a437c17f4c7fd106ea6c93b /maps/Colosseum.asm
parente2c15b0b922c906113cd9d5fa0681fb629721583 (diff)
Replace "Map<MapName>Signpost<#>Script" labels
Diffstat (limited to 'maps/Colosseum.asm')
-rw-r--r--maps/Colosseum.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index edaa5e0ad..f6ac38b4d 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -43,12 +43,12 @@ Colosseum_MapScripts:
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end
-MapColosseumSignpost1Script:
+ColosseumConsoleScript:
special Colosseum
newloadmap MAPSETUP_LINKRETURN
end
-ChrisScript_0x193499:
+CableClubFriendScript:
opentext
writetext .FriendReadyText
waitbutton
@@ -70,9 +70,9 @@ Colosseum_MapEvents:
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
- bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
+ bg_event 4, 4, BGEVENT_RIGHT, ColosseumConsoleScript
+ bg_event 5, 4, BGEVENT_LEFT, ColosseumConsoleScript
db 2 ; object events
- object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+ object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+ object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2