Water Sport doesnt seem to work correctly?

This commit is contained in:
Zeta_Null 2024-12-29 22:11:46 -05:00
parent 161bc9374c
commit 2207e15bc7
17 changed files with 101 additions and 7 deletions

View file

@ -78,7 +78,7 @@ TilesetForestAnim:
TilesetJohtoAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $5b, AnimateDeepWaterTile
dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation
@ -237,7 +237,6 @@ TilesetTowerAnim:
dw NULL, DoneTileAnimation
TilesetNihon1Anim:
TilesetNihonBirdonAnim:
TilesetNihonFontAnim:
TilesetNihonHighTechAnim:
TilesetNihonOldAnim:
@ -255,6 +254,19 @@ TilesetNihonWhiteCityAnim:
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
TilesetNihonBirdonAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $60, AnimateDeepWaterTile
dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation
dw NULL, AnimateFlowerTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
TilesetForestKantoAnim:
dw NULL, WaitTileAnimation

View file

@ -78,6 +78,11 @@ LoadSpecialMapPalette:
scf
ret
.underwater
call LoadUnderwaterPalette
scf
ret
.do_nothing
and a
ret
@ -228,6 +233,38 @@ LoadDesertPalette:
ret
INCLUDE "gfx/tilesets/desert.pal"
LoadUnderwaterPalette:
ld a, [wTimeOfDay]
and $7
cp NITE_F
jr z, .nite
cp DAY_F
jr z, .day
scf
;morn
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterMornPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.day
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterDayPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.nite
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterNitePalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
INCLUDE "gfx/tilesets/underwater.pal"
LoadSpecialMapObjectPalette: