From ad3fca33d3532f5dcffd22e5b88d3169675f43d0 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 1 Aug 2015 12:30:16 -0400 Subject: Attempt to make yellow buildable. Building Errors: Segmentation Error. --- engine/palettes.asm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'engine/palettes.asm') diff --git a/engine/palettes.asm b/engine/palettes.asm index c87959f7..5df64c7a 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -36,7 +36,7 @@ BuildBattlePalPacket: ; 71eda (1c:5eda) and a jr z, .asm_71ef9 ld hl, wPartyMon1 - ld a, [wPlayerMonNumber + ld a, [wPlayerMonNumber] ld bc, wPartyMon2 - wPartyMon1 call AddNTimes .asm_71ef9 @@ -1132,10 +1132,11 @@ Func_725be:: ; 725be (1c:65be) callba Func_bf450 ; 2f:7250 ret -INCLUDE "data/sgb_packets.asm" +INCBIN "baserom.gbc",$725e2,$734b9 - $725e2 +;INCLUDE "data/sgb_packets.asm" -INCLUDE "data/mon_palettes.asm" +;INCLUDE "data/mon_palettes.asm" -INCLUDE "data/super_palettes.asm" +;INCLUDE "data/super_palettes.asm" -INCLUDE "data/sgb_border.asm" \ No newline at end of file +;INCLUDE "data/sgb_border.asm" \ No newline at end of file -- cgit v1.3.1-sl0p