diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-11 12:41:13 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-11 12:41:13 -0600 |
| commit | 9525fdd54de805e8b45e23df6a57074e077c175d (patch) | |
| tree | af62f4a34588c3ad679249cfed757ac2a8eb075a /data | |
| parent | c681b482c2ab0a4281cb6ad5927ce8ca565a3692 (diff) | |
convert more constants
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_2.s | 1 | ||||
| -rw-r--r-- | data/battle_tower.s | 3 | ||||
| -rw-r--r-- | data/data2b.s | 1 | ||||
| -rw-r--r-- | data/data2c.s | 1 | ||||
| -rw-r--r-- | data/event_scripts.s | 3 | ||||
| -rw-r--r-- | data/graphics/field_objects/berry_tree_graphics_tables.inc | 20 | ||||
| -rw-r--r-- | data/item_menu_icons.s | 1 | ||||
| -rw-r--r-- | data/map_events.s | 5 | ||||
| -rw-r--r-- | data/player_pc.s | 1 |
9 files changed, 22 insertions, 14 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 73690665e..9cd6a4d7d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,3 +1,4 @@ +#include "constants/items.h" #include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" diff --git a/data/battle_tower.s b/data/battle_tower.s index 349eb3e9c..b3926d19a 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -1,6 +1,7 @@ #include "constants/easy_chat.h" -#include "constants/species.h" +#include "constants/items.h" #include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/data2b.s b/data/data2b.s index f99c6012d..6051b86cc 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -1,5 +1,6 @@ @ the second big chunk of data +#include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" .include "asm/macros.inc" diff --git a/data/data2c.s b/data/data2c.s index 60d0f8c8b..904009254 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -1,6 +1,7 @@ @ the second big chunk of data #include "constants/abilities.h" +#include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" .include "asm/macros.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index f795fde93..d05eb1965 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,8 +1,9 @@ #include "constants/flags.h" -#include "constants/vars.h" +#include "constants/items.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc index 52c8719fe..8d716d759 100644 --- a/data/graphics/field_objects/berry_tree_graphics_tables.inc +++ b/data/graphics/field_objects/berry_tree_graphics_tables.inc @@ -478,18 +478,18 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758 gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0 berry_tree_palette_slot_table 2 - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES + .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES .align 2 gBerryTreePicTablePointers:: @ 850C7B0 diff --git a/data/item_menu_icons.s b/data/item_menu_icons.s index 3b7b0ef89..01aa67eb0 100644 --- a/data/item_menu_icons.s +++ b/data/item_menu_icons.s @@ -1,3 +1,4 @@ +#include "constants/items.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/map_events.s b/data/map_events.s index 22769bac5..8784ee047 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,8 +1,9 @@ +#include "constants/flags.h" +#include "constants/items.h" #include "constants/map_objects.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" - .include "constants/flags.inc" - .include "constants/variables.inc" .section .rodata diff --git a/data/player_pc.s b/data/player_pc.s index c3422db30..47bdbff39 100644 --- a/data/player_pc.s +++ b/data/player_pc.s @@ -1,3 +1,4 @@ +#include "constants/items.h" .include "asm/macros.inc" .include "constants/constants.inc" |