summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-11 23:38:57 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-11 23:38:57 -0500
commit2ffcb4b49036b8bcd9a37cdc9305f7ee5567fe6c (patch)
tree0c9fe148771ade8ef1948852722b95b378cbe46f /maps
parent91068077f05afbbfd6571ceadada2c03ac7c8038 (diff)
More splits; map setup labels
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTowerBattleRoom.asm10
-rw-r--r--maps/BluesHouse.asm4
-rw-r--r--maps/CeruleanGym.asm4
-rw-r--r--maps/Colosseum.asm2
-rw-r--r--maps/EcruteakGym.asm2
-rw-r--r--maps/FastShip1F.asm4
-rw-r--r--maps/GoldenrodMagnetTrainStation.asm2
-rw-r--r--maps/IlexForest.asm12
-rw-r--r--maps/IndigoPlateauPokeCenter1F.asm2
-rw-r--r--maps/LancesRoom.asm2
-rw-r--r--maps/MobileBattleRoom.asm4
-rw-r--r--maps/OlivineLighthouse6F.asm18
-rw-r--r--maps/OlivinePort.asm2
-rw-r--r--maps/Route35NationalParkgate.asm4
-rw-r--r--maps/Route36NationalParkgate.asm4
-rw-r--r--maps/SaffronTrainStation.asm2
-rw-r--r--maps/SlowpokeWellB1F.asm14
-rw-r--r--maps/TeamRocketBaseB1F.asm12
-rw-r--r--maps/TeamRocketBaseB2F.asm10
-rw-r--r--maps/TeamRocketBaseB3F.asm4
-rw-r--r--maps/TimeCapsule.asm2
-rw-r--r--maps/TradeCenter.asm2
-rw-r--r--maps/VermilionPort.asm2
-rw-r--r--maps/WarehouseEntrance.asm8
24 files changed, 66 insertions, 66 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 349a61e56..e22057abf 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425
keeptextopen
loadmovesprites
special BattleTowerBattle ; calls predef startbattle
- special FadeBlackBGMap
+ special FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
@@ -46,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425
closetext
loadmovesprites
playmusic MUSIC_HEAL
- special FadeBlackBGMap
+ special FadeOutPalettes
special LoadMapPalettes
pause 60
- special FadeInBGMap
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext Text_NextUpOpponentNo
@@ -73,7 +73,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitbutton
- special FadeBlackBGMap
+ special FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@@ -84,7 +84,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index de5bc1ca6..1540239bc 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266
closetext
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special FadeInBGMap
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index a272b6472..10c00d18a 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -176,8 +176,8 @@ MovementData_0x1884eb:
jump_step_up
db $38 ; movement
remove_fixed_facing
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
step_down
step_down
step_end
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 7b9c5272a..4e9db3be0 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -49,7 +49,7 @@ ColosseumScript_Initialize:
MapColosseumSignpost1Script:
special Special_Colosseum
- newloadmap MAPSETUP_08
+ newloadmap MAPSETUP_LINKRETURN
end
ChrisScript_0x193499:
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index af89cbb90..caf60826f 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
- special FadeBlackBGMap
+ special FadeOutPalettes
playsound SFX_ENTER_DOOR
waitbutton
warp ECRUTEAK_CITY, $6, $1b
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 832ab3d1d..bf7ff442b 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -64,7 +64,7 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger VERMILION_PORT, $1
@@ -77,7 +77,7 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index b92de272c..d95cfb934 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -35,7 +35,7 @@ OfficerScript_0x550ec:
writebyte $0
special Special_MagnetTrain
warpcheck
- newloadmap MAPSETUP_09
+ newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
wait $14
end
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 570500dee..e1aaa43da 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -572,8 +572,8 @@ MovementData_0x6eed2:
big_step_down
fix_facing
jump_step_up
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
remove_fixed_facing
big_step_up
big_step_up
@@ -664,8 +664,8 @@ MovementData_0x6ef23:
big_step_left
fix_facing
jump_step_right
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
remove_fixed_facing
big_step_left
big_step_left
@@ -694,8 +694,8 @@ MovementData_0x6ef3d:
big_step_left
fix_facing
jump_step_right
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
remove_fixed_facing
big_step_right
big_step_right
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
index 5d1a94345..e0e56981c 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -154,7 +154,7 @@ TeleportGuyScript:
closetext
loadmovesprites
playsound SFX_WARP_TO
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
warp NEW_BARK_TOWN, $d, $6
end
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 91bb5a8ad..3929e6f35 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
loadmovesprites
applymovement $3, MovementData_0x180f5b
- special FadeBlackBGMap
+ special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index ba54d2a5d..c672c3b69 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText
pause 20
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
pause 60
- special FadeInBGMap
+ special FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_:
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index f5e2426b0..c9bb683e7 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -42,9 +42,9 @@ UnknownScript_0x60bab:
loadmovesprites
special RestartMapMusic
cry AMPHAROS
- special FadeBlackBGMap
+ special FadeOutPalettes
pause 10
- special FadeInBGMap
+ special FadeInPalettes
loadfont
writetext UnknownText_0x60f3d
closetext
@@ -116,10 +116,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
closetext
loadmovesprites
- special FadeBlackBGMap
- special FadeInBGMap
- special FadeBlackBGMap
- special FadeInBGMap
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
end
ItemFragment_0x60c66:
@@ -131,8 +131,8 @@ MovementData_0x60c68:
slow_step_right
slow_step_up
slow_step_up
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
step_end
MovementData_0x60c70:
@@ -153,7 +153,7 @@ MovementData_0x60c79:
slow_step_up
slow_step_up
slow_step_up
- accelerate_last
+ step_sleep_8
step_end
UnknownText_0x60c81:
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 35343fa91..51af0670d 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -39,7 +39,7 @@ SailorScript_0x748c0:
waitbutton
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index be2ddf686..c95707c78 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
loadmovesprites
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
@@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed:
special Special_GiveParkBalls
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 703670d7c..4ae506977 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader:
loadmovesprites
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
@@ -166,7 +166,7 @@ Route36OfficerScriptContest:
special Special_GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index 329d3d6c7..72bc19056 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -35,7 +35,7 @@ OfficerScript_0x18a81e:
writebyte $1
special Special_MagnetTrain
warpcheck
- newloadmap MAPSETUP_09
+ newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
wait $14
end
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 47661ee39..95ec72694 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -56,7 +56,7 @@ GruntM1Script:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
- special FadeBlackBGMap
+ special FadeOutPalettes
special HealParty
pause 15
warp KURTS_HOUSE, $3, $3
@@ -121,15 +121,15 @@ KurtSlowpokeWellVictoryMovementData:
step_left
step_left
step_up
- accelerate_last
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
+ step_sleep_8
step_left
step_up
step_up
- accelerate_last
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
+ step_sleep_8
turn_head_left
step_end
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 3a03b67a2..29ca078b8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -445,9 +445,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry VOLTORB
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry GEODUDE
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry KOFFING
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 920db3621..7774ef97f 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -155,11 +155,11 @@ UnknownScript_0x6d091:
writetext UnknownText_0x6da97
closetext
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
special Mobile_HealParty
playsound SFX_FULL_HEAL
special HealParty
- special FadeInBGMap
+ special FadeInPalettes
loadfont
writetext UnknownText_0x6daf7
closetext
@@ -449,17 +449,17 @@ MovementData_0x6d254:
step_end
MovementData_0x6d258:
- accelerate_last
+ step_sleep_8
step_left
step_left
turn_head_up
- accelerate_last
+ step_sleep_8
step_right
step_right
step_right
step_right
turn_head_up
- accelerate_last
+ step_sleep_8
step_left
step_left
turn_head_down
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 2939c1691..2672e2410 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -254,8 +254,8 @@ MovementData_0x6e147:
fix_facing
fast_jump_step_left
remove_fixed_facing
- accelerate_last
- accelerate_last
+ step_sleep_8
+ step_sleep_8
slow_step_right
big_step_down
big_step_down
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 59f9c36b4..9795265b6 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -39,7 +39,7 @@ TimeCapsule_Initialize:
MapTimeCapsuleSignpost1Script:
special Special_TimeCapsule
- newloadmap MAPSETUP_08
+ newloadmap MAPSETUP_LINKRETURN
end
ChrisScript_0x19351a:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index a53f6a319..982650b4e 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -39,7 +39,7 @@ TradeCenter_Initialize:
MapTradeCenterSignpost1Script:
special Special_TradeCenter
- newloadmap MAPSETUP_08
+ newloadmap MAPSETUP_LINKRETURN
end
ChrisScript_0x19340b:
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index de184c02a..de943b3e4 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -51,7 +51,7 @@ SailorScript_0x74dc4:
waitbutton
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
- special FadeBlackBGMap
+ special FadeOutPalettes
waitbutton
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index 015692811..7199599d7 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -226,10 +226,10 @@ OlderHaircutBrotherScript:
writetext UnknownText_0x7c6b8
closetext
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special FadeInBGMap
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c6d8
@@ -309,10 +309,10 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c80e
closetext
loadmovesprites
- special FadeBlackBGMap
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special FadeInBGMap
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c82a