diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 23:14:52 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-25 23:14:52 -0400 |
| commit | aa334dc5b9ac6ed4ecfd61429c0a1da7f8a8d262 (patch) | |
| tree | 7282ddf2583152a956291ac61134422044139e2e | |
| parent | a6560d0871948863c79b1e5aeba9a8cded9ccea7 (diff) | |
Use specific constants for overwritten text tiles
| -rw-r--r-- | engine/battle/battle_transition.asm | 8 | ||||
| -rw-r--r-- | engine/events/field_moves.asm | 6 | ||||
| -rw-r--r-- | engine/events/print_unown.asm | 11 | ||||
| -rw-r--r-- | engine/games/unown_puzzle.asm | 4 |
4 files changed, 17 insertions, 12 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 96368b9ab..8747f46a6 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -6,6 +6,8 @@ BATTLETRANSITION_NO_CAVE_STRONGER EQU $18 BATTLETRANSITION_FINISH EQU $20 BATTLETRANSITION_END EQU $80 +BATTLETRANSITION_SQUARE EQUS "\"8\"" ; $fe + DoBattleTransition: call .InitGFX ld a, [rBGP] @@ -97,7 +99,7 @@ LoadTrainerBattlePokeballTiles: ; Load the tiles used in the Pokeball Graphic that fills the screen ; at the start of every Trainer battle. ld de, TrainerBattlePokeballTiles - ld hl, vTiles1 tile $7e + ld hl, vTiles0 tile BATTLETRANSITION_SQUARE ld b, BANK(TrainerBattlePokeballTiles) ld c, 2 call Request2bpp @@ -108,7 +110,7 @@ LoadTrainerBattlePokeballTiles: ld [rVBK], a ld de, TrainerBattlePokeballTiles - ld hl, vTiles4 tile $7e + ld hl, vTiles3 tile BATTLETRANSITION_SQUARE ld b, BANK(TrainerBattlePokeballTiles) ld c, 2 call Request2bpp @@ -616,7 +618,7 @@ StartTrainerBattle_LoadPokeBallGraphics: jr z, .done sla a jr nc, .no_load - ld [hl], $fe + ld [hl], BATTLETRANSITION_SQUARE .no_load inc hl jr .loop4 diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index e87c2ae0d..f5ad049f2 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -20,7 +20,7 @@ BlindingFlash: ShakeHeadbuttTree: farcall ClearSpriteAnims ld de, CutGrassGFX - ld hl, vTiles1 + ld hl, vTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 call Request2bpp ld de, HeadbuttTreeGFX @@ -134,11 +134,11 @@ OWCutAnimation: .LoadCutGFX: callfar ClearSpriteAnims ; pointless to farcall ld de, CutGrassGFX - ld hl, vTiles1 + ld hl, vTiles1 tile $00 lb bc, BANK(CutGrassGFX), 4 call Request2bpp ld de, CutTreeGFX - ld hl, vTiles1 tile $4 + ld hl, vTiles1 tile $04 lb bc, BANK(CutTreeGFX), 4 call Request2bpp ret diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index ed7087e35..9e231f449 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,3 +1,6 @@ +UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef +UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5 + _UnownPrinter: ld a, [wUnownDex] and a @@ -15,12 +18,12 @@ _UnownPrinter: call ClearTileMap ld de, UnownDexATile - ld hl, vTiles1 tile $6f + ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A lb bc, BANK(UnownDexBTile), 1 call Request1bpp ld de, UnownDexBTile - ld hl, vTiles1 tile $75 + ld hl, vTiles0 tile UNOWNSTAMP_BOLD_B lb bc, BANK(UnownDexBTile), 1 call Request1bpp @@ -200,8 +203,8 @@ UnownDexDoWhatString: db "Do what?@" UnownDexMenuString: - db "♂ PRINT" - next "♀ CANCEL" + db UNOWNSTAMP_BOLD_A, " PRINT" + next UNOWNSTAMP_BOLD_B, " CANCEL" next "← PREVIOUS" next "→ NEXT" db "@" diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index 9424d6a55..fb88d93b6 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -1,5 +1,5 @@ -PUZZLE_BORDER EQUS "\"▼\"" ; $ee -PUZZLE_VOID EQUS "\"♂\"" ; $ef +PUZZLE_BORDER EQU $ee +PUZZLE_VOID EQU $ef puzcoord EQUS "* 6 +" |