diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /maps.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'maps.asm')
| -rw-r--r-- | maps.asm | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -1225,33 +1225,33 @@ AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" SECTION "Maps 22", ROMX -INCLUDE "scripts/ViridianCity2.asm" -INCLUDE "scripts/VermilionCity2.asm" -INCLUDE "scripts/CeladonCity2.asm" +INCLUDE "scripts/ViridianCity_2.asm" +INCLUDE "scripts/VermilionCity_2.asm" +INCLUDE "scripts/CeladonCity_2.asm" INCLUDE "scripts/Route1_2.asm" INCLUDE "scripts/Route22_2.asm" -INCLUDE "scripts/RedsHouse1F2.asm" -INCLUDE "scripts/OaksLab2.asm" -INCLUDE "scripts/ViridianSchoolHouse2.asm" -INCLUDE "scripts/Museum1F2.asm" -INCLUDE "scripts/PewterPokecenter2.asm" +INCLUDE "scripts/RedsHouse1F_2.asm" +INCLUDE "scripts/OaksLab_2.asm" +INCLUDE "scripts/ViridianSchoolHouse_2.asm" +INCLUDE "scripts/Museum1F_2.asm" +INCLUDE "scripts/PewterPokecenter_2.asm" INCLUDE "scripts/PokemonTower2F_2.asm" INCLUDE "scripts/CeladonMart3F_2.asm" INCLUDE "scripts/CeladonMansion1F_2.asm" INCLUDE "scripts/CeladonMansion3F_2.asm" -INCLUDE "scripts/GameCorner2.asm" -INCLUDE "scripts/CeladonDiner2.asm" -INCLUDE "scripts/SafariZoneGate2.asm" -INCLUDE "scripts/CinnabarGym3.asm" -INCLUDE "scripts/MtMoonPokecenter2.asm" +INCLUDE "scripts/GameCorner_2.asm" +INCLUDE "scripts/CeladonDiner_2.asm" +INCLUDE "scripts/SafariZoneGate_2.asm" +INCLUDE "scripts/CinnabarGym_3.asm" +INCLUDE "scripts/MtMoonPokecenter_2.asm" INCLUDE "data/maps/headers/SummerBeachHouse.asm" INCLUDE "scripts/SummerBeachHouse.asm" SummerBeachHouse_Blocks: INCBIN "maps/SummerBeachHouse.blk" INCLUDE "data/maps/objects/SummerBeachHouse.asm" -INCLUDE "scripts/SummerBeachHouse2.asm" +INCLUDE "scripts/SummerBeachHouse_2.asm" -INCLUDE "scripts/BillsHouse2.asm" -INCLUDE "scripts/ViridianForest2.asm" +INCLUDE "scripts/BillsHouse_2.asm" +INCLUDE "scripts/ViridianForest_2.asm" INCLUDE "scripts/SSAnne2FRooms_2.asm" INCLUDE "scripts/SilphCo11F_2.asm" |