From e16beff04b52faf7b50972b0ce8da9f1d1b6a35c Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 18 Jun 2014 10:51:00 -0400 Subject: Add player/rival graphics --- gfx/trainers/player.2bpp | Bin 0 -> 576 bytes gfx/trainers/ronald.2bpp | Bin 0 -> 576 bytes main.asm | 16 ++++++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100755 gfx/trainers/player.2bpp create mode 100755 gfx/trainers/ronald.2bpp diff --git a/gfx/trainers/player.2bpp b/gfx/trainers/player.2bpp new file mode 100755 index 0000000..128ae20 Binary files /dev/null and b/gfx/trainers/player.2bpp differ diff --git a/gfx/trainers/ronald.2bpp b/gfx/trainers/ronald.2bpp new file mode 100755 index 0000000..1d40e08 Binary files /dev/null and b/gfx/trainers/ronald.2bpp differ diff --git a/main.asm b/main.asm index 70930b5..b4a4a0e 100755 --- a/main.asm +++ b/main.asm @@ -113,7 +113,13 @@ SECTION "bank20",ROMX,BANK[$20] INCLUDE "engine/bank20.asm" SECTION "bank21",ROMX,BANK[$21] -INCBIN "baserom.gbc",$84000,$4000 +INCBIN "baserom.gbc",$84000,$87d7e - $84000 + +PlayerGfx: ; 87d7e (21:7d7e) + dw $24 + INCBIN "gfx/trainers/player.2bpp" + +INCBIN "baserom.gbc",$87fc0,$88000 - $87fc0 SECTION "bank22",ROMX,BANK[$22] INCBIN "baserom.gbc",$88000,$4000 @@ -122,7 +128,13 @@ SECTION "bank23",ROMX,BANK[$23] INCBIN "baserom.gbc",$8C000,$4000 SECTION "bank24",ROMX,BANK[$24] -INCBIN "baserom.gbc",$90000,$4000 +INCBIN "baserom.gbc",$90000,$93aa2 - $90000 + +RonaldGfx: ; 93aa2 (24:7aa2) + dw $24 + INCBIN "gfx/trainers/ronald.2bpp" + +INCBIN "baserom.gbc",$93ce4,$94000 - $93ce4 SECTION "bank25",ROMX,BANK[$25] INCBIN "baserom.gbc",$94000,$4000 -- cgit v1.2.3