From ce9c7e3286f26d6fb171d032d53d0a2ab1d5ec2f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 15 Apr 2017 14:13:23 -0700 Subject: Dump and label CatchBarTiles --- home.asm | 6 ++++-- main.asm | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/home.asm b/home.asm index f3a8635..024ebf9 100755 --- a/home.asm +++ b/home.asm @@ -5268,8 +5268,10 @@ Data_2894: RGB 27, 10, 10 RGB 20, 04, 04 -Data_2898: - dr $2898, $28a0 +CatchBarTiles: +; The tile ids for the blue CATCH! bar under the wild pokemon + db $80, $AE, $AF, $B0, $B1, $B2, $B3, $80 +CatchBarTilesEnd: CopyHLToDE: ; 0x28a0 ; Places [hl] into [de] diff --git a/main.asm b/main.asm index 31851f8..91a8aee 100755 --- a/main.asm +++ b/main.asm @@ -9978,9 +9978,9 @@ StartCatchEmMode: ; 0x1003f ld bc, $0020 call LoadOrCopyVRAMData ld a, $0 - ld hl, Data_2898 + ld hl, CatchBarTiles deCoord 6, 8, vBGMap - ld bc, $0008 + ld bc, (CatchBarTilesEnd - CatchBarTiles) call LoadOrCopyVRAMData .asm_1011d call SetPokemonSeenFlag @@ -11784,9 +11784,9 @@ Func_10d1d: ; 0x10d1d ld bc, $0020 call LoadOrCopyVRAMData ld a, $0 - ld hl, Data_2898 + ld hl, CatchBarTiles deCoord 6, 8, vBGMap - ld bc, $0008 + ld bc, (CatchBarTilesEnd - CatchBarTiles) call LoadOrCopyVRAMData .asm_10e09 ret -- cgit v1.2.3