diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 15:57:35 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 15:57:35 -0400 |
commit | ccb01731fe8cd44ae4c8840ee8ddc02e6bdea97e (patch) | |
tree | f74ebc68abb065e651af6c2ecbd701a1a9e25b02 | |
parent | 710c3275fc6a4caeeff3ad89c029a05984cf8388 (diff) |
Make suggested edits:
- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants
-rw-r--r-- | constants/audio_constants.asm | 13 | ||||
-rw-r--r-- | constants/music_constants.asm | 12 | ||||
-rwxr-xr-x | data/wild/grass_water.asm | 118 | ||||
-rw-r--r-- | data/wild/maps/CeruleanCave1F.asm (renamed from data/mapWilds/CeruleanCave1F.asm) | 0 | ||||
-rw-r--r-- | data/wild/maps/CeruleanCave2F.asm (renamed from data/mapWilds/CeruleanCave2F.asm) | 0 | ||||
-rw-r--r-- | data/wild/maps/CeruleanCaveB1F.asm (renamed from data/mapWilds/CeruleanCaveB1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/DiglettsCave.asm (renamed from data/mapWilds/DiglettsCave.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/MtMoon1F.asm (renamed from data/mapWilds/MtMoon1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/MtMoonB1F.asm (renamed from data/mapWilds/MtMoonB1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/MtMoonB2F.asm (renamed from data/mapWilds/MtMoonB2F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonMansion1F.asm (renamed from data/mapWilds/PokemonMansion1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonMansion2F.asm (renamed from data/mapWilds/PokemonMansion2F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonMansion3F.asm (renamed from data/mapWilds/PokemonMansion3F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonMansionB1F.asm (renamed from data/mapWilds/PokemonMansionB1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower1F.asm (renamed from data/mapWilds/PokemonTower1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower2F.asm (renamed from data/mapWilds/PokemonTower2F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower3F.asm (renamed from data/mapWilds/PokemonTower3F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower4F.asm (renamed from data/mapWilds/PokemonTower4F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower5F.asm (renamed from data/mapWilds/PokemonTower5F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower6F.asm (renamed from data/mapWilds/PokemonTower6F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PokemonTower7F.asm (renamed from data/mapWilds/PokemonTower7F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/PowerPlant.asm (renamed from data/mapWilds/PowerPlant.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/RockTunnel1F.asm (renamed from data/mapWilds/RockTunnel1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/RockTunnelB1F.asm (renamed from data/mapWilds/RockTunnelB1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route1.asm (renamed from data/mapWilds/Route1.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route10.asm (renamed from data/mapWilds/Route10.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route11.asm (renamed from data/mapWilds/Route11.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route12.asm (renamed from data/mapWilds/Route12.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route13.asm (renamed from data/mapWilds/Route13.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route14.asm (renamed from data/mapWilds/Route14.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route15.asm (renamed from data/mapWilds/Route15.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route16.asm (renamed from data/mapWilds/Route16.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route17.asm (renamed from data/mapWilds/Route17.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route18.asm (renamed from data/mapWilds/Route18.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route2.asm (renamed from data/mapWilds/Route2.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route21.asm (renamed from data/mapWilds/Route21.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route22.asm (renamed from data/mapWilds/Route22.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route23.asm (renamed from data/mapWilds/Route23.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route24.asm (renamed from data/mapWilds/Route24.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route25.asm (renamed from data/mapWilds/Route25.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route3.asm (renamed from data/mapWilds/Route3.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route4.asm (renamed from data/mapWilds/Route4.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route5.asm (renamed from data/mapWilds/Route5.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route6.asm (renamed from data/mapWilds/Route6.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route7.asm (renamed from data/mapWilds/Route7.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route8.asm (renamed from data/mapWilds/Route8.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/Route9.asm (renamed from data/mapWilds/Route9.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SafariZoneCenter.asm (renamed from data/mapWilds/SafariZoneCenter.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SafariZoneEast.asm (renamed from data/mapWilds/SafariZoneEast.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SafariZoneNorth.asm (renamed from data/mapWilds/SafariZoneNorth.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SafariZoneWest.asm (renamed from data/mapWilds/SafariZoneWest.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeaRoutes.asm (renamed from data/mapWilds/SeaRoutes.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeafoamIslands1F.asm (renamed from data/mapWilds/SeafoamIslands1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeafoamIslandsB1F.asm (renamed from data/mapWilds/SeafoamIslandsB1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeafoamIslandsB2F.asm (renamed from data/mapWilds/SeafoamIslandsB2F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeafoamIslandsB3F.asm (renamed from data/mapWilds/SeafoamIslandsB3F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/SeafoamIslandsB4F.asm (renamed from data/mapWilds/SeafoamIslandsB4F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/VictoryRoad1F.asm (renamed from data/mapWilds/VictoryRoad1F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/VictoryRoad2F.asm (renamed from data/mapWilds/VictoryRoad2F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/VictoryRoad3F.asm (renamed from data/mapWilds/VictoryRoad3F.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/ViridianForest.asm (renamed from data/mapWilds/ViridianForest.asm) | 0 | ||||
-rwxr-xr-x | data/wild/maps/nothing.asm (renamed from data/mapWilds/nothing.asm) | 0 | ||||
-rw-r--r-- | engine/events/hidden_objects/book_or_sculpture.asm (renamed from engine/events/hidden_objects/diglett_sculpture.asm) | 0 | ||||
-rwxr-xr-x | main.asm | 2 |
64 files changed, 71 insertions, 74 deletions
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 index 20e8643a..20e8643a 100644 --- a/data/mapWilds/CeruleanCave1F.asm +++ b/data/wild/maps/CeruleanCave1F.asm diff --git a/data/mapWilds/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm index 5afe55ac..5afe55ac 100644 --- a/data/mapWilds/CeruleanCave2F.asm +++ b/data/wild/maps/CeruleanCave2F.asm diff --git a/data/mapWilds/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm index 245d5912..245d5912 100644 --- a/data/mapWilds/CeruleanCaveB1F.asm +++ b/data/wild/maps/CeruleanCaveB1F.asm diff --git a/data/mapWilds/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index 37512687..37512687 100755 --- a/data/mapWilds/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm diff --git a/data/mapWilds/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index 44b34c45..44b34c45 100755 --- a/data/mapWilds/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm diff --git a/data/mapWilds/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 5c0d8a53..5c0d8a53 100755 --- a/data/mapWilds/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm diff --git a/data/mapWilds/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index cbf97e7e..cbf97e7e 100755 --- a/data/mapWilds/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm diff --git a/data/mapWilds/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index 22ad032b..22ad032b 100755 --- a/data/mapWilds/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm diff --git a/data/mapWilds/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 985474fc..985474fc 100755 --- a/data/mapWilds/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm diff --git a/data/mapWilds/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index 9c5521ae..9c5521ae 100755 --- a/data/mapWilds/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm diff --git a/data/mapWilds/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index 83266ddd..83266ddd 100755 --- a/data/mapWilds/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm diff --git a/data/mapWilds/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm index df951e70..df951e70 100755 --- a/data/mapWilds/PokemonTower1F.asm +++ b/data/wild/maps/PokemonTower1F.asm diff --git a/data/mapWilds/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index dcbe0da0..dcbe0da0 100755 --- a/data/mapWilds/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm diff --git a/data/mapWilds/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index 135ed84f..135ed84f 100755 --- a/data/mapWilds/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm diff --git a/data/mapWilds/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index 0c84b0cf..0c84b0cf 100755 --- a/data/mapWilds/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm diff --git a/data/mapWilds/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 440dbf8d..440dbf8d 100755 --- a/data/mapWilds/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm diff --git a/data/mapWilds/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 553fdb5d..553fdb5d 100755 --- a/data/mapWilds/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm diff --git a/data/mapWilds/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 0f7e66e9..0f7e66e9 100755 --- a/data/mapWilds/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm diff --git a/data/mapWilds/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index 35eece95..35eece95 100755 --- a/data/mapWilds/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm diff --git a/data/mapWilds/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index a36f2092..a36f2092 100755 --- a/data/mapWilds/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm diff --git a/data/mapWilds/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 2fc7ef94..2fc7ef94 100755 --- a/data/mapWilds/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm diff --git a/data/mapWilds/Route1.asm b/data/wild/maps/Route1.asm index f618c34f..f618c34f 100755 --- a/data/mapWilds/Route1.asm +++ b/data/wild/maps/Route1.asm diff --git a/data/mapWilds/Route10.asm b/data/wild/maps/Route10.asm index 34e0b5ee..34e0b5ee 100755 --- a/data/mapWilds/Route10.asm +++ b/data/wild/maps/Route10.asm diff --git a/data/mapWilds/Route11.asm b/data/wild/maps/Route11.asm index 9e4e3644..9e4e3644 100755 --- a/data/mapWilds/Route11.asm +++ b/data/wild/maps/Route11.asm diff --git a/data/mapWilds/Route12.asm b/data/wild/maps/Route12.asm index 45dfbc9d..45dfbc9d 100755 --- a/data/mapWilds/Route12.asm +++ b/data/wild/maps/Route12.asm diff --git a/data/mapWilds/Route13.asm b/data/wild/maps/Route13.asm index 2a1a6cb5..2a1a6cb5 100755 --- a/data/mapWilds/Route13.asm +++ b/data/wild/maps/Route13.asm diff --git a/data/mapWilds/Route14.asm b/data/wild/maps/Route14.asm index aad5aa48..aad5aa48 100755 --- a/data/mapWilds/Route14.asm +++ b/data/wild/maps/Route14.asm diff --git a/data/mapWilds/Route15.asm b/data/wild/maps/Route15.asm index b4762230..b4762230 100755 --- a/data/mapWilds/Route15.asm +++ b/data/wild/maps/Route15.asm diff --git a/data/mapWilds/Route16.asm b/data/wild/maps/Route16.asm index c2421c50..c2421c50 100755 --- a/data/mapWilds/Route16.asm +++ b/data/wild/maps/Route16.asm diff --git a/data/mapWilds/Route17.asm b/data/wild/maps/Route17.asm index 8dffd9a3..8dffd9a3 100755 --- a/data/mapWilds/Route17.asm +++ b/data/wild/maps/Route17.asm diff --git a/data/mapWilds/Route18.asm b/data/wild/maps/Route18.asm index 47bd247d..47bd247d 100755 --- a/data/mapWilds/Route18.asm +++ b/data/wild/maps/Route18.asm diff --git a/data/mapWilds/Route2.asm b/data/wild/maps/Route2.asm index ad958ea5..ad958ea5 100755 --- a/data/mapWilds/Route2.asm +++ b/data/wild/maps/Route2.asm diff --git a/data/mapWilds/Route21.asm b/data/wild/maps/Route21.asm index 3cc73ba0..3cc73ba0 100755 --- a/data/mapWilds/Route21.asm +++ b/data/wild/maps/Route21.asm diff --git a/data/mapWilds/Route22.asm b/data/wild/maps/Route22.asm index 750a2f4e..750a2f4e 100755 --- a/data/mapWilds/Route22.asm +++ b/data/wild/maps/Route22.asm diff --git a/data/mapWilds/Route23.asm b/data/wild/maps/Route23.asm index a057d24d..a057d24d 100755 --- a/data/mapWilds/Route23.asm +++ b/data/wild/maps/Route23.asm diff --git a/data/mapWilds/Route24.asm b/data/wild/maps/Route24.asm index 3a745f36..3a745f36 100755 --- a/data/mapWilds/Route24.asm +++ b/data/wild/maps/Route24.asm diff --git a/data/mapWilds/Route25.asm b/data/wild/maps/Route25.asm index 4884fa64..4884fa64 100755 --- a/data/mapWilds/Route25.asm +++ b/data/wild/maps/Route25.asm diff --git a/data/mapWilds/Route3.asm b/data/wild/maps/Route3.asm index dea820a4..dea820a4 100755 --- a/data/mapWilds/Route3.asm +++ b/data/wild/maps/Route3.asm diff --git a/data/mapWilds/Route4.asm b/data/wild/maps/Route4.asm index 624d58de..624d58de 100755 --- a/data/mapWilds/Route4.asm +++ b/data/wild/maps/Route4.asm diff --git a/data/mapWilds/Route5.asm b/data/wild/maps/Route5.asm index cb8c583b..cb8c583b 100755 --- a/data/mapWilds/Route5.asm +++ b/data/wild/maps/Route5.asm diff --git a/data/mapWilds/Route6.asm b/data/wild/maps/Route6.asm index 92512ffb..92512ffb 100755 --- a/data/mapWilds/Route6.asm +++ b/data/wild/maps/Route6.asm diff --git a/data/mapWilds/Route7.asm b/data/wild/maps/Route7.asm index 559c98ee..559c98ee 100755 --- a/data/mapWilds/Route7.asm +++ b/data/wild/maps/Route7.asm diff --git a/data/mapWilds/Route8.asm b/data/wild/maps/Route8.asm index 8a0bfa31..8a0bfa31 100755 --- a/data/mapWilds/Route8.asm +++ b/data/wild/maps/Route8.asm diff --git a/data/mapWilds/Route9.asm b/data/wild/maps/Route9.asm index 716589b0..716589b0 100755 --- a/data/mapWilds/Route9.asm +++ b/data/wild/maps/Route9.asm diff --git a/data/mapWilds/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 0cd5323a..0cd5323a 100755 --- a/data/mapWilds/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm diff --git a/data/mapWilds/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index 3d77b6fe..3d77b6fe 100755 --- a/data/mapWilds/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm diff --git a/data/mapWilds/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index c1b6a547..c1b6a547 100755 --- a/data/mapWilds/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm diff --git a/data/mapWilds/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index 47b6a102..47b6a102 100755 --- a/data/mapWilds/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm diff --git a/data/mapWilds/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm index 07c6a187..07c6a187 100755 --- a/data/mapWilds/SeaRoutes.asm +++ b/data/wild/maps/SeaRoutes.asm diff --git a/data/mapWilds/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index 3c431f9a..3c431f9a 100755 --- a/data/mapWilds/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm diff --git a/data/mapWilds/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index 6f96f240..6f96f240 100755 --- a/data/mapWilds/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm diff --git a/data/mapWilds/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 7191fea9..7191fea9 100755 --- a/data/mapWilds/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm diff --git a/data/mapWilds/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 9778c0e9..9778c0e9 100755 --- a/data/mapWilds/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm diff --git a/data/mapWilds/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index 3948470b..3948470b 100755 --- a/data/mapWilds/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm diff --git a/data/mapWilds/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 60aae31a..60aae31a 100755 --- a/data/mapWilds/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm diff --git a/data/mapWilds/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 580d644d..580d644d 100755 --- a/data/mapWilds/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm diff --git a/data/mapWilds/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 80d7ef3e..80d7ef3e 100755 --- a/data/mapWilds/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm diff --git a/data/mapWilds/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index ae9a5a70..ae9a5a70 100755 --- a/data/mapWilds/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm diff --git a/data/mapWilds/nothing.asm b/data/wild/maps/nothing.asm index ce7f7ede..ce7f7ede 100755 --- a/data/mapWilds/nothing.asm +++ b/data/wild/maps/nothing.asm diff --git a/engine/events/hidden_objects/diglett_sculpture.asm b/engine/events/hidden_objects/book_or_sculpture.asm index 2d6f278a..2d6f278a 100644 --- a/engine/events/hidden_objects/diglett_sculpture.asm +++ b/engine/events/hidden_objects/book_or_sculpture.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" |