summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-09-08 10:19:47 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-09-08 10:19:47 -0400
commit5fd2c9b7d4d94d0b2370fec1bc1308989f0abddc (patch)
tree59426f24a7c8d58bb7cb2d57f4a19d450f7b21e7
parent55d5a879ddd67eee587fea9e6d1000243f901e5a (diff)
parentc29ed3b405d41e38f96b268b2e8ffba870f5e5aa (diff)
Merge branch 'comments' of https://github.com/dannye/pokered
-rwxr-xr-xgfx/blank_leader_names.2bppbin368 -> 352 bytes
-rwxr-xr-xgfx/circle_tile.2bppbin0 -> 16 bytes
-rw-r--r--main.asm13
3 files changed, 5 insertions, 8 deletions
diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp
index 1eac2fae..2bdf7c63 100755
--- a/gfx/blank_leader_names.2bpp
+++ b/gfx/blank_leader_names.2bpp
Binary files differ
diff --git a/gfx/circle_tile.2bpp b/gfx/circle_tile.2bpp
new file mode 100755
index 00000000..b06a180a
--- /dev/null
+++ b/gfx/circle_tile.2bpp
Binary files differ
diff --git a/main.asm b/main.asm
index 3223ff4a..807d0ef9 100644
--- a/main.asm
+++ b/main.asm
@@ -45302,10 +45302,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"
@@ -52480,11 +52482,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
@@ -86482,10 +86479,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