convert more constants

This commit is contained in:
camthesaxman
2017-12-11 12:41:13 -06:00
parent c681b482c2
commit 9525fdd54d
19 changed files with 22 additions and 4642 deletions

View File

@@ -1,3 +1,4 @@
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

View File

@@ -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

View File

@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"