From a37da53f206a190ef54fa9477e16f3e24b541f38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 May 2019 14:56:59 -0400 Subject: Daycare --- include/constants/flags.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index daa8b3132..ebf619541 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -136,7 +136,7 @@ #define FLAG_0x083 0x83 #define FLAG_0x084 0x84 #define FLAG_0x085 0x85 -#define FLAG_PENDING_DAYCARE_EGG 0x86 +#define FLAG_0x086 0x86 #define FLAG_0x087 0x87 #define FLAG_0x088 0x88 #define FLAG_0x089 0x89 @@ -616,7 +616,7 @@ #define FLAG_0x263 0x263 #define FLAG_0x264 0x264 #define FLAG_0x265 0x265 -#define FLAG_0x266 0x266 +#define FLAG_PENDING_DAYCARE_EGG 0x266 #define FLAG_0x267 0x267 #define FLAG_0x268 0x268 #define FLAG_0x269 0x269 -- cgit v1.2.3 From efbbd67f81538a6c1774201cef2c1b33083a3a65 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 16:45:10 -0400 Subject: Fix scrcmd names and define world map flags --- include/constants/flags.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index ebf619541..aac4d809a 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1,6 +1,61 @@ #ifndef GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H +// World Map Flags +#define FLAG_WORLD_MAP_PALLET_TOWN 0x890 +#define FLAG_WORLD_MAP_VIRIDIAN_CITY 0x891 +#define FLAG_WORLD_MAP_PEWTER_CITY 0x892 +#define FLAG_WORLD_MAP_CERULEAN_CITY 0x893 +#define FLAG_WORLD_MAP_LAVENDER_TOWN 0x894 +#define FLAG_WORLD_MAP_VERMILION_CITY 0x895 +#define FLAG_WORLD_MAP_CELADON_CITY 0x896 +#define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897 +#define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898 +#define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899 +#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a +#define FLAG_WORLD_MAP_ONE_ISLAND 0x89b +#define FLAG_WORLD_MAP_TWO_ISLAND 0x89c +#define FLAG_WORLD_MAP_THREE_ISLAND 0x89d +#define FLAG_WORLD_MAP_FOUR_ISLAND 0x89e +#define FLAG_WORLD_MAP_FIVE_ISLAND 0x89f +#define FLAG_WORLD_MAP_SEVEN_ISLAND 0x8a0 +#define FLAG_WORLD_MAP_SIX_ISLAND 0x8a1 +#define FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F 0x8a2 +#define FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F 0x8a3 +#define FLAG_WORLD_MAP_VIRIDIAN_FOREST 0x8a4 +#define FLAG_WORLD_MAP_MT_MOON_1F 0x8a5 +#define FLAG_WORLD_MAP_SSANNE_EXTERIOR 0x8a6 +#define FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL 0x8a7 +#define FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL 0x8a8 +#define FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F 0x8a9 +#define FLAG_WORLD_MAP_VICTORY_ROAD_1F 0x8aa +#define FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F 0x8ab +#define FLAG_WORLD_MAP_SILPH_CO_1F 0x8ac +#define FLAG_WORLD_MAP_POKEMON_MANSION_1F 0x8ad +#define FLAG_WORLD_MAP_SAFARI_ZONE_CENTER 0x8ae +#define FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM 0x8af +#define FLAG_WORLD_MAP_ROCK_TUNNEL_1F 0x8b0 +#define FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F 0x8b1 +#define FLAG_WORLD_MAP_POKEMON_TOWER_1F 0x8b2 +#define FLAG_WORLD_MAP_CERULEAN_CAVE_1F 0x8b3 +#define FLAG_WORLD_MAP_POWER_PLANT 0x8b4 +#define FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR 0x8b5 +#define FLAG_WORLD_MAP_MT_EMBER_EXTERIOR 0x8b6 +#define FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST 0x8b7 +#define FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE 0x8b8 +#define FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE 0x8b9 +#define FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 0x8ba +#define FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F 0x8bb +#define FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE 0x8bc +#define FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH 0x8bd +#define FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE 0x8be +#define FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER 0x8bf +#define FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL 0x8c0 +#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 0x8c1 +#define FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR 0x8c2 + +// Emerald Flags + // TODO: Get correct names and numbers #define FLAG_0x001 0x1 -- cgit v1.2.3 From 9a464931d207da83d3fb582e35821ba50ced6afc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 14 May 2019 17:35:04 -0400 Subject: Replace some hardcoded flags/vars --- include/constants/flags.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index aac4d809a..8ecac9769 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -54,6 +54,32 @@ #define FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 0x8c1 #define FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR 0x8c2 +// Unknown + +#define FLAG_0x807 0x807 +#define FLAG_0x821 0x821 +#define FLAG_0x822 0x822 +#define FLAG_0x823 0x823 +#define FLAG_0x825 0x825 +#define FLAG_0x827 0x827 +#define FLAG_0x828 0x828 +#define FLAG_0x829 0x829 +#define FLAG_0x82C 0x82C +#define FLAG_0x82F 0x82F +#define FLAG_0x830 0x830 +#define FLAG_0x834 0x834 +#define FLAG_0x83E 0x83E +#define FLAG_0x841 0x841 +#define FLAG_0x844 0x844 +#define FLAG_0x845 0x845 +#define FLAG_0x846 0x846 +#define FLAG_0x847 0x847 +#define FLAG_0x848 0x848 +#define FLAG_0x849 0x849 +#define FLAG_0x84A 0x84A +#define FLAG_0x84B 0x84B + + // Emerald Flags // TODO: Get correct names and numbers -- cgit v1.2.3 From 71d017a2bc12b584dad5e2d3a165e361e7866512 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2019 17:32:33 -0400 Subject: help_system_812B1E0: through sub_812B4D8 --- include/constants/flags.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index 8ecac9769..eed83d7c6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -68,6 +68,7 @@ #define FLAG_0x82F 0x82F #define FLAG_0x830 0x830 #define FLAG_0x834 0x834 +#define FLAG_0x83C 0x83C #define FLAG_0x83E 0x83E #define FLAG_0x841 0x841 #define FLAG_0x844 0x844 -- cgit v1.2.3 From e30052e271c649ae2ca08cbbbdf2dc2052e6ae38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 13 Jun 2019 13:45:46 -0400 Subject: help_system: through sub_813C3AC --- include/constants/flags.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index eed83d7c6..98ec3e47e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -67,7 +67,7 @@ #define FLAG_0x82C 0x82C #define FLAG_0x82F 0x82F #define FLAG_0x830 0x830 -#define FLAG_0x834 0x834 +#define FLAG_SYS_NOT_SOMEONES_PC 0x834 #define FLAG_0x83C 0x83C #define FLAG_0x83E 0x83E #define FLAG_0x841 0x841 -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- include/constants/flags.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/constants/flags.h') diff --git a/include/constants/flags.h b/include/constants/flags.h index 98ec3e47e..209e68aee 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1,6 +1,10 @@ #ifndef GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H +// Sys Flags Maybe +#define FLAG_WHITE_FLUTE_ACTIVE 0x803 +#define FLAG_BLACK_FLUTE_ACTIVE 0x804 + // World Map Flags #define FLAG_WORLD_MAP_PALLET_TOWN 0x890 #define FLAG_WORLD_MAP_VIRIDIAN_CITY 0x891 -- cgit v1.2.3