summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdata/mon_palettes.asm3
-rwxr-xr-xdata/sgb_border.asm41
-rwxr-xr-xdata/sgb_packets.asm306
-rwxr-xr-xdata/super_palettes.asm299
-rw-r--r--engine/bank3c/main.asm1
-rw-r--r--engine/bank3f/main.asm4
-rw-r--r--engine/battle/common_text.asm2
-rwxr-xr-xengine/gamefreak.asm4
-rwxr-xr-xengine/hall_of_fame.asm8
-rwxr-xr-xengine/overworld/healing_machine.asm8
-rwxr-xr-xengine/overworld/player_animations.asm14
-rwxr-xr-xengine/palettes.asm71
-rwxr-xr-xengine/predefs.asm199
-rwxr-xr-xengine/town_map.asm35
-rwxr-xr-xyellow/main.asm45
15 files changed, 523 insertions, 517 deletions
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index f6763d7d..676c86a0 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -1,4 +1,4 @@
-MonsterPalettes: ; 725c8 (1c:65c8)
+MonsterPalettes: ; 72921 (1c:6921)
db PAL_MEWMON ; MISSINGNO
db PAL_GREENMON ; BULBASAUR
db PAL_GREENMON ; IVYSAUR
@@ -151,3 +151,4 @@ MonsterPalettes: ; 725c8 (1c:65c8)
db PAL_BROWNMON ; DRAGONITE
db PAL_MEWMON ; MEWTWO
db PAL_MEWMON ; MEW
+; 1c:69b9 \ No newline at end of file
diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index 5beaa65f..401a55e9 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,28 +1,29 @@
-BorderPalettes: ; 72788 (1c:6788)
- INCBIN "gfx/tilemaps/sgbborder.map"
+BorderPalettes: ; 72c39 (1c:6c39)
+ dr $72c39,$734b9
+ ;INCBIN "gfx/tilemaps/sgbborder.map"
- ds $100
+ ;ds $100
- RGB 30,29,29 ; PAL_SGB1
- RGB 25,22,25
- RGB 25,17,21
- RGB 24,14,12
+ ;RGB 30,29,29 ; PAL_SGB1
+ ;RGB 25,22,25
+ ;RGB 25,17,21
+ ;RGB 24,14,12
- ds $18
+ ;ds $18
- RGB 30,29,29 ; PAL_SGB2
- RGB 22,31,16
- RGB 27,20,6
- RGB 15,15,15
+ ;RGB 30,29,29 ; PAL_SGB2
+ ;RGB 22,31,16
+ ;RGB 27,20,6
+ ;RGB 15,15,15
- ds $18
+ ;ds $18
- RGB 30,29,29 ; PAL_SGB3
- RGB 31,31,17
- RGB 18,21,29
- RGB 15,15,15
+ ;RGB 30,29,29 ; PAL_SGB3
+ ;RGB 31,31,17
+ ;RGB 18,21,29
+ ;RGB 15,15,15
- ds $18
+ ;ds $18
-SGBBorderGraphics: ; 72fe8 (1c:6fe8)
- INCBIN "gfx/sgbborder.2bpp"
+SGBBorderGraphics: ; 734b9 (1c:74b9)
+ INCBIN "gfx/pokemon_yellow.t6.2bpp"
diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm
index 3e5e3f0b..bfd209fd 100755
--- a/data/sgb_packets.asm
+++ b/data/sgb_packets.asm
@@ -50,188 +50,138 @@ DATA_SND: MACRO
db \2 ; bank
db \3 ; length (1-11)
ENDM
-
-BlkPacket_WholeScreen: ; 7219e (1c:619e)
- ATTR_BLK 1
- ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17
- ds 8
-
- db $03,$00,$00,$13,$11,$00,$00
-
-BlkPacket_Battle: ; 721b5 (1c:61b5)
- 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,07, 19,10
- ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11
- ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06
-
- db $03,$00,$00,$13,$0b,$00
- db $03,$00,$0c,$13,$11,$02
- db $03,$01,$00,$0a,$03,$01
- db $03,$0a,$08,$13,$0a,$00
- db $03,$00,$04,$08,$0b,$02
- db $03,$0b,$00,$13,$07,$03
- db $00
-
-BlkPacket_StatusScreen: ; 721fa (1c:61fa)
- ATTR_BLK 1
- ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06
- ds 8
-
- db $02,$00,$00,$11,$00,$03
- db $01,$00,$07,$06,$01,$03
- db $01,$07,$13,$11,$00,$03
- db $08,$00,$13,$06,$00,$00
-
-BlkPacket_Pokedex: ; 72222 (1c:6222)
- ATTR_BLK 1
- ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08
- ds 8
-
- db $02,$00,$00,$11,$00,$01
- db $00,$01,$13,$00,$03,$01
- db $01,$08,$08,$01,$03,$01
- db $09,$08,$11,$00,$03,$09
- db $01,$13,$11,$00,$00
-
-BlkPacket_Slots: ; 7224f (1c:624f)
- 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
-
- db $03,$00,$00,$13,$0b,$01
- db $03,$00,$04,$13,$09,$02
- db $03,$00,$06,$13,$07,$03
- db $03,$04,$04,$0f,$09,$00
- db $03,$00,$0c,$13,$11,$00
- db $00
-
-BlkPacket_Titlescreen: ; 7228e (1c:628e)
- ATTR_BLK 3
- ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07
- ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09
- ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17
- ds 12
-
- db $03,$00,$00,$13,$07,$00
- db $03,$00,$08,$13,$09,$01
- db $03,$00,$0a,$13,$11,$02
- db $00
-
-BlkPacket_NidorinoIntro: ; 722c1 (1c:62c1)
- ATTR_BLK 3
- ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03
- ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13
- ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17
- ds 12
-
- db $03,$00,$00,$13,$03,$01
- db $03,$00,$04,$13,$0d,$00
- db $03,$00,$0e,$13,$11,$01
- db $00
-
-BlkPacket_PartyMenu: ; 722f4 (1c:62f4)
- ATTR_BLK 7
- ATTR_BLK_DATA %110, 0,0,1, 01,00, 02,12
- ATTR_BLK_DATA %010, 0,0,0, 05,01, 11,01
- ATTR_BLK_DATA %010, 0,0,0, 05,03, 11,03
- ATTR_BLK_DATA %010, 0,0,0, 05,05, 11,05
- ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07
- ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09
- ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11
- ds 4
-
- db $02,$00,$00,$11,$01,$03
- db $01,$00,$02,$0c,$00,$03
- db $01,$0d,$02,$11,$01,$03
- db $03,$00,$13,$11,$01,$03
- db $0c,$00,$12,$01,$00,$03
- db $0c,$02,$12,$03,$00,$03
- db $0c,$04,$12,$05,$00,$03
- db $0c,$06,$12,$07,$00,$03
- db $0c,$08,$12,$09,$00,$03
- db $0c,$0a,$12,$0b,$00,$00
-
-BlkPacket_TrainerCard: ; 72360 (1c:6360)
- 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,14
- ATTR_BLK_DATA %010, 3,3,0, 16,13, 17,14
- 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
-
- db $03,$03,$0c,$04,$0d,$00
- db $03,$07,$0c,$08,$0d,$01
- db $03,$0b,$0c,$0c,$0d,$03
- db $03,$10,$0b,$11,$0c,$02
- db $03,$0e,$0d,$0f,$0e,$01
- db $03,$10,$0d,$11,$0e,$03
- db $03,$03,$0f,$04,$10,$02
- db $03,$07,$0f,$08,$10,$03
- db $03,$0b,$0f,$0c,$10,$02
- db $03,$0f,$0f,$10,$10,$01
- db $00
-
-BlkPacket_GameFreakIntro: ; 723dd (1c:63dd)
- ATTR_BLK 3
- ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13
- ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13
- ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13
- ds 12
-
- db $03,$00,$00,$13,$0a,$00
- db $03,$00,$0b,$04,$0d,$00
- db $03,$05,$0b,$07,$0d,$01
- db $03,$08,$0b,$13,$0d,$00
- db $03,$00,$0e,$13,$11,$00
- db $03,$08,$0b,$09,$0d,$02
- db $03,$0c,$0b,$0e,$0d,$03
- db $00
-
-
-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
-
-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
+BlkPacket_WholeScreen: ; 72611 (1c:6611)
+ db $21
+ db $1,$3,$0,$0,$0,$13,$11,$0
+ db $0,$0,$0,$0,$0,$0,$0
+BlkPacket_Battle: ; 72621 (1c:6621)
+ 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: ; 72641 (1c:6641)
+ db $21
+ db $1,$7,$5,$1,$0
+ db $7,$6,$0,$0,$0,$0,$0,$0,$0
+ db $0
+BlkPacket_Pokedex: ; 72651 (1c:6651)
+ db $21
+ db $1,$7,$5,$1,$1,$8,$8
+ db $0,$0,$0,$0,$0,$0,$0,$0,
+BlkPacket_Slots: ; 72661 (1c:6611)
+ 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: ; 72681 (1c:6681)
+ 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: ; 726c1 (1c:66c1)
+ 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: ; 726f1 (1c:66f1)
+ 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: ; 72731 (1c:6731)
+ 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: ; 72751 (1c:6751)
+ db $21,$1,$7,$5
+ db $4,$0,$f,$5,$0,$0,$0,$0,$0
+ db $0,$0,$0
+
+PalPacket_Empty: ; 72761 (1c:6761)
+ PAL_SET 0, 0, 0, 0
+
+PalPacket_PartyMenu: ; 72771 (1c:6771)
+ PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR
+
+PalPacket_Black: ; 72781 (1c:6781)
+ PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK
+
+PalPacket_TownMap: ; 72791 (1c:6791)
+ PAL_SET PAL_TOWNMAP, 0, 0, 0
+
+PalPacket_Pokedex: ; 727a1 (1c:67a1)
+ PAL_SET PAL_BROWNMON, 0, 0, 0
+
+PalPacket_Slots: ; 727b1 (1c:67b1)
+ PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4
+
+PalPacket_Titlescreen: ; 727c1 (1c:67c1)
+ PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON
+
+PalPacket_TrainerCard: ; 727d1 (1c:67d1)
+ PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON
+
+PalPacket_Generic: ; 727e1 (1c:67e1)
+ PAL_SET PAL_MEWMON, 0, 0, 0
+
+PalPacket_NidorinoIntro: ; 727f1 (1c:67f1)
+ PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
+
+PalPacket_GameFreakIntro: ; 72801 (1c:6801)
+ PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
+
+UnknownPalPacket_72811: ; 72811 (1c:6811)
+ db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
+
+UnknownPalPacket_72821: ; 72821 (1c:6821)
+ db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0
+
+PalTrnPacket: ; 72831 (1c:6831)
+ PAL_TRN
+MltReq1Packet: ; 72841 (1c:6841)
+ MLT_REQ 1
+MltReq2Packet: ; 72851 (1c:6851)
+ MLT_REQ 2
+ChrTrnPacket: ; 72861 (1c:6861)
+ CHR_TRN 0, 0
+PctTrnPacket: ; 72871 (1c:6871)
+ PCT_TRN
+
+MaskEnFreezePacket: ; 72881 (1c:6881)
+ MASK_EN 1
+MaskEnCancelPacket: ; 72891 (1c:6891)
+ MASK_EN 0
; These are DATA_SND 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.
-DataSnd_72548: DATA_SND $85d, $0, 11
+DataSnd_728a1: DATA_SND $85d, $0, 11 ; 728a1 (1c:68a1)
db $8C ; cpx #$8c (2)
db $D0, $F4 ; bne -$0c
db $60 ; rts
ds 7
-DataSnd_72558: DATA_SND $852, $0, 11
+DataSnd_728b1: DATA_SND $852, $0, 11 ; 728b1 (1c:68b1)
db $A9, $E7 ; lda #$e7
db $9F, $01, $C0, $7E ; sta $7ec001, x
db $E8 ; inx
@@ -240,7 +190,7 @@ DataSnd_72558: DATA_SND $852, $0, 11
db $E8 ; inx
db $E0 ; cpx #$8c (1)
-DataSnd_72568: DATA_SND $847, $0, 11
+DataSnd_728c1: DATA_SND $847, $0, 11 ; 728c1 (1c:68c1)
db $C4 ; cmp #$c4 (2)
db $D0, $16 ; bne +$16
db $A5 ; lda dp
@@ -249,7 +199,7 @@ DataSnd_72568: DATA_SND $847, $0, 11
db $D0, $10 ; bne +$10
db $A2, $28 ; ldx #$28
-DataSnd_72578: DATA_SND $83c, $0, 11
+DataSnd_728d1: DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1)
db $F0, $12 ; beq +$12
db $A5 ; lda dp
db $C9, $C9 ; cmp #$c9
@@ -259,7 +209,7 @@ DataSnd_72578: DATA_SND $83c, $0, 11
db $CA ; dex
db $C9 ; cmp #$c4 (1)
-DataSnd_72588: DATA_SND $831, $0, 11
+DataSnd_728e1: DATA_SND $831, $0, 11 ; 728e1 (1c:68e1)
dbw $0C, $CAA5 ; tsb $caa5
db $C9, $7E ; cmp #$7e
db $D0, $06 ; bne +$06
@@ -267,7 +217,7 @@ DataSnd_72588: DATA_SND $831, $0, 11
db $CB ; wai
db $C9, $7E ; cmp #$7e
-DataSnd_72598: DATA_SND $826, $0, 11
+DataSnd_728f1: DATA_SND $826, $0, 11 ; 728f1 (1c:68f1)
db $39 ; bne +$39 (2)
dbw $CD, $C48 ; cmp $c48
db $D0, $34 ; bne +$34
@@ -275,7 +225,7 @@ DataSnd_72598: DATA_SND $826, $0, 11
db $C9, $C9 ; cmp #$c9
db $80, $D0 ; bra -$30
-DataSnd_725a8: DATA_SND $81b, $0, 11
+DataSnd_72901: DATA_SND $81b, $0, 11 ; 72901 (1c:6901)
db $EA ; nop
db $EA ; nop
db $EA ; nop
@@ -286,7 +236,7 @@ DataSnd_725a8: DATA_SND $81b, $0, 11
dbw $CD,$C4F ; cmp $c4f
db $D0 ; bne +$39 (1)
-DataSnd_725b8: DATA_SND $810, $0, 11
+DataSnd_72911: DATA_SND $810, $0, 11 ; 72911 (1c:6911)
dbw $4C, $820 ; jmp $820
db $EA ; nop
db $EA ; nop
@@ -295,4 +245,4 @@ DataSnd_725b8: DATA_SND $810, $0, 11
db $EA ; nop
db $60 ; rts
db $EA ; nop
- db $EA ; nop
+ db $EA ; nop \ No newline at end of file
diff --git a/data/super_palettes.asm b/data/super_palettes.asm
index 3580a061..15bce3e2 100755
--- a/data/super_palettes.asm
+++ b/data/super_palettes.asm
@@ -1,150 +1,151 @@
; palettes for overworlds, title screen, monsters
-SuperPalettes: ; 72660 (1c:6660)
- RGB 31,29,31 ; PAL_ROUTE
- RGB 21,28,11
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_PALLET
- RGB 25,28,27
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_VIRIDIAN
- RGB 17,26,3
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_PEWTER
- RGB 23,25,16
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_CERULEAN
- RGB 17,20,30
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_LAVENDER
- RGB 27,20,27
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_VERMILION
- RGB 30,18,0
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_CELADON
- RGB 16,30,22
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_FUCHSIA
- RGB 31,15,22
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_CINNABAR
- RGB 26,10,6
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_INDIGO
- RGB 22,14,24
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_SAFFRON
- RGB 27,27,3
- RGB 20,26,31
- RGB 3,2,2
- RGB 31,29,31 ; PAL_TOWNMAP
- RGB 20,26,31
- RGB 17,23,10
- RGB 3,2,2
- RGB 31,29,31 ; PAL_LOGO1
- RGB 30,30,17
- RGB 17,23,10
- RGB 21,0,4
- RGB 31,29,31 ; PAL_LOGO2
- RGB 30,30,17
- RGB 18,18,24
- RGB 7,7,16
- RGB 31,29,31 ; PAL_0F
- RGB 24,20,30
- RGB 11,20,30
- RGB 3,2,2
- RGB 31,29,31 ; PAL_MEWMON
- RGB 30,22,17
- RGB 16,14,19
- RGB 3,2,2
- RGB 31,29,31 ; PAL_BLUEMON
- RGB 18,20,27
- RGB 11,15,23
- RGB 3,2,2
- RGB 31,29,31 ; PAL_REDMON
- RGB 31,20,10
- RGB 26,10,6
- RGB 3,2,2
- RGB 31,29,31 ; PAL_CYANMON
- RGB 21,25,29
- RGB 14,19,25
- RGB 3,2,2
- RGB 31,29,31 ; PAL_PURPLEMON
- RGB 27,22,24
- RGB 21,15,23
- RGB 3,2,2
- RGB 31,29,31 ; PAL_BROWNMON
- RGB 28,20,15
- RGB 21,14,9
- RGB 3,2,2
- RGB 31,29,31 ; PAL_GREENMON
- RGB 20,26,16
- RGB 9,20,11
- RGB 3,2,2
- RGB 31,29,31 ; PAL_PINKMON
- RGB 30,22,24
- RGB 28,15,21
- RGB 3,2,2
- RGB 31,29,31 ; PAL_YELLOWMON
- RGB 31,28,14
- RGB 26,20,0
- RGB 3,2,2
- RGB 31,29,31 ; PAL_GREYMON
- RGB 26,21,22
- RGB 15,15,18
- RGB 3,2,2
- RGB 31,29,31 ; PAL_SLOTS1
- RGB 26,21,22
- RGB 27,20,6
- RGB 3,2,2
- RGB 31,29,31 ; PAL_SLOTS2
- RGB 31,31,17
- RGB 25,17,21
- RGB 3,2,2
- RGB 31,29,31 ; PAL_SLOTS3
- RGB 22,31,16
- RGB 25,17,21
- RGB 3,2,2
- RGB 31,29,31 ; PAL_SLOTS4
- RGB 16,19,29
- RGB 25,17,21
- RGB 3,2,2
- RGB 31,29,31 ; PAL_BLACK
- RGB 7,7,7
- RGB 2,3,3
- RGB 3,2,2
- RGB 31,29,31 ; PAL_GREENBAR
- RGB 30,26,15
- RGB 9,20,11
- RGB 3,2,2
- RGB 31,29,31 ; PAL_YELLOWBAR
- RGB 30,26,15
- RGB 26,20,0
- RGB 3,2,2
- RGB 31,29,31 ; PAL_REDBAR
- RGB 30,26,15
- RGB 26,10,6
- RGB 3,2,2
- RGB 31,29,31 ; PAL_BADGE
- RGB 30,22,17
- RGB 11,15,23
- RGB 3,2,2
- RGB 31,29,31 ; PAL_CAVE
- RGB 21,14,9
- RGB 18,24,22
- RGB 3,2,2
- RGB 31,29,31 ; PAL_GAMEFREAK
- RGB 31,28,14
- RGB 24,20,10
- RGB 3,2,2
+SuperPalettes: ; 729b9 (1c:69b9)
+ dr $729b9,$72c39
+ ;RGB 31,29,31 ; PAL_ROUTE
+ ;RGB 21,28,11
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_PALLET
+ ;RGB 25,28,27
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_VIRIDIAN
+ ;RGB 17,26,3
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_PEWTER
+ ;RGB 23,25,16
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_CERULEAN
+ ;RGB 17,20,30
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_LAVENDER
+ ;RGB 27,20,27
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_VERMILION
+ ;RGB 30,18,0
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_CELADON
+ ;RGB 16,30,22
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_FUCHSIA
+ ;RGB 31,15,22
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_CINNABAR
+ ;RGB 26,10,6
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_INDIGO
+ ;RGB 22,14,24
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_SAFFRON
+ ;RGB 27,27,3
+ ;RGB 20,26,31
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_TOWNMAP
+ ;RGB 20,26,31
+ ;RGB 17,23,10
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_LOGO1
+ ;RGB 30,30,17
+ ;RGB 17,23,10
+ ;RGB 21,0,4
+ ;RGB 31,29,31 ; PAL_LOGO2
+ ;RGB 30,30,17
+ ;RGB 18,18,24
+ ;RGB 7,7,16
+ ;RGB 31,29,31 ; PAL_0F
+ ;RGB 24,20,30
+ ;RGB 11,20,30
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_MEWMON
+ ;RGB 30,22,17
+ ;RGB 16,14,19
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_BLUEMON
+ ;RGB 18,20,27
+ ;RGB 11,15,23
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_REDMON
+ ;RGB 31,20,10
+ ;RGB 26,10,6
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_CYANMON
+ ;RGB 21,25,29
+ ;RGB 14,19,25
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_PURPLEMON
+ ;RGB 27,22,24
+ ;RGB 21,15,23
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_BROWNMON
+ ;RGB 28,20,15
+ ;RGB 21,14,9
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_GREENMON
+ ;RGB 20,26,16
+ ;RGB 9,20,11
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_PINKMON
+ ;RGB 30,22,24
+ ;RGB 28,15,21
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_YELLOWMON
+ ;RGB 31,28,14
+ ;RGB 26,20,0
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_GREYMON
+ ;RGB 26,21,22
+ ;RGB 15,15,18
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_SLOTS1
+ ;RGB 26,21,22
+ ;RGB 27,20,6
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_SLOTS2
+ ;RGB 31,31,17
+ ;RGB 25,17,21
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_SLOTS3
+ ;RGB 22,31,16
+ ;RGB 25,17,21
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_SLOTS4
+ ;RGB 16,19,29
+ ;RGB 25,17,21
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_BLACK
+ ;RGB 7,7,7
+ ;RGB 2,3,3
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_GREENBAR
+ ;RGB 30,26,15
+ ;RGB 9,20,11
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_YELLOWBAR
+ ;RGB 30,26,15
+ ;RGB 26,20,0
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_REDBAR
+ ;RGB 30,26,15
+ ;RGB 26,10,6
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_BADGE
+ ;RGB 30,22,17
+ ;RGB 11,15,23
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_CAVE
+ ;RGB 21,14,9
+ ;RGB 18,24,22
+ ;RGB 3,2,2
+ ;RGB 31,29,31 ; PAL_GAMEFREAK
+ ;RGB 31,28,14
+ ;RGB 24,20,10
+ ;RGB 3,2,2 \ No newline at end of file
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm
index c2cf770e..026c7d48 100644
--- a/engine/bank3c/main.asm
+++ b/engine/bank3c/main.asm
@@ -1,4 +1,5 @@
;INCLUDE "engine/bank3c/overworld.asm"
+Func_f0000:: ; f0000 (3c:4000)
dr $f0000,$f010c
_AdvancePlayerSprite:: ; f010c (3c:410c)
dr $f010c,$f0274
diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm
index b1bd6e55..b0d3a808 100644
--- a/engine/bank3f/main.asm
+++ b/engine/bank3f/main.asm
@@ -302,7 +302,9 @@ Func_fce18:: ; fce18 (3f:4e18)
Func_fcf0c:: ; fcf0c (3f:4f0c)
dr $fcf0c,$fd004
Func_fd004:: ; fd004 (3f:5004)
- dr $fd004,$fd2a1
+ dr $fd004,$fd0d0
+Func_fd0d0:: ; fd0d0 (3f:50d0)
+ dr $fd0d0,$fd2a1
Func_fd2a1:: ; fd2a1 (3f:52a1)
dr $fd2a1,$fe66f
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index d3200beb..e1fbedc2 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -76,7 +76,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000)
ld [wc0f1], a
ld a, $80
ld [wc0f2], a
- ld a, (SFX_08_77 - SFX_Headers_08) / 3
+ ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3
call PlaySound
jp WaitForSoundToFinish
.done
diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm
index 10765ced..b3854b7b 100755
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -5,7 +5,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000)
ld [rOBP1], a ; $ff49
call Func_3040
call Func_3061
- ld de, AnimationTileset2 + $30 ; $471e ; star tile (top left quadrant)
+ ld de, AnimationTileset2 + $30 ; $4757 ; star tile (top left quadrant)
ld hl, vChars1 + $200
ld bc, (BANK(AnimationTileset2) << 8) + $01
call CopyVideoData
@@ -28,7 +28,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000)
AnimateShootingStar: ; 7004a (1c:404a)
call LoadShootingStarGraphics
- ld a, (SFX_1f_67 - SFX_Headers_1f) / 3
+ ld a, $c2 ; (SFX_1f_67 - SFX_Headers_1f) / 3
call PlaySound
ld hl, wOAMBuffer
ld bc, $a004
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 9481afab..8c7ca55f 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -33,8 +33,8 @@ AnimateHallOfFame: ; 701c6 (1c:41c6)
.asm_70211
ld a, $90
ld [hWY], a
- ld c, BANK(Music_HallOfFame)
- ld a, MUSIC_HALL_OF_FAME
+ ld c, $1f ; BANK(Music_HallOfFame)
+ ld a, $ca ; MUSIC_HALL_OF_FAME
call PlayMusic
ld hl, wPartySpecies
ld c, $ff
@@ -254,9 +254,9 @@ Func_703d1: ; 703d1 (1c:43d1)
ld c, $a3
call PrintBCDNumber
ld hl, DexSeenOwnedText
- call Func_703e2
+ call Func_7043a
ld hl, DexRatingText
- call Func_703e2
+ call Func_7043a
ld hl, wcc5d
Func_7043a: ; 7043a (1c:443a)
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 09abf779..eb23c80c 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -29,7 +29,7 @@ AnimateHealingMachine: ; 7048b (1c:448b)
ld b, a
.asm_704c4
call Func_7055a
- ld a, (SFX_02_4a - SFX_Headers_02) / 3
+ ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3
call PlaySound
ld c, $1e
call DelayFrames
@@ -41,17 +41,17 @@ AnimateHealingMachine: ; 7048b (1c:448b)
jr nz, .asm_704e6
call StopAllMusic
call PlaySound
- ld a, BANK(Music_PkmnHealed)
+ ld a, $2 ; BANK(Music_PkmnHealed)
ld [wc0ef], a
.asm_704e6
- ld a, MUSIC_PKMN_HEALED
+ ld a, $e8 ; MUSIC_PKMN_HEALED
ld [wc0ee], a
call PlaySound
ld d, $28
call FlashSprite8Times
.asm_704f3
ld a, [wc026]
- cp MUSIC_PKMN_HEALED
+ cp $e8 ; MUSIC_PKMN_HEALED
jr z, .asm_704f3
ld c, $20
call DelayFrames
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index bd0a52b5..43d3ec9c 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -9,7 +9,7 @@ EnterMapAnim: ; 70567 (1c:4567)
bit 7, [hl] ; used fly out of battle?
res 7, [hl]
jr nz, .flyAnimation
- ld a, (SFX_02_4c - SFX_Headers_02) / 3
+ ld a, $a0 ; (SFX_02_4c - SFX_Headers_02) / 3
call PlaySound
ld hl, wd732
bit 4, [hl] ; used dungeon warp?
@@ -17,7 +17,7 @@ EnterMapAnim: ; 70567 (1c:4567)
;res 4, [hl]
jr nz, .dungeonWarpAnimation
call PlayerSpinWhileMovingDown
- ld a, (SFX_02_4f - SFX_Headers_02) / 3
+ ld a, $a3 ; (SFX_02_4f - SFX_Headers_02) / 3
call PlaySound
call IsPlayerStandingOnWarpPadOrHole
ld a, b
@@ -55,7 +55,7 @@ EnterMapAnim: ; 70567 (1c:4567)
;ld bc, (BANK(BirdSprite) << 8) + $0c
;call CopyVideoData
call LoadBirdSpriteGraphics
- ld a, (SFX_02_50 - SFX_Headers_02) / 3
+ ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3
call PlaySound
ld hl, wFlyAnimUsingCoordList
xor a ; is using coord list
@@ -107,7 +107,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
dec a
jp nz, LeaveMapThroughHoleAnim
.spinWhileMovingUp
- ld a, (SFX_02_4b - SFX_Headers_02) / 3
+ ld a, $9f ; (SFX_02_4b - SFX_Headers_02) / 3
call PlaySound
ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY
ld a, -$10
@@ -141,7 +141,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta
xor a
ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue
- ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID
+ ld [hl], $a1 ; (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID
ld hl, wcd48
call PlayerSpinInPlace
jr .spinWhileMovingUp
@@ -154,7 +154,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
ld [hli], a ; wFlyAnimCounter
ld [hl], $c ; wFlyAnimBirdSpriteImageIndex
call DoFlyAnimation
- ld a, (SFX_02_50 - SFX_Headers_02) / 3
+ ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3
call PlaySound
ld hl, wFlyAnimUsingCoordList
xor a ; is using coord list
@@ -452,7 +452,7 @@ Func_70816: ; 70816 (1c:4816)
call LoadFontTilePatterns
ret
-Func_70842: ; 708a3 (1c:48a3)
+Func_708a3: ; 708a3 (1c:48a3)
ld a, [hl]
xor $1
ld [hl], a
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 4c2ac3b2..0624b61f 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -220,7 +220,7 @@ BuildTrainerCardPalPacket: ; 72025 (1c:6025)
ld de, wcc5b
ld bc, $40
call CopyData
- ld de, LoopCounts_71f8f
+ ld de, LoopCounts_7208b
ld hl, wcc5d
ld a, [W_OBTAINEDBADGES]
ld c, $8
@@ -255,7 +255,7 @@ BuildTrainerCardPalPacket: ; 72025 (1c:6025)
SendUnknownPalPacket_7205d:: ; 7205d (1c:605d)
ld hl,UnknownPalPacket_72811
- ld de,UnknownPacket_72611
+ ld de,BlkPacket_WholeScreen
ret
SendUnknownPalPacket_72064:: ; 72064 (1c:6064)
@@ -311,19 +311,19 @@ Func_720ad:: ; 720ad (1c:60ad)
ld a,e
and a
jr nz,Func_720bd
- ld hl,Pointer_727e1
+ ld hl,PalPacket_Generic
ld a,[hGBC]
and a
jp z,Func_721b4
jp Func_72346
Func_720bd:: ; 720bd (1c:60bd)
- ld hl,Func_72811
+ ld hl,UnknownPalPacket_72811
ld a,[hGBC]
and a
jp z,Func_721b4
call Func_72346
- ld hl,Pointer_727e1
+ ld hl,PalPacket_Generic
inc hl
ld a,[hli]
call Func_723fe
@@ -338,7 +338,7 @@ Func_720bd:: ; 720bd (1c:60bd)
ret
Func_720e3:: ; 720e3 (1c:60e3)
- ld hl,Pointer_72761
+ ld hl,PalPacket_Empty
ld de,wcf2d
ld bc,$10
call CopyData
@@ -357,7 +357,7 @@ Func_720e3:: ; 720e3 (1c:60e3)
.asm_72109
call Func_72346
.asm_7210c
- ld hl,UnknownPacket_72611
+ ld hl,BlkPacket_WholeScreen
ld de,wcf2d
ld bc,$10
call CopyData
@@ -433,7 +433,7 @@ SendBlkPacket_PartyMenu: ; 7217f (1c:617f)
ld bc, $30
jp CopyData
-Func_71fc2: ; 7218b (1c:618b)
+Func_7218b: ; 7218b (1c:618b)
ld hl, wcf1f
ld a, [wcf2d]
ld e, a
@@ -569,7 +569,7 @@ LoadSGB: ; 721f8 (1c:61f8)
jp SendSGBPacket
Func_72247: ; 72247 (1c:6247)
- ld hl, PointerTable_72089
+ ld hl, PointerTable_7225b
ld c, $9
.loop
push bc
@@ -587,14 +587,14 @@ Func_72247: ; 72247 (1c:6247)
PointerTable_7225b: ; 7225b (1c:625b)
dw MaskEnFreezePacket
- dw DataSnd_72548
- dw DataSnd_72558
- dw DataSnd_72568
- dw DataSnd_72578
- dw DataSnd_72588
- dw DataSnd_72598
- dw DataSnd_725a8
- dw DataSnd_725b8
+ dw DataSnd_728a1
+ dw DataSnd_728b1
+ dw DataSnd_728c1
+ dw DataSnd_728d1
+ dw DataSnd_728e1
+ dw DataSnd_728f1
+ dw DataSnd_72901
+ dw DataSnd_72911
CheckSGB: ; 7226d (1c:626d)
ld hl, MltReq2Packet
@@ -725,7 +725,7 @@ Func_72346: ; 72346 (1c:6346)
ld a,[hl]
and $f8
cp $20
- jp z,Func_7265e
+ jp z,Func_725be
inc hl
ld a,[hli]
inc hl
@@ -1133,12 +1133,37 @@ Func_725be:: ; 725be (1c:65be)
.asm_725d9
callba Func_bf450 ; 2f:7250
ret
+
+Pointer_725e2:: ; 725e2 (1c:65e2)
+ db $0c,$11,$66,$21,$66,$41,$66,$51,$61,$81,$1a,$66,$2d
+ db $cf,$5b,$cc,$31,$67,$2c,$cf,$51,$67
- dr $725e2,$734b9
-;INCLUDE "data/sgb_packets.asm"
+Func_725fb: ; 725fb (1c:65fb)
+ ld b, $80
+.loop
+ ld c, $10
+.asm_725ff
+ ld a, [hli]
+ ld [de], a
+ inc de
+ dec c
+ jr nz, .asm_725ff
+ ld c, $10
+ xor a
+.asm_72608
+ ld [de], a
+ inc de
+ dec c
+ jr nz, .asm_72608
+ dec b
+ jr nz, .loop
+ ret
+
+ ;dr $725e2,$734b9
+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
diff --git a/engine/predefs.asm b/engine/predefs.asm
index 30099dfe..859d4aec 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -52,102 +52,107 @@ GetPredefPointer: ; f67ed (3d:67ed)
PredefPointers:: ; f681d (3d:681d)
; these are pointers to ASM routines.
; they appear to be used in overworld map scripts.
- add_predef DrawPlayerHUDAndHPBar
- add_predef Func_3f0c6
- add_predef Func_3f073
- add_predef ScaleSpriteByTwo
- add_predef LoadMonBackPic
- add_predef Func_79aba
- add_predef LoadMissableObjects
- add_predef HealParty
- add_predef MoveAnimation; 08 play move animation
- add_predef DivideBCDPredef
- add_predef DivideBCDPredef2
- add_predef AddBCDPredef
- add_predef SubBCDPredef
- add_predef DivideBCDPredef3
- add_predef DivideBCDPredef4
- add_predef InitPlayerData
- add_predef FlagActionPredef
- add_predef HideObject
- add_predef IsObjectHidden
- add_predef ApplyOutOfBattlePoisonDamage
- add_predef AnyPartyAlive
- add_predef ShowObject
- add_predef ShowObject2
- add_predef ReplaceTileBlock
- add_predef InitPlayerData2
- add_predef LoadTilesetHeader
- add_predef LearnMoveFromLevelUp
- add_predef LearnMove
- add_predef IsItemInBag_
- dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0
- dbw $03,GiveItem
- add_predef ChangeBGPalColor0_4Frames
- add_predef FindPathToPlayer
- add_predef Func_480ff
- add_predef CalcPositionOfPlayerRelativeToNPC
- add_predef ConvertNPCMovementDirectionsToJoypadMasks
- add_predef Func_48125
- add_predef UpdateHPBar
- add_predef HPBarLength
- add_predef Diploma_TextBoxBorder
- add_predef DoubleOrHalveSelectedStats
- add_predef ShowPokedexMenu
- add_predef EvolutionAfterBattle
- add_predef SaveSAVtoSRAM0
- add_predef InitOpponent
- add_predef CableClub_Run
- add_predef DrawBadges
- add_predef ExternalClockTradeAnim
- add_predef BattleTransition
- add_predef CopyTileIDsFromList
- add_predef PlayIntro
- add_predef Func_79869
- add_predef FlashScreen
+ dr $f681d,$f68a1
+ ;add_predef DrawPlayerHUDAndHPBar
+ ;add_predef Func_3f0c6
+ ;add_predef Func_3f073
+ ;add_predef ScaleSpriteByTwo
+ ;add_predef LoadMonBackPic
+ ;add_predef Func_79aba
+ ;add_predef LoadMissableObjects
+ ;add_predef HealParty
+ ;add_predef MoveAnimation; 08 play move animation
+ ;add_predef DivideBCDPredef
+ ;add_predef DivideBCDPredef2
+ ;add_predef AddBCDPredef
+ ;add_predef SubBCDPredef
+ ;add_predef DivideBCDPredef3
+ ;add_predef DivideBCDPredef4
+ ;add_predef InitPlayerData
+ ;add_predef FlagActionPredef
+ ;add_predef HideObject
+ ;add_predef IsObjectHidden
+ ;add_predef ApplyOutOfBattlePoisonDamage
+ ;add_predef AnyPartyAlive
+ ;add_predef ShowObject
+ ;add_predef ShowObject2
+ ;add_predef ReplaceTileBlock
+ ;add_predef InitPlayerData2
+ ;add_predef LoadTilesetHeader
+ ;add_predef LearnMoveFromLevelUp
+ ;add_predef LearnMove
+ ;add_predef IsItemInBag_
+ ;dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0
+ ;dbw $03,GiveItem
+ ;add_predef ChangeBGPalColor0_4Frames
+ ;add_predef FindPathToPlayer
+ ;add_predef Func_480ff
+ ;add_predef CalcPositionOfPlayerRelativeToNPC
+ ;add_predef ConvertNPCMovementDirectionsToJoypadMasks
+ ;add_predef Func_48125
+ ;add_predef UpdateHPBar
+ ;add_predef HPBarLength
+ ;add_predef Diploma_TextBoxBorder
+ ;add_predef DoubleOrHalveSelectedStats
+ ;add_predef ShowPokedexMenu
+ ;add_predef EvolutionAfterBattle
+ ;add_predef SaveSAVtoSRAM0
+ ;add_predef InitOpponent
+CableClub_RunPredef::
+ dr $f68a1,$f68b9
+ ;add_predef CableClub_Run
+ ;add_predef DrawBadges
+ ;add_predef ExternalClockTradeAnim
+ ;add_predef BattleTransition
+ ;add_predef CopyTileIDsFromList
+ ;add_predef PlayIntro
+ ;add_predef Func_79869
+ ;add_predef FlashScreen
add_predef GetTileAndCoordsInFrontOfPlayer
- add_predef StatusScreen
- add_predef StatusScreen2
- add_predef InternalClockTradeAnim
- add_predef TrainerEngage
- add_predef IndexToPokedex
- add_predef Predef3B; 3B display pic?
- add_predef UsedCut
- add_predef ShowPokedexData
- add_predef WriteMonMoves
- add_predef SaveSAV
- add_predef LoadSGB
- add_predef MarkTownVisitedAndLoadMissableObjects
- add_predef SetPartyMonTypes
- add_predef CanLearnTM
- add_predef TMToMove
+ dr $f68bc,$f68e9
+ ;add_predef StatusScreen
+ ;add_predef StatusScreen2
+ ;add_predef InternalClockTradeAnim
+ ;add_predef TrainerEngage
+ ;add_predef IndexToPokedex
+ ;add_predef Predef3B; 3B display pic?
+ ;add_predef UsedCut
+ ;add_predef ShowPokedexData
+ ;add_predef WriteMonMoves
+ ;add_predef SaveSAV
+ ;add_predef LoadSGB
+ ;add_predef MarkTownVisitedAndLoadMissableObjects
+ ;add_predef SetPartyMonTypes
+ ;add_predef CanLearnTM
+ ;add_predef TMToMove
add_predef Func_71ddf
- add_predef StarterDex ; 46
- add_predef _AddPartyMon
- add_predef UpdateHPBar2
- add_predef DrawEnemyHUDAndHPBar
- add_predef LoadTownMap_Nest
- add_predef PrintMonType
- add_predef EmotionBubble; 4C player exclamation
- add_predef EmptyFunc3; return immediately
- add_predef AskName
- add_predef PewterGuys
- add_predef SaveSAVtoSRAM2
- add_predef LoadSAVCheckSum2
- add_predef LoadSAV
- add_predef SaveSAVtoSRAM1
- add_predef DoInGameTradeDialogue ; 54 initiate trade
- add_predef HallOfFamePC
- add_predef DisplayDexRating
- dbw $1E, _LeaveMapAnim ; wrong bank
- dbw $1E, EnterMapAnim ; wrong bank
- add_predef GetTileTwoStepsInFrontOfPlayer
- add_predef CheckForCollisionWhenPushingBoulder
- add_predef PrintStrengthTxt
- add_predef PickupItem
- add_predef PrintMoveType
- add_predef LoadMovePPs
- add_predef DrawHP ; 5F
- add_predef DrawHP2
- add_predef Func_1c9c6
- add_predef OaksAideScript
+ dr $f68e9,$f8000
+ ;add_predef StarterDex ; 46
+ ;add_predef _AddPartyMon
+ ;add_predef UpdateHPBar2
+ ;add_predef DrawEnemyHUDAndHPBar
+ ;add_predef LoadTownMap_Nest
+ ;add_predef PrintMonType
+ ;add_predef EmotionBubble; 4C player exclamation
+ ;add_predef EmptyFunc3; return immediately
+ ;add_predef AskName
+ ;add_predef PewterGuys
+ ;add_predef SaveSAVtoSRAM2
+ ;add_predef LoadSAVCheckSum2
+ ;add_predef LoadSAV
+ ;add_predef SaveSAVtoSRAM1
+ ;add_predef DoInGameTradeDialogue ; 54 initiate trade
+ ;add_predef HallOfFamePC
+ ;add_predef DisplayDexRating
+ ;dbw $1E, _LeaveMapAnim ; wrong bank
+ ;dbw $1E, EnterMapAnim ; wrong bank
+ ;add_predef GetTileTwoStepsInFrontOfPlayer
+ ;add_predef CheckForCollisionWhenPushingBoulder
+ ;add_predef PrintStrengthTxt
+ ;add_predef PickupItem
+ ;add_predef PrintMoveType
+ ;add_predef LoadMovePPs
+ ;add_predef DrawHP ; 5F
+ ;add_predef DrawHP2
+ ;add_predef Func_1c9c6
+ ;add_predef OaksAideScript
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 48e79d14..6b12c04b 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -40,7 +40,7 @@ Func_70ef4: ; 70ef4 (1c:4ef4)
Func_70f08: ; 70f08 (1c:4f08)
ld de, wHPBarMaxHP
- call Func_712f1
+ call Func_7137a
ld a, [de]
push hl
call Func_712e1
@@ -70,7 +70,7 @@ Func_70f08: ; 70f08 (1c:4f08)
ld b, a
and D_DOWN | D_UP | B_BUTTON | A_BUTTON
jr z, .asm_70f3e
- ld a, (SFX_02_3c - SFX_Headers_02) / 3
+ ld a, $8c ; (SFX_02_3c - SFX_Headers_02) / 3
call PlaySound
bit 6, b
jr nz, .asm_70f68
@@ -107,7 +107,7 @@ Func_70f08: ; 70f08 (1c:4f08)
ld a,[hJoy5]
and D_DOWN | D_UP | B_BUTTON | A_BUTTON
ret z
- callab Func_f4000
+ callab PrintBeginningBattleText
ret
INCLUDE "data/town_map_order.asm"
@@ -204,7 +204,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014)
jr z, .asm_7108d
bit 0, b
jr nz, .asm_710af
- ld a, (SFX_02_3c - SFX_Headers_02) / 3
+ ld a, $8c ; (SFX_02_3c - SFX_Headers_02) / 3
call PlaySound
bit 6, b
jr nz, .asm_710cd
@@ -212,7 +212,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014)
jr nz, .asm_710e3
jr .asm_710c0
.asm_710af
- ld a, (SFX_02_3e - SFX_Headers_02) / 3
+ ld a, $8e ; (SFX_02_3e - SFX_Headers_02) / 3
call PlaySound
ld a, [hl]
ld [wDestinationMap], a
@@ -296,7 +296,7 @@ LoadTownMap: ; 71126 (1c:5126)
ld de, vChars2 + $600
ld bc, $100
ld a, BANK(WorldMapTileGraphics)
- call FarCopyData2
+ call FarCopyData
ld hl, MonNestIcon ; $574b
ld de, vSprites + $40
ld bc, $8
@@ -348,13 +348,13 @@ Func_71235: ; 71235 (1c:5235)
call UpdateSprites
jp GoPAL_SET_CF1C
-Func_711c4: ; 7124e (1c:524e)
+Func_7124e: ; 7124e (1c:524e)
push af
ld a, b
ld [wcd5b], a
pop af
ld de, wHPBarMaxHP
- call Func_712f1
+ call Func_7137a
ld a, [de]
push hl
call Func_712e1
@@ -372,7 +372,7 @@ Func_711c4: ; 7124e (1c:524e)
ld bc, $a0
jp CopyData
-Func_71279: ; 711ef (1c:51ef)
+Func_71279: ; 71279 (1c:5279)
callba FindWildLocationsOfMon
call Func_71362
ld hl, wOAMBuffer
@@ -553,7 +553,7 @@ Func_7137a: ; 7137a (1c:537a)
cp REDS_HOUSE_1F
jr c, .asm_7138d
ld bc, $4
- ld hl, InternalMapEntries ; $5382
+ ld hl, InternalMapEntries ; $540b
.asm_71384
cp [hl]
jr c, .asm_7138a
@@ -563,7 +563,7 @@ Func_7137a: ; 7137a (1c:537a)
inc hl
jr .asm_71384
.asm_7138d
- ld hl, ExternalMapEntries ; $5313
+ ld hl, ExternalMapEntries ; $539c
ld c, a
ld b, $0
add hl, bc
@@ -576,15 +576,18 @@ Func_7137a: ; 7137a (1c:537a)
ld h, [hl]
ld l, a
ret
-
-INCBIN "baserom.gbc",$7139c,$71753 - $7139c
-
+
+ExternalMapEntries: ; 7139c (1c:539c)
+ dr $7139c,$7140b
+InternalMapEntries: ; 7140b (1c:540b)
+ dr $7140b,$7174b
+
;INCLUDE "data/town_map_entries.asm"
;INCLUDE "text/map_names.asm" ; TODO: relabel addresses
-;MonNestIcon: ; 716be (1c:56be) ; relabel this too
-; INCBIN "gfx/mon_nest_icon.1bpp"
+MonNestIcon: ; 7174b (1c:574b) ; relabel this too
+ INCBIN "gfx/mon_nest_icon.1bpp"
TownMapSpriteBlinkingAnimation: ; 71753 (1c:5753)
ld a, [wTownMapSpriteBlinkingCounter]
diff --git a/yellow/main.asm b/yellow/main.asm
index b942f5e5..c296ad5e 100755
--- a/yellow/main.asm
+++ b/yellow/main.asm
@@ -347,7 +347,9 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c1e6 (3:41e6)
INCLUDE "data/warp_tile_ids.asm"
PrintSafariZoneSteps:: ; c27b (3:427b)
- dr $c27b,$cb62
+ dr $c27b,$c2d4
+_GetTileAndCoordsInFrontOfPlayer:: ; c2d4 (3:42d4)
+ dr $c2d4,$cb62
LoadWildData:: ; cb62 (3:4b62)
dr $cb62,$d2ed
UseItem_:: ; d2ed (3:52ed)
@@ -357,8 +359,10 @@ TossItem_:: ; e635 (3:6635)
IsKeyItem_:: ; e6a8 (3:66a8)
dr $e6a8,$e808
IsNextTileShoreOrWater:: ; e808 (3:6808)
- dr $e808,$e91b
-
+ dr $e808,$e848
+FindWildLocationsOfMon:: ; e848 (3:6848)
+ dr $e848,$e91b
+
GymLeaderFaceAndBadgeTileGraphics: ; e91b (3:691b)
INCBIN "gfx/badges.2bpp"
@@ -888,7 +892,11 @@ CryData:: ; 39462 (e:5462)
TrainerPicAndMoneyPointers:: ; 39893 (e:5893)
dr $39893,$3997e
TrainerNames:: ; 3997e (e:597e)
- dr $3997e,$3aa68
+ dr $3997e,$3a8df
+DrawAllPokeballs: ; 3a8df (e:68df)
+ dr $3a8df,$3a9e9
+SetupPlayerAndEnemyPokeballs: ; 3a9e9 (e:69e9)
+ dr $3a9e9,$3aa68
TradingAnimationGraphics:
INCBIN "gfx/game_boy.norepeat.2bpp"
@@ -905,7 +913,9 @@ SECTION "bank0F",ROMX,BANK[$0F]
dr $3c000,$3cae8
AnyPartyAlive:: ; 3cae8 (f:4ae8)
- dr $3cae8,$40000
+ dr $3cae8,$3ec87
+LoadEnemyMonData: ; 3ec87 (f:6c87)
+ dr $3ec87,$40000
SECTION "bank10",ROMX,BANK[$10]
@@ -1042,13 +1052,16 @@ INCLUDE "engine/town_map.asm"
AnimatePartyMon_ForceSpeed1:: ; 71784 (1c:5784)
dr $71784,$7178c
AnimatePartyMon:: ; 7178c (1c:578c)
- dr $7178c,$71eb3
-
+ dr $7178c,$717fe
+LoadAnimSpriteGfx: ; 717fe (1c:57fe)
+ dr $717fe,$71eb3
INCLUDE "engine/palettes.asm"
-PokemonYellowGraphics: INCBIN "gfx/pokemon_yellow.t6.2bpp"
+;PokemonYellowGraphics: INCBIN "gfx/pokemon_yellow.t6.2bpp"
- dr $73959,$74000
+ dr $73959,$73e2e
+SaveHallOfFameTeams: ; 73e2e (1c:7e2e)
+ dr $73e2e,$74000
SECTION "bank1D",ROMX,BANK[$1D]
@@ -1059,8 +1072,11 @@ VendingMachineMenu:: ; 74726 (1d:4726)
SECTION "bank1E",ROMX,BANK[$1E]
- dr $78000,$7a19a
-
+ dr $78000,$78757
+AnimationTileset2: ; 78757 (1e:4857)
+ dr $78757,$798d4
+Func_798d4: ; 798d4 (1e:58d4)
+ dr $798d4,$7a19a
RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp"
RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp"
RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp"
@@ -1111,9 +1127,10 @@ SECTION "bank25",ROMX,BANK[$25]
SECTION "bank2f",ROMX[$5000],BANK[$2F]
- dr $bd000,$c0000
-
-
+ dr $bd000,$bf450
+Func_bf450:: ; bf450 (2f:7450)
+ dr $bf450,$c0000
+
SECTION "bank30",ROMX,BANK[$30]
dr $c0000,$c4000
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 21:59:05 +0000