diff options
| -rw-r--r-- | asm/rom5.s | 6 | ||||
| -rw-r--r-- | constants/constants.s | 1 | ||||
| -rw-r--r-- | constants/region_map_sections.s | 52 | ||||
| -rw-r--r-- | data/data2.s | 96 | ||||
| -rw-r--r-- | data/landmarks.s | 556 | ||||
| -rw-r--r-- | data/region_map_sections.s | 16 | ||||
| -rw-r--r-- | data/text/landmarks.s | 110 | ||||
| -rwxr-xr-x | graphics/pokenav/region_map.pal (renamed from graphics/interface/map.pal) | 0 | ||||
| -rwxr-xr-x | graphics/pokenav/region_map.png (renamed from graphics/interface/map.png) | bin | 3959 -> 3959 bytes | |||
| -rw-r--r-- | graphics/pokenav/region_map_map.bin | bin | 0 -> 4096 bytes | |||
| -rwxr-xr-x | misc.mk | 2 |
11 files changed, 752 insertions, 87 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 996280c86..8bc48d623 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -263571,7 +263571,7 @@ _080FB324: pop {r1} bx r1 .align 2, 0 -_080FB328: .4byte gUnknown_083E6E50 +_080FB328: .4byte gRegionMapSections thumb_func_end sub_80FB2EC thumb_func_start sub_80FB32C @@ -328153,7 +328153,7 @@ _0811A956: bne _0811A970 b _0811A990 .align 2, 0 -_0811A964: .4byte gUnknown_083FBA18 +_0811A964: .4byte gLandmarkLists _0811A968: adds r0, r4, 0x4 adds r0, r1, r0 @@ -328184,7 +328184,7 @@ _0811A992: pop {r1} bx r1 .align 2, 0 -_0811A998: .4byte gUnknown_083FBA18 +_0811A998: .4byte gLandmarkLists thumb_func_end sub_811A920 thumb_func_start sub_811A99C diff --git a/constants/constants.s b/constants/constants.s index 6bcbc3261..1cd3923f2 100644 --- a/constants/constants.s +++ b/constants/constants.s @@ -20,3 +20,4 @@ .include "constants/variables.s" .include "constants/songs.s" .include "constants/version.s" + .include "constants/region_map_sections.s" diff --git a/constants/region_map_sections.s b/constants/region_map_sections.s new file mode 100644 index 000000000..25f1b6ee1 --- /dev/null +++ b/constants/region_map_sections.s @@ -0,0 +1,52 @@ + .equiv MAPSEC_LittlerootTown, 0x00 + .equiv MAPSEC_OldaleTown, 0x01 + .equiv MAPSEC_DewfordTown, 0x02 + .equiv MAPSEC_LavaridgeTown, 0x03 + .equiv MAPSEC_FallarborTown, 0x04 + .equiv MAPSEC_VerdanturfTown, 0x05 + .equiv MAPSEC_PacifidlogTown, 0x06 + .equiv MAPSEC_PetalburgCity, 0x07 + .equiv MAPSEC_SlateportCity, 0x08 + .equiv MAPSEC_MauvilleCity, 0x09 + .equiv MAPSEC_RustboroCity, 0x0A + .equiv MAPSEC_FortreeCity, 0x0B + .equiv MAPSEC_LilycoveCity, 0x0C + .equiv MAPSEC_MossdeepCity, 0x0D + .equiv MAPSEC_SootopolisCity, 0x0E + .equiv MAPSEC_EverGrandeCity, 0x0F + .equiv MAPSEC_Route101, 0x10 + .equiv MAPSEC_Route102, 0x11 + .equiv MAPSEC_Route103, 0x12 + .equiv MAPSEC_Route104, 0x13 + .equiv MAPSEC_Route105, 0x14 + .equiv MAPSEC_Route106, 0x15 + .equiv MAPSEC_Route107, 0x16 + .equiv MAPSEC_Route108, 0x17 + .equiv MAPSEC_Route109, 0x18 + .equiv MAPSEC_Route110, 0x19 + .equiv MAPSEC_Route111, 0x1A + .equiv MAPSEC_Route112, 0x1B + .equiv MAPSEC_Route113, 0x1C + .equiv MAPSEC_Route114, 0x1D + .equiv MAPSEC_Route115, 0x1E + .equiv MAPSEC_Route116, 0x1F + .equiv MAPSEC_Route117, 0x20 + .equiv MAPSEC_Route118, 0x21 + .equiv MAPSEC_Route119, 0x22 + .equiv MAPSEC_Route120, 0x23 + .equiv MAPSEC_Route121, 0x24 + .equiv MAPSEC_Route122, 0x25 + .equiv MAPSEC_Route123, 0x26 + .equiv MAPSEC_Route124, 0x27 + .equiv MAPSEC_Route125, 0x28 + .equiv MAPSEC_Route126, 0x29 + .equiv MAPSEC_Route127, 0x2A + .equiv MAPSEC_Route128, 0x2B + .equiv MAPSEC_Route129, 0x2C + .equiv MAPSEC_Route130, 0x2D + .equiv MAPSEC_Route131, 0x2E + .equiv MAPSEC_Route132, 0x2F + .equiv MAPSEC_Route133, 0x30 + .equiv MAPSEC_Route134, 0x31 + .equiv MAPSEC_MtChimney, 0x38 + .equiv MAPSEC_Nothing, 0x58 diff --git a/data/data2.s b/data/data2.s index 7c6c2600c..451e2c5f9 100644 --- a/data/data2.s +++ b/data/data2.s @@ -20370,17 +20370,20 @@ gUnknown_083E5CC0:: @ 83E5CC0 gUnknown_083E5CE0:: @ 83E5CE0 .incbin "baserom.gba", 0x003e5ce0, 0x80 + .align 2 gUnknown_083E5D60:: @ 83E5D60 - .incbin "graphics/interface/map.gbapal", 0xE0, 0x40 + .incbin "graphics/pokenav/region_map.gbapal", 0xE0, 0x40 + .align 2 gUnknown_083E5DA0:: @ 83E5DA0 - .incbin "graphics/interface/map.8bpp.lz" + .incbin "graphics/pokenav/region_map.8bpp.lz" + .align 2 gUnknown_083E6B04:: @ 83E6B04 - .incbin "baserom.gba", 0x003e6b04, 0x34c + .incbin "graphics/pokenav/region_map_map.bin.lz" -gUnknown_083E6E50:: @ 83E6E50 - .incbin "baserom.gba", 0x003e6e50, 0x1A4 +@ 83E6E50 + .include "data/region_map_sections.s" @ 83E6FF4 .include "data/region_map_locations.s" @@ -23010,10 +23013,8 @@ gCryMeterNeedleSpritePalettes:: @ 83FB79C obj_pal CryMeterNeedlePalette, 8192 null_obj_pal - .incbin "baserom.gba", 0x003fb7ac, 0x26c - -gUnknown_083FBA18:: @ 83FBA18 - .incbin "baserom.gba", 0x003fba18, 0x170 +@ 83FB7AC + .include "data/landmarks.s" gUnknown_083FBB88:: @ 83FBB88 .incbin "baserom.gba", 0x003fbb88, 0x580 @@ -28839,80 +28840,9 @@ ContestText_PokeWon: gUnknown_0842CEAF:: @ 842CEAF OtherText_LinkStandby: .string "Link standby...$" -OtherText_FlowerShop: - .string "FLOWER SHOP$" -OtherText_PetalburgWoods: - .string "PETALBURG WOODS$" -OtherText_BrineysCottage: - .string "MR. BRINEY’S COTTAGE$" -OtherText_AbandonedShip: - .string "ABANDONED SHIP$" -OtherText_SeashoreHouse: - .string "SEASHORE HOUSE$" -OtherText_SlateportBeach: - .string "SLATEPORT BEACH$" -OtherText_CyclingRoad: - .string "CYCLING ROAD$" -OtherText_NewMauville: - .string "NEW MAUVILLE$" -OtherText_TrickHouse: - .string "TRICK HOUSE$" -OtherText_OldLadyRestShop: - .string "OLD LADY’S REST STOP$" -OtherText_Desert: - .string "DESERT$" -OtherText_WinstrateFamily: - .string "THE WINSTRATE FAMILY$" -OtherText_CableCar: - .string "CABLE CAR$" -OtherText_GlassWorkshop: - .string "GLASS WORKSHOP$" -OtherText_WeatherInstitute: - .string "WEATHER INSTITUTE$" -OtherText_MeteorFalls: - .string "METEOR FALLS$" -OtherText_TunnelersRestHouse: - .string "TUNNELER’S REST HOUSE$" -OtherText_RusturfTunnel: - .string "RUSTURF TUNNEL$" -OtherText_PokemonDayCare: - .string "POKéMON DAY CARE$" -OtherText_SafariZoneEntrance: - .string "SAFARI ZONE ENTRANCE$" -OtherText_MtPyre: - .string "MT. PYRE$" -OtherText_ShoalCave: - .string "SHOAL CAVE$" -OtherText_SeafloorCavern: - .string "SEAFLOOR CAVERN$" -OtherText_GraniteCave: - .string "GRANITE CAVE$" -OtherText_OceanCurrent: - .string "OCEAN CURRENT$" -OtherText_LanetteHouse: - .string "LANETTE’S HOUSE$" -OtherText_FieryPath: - .string "FIERY PATH$" -OtherText_JaggedPass: - .string "JAGGED PASS$" -OtherText_SkyPillar: - .string "SKY PILLAR$" -OtherText_BerryMasterHouse: - .string "BERRY MASTER’S HOUSE$" -OtherText_IslandCave: - .string "ISLAND CAVE$" -OtherText_DesertRuins: - .string "DESERT RUINS$" -OtherText_ScorchedSlab: - .string "SCORCHED SLAB$" -OtherText_AncientTomb: - .string "ANCIENT TOMB$" -OtherText_SealedChamber: - .string "SEALED CHAMBER$" -OtherText_FossilManiacsHouse: - .string "FOSSIL MANIAC’S HOUSE$" -OtherText_HuntersHouse: - .string "HUNTER’S HOUSE$" + +@ 842CEBF + .include "data/text/landmarks.s" gUnknown_0842D0E6:: @ 842D0E6 OtherText_Terminator4: diff --git a/data/landmarks.s b/data/landmarks.s new file mode 100644 index 000000000..455868d8c --- /dev/null +++ b/data/landmarks.s @@ -0,0 +1,556 @@ + .align 2 +Landmark_FlowerShop: + .4byte gLandmarkName_FlowerShop + .2byte 2108 @ flag num. + + .align 2 +Landmark_PetalburgWoods: + .4byte gLandmarkName_PetalburgWoods + .2byte -1 @ flag num. + + .align 2 +Landmark_MrBrineysCottage: + .4byte gLandmarkName_MrBrineysCottage + .2byte 2109 @ flag num. + + .align 2 +Landmark_AbandonedShip: + .4byte gLandmarkName_AbandonedShip + .2byte 2110 @ flag num. + + .align 2 +Landmark_SeashoreHouse: + .4byte gLandmarkName_SeashoreHouse + .2byte 2111 @ flag num. + + .align 2 +Landmark_SlateportBeach: + .4byte gLandmarkName_SlateportBeach + .2byte -1 @ flag num. + + .align 2 +Landmark_CyclingRoad: + .4byte gLandmarkName_CyclingRoad + .2byte -1 @ flag num. + + .align 2 +Landmark_NewMauville: + .4byte gLandmarkName_NewMauville + .2byte 2112 @ flag num. + + .align 2 +Landmark_TrickHouse: + .4byte gLandmarkName_TrickHouse + .2byte 2114 @ flag num. + + .align 2 +Landmark_OldLadysRestShop: + .4byte gLandmarkName_OldLadysRestShop + .2byte 2113 @ flag num. + + .align 2 +Landmark_Desert: + .4byte gLandmarkName_Desert + .2byte -1 @ flag num. + + .align 2 +Landmark_WinstrateFamily: + .4byte gLandmarkName_WinstrateFamily + .2byte 2115 @ flag num. + + .align 2 +Landmark_CableCar: + .4byte gLandmarkName_CableCar + .2byte -1 @ flag num. + + .align 2 +Landmark_GlassWorkshop: + .4byte gLandmarkName_GlassWorkshop + .2byte 2116 @ flag num. + + .align 2 +Landmark_WeatherInstitute: + .4byte gLandmarkName_WeatherInstitute + .2byte -1 @ flag num. + + .align 2 +Landmark_MeteorFalls: + .4byte gLandmarkName_MeteorFalls + .2byte -1 @ flag num. + + .align 2 +Landmark_TunnelersRestHouse: + .4byte gLandmarkName_TunnelersRestHouse + .2byte 2138 @ flag num. + + .align 2 +Landmark_RusturfTunnel: + .4byte gLandmarkName_RusturfTunnel + .2byte -1 @ flag num. + + .align 2 +Landmark_PokemonDayCare: + .4byte gLandmarkName_PokemonDayCare + .2byte 2118 @ flag num. + + .align 2 +Landmark_SafariZoneEntrance: + .4byte gLandmarkName_SafariZoneEntrance + .2byte -1 @ flag num. + + .align 2 +Landmark_MtPyre: + .4byte gLandmarkName_MtPyre + .2byte -1 @ flag num. + + .align 2 +Landmark_ShoalCave: + .4byte gLandmarkName_ShoalCave + .2byte -1 @ flag num. + + .align 2 +Landmark_SeafloorCavern: + .4byte gLandmarkName_SeafloorCavern + .2byte 2119 @ flag num. + + .align 2 +Landmark_GraniteCave: + .4byte gLandmarkName_GraniteCave + .2byte -1 @ flag num. + + .align 2 +Landmark_OceanCurrent: + .4byte gLandmarkName_OceanCurrent + .2byte -1 @ flag num. + + .align 2 +Landmark_LanettesHouse: + .4byte gLandmarkName_LanettesHouse + .2byte 2117 @ flag num. + + .align 2 +Landmark_FieryPath: + .4byte gLandmarkName_FieryPath + .2byte 2122 @ flag num. + + .align 2 +Landmark_JaggedPass: + .4byte gLandmarkName_JaggedPass + .2byte -1 @ flag num. + + .align 2 +Landmark_BerryMastersHouse: + .4byte gLandmarkName_BerryMastersHouse + .2byte 2147 @ flag num. + + .align 2 +Landmark_IslandCave: + .4byte gLandmarkName_IslandCave + .2byte 2133 @ flag num. + + .align 2 +Landmark_DesertRuins: + .4byte gLandmarkName_DesertRuins + .2byte 2134 @ flag num. + + .align 2 +Landmark_ScorchedSlab: + .4byte gLandmarkName_ScorchedSlab + .2byte 2136 @ flag num. + + .align 2 +Landmark_AncientTomb: + .4byte gLandmarkName_AncientTomb + .2byte 2137 @ flag num. + + .align 2 +Landmark_SealedChamber: + .4byte gLandmarkName_SealedChamber + .2byte 2140 @ flag num. + + .align 2 +Landmark_FossilManiacsHouse: + .4byte gLandmarkName_FossilManiacsHouse + .2byte 2135 @ flag num. + + .align 2 +Landmark_HuntersHouse: + .4byte gLandmarkName_HuntersHouse + .2byte 2139 @ flag num. + + .align 2 +Landmark_SkyPillar: + .4byte gLandmarkName_SkyPillar + .2byte 2142 @ flag num. + + .align 2 +LandmarkList_Route104_0: + .4byte Landmark_FlowerShop + .4byte NULL + + .align 2 +LandmarkList_Route104_1: + .4byte Landmark_PetalburgWoods + .4byte Landmark_MrBrineysCottage + .4byte NULL + + .align 2 +LandmarkList_Route105_0: + .4byte Landmark_IslandCave + .4byte NULL + + .align 2 +LandmarkList_Route106_1: + .4byte Landmark_GraniteCave + .4byte NULL + + .align 2 +LandmarkList_Route108_0: + .4byte Landmark_AbandonedShip + .4byte NULL + + .align 2 +LandmarkList_Route109_0: + .4byte Landmark_SeashoreHouse + .4byte Landmark_SlateportBeach + .4byte NULL + + .align 2 +LandmarkList_Route110_0: + .4byte Landmark_CyclingRoad + .4byte Landmark_NewMauville + .4byte NULL + + .align 2 +LandmarkList_Route110_1: + .4byte Landmark_CyclingRoad + .4byte NULL + + .align 2 +LandmarkList_Route110_2: + .4byte Landmark_CyclingRoad + .4byte Landmark_TrickHouse + .4byte NULL + + .align 2 +LandmarkList_Route111_0: + .4byte Landmark_OldLadysRestShop + .4byte NULL + + .align 2 +LandmarkList_Route111_1: + .4byte Landmark_Desert + .4byte NULL + + .align 2 +LandmarkList_Route111_3: + .4byte Landmark_DesertRuins + .4byte Landmark_Desert + .4byte NULL + + .align 2 +LandmarkList_Route111_4: + .4byte Landmark_WinstrateFamily + .4byte Landmark_Desert + .4byte NULL + + .align 2 +LandmarkList_Route112_0: + .4byte Landmark_FieryPath + .4byte Landmark_JaggedPass + .4byte NULL + + .align 2 +LandmarkList_Route112_1: + .4byte Landmark_CableCar + .4byte Landmark_FieryPath + .4byte NULL + + .align 2 +LandmarkList_Route113_1: + .4byte Landmark_GlassWorkshop + .4byte NULL + + .align 2 +LandmarkList_Route114_1: + .4byte Landmark_FossilManiacsHouse + .4byte NULL + + .align 2 +LandmarkList_Route114_2: + .4byte Landmark_LanettesHouse + .4byte NULL + + .align 2 +LandmarkList_MeteorFalls: + .4byte Landmark_MeteorFalls + .4byte NULL + + .align 2 +LandmarkList_Route116_1: + .4byte Landmark_TunnelersRestHouse + .4byte Landmark_RusturfTunnel + .4byte NULL + + .align 2 +LandmarkList_Route116_2: + .4byte Landmark_RusturfTunnel + .4byte NULL + + .align 2 +LandmarkList_Route117_2: + .4byte Landmark_PokemonDayCare + .4byte NULL + + .align 2 +LandmarkList_Route119_1: + .4byte Landmark_WeatherInstitute + .4byte NULL + + .align 2 +LandmarkList_Route120_0: + .4byte Landmark_ScorchedSlab + .4byte NULL + + .align 2 +LandmarkList_Route120_2: + .4byte Landmark_AncientTomb + .4byte NULL + + .align 2 +LandmarkList_Route121_2: + .4byte Landmark_SafariZoneEntrance + .4byte NULL + + .align 2 +LandmarkList_Route122_0: + .4byte Landmark_MtPyre + .4byte NULL + + .align 2 +LandmarkList_Route123_0: + .4byte Landmark_BerryMastersHouse + .4byte NULL + + .align 2 +LandmarkList_Route124_7: + .4byte Landmark_HuntersHouse + .4byte NULL + + .align 2 +LandmarkList_Route125_2: + .4byte Landmark_ShoalCave + .4byte NULL + + .align 2 +LandmarkList_Route128_1: + .4byte Landmark_SeafloorCavern + .4byte NULL + + .align 2 +LandmarkList_Route131_1: + .4byte Landmark_SkyPillar + .4byte NULL + + .align 2 +LandmarkList_OceanCurrent: + .4byte Landmark_OceanCurrent + .4byte NULL + + .align 2 +LandmarkList_Route134_2: + .4byte Landmark_SealedChamber + .4byte Landmark_OceanCurrent + .4byte NULL + + .align 2 +LandmarkList_MtChimney_2: + .4byte Landmark_CableCar + .4byte Landmark_JaggedPass + .4byte NULL + + .align 2 +gLandmarkLists:: @ 83FBA18 + .byte MAPSEC_Route104, 0 + .space 2 + .4byte LandmarkList_Route104_0 + + .byte MAPSEC_Route104, 1 + .space 2 + .4byte LandmarkList_Route104_1 + + .byte MAPSEC_Route105, 0 + .space 2 + .4byte LandmarkList_Route105_0 + + .byte MAPSEC_Route106, 1 + .space 2 + .4byte LandmarkList_Route106_1 + + .byte MAPSEC_Route108, 0 + .space 2 + .4byte LandmarkList_Route108_0 + + .byte MAPSEC_Route109, 0 + .space 2 + .4byte LandmarkList_Route109_0 + + .byte MAPSEC_Route110, 0 + .space 2 + .4byte LandmarkList_Route110_0 + + .byte MAPSEC_Route110, 1 + .space 2 + .4byte LandmarkList_Route110_1 + + .byte MAPSEC_Route110, 2 + .space 2 + .4byte LandmarkList_Route110_2 + + .byte MAPSEC_Route111, 0 + .space 2 + .4byte LandmarkList_Route111_0 + + .byte MAPSEC_Route111, 1 + .space 2 + .4byte LandmarkList_Route111_1 + + .byte MAPSEC_Route111, 2 + .space 2 + .4byte LandmarkList_Route111_1 + + .byte MAPSEC_Route111, 3 + .space 2 + .4byte LandmarkList_Route111_3 + + .byte MAPSEC_Route111, 4 + .space 2 + .4byte LandmarkList_Route111_4 + + .byte MAPSEC_Route112, 0 + .space 2 + .4byte LandmarkList_Route112_0 + + .byte MAPSEC_Route112, 1 + .space 2 + .4byte LandmarkList_Route112_1 + + .byte MAPSEC_Route113, 1 + .space 2 + .4byte LandmarkList_Route113_1 + + .byte MAPSEC_Route114, 1 + .space 2 + .4byte LandmarkList_Route114_1 + + .byte MAPSEC_Route114, 2 + .space 2 + .4byte LandmarkList_Route114_2 + + .byte MAPSEC_Route114, 3 + .space 2 + .4byte LandmarkList_MeteorFalls + + .byte MAPSEC_Route115, 0 + .space 2 + .4byte LandmarkList_MeteorFalls + + .byte MAPSEC_Route115, 1 + .space 2 + .4byte LandmarkList_MeteorFalls + + .byte MAPSEC_Route116, 1 + .space 2 + .4byte LandmarkList_Route116_1 + + .byte MAPSEC_Route116, 2 + .space 2 + .4byte LandmarkList_Route116_2 + + .byte MAPSEC_Route117, 2 + .space 2 + .4byte LandmarkList_Route117_2 + + .byte MAPSEC_Route119, 1 + .space 2 + .4byte LandmarkList_Route119_1 + + .byte MAPSEC_Route120, 0 + .space 2 + .4byte LandmarkList_Route120_0 + + .byte MAPSEC_Route120, 2 + .space 2 + .4byte LandmarkList_Route120_2 + + .byte MAPSEC_Route121, 2 + .space 2 + .4byte LandmarkList_Route121_2 + + .byte MAPSEC_Route122, 0 + .space 2 + .4byte LandmarkList_Route122_0 + + .byte MAPSEC_Route123, 0 + .space 2 + .4byte LandmarkList_Route123_0 + + .byte MAPSEC_Route122, 1 + .space 2 + .4byte LandmarkList_Route122_0 + + .byte MAPSEC_Route124, 7 + .space 2 + .4byte LandmarkList_Route124_7 + + .byte MAPSEC_Route125, 2 + .space 2 + .4byte LandmarkList_Route125_2 + + .byte MAPSEC_Route128, 1 + .space 2 + .4byte LandmarkList_Route128_1 + + .byte MAPSEC_Route131, 1 + .space 2 + .4byte LandmarkList_Route131_1 + + .byte MAPSEC_Route132, 0 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route132, 1 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route133, 0 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route133, 1 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route133, 2 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route134, 0 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route134, 1 + .space 2 + .4byte LandmarkList_OceanCurrent + + .byte MAPSEC_Route134, 2 + .space 2 + .4byte LandmarkList_Route134_2 + + .byte MAPSEC_MtChimney, 2 + .space 2 + .4byte LandmarkList_MtChimney_2 + + .byte MAPSEC_Nothing, 0 + .space 2 + .4byte NULL diff --git a/data/region_map_sections.s b/data/region_map_sections.s new file mode 100644 index 000000000..6336eac0e --- /dev/null +++ b/data/region_map_sections.s @@ -0,0 +1,16 @@ +gRegionMapSections:: @ 83E6E50 + .byte 0x58,0x1D,0x1D,0x04,0x1C,0x1C,0x1C,0x1C,0x1A,0x58,0x58,0x22,0x0B,0x23,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 + .byte 0x58,0x1D,0x58,0x58,0x58,0x58,0x38,0x38,0x1A,0x58,0x58,0x22,0x58,0x23,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 + .byte 0x1E,0x1D,0x58,0x58,0x58,0x58,0x38,0x38,0x1A,0x58,0x58,0x22,0x58,0x23,0x58,0x58,0x39,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 + .byte 0x1E,0x58,0x58,0x58,0x58,0x03,0x1B,0x1B,0x1A,0x58,0x58,0x22,0x58,0x23,0x24,0x24,0x24,0x24,0x0C,0x0C,0x27,0x27,0x27,0x27,0x28,0x28,0x58,0x58 + .byte 0x1E,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x1A,0x58,0x58,0x22,0x58,0x58,0x58,0x58,0x25,0x58,0x58,0x58,0x27,0x27,0x27,0x27,0x28,0x28,0x58,0x58 + .byte 0x0A,0x1F,0x1F,0x1F,0x1F,0x58,0x58,0x58,0x1A,0x58,0x58,0x22,0x58,0x58,0x58,0x58,0x25,0x58,0x58,0x58,0x27,0x27,0x27,0x27,0x0D,0x0D,0x58,0x58 + .byte 0x0A,0x58,0x58,0x58,0x05,0x20,0x20,0x20,0x09,0x09,0x21,0x21,0x26,0x26,0x26,0x26,0x26,0x58,0x58,0x58,0x29,0x29,0x29,0x2A,0x2A,0x2A,0x58,0x58 + .byte 0x13,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x29,0x0E,0x29,0x2A,0x2A,0x2A,0x58,0x58 + .byte 0x13,0x58,0x58,0x58,0x12,0x12,0x12,0x12,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x29,0x29,0x29,0x2A,0x2A,0x2A,0x58,0x0F + .byte 0x13,0x07,0x11,0x11,0x01,0x58,0x58,0x58,0x19,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x2B,0x2B,0x2B,0x2B,0x0F + .byte 0x14,0x58,0x58,0x58,0x10,0x58,0x58,0x58,0x08,0x31,0x31,0x31,0x30,0x30,0x30,0x2F,0x2F,0x06,0x2E,0x2E,0x2E,0x2D,0x2D,0x2D,0x2C,0x2C,0x58,0x58 + .byte 0x14,0x58,0x58,0x58,0x00,0x58,0x58,0x58,0x08,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 + .byte 0x14,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x18,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x3A,0x58,0x58,0x58,0x58,0x58 + .byte 0x15,0x15,0x15,0x58,0x58,0x58,0x58,0x58,0x18,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 + .byte 0x58,0x58,0x02,0x16,0x16,0x16,0x17,0x17,0x18,0x58,0x58,0x58,0x49,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58,0x58 diff --git a/data/text/landmarks.s b/data/text/landmarks.s new file mode 100644 index 000000000..72d5398bd --- /dev/null +++ b/data/text/landmarks.s @@ -0,0 +1,110 @@ +gLandmarkName_FlowerShop:: + .string "FLOWER SHOP$" + +gLandmarkName_PetalburgWoods:: + .string "PETALBURG WOODS$" + +gLandmarkName_MrBrineysCottage:: + .string "MR. BRINEY’S COTTAGE$" + +gLandmarkName_AbandonedShip:: + .string "ABANDONED SHIP$" + +gLandmarkName_SeashoreHouse:: + .string "SEASHORE HOUSE$" + +gLandmarkName_SlateportBeach:: + .string "SLATEPORT BEACH$" + +gLandmarkName_CyclingRoad:: + .string "CYCLING ROAD$" + +gLandmarkName_NewMauville:: + .string "NEW MAUVILLE$" + +gLandmarkName_TrickHouse:: + .string "TRICK HOUSE$" + +gLandmarkName_OldLadysRestShop:: + .string "OLD LADY’S REST STOP$" + +gLandmarkName_Desert:: + .string "DESERT$" + +gLandmarkName_WinstrateFamily:: + .string "THE WINSTRATE FAMILY$" + +gLandmarkName_CableCar:: + .string "CABLE CAR$" + +gLandmarkName_GlassWorkshop:: + .string "GLASS WORKSHOP$" + +gLandmarkName_WeatherInstitute:: + .string "WEATHER INSTITUTE$" + +gLandmarkName_MeteorFalls:: + .string "METEOR FALLS$" + +gLandmarkName_TunnelersRestHouse:: + .string "TUNNELER’S REST HOUSE$" + +gLandmarkName_RusturfTunnel:: + .string "RUSTURF TUNNEL$" + +gLandmarkName_PokemonDayCare:: + .string "POKéMON DAY CARE$" + +gLandmarkName_SafariZoneEntrance:: + .string "SAFARI ZONE ENTRANCE$" + +gLandmarkName_MtPyre:: + .string "MT. PYRE$" + +gLandmarkName_ShoalCave:: + .string "SHOAL CAVE$" + +gLandmarkName_SeafloorCavern:: + .string "SEAFLOOR CAVERN$" + +gLandmarkName_GraniteCave:: + .string "GRANITE CAVE$" + +gLandmarkName_OceanCurrent:: + .string "OCEAN CURRENT$" + +gLandmarkName_LanettesHouse:: + .string "LANETTE’S HOUSE$" + +gLandmarkName_FieryPath:: + .string "FIERY PATH$" + +gLandmarkName_JaggedPass:: + .string "JAGGED PASS$" + +gLandmarkName_SkyPillar:: + .string "SKY PILLAR$" + +gLandmarkName_BerryMastersHouse:: + .string "BERRY MASTER’S HOUSE$" + +gLandmarkName_IslandCave:: + .string "ISLAND CAVE$" + +gLandmarkName_DesertRuins:: + .string "DESERT RUINS$" + +gLandmarkName_ScorchedSlab:: + .string "SCORCHED SLAB$" + +gLandmarkName_AncientTomb:: + .string "ANCIENT TOMB$" + +gLandmarkName_SealedChamber:: + .string "SEALED CHAMBER$" + +gLandmarkName_FossilManiacsHouse:: + .string "FOSSIL MANIAC’S HOUSE$" + +gLandmarkName_HuntersHouse:: + .string "HUNTER’S HOUSE$" diff --git a/graphics/interface/map.pal b/graphics/pokenav/region_map.pal index 4fca67ade..4fca67ade 100755 --- a/graphics/interface/map.pal +++ b/graphics/pokenav/region_map.pal diff --git a/graphics/interface/map.png b/graphics/pokenav/region_map.png Binary files differindex 08df6eb29..08df6eb29 100755 --- a/graphics/interface/map.png +++ b/graphics/pokenav/region_map.png diff --git a/graphics/pokenav/region_map_map.bin b/graphics/pokenav/region_map_map.bin Binary files differnew file mode 100644 index 000000000..889fd6d36 --- /dev/null +++ b/graphics/pokenav/region_map_map.bin @@ -22,7 +22,7 @@ $(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ -$(MENUGFXDIR)/map.8bpp: $(MENUGFXDIR)/map.png +$(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png $(GFX) $< $@ -num_tiles 233 $(PSSGFXDIR)/forest_frame.4bpp: $(PSSGFXDIR)/forest_frame.png |
