From 84cc9c2e3821c3309e7e4dc93f7317c39f6d3dc2 Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Mon, 17 May 2021 17:43:37 +0700
Subject: Identify some more SGB stuff, rework SGB layout constants

---
 data/predef_pointers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
index d71e4d7..8b0d143 100644
--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@@ -88,7 +88,7 @@ GiveItemPredef::
 	add_predef Function1457a
 	add_predef Function143e0
 	add_predef CheckSGB
-	add_predef Function928b
+	add_predef LoadSGBLayout
 	add_predef Function8786
 	add_predef DoBattleTransition
 	add_predef Function8c9c6
-- 
cgit v1.2.3


From 3384ac5d7a7c8118d6701576680ea1e71624983c Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Mon, 17 May 2021 17:52:23 +0700
Subject: split SGB packet data

---
 data/sgb/blk_packets.inc  | 56 ++++++++++++++++++++++++++++++++++++++
 data/sgb/ctrl_packets.inc | 60 +++++++++++++++++++++++++++++++++++++++++
 data/sgb/pal_packets.inc  | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 184 insertions(+)
 create mode 100644 data/sgb/blk_packets.inc
 create mode 100644 data/sgb/ctrl_packets.inc
 create mode 100644 data/sgb/pal_packets.inc

(limited to 'data')

diff --git a/data/sgb/blk_packets.inc b/data/sgb/blk_packets.inc
new file mode 100644
index 0000000..136f73d
--- /dev/null
+++ b/data/sgb/blk_packets.inc
@@ -0,0 +1,56 @@
+BlkPacket_986c:
+	db $21, $01, $03, $00, $00, $00, $13, $11
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_GSIntroJigglypuffPikachu:
+	db $21, $01, $07, $05, $00, $0a, $13, $0d
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_Battle:
+	db $22, $05, $07, $0a, $00, $0c, $13, $11
+	db $03, $05, $01, $00, $0a, $03, $03, $00
+
+Data989c:
+	db $0a, $08, $13, $0a, $03, $0a, $00, $04
+	db $08, $0b, $03, $0f, $0b, $00, $13, $07
+
+BlkPacket_StatsScreen:
+	db $21, $01, $07, $05, $00, $01, $07, $07
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_98bc:
+	db $21, $01, $07, $05, $0b, $01, $13, $02
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_Pokedex:
+	db $21, $01, $07, $05, $01, $01, $08, $08
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_SlotMachine:
+	db $22, $05, $03, $05, $00, $00, $13, $0b
+	db $03, $0a, $00, $04, $13, $09, $02, $0f
+
+Data98ec:
+	db $00, $06, $13, $07, $03, $00, $04, $04
+	db $0f, $09, $03, $00, $00, $0c, $13, $11
+
+BlkPacket_98fc:
+	db $23, $07, $07, $10, $00, $00, $02, $0c
+	db $02, $00, $0c, $00, $12, $01, $02, $00
+
+Data990c:
+	db $0c, $02, $12, $03, $02, $00, $0c, $04
+	db $12, $05, $02, $00, $0c, $06, $12, $07
+
+Data991c:
+	db $02, $00, $0c, $08, $12, $09, $02, $00
+	db $0c, $0a, $12, $0b, $00, $00, $00, $00
+
+BlkPacket_TrainerGear:
+	db $21, $01, $07, $10, $00, $00, $13, $02
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+BlkPacket_TitleScreen:
+	db $21, $01, $07, $10, $00, $00, $13, $05
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
diff --git a/data/sgb/ctrl_packets.inc b/data/sgb/ctrl_packets.inc
new file mode 100644
index 0000000..bcca0ed
--- /dev/null
+++ b/data/sgb/ctrl_packets.inc
@@ -0,0 +1,60 @@
+PalTrnPacket:
+	db $59, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+MltReq1Packet:
+	db $89, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+MltReq2Packet:
+	db $89, $01, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+ChrTrnPacket:
+	db $99, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PctTrnPacket:
+	db $a1, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+MaskEnFreezePacket:
+	db $b9, $01, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+MaskEnCancelPacket:
+	db $b9, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+DataSndPacket1:
+	db $79, $5d, $08, $00, $0b, $8c, $d0, $f4
+	db $60, $00, $00, $00, $00, $00, $00, $00
+
+DataSndPacket2:
+	db $79, $52, $08, $00, $0b, $a9, $e7, $9f
+	db $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0
+
+DataSndPacket3:
+	db $79, $47, $08, $00, $0b, $c4, $d0, $16
+	db $a5, $cb, $c9, $05, $d0, $10, $a2, $28
+
+DataSndPacket4:
+	db $79, $3c, $08, $00, $0b, $f0, $12, $a5
+	db $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9
+
+DataSndPacket5:
+	db $79, $31, $08, $00, $0b, $0c, $a5, $ca
+	db $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e
+
+DataSndPacket6:
+	db $79, $26, $08, $00, $0b, $39, $cd, $48
+	db $0c, $d0, $34, $a5, $c9, $c9, $80, $d0
+
+DataSndPacket7:
+	db $79, $1b, $08, $00, $0b, $ea, $ea, $ea
+	db $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0
+
+DataSndPacket8:
+	db $79, $10, $08, $00, $0b, $4c, $20, $08
+	db $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea
+
diff --git a/data/sgb/pal_packets.inc b/data/sgb/pal_packets.inc
new file mode 100644
index 0000000..8537072
--- /dev/null
+++ b/data/sgb/pal_packets.inc
@@ -0,0 +1,68 @@
+PalPacket_Poker:
+	db $51, $35, $00, $36, $00, $37, $00, $38
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_995c:
+	db $51, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_GSIntroShellderLapras:
+	db $51, $2a, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_MagikarpIntro:
+	db $51, $2b, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_GSIntroJigglypuffPikachu:
+	db $51, $2c, $00, $2d, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_GSIntroStartersTransition:
+	db $51, $2e, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_VenusaurIntro:
+	db $51, $2f, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_99bc:
+	db $51, $30, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_PikachuMinigame:
+	db $51, $2d, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_PartyMenu:
+	db $51, $22, $00, $23, $00, $24, $00, $25
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_BattleGrayscale:
+	db $51, $0e, $00, $0e, $00, $0e, $00, $0e
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+Data99fc:
+	db $51, $26, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_Pokedex:
+	db $51, $30, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_SlotMachine:
+	db $51, $31, $00, $32, $00, $33, $00, $34
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_TitleScreen:
+	db $51, $27, $00, $28, $00, $0f, $00, $13
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_9a3c:
+	db $51, $0f, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
+PalPacket_GFIntro:
+	db $51, $29, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00
+
-- 
cgit v1.2.3


From 0f72265c2fb4df1069654ee9e62707398e326649 Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Mon, 17 May 2021 18:05:49 +0700
Subject: Decode SGB system control packets

---
 data/sgb/ctrl_packets.inc | 142 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 105 insertions(+), 37 deletions(-)

(limited to 'data')

diff --git a/data/sgb/ctrl_packets.inc b/data/sgb/ctrl_packets.inc
index bcca0ed..b613e7d 100644
--- a/data/sgb/ctrl_packets.inc
+++ b/data/sgb/ctrl_packets.inc
@@ -1,60 +1,128 @@
-PalTrnPacket:
-	db $59, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_pal_trn: MACRO
+	db (SGB_PAL_TRN << 3) + 1
+	ds 15
+ENDM
 
-MltReq1Packet:
-	db $89, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_mlt_req: MACRO
+	db (SGB_MLT_REG << 3) + 1
+	db \1 - 1
+	ds 14
+ENDM
 
-MltReq2Packet:
-	db $89, $01, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_chr_trn: MACRO
+	db (SGB_CHR_TRN << 3) + 1
+	db \1 + (\2 << 1)
+	ds 14
+ENDM
 
-ChrTrnPacket:
-	db $99, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_pct_trn: MACRO
+	db (SGB_PCT_TRN << 3) + 1
+	ds 15
+ENDM
 
-PctTrnPacket:
-	db $a1, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_mask_en: MACRO
+	db (SGB_MASK_EN << 3) + 1
+	db \1
+	ds 14
+ENDM
 
-MaskEnFreezePacket:
-	db $b9, $01, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+sgb_data_snd: MACRO
+	db (SGB_DATA_SND << 3) + 1
+	dw \1 ; address
+	db \2 ; bank
+	db \3 ; length (1-11)
+ENDM
 
-MaskEnCancelPacket:
-	db $b9, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+PalTrnPacket: sgb_pal_trn
+MltReq1Packet: sgb_mlt_req 1
+MltReq2Packet: sgb_mlt_req 2
+ChrTrnPacket: sgb_chr_trn 0, 0
+PctTrnPacket: sgb_pct_trn
+
+MaskEnFreezePacket: sgb_mask_en 1
+MaskEnCancelPacket: sgb_mask_en 0
+
+; These are packets containing SNES code.
+; This set of packets is found in several Japanese SGB-compatible titles.
+; It appears to be part of NCL's SGB devkit.
 
 DataSndPacket1:
-	db $79, $5d, $08, $00, $0b, $8c, $d0, $f4
-	db $60, $00, $00, $00, $00, $00, $00, $00
+	sgb_data_snd $085d, $0, 11
+	db  $8c                 ; cpx #$8c (2)
+	db  $d0, $f4            ; bne -$0c
+	db  $60                 ; rts
+	ds  7
 
 DataSndPacket2:
-	db $79, $52, $08, $00, $0b, $a9, $e7, $9f
-	db $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0
+	sgb_data_snd $0852, $0, 11
+	db  $a9, $e7            ; lda #$e7
+	db  $9f, $01, $c0, $7e  ; sta $7ec001, x
+	db  $e8                 ; inx
+	db  $e8                 ; inx
+	db  $e8                 ; inx
+	db  $e8                 ; inx
+	db  $e0                 ; cpx #$8c (1)
 
 DataSndPacket3:
-	db $79, $47, $08, $00, $0b, $c4, $d0, $16
-	db $a5, $cb, $c9, $05, $d0, $10, $a2, $28
+	sgb_data_snd $0847, $0, 11
+	db  $c4                 ; cmp #$c4 (2)
+	db  $d0, $16            ; bne +$16
+	db  $a5                 ; lda dp
+	db  $cb                 ; wai
+	db  $c9, $05            ; cmp #$05
+	db  $d0, $10            ; bne +$10
+	db  $a2, $28            ; ldx #$28
 
 DataSndPacket4:
-	db $79, $3c, $08, $00, $0b, $f0, $12, $a5
-	db $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9
+	sgb_data_snd $083c, $0, 11
+	db  $f0, $12            ; beq +$12
+	db  $a5                 ; lda dp
+	db  $c9, $c9            ; cmp #$c9
+	db  $c8                 ; iny
+	db  $d0, $1c            ; bne +$1c
+	db  $a5                 ; lda dp
+	db  $ca                 ; dex
+	db  $c9                 ; cmp #$c4 (1)
 
 DataSndPacket5:
-	db $79, $31, $08, $00, $0b, $0c, $a5, $ca
-	db $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e
+	sgb_data_snd $0831, $0, 11
+	dbw $0c, $caa5          ; tsb $caa5
+	db  $c9, $7e            ; cmp #$7e
+	db  $d0, $06            ; bne +$06
+	db  $a5                 ; lda dp
+	db  $cb                 ; wai
+	db  $c9, $7e            ; cmp #$7e
 
 DataSndPacket6:
-	db $79, $26, $08, $00, $0b, $39, $cd, $48
-	db $0c, $d0, $34, $a5, $c9, $c9, $80, $d0
+	sgb_data_snd $0826, $0, 11
+	db  $39                 ; bne +$39 (2)
+	dbw $cd, $0c48          ; cmp $0c48
+	db  $d0, $34            ; bne +$34
+	db  $a5                 ; lda dp
+	db  $c9, $c9            ; cmp #$c9
+	db  $80, $d0            ; bra -$30
 
 DataSndPacket7:
-	db $79, $1b, $08, $00, $0b, $ea, $ea, $ea
-	db $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0
+	sgb_data_snd $081b, $0, 11
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	                        ; $0820:
+	db  $a9, $01            ; lda #01
+	dbw $cd, $0c4f          ; cmp $c4f
+	db  $d0                 ; bne +$39 (1)
 
 DataSndPacket8:
-	db $79, $10, $08, $00, $0b, $4c, $20, $08
-	db $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea
+	sgb_data_snd $0810, $0, 11
+	dbw $4c, $0820          ; jmp $0820
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $ea                 ; nop
+	db  $60                 ; rts
+	db  $ea                 ; nop
+	db  $ea                 ; nop
 
-- 
cgit v1.2.3


From ee0e7ea5a0b3d93d6bb228fe60df79f9dba966e4 Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Tue, 18 May 2021 15:00:46 +0700
Subject: Decode SGB blk_packets

---
 data/sgb/blk_packets.inc | 91 ++++++++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 37 deletions(-)

(limited to 'data')

diff --git a/data/sgb/blk_packets.inc b/data/sgb/blk_packets.inc
index 136f73d..1ca8e34 100644
--- a/data/sgb/blk_packets.inc
+++ b/data/sgb/blk_packets.inc
@@ -1,56 +1,73 @@
+attr_blk: MACRO
+	db (SGB_ATTR_BLK << 3) + ((\1 * 6) / 16 + 1)
+	db \1
+ENDM
+
+attr_blk_data: MACRO
+	db \1 ; which regions are affected
+	db \2 + (\3 << 2) + (\4 << 4) ; palette for each region
+	db \5, \6, \7, \8 ; x1, y1, x2, y2
+ENDM
+
 BlkPacket_986c:
-	db $21, $01, $03, $00, $00, $00, $13, $11
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %011, 0,0,0, 00,00, 19,17
+	ds 8
 
 BlkPacket_GSIntroJigglypuffPikachu:
-	db $21, $01, $07, $05, $00, $0a, $13, $0d
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 00,10, 19,13
+	ds 8
 
 BlkPacket_Battle:
-	db $22, $05, $07, $0a, $00, $0c, $13, $11
-	db $03, $05, $01, $00, $0a, $03, $03, $00
-
-Data989c:
-	db $0a, $08, $13, $0a, $03, $0a, $00, $04
-	db $08, $0b, $03, $0f, $0b, $00, $13, $07
+	attr_blk 5
+	attr_blk_data %111, 2,2,0, 00,12, 19,17
+	attr_blk_data %011, 1,1,0, 01,00, 10,03
+	attr_blk_data %011, 0,0,0, 10,08, 19,10
+	attr_blk_data %011, 2,2,0, 00,04, 08,11
+	attr_blk_data %011, 3,3,0, 11,00, 19,07
 
 BlkPacket_StatsScreen:
-	db $21, $01, $07, $05, $00, $01, $07, $07
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 00,01, 07,07
+	ds 8
 
-BlkPacket_98bc:
-	db $21, $01, $07, $05, $0b, $01, $13, $02
-	db $00, $00, $00, $00, $00, $00, $00, $00
+BlkPacket_MoveList:
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 11,01, 19,02
+	ds 8
 
 BlkPacket_Pokedex:
-	db $21, $01, $07, $05, $01, $01, $08, $08
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %111, 1,1,0, 01,01, 08,08
+	ds 8
 
 BlkPacket_SlotMachine:
-	db $22, $05, $03, $05, $00, $00, $13, $0b
-	db $03, $0a, $00, $04, $13, $09, $02, $0f
-
-Data98ec:
-	db $00, $06, $13, $07, $03, $00, $04, $04
-	db $0f, $09, $03, $00, $00, $0c, $13, $11
+	attr_blk 5
+	attr_blk_data %011, 1,1,0, 00,00, 19,11
+	attr_blk_data %011, 2,2,0, 00,04, 19,09
+	attr_blk_data %010, 3,3,0, 00,06, 19,07
+	attr_blk_data %011, 0,0,0, 04,04, 15,09
+	attr_blk_data %011, 0,0,0, 00,12, 19,17
 
 BlkPacket_98fc:
-	db $23, $07, $07, $10, $00, $00, $02, $0c
-	db $02, $00, $0c, $00, $12, $01, $02, $00
-
-Data990c:
-	db $0c, $02, $12, $03, $02, $00, $0c, $04
-	db $12, $05, $02, $00, $0c, $06, $12, $07
-
-Data991c:
-	db $02, $00, $0c, $08, $12, $09, $02, $00
-	db $0c, $0a, $12, $0b, $00, $00, $00, $00
+	attr_blk 7
+	attr_blk_data %111, 0,0,1, 00,00, 02,12
+	attr_blk_data %010, 0,0,0, 12,00, 18,01
+	attr_blk_data %010, 0,0,0, 12,02, 18,03
+	attr_blk_data %010, 0,0,0, 12,04, 18,05
+	attr_blk_data %010, 0,0,0, 12,06, 18,07
+	attr_blk_data %010, 0,0,0, 12,08, 18,09
+	attr_blk_data %010, 0,0,0, 12,10, 18,11
+	ds 4
 
 BlkPacket_TrainerGear:
-	db $21, $01, $07, $10, $00, $00, $13, $02
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %111, 0,0,1, 00,00, 19,02
+	ds 8
 
 BlkPacket_TitleScreen:
-	db $21, $01, $07, $10, $00, $00, $13, $05
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	attr_blk 1
+	attr_blk_data %111, 0,0,1, 00,00, 19,05
+	ds 8
 
-- 
cgit v1.2.3


From 8a43aebe6e65e3d472085fb80c150d988075113a Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Tue, 18 May 2021 15:35:33 +0700
Subject: Decode SGB pal_packets

---
 data/sgb/pal_packets.inc | 65 ++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

(limited to 'data')

diff --git a/data/sgb/pal_packets.inc b/data/sgb/pal_packets.inc
index 8537072..510cc04 100644
--- a/data/sgb/pal_packets.inc
+++ b/data/sgb/pal_packets.inc
@@ -1,68 +1,57 @@
+sgb_pal_set: MACRO
+	db (SGB_PAL_SET << 3) + 1
+	dw PAL_\1, PAL_\2, PAL_\3, PAL_\4
+	ds 7
+ENDM
+
 PalPacket_Poker:
-	db $51, $35, $00, $36, $00, $37, $00, $38
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set POKER_1, POKER_2, POKER_3, POKER_4
 
 PalPacket_995c:
-	db $51, $00, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set ROUTE, ROUTE, ROUTE, ROUTE
 
 PalPacket_GSIntroShellderLapras:
-	db $51, $2a, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set INTRO_WATER, ROUTE, ROUTE, ROUTE
 
 PalPacket_MagikarpIntro:
-	db $51, $2b, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set INTRO_LAPRAS, ROUTE, ROUTE, ROUTE
 
 PalPacket_GSIntroJigglypuffPikachu:
-	db $51, $2c, $00, $2d, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set INTRO_FOREST, INTRO_JIGGLYPUFF_PIKACHU, ROUTE, ROUTE
 
-PalPacket_GSIntroStartersTransition:
-	db $51, $2e, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+PalPacket_GSIntroBlastoise:
+	sgb_pal_set INTRO_BLASTOISE, ROUTE, ROUTE, ROUTE
 
-PalPacket_VenusaurIntro:
-	db $51, $2f, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+PalPacket_GSIntroVenusaur:
+	sgb_pal_set INTRO_VENUSAUR, ROUTE, ROUTE, ROUTE
 
-PalPacket_99bc:
-	db $51, $30, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+PalPacket_GSIntroCharizard:
+	sgb_pal_set INTRO_CHARIZARD, ROUTE, ROUTE, ROUTE
 
 PalPacket_PikachuMinigame:
-	db $51, $2d, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set INTRO_JIGGLYPUFF_PIKACHU, ROUTE, ROUTE, ROUTE
 
 PalPacket_PartyMenu:
-	db $51, $22, $00, $23, $00, $24, $00, $25
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set SHINY_GRAYMON, GREEN_BAR, YELLOW_BAR, RED_BAR
 
 PalPacket_BattleGrayscale:
-	db $51, $0e, $00, $0e, $00, $0e, $00, $0e
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set BLACK, BLACK, BLACK, BLACK
 
-Data99fc:
-	db $51, $26, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+PalPacket_TownMap:
+	sgb_pal_set TOWN_MAP, ROUTE, ROUTE, ROUTE
 
 PalPacket_Pokedex:
-	db $51, $30, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set INTRO_CHARIZARD, ROUTE, ROUTE, ROUTE
 
 PalPacket_SlotMachine:
-	db $51, $31, $00, $32, $00, $33, $00, $34
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set SLOTS_1, SLOTS_2, SLOTS_3, SLOTS_4
 
 PalPacket_TitleScreen:
-	db $51, $27, $00, $28, $00, $0f, $00, $13
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set LOGO_1, LOGO_2, MEWMON, PURPLEMON
 
 PalPacket_9a3c:
-	db $51, $0f, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set MEWMON, ROUTE, ROUTE, ROUTE
 
 PalPacket_GFIntro:
-	db $51, $29, $00, $00, $00, $00, $00, $00
-	db $00, $00, $00, $00, $00, $00, $00, $00
+	sgb_pal_set GAME_FREAK, ROUTE, ROUTE, ROUTE
 
-- 
cgit v1.2.3


From 87d04a1252e9664018b6624ed3eb660efee90092 Mon Sep 17 00:00:00 2001
From: Zumi Daxuya <daxuya.zumi+code@protonmail.com>
Date: Tue, 18 May 2021 15:37:05 +0700
Subject: Move super_palettes.inc to data/sgb/

---
 data/sgb/super_palettes.inc | 63 +++++++++++++++++++++++++++++++++++++++++++++
 data/super_palettes.inc     | 63 ---------------------------------------------
 2 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 data/sgb/super_palettes.inc
 delete mode 100644 data/super_palettes.inc

(limited to 'data')

diff --git a/data/sgb/super_palettes.inc b/data/sgb/super_palettes.inc
new file mode 100644
index 0000000..5dba6d8
--- /dev/null
+++ b/data/sgb/super_palettes.inc
@@ -0,0 +1,63 @@
+SuperPalettes::
+	RGB 28,28,28, 23,21,16, 15,20,20, 04,04,04 ; ROUTE
+	RGB 28,28,28, 25,24,29, 15,20,20, 04,04,04 ; TOWN_01
+	RGB 28,28,28, 11,31,03, 15,20,20, 04,04,04 ; TOWN_02
+	RGB 28,28,28, 18,18,18, 15,20,20, 04,04,04 ; TOWN_03
+	RGB 28,28,28, 16,21,30, 15,20,20, 04,04,04 ; TOWN_04
+	RGB 28,28,28, 25,19,31, 15,20,20, 04,04,04 ; TOWN_05
+	RGB 28,28,28, 31,20,00, 15,20,20, 04,04,04 ; TOWN_06
+	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_07
+	RGB 28,28,28, 31,17,21, 15,20,20, 04,04,04 ; TOWN_08
+	RGB 28,28,28, 26,10,06, 15,20,20, 04,04,04 ; TOWN_09
+	RGB 28,28,28, 18,14,31, 15,20,20, 04,04,04 ; TOWN_0A
+	RGB 28,28,28, 29,26,03, 15,20,20, 04,04,04 ; TOWN_0B
+	RGB 28,28,28, 21,14,09, 15,20,20, 04,04,04 ; TOWN_0C
+	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_0D
+	RGB 28,28,28, 07,07,07, 02,03,03, 04,04,04 ; BLACK
+	RGB 28,28,28, 30,22,17, 16,14,19, 04,04,04 ; MEWMON
+	RGB 28,28,28, 18,20,27, 11,15,23, 04,04,04 ; BLUEMON
+	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; REDMON
+	RGB 28,28,28, 21,25,29, 14,19,25, 04,04,04 ; CYANMON
+	RGB 28,28,28, 27,22,24, 21,15,23, 04,04,04 ; PURPLEMON
+	RGB 28,28,28, 28,20,15, 21,14,09, 04,04,04 ; BROWNMON
+	RGB 28,28,28, 20,26,16, 09,20,11, 04,04,04 ; GREENMON
+	RGB 28,28,28, 30,22,24, 28,15,21, 04,04,04 ; PINKMON
+	RGB 28,28,28, 31,28,14, 26,20,00, 04,04,04 ; YELLOWMON
+	RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GRAYMON
+	RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; SHINY_MEWMON
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; SHINY_BLUEMON
+	RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; SHINY_REDMON
+	RGB 28,28,28, 15,20,20, 05,16,16, 04,04,04 ; SHINY_CYANMON
+	RGB 28,28,28, 23,15,19, 14,04,12, 04,04,04 ; SHINY_PURPLEMON
+	RGB 28,28,28, 20,17,18, 18,13,11, 04,04,04 ; SHINY_BROWNMON
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; SHINY_GREENMON
+	RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; SHINY_PINKMON
+	RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; SHINY_YELLOWMON
+	RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; SHINY_GRAYMON
+	RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREEN_BAR
+	RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR
+	RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR
+	RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
+if DEF(GOLD)
+	RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
+else
+	RGB 28,28,28, 18,18,18, 21,00,04, 04,04,04 ; LOGO_1
+endc
+	RGB 28,28,28, 31,20,10, 21,00,04, 04,04,04 ; LOGO_2
+	RGB 28,28,28, 30,26,16, 16,12,09, 04,04,04 ; GAME_FREAK
+	RGB 28,28,28, 15,28,26, 12,22,26, 03,16,14 ; INTRO_WATER
+	RGB 28,28,28, 15,28,26, 23,24,24, 04,04,04 ; INTRO_LAPRAS
+	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; INTRO_FOREST
+	RGB 28,28,28, 31,28,14, 30,22,24, 04,04,04 ; INTRO_JIGGLYPUFF_PIKACHU
+	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; INTRO_BLASTOISE
+	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; INTRO_VENUSAUR
+	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; INTRO_CHARIZARD
+	RGB 28,28,28, 26,21,22, 26,10,06, 04,04,04 ; SLOTS_1
+	RGB 28,28,28, 30,27,04, 24,20,11, 04,04,04 ; SLOTS_2
+	RGB 28,28,28, 27,15,21, 24,20,11, 04,04,04 ; SLOTS_3
+	RGB 28,28,28, 16,19,29, 24,20,11, 04,04,04 ; SLOTS_4
+	RGB 28,28,28, 30,22,24, 18,18,18, 16,10,07 ; POKER_1
+	RGB 28,28,28, 21,25,29, 18,18,18, 16,10,07 ; POKER_2
+	RGB 28,28,28, 20,26,16, 18,18,18, 16,10,07 ; POKER_3
+	RGB 28,28,28, 31,28,14, 18,18,18, 16,10,07 ; POKER_4
+	RGB 28,28,28, 18,18,18, 26,10,06, 04,04,04 ; RADIO
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
deleted file mode 100644
index 5dba6d8..0000000
--- a/data/super_palettes.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-SuperPalettes::
-	RGB 28,28,28, 23,21,16, 15,20,20, 04,04,04 ; ROUTE
-	RGB 28,28,28, 25,24,29, 15,20,20, 04,04,04 ; TOWN_01
-	RGB 28,28,28, 11,31,03, 15,20,20, 04,04,04 ; TOWN_02
-	RGB 28,28,28, 18,18,18, 15,20,20, 04,04,04 ; TOWN_03
-	RGB 28,28,28, 16,21,30, 15,20,20, 04,04,04 ; TOWN_04
-	RGB 28,28,28, 25,19,31, 15,20,20, 04,04,04 ; TOWN_05
-	RGB 28,28,28, 31,20,00, 15,20,20, 04,04,04 ; TOWN_06
-	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_07
-	RGB 28,28,28, 31,17,21, 15,20,20, 04,04,04 ; TOWN_08
-	RGB 28,28,28, 26,10,06, 15,20,20, 04,04,04 ; TOWN_09
-	RGB 28,28,28, 18,14,31, 15,20,20, 04,04,04 ; TOWN_0A
-	RGB 28,28,28, 29,26,03, 15,20,20, 04,04,04 ; TOWN_0B
-	RGB 28,28,28, 21,14,09, 15,20,20, 04,04,04 ; TOWN_0C
-	RGB 28,28,28, 12,28,22, 15,20,20, 04,04,04 ; TOWN_0D
-	RGB 28,28,28, 07,07,07, 02,03,03, 04,04,04 ; BLACK
-	RGB 28,28,28, 30,22,17, 16,14,19, 04,04,04 ; MEWMON
-	RGB 28,28,28, 18,20,27, 11,15,23, 04,04,04 ; BLUEMON
-	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; REDMON
-	RGB 28,28,28, 21,25,29, 14,19,25, 04,04,04 ; CYANMON
-	RGB 28,28,28, 27,22,24, 21,15,23, 04,04,04 ; PURPLEMON
-	RGB 28,28,28, 28,20,15, 21,14,09, 04,04,04 ; BROWNMON
-	RGB 28,28,28, 20,26,16, 09,20,11, 04,04,04 ; GREENMON
-	RGB 28,28,28, 30,22,24, 28,15,21, 04,04,04 ; PINKMON
-	RGB 28,28,28, 31,28,14, 26,20,00, 04,04,04 ; YELLOWMON
-	RGB 28,28,28, 26,21,22, 15,15,18, 04,04,04 ; GRAYMON
-	RGB 28,28,28, 23,19,13, 14,12,17, 04,04,04 ; SHINY_MEWMON
-	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; SHINY_BLUEMON
-	RGB 28,28,28, 22,15,16, 17,02,05, 04,04,04 ; SHINY_REDMON
-	RGB 28,28,28, 15,20,20, 05,16,16, 04,04,04 ; SHINY_CYANMON
-	RGB 28,28,28, 23,15,19, 14,04,12, 04,04,04 ; SHINY_PURPLEMON
-	RGB 28,28,28, 20,17,18, 18,13,11, 04,04,04 ; SHINY_BROWNMON
-	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; SHINY_GREENMON
-	RGB 28,28,28, 21,25,29, 30,22,24, 04,04,04 ; SHINY_PINKMON
-	RGB 28,28,28, 26,23,16, 29,14,09, 04,04,04 ; SHINY_YELLOWMON
-	RGB 28,28,28, 18,18,18, 10,10,10, 04,04,04 ; SHINY_GRAYMON
-	RGB 28,28,28, 30,26,15, 09,20,11, 04,04,04 ; GREEN_BAR
-	RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR
-	RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR
-	RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
-if DEF(GOLD)
-	RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
-else
-	RGB 28,28,28, 18,18,18, 21,00,04, 04,04,04 ; LOGO_1
-endc
-	RGB 28,28,28, 31,20,10, 21,00,04, 04,04,04 ; LOGO_2
-	RGB 28,28,28, 30,26,16, 16,12,09, 04,04,04 ; GAME_FREAK
-	RGB 28,28,28, 15,28,26, 12,22,26, 03,16,14 ; INTRO_WATER
-	RGB 28,28,28, 15,28,26, 23,24,24, 04,04,04 ; INTRO_LAPRAS
-	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; INTRO_FOREST
-	RGB 28,28,28, 31,28,14, 30,22,24, 04,04,04 ; INTRO_JIGGLYPUFF_PIKACHU
-	RGB 28,28,28, 16,18,21, 10,12,18, 04,04,04 ; INTRO_BLASTOISE
-	RGB 28,28,28, 23,21,16, 12,12,10, 04,04,04 ; INTRO_VENUSAUR
-	RGB 28,28,28, 31,20,10, 26,10,06, 04,04,04 ; INTRO_CHARIZARD
-	RGB 28,28,28, 26,21,22, 26,10,06, 04,04,04 ; SLOTS_1
-	RGB 28,28,28, 30,27,04, 24,20,11, 04,04,04 ; SLOTS_2
-	RGB 28,28,28, 27,15,21, 24,20,11, 04,04,04 ; SLOTS_3
-	RGB 28,28,28, 16,19,29, 24,20,11, 04,04,04 ; SLOTS_4
-	RGB 28,28,28, 30,22,24, 18,18,18, 16,10,07 ; POKER_1
-	RGB 28,28,28, 21,25,29, 18,18,18, 16,10,07 ; POKER_2
-	RGB 28,28,28, 20,26,16, 18,18,18, 16,10,07 ; POKER_3
-	RGB 28,28,28, 31,28,14, 18,18,18, 16,10,07 ; POKER_4
-	RGB 28,28,28, 18,18,18, 26,10,06, 04,04,04 ; RADIO
-- 
cgit v1.2.3