diff options
| -rw-r--r-- | common.asm | 59 | ||||
| -rw-r--r-- | constants.asm | 284 | ||||
| -rw-r--r-- | extras/print_pc_items.py | 4 | ||||
| -rw-r--r-- | music/PalletTownCh1.md | bin | 0 -> 154 bytes | |||
| -rw-r--r-- | music/PalletTownCh2.md | bin | 0 -> 127 bytes | |||
| -rw-r--r-- | music/PalletTownCh3.md | bin | 0 -> 408 bytes |
6 files changed, 181 insertions, 166 deletions
@@ -2973,13 +2973,14 @@ INCBIN "baserom.gbc",$8000,$822E - $8000 ;Pallet Town PalletTown_mh: ;0x822E - 0x8236 + db $80 - dw $67C5 ;Channel 1 + dw PalletTown_md_1 ;Channel 1 ($A7C5) db $01 - dw $685F ;Channel 2 + dw PalletTown_md_2 ;Channel 2 ($A85f) db $02 - dw $68DE ;Channel 3 - + dw PalletTown_md_3 ;Channel 3 ($A8DE) + ;Pokemon Center Pokecenter_mh: ;0x8237 - 0x823F db $80 @@ -2998,7 +2999,7 @@ db $01 db $02 dw $7DFA ;Channel 3 -;Viridian City, Pewter City, Saffron City +;Viridian City, Pewter City, Saffron City Cities1_mh: ;0x8249 - 0x8254 db $C0 dw $6A76 ;Channel 1 @@ -3008,7 +3009,7 @@ db $02 dw $6C32 ;Channel 3 db $03 dw $6CEF ;Channel 4 - + ;Cerulean City, Fuchsia City Cities2_mh: ;0x8255 - 0x825D db $80 @@ -3017,7 +3018,7 @@ db $01 dw $7569 ;Channel 2 db $02 dw $7640 ;Channel 3 - + ;Celedon City Celedon_mh: ;0x825E - 0x8266 db $80 @@ -3026,7 +3027,7 @@ db $01 dw $773A ;Channel 2 db $02 dw $77B5 ;Channel 3 - + ;Cinnabar Island Cinnabar_mh: ;0x8267-0x826F db $80 @@ -3035,7 +3036,7 @@ db $01 dw $78D4 ;Channel 2 db $02 dw $793D ;Channel 3 - + ;Vermillion City Vermillion_mh: ;0x8270 - 0x827B db $C0 @@ -3046,7 +3047,7 @@ db $02 dw $7AA6 ;Channel 3 db $03 dw $7B0D ;Channel 4 - + ;Lavender Town Lavender_mh: ;0x827C - 0x8287 db $C0 @@ -3057,7 +3058,7 @@ db $02 dw $7BAE ;Channel 3 db $03 dw $7C21 ;Channel 4 - + ;SS Anne SSAnne_mh: ;0x8288 - 0x8290 db $80 @@ -3066,7 +3067,7 @@ db $01 dw $7419 ;Channel 2 db $02 dw $74CB ;Channel 3 - + ;Meet Prof. Oak MeetProfOak_mh: ;0x8291 - 0x8299 db $80 @@ -3075,7 +3076,7 @@ db $01 dw $6FA9 ;Channel 2 db $02 dw $703D ;Channel 3 - + ;Meet Rival MeetRival_mh: ;0x829A - 0x82A2 db $80 @@ -3084,7 +3085,7 @@ db $01 dw $71BB ;Channel 2 db $02 dw $7233 ;Channel 3 - + ;Guy walks you to museum MuseumGuy_mh: ;0x82A3 - 0x82AE db $C0 @@ -3095,7 +3096,7 @@ db $02 dw $6E6E ;Channel 3 db $03 dw $6ED1 ;Channel 4 - + ;Safari Zone SafariZone_mh: ;0x82AF - 0x82B7 db $80 @@ -3104,7 +3105,7 @@ db $01 dw $7C6A ;Channel 2 db $02 dw $7C94 ;Channel 3 - + ;Pokemon Get Healed PkmnHealed_mh: ;0x82B8 - 0x82C0 db $80 @@ -3113,7 +3114,7 @@ db $01 dw $5BC4 ;Channel 2 db $02 dw $5BD2 ;Channel 3 - + ;Routes 1 and 2 Routes1_mh: ;0x82C1 - 0x82CC db $C0 @@ -3124,7 +3125,7 @@ db $02 dw $5CD8 ;Channel 3 db $03 dw $5D24 ;Channel 4 - + ;Routes 24 and 25 Routes2_mh: ;0x82CD - 0x82D8 db $C0 @@ -3135,7 +3136,7 @@ db $02 dw $5E9B ;Channel 3 db $03 dw $5F08 ;Channel 4 - + ;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Routes3_mh: ;0x82D9 - 0x82E4 db $C0 @@ -3146,7 +3147,7 @@ db $02 dw $607F ;Channel 3 db $03 dw $6131 ;Channel 4 - + ;Routes 11, 12, 13, 14, 15 Routes4_mh: ;0x82E5 - 0x82F0 db $C0 @@ -3157,7 +3158,7 @@ db $02 dw $63C4 ;Channel 3 db $03 dw $649D ;Channel 4 - + ;Indigo Plateau IndigoPlateau_mh: ;0x82F1 - 0x82FC db $C0 @@ -3169,7 +3170,21 @@ db $02 db $03 dw $670F ;Channel 4 -INCBIN "baserom.gbc",$82FD,$C000 - $82FD +INCBIN "baserom.gbc",$82FD,$A7C5 - $82FD + +; Music Data +; The start and stop of these byte ranges were based off the theory they're lined +; consecutively (Right up against each other). +PalletTown_md_1: +INCBIN "music/PalletTownCh1.md" ;0xA7C5-0xA85E (153 bytes) + +PalletTown_md_2: +INCBIN "music/PalletTownCh2.md" ;0xA85F-0xA8DD (126 bytes) + +PalletTown_md_3: +INCBIN "music/PalletTownCh3.md" ;0xA8DE-0xAA75 (407 bytes) ;Suspiciously Big + +INCBIN "baserom.gbc",$AA76,$C000 - $AA76 SECTION "bank3",DATA,BANK[$3] diff --git a/constants.asm b/constants.asm index 05e81a5d..dd78131a 100644 --- a/constants.asm +++ b/constants.asm @@ -162,46 +162,46 @@ W_NUMINPARTY EQU $D163 W_NUMBAGITEMS EQU $D31D ; BAGITEM01 is an item id ; BAGCOUNT01 is how many of this item -W_BAGITEM01 EQU $D31E -W_BAGCOUNT01 EQU $D31F -W_BAGITEM02 EQU $D320 -W_BAGCOUNT02 EQU $D321 -W_BAGITEM03 EQU $D322 -W_BAGCOUNT03 EQU $D323 -W_BAGITEM04 EQU $D324 -W_BAGCOUNT04 EQU $D325 -W_BAGITEM05 EQU $D326 -W_BAGCOUNT05 EQU $D327 -W_BAGITEM06 EQU $D328 -W_BAGCOUNT06 EQU $D329 -W_BAGITEM07 EQU $D32A -W_BAGCOUNT07 EQU $D32B -W_BAGITEM08 EQU $D32C -W_BAGCOUNT08 EQU $D32D -W_BAGITEM09 EQU $D32E -W_BAGCOUNT09 EQU $D32F -W_BAGITEM10 EQU $D330 -W_BAGCOUNT10 EQU $D331 -W_BAGITEM11 EQU $D332 -W_BAGCOUNT11 EQU $D333 -W_BAGITEM12 EQU $D334 -W_BAGCOUNT12 EQU $D335 -W_BAGITEM13 EQU $D336 -W_BAGCOUNT13 EQU $D337 -W_BAGITEM14 EQU $D338 -W_BAGCOUNT14 EQU $D339 -W_BAGITEM15 EQU $D33A -W_BAGCOUNT15 EQU $D33B -W_BAGITEM16 EQU $D33C -W_BAGCOUNT16 EQU $D33D -W_BAGITEM17 EQU $D33E -W_BAGCOUNT17 EQU $D33F -W_BAGITEM18 EQU $D340 -W_BAGCOUNT18 EQU $D341 -W_BAGITEM19 EQU $D342 -W_BAGCOUNT19 EQU $D343 -W_BAGITEM20 EQU $D344 -W_BAGCOUNT20 EQU $D345 +W_BAGITEM01 EQU $D31E +W_BAGITEM01QTY EQU $D31F +W_BAGITEM02 EQU $D320 +W_BAGITEM02QTY EQU $D321 +W_BAGITEM03 EQU $D322 +W_BAGITEM03QTY EQU $D323 +W_BAGITEM04 EQU $D324 +W_BAGITEM04QTY EQU $D325 +W_BAGITEM05 EQU $D326 +W_BAGITEM05QTY EQU $D327 +W_BAGITEM06 EQU $D328 +W_BAGITEM06QTY EQU $D329 +W_BAGITEM07 EQU $D32A +W_BAGITEM07QTY EQU $D32B +W_BAGITEM08 EQU $D32C +W_BAGITEM08QTY EQU $D32D +W_BAGITEM09 EQU $D32E +W_BAGITEM09QTY EQU $D32F +W_BAGITEM10 EQU $D330 +W_BAGITEM10QTY EQU $D331 +W_BAGITEM11 EQU $D332 +W_BAGITEM11QTY EQU $D333 +W_BAGITEM12 EQU $D334 +W_BAGITEM12QTY EQU $D335 +W_BAGITEM13 EQU $D336 +W_BAGITEM13QTY EQU $D337 +W_BAGITEM14 EQU $D338 +W_BAGITEM14QTY EQU $D339 +W_BAGITEM15 EQU $D33A +W_BAGITEM15QTY EQU $D33B +W_BAGITEM16 EQU $D33C +W_BAGITEM16QTY EQU $D33D +W_BAGITEM17 EQU $D33E +W_BAGITEM17QTY EQU $D33F +W_BAGITEM18 EQU $D340 +W_BAGITEM18QTY EQU $D341 +W_BAGITEM19 EQU $D342 +W_BAGITEM19QTY EQU $D343 +W_BAGITEM20 EQU $D344 +W_BAGITEM20QTY EQU $D345 ; money is in decimal W_PLAYERMONEY3 EQU $D347 @@ -473,108 +473,108 @@ W_NUMINBOX EQU $DA80 ;number of items in box W_NUMBOXITEMS EQU $D53A -; BOXITEM01 is an item id -; BOXCOUNT01 is how many of this item -W_BOXITEM01 EQU $D53B -W_BOXCOUNT01 EQU $D53C -W_BOXITEM02 EQU $D53D -W_BOXCOUNT02 EQU $D53E -W_BOXITEM03 EQU $D53F -W_BOXCOUNT03 EQU $D540 -W_BOXITEM04 EQU $D541 -W_BOXCOUNT04 EQU $D542 -W_BOXITEM05 EQU $D543 -W_BOXCOUNT05 EQU $D544 -W_BOXITEM06 EQU $D545 -W_BOXCOUNT06 EQU $D546 -W_BOXITEM07 EQU $D547 -W_BOXCOUNT07 EQU $D548 -W_BOXITEM08 EQU $D549 -W_BOXCOUNT08 EQU $D54A -W_BOXITEM09 EQU $D54B -W_BOXCOUNT09 EQU $D54C -W_BOXITEM10 EQU $D54D -W_BOXCOUNT10 EQU $D54E -W_BOXITEM11 EQU $D54F -W_BOXCOUNT11 EQU $D550 -W_BOXITEM12 EQU $D551 -W_BOXCOUNT12 EQU $D552 -W_BOXITEM13 EQU $D553 -W_BOXCOUNT13 EQU $D554 -W_BOXITEM14 EQU $D555 -W_BOXCOUNT14 EQU $D556 -W_BOXITEM15 EQU $D557 -W_BOXCOUNT15 EQU $D558 -W_BOXITEM16 EQU $D559 -W_BOXCOUNT16 EQU $D55A -W_BOXITEM17 EQU $D55B -W_BOXCOUNT17 EQU $D55C -W_BOXITEM18 EQU $D55D -W_BOXCOUNT18 EQU $D55E -W_BOXITEM19 EQU $D55F -W_BOXCOUNT19 EQU $D560 -W_BOXITEM20 EQU $D561 -W_BOXCOUNT20 EQU $D562 -W_BOXITEM21 EQU $D563 -W_BOXCOUNT21 EQU $D564 -W_BOXITEM22 EQU $D565 -W_BOXCOUNT22 EQU $D566 -W_BOXITEM23 EQU $D567 -W_BOXCOUNT23 EQU $D568 -W_BOXITEM24 EQU $D569 -W_BOXCOUNT24 EQU $D56A -W_BOXITEM25 EQU $D56B -W_BOXCOUNT25 EQU $D56C -W_BOXITEM26 EQU $D56D -W_BOXCOUNT26 EQU $D56E -W_BOXITEM27 EQU $D56F -W_BOXCOUNT27 EQU $D570 -W_BOXITEM28 EQU $D571 -W_BOXCOUNT28 EQU $D572 -W_BOXITEM29 EQU $D573 -W_BOXCOUNT29 EQU $D574 -W_BOXITEM30 EQU $D575 -W_BOXCOUNT30 EQU $D576 -W_BOXITEM31 EQU $D577 -W_BOXCOUNT31 EQU $D578 -W_BOXITEM32 EQU $D579 -W_BOXCOUNT32 EQU $D57A -W_BOXITEM33 EQU $D57B -W_BOXCOUNT33 EQU $D57C -W_BOXITEM34 EQU $D57D -W_BOXCOUNT34 EQU $D57E -W_BOXITEM35 EQU $D57F -W_BOXCOUNT35 EQU $D580 -W_BOXITEM36 EQU $D581 -W_BOXCOUNT36 EQU $D582 -W_BOXITEM37 EQU $D583 -W_BOXCOUNT37 EQU $D584 -W_BOXITEM38 EQU $D585 -W_BOXCOUNT38 EQU $D586 -W_BOXITEM39 EQU $D587 -W_BOXCOUNT39 EQU $D588 -W_BOXITEM40 EQU $D589 -W_BOXCOUNT40 EQU $D58A -W_BOXITEM41 EQU $D58B -W_BOXCOUNT41 EQU $D58C -W_BOXITEM42 EQU $D58D -W_BOXCOUNT42 EQU $D58E -W_BOXITEM43 EQU $D58F -W_BOXCOUNT43 EQU $D590 -W_BOXITEM44 EQU $D591 -W_BOXCOUNT44 EQU $D592 -W_BOXITEM45 EQU $D593 -W_BOXCOUNT45 EQU $D594 -W_BOXITEM46 EQU $D595 -W_BOXCOUNT46 EQU $D596 -W_BOXITEM47 EQU $D597 -W_BOXCOUNT47 EQU $D598 -W_BOXITEM48 EQU $D599 -W_BOXCOUNT48 EQU $D59A -W_BOXITEM49 EQU $D59B -W_BOXCOUNT49 EQU $D59C -W_BOXITEM50 EQU $D59D -W_BOXCOUNT50 EQU $D59E +; BOXITEM01 is an item id +; BOXITEM01QTY is how many of this item +W_BOXITEM01 EQU $D53B +W_BOXITEM01QTY EQU $D53C +W_BOXITEM02 EQU $D53D +W_BOXITEM02QTY EQU $D53E +W_BOXITEM03 EQU $D53F +W_BOXITEM03QTY EQU $D540 +W_BOXITEM04 EQU $D541 +W_BOXITEM04QTY EQU $D542 +W_BOXITEM05 EQU $D543 +W_BOXITEM05QTY EQU $D544 +W_BOXITEM06 EQU $D545 +W_BOXITEM06QTY EQU $D546 +W_BOXITEM07 EQU $D547 +W_BOXITEM07QTY EQU $D548 +W_BOXITEM08 EQU $D549 +W_BOXITEM08QTY EQU $D54A +W_BOXITEM09 EQU $D54B +W_BOXITEM09QTY EQU $D54C +W_BOXITEM10 EQU $D54D +W_BOXITEM10QTY EQU $D54E +W_BOXITEM11 EQU $D54F +W_BOXITEM11QTY EQU $D550 +W_BOXITEM12 EQU $D551 +W_BOXITEM12QTY EQU $D552 +W_BOXITEM13 EQU $D553 +W_BOXITEM13QTY EQU $D554 +W_BOXITEM14 EQU $D555 +W_BOXITEM14QTY EQU $D556 +W_BOXITEM15 EQU $D557 +W_BOXITEM15QTY EQU $D558 +W_BOXITEM16 EQU $D559 +W_BOXITEM16QTY EQU $D55A +W_BOXITEM17 EQU $D55B +W_BOXITEM17QTY EQU $D55C +W_BOXITEM18 EQU $D55D +W_BOXITEM18QTY EQU $D55E +W_BOXITEM19 EQU $D55F +W_BOXITEM19QTY EQU $D560 +W_BOXITEM20 EQU $D561 +W_BOXITEM20QTY EQU $D562 +W_BOXITEM21 EQU $D563 +W_BOXITEM21QTY EQU $D564 +W_BOXITEM22 EQU $D565 +W_BOXITEM22QTY EQU $D566 +W_BOXITEM23 EQU $D567 +W_BOXITEM23QTY EQU $D568 +W_BOXITEM24 EQU $D569 +W_BOXITEM24QTY EQU $D56A +W_BOXITEM25 EQU $D56B +W_BOXITEM25QTY EQU $D56C +W_BOXITEM26 EQU $D56D +W_BOXITEM26QTY EQU $D56E +W_BOXITEM27 EQU $D56F +W_BOXITEM27QTY EQU $D570 +W_BOXITEM28 EQU $D571 +W_BOXITEM28QTY EQU $D572 +W_BOXITEM29 EQU $D573 +W_BOXITEM29QTY EQU $D574 +W_BOXITEM30 EQU $D575 +W_BOXITEM30QTY EQU $D576 +W_BOXITEM31 EQU $D577 +W_BOXITEM31QTY EQU $D578 +W_BOXITEM32 EQU $D579 +W_BOXITEM32QTY EQU $D57A +W_BOXITEM33 EQU $D57B +W_BOXITEM33QTY EQU $D57C +W_BOXITEM34 EQU $D57D +W_BOXITEM34QTY EQU $D57E +W_BOXITEM35 EQU $D57F +W_BOXITEM35QTY EQU $D580 +W_BOXITEM36 EQU $D581 +W_BOXITEM36QTY EQU $D582 +W_BOXITEM37 EQU $D583 +W_BOXITEM37QTY EQU $D584 +W_BOXITEM38 EQU $D585 +W_BOXITEM38QTY EQU $D586 +W_BOXITEM39 EQU $D587 +W_BOXITEM39QTY EQU $D588 +W_BOXITEM40 EQU $D589 +W_BOXITEM40QTY EQU $D58A +W_BOXITEM41 EQU $D58B +W_BOXITEM41QTY EQU $D58C +W_BOXITEM42 EQU $D58D +W_BOXITEM42QTY EQU $D58E +W_BOXITEM43 EQU $D58F +W_BOXITEM43QTY EQU $D590 +W_BOXITEM44 EQU $D591 +W_BOXITEM44QTY EQU $D592 +W_BOXITEM45 EQU $D593 +W_BOXITEM45QTY EQU $D594 +W_BOXITEM46 EQU $D595 +W_BOXITEM46QTY EQU $D596 +W_BOXITEM47 EQU $D597 +W_BOXITEM47QTY EQU $D598 +W_BOXITEM48 EQU $D599 +W_BOXITEM48QTY EQU $D59A +W_BOXITEM49 EQU $D59B +W_BOXITEM49QTY EQU $D59C +W_BOXITEM50 EQU $D59D +W_BOXITEM50QTY EQU $D59E ;box end of list $D59F ; coins are in decimal diff --git a/extras/print_pc_items.py b/extras/print_pc_items.py index 0fedbedd..7b9dc6c3 100644 --- a/extras/print_pc_items.py +++ b/extras/print_pc_items.py @@ -4,6 +4,6 @@ #spit out some constants for x in range(1, 51): - print "BOXITEM%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2))).upper()) - print "BOXCOUNT%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2)+1)).upper()) + print "W_BOXITEM%.2d EQU $%s" % (x, ("%.2x" % (0xd539+(x*2))).upper()) + print "W_BOXITEM%.2dQTY EQU $%s" % (x, ("%.2x" % (0xd539+(x*2)+1)).upper()) diff --git a/music/PalletTownCh1.md b/music/PalletTownCh1.md Binary files differnew file mode 100644 index 00000000..db9403fd --- /dev/null +++ b/music/PalletTownCh1.md diff --git a/music/PalletTownCh2.md b/music/PalletTownCh2.md Binary files differnew file mode 100644 index 00000000..6a30c6c3 --- /dev/null +++ b/music/PalletTownCh2.md diff --git a/music/PalletTownCh3.md b/music/PalletTownCh3.md Binary files differnew file mode 100644 index 00000000..50d23d05 --- /dev/null +++ b/music/PalletTownCh3.md |