diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-03-10 18:36:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 18:36:19 -0600 |
| commit | 42cfe3d36192aca4d0c4ca222be0088c03236e0d (patch) | |
| tree | dd050c795930a34af6ea020c00f52dc7116ee49a /engine | |
| parent | 37ded1d150197b3784bc351eeeb0a8d9713c2e35 (diff) | |
| parent | 4768fed52d7379704ecd958f171ec0dc2d36efc0 (diff) | |
Merge pull request #177 from yenatch/rgbgfx
Use rgbgfx and c tools instead of the submodule.
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/intro.asm | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index fb196486..7e08631c 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" TheEndGfx: - INCBIN "gfx/theend.interleave.2bpp" + INCBIN "gfx/theend.2bpp" TheEndGfxEnd: diff --git a/engine/intro.asm b/engine/intro.asm index ed532681..422bcf7a 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -443,14 +443,14 @@ FightIntroBackMonEnd: FightIntroFrontMon: IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.6x6.2bpp" - INCBIN "gfx/red/intro_nido_2.6x6.2bpp" - INCBIN "gfx/red/intro_nido_3.6x6.2bpp" + INCBIN "gfx/red/intro_nido_1.2bpp" + INCBIN "gfx/red/intro_nido_2.2bpp" + INCBIN "gfx/red/intro_nido_3.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_2.6x6.2bpp" - INCBIN "gfx/blue/intro_purin_3.6x6.2bpp" + INCBIN "gfx/blue/intro_purin_1.2bpp" + INCBIN "gfx/blue/intro_purin_2.2bpp" + INCBIN "gfx/blue/intro_purin_3.2bpp" ENDC FightIntroFrontMonEnd: |