summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdata/mon_gfx/mon_billboard_palette_maps_5.asm1
-rwxr-xr-xdata/mon_gfx/mon_billboard_palettes_6.asm102
-rwxr-xr-xdata/stage_palettes.asm166
-rwxr-xr-xhome.asm2
-rwxr-xr-xhome/serial.asm84
-rwxr-xr-xmain.asm2
6 files changed, 324 insertions, 33 deletions
diff --git a/data/mon_gfx/mon_billboard_palette_maps_5.asm b/data/mon_gfx/mon_billboard_palette_maps_5.asm
index def4e62..7cea56e 100755
--- a/data/mon_gfx/mon_billboard_palette_maps_5.asm
+++ b/data/mon_gfx/mon_billboard_palette_maps_5.asm
@@ -93,4 +93,3 @@ NidoranMBillboardBGPaletteMap: ; 0xb7d68
db $7, $7, $7, $7, $7, $7
db $7, $7, $7, $7, $7, $7
db $7, $7, $7, $7, $7, $7
- dr $b7d80, $b8000 ; 0xb7d80
diff --git a/data/mon_gfx/mon_billboard_palettes_6.asm b/data/mon_gfx/mon_billboard_palettes_6.asm
index 1366b36..bbe16b3 100755
--- a/data/mon_gfx/mon_billboard_palettes_6.asm
+++ b/data/mon_gfx/mon_billboard_palettes_6.asm
@@ -74,4 +74,104 @@ MewBillboardBGPalette2: ; 0xdc768
RGB 31, 18, 24
RGB 0, 10, 31
RGB 0, 0, 0
- dr $dc770, $dc880
+
+UnusedPalettes_dc770: ; 0xdc770
+ RGB 31, 31, 31
+ RGB 31, 23, 7
+ RGB 9, 19, 30
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 31, 23, 7
+ RGB 9, 19, 30
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+UnusedData_dc800: ; 0xdc800
+ db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+ db $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
+ db $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF
+ db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+ db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+ db $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00
+ db $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF
+ db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
diff --git a/data/stage_palettes.asm b/data/stage_palettes.asm
index 5b701ee..b2bc94c 100755
--- a/data/stage_palettes.asm
+++ b/data/stage_palettes.asm
@@ -80,7 +80,87 @@ SeelBonusOBJPalette7: ; 0xdc8f8
RGB 20, 20, 20
RGB 8, 8, 8
RGB 0, 0, 0
- dr $dc900, $dc980
+
+UnusedPalettes_dc900: ; 0xdc900
+ RGB 31, 27, 29
+ RGB 31, 31, 31
+ RGB 15, 15, 15
+ RGB 0, 0, 0
+
+ RGB 26, 31, 26
+ RGB 4, 23, 13
+ RGB 0, 13, 4
+ RGB 0, 0, 0
+
+ RGB 25, 29, 31
+ RGB 31, 0, 0
+ RGB 16, 0, 0
+ RGB 0, 0, 0
+
+ RGB 31, 29, 25
+ RGB 31, 29, 0
+ RGB 15, 8, 0
+ RGB 0, 0, 0
+
+ RGB 31, 27, 29
+ RGB 20, 20, 20
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 27, 29
+ RGB 20, 20, 20
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 20, 20, 20
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 20, 20, 20
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 20, 20, 20
+ RGB 31, 31, 31
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 16, 12, 31
+ RGB 8, 4, 16
+ RGB 4, 0, 8
+
+ RGB 20, 20, 20
+ RGB 31, 31, 31
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 31, 21, 25
+ RGB 23, 7, 11
+ RGB 13, 0, 2
+
+ RGB 20, 20, 20
+ RGB 31, 31, 31
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 31, 10, 9
+ RGB 13, 2, 4
+ RGB 4, 0, 2
+
+ RGB 20, 20, 20
+ RGB 31, 31, 31
+ RGB 8, 8, 8
+ RGB 0, 0, 0
+
+ RGB 31, 31, 31
+ RGB 19, 26, 2
+ RGB 3, 13, 0
+ RGB 2, 4, 0
StageRedFieldTopPalettes: ; 0xdc980
StageRedFieldTopBGPalette0: ; 0xdc980
@@ -910,8 +990,88 @@ OptionMenuOBJPalette7: ; 0xdce78
RGB 31, 31, 31
RGB 31, 31, 31
-Data_dce80:
- dr $dce80, $dcf00
+PokedexPalettes: ; 0xdce80
+PokedexBGPalette0:
+ RGB 31, 31, 31
+ RGB 7, 27, 27
+ RGB 0, 22, 0
+ RGB 0, 0, 0
+PokedexBGPalette1:
+ RGB 31, 31, 31
+ RGB 7, 27, 27
+ RGB 0, 22, 0
+ RGB 0, 0, 0
+PokedexBGPalette2:
+ RGB 31, 31, 31
+ RGB 31, 19, 19
+ RGB 31, 0, 0
+ RGB 0, 0, 0
+PokedexBGPalette3:
+ RGB 31, 31, 31
+ RGB 31, 29, 0
+ RGB 31, 0, 0
+ RGB 0, 0, 0
+PokedexBGPalette4:
+ RGB 31, 31, 31
+ RGB 23, 23, 31
+ RGB 31, 0, 0
+ RGB 0, 0, 0
+PokedexBGPalette5:
+ RGB 31, 31, 31
+ RGB 21, 21, 21
+ RGB 11, 11, 11
+ RGB 0, 0, 0
+PokedexBGPalette6:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+PokedexBGPalette7:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+
+PokedexOBJPalette0:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 19, 19
+ RGB 31, 0, 0
+PokedexOBJPalette1:
+ RGB 31, 31, 31
+ RGB 31, 29, 0
+ RGB 31, 0, 0
+ RGB 0, 0, 0
+PokedexOBJPalette2:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 29, 0
+ RGB 31, 0, 0
+PokedexOBJPalette3:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+PokedexOBJPalette4:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+PokedexOBJPalette5:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+PokedexOBJPalette6:
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+PokedexOBJPalette7:
+ RGB 31, 31, 31
+ RGB 31, 19, 19
+ RGB 31, 0, 0
+ RGB 0, 0, 0
MewtwoBonusPalettes: ; 0xdcf00
MewtwoBonusBGPalette0: ; 0xdcf00
diff --git a/home.asm b/home.asm
index f9cf5da..f78028f 100755
--- a/home.asm
+++ b/home.asm
@@ -3227,7 +3227,7 @@ Func_1bb2: ; 0x1bb2
ret
Data_1bcf:
- dr $1bcf, $1bd3
+ db $02, $01, $04, $03
Func_1bd3: ; 0x1bd3
lb de, $00, $01
diff --git a/home/serial.asm b/home/serial.asm
index 8e68e6b..b63e2a3 100755
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -38,7 +38,7 @@ Func_1502: ; 1502 (0:1502)
ld c, [hl]
inc [hl]
ld b, $0
- ld hl, Data_18ff
+ ld hl, SerialTranfserData_18ff
add hl, bc
ld a, [hl]
ld [rSB], a
@@ -632,28 +632,60 @@ Func_18d4: ; 0x18d4
call Func_16bf
ret
-Data_18ff:
- dr $18ff, $1901
-
-Data_1901:
- dr $1901, $1909
-
-Data_1909:
- dr $1909, $190d
-
-Data_190d:
- dr $190d, $1915
-
-Data_1915:
- dr $1915, $191d
-
-Data_191d:
- dr $191d, $1925
+SerialTranfserData_18ff: ; 0x18ff
+ db $88
+ db $33
+
+SerialTransferData_1901: ; 0x1901
+ db $01
+ db $00
+ db $00
+ db $00
+ db $01
+ db $00
+ db $00
+ db $00
+
+SerialTransferData_1909: ; 0x1909
+ db $02
+ db $00
+ db $04
+ db $00
+
+SerialTransferData_190d: ; 0x190d
+ db $04
+ db $00
+ db $00
+ db $00
+ db $04
+ db $00
+ db $00
+ db $00
+
+SerialTransferData_1915: ; 0x1915
+ db $08
+ db $00
+ db $00
+ db $00
+ db $08
+ db $00
+ db $00
+ db $00
+
+SerialTransferData_191d: ; 0x191d
+ db $0F
+ db $00
+ db $00
+ db $00
+ db $0F
+ db $00
+ db $00
+ db $00
Func_1925: ; 0x1925
ld a, $1
ld d, $0
- ld hl, Data_1901
+ ld hl, SerialTransferData_1901
ld bc, $0008
jp Func_18d4
@@ -663,7 +695,7 @@ Func_1932: ; 0x19332
ld hl, wd8cd
ld bc, $000c
call Func_18d4
- ld hl, Data_1909
+ ld hl, SerialTransferData_1909
ld de, wd8cd
ld bc, $0004
call LocalCopyData
@@ -712,7 +744,7 @@ Func_1989: ; 0x1989
ld hl, wd8cd
ld bc, $0004
call Func_18d4
- ld a, [Data_190d]
+ ld a, [SerialTransferData_190d]
ld [wd8cd], a
ld a, [wd8ac]
ld [wd8ce], a
@@ -726,25 +758,25 @@ Func_1989: ; 0x1989
Func_19bd: ; 19bd (0:19bd)
ld a, $4
ld d, $0
- ld hl, Data_1915
+ ld hl, SerialTransferData_1915
ld bc, $8
jp Func_18d4
Func_19ca: ; 0x19ca
ld a, $5
ld d, $0
- ld hl, Data_191d
+ ld hl, SerialTransferData_191d
ld bc, $0008
jp Func_18d4
Func_19d7: ; 0x19d7
ld a, $6
ld d, $1
- ld hl, Data_190d
+ ld hl, SerialTransferData_190d
ld bc, $0008
jp Func_18d4
-; XXX
+; unused
ret
Func_19e5: ; 0x19e5
@@ -772,7 +804,7 @@ Func_19e5: ; 0x19e5
ld a, $1
ld [wd8b9], a
ld [wd8db], a
- ld a, [Data_18ff]
+ ld a, [SerialTranfserData_18ff]
ld [rSB], a
ld a, $1
ld [rSC], a
diff --git a/main.asm b/main.asm
index 6e9a63b..840f557 100755
--- a/main.asm
+++ b/main.asm
@@ -46047,7 +46047,7 @@ Data_280c4: ; 0x280c4
dab Data_c4c00
dw $9e00
dw $802
- dab Data_dce80
+ dab PokedexPalettes
dw $0000
dw $101
dw $FFFF ; terminators
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 15:13:01 +0000