Make suggested edits:

- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants

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

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"

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"

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"