From ce31567c4decea39233d535fae27245b2954ed8a Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 1 Aug 2013 15:29:12 -0400 Subject: [PATCH] frames --- gfx/frames/1.1bpp | Bin 0 -> 48 bytes gfx/frames/2.1bpp | Bin 0 -> 48 bytes gfx/frames/3.1bpp | Bin 0 -> 48 bytes gfx/frames/4.1bpp | Bin 0 -> 48 bytes gfx/frames/5.1bpp | Bin 0 -> 48 bytes gfx/frames/6.1bpp | Bin 0 -> 48 bytes gfx/frames/7.1bpp | Bin 0 -> 48 bytes gfx/frames/8.1bpp | Bin 0 -> 48 bytes gfx/frames/9.1bpp | Bin 0 -> 48 bytes main.asm | 18 +++++++++++++++--- 10 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 gfx/frames/1.1bpp create mode 100644 gfx/frames/2.1bpp create mode 100644 gfx/frames/3.1bpp create mode 100644 gfx/frames/4.1bpp create mode 100644 gfx/frames/5.1bpp create mode 100644 gfx/frames/6.1bpp create mode 100644 gfx/frames/7.1bpp create mode 100644 gfx/frames/8.1bpp create mode 100644 gfx/frames/9.1bpp diff --git a/gfx/frames/1.1bpp b/gfx/frames/1.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..63005ab72177bb6eee0e9409a3f649998c80ce14 GIT binary patch literal 48 tcmZQzVBi-}*VkcSVEE7Q|38pocpz}%MTQ0fs2j-hGXS|KBtAS~000SP3=9AO literal 0 HcmV?d00001 diff --git a/gfx/frames/2.1bpp b/gfx/frames/2.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..4dfe9a9491b55f108ffcc16512a37c2b71f90a9f GIT binary patch literal 48 qcmZQzut|4vO1EKPU^r}Ja~Me3Jack-W}~8_A^`+I3L+1r!QucJb_}Bc literal 0 HcmV?d00001 diff --git a/gfx/frames/3.1bpp b/gfx/frames/3.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..9c488c555cb02b8576d3da701093e001f97400fb GIT binary patch literal 48 scmZQzV31eP*VkcSVEE7Q|38po_`&n$jSdpfSCHpt0P^4P{Q1EE02Kucpa1{> literal 0 HcmV?d00001 diff --git a/gfx/frames/4.1bpp b/gfx/frames/4.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..01449a04ca0adca8be14e3e63646f107dd16e04f GIT binary patch literal 48 xcmZQzV31eP*VkcSVEAvG_8&+w{NQ=>Mn}cO28?xdbo3SMF@(dap78O5!d|&_o{Q3;9 literal 0 HcmV?d00001 diff --git a/gfx/frames/8.1bpp b/gfx/frames/8.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..509bf898ad5affb0f242f6c00eeb3c39f1fcffe7 GIT binary patch literal 48 pcmZQzU|`^vmyrNc4FCUwNCt)vKP)7WfQ&pp0|St6@#6yn0|2yd2vYz6 literal 0 HcmV?d00001 diff --git a/gfx/frames/9.1bpp b/gfx/frames/9.1bpp new file mode 100644 index 0000000000000000000000000000000000000000..9be4865b35f60d9e09bf24d0643507fefb7aca44 GIT binary patch literal 48 scmZQzVBnXxx3^(nVEF%^;XjaK`0(S;9~&fKZ!gc!0ObGq^Wy^p08K~_)&Kwi literal 0 HcmV?d00001 diff --git a/main.asm b/main.asm index 2d431639c..dab96cf3f 100644 --- a/main.asm +++ b/main.asm @@ -63540,7 +63540,19 @@ INCBIN "gfx/misc/font.1bpp", $0, $400 FontBattleExtra: INCBIN "gfx/misc/font_battle_extra.2bpp", $0, $200 -INCBIN "baserom.gbc", $f8800, $f8ba0 - $f8800 +Frames: ; f8800 +INCBIN "gfx/frames/1.1bpp" +INCBIN "gfx/frames/2.1bpp" +INCBIN "gfx/frames/3.1bpp" +INCBIN "gfx/frames/4.1bpp" +INCBIN "gfx/frames/5.1bpp" +INCBIN "gfx/frames/6.1bpp" +INCBIN "gfx/frames/7.1bpp" +INCBIN "gfx/frames/8.1bpp" +INCBIN "gfx/frames/9.1bpp" +; f89b0 + +INCBIN "baserom.gbc", $f89b0, $f8ba0 - $f89b0 TownMapGFX: ; f8ba0 INCBIN "gfx/misc/town_map.lz" @@ -63607,9 +63619,9 @@ Functionfb48a: ; fb48a .asm_fb4cc ld a, [TextBoxFrame] - and $7 + and 7 ld bc, $0030 - ld hl, $4800 + ld hl, Frames call AddNTimes ld d, h ld e, l