pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use specific constants for overwritten text tiles

Browse Source
This commit is contained in:
Rangi 2018-06-25 23:14:52 -04:00
parent a6560d0871
commit aa334dc5b9
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/battle/battle_transition.asm
View File

@ -6,6 +6,8 @@ BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
BATTLETRANSITION_FINISH EQU $20 BATTLETRANSITION_FINISH EQU $20
BATTLETRANSITION_END EQU $80 BATTLETRANSITION_END EQU $80
BATTLETRANSITION_SQUARE EQUS "\"8\"" ; $fe
DoBattleTransition: DoBattleTransition:
call .InitGFX call .InitGFX
ld a, [rBGP] ld a, [rBGP]
@ -97,7 +99,7 @@ LoadTrainerBattlePokeballTiles:
; Load the tiles used in the Pokeball Graphic that fills the screen ; Load the tiles used in the Pokeball Graphic that fills the screen
; at the start of every Trainer battle. ; at the start of every Trainer battle.
ld de, TrainerBattlePokeballTiles ld de, TrainerBattlePokeballTiles
ld hl, vTiles1 tile $7e ld hl, vTiles0 tile BATTLETRANSITION_SQUARE
ld b, BANK(TrainerBattlePokeballTiles) ld b, BANK(TrainerBattlePokeballTiles)
ld c, 2 ld c, 2
call Request2bpp call Request2bpp
@ -108,7 +110,7 @@ LoadTrainerBattlePokeballTiles:
ld [rVBK], a ld [rVBK], a
ld de, TrainerBattlePokeballTiles ld de, TrainerBattlePokeballTiles
ld hl, vTiles4 tile $7e ld hl, vTiles3 tile BATTLETRANSITION_SQUARE
ld b, BANK(TrainerBattlePokeballTiles) ld b, BANK(TrainerBattlePokeballTiles)
ld c, 2 ld c, 2
call Request2bpp call Request2bpp
@ -616,7 +618,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
jr z, .done jr z, .done
sla a sla a
jr nc, .no_load jr nc, .no_load
ld [hl], $fe ld [hl], BATTLETRANSITION_SQUARE
.no_load .no_load
inc hl inc hl
jr .loop4 jr .loop4

6
engine/events/field_moves.asm
View File

@ -20,7 +20,7 @@ BlindingFlash:
ShakeHeadbuttTree: ShakeHeadbuttTree:
farcall ClearSpriteAnims farcall ClearSpriteAnims
ld de, CutGrassGFX ld de, CutGrassGFX
ld hl, vTiles1 ld hl, vTiles1 tile $00
lb bc, BANK(CutGrassGFX), 4 lb bc, BANK(CutGrassGFX), 4
call Request2bpp call Request2bpp
ld de, HeadbuttTreeGFX ld de, HeadbuttTreeGFX
@ -134,11 +134,11 @@ OWCutAnimation:
.LoadCutGFX: .LoadCutGFX:
callfar ClearSpriteAnims ; pointless to farcall callfar ClearSpriteAnims ; pointless to farcall
ld de, CutGrassGFX ld de, CutGrassGFX
ld hl, vTiles1 ld hl, vTiles1 tile $00
lb bc, BANK(CutGrassGFX), 4 lb bc, BANK(CutGrassGFX), 4
call Request2bpp call Request2bpp
ld de, CutTreeGFX ld de, CutTreeGFX
ld hl, vTiles1 tile $4 ld hl, vTiles1 tile $04
lb bc, BANK(CutTreeGFX), 4 lb bc, BANK(CutTreeGFX), 4
call Request2bpp call Request2bpp
ret ret

11
engine/events/print_unown.asm
View File

@ -1,3 +1,6 @@
UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef
UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5
_UnownPrinter: _UnownPrinter:
ld a, [wUnownDex] ld a, [wUnownDex]
and a and a
@ -15,12 +18,12 @@ _UnownPrinter:
call ClearTileMap call ClearTileMap
ld de, UnownDexATile ld de, UnownDexATile
ld hl, vTiles1 tile $6f ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
lb bc, BANK(UnownDexBTile), 1 lb bc, BANK(UnownDexBTile), 1
call Request1bpp call Request1bpp
ld de, UnownDexBTile ld de, UnownDexBTile
ld hl, vTiles1 tile $75 ld hl, vTiles0 tile UNOWNSTAMP_BOLD_B
lb bc, BANK(UnownDexBTile), 1 lb bc, BANK(UnownDexBTile), 1
call Request1bpp call Request1bpp
@ -200,8 +203,8 @@ UnownDexDoWhatString:
db "Do what?@" db "Do what?@"
UnownDexMenuString: UnownDexMenuString:
db "♂ PRINT" db UNOWNSTAMP_BOLD_A, " PRINT"
next "♀ CANCEL" next UNOWNSTAMP_BOLD_B, " CANCEL"
next "← PREVIOUS" next "← PREVIOUS"
next "→ NEXT" next "→ NEXT"
db "@" db "@"

4
engine/games/unown_puzzle.asm
View File

@ -1,5 +1,5 @@
PUZZLE_BORDER EQUS "\"▼\"" ; $ee PUZZLE_BORDER EQU $ee
PUZZLE_VOID EQUS "\"♂\"" ; $ef PUZZLE_VOID EQU $ef
puzcoord EQUS "* 6 +" puzcoord EQUS "* 6 +"