aboutsummaryrefslogtreecommitdiffstats
path: root/main.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-11-07 21:28:20 -0600
committerGitHub <noreply@github.com>2020-11-07 21:28:20 -0600
commitedf375aff14e54bd54e7a25780fe8b714691ccc7 (patch)
tree015c63e79e4a245c28f72b18954f2a845d30271c /main.asm
parentIgnore tools/pcm (diff)
parentFix typo (diff)
downloadpokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.gz
pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.xz
pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.zip
Merge pull request #63 from dannye/debug
Debug Yellow
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm17
1 files changed, 15 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 795204dd..30ce5825 100755
--- a/main.asm
+++ b/main.asm
@@ -311,15 +311,27 @@ INCLUDE "data/battle_anims/subanimations.asm"
INCLUDE "data/battle_anims/frame_blocks.asm"
+SECTION "BG Map Attributes (Debug)", ROMX
+
+IF DEF(_DEBUG)
+ INCLUDE "engine/gfx/bg_map_attributes.asm"
+ENDC
+
+
SECTION "BG Map Attributes", ROMX
-INCLUDE "engine/gfx/bg_map_attributes.asm"
+INCLUDE "data/cgb/bg_map_attributes.asm"
+IF !DEF(_DEBUG)
+ INCLUDE "engine/gfx/bg_map_attributes.asm"
+ENDC
SECTION "bank30", ROMX
; This whole bank is garbage data.
-INCBIN "garbage/bank30.bin"
+IF !DEF(_DEBUG)
+ INCBIN "garbage/bank30.bin"
+ENDC
SECTION "bank3A", ROMX
@@ -414,3 +426,4 @@ INCLUDE "engine/pikachu/pikachu_status.asm"
INCLUDE "engine/pikachu/pikachu_emotions.asm"
INCLUDE "engine/pikachu/pikachu_movement.asm"
INCLUDE "engine/pikachu/pikachu_pic_animation.asm"
+INCLUDE "engine/debug/debug_menu.asm"