summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconstants/palette_constants.asm3
-rwxr-xr-xdata/sgb_packets.asm203
-rwxr-xr-xdata/super_palettes.asm80
-rwxr-xr-xdata/trainer_parties.asm3
-rw-r--r--gfx/pikachu/unknown_e41d2.pngbin210 -> 249 bytes
-rw-r--r--gfx/pikachu/unknown_e444b.pngbin299 -> 353 bytes
-rw-r--r--gfx/pikachu/unknown_e4a99.pngbin199 -> 261 bytes
-rwxr-xr-xscripts/billshouse.asm2
-rwxr-xr-xscripts/billshouse2.asm2
-rwxr-xr-xscripts/fanclub.asm2
-rwxr-xr-xscripts/mtmoon3.asm2
-rwxr-xr-xscripts/oakslab.asm2
-rwxr-xr-xscripts/pallettown.asm4
-rwxr-xr-xscripts/pokemontower7.asm2
-rwxr-xr-xscripts/rockethideout4.asm2
-rwxr-xr-xscripts/silphco11.asm2
16 files changed, 189 insertions, 120 deletions
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index ca2e103a..fda3b470 100755
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -54,3 +54,6 @@ const_value = 0
const PAL_BADGE ; $22
const PAL_CAVE ; $23
const PAL_GAMEFREAK ; $24
+ const PAL_25 ; $25
+ const PAL_26 ; $26
+ const PAL_27 ; $27
diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm
index a29de819..b188ad42 100755
--- a/data/sgb_packets.asm
+++ b/data/sgb_packets.asm
@@ -52,124 +52,109 @@ DATA_SND: MACRO
ENDM
BlkPacket_WholeScreen:
- db $21
- db $1,$3,$0,$0,$0,$13,$11,$0
- db $0,$0,$0,$0,$0,$0,$0
-BlkPacket_Battle:
- db $22
- db $5,$7,$a,$0,$c,$13,$11,$3,$5,$1
- db $0,$a,$3,$3,$0,$a,$7,$13,$a
- db $3,$a,$0,$4,$8,$b,$3,$f,$b
- db $0,$13,$6
-BlkPacket_StatusScreen:
- db $21
- db $1,$7,$5,$1,$0
- db $7,$6,$0,$0,$0,$0,$0,$0,$0
- db $0
-BlkPacket_Pokedex:
- db $21
- db $1,$7,$5,$1,$1,$8,$8
- db $0,$0,$0,$0,$0,$0,$0,$0
-BlkPacket_Slots:
- db $22
- db $5,$3,$5,$0,$0,$13,$b,$3,$a
- db $0,$4,$13,$9,$2,$f,$0,$6,$13
- db $7,$3,$0,$4,$4,$f,$9,$3,$0
- db $0,$c,$13,$11
-BlkPacket_Titlescreen:
- db $22
- db $3,$3,$0,$0
- db $0,$13,$7,$3,$a,$0,$8,$13,$11
- db $2,$0,$9,$8,$a,$8,$0,$0,$0
- db $0,$0,$0,$0,$0,$0,$0,$0,$0
-BlkPacket_NidorinoIntro ; 726a1 (1c:66a1)
- db $22
- db $3,$3,$5,$0,$0,$13,$3,$3
- db $0,$0,$4,$13,$d,$3,$5,$0,$e
- db $13,$11,$0,$0,$0,$0,$0,$0,$0
- db $0,$0,$0,$0,$0
-BlkPacket_PartyMenu:
- db $23
- db $7,$6,$10
- db $1,$0,$2,$c,$2,$0,$5,$1,$b
- db $1,$2,$0,$5,$3,$b,$3,$2,$0
- db $5,$5,$b,$5,$2,$0,$5,$7,$b
- db $7,$2,$0,$5,$9,$b,$9,$2,$0
- db $5,$b,$b,$b,$0,$0,$0,$0
-BlkPacket_TrainerCard:
- db $24
- db $a,$2,$0,$3,$c,$4,$d,$2,$5
- db $7,$c,$8,$d,$2,$f,$b,$c,$c
- db $d,$2,$a,$10,$b,$11,$c,$2,$5
- db $e,$d,$f,$d,$2,$f,$10,$d,$11
- db $d,$2,$a,$3,$f,$4,$10,$2,$f
- db $7,$f,$8,$10,$2,$a,$b,$f,$c
- db $10,$2,$5,$f,$f,$10,$10,$0,$0
-BlkPacket_GameFreakIntro:
- db $22
- db $3,$7,$5,$5,$b,$7,$d,$2
- db $a,$8,$b,$9,$d,$3,$f,$c,$b
- db $e,$d,$0,$0,$0,$0,$0,$0,$0
- db $0,$0,$0,$0,$0
-UnknownPacket_72751:
- db $21,$1,$7,$5
- db $4,$0,$f,$5,$0,$0,$0,$0,$0
- db $0,$0,$0
-
-PalPacket_Empty:
- PAL_SET 0, 0, 0, 0
-
-PalPacket_PartyMenu:
- PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR
-
-PalPacket_Black:
- PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK
+ ATTR_BLK 1
+ ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17
+ ds 8
-PalPacket_TownMap:
- PAL_SET PAL_TOWNMAP, 0, 0, 0
-
-PalPacket_Pokedex:
- PAL_SET PAL_BROWNMON, 0, 0, 0
-
-PalPacket_Slots:
- PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4
-
-PalPacket_Titlescreen:
- PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON
+BlkPacket_Battle:
+ ATTR_BLK 5
+ ATTR_BLK_DATA %111, 2,2,0, 00,12, 19,17 ; message box: pal 2
+ ATTR_BLK_DATA %011, 1,1,0, 01,00, 10,03 ; enemy HP bar: pal 1
+ ATTR_BLK_DATA %011, 0,0,0, 10,07, 19,10 ; player HP bar: pal 0
+ ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2
+ ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 ; enemy mon : pal 3
-PalPacket_TrainerCard:
- PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON
+BlkPacket_StatusScreen:
+ ATTR_BLK 1
+ ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0
+ ds 8
-PalPacket_Generic:
- PAL_SET PAL_MEWMON, 0, 0, 0
+BlkPacket_Pokedex:
+ ATTR_BLK 1
+ ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0
+ ds 8
-PalPacket_NidorinoIntro:
- PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
+BlkPacket_Slots:
+ ATTR_BLK 5
+ ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,11 ; "3" rows and top of screen: pal 1
+ ATTR_BLK_DATA %011, 2,2,0, 00,04, 19,09 ; "2" rows: pal 2
+ ATTR_BLK_DATA %010, 3,3,0, 00,06, 19,07 ; "1" row: pal 3
+ ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0
+ ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 ; message box: pal 0
-PalPacket_GameFreakIntro:
- PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
+BlkPacket_Titlescreen:
+ ATTR_BLK 3
+ ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07
+ ATTR_BLK_DATA %011, 2,2,0, 00,08, 19,17
+ ATTR_BLK_DATA %010, 0,0,0, 09,08, 10,08
+ ds 12
+
+BlkPacket_NidorinoIntro:
+ ATTR_BLK 3
+ ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1
+ ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0
+ ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1
+ ds 12
-UnknownPalPacket_72811:
- db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
+BlkPacket_PartyMenu:
+ ATTR_BLK 7
+ ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12 ; mon sprites: pal 0, everything else: pal 1
+ ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01 ; HP bar 0: pal set dynamically
+ ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03 ; HP bar 1: pal set dynamically
+ ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05 ; HP bar 2: pal set dynamically
+ ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically
+ ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically
+ ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically
+ ds 4
-UnknownPalPacket_72821:
- db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
+BlkPacket_TrainerCard:
+ ATTR_BLK 10
+ ATTR_BLK_DATA %010, 0,0,0, 03,12, 04,13
+ ATTR_BLK_DATA %010, 1,1,0, 07,12, 08,13
+ ATTR_BLK_DATA %010, 3,3,0, 11,12, 12,13
+ ATTR_BLK_DATA %010, 2,2,0, 16,11, 17,12
+ ATTR_BLK_DATA %010, 1,1,0, 14,13, 15,13
+ ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,13
+ ATTR_BLK_DATA %010, 2,2,0, 03,15, 04,16
+ ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16
+ ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16
+ ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16
+ ds 2
-PalTrnPacket:
- PAL_TRN
-MltReq1Packet:
- MLT_REQ 1
-MltReq2Packet:
- MLT_REQ 2
-ChrTrnPacket:
- CHR_TRN 0, 0
-PctTrnPacket:
- PCT_TRN
+BlkPacket_GameFreakIntro:
+ ATTR_BLK 3
+ ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0
+ ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2
+ ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3
+ ds 12
-MaskEnFreezePacket:
- MASK_EN 1
-MaskEnCancelPacket:
- MASK_EN 0
+UnknownPacket_72751:
+ ATTR_BLK 1
+ ATTR_BLK_DATA %111, 1,1,0, 04,00, 15,05
+ ds 8
+
+PalPacket_Empty: PAL_SET 0, 0, 0, 0
+PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR
+PalPacket_Black: PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK
+PalPacket_TownMap: PAL_SET PAL_TOWNMAP, 0, 0, 0
+PalPacket_Pokedex: PAL_SET PAL_BROWNMON, 0, 0, 0
+PalPacket_Slots: PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4
+PalPacket_Titlescreen: PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON
+PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON
+PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0
+PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
+PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
+UnknownPalPacket_72811: PAL_SET PAL_25, PAL_25, PAL_25, PAL_25
+UnknownPalPacket_72821: PAL_SET PAL_25, PAL_27, PAL_25, PAL_25
+
+PalTrnPacket: PAL_TRN
+MltReq1Packet: MLT_REQ 1
+MltReq2Packet: MLT_REQ 2
+ChrTrnPacket: CHR_TRN 0, 0
+PctTrnPacket: PCT_TRN
+
+MaskEnFreezePacket: MASK_EN 1
+MaskEnCancelPacket: MASK_EN 0
; These are DATA_SND packets containing SNES code.
; This set of packets is found in several Japanese SGB-compatible titles.
diff --git a/data/super_palettes.asm b/data/super_palettes.asm
index f5ec3d86..d04d461e 100755
--- a/data/super_palettes.asm
+++ b/data/super_palettes.asm
@@ -1,400 +1,480 @@
SuperPalettes:
+ ; PAL_ROUTE
RGB 31, 31, 30
RGB 23, 26, 19
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_PALLET
RGB 31, 31, 30
RGB 28, 27, 31
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_VIRIDIAN
RGB 31, 31, 30
RGB 26, 31, 21
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_PEWTER
RGB 31, 31, 30
RGB 23, 23, 22
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_CERULEAN
RGB 31, 31, 30
RGB 22, 23, 31
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_LAVENDER
RGB 31, 31, 30
RGB 27, 23, 29
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_VERMILION
RGB 31, 31, 30
RGB 31, 25, 16
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_CELADON
RGB 31, 31, 30
RGB 22, 31, 22
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_FUCHSIA
RGB 31, 31, 30
RGB 31, 26, 26
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_CINNABAR
RGB 31, 31, 30
RGB 31, 15, 14
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_INDIGO
RGB 31, 31, 30
RGB 17, 17, 25
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_SAFFRON
RGB 31, 31, 30
RGB 31, 31, 19
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_TOWNMAP
RGB 31, 31, 30
RGB 20, 26, 31
RGB 17, 23, 10
RGB 3, 2, 2
+ ; PAL_LOGO1
RGB 31, 31, 30
RGB 30, 30, 17
RGB 21, 0, 4
RGB 21, 0, 4
+ ; PAL_LOGO2
RGB 31, 31, 30
RGB 30, 30, 17
RGB 18, 18, 24
RGB 7, 7, 16
+ ; PAL_0F
RGB 31, 31, 30
RGB 24, 20, 30
RGB 11, 20, 30
RGB 3, 2, 2
+ ; PAL_MEWMON
RGB 31, 31, 30
RGB 31, 30, 22
RGB 27, 16, 16
RGB 6, 6, 6
+ ; PAL_BLUEMON
RGB 31, 31, 30
RGB 21, 22, 31
RGB 9, 10, 20
RGB 6, 6, 6
+ ; PAL_REDMON
RGB 31, 31, 30
RGB 31, 24, 11
RGB 26, 9, 6
RGB 6, 6, 6
+ ; PAL_CYANMON
RGB 31, 31, 30
RGB 26, 28, 31
RGB 7, 24, 28
RGB 6, 6, 6
+ ; PAL_PURPLEMON
RGB 31, 31, 30
RGB 27, 22, 30
RGB 22, 15, 23
RGB 6, 6, 6
+ ; PAL_BROWNMON
RGB 31, 31, 30
RGB 26, 23, 18
RGB 18, 14, 10
RGB 6, 6, 6
+ ; PAL_GREENMON
RGB 31, 31, 30
RGB 24, 28, 18
RGB 13, 21, 15
RGB 6, 6, 6
+ ; PAL_PINKMON
RGB 31, 31, 30
RGB 31, 24, 26
RGB 31, 18, 21
RGB 6, 6, 6
+ ; PAL_YELLOWMON
RGB 31, 31, 30
RGB 31, 31, 19
RGB 28, 23, 9
RGB 6, 6, 6
+ ; PAL_GREYMON
RGB 31, 31, 30
RGB 25, 25, 18
RGB 16, 16, 14
RGB 6, 6, 6
+ ; PAL_SLOTS1
RGB 31, 31, 30
RGB 27, 22, 30
RGB 26, 9, 6
RGB 6, 6, 6
+ ; PAL_SLOTS2
RGB 31, 31, 30
RGB 31, 23, 26
RGB 29, 29, 8
RGB 6, 6, 6
+ ; PAL_SLOTS3
RGB 31, 31, 30
RGB 23, 31, 20
RGB 29, 29, 8
RGB 6, 6, 6
+ ; PAL_SLOTS4
RGB 31, 31, 30
RGB 23, 29, 31
RGB 29, 29, 8
RGB 6, 6, 6
+ ; PAL_BLACK
RGB 31, 31, 30
RGB 6, 6, 6
RGB 6, 6, 6
RGB 6, 6, 6
+ ; PAL_GREENBAR
RGB 31, 31, 30
RGB 31, 31, 19
RGB 0, 21, 0
RGB 6, 6, 6
+ ; PAL_YELLOWBAR
RGB 31, 31, 30
RGB 31, 31, 19
RGB 28, 23, 9
RGB 6, 6, 6
+ ; PAL_REDBAR
RGB 31, 31, 30
RGB 31, 31, 19
RGB 26, 9, 6
RGB 6, 6, 6
+ ; PAL_BADGE
RGB 31, 31, 30
RGB 20, 15, 11
RGB 22, 21, 20
RGB 6, 6, 6
+ ; PAL_CAVE
RGB 31, 31, 30
RGB 20, 15, 11
RGB 22, 21, 20
RGB 6, 6, 6
+ ; PAL_GAMEFREAK
RGB 31, 31, 30
RGB 28, 24, 14
RGB 20, 20, 11
RGB 6, 6, 6
+ ; PAL_25
RGB 31, 31, 30
RGB 31, 30, 22
RGB 23, 27, 31
RGB 6, 6, 6
+ ; PAL_26
RGB 31, 31, 30
RGB 28, 23, 9
RGB 18, 14, 10
RGB 6, 6, 6
+ ; PAL_27
RGB 31, 31, 30
RGB 16, 16, 16
RGB 31, 25, 9
RGB 6, 6, 6
GBCBasePalettes:
+ ; PAL_ROUTE
RGB 31, 31, 31
RGB 16, 31, 4
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_PALLET
RGB 31, 31, 31
RGB 23, 17, 31
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_VIRIDIAN
RGB 31, 31, 31
RGB 19, 31, 0
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_PEWTER
RGB 31, 31, 31
RGB 18, 18, 15
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_CERULEAN
RGB 31, 31, 31
RGB 5, 8, 31
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_LAVENDER
RGB 31, 31, 31
RGB 25, 4, 31
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_VERMILION
RGB 31, 31, 31
RGB 31, 19, 0
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_CELADON
RGB 31, 31, 31
RGB 5, 31, 5
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_FUCHSIA
RGB 31, 31, 31
RGB 31, 15, 15
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_CINNABAR
RGB 31, 31, 31
RGB 31, 8, 8
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_INDIGO
RGB 31, 31, 31
RGB 11, 8, 31
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_SAFFRON
RGB 31, 31, 31
RGB 31, 31, 0
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_TOWNMAP
RGB 31, 31, 31
RGB 0, 21, 31
RGB 10, 28, 0
RGB 1, 1, 1
+ ; PAL_LOGO1
RGB 31, 31, 31
RGB 31, 31, 0
RGB 31, 0, 0
RGB 31, 0, 0
+ ; PAL_LOGO2
RGB 31, 31, 31
RGB 31, 31, 0
RGB 7, 7, 25
RGB 0, 0, 17
+ ; PAL_0F
RGB 31, 31, 31
RGB 13, 1, 31
RGB 0, 9, 31
RGB 1, 1, 1
+ ; PAL_MEWMON
RGB 31, 31, 31
RGB 31, 31, 0
RGB 31, 1, 1
RGB 3, 3, 3
+ ; PAL_BLUEMON
RGB 31, 31, 31
RGB 16, 18, 31
RGB 0, 1, 25
RGB 3, 3, 3
+ ; PAL_REDMON
RGB 31, 31, 31
RGB 31, 17, 0
RGB 31, 0, 0
RGB 3, 3, 3
+ ; PAL_CYANMON
RGB 31, 31, 31
RGB 16, 26, 31
RGB 0, 17, 31
RGB 3, 3, 3
+ ; PAL_PURPLEMON
RGB 31, 31, 31
RGB 25, 15, 31
RGB 19, 0, 22
RGB 3, 3, 3
+ ; PAL_BROWNMON
RGB 31, 31, 31
RGB 29, 18, 10
RGB 17, 9, 5
RGB 3, 3, 3
+ ; PAL_GREENMON
RGB 31, 31, 31
RGB 17, 31, 11
RGB 1, 22, 6
RGB 3, 3, 3
+ ; PAL_PINKMON
RGB 31, 31, 31
RGB 31, 15, 18
RGB 31, 0, 6
RGB 3, 3, 3
+ ; PAL_YELLOWMON
RGB 31, 31, 31
RGB 31, 31, 0
RGB 28, 14, 0
RGB 3, 3, 3
+ ; PAL_GREYMON
RGB 31, 31, 31
RGB 20, 23, 10
RGB 11, 11, 5
RGB 3, 3, 3
+ ; PAL_SLOTS1
RGB 31, 31, 31
RGB 25, 1, 31
RGB 31, 0, 0
RGB 3, 3, 3
+ ; PAL_SLOTS2
RGB 31, 31, 31
RGB 31, 4, 19
RGB 31, 31, 0
RGB 3, 3, 3
+ ; PAL_SLOTS3
RGB 31, 31, 31
RGB 8, 31, 0
RGB 31, 31, 0
RGB 3, 3, 3
+ ; PAL_SLOTS4
RGB 31, 31, 31
RGB 0, 31, 31
RGB 31, 31, 0
RGB 3, 3, 3
+ ; PAL_BLACK
RGB 31, 31, 31
RGB 3, 3, 3
RGB 3, 3, 3
RGB 3, 3, 3
+ ; PAL_GREENBAR
RGB 31, 31, 31
RGB 31, 31, 0
RGB 0, 31, 0
RGB 3, 3, 3
+ ; PAL_YELLOWBAR
RGB 31, 31, 31
RGB 31, 31, 0
RGB 31, 18, 0
RGB 3, 3, 3
+ ; PAL_REDBAR
RGB 31, 31, 31
RGB 31, 31, 0
RGB 31, 0, 0
RGB 3, 3, 3
+ ; PAL_BADGE
RGB 31, 31, 31
RGB 23, 8, 0
RGB 17, 14, 11
RGB 3, 3, 3
+ ; PAL_CAVE
RGB 31, 31, 31
RGB 23, 8, 0
RGB 17, 14, 11
RGB 3, 3, 3
+ ; PAL_GAMEFREAK
RGB 31, 31, 31
RGB 31, 19, 0
RGB 19, 19, 0
RGB 3, 3, 3
+ ; PAL_25
RGB 31, 31, 31
RGB 31, 31, 0
RGB 11, 23, 31
RGB 3, 3, 3
+ ; PAL_26
RGB 31, 31, 31
RGB 31, 18, 0
RGB 19, 7, 1
RGB 3, 3, 3
+ ; PAL_27
RGB 31, 31, 31
RGB 9, 9, 9
RGB 31, 21, 0
diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm
index 48de8bce..865d1907 100755
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -405,11 +405,12 @@ RocketData:
db 33,MACHOKE,0
db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0
db 32,CUBONE,DROWZEE,MAROWAK,0
-JessieJamesData:
+;JessieJamesData:
db 14,EKANS,MEOWTH,KOFFING,0
db 25,KOFFING,MEOWTH,EKANS,0
db 27,MEOWTH,ARBOK,WEEZING,0
db 31,WEEZING,ARBOK,MEOWTH,0
+; unused JessieJames trainers
db 16,KOFFING,0
db 27,KOFFING,0
db 29,WEEZING,0
diff --git a/gfx/pikachu/unknown_e41d2.png b/gfx/pikachu/unknown_e41d2.png
index 34d71c02..df027a11 100644
--- a/gfx/pikachu/unknown_e41d2.png
+++ b/gfx/pikachu/unknown_e41d2.png
Binary files differ
diff --git a/gfx/pikachu/unknown_e444b.png b/gfx/pikachu/unknown_e444b.png
index d0240c72..26128b23 100644
--- a/gfx/pikachu/unknown_e444b.png
+++ b/gfx/pikachu/unknown_e444b.png
Binary files differ
diff --git a/gfx/pikachu/unknown_e4a99.png b/gfx/pikachu/unknown_e4a99.png
index e97998c1..202cbd2f 100644
--- a/gfx/pikachu/unknown_e4a99.png
+++ b/gfx/pikachu/unknown_e4a99.png
Binary files differ
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index c7fd74f9..02183977 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -171,7 +171,7 @@ BillsHouseScript5:
call ApplyPikachuMovementData
ld a, $f
ld [wEmotionBubbleSpriteIndex], a
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
callab InitializePikachuTextID
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm
index 87016aa8..9d3b4364 100755
--- a/scripts/billshouse2.asm
+++ b/scripts/billshouse2.asm
@@ -117,7 +117,7 @@ Func_f24d5:
call ApplyPikachuMovementData
ld a, $f ; pikachu
ld [wEmotionBubbleSpriteIndex], a
- ld a, $1
+ ld a, QUESTION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
call DisablePikachuFollowingPlayer
diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm
index 01d6269b..7bb1bc86 100755
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -44,7 +44,7 @@ FanClubScript_59a44:
ld [wPlayerMovingDirection], a
call UpdateSprites
call UpdateSprites
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
ld a, $f ; Pikachu
ld [wEmotionBubbleSpriteIndex], a
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm
index b8d14bd5..e86d6d37 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -467,7 +467,7 @@ MtMoon3Text12:
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 55b58b39..d3082256 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -797,7 +797,7 @@ OaksLabText_1c9a7:
OaksLabScript_1c9ac:
ld a, $1
ld [wEmotionBubbleSpriteIndex], a
- xor a
+ xor a ; EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld a, $8
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index 803aa4f3..49546a44 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -260,8 +260,8 @@ OakAppearsText:
ld [wPlayerMovingDirection], a
ld a, 0
ld [wEmotionBubbleSpriteIndex], a ; player's sprite
- ld a, 0
- ld [wWhichEmotionBubble], a ; EXCLAMATION_BUBBLE
+ ld a, EXCLAMATION_BUBBLE
+ ld [wWhichEmotionBubble], a
predef EmotionBubble
jp TextScriptEnd
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index 9a016d84..6a2cdad5 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -269,7 +269,7 @@ PokemonTower7Text4:
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm
index 2b3e0e89..1781b12e 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -322,7 +322,7 @@ RocketHideout4Text10:
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 1ef7dbaf..cb922453 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -498,7 +498,7 @@ SilphCo11Text8:
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
- ld a, $0
+ ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 02:07:33 +0000