diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 434bb4a3..bb2bb7f2 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -20,19 +20,6 @@ REG_DUTY_SOUND_LEN EQU 1 REG_VOLUME_ENVELOPE EQU 2 REG_FREQUENCY_LO EQU 3 -MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA" -MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE" -MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR" - -NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01" -NOISE_INSTRUMENTS_END EQUS "SFX_NOISE_INSTRUMENT19 + 1" - -CRY_SFX_START EQUS "SFX_CRY_00" -CRY_SFX_END EQUS "SFX_CRY_25 + 3" - -BATTLE_SFX_START EQUS "SFX_PECK" -BATTLE_SFX_END EQUS "SFX_SILPH_SCOPE + 1" - ; wChannelFlags1 constants BIT_PERFECT_PITCH EQU 0 ; controlled by toggle_perfect_pitch command BIT_SOUND_CALL EQU 1 ; if in sound call diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 9459c0a4..9f726fb7 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -56,6 +56,7 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 +NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01" music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1 music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1 music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1 @@ -75,6 +76,9 @@ ENDM music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1 music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1 music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_1 +NOISE_INSTRUMENTS_END EQUS "SFX_NOISE_INSTRUMENT19 + 1" + +CRY_SFX_START EQUS "SFX_CRY_00" music_const SFX_CRY_00, SFX_Cry00_1 music_const SFX_CRY_01, SFX_Cry01_1 music_const SFX_CRY_02, SFX_Cry02_1 @@ -113,6 +117,7 @@ ENDM music_const SFX_CRY_23, SFX_Cry23_1 music_const SFX_CRY_24, SFX_Cry24_1 music_const SFX_CRY_25, SFX_Cry25_1 +CRY_SFX_END EQUS "SFX_CRY_25 + 3" music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 music_const SFX_TINK, SFX_Tink_1 @@ -157,16 +162,18 @@ ENDM ; AUDIO_1 music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA +MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA" ; AUDIO_2 music_const SFX_LEVEL_UP, SFX_Level_Up - music_const SFX_BALL_TOSS, SFX_Ball_Toss music_const SFX_BALL_POOF, SFX_Ball_Poof music_const SFX_FAINT_THUD, SFX_Faint_Thud music_const SFX_RUN, SFX_Run music_const SFX_DEX_PAGE_ADDED, SFX_Dex_Page_Added music_const SFX_CAUGHT_MON, SFX_Caught_Mon + +BATTLE_SFX_START EQUS "SFX_PECK" music_const SFX_PECK, SFX_Peck music_const SFX_FAINT_FALL, SFX_Faint_Fall music_const SFX_BATTLE_09, SFX_Battle_09 @@ -216,6 +223,8 @@ ENDM music_const SFX_BATTLE_35, SFX_Battle_35 music_const SFX_BATTLE_36, SFX_Battle_36 music_const SFX_SILPH_SCOPE, SFX_Silph_Scope +BATTLE_SFX_END EQUS "SFX_SILPH_SCOPE + 1" +MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE" ; AUDIO_3 music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge @@ -228,3 +237,4 @@ ENDM music_const SFX_SLOTS_REWARD, SFX_Slots_Reward music_const SFX_SLOTS_NEW_SPIN, SFX_Slots_New_Spin music_const SFX_SHOOTING_STAR, SFX_Shooting_Star +MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR" diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 5697300e..f1dd461e 100755 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -260,62 +260,62 @@ WildDataPointers: ; followed by 20 bytes: ; level, species (ten times) -INCLUDE "data/mapWilds/nothing.asm" -INCLUDE "data/mapWilds/Route1.asm" -INCLUDE "data/mapWilds/Route2.asm" -INCLUDE "data/mapWilds/Route22.asm" -INCLUDE "data/mapWilds/ViridianForest.asm" -INCLUDE "data/mapWilds/Route3.asm" -INCLUDE "data/mapWilds/MtMoon1F.asm" -INCLUDE "data/mapWilds/MtMoonB1F.asm" -INCLUDE "data/mapWilds/MtMoonB2F.asm" -INCLUDE "data/mapWilds/Route4.asm" -INCLUDE "data/mapWilds/Route24.asm" -INCLUDE "data/mapWilds/Route25.asm" -INCLUDE "data/mapWilds/Route9.asm" -INCLUDE "data/mapWilds/Route5.asm" -INCLUDE "data/mapWilds/Route6.asm" -INCLUDE "data/mapWilds/Route11.asm" -INCLUDE "data/mapWilds/RockTunnel1F.asm" -INCLUDE "data/mapWilds/RockTunnelB1F.asm" -INCLUDE "data/mapWilds/Route10.asm" -INCLUDE "data/mapWilds/Route12.asm" -INCLUDE "data/mapWilds/Route8.asm" -INCLUDE "data/mapWilds/Route7.asm" -INCLUDE "data/mapWilds/PokemonTower1F.asm" -INCLUDE "data/mapWilds/PokemonTower2F.asm" -INCLUDE "data/mapWilds/PokemonTower3F.asm" -INCLUDE "data/mapWilds/PokemonTower4F.asm" -INCLUDE "data/mapWilds/PokemonTower5F.asm" -INCLUDE "data/mapWilds/PokemonTower6F.asm" -INCLUDE "data/mapWilds/PokemonTower7F.asm" -INCLUDE "data/mapWilds/Route13.asm" -INCLUDE "data/mapWilds/Route14.asm" -INCLUDE "data/mapWilds/Route15.asm" -INCLUDE "data/mapWilds/Route16.asm" -INCLUDE "data/mapWilds/Route17.asm" -INCLUDE "data/mapWilds/Route18.asm" -INCLUDE "data/mapWilds/SafariZoneCenter.asm" -INCLUDE "data/mapWilds/SafariZoneEast.asm" -INCLUDE "data/mapWilds/SafariZoneNorth.asm" -INCLUDE "data/mapWilds/SafariZoneWest.asm" -INCLUDE "data/mapWilds/SeaRoutes.asm" -INCLUDE "data/mapWilds/SeafoamIslands1F.asm" -INCLUDE "data/mapWilds/SeafoamIslandsB1F.asm" -INCLUDE "data/mapWilds/SeafoamIslandsB2F.asm" -INCLUDE "data/mapWilds/SeafoamIslandsB3F.asm" -INCLUDE "data/mapWilds/SeafoamIslandsB4F.asm" -INCLUDE "data/mapWilds/PokemonMansion1F.asm" -INCLUDE "data/mapWilds/PokemonMansion2F.asm" -INCLUDE "data/mapWilds/PokemonMansion3F.asm" -INCLUDE "data/mapWilds/PokemonMansionB1F.asm" -INCLUDE "data/mapWilds/Route21.asm" -INCLUDE "data/mapWilds/CeruleanCave1F.asm" -INCLUDE "data/mapWilds/CeruleanCave2F.asm" -INCLUDE "data/mapWilds/CeruleanCaveB1F.asm" -INCLUDE "data/mapWilds/PowerPlant.asm" -INCLUDE "data/mapWilds/Route23.asm" -INCLUDE "data/mapWilds/VictoryRoad2F.asm" -INCLUDE "data/mapWilds/VictoryRoad3F.asm" -INCLUDE "data/mapWilds/VictoryRoad1F.asm" -INCLUDE "data/mapWilds/DiglettsCave.asm" +INCLUDE "data/wild/maps/nothing.asm" +INCLUDE "data/wild/maps/Route1.asm" +INCLUDE "data/wild/maps/Route2.asm" +INCLUDE "data/wild/maps/Route22.asm" +INCLUDE "data/wild/maps/ViridianForest.asm" +INCLUDE "data/wild/maps/Route3.asm" +INCLUDE "data/wild/maps/MtMoon1F.asm" +INCLUDE "data/wild/maps/MtMoonB1F.asm" +INCLUDE "data/wild/maps/MtMoonB2F.asm" +INCLUDE "data/wild/maps/Route4.asm" +INCLUDE "data/wild/maps/Route24.asm" +INCLUDE "data/wild/maps/Route25.asm" +INCLUDE "data/wild/maps/Route9.asm" +INCLUDE "data/wild/maps/Route5.asm" +INCLUDE "data/wild/maps/Route6.asm" +INCLUDE "data/wild/maps/Route11.asm" +INCLUDE "data/wild/maps/RockTunnel1F.asm" +INCLUDE "data/wild/maps/RockTunnelB1F.asm" +INCLUDE "data/wild/maps/Route10.asm" +INCLUDE "data/wild/maps/Route12.asm" +INCLUDE "data/wild/maps/Route8.asm" +INCLUDE "data/wild/maps/Route7.asm" +INCLUDE "data/wild/maps/PokemonTower1F.asm" +INCLUDE "data/wild/maps/PokemonTower2F.asm" +INCLUDE "data/wild/maps/PokemonTower3F.asm" +INCLUDE "data/wild/maps/PokemonTower4F.asm" +INCLUDE "data/wild/maps/PokemonTower5F.asm" +INCLUDE "data/wild/maps/PokemonTower6F.asm" +INCLUDE "data/wild/maps/PokemonTower7F.asm" +INCLUDE "data/wild/maps/Route13.asm" +INCLUDE "data/wild/maps/Route14.asm" +INCLUDE "data/wild/maps/Route15.asm" +INCLUDE "data/wild/maps/Route16.asm" +INCLUDE "data/wild/maps/Route17.asm" +INCLUDE "data/wild/maps/Route18.asm" +INCLUDE "data/wild/maps/SafariZoneCenter.asm" +INCLUDE "data/wild/maps/SafariZoneEast.asm" +INCLUDE "data/wild/maps/SafariZoneNorth.asm" +INCLUDE "data/wild/maps/SafariZoneWest.asm" +INCLUDE "data/wild/maps/SeaRoutes.asm" +INCLUDE "data/wild/maps/SeafoamIslands1F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm" +INCLUDE "data/wild/maps/PokemonMansion1F.asm" +INCLUDE "data/wild/maps/PokemonMansion2F.asm" +INCLUDE "data/wild/maps/PokemonMansion3F.asm" +INCLUDE "data/wild/maps/PokemonMansionB1F.asm" +INCLUDE "data/wild/maps/Route21.asm" +INCLUDE "data/wild/maps/CeruleanCave1F.asm" +INCLUDE "data/wild/maps/CeruleanCave2F.asm" +INCLUDE "data/wild/maps/CeruleanCaveB1F.asm" +INCLUDE "data/wild/maps/PowerPlant.asm" +INCLUDE "data/wild/maps/Route23.asm" +INCLUDE "data/wild/maps/VictoryRoad2F.asm" +INCLUDE "data/wild/maps/VictoryRoad3F.asm" +INCLUDE "data/wild/maps/VictoryRoad1F.asm" +INCLUDE "data/wild/maps/DiglettsCave.asm" diff --git a/data/mapWilds/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm similarity index 100% rename from data/mapWilds/CeruleanCave1F.asm rename to data/wild/maps/CeruleanCave1F.asm diff --git a/data/mapWilds/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm similarity index 100% rename from data/mapWilds/CeruleanCave2F.asm rename to data/wild/maps/CeruleanCave2F.asm diff --git a/data/mapWilds/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm similarity index 100% rename from data/mapWilds/CeruleanCaveB1F.asm rename to data/wild/maps/CeruleanCaveB1F.asm diff --git a/data/mapWilds/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm similarity index 100% rename from data/mapWilds/DiglettsCave.asm rename to data/wild/maps/DiglettsCave.asm diff --git a/data/mapWilds/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm similarity index 100% rename from data/mapWilds/MtMoon1F.asm rename to data/wild/maps/MtMoon1F.asm diff --git a/data/mapWilds/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm similarity index 100% rename from data/mapWilds/MtMoonB1F.asm rename to data/wild/maps/MtMoonB1F.asm diff --git a/data/mapWilds/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm similarity index 100% rename from data/mapWilds/MtMoonB2F.asm rename to data/wild/maps/MtMoonB2F.asm diff --git a/data/mapWilds/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm similarity index 100% rename from data/mapWilds/PokemonMansion1F.asm rename to data/wild/maps/PokemonMansion1F.asm diff --git a/data/mapWilds/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm similarity index 100% rename from data/mapWilds/PokemonMansion2F.asm rename to data/wild/maps/PokemonMansion2F.asm diff --git a/data/mapWilds/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm similarity index 100% rename from data/mapWilds/PokemonMansion3F.asm rename to data/wild/maps/PokemonMansion3F.asm diff --git a/data/mapWilds/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm similarity index 100% rename from data/mapWilds/PokemonMansionB1F.asm rename to data/wild/maps/PokemonMansionB1F.asm diff --git a/data/mapWilds/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm similarity index 100% rename from data/mapWilds/PokemonTower1F.asm rename to data/wild/maps/PokemonTower1F.asm diff --git a/data/mapWilds/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm similarity index 100% rename from data/mapWilds/PokemonTower2F.asm rename to data/wild/maps/PokemonTower2F.asm diff --git a/data/mapWilds/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm similarity index 100% rename from data/mapWilds/PokemonTower3F.asm rename to data/wild/maps/PokemonTower3F.asm diff --git a/data/mapWilds/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm similarity index 100% rename from data/mapWilds/PokemonTower4F.asm rename to data/wild/maps/PokemonTower4F.asm diff --git a/data/mapWilds/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm similarity index 100% rename from data/mapWilds/PokemonTower5F.asm rename to data/wild/maps/PokemonTower5F.asm diff --git a/data/mapWilds/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm similarity index 100% rename from data/mapWilds/PokemonTower6F.asm rename to data/wild/maps/PokemonTower6F.asm diff --git a/data/mapWilds/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm similarity index 100% rename from data/mapWilds/PokemonTower7F.asm rename to data/wild/maps/PokemonTower7F.asm diff --git a/data/mapWilds/PowerPlant.asm b/data/wild/maps/PowerPlant.asm similarity index 100% rename from data/mapWilds/PowerPlant.asm rename to data/wild/maps/PowerPlant.asm diff --git a/data/mapWilds/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm similarity index 100% rename from data/mapWilds/RockTunnel1F.asm rename to data/wild/maps/RockTunnel1F.asm diff --git a/data/mapWilds/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm similarity index 100% rename from data/mapWilds/RockTunnelB1F.asm rename to data/wild/maps/RockTunnelB1F.asm diff --git a/data/mapWilds/Route1.asm b/data/wild/maps/Route1.asm similarity index 100% rename from data/mapWilds/Route1.asm rename to data/wild/maps/Route1.asm diff --git a/data/mapWilds/Route10.asm b/data/wild/maps/Route10.asm similarity index 100% rename from data/mapWilds/Route10.asm rename to data/wild/maps/Route10.asm diff --git a/data/mapWilds/Route11.asm b/data/wild/maps/Route11.asm similarity index 100% rename from data/mapWilds/Route11.asm rename to data/wild/maps/Route11.asm diff --git a/data/mapWilds/Route12.asm b/data/wild/maps/Route12.asm similarity index 100% rename from data/mapWilds/Route12.asm rename to data/wild/maps/Route12.asm diff --git a/data/mapWilds/Route13.asm b/data/wild/maps/Route13.asm similarity index 100% rename from data/mapWilds/Route13.asm rename to data/wild/maps/Route13.asm diff --git a/data/mapWilds/Route14.asm b/data/wild/maps/Route14.asm similarity index 100% rename from data/mapWilds/Route14.asm rename to data/wild/maps/Route14.asm diff --git a/data/mapWilds/Route15.asm b/data/wild/maps/Route15.asm similarity index 100% rename from data/mapWilds/Route15.asm rename to data/wild/maps/Route15.asm diff --git a/data/mapWilds/Route16.asm b/data/wild/maps/Route16.asm similarity index 100% rename from data/mapWilds/Route16.asm rename to data/wild/maps/Route16.asm diff --git a/data/mapWilds/Route17.asm b/data/wild/maps/Route17.asm similarity index 100% rename from data/mapWilds/Route17.asm rename to data/wild/maps/Route17.asm diff --git a/data/mapWilds/Route18.asm b/data/wild/maps/Route18.asm similarity index 100% rename from data/mapWilds/Route18.asm rename to data/wild/maps/Route18.asm diff --git a/data/mapWilds/Route2.asm b/data/wild/maps/Route2.asm similarity index 100% rename from data/mapWilds/Route2.asm rename to data/wild/maps/Route2.asm diff --git a/data/mapWilds/Route21.asm b/data/wild/maps/Route21.asm similarity index 100% rename from data/mapWilds/Route21.asm rename to data/wild/maps/Route21.asm diff --git a/data/mapWilds/Route22.asm b/data/wild/maps/Route22.asm similarity index 100% rename from data/mapWilds/Route22.asm rename to data/wild/maps/Route22.asm diff --git a/data/mapWilds/Route23.asm b/data/wild/maps/Route23.asm similarity index 100% rename from data/mapWilds/Route23.asm rename to data/wild/maps/Route23.asm diff --git a/data/mapWilds/Route24.asm b/data/wild/maps/Route24.asm similarity index 100% rename from data/mapWilds/Route24.asm rename to data/wild/maps/Route24.asm diff --git a/data/mapWilds/Route25.asm b/data/wild/maps/Route25.asm similarity index 100% rename from data/mapWilds/Route25.asm rename to data/wild/maps/Route25.asm diff --git a/data/mapWilds/Route3.asm b/data/wild/maps/Route3.asm similarity index 100% rename from data/mapWilds/Route3.asm rename to data/wild/maps/Route3.asm diff --git a/data/mapWilds/Route4.asm b/data/wild/maps/Route4.asm similarity index 100% rename from data/mapWilds/Route4.asm rename to data/wild/maps/Route4.asm diff --git a/data/mapWilds/Route5.asm b/data/wild/maps/Route5.asm similarity index 100% rename from data/mapWilds/Route5.asm rename to data/wild/maps/Route5.asm diff --git a/data/mapWilds/Route6.asm b/data/wild/maps/Route6.asm similarity index 100% rename from data/mapWilds/Route6.asm rename to data/wild/maps/Route6.asm diff --git a/data/mapWilds/Route7.asm b/data/wild/maps/Route7.asm similarity index 100% rename from data/mapWilds/Route7.asm rename to data/wild/maps/Route7.asm diff --git a/data/mapWilds/Route8.asm b/data/wild/maps/Route8.asm similarity index 100% rename from data/mapWilds/Route8.asm rename to data/wild/maps/Route8.asm diff --git a/data/mapWilds/Route9.asm b/data/wild/maps/Route9.asm similarity index 100% rename from data/mapWilds/Route9.asm rename to data/wild/maps/Route9.asm diff --git a/data/mapWilds/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm similarity index 100% rename from data/mapWilds/SafariZoneCenter.asm rename to data/wild/maps/SafariZoneCenter.asm diff --git a/data/mapWilds/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm similarity index 100% rename from data/mapWilds/SafariZoneEast.asm rename to data/wild/maps/SafariZoneEast.asm diff --git a/data/mapWilds/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm similarity index 100% rename from data/mapWilds/SafariZoneNorth.asm rename to data/wild/maps/SafariZoneNorth.asm diff --git a/data/mapWilds/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm similarity index 100% rename from data/mapWilds/SafariZoneWest.asm rename to data/wild/maps/SafariZoneWest.asm diff --git a/data/mapWilds/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm similarity index 100% rename from data/mapWilds/SeaRoutes.asm rename to data/wild/maps/SeaRoutes.asm diff --git a/data/mapWilds/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm similarity index 100% rename from data/mapWilds/SeafoamIslands1F.asm rename to data/wild/maps/SeafoamIslands1F.asm diff --git a/data/mapWilds/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm similarity index 100% rename from data/mapWilds/SeafoamIslandsB1F.asm rename to data/wild/maps/SeafoamIslandsB1F.asm diff --git a/data/mapWilds/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm similarity index 100% rename from data/mapWilds/SeafoamIslandsB2F.asm rename to data/wild/maps/SeafoamIslandsB2F.asm diff --git a/data/mapWilds/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm similarity index 100% rename from data/mapWilds/SeafoamIslandsB3F.asm rename to data/wild/maps/SeafoamIslandsB3F.asm diff --git a/data/mapWilds/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm similarity index 100% rename from data/mapWilds/SeafoamIslandsB4F.asm rename to data/wild/maps/SeafoamIslandsB4F.asm diff --git a/data/mapWilds/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm similarity index 100% rename from data/mapWilds/VictoryRoad1F.asm rename to data/wild/maps/VictoryRoad1F.asm diff --git a/data/mapWilds/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm similarity index 100% rename from data/mapWilds/VictoryRoad2F.asm rename to data/wild/maps/VictoryRoad2F.asm diff --git a/data/mapWilds/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm similarity index 100% rename from data/mapWilds/VictoryRoad3F.asm rename to data/wild/maps/VictoryRoad3F.asm diff --git a/data/mapWilds/ViridianForest.asm b/data/wild/maps/ViridianForest.asm similarity index 100% rename from data/mapWilds/ViridianForest.asm rename to data/wild/maps/ViridianForest.asm diff --git a/data/mapWilds/nothing.asm b/data/wild/maps/nothing.asm similarity index 100% rename from data/mapWilds/nothing.asm rename to data/wild/maps/nothing.asm diff --git a/engine/events/hidden_objects/diglett_sculpture.asm b/engine/events/hidden_objects/book_or_sculpture.asm similarity index 100% rename from engine/events/hidden_objects/diglett_sculpture.asm rename to engine/events/hidden_objects/book_or_sculpture.asm diff --git a/main.asm b/main.asm index 3adc2a63..39519774 100755 --- a/main.asm +++ b/main.asm @@ -76,7 +76,7 @@ INCLUDE "engine/overworld/pathfinding.asm" INCLUDE "engine/gfx/hp_bar.asm" INCLUDE "engine/events/hidden_objects/bookshelves.asm" INCLUDE "engine/events/hidden_objects/indigo_plateau_statues.asm" -INCLUDE "engine/events/hidden_objects/diglett_sculpture.asm" +INCLUDE "engine/events/hidden_objects/book_or_sculpture.asm" INCLUDE "engine/events/hidden_objects/elevator.asm" INCLUDE "engine/events/hidden_objects/town_map.asm" INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm"