From 7742e53476fbd71db2c6468b9ed655bacb9c3769 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Jun 2018 11:56:42 -0400 Subject: Define landmark constants --- constants/landmark_constants.asm | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 constants/landmark_constants.asm (limited to 'constants') diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm new file mode 100644 index 0000000..b7a7542 --- /dev/null +++ b/constants/landmark_constants.asm @@ -0,0 +1,47 @@ + const_def + const LANDMARK_NONE ; 00 + const LANDMARK_SILENT ; 01 + const LANDMARK_OLD ; 02 + const LANDMARK_WEST ; 03 + const LANDMARK_HIGH_TECH ; 04 + const LANDMARK_FOUNT ; 05 + const LANDMARK_BIRDON ; 06 + const LANDMARK_NEW_TYPE ; 07 + const LANDMARK_SUGAR ; 08 + const LANDMARK_BLUE_FOREST ; 09 + const LANDMARK_STAND ; 0a + const LANDMARK_KANTO ; 0b + const LANDMARK_PRINCE ; 0c + const LANDMARK_MT_FUJI ; 0d + const LANDMARK_SOUTH ; 0e + const LANDMARK_NORTH ; 0f + const LANDMARK_ROUTE_15 ; 10 + const LANDMARK_ROUTE_18 ; 11 + const LANDMARK_POWER_PLANT_1 ; 12 + const LANDMARK_POWER_PLANT_2 ; 13 + const LANDMARK_POWER_PLANT_3 ; 14 + const LANDMARK_POWER_PLANT_4 ; 15 + const LANDMARK_RUINS_1 ; 16 + const LANDMARK_RUINS_2 ; 17 + const LANDMARK_MINES_1 ; 18 + const LANDMARK_MINES_2 ; 19 + const LANDMARK_MINES_3 ; 1a + const LANDMARK_MINES_4 ; 1b + const LANDMARK_MINES_5 ; 1c + const LANDMARK_MINES_6 ; 1d + const LANDMARK_MINES_7 ; 1e + const LANDMARK_HIDEOUT_1 ; 1f + const LANDMARK_HIDEOUT_2 ; 20 + const LANDMARK_HIDEOUT_3 ; 21 + const LANDMARK_SLOWPOKE_WELL_1 ; 22 + const LANDMARK_SLOWPOKE_WELL_2 ; 23 + const LANDMARK_POKEMON_LEAGUE_1 ; 24 + const LANDMARK_POKEMON_LEAGUE_1_2 ; 25 + const LANDMARK_POKEMON_LEAGUE_2 ; 26 + const LANDMARK_POKEMON_LEAGUE_3 ; 27 + const LANDMARK_POKEMON_LEAGUE_4 ; 28 + const LANDMARK_POKEMON_LEAGUE_5 ; 29 + const LANDMARK_POKEMON_LEAGUE_6 ; 2a + const LANDMARK_POKEMON_LEAGUE_7 ; 2b + const LANDMARK_POKEMON_LEAGUE_7_2 ; 2c + const LANDMARK_SILENT_HILL ; 2d -- cgit v1.2.3 From 2de1701c6408e073ce7680fbc2fb439abf962eda Mon Sep 17 00:00:00 2001 From: pfero Date: Tue, 5 Jun 2018 21:47:22 +0200 Subject: Add map IDs Courtesy of Koolboyman --- constants/map_constants.asm | 231 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 constants/map_constants.asm (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm new file mode 100644 index 0000000..af2bffe --- /dev/null +++ b/constants/map_constants.asm @@ -0,0 +1,231 @@ +; Map IDs + + const_def + const ROUTE_1_P1 + const ROUTE_1_P2 + const ROUTE_SILENT_EAST + const SILENT_HILL + const ROUTE_1_GATE_1F + const ROUTE_1_GATE_2F + const ROUTE_SILENT_EAST_GATE + const PLAYER_HOUSE_1F + const PLAYER_HOUSE_2F + const SILENT_POKECENTER + const SILENT_HILL_HOUSE + const SILENT_HILL_LAB + const SILENT_HILL_LAB_2 + const UNUSED_13 + const SHIZUKANA_OKA + const ROUTE_2 + const OLD_CITY + const ROUTE_2_GATE_1F + const ROUTE_2_GATE_2F + const ROUTE_2_HOUSE + const OLD_MUSEUM + const OLD_GYM + const OLD_TOWER_1F + const OLD_TOWER_2F + const OLD_TOWER_3F + const OLD_TOWER_4F + const OLD_TOWER_5F + const OLD_BILLS_HOUSE + const OLD_MART + const OLD_HOUSE + const OLD_POKECENTER_1F + const OLD_POKECENTER_2F + const OLD_POKECENTER_TRADE + const OLD_POKECENTER_BATTLE + const OLD_POKECENTER_TIME_MACHINE + const OLD_KURTS_HOUSE + const OLD_SCHOOL + const WASTE + const WASTE_MART_1F + const WASTE_MART_2F + const WASTE_MART_3F + const WASTE_MART_4F + const WASTE_MART_5F + const WASTE_MART_6F + const WASTE_MART_ELEVATOR + const WASTE_RADIO_TOWER_1F + const WASTE_RADIO_TOWER_2F + const WASTE_RADIO_TOWER_3F + const WASTE_RADIO_TOWER_4F + const WASTE_RADIO_TOWER_5F + const WASTE_ROCKET_RAIDED_HOUSE + const WASTE_POKECENTER_1F + const WASTE_POKECENTER_2F + const WASTE_GYM + const WASTE_HOUSE_1 + const WASTE_HOUSE_2 + const HAITEKU_WEST_ROUTE + const HAITEKU_WEST_ROUTE_OCEAN + const HAITEKU + const HAITEKU_WEST_ROUTE_GATE + const HAITEKU_POKECENTER_1F + const HAITEKU_POKECENTER_2F + const HAITEKU_LEAGUE_1F + const HAITEKU_LEAGUE_2F + const HAITEKU_MART + const HAITEKU_HOUSE_1 + const HAITEKU_HOUSE_2 + const HAITEKU_IMPOSTER_OAK_HOUSE + const HAITEKU_AQUARIUM_1F + const HAITEKU_AQUARIUM_2F + const FONTO_ROUTE_1 + const FONTO_ROUTE_2 + const FONTO_ROUTE_3 + const FONTO_ROUTE_4 + const FONTO_ROUTE_5 + const FONTO_ROUTE_6 + const FONTO + const FONTO_ROUTE_GATE_1 + const FONTO_ROUTE_GATE_2 + const FONTO_ROUTE_GATE_3 + const FONTO_ROCKET_HOUSE + const FONTO_MART + const FONTO_HOUSE + const FONTO_POKECENTER_1F + const FONTO_POKECENTER_2F + const FONTO_LAB + const BAADON_ROUTE_1 + const BAADON_ROUTE_2 + const BAADON_ROUTE_3 + const BAADON + const BAADON_ROUTE_GATE_WASTE + const BAADON_ROUTE_GATE_NEWTYPE + const BAADON_MART + const BAADON_POKECENTER_1F + const BAADON_POKECENTER_2F + const BAADON_HOUSE_1 + const BAADON_WALLPAPER_HOUSE + const BAADON_HOUSE_2 + const BAADON_LEAGUE_1F + const BAADON_LEAGUE_2F + const ROUTE_15 + const NEWTYPE_ROUTE + const ROUTE_18 + const NEWTYPE + const ROUTE_15_POKECENTER_1F + const ROUTE_15_POKECENTER_2F + const NEWTYPE_ROUTE_GATE + const ROUTE_18_POKECENTER_1F + const ROUTE_18_POKECENTER_2F + const NEWTYPE_POKECENTER_1F + const NEWTYPE_POKECENTER_2F + const NEWTYPE_LEAGUE_1F + const NEWTYPE_LEAGUE_2F + const NEWTYPE_SAILOR_HOUSE + const NEWTYPE_MART + const NEWTYPE_DOJO + const NEWTYPE_HOUSE_1 + const NEWTYPE_DINER + const NEWTYPE_HOUSE_2 + const NEWTYPE_HOUSE_3 + const SUGAR_ROUTE + const SUGAR + const SUGAR_ROUTE_GATE + const SUGAR_HOUSE + const SUGAR_HOUSE_2 + const SUGAR_MART + const SUGAR_POKECENTER_1F + const SUGAR_POKECENTER_2F + const BULL_FOREST_ROUTE_1 + const BULL_FOREST_ROUTE_2 + const BULL_FOREST_ROUTE_3 + const BULL_FOREST + const BULL_FOREST_ROUTE_1_HOUSE + const BULL_FOREST_ROUTE_GATE_STAND + const BULL_MART + const BULL_HOUSE_1 + const BULL_HOUSE_2 + const BULL_HOUSE_3 + const BULL_POKECENTER_1F + const BULL_POKECENTER_2F + const BULL_LEAGUE_1F + const BULL_LEAGUE_2F + const BULL_HOUSE_4 + const STAND_ROUTE + const STAND + const STAND_ROUTE_GATE_KANTO + const STAND_LAB + const STAND_POKECENTER_1F + const STAND_POKECENTER_2F + const STAND_OFFICE + const STAND_MART + const STAND_HOUSE + const STAND_ROCKET_HOUSE_1F + const STAND_ROCKET_HOUSE_2F + const STAND_LEAGUE_1F + const STAND_LEAGUE_2F + const KANTO_EAST_ROUTE + const KANTO + const KANTO_CERULEAN_HOUSE + const KANTO_POKECENTER_1F + const KANTO_POKECENTER_2F + const KANTO_LEAGUE_1F + const KANTO_LEAGUE_2F + const KANTO_LAVENDER_HOUSE + const KANTO_CELADON_MART_1F + const KANTO_CELADON_MART_2F + const KANTO_CELADON_MART_3F + const KANTO_CELADON_MART_4F + const KANTO_CELADON_MART_5F + const KANTO_CELADON_ELEVATOR + const KANTO_MART + const KANTO_GAMEFREAK_HQ_1 + const KANTO_GAMEFREAK_HQ_2 + const KANTO_GAMEFREAK_HQ_3 + const KANTO_GAMEFREAK_HQ_4 + const KANTO_GAMEFREAK_HQ_5 + const KANTO_SILPH_CO + const KANTO_VIRIDIAN_HOUSE + const KANTO_GAME_CORNER + const KANTO_UNUSED_AREA + const KANTO_GAME_CORNER_PRIZES + const KANTO_DINER + const KANTO_SCHOOL + const KANTO_HOSPITAL + const KANTO_POKECENTER_2_1F + const KANTO_POKECENTER_2_2F + const KANTO_REDS_HOUSE + const KANTO_GREENS_HOUSE_1F + const KANTO_GREENS_HOUSE_2F + const KANTO_ELDERS_HOUSE + const KANTO_OAKS_LAB + const KANTO_LEAGUE_2_1F + const KANTO_LEAGUE_2_2F + const KANTO_FISHING_GURU + const PRINCE_ROUTE + const PRINCE + const MT_FUJI_ROUTE + const MT_FUJI + const SOUTH + const SOUTH_HOUSE_1 + const SOUTH_POKECENTER_1F + const SOUTH_POKECENTER_2F + const SOUTH_MART + const SOUTH_HOUSE_2 + const NORTH + const NORTH_HOUSE_1 + const NORTH_MART + const NORTH_HOUSE_2 + const NORTH_POKECENTER_1F + const NORTH_POKECENTER_2F + const POWER_PLANT_1 + const POWER_PLANT_2 + const POWER_PLANT_3 + const POWER_PLANT_4 + const RUINS_OF_ALPH_ENTRANCE + const RUINS_OF_ALPH_MAIN + const CAVE_MINECARTS_1 + const CAVE_MINECARTS_2 + const CAVE_MINECARTS_3 + const CAVE_MINECARTS_4 + const CAVE_MINECARTS_5 + const CAVE_MINECARTS_6 + const CAVE_MINECARTS_7 + const OFFICE_1 + const OFFICE_2 + const OFFICE_3 + const SLOWPOKE_WELL_ENTRANCE + const SLOWPOKE_WELL_MAIN -- cgit v1.2.3 From 7439c3107e8d972f88221a8d45781f3388d9ca64 Mon Sep 17 00:00:00 2001 From: pfero Date: Tue, 5 Jun 2018 21:49:23 +0200 Subject: WASTE -> WEST --- constants/map_constants.asm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index af2bffe..3b386e6 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -38,25 +38,25 @@ const OLD_POKECENTER_TIME_MACHINE const OLD_KURTS_HOUSE const OLD_SCHOOL - const WASTE - const WASTE_MART_1F - const WASTE_MART_2F - const WASTE_MART_3F - const WASTE_MART_4F - const WASTE_MART_5F - const WASTE_MART_6F - const WASTE_MART_ELEVATOR - const WASTE_RADIO_TOWER_1F - const WASTE_RADIO_TOWER_2F - const WASTE_RADIO_TOWER_3F - const WASTE_RADIO_TOWER_4F - const WASTE_RADIO_TOWER_5F - const WASTE_ROCKET_RAIDED_HOUSE - const WASTE_POKECENTER_1F - const WASTE_POKECENTER_2F - const WASTE_GYM - const WASTE_HOUSE_1 - const WASTE_HOUSE_2 + const WEST + const WEST_MART_1F + const WEST_MART_2F + const WEST_MART_3F + const WEST_MART_4F + const WEST_MART_5F + const WEST_MART_6F + const WEST_MART_ELEVATOR + const WEST_RADIO_TOWER_1F + const WEST_RADIO_TOWER_2F + const WEST_RADIO_TOWER_3F + const WEST_RADIO_TOWER_4F + const WEST_RADIO_TOWER_5F + const WEST_ROCKET_RAIDED_HOUSE + const WEST_POKECENTER_1F + const WEST_POKECENTER_2F + const WEST_GYM + const WEST_HOUSE_1 + const WEST_HOUSE_2 const HAITEKU_WEST_ROUTE const HAITEKU_WEST_ROUTE_OCEAN const HAITEKU @@ -91,7 +91,7 @@ const BAADON_ROUTE_2 const BAADON_ROUTE_3 const BAADON - const BAADON_ROUTE_GATE_WASTE + const BAADON_ROUTE_GATE_WEST const BAADON_ROUTE_GATE_NEWTYPE const BAADON_MART const BAADON_POKECENTER_1F -- cgit v1.2.3 From e9a8f8a769f77c289a4aa38423a39e00425b4813 Mon Sep 17 00:00:00 2001 From: pfero Date: Tue, 5 Jun 2018 23:59:08 +0200 Subject: Finish disassembling the names functions --- constants/pokemon_data_constants.asm | 6 +++--- constants/text_constants.asm | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'constants') diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 65be31a..0b00f47 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -104,9 +104,9 @@ MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 ; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick -HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator -NUM_HOF_TEAMS = 30 +HOF_MON_LENGTH EQUS "(wHallOfFamePokemonListMon1End - wHallOfFamePokemonListMon1)" +HOF_LENGTH EQUS "(wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1)" +NUM_HOF_TEAMS EQU 30 ; evolution types (used in data/pokemon/evos_attacks.asm) diff --git a/constants/text_constants.asm b/constants/text_constants.asm index b026e91..f899ea3 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -1,12 +1,11 @@ ; name lengths -NAME_LENGTH EQU 11 -PLAYER_NAME_LENGTH EQU 8 -BOX_NAME_LENGTH EQU 9 -MON_NAME_LENGTH EQU 11 -MOVE_NAME_LENGTH EQU 13 -ITEM_NAME_LENGTH EQU 13 -TRAINER_CLASS_NAME_LENGTH EQU 13 -NAME_LENGTH_JAPANESE EQU 6 +NAME_LENGTH EQU 11 ; English +PLAYER_NAME_LENGTH EQU 8 ; English +BOX_NAME_LENGTH EQU 9 ; English +MON_NAME_LENGTH EQU 6 +MOVE_NAME_LENGTH EQU 13 ; English +ITEM_NAME_LENGTH EQU 11 +TRAINER_CLASS_NAME_LENGTH EQU 13 ; English ; GetName types (see home/names.asm) const_def 1 -- cgit v1.2.3 From 1023e4f2a9b315c5c38cf85118de3b9660d3a759 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 6 Jun 2018 01:23:38 +0200 Subject: Disassemble map headers --- constants/map_data_constants.asm | 9 +++++++++ constants/tileset_constants.asm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 constants/map_data_constants.asm create mode 100644 constants/tileset_constants.asm (limited to 'constants') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm new file mode 100644 index 0000000..075a7f1 --- /dev/null +++ b/constants/map_data_constants.asm @@ -0,0 +1,9 @@ +; map environments (wEnvironment) + const_def 1 + const TOWN + const ROUTE + const INDOOR + const CAVE + const ENVIRONMENT_5 + const GATE + const DUNGEON diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm new file mode 100644 index 0000000..aac5db4 --- /dev/null +++ b/constants/tileset_constants.asm @@ -0,0 +1,31 @@ +; Tilesets indexes +; TODO: Temporary placeholders + const_def + const TILESET_00 + const TILESET_01 + const TILESET_02 + const TILESET_03 + const TILESET_04 + const TILESET_05 + const TILESET_06 + const TILESET_07 + const TILESET_08 + const TILESET_09 + const TILESET_0A + const TILESET_0B + const TILESET_0C + const TILESET_0D + const TILESET_0E + const TILESET_0F + const TILESET_10 + const TILESET_11 + const TILESET_12 + const TILESET_13 + const TILESET_14 + const TILESET_15 + const TILESET_16 + const TILESET_17 + const TILESET_18 + const TILESET_19 + const TILESET_1A + const TILESET_1B -- cgit v1.2.3 From d4a65343dada6f15a56818fdf6ddb000fb381a55 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 6 Jun 2018 01:41:42 +0200 Subject: Name the map groups --- constants/map_constants.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 3b386e6..d5e130e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -21,23 +21,23 @@ const ROUTE_2_GATE_1F const ROUTE_2_GATE_2F const ROUTE_2_HOUSE - const OLD_MUSEUM - const OLD_GYM - const OLD_TOWER_1F - const OLD_TOWER_2F - const OLD_TOWER_3F - const OLD_TOWER_4F - const OLD_TOWER_5F - const OLD_BILLS_HOUSE - const OLD_MART - const OLD_HOUSE - const OLD_POKECENTER_1F - const OLD_POKECENTER_2F - const OLD_POKECENTER_TRADE - const OLD_POKECENTER_BATTLE - const OLD_POKECENTER_TIME_MACHINE - const OLD_KURTS_HOUSE - const OLD_SCHOOL + const OLD_CITY_MUSEUM + const OLD_CITY_GYM + const OLD_CITY_TOWER_1F + const OLD_CITY_TOWER_2F + const OLD_CITY_TOWER_3F + const OLD_CITY_TOWER_4F + const OLD_CITY_TOWER_5F + const OLD_CITY_BILLS_HOUSE + const OLD_CITY_MART + const OLD_CITY_HOUSE + const OLD_CITY_POKECENTER_1F + const OLD_CITY_POKECENTER_2F + const OLD_CITY_POKECENTER_TRADE + const OLD_CITY_POKECENTER_BATTLE + const OLD_CITY_POKECENTER_TIME_MACHINE + const OLD_CITY_KURTS_HOUSE + const OLD_CITY_SCHOOL const WEST const WEST_MART_1F const WEST_MART_2F -- cgit v1.2.3