thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 11:04:30 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update related tile animation constants

Browse source
This commit is contained in:
SatoMew 2020-11-29 21:28:38 +00:00
parent a7dca30971
commit 083cb38e33
7 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
constants/map_data_constants.asm
View file

@ -9,8 +9,8 @@ MAP_BORDER EQU 3
shift_const SOUTH ; 4 shift_const SOUTH ; 4
shift_const NORTH ; 8 shift_const NORTH ; 8
; tileset environments ; flower and water tile animations
const_def const_def
const INDOOR ; 0 const STATIC_FLOWERS_WATER ; 0
const CAVE ; 1 const STATIC_FLOWERS_ANIMATED_WATER ; 1
const OUTDOOR ; 2 const ANIMATED_FLOWERS_WATER ; 2

48
data/tilesets/tileset_headers.asm
View file

@ -8,27 +8,27 @@ ENDM
Tilesets: Tilesets:
; block, gfx, coll, 3 counter tiles, grass tile, permission ; block, gfx, coll, 3 counter tiles, grass tile, permission
tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, ANIMATED_FLOWERS_WATER
tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, STATIC_FLOWERS_WATER
tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, STATIC_FLOWERS_ANIMATED_WATER
tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, ANIMATED_FLOWERS_WATER
tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, STATIC_FLOWERS_WATER
tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, ANIMATED_FLOWERS_WATER
tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, STATIC_FLOWERS_WATER
tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, STATIC_FLOWERS_WATER
tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, STATIC_FLOWERS_WATER
tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_ANIMATED_WATER
tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_ANIMATED_WATER
tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_ANIMATED_WATER
tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, STATIC_FLOWERS_WATER
tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, STATIC_FLOWERS_WATER
tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, STATIC_FLOWERS_WATER
tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, STATIC_FLOWERS_ANIMATED_WATER
tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, STATIC_FLOWERS_ANIMATED_WATER

2
engine/battle/core.asm
View file

@ -6865,7 +6865,7 @@ _InitBattleCommon:
ld [wLetterPrintingDelayFlags], a ld [wLetterPrintingDelayFlags], a
pop af pop af
ld [wMapPalOffset], a ld [wMapPalOffset], a
ld a, [wSavedTilesetType] ld a, [wSavedTileAnimations]
ldh [hTileAnimations], a ldh [hTileAnimations], a
scf scf
ret ret

2
engine/battle/init_battle_variables.asm
View file

@ -1,6 +1,6 @@
InitBattleVariables: InitBattleVariables:
ldh a, [hTileAnimations] ldh a, [hTileAnimations]
ld [wSavedTilesetType], a ld [wSavedTileAnimations], a
xor a xor a
ld [wActionResultOrTookBattleTurn], a ld [wActionResultOrTookBattleTurn], a
ld [wBattleResult], a ld [wBattleResult], a

4
engine/menus/save.asm
View file

@ -69,7 +69,7 @@ LoadSAV0:
ld de, wSpriteDataStart ld de, wSpriteDataStart
ld bc, wSpriteDataEnd - wSpriteDataStart ld bc, wSpriteDataEnd - wSpriteDataStart
call CopyData call CopyData
ld a, [sTilesetType] ld a, [sTileAnimations]
ldh [hTileAnimations], a ldh [hTileAnimations], a
ld hl, sCurBoxData ld hl, sCurBoxData
ld de, wBoxDataStart ld de, wBoxDataStart
@ -218,7 +218,7 @@ SaveSAVtoSRAM0:
ld bc, wBoxDataEnd - wBoxDataStart ld bc, wBoxDataEnd - wBoxDataStart
call CopyData call CopyData
ldh a, [hTileAnimations] ldh a, [hTileAnimations]
ld [sTilesetType], a ld [sTileAnimations], a
ld hl, sPlayerName ld hl, sPlayerName
ld bc, sMainDataCheckSum - sPlayerName ld bc, sMainDataCheckSum - sPlayerName
call SAVCheckSum call SAVCheckSum

2
sram.asm
View file

@ -17,7 +17,7 @@ sMainData:: ds wMainDataEnd - wMainDataStart
sSpriteData:: ds wSpriteDataEnd - wSpriteDataStart sSpriteData:: ds wSpriteDataEnd - wSpriteDataStart
sPartyData:: ds wPartyDataEnd - wPartyDataStart sPartyData:: ds wPartyDataEnd - wPartyDataStart
sCurBoxData:: ds wBoxDataEnd - wBoxDataStart sCurBoxData:: ds wBoxDataEnd - wBoxDataStart
sTilesetType:: ds 1 sTileAnimations:: ds 1
sMainDataCheckSum:: ds 1 sMainDataCheckSum:: ds 1

2
wram.asm
View file

@ -2000,7 +2000,7 @@ wMonHLearnset::
ds 1 ds 1
wMonHeaderEnd:: wMonHeaderEnd::
wSavedTilesetType:: wSavedTileAnimations::
; saved at the start of a battle and then written back at the end of the battle ; saved at the start of a battle and then written back at the end of the battle
ds 1 ds 1