From 7134eec5cb5cb08c9bc7a48d6a2e9b6ce3e6dd2f Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Fri, 6 Sep 2013 16:54:04 -0400 Subject: [PATCH 1/2] Remove INCBIN "baserom.gbc" from a comment --- main.asm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main.asm b/main.asm index 72a572f2..9ba9d0fd 100644 --- a/main.asm +++ b/main.asm @@ -51916,11 +51916,6 @@ db 1,0 ; CHANNELER db 1,0 ; AGATHA db 1,3,0 ; LANCE - -; trainer data: from 5C53 to 652E - -; INCBIN "baserom.gbc",$3989e,$39914 - $3989e - ; trainer pic pointers and base money. dw YoungsterPic db 0,$15,0 From c29ed3b405d41e38f96b268b2e8ffba870f5e5aa Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 8 Sep 2013 10:18:05 -0400 Subject: [PATCH 2/2] Split blank_leader_names and circle_tile --- gfx/blank_leader_names.2bpp | Bin 368 -> 352 bytes gfx/circle_tile.2bpp | Bin 0 -> 16 bytes main.asm | 8 +++++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100755 gfx/circle_tile.2bpp diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp index 1eac2fae3161136a2ed57032fc193fc74050f24a..2bdf7c63a7eec4acfa5d13f05e81182ddfa054a6 100755 GIT binary patch literal 352 NcmZQz7zMNp0RRDD00961 literal 368 VcmZQz7zMNr0Sks2Fth+#1OO0_0p$Py diff --git a/gfx/circle_tile.2bpp b/gfx/circle_tile.2bpp new file mode 100755 index 0000000000000000000000000000000000000000..b06a180a84c70112c0fd4e2188b7bca2147490f7 GIT binary patch literal 16 ScmZQzU|_Idr~yL@AR7P=FahNN literal 0 HcmV?d00001 diff --git a/main.asm b/main.asm index 9ba9d0fd..499b99f1 100644 --- a/main.asm +++ b/main.asm @@ -44741,10 +44741,12 @@ UnnamedText_2fb93: ; 2fb93 (b:7b93) TrainerInfoTextBoxTileGraphics: ; 2fb98 (b:7b98) INCBIN "gfx/trainer_info.2bpp" -; mostly empty, last tile contains circle BlankLeaderNames: ; 2fc28 (b:7c28) INCBIN "gfx/blank_leader_names.2bpp" +CircleTile: ; 2fd88 (b:7d88) +INCBIN "gfx/circle_tile.2bpp" + BadgeNumbersTileGraphics: ; 2fd98 (b:7d98) INCBIN "gfx/badge_numbers.2bpp" @@ -85899,10 +85901,10 @@ DisplayDiploma: ; 566e2 (15:66e2) ld hl, $d730 set 6, [hl] call DisableLCD - ld hl, BlankLeaderNames + $160 ; $7d88 ; circle tile + ld hl, CircleTile ; $7d88 ld de, $9700 ld bc, $0010 - ld a, BANK(BlankLeaderNames) + ld a, BANK(CircleTile) call FarCopyData2 ld hl, W_SCREENTILESBUFFER ld bc, $1012