Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some labels in engine/timeofdaypals.asm

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/map_setup.asm
View File

@ -272,8 +272,8 @@ MapSetupCommands: ; 15440
dba LoadMapAttributes ; 1a
dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c
dba RotatePalettesRightPalettes ; 1d
dba RotatePalettesLeftPalettes ; 1e
dba FadeOutPalettes ; 1d
dba FadeInPalettes ; 1e
dba GetCoordOfUpperLeftCorner ; 1f
dba RestoreFacingAfterWarp ; 20
dba SpawnInFacingDown ; 21

6
engine/specials.asm
View File

@ -66,11 +66,11 @@ SpecialsPointers:: ; c029
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen
add_special RotatePalettesRightPalettes
add_special FadeOutPalettes
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
add_special RotatePalettesLeftPalettes
add_special Special_RotatePalettesLeftQuickly
add_special FadeInPalettes
add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes
add_special UpdateTimePals

6
engine/timeofdaypals.asm
View File

@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070
ret
; 8c079
RotatePalettesLeftPalettes:: ; 8c079
FadeInPalettes:: ; 8c079
ld c, $12
call GetTimePalFade
ld b, $4
@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079
ret
; 8c084
RotatePalettesRightPalettes:: ; 8c084
FadeOutPalettes:: ; 8c084
call Function8c0c1
ld c, $9
call GetTimePalFade
@ -150,7 +150,7 @@ endr
ret
; 8c0ab
Special_RotatePalettesLeftQuickly: ; 8c0ab
Special_FadeInQuickly: ; 8c0ab
ld c, $0
call GetTimePalFade
ld b, $4

4
event/field_moves.asm
View File

@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1
BlindingFlash: ; 8c7e1
callba RotatePalettesRightPalettes
callba FadeOutPalettes
ld hl, StatusFlags
set 2, [hl]
callba Function8c0e5
@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_09
call GetSGBLayout
callba Function49409
callba RotatePalettesLeftPalettes
callba FadeInPalettes
ret
; 8c80a

4
event/halloffame.asm
View File

@ -40,7 +40,7 @@ RedCredits:: ; 86455
ld [MusicFadeIDHi], a
ld a, $a
ld [MusicFade], a
callba RotatePalettesRightPalettes
callba FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
@ -63,7 +63,7 @@ Function8648e: ; 8648e
ld [MusicFadeIDHi], a
ld a, 10
ld [MusicFade], a
callba RotatePalettesRightPalettes
callba FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a

12
event/sacred_ash.asm
View File

@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
special HealParty
reloadmappart
playsound SFX_WARP_TO
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
waitbutton
writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON

2
event/whiteout.asm
View File

@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
closetext
special RotatePalettesRightPalettes
special FadeOutPalettes
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER

4
home/map.asm
View File

@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
callba RotatePalettesRightPalettes
callba FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@ -2034,7 +2034,7 @@ Function2b5c:: ; 2b5c
call GetSGBLayout
callba Function49409
call Function3200
callba RotatePalettesLeftPalettes
callba FadeInPalettes
call EnableSpriteUpdates
ret
; 2b74

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

12
maps/TeamRocketBaseB1F.asm
View File

@ -445,9 +445,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
special RotatePalettesRightPalettes
special FadeOutPalettes
cry VOLTORB
special RotatePalettesLeftPalettes
special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
special RotatePalettesRightPalettes
special FadeOutPalettes
cry GEODUDE
special RotatePalettesLeftPalettes
special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
special RotatePalettesRightPalettes
special FadeOutPalettes
cry KOFFING
special RotatePalettesLeftPalettes
special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21

6
maps/TeamRocketBaseB2F.asm
View File

@ -106,7 +106,7 @@ UnknownScript_0x6cfac:
disappear $d
disappear $e
pause 15
special Special_RotatePalettesLeftQuickly
special Special_FadeInQuickly
dotrigger $2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface $4, DOWN
@ -155,11 +155,11 @@ UnknownScript_0x6d091:
writetext UnknownText_0x6da97
closetext
loadmovesprites
special RotatePalettesRightPalettes
special FadeOutPalettes
special Mobile_HealParty
playsound SFX_FULL_HEAL
special HealParty
special RotatePalettesLeftPalettes
special FadeInPalettes
loadfont
writetext UnknownText_0x6daf7
closetext

2
maps/VermilionPort.asm
View File

@ -51,7 +51,7 @@ SailorScript_0x74dc4:
waitbutton
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes
special FadeOutPalettes
waitbutton
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

8
maps/WarehouseEntrance.asm
View File

@ -226,10 +226,10 @@ OlderHaircutBrotherScript:
writetext UnknownText_0x7c6b8
closetext
loadmovesprites
special RotatePalettesRightPalettes
special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special RotatePalettesLeftPalettes
special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c6d8
@ -309,10 +309,10 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c80e
closetext
loadmovesprites
special RotatePalettesRightPalettes
special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special RotatePalettesLeftPalettes
special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c82a

2
misc/mobile_40.asm
View File

@ -313,7 +313,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
callba RotatePalettesRightPalettes
callba FadeOutPalettes
callba Function106464
call HideSprites
call DelayFrame