Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-23 13:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert landmark data to C

Browse Source
This commit is contained in:
camthesaxman 2017-11-27 17:17:00 -06:00
parent 5498eaf948
commit 8fd1e16862
7 changed files with 359 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/constants.inc
View File

@ -8,7 +8,6 @@
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"
.include "constants/version.inc"
.include "constants/region_map_sections.inc"
.include "constants/battle.inc"
.include "constants/battle_text.inc"
.include "constants/contest_move_effects.inc"

52
constants/region_map_sections.inc
View File

@ -1,52 +0,0 @@
.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

561
data/landmark.s
View File

@ -1,561 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.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
Landmarks_Route104_0:
.4byte Landmark_FlowerShop
.4byte NULL
.align 2
Landmarks_Route104_1:
.4byte Landmark_PetalburgWoods
.4byte Landmark_MrBrineysCottage
.4byte NULL
.align 2
Landmarks_Route105_0:
.4byte Landmark_IslandCave
.4byte NULL
.align 2
Landmarks_Route106_1:
.4byte Landmark_GraniteCave
.4byte NULL
.align 2
Landmarks_Route108_0:
.4byte Landmark_AbandonedShip
.4byte NULL
.align 2
Landmarks_Route109_0:
.4byte Landmark_SeashoreHouse
.4byte Landmark_SlateportBeach
.4byte NULL
.align 2
Landmarks_Route110_0:
.4byte Landmark_CyclingRoad
.4byte Landmark_NewMauville
.4byte NULL
.align 2
Landmarks_Route110_1:
.4byte Landmark_CyclingRoad
.4byte NULL
.align 2
Landmarks_Route110_2:
.4byte Landmark_CyclingRoad
.4byte Landmark_TrickHouse
.4byte NULL
.align 2
Landmarks_Route111_0:
.4byte Landmark_OldLadysRestShop
.4byte NULL
.align 2
Landmarks_Route111_1:
.4byte Landmark_Desert
.4byte NULL
.align 2
Landmarks_Route111_3:
.4byte Landmark_DesertRuins
.4byte Landmark_Desert
.4byte NULL
.align 2
Landmarks_Route111_4:
.4byte Landmark_WinstrateFamily
.4byte Landmark_Desert
.4byte NULL
.align 2
Landmarks_Route112_0:
.4byte Landmark_FieryPath
.4byte Landmark_JaggedPass
.4byte NULL
.align 2
Landmarks_Route112_1:
.4byte Landmark_CableCar
.4byte Landmark_FieryPath
.4byte NULL
.align 2
Landmarks_Route113_1:
.4byte Landmark_GlassWorkshop
.4byte NULL
.align 2
Landmarks_Route114_1:
.4byte Landmark_FossilManiacsHouse
.4byte NULL
.align 2
Landmarks_Route114_2:
.4byte Landmark_LanettesHouse
.4byte NULL
.align 2
Landmarks_MeteorFalls:
.4byte Landmark_MeteorFalls
.4byte NULL
.align 2
Landmarks_Route116_1:
.4byte Landmark_TunnelersRestHouse
.4byte Landmark_RusturfTunnel
.4byte NULL
.align 2
Landmarks_Route116_2:
.4byte Landmark_RusturfTunnel
.4byte NULL
.align 2
Landmarks_Route117_2:
.4byte Landmark_PokemonDayCare
.4byte NULL
.align 2
Landmarks_Route119_1:
.4byte Landmark_WeatherInstitute
.4byte NULL
.align 2
Landmarks_Route120_0:
.4byte Landmark_ScorchedSlab
.4byte NULL
.align 2
Landmarks_Route120_2:
.4byte Landmark_AncientTomb
.4byte NULL
.align 2
Landmarks_Route121_2:
.4byte Landmark_SafariZoneEntrance
.4byte NULL
.align 2
Landmarks_Route122_0:
.4byte Landmark_MtPyre
.4byte NULL
.align 2
Landmarks_Route123_0:
.4byte Landmark_BerryMastersHouse
.4byte NULL
.align 2
Landmarks_Route124_7:
.4byte Landmark_HuntersHouse
.4byte NULL
.align 2
Landmarks_Route125_2:
.4byte Landmark_ShoalCave
.4byte NULL
.align 2
Landmarks_Route128_1:
.4byte Landmark_SeafloorCavern
.4byte NULL
.align 2
Landmarks_Route131_1:
.4byte Landmark_SkyPillar
.4byte NULL
.align 2
Landmarks_OceanCurrent:
.4byte Landmark_OceanCurrent
.4byte NULL
.align 2
Landmarks_Route134_2:
.4byte Landmark_SealedChamber
.4byte Landmark_OceanCurrent
.4byte NULL
.align 2
Landmarks_MtChimney_2:
.4byte Landmark_CableCar
.4byte Landmark_JaggedPass
.4byte NULL
.align 2
gLandmarkLists:: @ 83FBA18
.byte MAPSEC_Route104, 0
.space 2
.4byte Landmarks_Route104_0
.byte MAPSEC_Route104, 1
.space 2
.4byte Landmarks_Route104_1
.byte MAPSEC_Route105, 0
.space 2
.4byte Landmarks_Route105_0
.byte MAPSEC_Route106, 1
.space 2
.4byte Landmarks_Route106_1
.byte MAPSEC_Route108, 0
.space 2
.4byte Landmarks_Route108_0
.byte MAPSEC_Route109, 0
.space 2
.4byte Landmarks_Route109_0
.byte MAPSEC_Route110, 0
.space 2
.4byte Landmarks_Route110_0
.byte MAPSEC_Route110, 1
.space 2
.4byte Landmarks_Route110_1
.byte MAPSEC_Route110, 2
.space 2
.4byte Landmarks_Route110_2
.byte MAPSEC_Route111, 0
.space 2
.4byte Landmarks_Route111_0
.byte MAPSEC_Route111, 1
.space 2
.4byte Landmarks_Route111_1
.byte MAPSEC_Route111, 2
.space 2
.4byte Landmarks_Route111_1
.byte MAPSEC_Route111, 3
.space 2
.4byte Landmarks_Route111_3
.byte MAPSEC_Route111, 4
.space 2
.4byte Landmarks_Route111_4
.byte MAPSEC_Route112, 0
.space 2
.4byte Landmarks_Route112_0
.byte MAPSEC_Route112, 1
.space 2
.4byte Landmarks_Route112_1
.byte MAPSEC_Route113, 1
.space 2
.4byte Landmarks_Route113_1
.byte MAPSEC_Route114, 1
.space 2
.4byte Landmarks_Route114_1
.byte MAPSEC_Route114, 2
.space 2
.4byte Landmarks_Route114_2
.byte MAPSEC_Route114, 3
.space 2
.4byte Landmarks_MeteorFalls
.byte MAPSEC_Route115, 0
.space 2
.4byte Landmarks_MeteorFalls
.byte MAPSEC_Route115, 1
.space 2
.4byte Landmarks_MeteorFalls
.byte MAPSEC_Route116, 1
.space 2
.4byte Landmarks_Route116_1
.byte MAPSEC_Route116, 2
.space 2
.4byte Landmarks_Route116_2
.byte MAPSEC_Route117, 2
.space 2
.4byte Landmarks_Route117_2
.byte MAPSEC_Route119, 1
.space 2
.4byte Landmarks_Route119_1
.byte MAPSEC_Route120, 0
.space 2
.4byte Landmarks_Route120_0
.byte MAPSEC_Route120, 2
.space 2
.4byte Landmarks_Route120_2
.byte MAPSEC_Route121, 2
.space 2
.4byte Landmarks_Route121_2
.byte MAPSEC_Route122, 0
.space 2
.4byte Landmarks_Route122_0
.byte MAPSEC_Route123, 0
.space 2
.4byte Landmarks_Route123_0
.byte MAPSEC_Route122, 1
.space 2
.4byte Landmarks_Route122_0
.byte MAPSEC_Route124, 7
.space 2
.4byte Landmarks_Route124_7
.byte MAPSEC_Route125, 2
.space 2
.4byte Landmarks_Route125_2
.byte MAPSEC_Route128, 1
.space 2
.4byte Landmarks_Route128_1
.byte MAPSEC_Route131, 1
.space 2
.4byte Landmarks_Route131_1
.byte MAPSEC_Route132, 0
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route132, 1
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route133, 0
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route133, 1
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route133, 2
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route134, 0
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route134, 1
.space 2
.4byte Landmarks_OceanCurrent
.byte MAPSEC_Route134, 2
.space 2
.4byte Landmarks_Route134_2
.byte MAPSEC_MtChimney, 2
.space 2
.4byte Landmarks_MtChimney_2
.byte MAPSEC_Nothing, 0
.space 2
.4byte NULL

2
include/landmark.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_LANDMARK_H
#define GUARD_LANDMARK_H
u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count);
const u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count);
#endif // GUARD_LANDMARK_H

4
include/region_map_sections.h
View File

@ -53,8 +53,8 @@ enum
MAPSEC_Route132, // 0x2F
MAPSEC_Route133, // 0x30
MAPSEC_Route134, // 0x31
MAPSEC_MtChimney, // 0x38
MAPSEC_Nothing, // 0x58
MAPSEC_MtChimney = 0x38, // 0x38
MAPSEC_Nothing = 0x58, // 0x58
};
#endif // GUARD_REGIONMAPSEC_H

2
ld_script.txt
View File

@ -568,7 +568,7 @@ SECTIONS {
src/scene/evolution_scene.o(.rodata);
data/roulette.o(.rodata);
data/pokedex_cry_screen.o(.rodata);
data/landmark.o(.rodata);
src/field/landmark.o(.rodata);
src/battle/battle_transition.o(.rodata);
src/battle/battle_controller_linkpartner.o(.rodata);
src/battle/battle_message.o(.rodata);

366
src/field/landmark.c
View File

@ -1,12 +1,11 @@
#include "global.h"
#include "landmark.h"
#include "event_data.h"
#define MAPSEC_NONE 0x58
#include "region_map_sections.h"
struct Landmark
{
u8 *name;
const u8 *name;
u16 flag;
};
@ -14,16 +13,361 @@ struct LandmarkList
{
u8 mapSection;
u8 id;
const struct Landmark **landmarks;
const struct Landmark *const *landmarks;
};
extern const struct LandmarkList gLandmarkLists[];
extern const u8 gLandmarkName_FlowerShop[];
extern const u8 gLandmarkName_PetalburgWoods[];
extern const u8 gLandmarkName_MrBrineysCottage[];
extern const u8 gLandmarkName_AbandonedShip[];
extern const u8 gLandmarkName_SeashoreHouse[];
extern const u8 gLandmarkName_SlateportBeach[];
extern const u8 gLandmarkName_CyclingRoad[];
extern const u8 gLandmarkName_NewMauville[];
extern const u8 gLandmarkName_TrickHouse[];
extern const u8 gLandmarkName_OldLadysRestShop[];
extern const u8 gLandmarkName_Desert[];
extern const u8 gLandmarkName_WinstrateFamily[];
extern const u8 gLandmarkName_CableCar[];
extern const u8 gLandmarkName_GlassWorkshop[];
extern const u8 gLandmarkName_WeatherInstitute[];
extern const u8 gLandmarkName_MeteorFalls[];
extern const u8 gLandmarkName_TunnelersRestHouse[];
extern const u8 gLandmarkName_RusturfTunnel[];
extern const u8 gLandmarkName_PokemonDayCare[];
extern const u8 gLandmarkName_SafariZoneEntrance[];
extern const u8 gLandmarkName_MtPyre[];
extern const u8 gLandmarkName_ShoalCave[];
extern const u8 gLandmarkName_SeafloorCavern[];
extern const u8 gLandmarkName_GraniteCave[];
extern const u8 gLandmarkName_OceanCurrent[];
extern const u8 gLandmarkName_LanettesHouse[];
extern const u8 gLandmarkName_FieryPath[];
extern const u8 gLandmarkName_JaggedPass[];
extern const u8 gLandmarkName_BerryMastersHouse[];
extern const u8 gLandmarkName_IslandCave[];
extern const u8 gLandmarkName_DesertRuins[];
extern const u8 gLandmarkName_ScorchedSlab[];
extern const u8 gLandmarkName_AncientTomb[];
extern const u8 gLandmarkName_SealedChamber[];
extern const u8 gLandmarkName_FossilManiacsHouse[];
extern const u8 gLandmarkName_HuntersHouse[];
extern const u8 gLandmarkName_SkyPillar[];
static const struct Landmark **GetLandmarks(u8 mapSection, u8 id);
static const struct Landmark Landmark_FlowerShop = {gLandmarkName_FlowerShop, 2108};
static const struct Landmark Landmark_PetalburgWoods = {gLandmarkName_PetalburgWoods, -1};
static const struct Landmark Landmark_MrBrineysCottage = {gLandmarkName_MrBrineysCottage, 2109};
static const struct Landmark Landmark_AbandonedShip = {gLandmarkName_AbandonedShip, 2110};
static const struct Landmark Landmark_SeashoreHouse = {gLandmarkName_SeashoreHouse, 2111};
static const struct Landmark Landmark_SlateportBeach = {gLandmarkName_SlateportBeach, -1};
static const struct Landmark Landmark_CyclingRoad = {gLandmarkName_CyclingRoad, -1};
static const struct Landmark Landmark_NewMauville = {gLandmarkName_NewMauville, 2112};
static const struct Landmark Landmark_TrickHouse = {gLandmarkName_TrickHouse, 2114};
static const struct Landmark Landmark_OldLadysRestShop = {gLandmarkName_OldLadysRestShop, 2113};
static const struct Landmark Landmark_Desert = {gLandmarkName_Desert, -1};
static const struct Landmark Landmark_WinstrateFamily = {gLandmarkName_WinstrateFamily, 2115};
static const struct Landmark Landmark_CableCar = {gLandmarkName_CableCar, -1};
static const struct Landmark Landmark_GlassWorkshop = {gLandmarkName_GlassWorkshop, 2116};
static const struct Landmark Landmark_WeatherInstitute = {gLandmarkName_WeatherInstitute, -1};
static const struct Landmark Landmark_MeteorFalls = {gLandmarkName_MeteorFalls, -1};
static const struct Landmark Landmark_TunnelersRestHouse = {gLandmarkName_TunnelersRestHouse, 2138};
static const struct Landmark Landmark_RusturfTunnel = {gLandmarkName_RusturfTunnel, -1};
static const struct Landmark Landmark_PokemonDayCare = {gLandmarkName_PokemonDayCare, 2118};
static const struct Landmark Landmark_SafariZoneEntrance = {gLandmarkName_SafariZoneEntrance, -1};
static const struct Landmark Landmark_MtPyre = {gLandmarkName_MtPyre, -1};
static const struct Landmark Landmark_ShoalCave = {gLandmarkName_ShoalCave, -1};
static const struct Landmark Landmark_SeafloorCavern = {gLandmarkName_SeafloorCavern, 2119};
static const struct Landmark Landmark_GraniteCave = {gLandmarkName_GraniteCave, -1};
static const struct Landmark Landmark_OceanCurrent = {gLandmarkName_OceanCurrent, -1};
static const struct Landmark Landmark_LanettesHouse = {gLandmarkName_LanettesHouse, 2117};
static const struct Landmark Landmark_FieryPath = {gLandmarkName_FieryPath, 2122};
static const struct Landmark Landmark_JaggedPass = {gLandmarkName_JaggedPass, -1};
static const struct Landmark Landmark_BerryMastersHouse = {gLandmarkName_BerryMastersHouse, 2147};
static const struct Landmark Landmark_IslandCave = {gLandmarkName_IslandCave, 2133};
static const struct Landmark Landmark_DesertRuins = {gLandmarkName_DesertRuins, 2134};
static const struct Landmark Landmark_ScorchedSlab = {gLandmarkName_ScorchedSlab, 2136};
static const struct Landmark Landmark_AncientTomb = {gLandmarkName_AncientTomb, 2137};
static const struct Landmark Landmark_SealedChamber = {gLandmarkName_SealedChamber, 2140};
static const struct Landmark Landmark_FossilManiacsHouse = {gLandmarkName_FossilManiacsHouse, 2135};
static const struct Landmark Landmark_HuntersHouse = {gLandmarkName_HuntersHouse, 2139};
static const struct Landmark Landmark_SkyPillar = {gLandmarkName_SkyPillar, 2142};
u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count)
static const struct Landmark *const Landmarks_Route104_0[] =
{
const struct Landmark **landmarks = GetLandmarks(mapSection, id);
&Landmark_FlowerShop,
NULL,
};
static const struct Landmark *const Landmarks_Route104_1[] =
{
&Landmark_PetalburgWoods,
&Landmark_MrBrineysCottage,
NULL,
};
static const struct Landmark *const Landmarks_Route105_0[] =
{
&Landmark_IslandCave,
NULL,
};
static const struct Landmark *const Landmarks_Route106_1[] =
{
&Landmark_GraniteCave,
NULL,
};
static const struct Landmark *const Landmarks_Route108_0[] =
{
&Landmark_AbandonedShip,
NULL,
};
static const struct Landmark *const Landmarks_Route109_0[] =
{
&Landmark_SeashoreHouse,
&Landmark_SlateportBeach,
NULL,
};
static const struct Landmark *const Landmarks_Route110_0[] =
{
&Landmark_CyclingRoad,
&Landmark_NewMauville,
NULL,
};
static const struct Landmark *const Landmarks_Route110_1[] =
{
&Landmark_CyclingRoad,
NULL,
};
static const struct Landmark *const Landmarks_Route110_2[] =
{
&Landmark_CyclingRoad,
&Landmark_TrickHouse,
NULL,
};
static const struct Landmark *const Landmarks_Route111_0[] =
{
&Landmark_OldLadysRestShop,
NULL,
};
static const struct Landmark *const Landmarks_Route111_1[] =
{
&Landmark_Desert,
NULL,
};
static const struct Landmark *const Landmarks_Route111_3[] =
{
&Landmark_DesertRuins,
&Landmark_Desert,
NULL,
};
static const struct Landmark *const Landmarks_Route111_4[] =
{
&Landmark_WinstrateFamily,
&Landmark_Desert,
NULL,
};
static const struct Landmark *const Landmarks_Route112_0[] =
{
&Landmark_FieryPath,
&Landmark_JaggedPass,
NULL,
};
static const struct Landmark *const Landmarks_Route112_1[] =
{
&Landmark_CableCar,
&Landmark_FieryPath,
NULL,
};
static const struct Landmark *const Landmarks_Route113_1[] =
{
&Landmark_GlassWorkshop,
NULL,
};
static const struct Landmark *const Landmarks_Route114_1[] =
{
&Landmark_FossilManiacsHouse,
NULL,
};
static const struct Landmark *const Landmarks_Route114_2[] =
{
&Landmark_LanettesHouse,
NULL,
};
static const struct Landmark *const Landmarks_MeteorFalls[] =
{
&Landmark_MeteorFalls,
NULL,
};
static const struct Landmark *const Landmarks_Route116_1[] =
{
&Landmark_TunnelersRestHouse,
&Landmark_RusturfTunnel,
NULL,
};
static const struct Landmark *const Landmarks_Route116_2[] =
{
&Landmark_RusturfTunnel,
NULL,
};
static const struct Landmark *const Landmarks_Route117_2[] =
{
&Landmark_PokemonDayCare,
NULL,
};
static const struct Landmark *const Landmarks_Route119_1[] =
{
&Landmark_WeatherInstitute,
NULL,
};
static const struct Landmark *const Landmarks_Route120_0[] =
{
&Landmark_ScorchedSlab,
NULL,
};
static const struct Landmark *const Landmarks_Route120_2[] =
{
&Landmark_AncientTomb,
NULL,
};
static const struct Landmark *const Landmarks_Route121_2[] =
{
&Landmark_SafariZoneEntrance,
NULL,
};
static const struct Landmark *const Landmarks_Route122_0[] =
{
&Landmark_MtPyre,
NULL,
};
static const struct Landmark *const Landmarks_Route123_0[] =
{
&Landmark_BerryMastersHouse,
NULL,
};
static const struct Landmark *const Landmarks_Route124_7[] =
{
&Landmark_HuntersHouse,
NULL,
};
static const struct Landmark *const Landmarks_Route125_2[] =
{
&Landmark_ShoalCave,
NULL,
};
static const struct Landmark *const Landmarks_Route128_1[] =
{
&Landmark_SeafloorCavern,
NULL,
};
static const struct Landmark *const Landmarks_Route131_1[] =
{
&Landmark_SkyPillar,
NULL,
};
static const struct Landmark *const Landmarks_OceanCurrent[] =
{
&Landmark_OceanCurrent,
NULL,
};
static const struct Landmark *const Landmarks_Route134_2[] =
{
&Landmark_SealedChamber,
&Landmark_OceanCurrent,
NULL,
};
static const struct Landmark *const Landmarks_MtChimney_2[] =
{
&Landmark_CableCar,
&Landmark_JaggedPass,
NULL,
};
static const struct LandmarkList gLandmarkLists[] =
{
{MAPSEC_Route104, 0, Landmarks_Route104_0},
{MAPSEC_Route104, 1, Landmarks_Route104_1},
{MAPSEC_Route105, 0, Landmarks_Route105_0},
{MAPSEC_Route106, 1, Landmarks_Route106_1},
{MAPSEC_Route108, 0, Landmarks_Route108_0},
{MAPSEC_Route109, 0, Landmarks_Route109_0},
{MAPSEC_Route110, 0, Landmarks_Route110_0},
{MAPSEC_Route110, 1, Landmarks_Route110_1},
{MAPSEC_Route110, 2, Landmarks_Route110_2},
{MAPSEC_Route111, 0, Landmarks_Route111_0},
{MAPSEC_Route111, 1, Landmarks_Route111_1},
{MAPSEC_Route111, 2, Landmarks_Route111_1},
{MAPSEC_Route111, 3, Landmarks_Route111_3},
{MAPSEC_Route111, 4, Landmarks_Route111_4},
{MAPSEC_Route112, 0, Landmarks_Route112_0},
{MAPSEC_Route112, 1, Landmarks_Route112_1},
{MAPSEC_Route113, 1, Landmarks_Route113_1},
{MAPSEC_Route114, 1, Landmarks_Route114_1},
{MAPSEC_Route114, 2, Landmarks_Route114_2},
{MAPSEC_Route114, 3, Landmarks_MeteorFalls},
{MAPSEC_Route115, 0, Landmarks_MeteorFalls},
{MAPSEC_Route115, 1, Landmarks_MeteorFalls},
{MAPSEC_Route116, 1, Landmarks_Route116_1},
{MAPSEC_Route116, 2, Landmarks_Route116_2},
{MAPSEC_Route117, 2, Landmarks_Route117_2},
{MAPSEC_Route119, 1, Landmarks_Route119_1},
{MAPSEC_Route120, 0, Landmarks_Route120_0},
{MAPSEC_Route120, 2, Landmarks_Route120_2},
{MAPSEC_Route121, 2, Landmarks_Route121_2},
{MAPSEC_Route122, 0, Landmarks_Route122_0},
{MAPSEC_Route123, 0, Landmarks_Route123_0},
{MAPSEC_Route122, 1, Landmarks_Route122_0},
{MAPSEC_Route124, 7, Landmarks_Route124_7},
{MAPSEC_Route125, 2, Landmarks_Route125_2},
{MAPSEC_Route128, 1, Landmarks_Route128_1},
{MAPSEC_Route131, 1, Landmarks_Route131_1},
{MAPSEC_Route132, 0, Landmarks_OceanCurrent},
{MAPSEC_Route132, 1, Landmarks_OceanCurrent},
{MAPSEC_Route133, 0, Landmarks_OceanCurrent},
{MAPSEC_Route133, 1, Landmarks_OceanCurrent},
{MAPSEC_Route133, 2, Landmarks_OceanCurrent},
{MAPSEC_Route134, 0, Landmarks_OceanCurrent},
{MAPSEC_Route134, 1, Landmarks_OceanCurrent},
{MAPSEC_Route134, 2, Landmarks_Route134_2},
{MAPSEC_MtChimney, 2, Landmarks_MtChimney_2},
{MAPSEC_Nothing, 0, NULL},
};
static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id);
const u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count)
{
const struct Landmark *const *landmarks = GetLandmarks(mapSection, id);
if (!landmarks)
return NULL;
@ -48,11 +392,11 @@ u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count)
return (*landmarks)->name;
}
static const struct Landmark **GetLandmarks(u8 mapSection, u8 id)
static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
{
u16 i = 0;
for (; gLandmarkLists[i].mapSection != MAPSEC_NONE; i++)
for (; gLandmarkLists[i].mapSection != MAPSEC_Nothing; i++)
{
if (gLandmarkLists[i].mapSection > mapSection)
return NULL;
@ -60,7 +404,7 @@ static const struct Landmark **GetLandmarks(u8 mapSection, u8 id)
break;
}
if (gLandmarkLists[i].mapSection == MAPSEC_NONE)
if (gLandmarkLists[i].mapSection == MAPSEC_Nothing)
return NULL;
for (; gLandmarkLists[i].mapSection == mapSection; i++)