More splits; map setup labels

This commit is contained in:
PikalaxALT
2015-11-11 23:38:57 -05:00
parent 91068077f0
commit 2ffcb4b490
85 changed files with 10945 additions and 11772 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -49,7 +49,7 @@ ColosseumScript_Initialize:
MapColosseumSignpost1Script:
special Special_Colosseum
newloadmap MAPSETUP_08
newloadmap MAPSETUP_LINKRETURN
end
ChrisScript_0x193499:

View File

@@ -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

View File

@@ -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

View File

@@ -35,7 +35,7 @@ OfficerScript_0x550ec:
writebyte $0
special Special_MagnetTrain
warpcheck
newloadmap MAPSETUP_09
newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
wait $14
end

View File

@@ -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

View File

@@ -154,7 +154,7 @@ TeleportGuyScript:
closetext
loadmovesprites
playsound SFX_WARP_TO
special FadeBlackBGMap
special FadeOutPalettes
waitbutton
warp NEW_BARK_TOWN, $d, $6
end

View File

@@ -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

View File

@@ -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_:

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -35,7 +35,7 @@ OfficerScript_0x18a81e:
writebyte $1
special Special_MagnetTrain
warpcheck
newloadmap MAPSETUP_09
newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
wait $14
end

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More