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

Harmonize engine/{phone, pokedex, pokegear, printer, rtc, tilesets} with pokegold

Browse Source 
To do: engine/{menus, movie, overworld, pokemon}
This commit is contained in:
Rangi
2020-06-17 11:29:00 -04:00
parent 8019db3ea9
commit be93ab33a7
8 changed files with 123 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/tilesets/tileset_anims.asm
View File

@@ -2,7 +2,7 @@ _AnimateTileset::
; Iterate over a given pointer array of
; animation functions (one per frame).
; Typically in wra1, vra0
; Typically in WRAM bank 1, VRAM bank 0.
ld a, [wTilesetAnim]
ld e, a
@@ -214,16 +214,16 @@ TilesetIcePathAnim:
dw NULL, DoneTileAnimation
TilesetTowerAnim:
dw TowerPillarTilePointer9, AnimateTowerPillarTile
dw TowerPillarTilePointer9, AnimateTowerPillarTile
dw TowerPillarTilePointer10, AnimateTowerPillarTile
dw TowerPillarTilePointer7, AnimateTowerPillarTile
dw TowerPillarTilePointer8, AnimateTowerPillarTile
dw TowerPillarTilePointer5, AnimateTowerPillarTile
dw TowerPillarTilePointer6, AnimateTowerPillarTile
dw TowerPillarTilePointer3, AnimateTowerPillarTile
dw TowerPillarTilePointer4, AnimateTowerPillarTile
dw TowerPillarTilePointer1, AnimateTowerPillarTile
dw TowerPillarTilePointer2, AnimateTowerPillarTile
dw TowerPillarTilePointer7, AnimateTowerPillarTile
dw TowerPillarTilePointer8, AnimateTowerPillarTile
dw TowerPillarTilePointer5, AnimateTowerPillarTile
dw TowerPillarTilePointer6, AnimateTowerPillarTile
dw TowerPillarTilePointer3, AnimateTowerPillarTile
dw TowerPillarTilePointer4, AnimateTowerPillarTile
dw TowerPillarTilePointer1, AnimateTowerPillarTile
dw TowerPillarTilePointer2, AnimateTowerPillarTile
dw NULL, StandingTileFrame
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -658,7 +658,6 @@ FlowerTileFrames:
INCBIN "gfx/tilesets/flower/cgb_2.2bpp"
LavaBubbleAnim1:
; Splash in the bottom-right corner of the fountain.
ld hl, sp+0
ld b, h
ld c, l
@@ -678,7 +677,6 @@ LavaBubbleAnim1:
jp WriteTile
LavaBubbleAnim2:
; Splash in the top-left corner of the fountain.
ld hl, sp+0
ld b, h
ld c, l

14
engine/tilesets/timeofday_pals.asm
View File

@@ -188,19 +188,19 @@ endr
ReplaceTimeOfDayPals:
ld hl, .BrightnessLevels
ld a, [wMapTimeOfDay]
cp $4 ; Dark cave, needs Flash
jr z, .DarkCave
cp PALETTE_DARK
jr z, .NeedsFlash
and $7
add l
ld l, a
ld a, $0
ld a, 0
adc h
ld h, a
ld a, [hl]
ld [wTimeOfDayPalset], a
ret
.DarkCave:
.NeedsFlash:
ld a, [wStatusFlags]
bit STATUSFLAGS_FLASH_F, a
jr nz, .UsedFlash
@@ -319,7 +319,7 @@ GetTimePalFade:
; get fade table
push bc
ld c, a
ld b, $0
ld b, 0
ld hl, .dmgfades
add hl, bc
add hl, bc
@@ -329,13 +329,13 @@ GetTimePalFade:
pop bc
; get place in fade table
ld b, $0
ld b, 0
add hl, bc
ret
.cgb
ld hl, .cgbfade
ld b, $0
ld b, 0
add hl, bc
ret