summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/battle_dome.h2
-rw-r--r--include/constants/battle_frontier_trainers.h2
-rw-r--r--include/constants/battle_pyramid.h2
-rw-r--r--include/constants/field_effects.h2
-rw-r--r--include/constants/flags.h26
-rw-r--r--include/constants/global.h1
-rw-r--r--include/constants/item_effects.h2
-rw-r--r--include/constants/lilycove_lady.h4
-rw-r--r--include/constants/map_scripts.h2
-rw-r--r--include/constants/metatile_labels.h4
-rw-r--r--include/constants/party_menu.h16
-rw-r--r--include/constants/pokemon.h2
-rw-r--r--include/constants/script_menu.h6
-rw-r--r--include/constants/songs.h2
-rw-r--r--include/constants/tv.h2
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/constants/weather.h2
17 files changed, 39 insertions, 40 deletions
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
index ea7310e55..adac0a938 100644
--- a/include/constants/battle_dome.h
+++ b/include/constants/battle_dome.h
@@ -118,7 +118,7 @@
#define MOVE_POINTS_ACCURATE 9
#define MOVE_POINTS_POWERFUL 10 // Most of the moves that are >= 100 power
#define MOVE_POINTS_POPULAR 11 // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
-#define MOVE_POINTS_LUCK 12
+#define MOVE_POINTS_LUCK 12
#define MOVE_POINTS_STRONG 13 // Most of the moves that are >= 90 power
#define MOVE_POINTS_LOW_PP 14
#define MOVE_POINTS_EFFECT 15 // Moves with additional effects
diff --git a/include/constants/battle_frontier_trainers.h b/include/constants/battle_frontier_trainers.h
index 2914b153f..af530a759 100644
--- a/include/constants/battle_frontier_trainers.h
+++ b/include/constants/battle_frontier_trainers.h
@@ -2,7 +2,7 @@
#define GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
#define FRONTIER_TRAINER_BRADY 0
-#define FRONTIER_TRAINER_CONNER 1
+#define FRONTIER_TRAINER_CONNER 1
#define FRONTIER_TRAINER_BRADLEY 2
#define FRONTIER_TRAINER_CYBIL 3
#define FRONTIER_TRAINER_RODETTE 4
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h
index 004df7155..1be3c1115 100644
--- a/include/constants/battle_pyramid.h
+++ b/include/constants/battle_pyramid.h
@@ -23,7 +23,7 @@
#define OBJ_POSITIONS_UNIFORM 0
#define OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE 1
#define OBJ_POSITIONS_IN_AND_NEAR_EXIT 2
-#define OBJ_POSITIONS_NEAR_ENTRANCE 3
+#define OBJ_POSITIONS_NEAR_ENTRANCE 3
#define OBJ_POSITIONS_NEAR_EXIT 4
// Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index dc1085f7c..e02e01efb 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
#define GUARD_FIELD_EFFECT_CONSTANTS_H
-#define FLDEFF_EXCLAMATION_MARK_ICON 0
+#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 6702fa5ee..ef5a9a75e 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -337,7 +337,7 @@
#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS 0x139
#define FLAG_RECEIVED_AURORA_TICKET 0x13A
#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B
-#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C
+#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C
#define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D
#define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E
#define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F
@@ -1135,18 +1135,18 @@
#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL 0x440
#define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441
#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442
-#define FLAG_ITEM_FIERY_PATH_TM06 0x443
-#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444
-#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445
-#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B
-#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E
+#define FLAG_ITEM_FIERY_PATH_TM06 0x443
+#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444
+#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B
+#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E
#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F
#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450
#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451
diff --git a/include/constants/global.h b/include/constants/global.h
index 9b0c46ce4..1cece7975 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -86,6 +86,7 @@
#define EASY_CHAT_BATTLE_WORDS_COUNT 6
#define MOVE_NAME_LENGTH 12
#define NUM_QUESTIONNAIRE_WORDS 4
+#define QUIZ_QUESTION_LEN 9
#define MALE 0
#define FEMALE 1
diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h
index 9a6bcd05e..f08b17ee9 100644
--- a/include/constants/item_effects.h
+++ b/include/constants/item_effects.h
@@ -23,7 +23,7 @@
#define ITEM3_POISON 0x10
#define ITEM3_SLEEP 0x20
#define ITEM3_LEVEL_UP 0x40
-#define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist.
+#define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist.
#define ITEM3_STATUS_ALL (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)
diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h
index 11b9b31e9..5b1e7d7b4 100644
--- a/include/constants/lilycove_lady.h
+++ b/include/constants/lilycove_lady.h
@@ -10,7 +10,7 @@
#define LILYCOVE_LADY_STATE_COMPLETED 1
#define LILYCOVE_LADY_STATE_PRIZE 2
-#define LILYCOVE_LADY_GIFT_THRESHOLD 5
+#define LILYCOVE_LADY_GIFT_THRESHOLD 5
#define QUIZ_AUTHOR_PLAYER 0
#define QUIZ_AUTHOR_OTHER_PLAYER 1
@@ -20,8 +20,6 @@
#define QUIZ_AUTHOR_NAME_LADY 0
#define QUIZ_AUTHOR_NAME_PLAYER 1
#define QUIZ_AUTHOR_NAME_OTHER_PLAYER 2
-
-#define QUIZ_QUESTION_LEN 9
// Constants for how many good Pokéblocks the Contest Lady was given
// This determines how her performance is described when her TV show comes on
diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h
index 68d360955..7a56cc908 100644
--- a/include/constants/map_scripts.h
+++ b/include/constants/map_scripts.h
@@ -9,7 +9,7 @@
They are numbered in the order that they will be called when entering a map (from a warp or camera transition).
NOTE: These descriptions are just of what they generally do, not what they always or have to do
- 3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
+ 3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
Almost exclusively used to set metatiles on the map before it's first drawn
6. ON_FRAME_TABLE: Run every frame after the map has faded in, before player input is processed.
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index b5ef69046..6159bf6cb 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -16,7 +16,7 @@
#define METATILE_General_MuddySlope_Frame2 0x0EA
#define METATILE_General_MuddySlope_Frame3 0x0EB
#define METATILE_General_SandPit_Center 0x121
-#define METATILE_General_Door 0x021
+#define METATILE_General_Door 0x021
#define METATILE_General_Door_PokeMart 0x041
#define METATILE_General_Door_PokeCenter 0x061
#define METATILE_General_Door_Gym 0x1CD
@@ -35,7 +35,7 @@
#define METATILE_General_SecretBase_VineLeft 0x036
#define METATILE_General_SecretBase_VineRight 0x037
#define METATILE_General_RedCaveIndent 0x1A0
-#define METATILE_General_RedCaveOpen 0x1A1
+#define METATILE_General_RedCaveOpen 0x1A1
#define METATILE_General_YellowCaveIndent 0x1A8
#define METATILE_General_YellowCaveOpen 0x1A9
#define METATILE_General_BlueCaveIndent 0x1B0
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 7953967ed..e31debb49 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -49,14 +49,14 @@
#define PARTY_LAYOUT_COUNT 4
#define KEEP_PARTY_LAYOUT 0xFF
-#define PARTY_MENU_TYPE_FIELD 0
-#define PARTY_MENU_TYPE_IN_BATTLE 1
-#define PARTY_MENU_TYPE_CONTEST 2
-#define PARTY_MENU_TYPE_CHOOSE_MON 3
+#define PARTY_MENU_TYPE_FIELD 0
+#define PARTY_MENU_TYPE_IN_BATTLE 1
+#define PARTY_MENU_TYPE_CONTEST 2
+#define PARTY_MENU_TYPE_CHOOSE_MON 3
#define PARTY_MENU_TYPE_CHOOSE_HALF 4 // multi battles, eReader battles, and some battle facilities
#define PARTY_MENU_TYPE_MULTI_SHOWCASE 5
-#define PARTY_MENU_TYPE_DAYCARE 6
-#define PARTY_MENU_TYPE_MOVE_RELEARNER 7
+#define PARTY_MENU_TYPE_DAYCARE 6
+#define PARTY_MENU_TYPE_MOVE_RELEARNER 7
#define PARTY_MENU_TYPE_UNION_ROOM_REGISTER 8 // trading board
#define PARTY_MENU_TYPE_UNION_ROOM_TRADE 9 // trading board
#define PARTY_MENU_TYPE_SPIN_TRADE 10 // Unused beta for Gen IV's Spin Trade
@@ -68,7 +68,7 @@
#define PARTY_ACTION_CANT_SWITCH 2
#define PARTY_ACTION_USE_ITEM 3
#define PARTY_ACTION_ABILITY_PREVENTS 4
-#define PARTY_ACTION_GIVE_ITEM 5
+#define PARTY_ACTION_GIVE_ITEM 5
#define PARTY_ACTION_GIVE_PC_ITEM 6 // Unused. Not possible to give non-mail items directly from PC
#define PARTY_ACTION_GIVE_MAILBOX_MAIL 7
#define PARTY_ACTION_SWITCH 8
@@ -83,7 +83,7 @@
#define PARTY_MSG_CHOOSE_MON 0
#define PARTY_MSG_CHOOSE_MON_OR_CANCEL 1
#define PARTY_MSG_CHOOSE_MON_AND_CONFIRM 2
-#define PARTY_MSG_MOVE_TO_WHERE 3
+#define PARTY_MSG_MOVE_TO_WHERE 3
#define PARTY_MSG_TEACH_WHICH_MON 4
#define PARTY_MSG_USE_ON_WHICH_MON 5
#define PARTY_MSG_GIVE_TO_WHICH_MON 6
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 63c031824..9bafa0a0b 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -225,7 +225,7 @@
// 1 bit each in the Pokémon struct. Gen 4 hard-codes
// each of these to the given name. In Gen 3 they're
// used to get an index into giftRibbons in the save block,
-// which can have a value 0-64 (0 is 'no ribbon') that
+// which can have a value 0-64 (0 is 'no ribbon') that
// corresponds to one of the special ribbons listed
// in gGiftRibbonDescriptionPointers. Most of these were
// never distributed
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h
index 928ca00e0..c58df7335 100644
--- a/include/constants/script_menu.h
+++ b/include/constants/script_menu.h
@@ -65,7 +65,7 @@
#define MULTI_RIGHTLEFT 54
#define MULTI_GAME_CORNER_TMS 55
#define MULTI_SSTIDAL_SLATEPORT_NO_BF 56
-#define MULTI_FLOORS 57
+#define MULTI_FLOORS 57
#define MULTI_SHARDS_R 58
#define MULTI_SHARDS_Y 59
#define MULTI_SHARDS_RY 60
@@ -82,9 +82,9 @@
#define MULTI_SHARDS_YBG 71
#define MULTI_SHARDS_RYBG 72
#define MULTI_TOURNEY_WITH_RECORD 73
-#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74
+#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74
#define MULTI_WIRELESS_NO_RECORD_BERRY 75
-#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76
+#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76
#define MULTI_WIRELESS_NO_BERRY 77
#define MULTI_WIRELESS_NO_RECORD 78
#define MULTI_WIRELESS_ALL_SERVICES 79
diff --git a/include/constants/songs.h b/include/constants/songs.h
index a78ee6faf..d6a418495 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -267,7 +267,7 @@
#define SE_RG_HELP_ERROR 259 // SE_RG_HELP_NG
#define SE_RG_DEOXYS_MOVE 260 // SE_RG_DEOMOV
#define SE_RG_POKE_JUMP_SUCCESS 261 // SE_RG_EXCELLENT
-#define SE_RG_POKE_JUMP_FAILURE 262 // SE_RG_NAWAMISS
+#define SE_RG_POKE_JUMP_FAILURE 262 // SE_RG_NAWAMISS
// New Emerald SFX
#define SE_POKENAV_CALL 263 // SE_TOREEYE
#define SE_POKENAV_HANG_UP 264 // SE_TOREOFF
diff --git a/include/constants/tv.h b/include/constants/tv.h
index 095a6ddca..3fe6c57b2 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -35,7 +35,7 @@
// TVGROUP_RECORD_MIX
#define TVGROUP_RECORD_MIX_START 21
-#define TVSHOW_POKEMON_TODAY_CAUGHT 21
+#define TVSHOW_POKEMON_TODAY_CAUGHT 21
#define TVSHOW_SMART_SHOPPER 22
#define TVSHOW_POKEMON_TODAY_FAILED 23
#define TVSHOW_FISHING_ADVICE 24
diff --git a/include/constants/vars.h b/include/constants/vars.h
index d3d1aba87..2cbe3e9b8 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -149,7 +149,7 @@
#define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084
-#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
+#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
#define VAR_CONTEST_HALL_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_TYPE 0x4088
diff --git a/include/constants/weather.h b/include/constants/weather.h
index becbdda87..c4a23a18b 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -16,7 +16,7 @@
#define WEATHER_DROUGHT 12
#define WEATHER_DOWNPOUR 13
#define WEATHER_UNDERWATER_BUBBLES 14
-#define WEATHER_ABNORMAL 15 // The alternating weather during Groudon/Kyogre conflict
+#define WEATHER_ABNORMAL 15 // The alternating weather during Groudon/Kyogre conflict
#define WEATHER_ROUTE119_CYCLE 20
#define WEATHER_ROUTE123_CYCLE 21
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 09:54:26 +0000