summaryrefslogtreecommitdiff
path: root/maps/TradeCenter.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/TradeCenter.asm
parente2c15b0b922c906113cd9d5fa0681fb629721583 (diff)
Replace "Map<MapName>Signpost<#>Script" labels
Diffstat (limited to 'maps/TradeCenter.asm')
-rw-r--r--maps/TradeCenter.asm13
1 files changed, 7 insertions, 6 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index eff2e414a..51501c5b1 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -34,12 +34,13 @@ TradeCenter_MapScripts:
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
end
-MapTradeCenterSignpost1Script:
+TradeCenterConsoleScript:
special TradeCenter
newloadmap MAPSETUP_LINKRETURN
end
-ChrisScript_0x19340b:
+TradeCenterFriendScript:
+; unreferenced
opentext
writetext .FriendReadyText
waitbutton
@@ -61,9 +62,9 @@ TradeCenter_MapEvents:
db 0 ; coord events
db 2 ; bg events
- bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
- bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
+ bg_event 4, 4, BGEVENT_RIGHT, TradeCenterConsoleScript
+ bg_event 5, 4, BGEVENT_LEFT, TradeCenterConsoleScript
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