From e08e7cf7b22bc8d29011dc864a895293157ceecd Mon Sep 17 00:00:00 2001 From: Kat Harrison Date: Mon, 27 May 2013 23:07:34 -0400 Subject: Include overworld sprites Created /extras/overworldripper.py and used it to extract overworld sprites and convert them to png files. --- main.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index e72489fae..cc0ee46c2 100644 --- a/main.asm +++ b/main.asm @@ -16651,12 +16651,16 @@ INCBIN "baserom.gbc", $bd0d0, $be699-$bd0d0 SECTION "bank30",DATA,BANK[$30] -INCBIN "baserom.gbc", $c0000, $c3fc0 - $c0000 +INCLUDE "gfx/overworld/bank30.asm" + +;INCBIN "baserom.gbc", $c0000, $c3fc0 - $c0000 SECTION "bank31",DATA,BANK[$31] -INCBIN "baserom.gbc", $c4000, $c7f80 - $c4000 +INCLUDE "gfx/overworld/bank31.asm" + +;INCBIN "baserom.gbc", $c4000, $c7f80 - $c4000 SECTION "bank32",DATA,BANK[$32] -- cgit v1.2.3 From 3517a4f500041351619d98b4a095b9316218e643 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Thu, 30 May 2013 16:28:56 -0500 Subject: remove two commented incbin lines --- main.asm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index cc0ee46c2..dca8a39db 100644 --- a/main.asm +++ b/main.asm @@ -16653,16 +16653,10 @@ SECTION "bank30",DATA,BANK[$30] INCLUDE "gfx/overworld/bank30.asm" -;INCBIN "baserom.gbc", $c0000, $c3fc0 - $c0000 - - SECTION "bank31",DATA,BANK[$31] INCLUDE "gfx/overworld/bank31.asm" -;INCBIN "baserom.gbc", $c4000, $c7f80 - $c4000 - - SECTION "bank32",DATA,BANK[$32] INCBIN "baserom.gbc", $c8000, $cbe2b - $c8000 -- cgit v1.2.3 From 723645b47011e2f7522bbcbb8304ffdc3bf774c1 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Thu, 30 May 2013 16:29:53 -0500 Subject: rename bank3{0,1}.asm to sprites_{1,2}.asm --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index dca8a39db..3324941fa 100644 --- a/main.asm +++ b/main.asm @@ -16651,11 +16651,11 @@ INCBIN "baserom.gbc", $bd0d0, $be699-$bd0d0 SECTION "bank30",DATA,BANK[$30] -INCLUDE "gfx/overworld/bank30.asm" +INCLUDE "gfx/overworld/sprites_1.asm" SECTION "bank31",DATA,BANK[$31] -INCLUDE "gfx/overworld/bank31.asm" +INCLUDE "gfx/overworld/sprites_2.asm" SECTION "bank32",DATA,BANK[$32] -- cgit v1.2.3