pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -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

4
engine/map_setup.asm
View File

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

6
engine/specials.asm
View File

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

6
engine/timeofdaypals.asm
View File

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

4
event/field_moves.asm
View File

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

4
event/halloffame.asm
View File

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

12
event/sacred_ash.asm
View File

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

2
event/whiteout.asm
View File

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

4
home/map.asm
View File

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

10
maps/BattleTowerBattleRoom.asm
View File

@@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425
keeptextopen keeptextopen
loadmovesprites loadmovesprites
special BattleTowerBattle ; calls predef startbattle special BattleTowerBattle ; calls predef startbattle
special RotatePalettesRightPalettes special FadeOutPalettes
reloadmap reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
@@ -46,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425
closetext closetext
loadmovesprites loadmovesprites
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special RotatePalettesRightPalettes special FadeOutPalettes
special LoadMapPalettes special LoadMapPalettes
pause 60 pause 60
special RotatePalettesLeftPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
loadfont loadfont
writetext Text_NextUpOpponentNo writetext Text_NextUpOpponentNo
@@ -73,7 +73,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction special BattleTowerAction
playsound SFX_SAVE playsound SFX_SAVE
waitbutton waitbutton
special RotatePalettesRightPalettes special FadeOutPalettes
special Reset special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3 Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge writetext Text_CancelYourBattleRoomChallenge
@@ -84,7 +84,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLE_TOWER_ACTION_06 writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction special BattleTowerAction
loadmovesprites loadmovesprites
special RotatePalettesRightPalettes special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7 warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont loadfont
jump UnknownScript_0x9e4b0 jump UnknownScript_0x9e4b0

4
maps/BluesHouse.asm
View File

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

2
maps/EcruteakGym.asm
View File

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

4
maps/FastShip1F.asm
View File

@@ -64,7 +64,7 @@ SailorScript_0x75160:
loadmovesprites loadmovesprites
scall .LetThePlayerOut scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitbutton waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger VERMILION_PORT, $1 domaptrigger VERMILION_PORT, $1
@@ -77,7 +77,7 @@ SailorScript_0x75160:
loadmovesprites loadmovesprites
scall .LetThePlayerOut scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
special RotatePalettesRightPalettes special FadeOutPalettes
waitbutton waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1 domaptrigger OLIVINE_PORT, $1

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

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

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

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

2
maps/IndigoPlateauPokeCenter1F.asm
View File

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

2
maps/LancesRoom.asm
View File

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

4
maps/MobileBattleRoom.asm
View File

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

2
maps/MrPokemonsHouse.asm
View File

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

12
maps/OlivineLighthouse6F.asm
View File

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

2
maps/OlivinePort.asm
View File

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

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