From 014596dea5e5c0c3e76aa0731d914573597144ef Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 17:50:55 -0400 Subject: Document and refactor AdjustFriendship --- include/constants/pokemon.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/constants') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8a32ef7d1..1b4c6ef53 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -204,9 +204,10 @@ #define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 #define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 #define FRIENDSHIP_EVENT_WALKING 0x5 -#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7 -#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8 +#define FRIENDSHIP_EVENT_MASSAGE 0x6 +#define FRIENDSHIP_EVENT_FAINT_SMALL 0x7 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x8 +#define FRIENDSHIP_EVENT_FAINT_LARGE 0x9 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 -- cgit v1.2.3 From 815636f271584b06b778c0d7a3046458e1f42276 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 18:23:41 -0400 Subject: Document ShouldIgnoreDeoxysForm --- include/constants/battle.h | 2 +- include/constants/pokemon.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/battle.h b/include/constants/battle.h index e7c9d9d17..9489e8d52 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -49,7 +49,7 @@ #define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. #define BATTLE_TYPE_TRAINER 0x0008 #define BATTLE_TYPE_FIRST_BATTLE 0x0010 -#define BATTLE_TYPE_20 0x0020 +#define BATTLE_TYPE_LINK_ESTABLISHED 0x0020 // Set when the link battle setup callback finishes. #define BATTLE_TYPE_MULTI 0x0040 #define BATTLE_TYPE_SAFARI 0x0080 #define BATTLE_TYPE_BATTLE_TOWER 0x0100 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1b4c6ef53..d58c51d72 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -219,4 +219,9 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +// used by ShouldIgnoreDeoxysForm +#define DEOXYS_CHECK_BATTLE_SPRITE 1 +#define DEOXYS_CHECK_TRADE_MAIN 3 +#define DEOXYS_CHECK_BATTLE_ANIM 5 + #endif // GUARD_CONSTANTS_POKEMON_H -- cgit v1.2.3 From 45f75213c0599405ccaee8c9a453392a00fa470b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Mar 2021 09:26:01 -0400 Subject: Some more quest log and field player avater documentation --- include/constants/event_objects.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 2e9fcaa83..f1291b1ea 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -4,14 +4,14 @@ #define OBJ_EVENT_GFX_RED_NORMAL 0 #define OBJ_EVENT_GFX_RED_BIKE 1 #define OBJ_EVENT_GFX_RED_SURF 2 -#define OBJ_EVENT_GFX_RED_ITEM 3 +#define OBJ_EVENT_GFX_RED_FIELD_MOVE 3 #define OBJ_EVENT_GFX_RED_FISH 4 #define OBJ_EVENT_GFX_RED_VS_SEEKER 5 #define OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE 6 #define OBJ_EVENT_GFX_GREEN_NORMAL 7 #define OBJ_EVENT_GFX_GREEN_BIKE 8 #define OBJ_EVENT_GFX_GREEN_SURF 9 -#define OBJ_EVENT_GFX_GREEN_ITEM 10 +#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE 10 #define OBJ_EVENT_GFX_GREEN_FISH 11 #define OBJ_EVENT_GFX_GREEN_VS_SEEKER 12 #define OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE 13 -- cgit v1.2.3 From cdfeb638f40ffa0e3f5d437f7b1613f8313896ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 20 Mar 2021 11:13:58 -0400 Subject: Document remaining routines in field_specials --- include/constants/flags.h | 2 +- include/constants/quest_log.h | 6 ++++++ include/constants/vars.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/flags.h b/include/constants/flags.h index 12bb5801c..83d9bf28b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1324,7 +1324,7 @@ #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) -#define FLAG_0x808 (SYS_FLAGS + 0x8) +#define FLAG_QL_DEPARTED (SYS_FLAGS + 0x8) #define FLAG_0x809 (SYS_FLAGS + 0x9) #define FLAG_0x80A (SYS_FLAGS + 0xA) #define FLAG_0x80B (SYS_FLAGS + 0xB) diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h index 3565c581e..58efd6ea3 100644 --- a/include/constants/quest_log.h +++ b/include/constants/quest_log.h @@ -8,6 +8,12 @@ #define QL_START_NORMAL 1 #define QL_START_WARP 2 +// gGlobalFieldTintMode +#define QL_TINT_NONE 0 +#define QL_TINT_GRAYSCALE 1 +#define QL_TINT_SEPIA 2 +#define QL_TINT_BACKUP_GRAYSCALE 3 + #define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST) #define QL_EVENT_0 0 // Null diff --git a/include/constants/vars.h b/include/constants/vars.h index 8b7ffbfbd..e10a96bd0 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -122,7 +122,7 @@ #define VAR_EGG_BRAG_STATE 0x404A #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D +#define VAR_QL_ENTRANCE 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F -- cgit v1.2.3 From f6565a15d403cf5878c4fbcfd30f4885ea77480f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 21 Mar 2021 20:28:42 -0400 Subject: Style fixes; attempt to match help_system NONMATCHING --- include/constants/flags.h | 2 +- include/constants/metatile_behaviors.h | 4 ++-- include/constants/pokemon.h | 20 ++++++++++---------- include/constants/vars.h | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'include/constants') diff --git a/include/constants/flags.h b/include/constants/flags.h index 83d9bf28b..9e76dd4de 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1324,7 +1324,7 @@ #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) -#define FLAG_QL_DEPARTED (SYS_FLAGS + 0x8) +#define FLAG_SYS_QL_DEPARTED (SYS_FLAGS + 0x8) #define FLAG_0x809 (SYS_FLAGS + 0x9) #define FLAG_0x80A (SYS_FLAGS + 0xA) #define FLAG_0x80B (SYS_FLAGS + 0xB) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index e26f79be0..77cd6de1b 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -107,11 +107,11 @@ #define MB_CUP 0x9B #define MB_PORTHOLE 0x9C #define MB_BLINKING_LIGHTS 0x9E -#define MB_9F 0x9F +#define MB_NEATLY_LINED_UP_TOOLS 0x9F #define MB_IMPRESSIVE_MACHINE 0xA0 #define MB_VIDEO_GAME 0xA1 #define MB_BURGLARY 0xA2 -#define MB_A3 0xA3 +#define MB_TRAINER_TOWER_MONITOR 0xA3 #define MB_CYCLING_ROAD_PULL_DOWN 0xD0 #define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index d58c51d72..737eed4d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -198,16 +198,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 -#define FRIENDSHIP_EVENT_VITAMIN 0x1 -#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 -#define FRIENDSHIP_EVENT_WALKING 0x5 -#define FRIENDSHIP_EVENT_MASSAGE 0x6 -#define FRIENDSHIP_EVENT_FAINT_SMALL 0x7 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x8 -#define FRIENDSHIP_EVENT_FAINT_LARGE 0x9 +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_MASSAGE 6 +#define FRIENDSHIP_EVENT_FAINT_SMALL 7 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 8 +#define FRIENDSHIP_EVENT_FAINT_LARGE 9 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 diff --git a/include/constants/vars.h b/include/constants/vars.h index e10a96bd0..468b9566e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -122,7 +122,7 @@ #define VAR_EGG_BRAG_STATE 0x404A #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C -#define VAR_QL_ENTRANCE 0x404D +#define VAR_QL_ENTRANCE 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F -- cgit v1.2.3