pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some labels in engine/timeofdaypals.asm

Browse Source
This commit is contained in:
PikalaxALT
2015-11-26 21:06:32 -05:00
parent 0c6f94effd
commit 4bcd71e322
33 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/BattleTowerBattleRoom.asm
View File

@@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425
keeptextopen
loadmovesprites
special BattleTowerBattle ; calls predef startbattle
special RotatePalettesRightPalettes
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 RotatePalettesRightPalettes
special FadeOutPalettes
special LoadMapPalettes
pause 60
special RotatePalettesLeftPalettes
special FadeInPalettes
special RestartMapMusic
loadfont
writetext Text_NextUpOpponentNo
@@ -73,7 +73,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitbutton
special RotatePalettesRightPalettes
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 RotatePalettesRightPalettes
special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0

4
maps/BluesHouse.asm
View File

@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266
closetext
loadmovesprites
special RotatePalettesRightPalettes
special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special RotatePalettesLeftPalettes
special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296

2
maps/EcruteakGym.asm
View File

@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
special RotatePalettesRightPalettes
special FadeOutPalettes
playsound SFX_ENTER_DOOR
waitbutton
warp ECRUTEAK_CITY, $6, $1b

4
maps/FastShip1F.asm
View File

@@ -64,7 +64,7 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes
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 RotatePalettesRightPalettes
special FadeOutPalettes
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -43,7 +43,7 @@ TwinScript_0x75ebb:
appear $4
spriteface PLAYER, UP
spriteface $4, UP
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
spriteface $3, DOWN
showemote EMOTE_SHOCK, $3, 15
applymovement $4, MovementData_0x7600c

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@@ -70,7 +70,7 @@ FastShipBed:
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
loadfont
writetext FastShipBedText2
closetext

2
maps/IndigoPlateauPokeCenter1F.asm
View File

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

2
maps/LancesRoom.asm
View File

@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
loadmovesprites
applymovement $3, MovementData_0x180f5b
special RotatePalettesRightPalettes
special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end

4
maps/MobileBattleRoom.asm
View File

@@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText
pause 20
loadmovesprites
special RotatePalettesRightPalettes
special FadeOutPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
pause 60
special RotatePalettesLeftPalettes
special FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_:

2
maps/MrPokemonsHouse.asm
View File

@@ -114,7 +114,7 @@ UnknownScript_0x196ec9:
special Mobile_HealParty
special HealParty
pause 60
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x197134

12
maps/OlivineLighthouse6F.asm
View File

@@ -42,9 +42,9 @@ UnknownScript_0x60bab:
loadmovesprites
special RestartMapMusic
cry AMPHAROS
special RotatePalettesRightPalettes
special FadeOutPalettes
pause 10
special RotatePalettesLeftPalettes
special FadeInPalettes
loadfont
writetext UnknownText_0x60f3d
closetext
@@ -116,10 +116,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
closetext
loadmovesprites
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
end
ItemFragment_0x60c66:

2
maps/OlivinePort.asm
View File

@@ -39,7 +39,7 @@ SailorScript_0x748c0:
waitbutton
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes
special FadeOutPalettes
waitbutton
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a

2
maps/RadioTower5F.asm
View File

@@ -95,7 +95,7 @@ UnknownScript_0x6006e:
disappear $3
disappear $4
pause 15
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER

2
maps/Route24.asm
View File

@@ -29,7 +29,7 @@ RocketScript_0x1adbfa:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 25
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
playmapmusic
end

2
maps/Route26HealSpeechHouse.asm
View File

@@ -17,7 +17,7 @@ TeacherScript_0x7b125:
playmusic MUSIC_HEAL
special HealParty
pause 60
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x7b18b

4
maps/Route35NationalParkgate.asm
View File

@@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
loadmovesprites
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
special RotatePalettesRightPalettes
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 RotatePalettesRightPalettes
special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f

6
maps/Route36NationalParkgate.asm
View File

@@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader:
appear $d
applymovement PLAYER, MovementData_0x6add1
pause 15
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
jumpstd bugcontestresults
.GoBackToContest:
@@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader:
loadmovesprites
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes
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 RotatePalettesRightPalettes
special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12

2
maps/SilverCaveRoom3.asm
View File

@@ -26,7 +26,7 @@ RedScript_0x18c603:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 15
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
pause 30
special HealParty
refreshscreen $0

4
maps/SlowpokeWellB1F.asm
View File

@@ -34,7 +34,7 @@ GruntM1Script:
disappear $4
disappear $5
pause 15
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
disappear $8
moveperson $8, $b, $6
appear $8
@@ -56,7 +56,7 @@ GruntM1Script:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
special RotatePalettesRightPalettes
special FadeOutPalettes
special HealParty
pause 15
warp KURTS_HOUSE, $3, $3

2
maps/SproutTower3F.asm
View File

@@ -51,7 +51,7 @@ UnknownScript_0x184947:
special Special_ReloadSpritesNoPalettes
disappear $8
waitbutton
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
dotrigger $1
special RestartMapMusic
end

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