From 046d85f37a04b9e6206561b0892b5b6585416d1e Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 20 Dec 2013 00:48:27 -0500 Subject: [PATCH] finish off object gfx pointers and dont use BANK() for null pointers fixes 2f5b9b96 definitely did this in the original commit... --- battle/anim_objects.asm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 8eff5e570..c05200cbc 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -5040,6 +5040,7 @@ INCBIN "baserom.gbc", $ce85e, $cfcf6 - $ce85e AnimObjGFX: ; cfcf6 object_gfx: MACRO +; label, # tiles db \2 db BANK(\1) dw \1 @@ -5082,7 +5083,14 @@ ENDM object_gfx AnimObj34GFX, 48 object_gfx AnimObj35GFX, 18 object_gfx AnimObj36GFX, 38 - object_gfx 0000, 1 - object_gfx 0000, 1 + object_gfx AnimObj37GFX, 35 + object_gfx AnimObj38GFX, 18 + object_gfx AnimObj39GFX, 24 + + ; null pointers + db 1 + dbw 0, 0 + db 1 + dbw 0, 0 ; cfd9e