Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
|
||||
; 8c7e1
|
||||
|
||||
BlindingFlash: ; 8c7e1
|
||||
farcall FadeOutPalettes
|
||||
farcall Special_FadeOutPalettes
|
||||
ld hl, wStatusFlags
|
||||
set 2, [hl] ; Flash
|
||||
farcall ReplaceTimeOfDayPals
|
||||
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
farcall LoadOW_BGPal7
|
||||
farcall FadeInPalettes
|
||||
farcall Special_FadeInPalettes
|
||||
ret
|
||||
; 8c80a
|
||||
|
||||
|
Reference in New Issue
Block a user