diff --git a/README.md b/README.md index 2458f3f..995ad76 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,16 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co - Seasick: Kris running sprite - Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FeMC sprites. +## Music Credits + +### JEP Developers +JEP-affiliated musicians require music to be used with direct credit for non-commerical purposes. Credit the musician in any case of using them. +- LuciShrimp: Most of the new music in JEP. If it's not by someone else it is most likely from her. +- Zeta_Null: Sinjoh Ruins theme, Silent Hills + +### Unaffiliated +- FroggestSpirit: HGSS Poke Mart Demix + ## Other Sources - Nob Ogasawara (Many prototype Pokemon names) - ImportedCheese (Japanese speaker who named Hyoshu) diff --git a/audio.asm b/audio.asm index adb3236..aa23e62 100644 --- a/audio.asm +++ b/audio.asm @@ -165,6 +165,7 @@ INCLUDE "audio/music/NihonTrainerBattle.asm" INCLUDE "audio/music/NorthCity.asm" INCLUDE "audio/music/Tanoby01.asm" INCLUDE "audio/music/silenthills.asm" +INCLUDE "audio/music/mart.asm" SECTION "Sound Effects", ROMX diff --git a/audio/music/mart.asm b/audio/music/mart.asm new file mode 100644 index 0000000..1af40b4 --- /dev/null +++ b/audio/music/mart.asm @@ -0,0 +1,1004 @@ +; Pokémon HG/SS - Poké Mart +; Demixed by FroggestSpirit +; https://github.com/froggestspirit/CrystalComplete/blob/master/audio/music/custom/shop.asm + +;Music_MartHGSS: +Music_Mart: + dbw $c0, Music_MartHGSS_Ch1 + dbw $01, Music_MartHGSS_Ch2 + dbw $02, Music_MartHGSS_Ch3 + dbw $03, Music_MartHGSS_Ch4 + +Music_MartHGSS_Ch1: + tempo $90 + volume $77 + dutycycle 1 + notetype $C, $B2 + stereopanning $f + octave 4 + note C#, 4 + note C#, 4 + note C_, 2 + note C_, 4 + octave 3 + note B_, 6 + note A#, 12 +Music_MartHGSS_Loop1: + note D#, 4 + octave 2 + note A#, 2 + octave 3 + note D#, 4 + octave 2 + note F#, 4 + octave 3 + note D#, 4 + octave 2 + note F#, 2 + note B_, 2 + note F#, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 2 + note A_, 4 + note F#, 2 + octave 3 + note D#, 4 + octave 2 + note A_, 4 + octave 3 + note D#, 4 + octave 2 + note F#, 2 + note A_, 2 + note F#, 4 + octave 3 + note D#, 4 + octave 2 + note A_, 2 + note G#, 4 + note B_, 2 + note E_, 4 + note B_, 4 + note G#, 4 + note F_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 4 + octave 3 + note D_, 4 + note F_, 2 + note B_, 4 + note F#, 2 + note B_, 2 + note F#, 2 + intensity $B4 + note F_, 2 + note F#, 2 + note G#, 2 + note A#, 16 + dutycycle 2 + note A#, 4 + note B_, 2 + note D#, 4 + note F#, 4 + note D#, 1 + note F#, 1 + note B_, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note A_, 4 + note B_, 2 + note D#, 4 + note F#, 4 + note D#, 1 + note F#, 1 + note A_, 2 + note D#, 2 + note F#, 2 + note B_, 4 + note A_, 4 + note F#, 1 + note A_, 1 + note B_, 4 + note B_, 2 + note E_, 4 + note B_, 4 + note E_, 4 + octave 2 + note F_, 2 + octave 3 + note D_, 2 + note F_, 4 + note D_, 4 + note G#, 2 + note B_, 4 + note F#, 2 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A#, 8 + note E_, 2 + note C#, 2 + note F#, 2 + note E_, 2 + intensity $B1 + dutycycle 0 + note D#, 2 + octave 2 + note G_, 2 + note A#, 2 + note G_, 4 + note A#, 4 + octave 3 + note D#, 4 + octave 2 + note G_, 2 + note A#, 2 + note G_, 4 + octave 3 + note D#, 4 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note G#, 2 + note B_, 2 + note G#, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 4 + note G#, 2 + note B_, 2 + note G#, 4 + octave 3 + note D#, 4 + octave 2 + note G#, 2 + intensity $B4 + dutycycle 1 + octave 3 + note G_, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + octave 4 + note D#, 1 + note D_, 1 + note D#, 2 + note F_, 1 + note E_, 1 + note F_, 2 + note G_, 1 + note F#, 1 + note G_, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + octave 3 + note B_, 4 + note D#, 4 + note C#, 4 + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note B_, 4 + note D#, 4 + octave 2 + note G#, 2 + intensity $B2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G#, 4 + note B_, 4 + note D#, 2 + note D_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note G#, 4 + note F_, 4 + note D_, 2 + note C#, 2 + octave 2 + note F#, 2 + note A#, 2 + octave 3 + note C#, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + note A#, 10 + loopchannel 0, Music_MartHGSS_Loop1 + +Music_MartHGSS_Ch2: + dutycycle 2 + notetype $C, $B1 + stereopanning $f + octave 4 + note F#, 4 + note F#, 4 + note F#, 2 + note F#, 4 + note F#, 6 + intensity $C5 + note F#, 6 + dutycycle 1 + stereopanning $ff + octave 3 + note F#, 2 + note G#, 2 + note A#, 2 +Music_MartHGSS_Loop2: + octave 4 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 + note D#, 2 + note D_, 2 + note D#, 2 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 2 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 + note D#, 2 + note D_, 2 + note D#, 2 + note G#, 6 + note E_, 1 + note D#, 1 + note C#, 2 + note D#, 3 + octave 3 + note G#, 1 + octave 4 + note E_, 2 + note C#, 12 + octave 3 + note G#, 6 + note A#, 4 + note B_, 4 + octave 4 + note D#, 6 + note E_, 1 + note D#, 1 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + intensity $C2 + octave 4 + note C#, 8 + note B_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + intensity $C5 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 + note D#, 6 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 + notetype 6, $C5 + note D#, 11 + note G_, 1 + note G#, 8 + note F#, 8 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 6 + octave 3 + note G#, 2 + octave 4 + note E_, 4 + note C#, 16 + note __, 8 + octave 3 + note G#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note G#, 4 + note A#, 4 + note B_, 3 + octave 4 + note D_, 1 + note D#, 12 + note E_, 2 + note D#, 2 + note C#, 4 + octave 3 + note B_, 4 + note A#, 4 + note B_, 4 + notetype $C, $C5 + octave 4 + note C#, 12 + dutycycle 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 4 + note D#, 4 + note D#, 2 + note D_, 2 + notetype 6, $C5 + note D#, 3 + note G#, 1 + note A#, 12 + note G_, 8 + note D#, 8 + note C#, 8 + note C#, 6 + note C#, 1 + note D_, 1 + note D#, 4 + octave 3 + note B_, 8 + note A#, 4 + note B_, 4 + octave 4 + note C#, 12 + note D#, 4 + note G#, 12 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + note D#, 8 + note D#, 8 + note D#, 4 + note D_, 4 + note D#, 3 + note G#, 1 + note A#, 12 + note G_, 2 + note F#, 2 + note G_, 4 + note G#, 2 + note G_, 2 + note G#, 4 + note A#, 2 + note A_, 2 + note A#, 4 + note A#, 8 + note B_, 4 + note G#, 8 + note G_, 4 + note G#, 4 + note A#, 12 + note B_, 4 + note G#, 7 + dutycycle 0 + octave 5 + note C_, 1 + note C#, 4 + octave 4 + note B_, 4 + note A#, 4 + notetype $C, $C5 + note B_, 15 + notetype 6, $C5 + note G#, 1 + note A#, 1 + notetype $C, $C5 + note B_, 10 + note G#, 2 + note A#, 2 + note B_, 2 + note A#, 10 + note G#, 2 + note A#, 2 + note G#, 2 + note A#, 2 + note G#, 4 + note F#, 10 + dutycycle 1 + loopchannel 0, Music_MartHGSS_Loop2 + +Music_MartHGSS_Ch3: + notetype $C, $14 + stereopanning $f0 + octave 4 + note D#, 1 + note __, 3 + note D#, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note C#, 1 + note __, 5 + octave 3 + note F#, 5 + note __, 7 +Music_MartHGSS_Loop3: + octave 2 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note E_, 4 + note __, 2 + note E_, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + octave 3 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + octave 2 + note F#, 2 + note __, 14 + callchannel Music_MartHGSS_Branch + callchannel Music_MartHGSS_Branch + callchannel Music_MartHGSS_Branch + callchannel Music_MartHGSS_Branch + note E_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note E_, 1 + note __, 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 + note F_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 + note F#, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note F#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + octave 3 + note F#, 1 + octave 2 + note __, 1 + note F#, 2 + note __, 6 + octave 3 + note C#, 4 + octave 2 + note F#, 4 + note D#, 4 + note __, 2 + note D#, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note A#, 4 + note __, 2 + note A#, 1 + note __, 1 + note D#, 4 + note G_, 4 + note G#, 4 + note __, 2 + note G#, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note F_, 4 + note E_, 4 + note D#, 4 + octave 4 + note A#, 1 + octave 2 + note __, 1 + note D#, 1 + note __, 1 + note G_, 4 + octave 4 + note G_, 1 + octave 2 + note __, 1 + note G_, 1 + note __, 1 + note A#, 4 + octave 4 + note A#, 1 + octave 2 + note __, 1 + note A#, 1 + note __, 1 + note D#, 4 + note G_, 4 + note G#, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note G#, 1 + note __, 1 + note G_, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note G_, 1 + note __, 1 + note F#, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + note F_, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 + note E_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note F_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note B_, 4 + intensity $24 + octave 6 + note D_, 1 + intensity $14 + octave 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note F#, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note C#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 3 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + loopchannel 0, Music_MartHGSS_Loop3 +Music_MartHGSS_Branch: + note B_, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 + note F#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + endchannel + +Music_MartHGSS_Ch4: + notetype $C + togglenoise 0 + stereopanning $f0 + note G_, 4 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 6 + note A#, 12 +Music_MartHGSS_Loop4: + note A#, 4 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 16 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 16 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 + note G_, 2 + note A#, 4 + note A#, 4 + note D_, 2 + note G_, 2 + note G_, 2 + loopchannel 0, Music_MartHGSS_Loop4 diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 622cc5b..ee3d8ea 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -120,4 +120,5 @@ Music: dba Music_NorthCity dba Music_Tanoby01 dba Music_SilentHills + dba Music_Mart assert_table_length NUM_MUSIC_SONGS diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 7ca047c..92b527e 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -118,6 +118,7 @@ const MUSIC_NORTHCITY ; 71 const MUSIC_TANOBY01 ; 72 const MUSIC_SILENTHILLS ; 73 + const MUSIC_MART ; 74 DEF NUM_MUSIC_SONGS EQU const_value ; GetMapMusic picks music for this value (see home/map.asm) diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 24b5d8d..f931034 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -842,10 +842,10 @@ ENDM map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0 map_attributes OldCity, OLD_CITY, $00, WEST - connection west, Route50, ROUTE_50, 4 + connection west, Route50, ROUTE_50, 5 map_attributes Route50, ROUTE_50, $00, EAST - connection east, OldCity, OLD_CITY, -4 + connection east, OldCity, OLD_CITY, -5 map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0 map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 2988ed5..7eb83c1 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -67,7 +67,7 @@ MapGroup_Olivine: map OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineCafe, TILESET_GAME_CORNER, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map OlivineMart, TILESET_MART, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineMart, TILESET_MART, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route38EcruteakGate, TILESET_GATE, GATE, LANDMARK_ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route39Farmhouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -136,7 +136,7 @@ MapGroup_Dungeons: map OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LANDMARK_LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LANDMARK_LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LANDMARK_LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE map TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, LANDMARK_MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE map TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, LANDMARK_MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE map TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, LANDMARK_MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -189,7 +189,7 @@ MapGroup_Ecruteak: map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map DanceTheater, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map EcruteakMart, TILESET_MART, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakMart, TILESET_MART, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakCity, TILESET_JOHTO, TOWN, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND @@ -202,7 +202,7 @@ MapGroup_Blackthorn: map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BlackthornEmysHouse, TILESET_HOUSE, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map BlackthornMart, TILESET_MART, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornMart, TILESET_MART, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map MoveDeletersHouse, TILESET_HOUSE, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route45, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2 @@ -235,7 +235,7 @@ MapGroup_Cerulean: map CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeruleanGym, TILESET_PORT, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE - map CeruleanMart, TILESET_MART, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanMart, TILESET_MART, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PowerPlant, TILESET_FACILITY, INDOOR, LANDMARK_POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -257,7 +257,7 @@ MapGroup_Azalea: table_width MAP_LENGTH, MapGroup_Azalea map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CharcoalKiln, TILESET_HOUSE, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map AzaleaMart, TILESET_MART, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map AzaleaMart, TILESET_MART, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route33, TILESET_JOHTO_MODERN, ROUTE, LANDMARK_ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE @@ -274,7 +274,7 @@ MapGroup_LakeOfRage: map LakeOfRage, TILESET_JOHTO, TOWN, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS map LakeOfRageTraderHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LakeOfRagePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LakeOfRagePrycesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_LAKE_OF_RAGE_MAPS @@ -285,7 +285,7 @@ MapGroup_Violet: map Route36, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route37, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map VioletCity, TILESET_JOHTO, TOWN, LANDMARK_VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND - map VioletMart, TILESET_MART, INDOOR, LANDMARK_VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VioletMart, TILESET_MART, INDOOR, LANDMARK_VIOLET_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map EarlsPokemonAcademy, TILESET_LAB, INDOOR, LANDMARK_VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -311,14 +311,14 @@ MapGroup_Goldenrod: map GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodNameRater, TILESET_HOUSE, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore1F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore2F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore3F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore4F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore5F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStore6F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore1F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore2F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore3F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore4F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore5F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore6F, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE ; map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_MOBILE_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -337,7 +337,7 @@ MapGroup_Vermilion: map VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokemonFanClub, TILESET_HOUSE, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map VermilionMart, TILESET_MART, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionMart, TILESET_MART, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map VermilionGym, TILESET_GAME_CORNER, INDOOR, LANDMARK_VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route6SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -360,7 +360,7 @@ MapGroup_Pewter: map PewterCity, TILESET_KANTO, TOWN, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PewterGym, TILESET_TOWER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map PewterMart, TILESET_MART, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PewterMart, TILESET_MART, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -405,7 +405,7 @@ MapGroup_Fuchsia: map Route15, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route18, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map FuchsiaCity, TILESET_KANTO, TOWN, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS - map FuchsiaMart, TILESET_MART, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FuchsiaMart, TILESET_MART, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaGym, TILESET_LAB, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map BillsBrothersHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -433,7 +433,7 @@ MapGroup_Lavender: map MrFujisHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LavenderNameRater, TILESET_HOUSE, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map LavenderMart, TILESET_MART, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderMart, TILESET_MART, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SoulHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -474,13 +474,13 @@ MapGroup_Celadon: map Route16, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route17, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE map CeladonCity, TILESET_KANTO, TOWN, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE - map CeladonDeptStore1F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStore2F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStore3F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStore4F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStore5F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStore6F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map CeladonDeptStoreElevator, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore1F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore2F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore3F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore4F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore5F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore6F, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStoreElevator, TILESET_MART, INDOOR, LANDMARK_CELADON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeladonMansion1F, TILESET_MANSION, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeladonMansion2F, TILESET_MANSION, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CeladonMansion3F, TILESET_MANSION, INDOOR, LANDMARK_CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -536,7 +536,7 @@ MapGroup_Viridian: map ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map TrainerHouse1F, TILESET_HOUSE, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map TrainerHouseB1F, TILESET_FACILITY, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ViridianMart, TILESET_MART, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianMart, TILESET_MART, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -570,7 +570,7 @@ MapGroup_Saffron: map SaffronCity, TILESET_KANTO, TOWN, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map FightingDojo, TILESET_TRAIN_STATION, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SaffronGym, TILESET_UNDERGROUND, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map SaffronMart, TILESET_MART, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronMart, TILESET_MART, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map MrPsychicsHouse, TILESET_HOUSE, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -588,7 +588,7 @@ MapGroup_Cherrygrove: map Route30, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND map Route31, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND map CherrygroveCity, TILESET_JOHTO, TOWN, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map CherrygroveMart, TILESET_MART, INDOOR, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CherrygroveMart, TILESET_MART, INDOOR, LANDMARK_CHERRYGROVE_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GuideGentsHouse, TILESET_HOUSE, INDOOR, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -713,7 +713,7 @@ MapGroup_OldCity: table_width MAP_LENGTH, MapGroup_OldCity map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, TRUE, PALETTE_AUTO, FISHGROUP_POND map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE - map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE + map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE diff --git a/maps/OldCity.ablk b/maps/OldCity.ablk index ec410ef..0487c07 100644 Binary files a/maps/OldCity.ablk and b/maps/OldCity.ablk differ diff --git a/maps/OldCity.asm b/maps/OldCity.asm index 1ef2feb..17aa468 100644 --- a/maps/OldCity.asm +++ b/maps/OldCity.asm @@ -214,10 +214,10 @@ OldCity_MapEvents: def_bg_events bg_event 20, 22, BGEVENT_READ, OldCitySignScript bg_event 4, 32, BGEVENT_READ, HoneyGrandmaSignScript - bg_event 8, 14, BGEVENT_READ, PokemonPagodaSignScript + bg_event 8, 16, BGEVENT_READ, PokemonPagodaSignScript bg_event 26, 20, BGEVENT_READ, OldCityEarlsHouseSignScript bg_event 28, 14, BGEVENT_READ, OldCityGymSignScript - bg_event 8, 11, BGEVENT_READ, OldCityMuseumSignScript + bg_event 8, 13, BGEVENT_READ, OldCityMuseumSignScript bg_event 28, 28, BGEVENT_READ, OldCityPokecenterSign bg_event 4, 26, BGEVENT_READ, OldCityMartSign bg_event 20, 30, BGEVENT_READ, OldCitySouthSignScript @@ -225,7 +225,7 @@ OldCity_MapEvents: def_object_events object_event 24, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityFruitTree, -1 - object_event 9, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityOldManScript, -1 + object_event 9, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityOldManScript, -1 object_event 26, 22, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityTwinScript, -1 object_event 17, 16, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityBugCatcherScript, -1 object_event 18, 24, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityYoungsterScript, -1