From 1c308e418be00dcce7097b75314c5a6397efb320 Mon Sep 17 00:00:00 2001 From: Sanky Date: Sun, 26 Feb 2012 16:14:40 +0100 Subject: [PATCH] Some graphics extracted. hg-commit-id: a831c95df9bc --- gfx/font.1bpp | Bin 0 -> 1024 bytes gfx/hp_bar_and_status.2bpp | Bin 0 -> 480 bytes gfx/p_tile.1bpp | Bin 0 -> 8 bytes gfx/pokemon_logo.2bpp | Bin 0 -> 1792 bytes gfx/text_box.2bpp | Bin 0 -> 512 bytes main.asm | 43 +++++++++++++++++++++++++------------ 6 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 gfx/font.1bpp create mode 100644 gfx/hp_bar_and_status.2bpp create mode 100644 gfx/p_tile.1bpp create mode 100644 gfx/pokemon_logo.2bpp create mode 100644 gfx/text_box.2bpp diff --git a/gfx/font.1bpp b/gfx/font.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..663a42077526bd76f020f258b06a84de32b1b549 GIT binary patch literal 1024 zcmd^7v5MP35PcEGCk_+DaRd=U5GIAvxfEeBi&%_{5L~3VQbo!XE>$c-EFuV3L4lM< zxGK2H7X)z};);+urMoow02e~!jeO)M^2F}&-pr4)_bLS6A89Y7|fYe;PvK%!x5x%J_h!)A}Kv2fW#2LZP(sSVth8oslz( z5q}!~KiGk0&%C%}16C(pO>&@^gi(P-d#d*~bz}Ya>ssnUtFNQykCtfH-$~gYeKVh5 z`n>;tBg-N!9XNbB>~^#B^Iu=xOf4F4qe^TQ*`YSTm%Qv z<|P%Ieqi!{zC_;x03nj(`P^(|RLnDNdi|yXh2a9i@HgIucjycsFc>~!G8oEn}S1<9TG3W!rJQ-uC_Lb+6cNsSae4+bzo|M^O+QkMyn6iJVB& ziy}?6m*wl#_ibC(+G(w-H3O4G`FXzes`2b4Td_e#J literal 0 HcmV?d00001 diff --git a/gfx/p_tile.1bpp b/gfx/p_tile.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..e863449f50bc6f0c6a68c941c248b9a916fc04ee GIT binary patch literal 8 QcmZShbL`l$KL-u~02jIi%K!iX literal 0 HcmV?d00001 diff --git a/gfx/pokemon_logo.2bpp b/gfx/pokemon_logo.2bpp new file mode 100644 index 0000000000000000000000000000000000000000..c23a2ec3536404d0ec6c0c0b4c57acd4cf975bd1 GIT binary patch literal 1792 zcmd5+L2nyH6rT0CUZWasxS*9-yyXX=_!di8S(jcoR7e%7gcPCp#xX`5h?L+N%TjWn z0)7Az`2~mrC>Mw~vI;%n!UaT>?p8)PQrhf2+U_$JNw>#-#2gG z3?cvh$WdyVR^@rmX4T9MC!BLX^hNXEbeA(Onweg~Fx@>C%buUjYXGp>1p-q$ocQ69 z_-6gYnZ6(fF(yOLFVIDI6Cwc|I3Y**-+oYo<6!kM6Ki6UZ%`xG@%!;`m$ByIaCh(- zNL1Jd##`ZzPx$Md%iVtW!4Tfp`P85o-Pi`2Qax8mqLMA8QPA_h8w=q^!eFyMANw?X z^vC?15KhYOYtBXI)r#5PVw7F>^ctUFQDo1d8@XV`mNL%D$~-rLLKphMFc@B-#3Uw1 zd}Z}m5W)nDLL(APtcJ|@{0WPZQe_@4AJpR-v?3i1SqP+G?`<*}%f0=yyRrR~r`$W< zZu?yooyF>%y_ABXj3u!Bhm9mHuKl8%36C({9FTjy!7kR;c{95 z2b{<`c76#{HL4_qhhOFLN>Dnp#%9Lxc{5&5+tAci32I{pFrtjO zJX>44gPRQZD_CXoekG`nlY_*SS#)Ga$Qn6m1=$K;zX@02>gv7VUV5UnNT#9V4p$Nsen6WU1Ab*CkoVe_y3KuC^Jk9x1T# zW(onSU%YqcE*>Ss;SdXo-hr!*>Od#$rrkyu`o7Qc$Mq%i^zw=BX5CXceV{SQ!bRbU z7azM&ff9=CupK6sH^G>IK+)8I?)mn3>vvUGg(NSD)LEyeD=XKp mU%Qrl@z4L98SOWwx3bPeum9_jpWKjh7Uiuu_jB*3kADJupiK4v literal 0 HcmV?d00001 diff --git a/gfx/text_box.2bpp b/gfx/text_box.2bpp new file mode 100644 index 0000000000000000000000000000000000000000..684cec1ac6c826ff2012f84287b85077cbf725d0 GIT binary patch literal 512 zcmZXQA&=**iVuK5>_bddEtBY} z$_0U_SjzQJuSf3gm-IEi_g-JS5t3zPsT|fSMI6JR6c!>}2(4>})k literal 0 HcmV?d00001 diff --git a/main.asm b/main.asm index 19d95807..89951106 100644 --- a/main.asm +++ b/main.asm @@ -6887,15 +6887,15 @@ LoadFontTilePatterns: ; 3680 bit 7,a ; is the LCD enabled? jr nz,.lcdEnabled\@ .lcdDisabled\@ - ld hl,$5a80 + ld hl,FontGraphics ld de,$8800 - ld bc,$0400 + ld bc,(BANK(FontGraphics) << 8 | $00) ld a,$04 jp FarCopyDataDouble ; if LCD is off, transfer all at once .lcdEnabled\@ - ld de,$5a80 + ld de,FontGraphics ld hl,$8800 - ld bc,$0480 + ld bc,(BANK(FontGraphics) << 8 | $80) jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank ; copies the text box tile patterns into VRAM @@ -6904,15 +6904,15 @@ LoadTextBoxTilePatterns: ; 36A0 bit 7,a ; is the LCD enabled? jr nz,.lcdEnabled\@ .lcdDisabled\@ - ld hl,$6288 + ld hl,TextBoxGraphics ld de,$9600 ld bc,$0200 - ld a,$04 + ld a,BANK(TextBoxGraphics) jp FarCopyData2 ; if LCD is off, transfer all at once .lcdEnabled\@ - ld de,$6288 + ld de,TextBoxGraphics ld hl,$9600 - ld bc,$0420 + ld bc,(BANK(TextBoxGraphics) << 8 | $20) jp CopyVideoData ; if LCD is on, transfer during V-blank ; copies HP bar and status display tile patterns into VRAM @@ -6921,15 +6921,15 @@ LoadHpBarAndStatusTilePatterns: ; 36C0 bit 7,a ; is the LCD enabled? jr nz,.lcdEnabled\@ .lcdDisabled\@ - ld hl,$5ea0 + ld hl,HpBarAndStatusGraphics ld de,$9620 ld bc,$01e0 - ld a,$04 + ld a,BANK(HpBarAndStatusGraphics) jp FarCopyData2 ; if LCD is off, transfer all at once .lcdEnabled\@ - ld de,$5ea0 + ld de,HpBarAndStatusGraphics ld hl,$9620 - ld bc,$041e + ld bc,(BANK(HpBarAndStatusGraphics) << 8 | $1e) jp CopyVideoData ; if LCD is on, transfer during V-blank INCBIN "baserom.gbc",$36E0,$3739 - $36E0 @@ -18468,8 +18468,23 @@ OldAmberSprite: ; 0x11300 INCBIN "gfx/sprites/old_amber.2bpp" ; was $11300 LyingOldManSprite: ; 0x11340 INCBIN "gfx/sprites/lying_old_man.2bpp" ; was $11340 + +PokemonLogoGraphics: ; 0x11380 + INCBIN "gfx/pokemon_logo.2bpp" +FontGraphics: ; 0x11a80 + INCBIN "gfx/font.1bpp" -INCBIN "baserom.gbc",$11380,$12953 - $11380 +INCBIN "baserom.gbc",$11e80,$11ea0 - $11e80 + +HpBarAndStatusGraphics: ; 0x11ea0 + INCBIN "gfx/hp_bar_and_status.2bpp" + +INCBIN "baserom.gbc",$12080,$12288 - $12080 ; FIXME + +TextBoxGraphics: ; 0x12288 + INCBIN "gfx/text_box.2bpp" + +INCBIN "baserom.gbc",$12488,$12953 - $12488 ; Predef 0x37 StatusScreen: ; 0x12953 @@ -18655,7 +18670,7 @@ DrawLineBox ; 0x12ac7 ret PTile: ; This is a single 1bpp "P" tile -INCBIN "baserom.gbc",$12adc,$12ae4 - $12adc + INCBIN "gfx/p_tile.1bpp" PrintStatsBox: ; 12ae4 ld a, d