summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-12-11 12:27:51 -0600
committercamthesaxman <cameronghall@cox.net>2017-12-11 12:27:51 -0600
commitc681b482c2ab0a4281cb6ad5927ce8ca565a3692 (patch)
treef921b45edbf2dfc050524dd48b1e0cf1bb6d45e9 /constants
parent19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (diff)
convert more constants
Diffstat (limited to 'constants')
-rw-r--r--constants/constants.inc12
-rw-r--r--constants/field_object_constants.inc12
2 files changed, 6 insertions, 18 deletions
diff --git a/constants/constants.inc b/constants/constants.inc
index fbd4e8af0..cf322f9e8 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -1,20 +1,20 @@
.include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
- .include "constants/species_constants.inc"
- .include "constants/ability_constants.inc"
- .include "constants/move_constants.inc"
+@ .include "constants/species_constants.inc"
+@ .include "constants/ability_constants.inc"
+@ .include "constants/move_constants.inc"
.include "constants/item_constants.inc"
.include "constants/type_constants.inc"
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc"
.include "constants/battle_move_constants.inc"
- .include "constants/easy_chat_constants.inc"
+@ .include "constants/easy_chat_constants.inc"
.include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
- .include "constants/map_object_constants.inc"
+@ .include "constants/map_object_constants.inc"
.include "constants/berry_constants.inc"
.include "constants/field_object_constants.inc"
.include "constants/contest_move_effects.inc"
- .include "constants/songs.inc"
+@ .include "constants/songs.inc"
diff --git a/constants/field_object_constants.inc b/constants/field_object_constants.inc
index 50cdbd848..dfef07a8f 100644
--- a/constants/field_object_constants.inc
+++ b/constants/field_object_constants.inc
@@ -237,15 +237,3 @@
.set FIELD_OBJ_GFX_RUBY_SAPPHIRE_MAY, 236
.set FIELD_OBJ_GFX_LUGIA, 237
.set FIELD_OBJ_GFX_HO_OH, 238
-
- .set SHADOW_SIZE_S, 0
- .set SHADOW_SIZE_M, 1
- .set SHADOW_SIZE_L, 2
- .set SHADOW_SIZE_XL, 3
-
- .set F_INANIMATE, 1 << 6
- .set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
-
- .set TRACKS_NONE, 0
- .set TRACKS_FOOT, 1
- .set TRACKS_BIKE_TIRE, 2