summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/battle_script_commands.h22
-rwxr-xr-xinclude/constants/event_object_movement_constants.h2
-rw-r--r--include/constants/flags.h50
-rw-r--r--include/constants/game_stat.h2
-rw-r--r--include/constants/maps.h6
-rw-r--r--include/constants/songs.h2
-rw-r--r--include/constants/vars.h2
7 files changed, 56 insertions, 30 deletions
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index e8a2980a5..894bd13b6 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -95,8 +95,6 @@
// statchange defines
#define STAT_CHANGE_BS_PTR 0x1
#define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20
-#define STAT_CHANGE_WORKED 0
-#define STAT_CHANGE_DIDNT_WORK 1
// atk48
#define ATK48_STAT_NEGATIVE 0x1
@@ -104,6 +102,26 @@
#define ATK48_ONLY_MULTIPLE 0x4
#define ATK48_DONT_CHECK_LOWER 0x8
+// atk49, moveend cases
+#define ATK49_RAGE 0
+#define ATK49_DEFROST 1
+#define ATK49_SYNCHRONIZE_TARGET 2
+#define ATK49_MOVE_END_ABILITIES 3
+#define ATK49_STATUS_IMMUNITY_ABILITIES 4
+#define ATK49_SYNCHRONIZE_ATTACKER 5
+#define ATK49_CHOICE_MOVE 6
+#define ATK49_CHANGED_ITEMS 7
+#define ATK49_ATTACKER_INVISIBLE 8
+#define ATK49_ATTACKER_VISIBLE 9
+#define ATK49_TARGET_VISIBLE 10
+#define ATK49_ITEM_EFFECTS_ALL 11
+#define ATK49_KINGSROCK_SHELLBELL 12
+#define ATK49_SUBSTITUTE 13
+#define ATK49_UPDATE_LAST_MOVES 14
+#define ATK49_MIRROR_MOVE 15
+#define ATK49_NEXT_TARGET 16
+#define ATK49_COUNT 17
+
#define BIT_HP 0x1
#define BIT_ATK 0x2
#define BIT_DEF 0x4
diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement_constants.h
index 2a80f9a09..b1f9b4cb5 100755
--- a/include/constants/event_object_movement_constants.h
+++ b/include/constants/event_object_movement_constants.h
@@ -242,4 +242,6 @@
#define MOVEMENT_ACTION_FLY_UP 0x9C
#define MOVEMENT_ACTION_FLY_DOWN 0x9D
+#define MOVEMENT_ACTION_STEP_END 0xFE
+
#endif // GUARD_CONSTANTS_EVENTOBJMV_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 230fbabaf..0450e988d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -336,24 +336,23 @@
#define FLAG_RECEIVED_AURORA_TICKET 0x13A // RECEIVED Aurora Ticket in Mystery Gift
#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B // RECEIVED Mystic Ticket in Mystery Gift
#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C // RECEIVED Old Sea Map in Mystery Gift
-
-#define FLAG_UNUSED_0x13D 0x13D // Unused Flag
-#define FLAG_UNUSED_0x13E 0x13E // Unused Flag
-#define FLAG_UNUSED_0x13F 0x13F // Unused Flag
-#define FLAG_UNUSED_0x140 0x140 // Unused Flag
-#define FLAG_UNUSED_0x141 0x141 // Unused Flag
-#define FLAG_UNUSED_0x142 0x142 // Unused Flag
-#define FLAG_UNUSED_0x143 0x143 // Unused Flag
-#define FLAG_UNUSED_0x144 0x144 // Unused Flag
-#define FLAG_UNUSED_0x145 0x145 // Unused Flag
-#define FLAG_UNUSED_0x146 0x146 // Unused Flag
-#define FLAG_UNUSED_0x147 0x147 // Unused Flag
-#define FLAG_UNUSED_0x148 0x148 // Unused Flag
-#define FLAG_UNUSED_0x149 0x149 // Unused Flag
-#define FLAG_UNUSED_0x14A 0x14A // Unused Flag
-#define FLAG_UNUSED_0x14B 0x14B // Unused Flag
-#define FLAG_UNUSED_0x14C 0x14C // Unused Flag
-#define FLAG_UNUSED_0x14D 0x14D // Unused Flag
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E
+#define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F
+#define FLAG_UNUSED_MYSTERY_GIFT_0x140 0x140
+#define FLAG_UNUSED_MYSTERY_GIFT_0x141 0x141
+#define FLAG_UNUSED_MYSTERY_GIFT_0x142 0x142
+#define FLAG_UNUSED_MYSTERY_GIFT_0x143 0x143
+#define FLAG_UNUSED_MYSTERY_GIFT_0x144 0x144
+#define FLAG_UNUSED_MYSTERY_GIFT_0x145 0x145
+#define FLAG_UNUSED_MYSTERY_GIFT_0x146 0x146
+#define FLAG_UNUSED_MYSTERY_GIFT_0x147 0x147
+#define FLAG_UNUSED_MYSTERY_GIFT_0x148 0x148
+#define FLAG_UNUSED_MYSTERY_GIFT_0x149 0x149
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14A 0x14A
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14B 0x14B
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14C 0x14C
+#define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D
#define FLAG_MIRAGE_TOWER_VISIBLE 0x14E
#define FLAG_CHOSE_CLAW_FOSSIL 0x14F // Player chose Claw Fossil
@@ -446,13 +445,14 @@
#define FLAG_REMATCH_NORMAN 0x1A2
#define FLAG_REMATCH_WINONA 0x1A3
#define FLAG_REMATCH_TATE_AND_LIZA 0x1A4
-#define FLAG_REMATCH_JUAN 0x1A5
-#define FLAG_REMATCH_SIDNEY 0x1A6
-#define FLAG_REMATCH_PHOEBE 0x1A7
-#define FLAG_REMATCH_GLACIA 0x1A8
-#define FLAG_REMATCH_DRAKE 0x1A9
-#define FLAG_REMATCH_WALLACE 0x1AA
-
+// Note: FLAG_REMATCH_JUAN is handled by FLAG_ENABLE_JUAN_MATCH_CALL instead.
+#define FLAG_REMATCH_SIDNEY 0x1A5
+#define FLAG_REMATCH_PHOEBE 0x1A6
+#define FLAG_REMATCH_GLACIA 0x1A7
+#define FLAG_REMATCH_DRAKE 0x1A8
+#define FLAG_REMATCH_WALLACE 0x1A9
+
+#define FLAG_UNUSED_0x1AA 0x1AA // Unused Flag
#define FLAG_UNUSED_0x1AB 0x1AB // Unused Flag
#define FLAG_DEFEATED_DEOXYS 0x1AC
diff --git a/include/constants/game_stat.h b/include/constants/game_stat.h
index 7ebf3501b..e302f1345 100644
--- a/include/constants/game_stat.h
+++ b/include/constants/game_stat.h
@@ -51,7 +51,7 @@
#define GAME_STAT_USED_DAYCARE 47
#define GAME_STAT_RODE_CABLE_CAR 48
#define GAME_STAT_ENTERED_HOT_SPRINGS 49
-#define GAME_STAT_50 50
+#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_51 51
#define NUM_USED_GAME_STATS 52
diff --git a/include/constants/maps.h b/include/constants/maps.h
index e1e2da992..b849749a9 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -9,4 +9,10 @@
#define MAP_GROUP(map) (MAP_##map >> 8)
#define MAP_NUM(map) (MAP_##map & 0xFF)
+// These groups are used by pokedex_area_screen.c to find wild
+// pokemon locations.
+#define MAP_GROUP_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY)
+#define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
+#define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
+
#endif // GUARD_CONSTANTS_MAPS_H
diff --git a/include/constants/songs.h b/include/constants/songs.h
index 14b766965..3778d5f08 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -467,7 +467,7 @@
#define MUS_RG_UNION 539 // Union Room
#define MUS_RG_NETWORK 540 // Network Center
#define MUS_RG_OKURIMONO 541 // Mystery Gift
-#define MUS_RG_KINOMIKUI 542
+#define MUS_RG_KINOMIKUI 542 // Dodrio Berry Picking
#define MUS_RG_NANADUNGEON 543 // Sevii Caves/Altering Cave (Mt. Moon)
#define MUS_RG_OSHIE_TV 544 // Follow Me!
#define MUS_RG_NANASHIMA 545 // Sevii Islands Routes (Lake of Rage)
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 81ae99e1e..20524611b 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -60,7 +60,7 @@
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D
-#define VAR_UNUSED_0x402E 0x402E // Unused Var
+#define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-30 19:41:48 +0000