diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /constants.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/constants.asm b/constants.asm index 4931bdd5f..5dcbc57be 100644 --- a/constants.asm +++ b/constants.asm @@ -5,48 +5,50 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" INCLUDE "constants/hardware_constants.asm" +INCLUDE "constants/deco_constants.asm" INCLUDE "constants/wram_constants.asm" -INCLUDE "constants/pokemon_constants.asm" -INCLUDE "constants/type_constants.asm" -INCLUDE "constants/move_constants.asm" -INCLUDE "constants/move_effect_constants.asm" -INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/misc_constants.asm" +INCLUDE "constants/input_constants.asm" +INCLUDE "constants/gfx_constants.asm" +INCLUDE "constants/text_constants.asm" +INCLUDE "constants/audio_constants.asm" INCLUDE "constants/battle_anim_constants.asm" +INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_tower_constants.asm" +INCLUDE "constants/collision_constants.asm" +INCLUDE "constants/credits_constants.asm" +INCLUDE "constants/cry_constants.asm" +INCLUDE "constants/engine_flags.asm" +INCLUDE "constants/event_flags.asm" +INCLUDE "constants/icon_constants.asm" +INCLUDE "constants/item_constants.asm" +INCLUDE "constants/item_data_constants.asm" +INCLUDE "constants/landmark_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" +INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/map_setup_constants.asm" -INCLUDE "constants/landmark_constants.asm" -INCLUDE "constants/item_constants.asm" -INCLUDE "constants/item_data_constants.asm" -INCLUDE "constants/trainer_constants.asm" -INCLUDE "constants/trainer_data_constants.asm" -INCLUDE "constants/script_constants.asm" -INCLUDE "constants/event_flags.asm" -INCLUDE "constants/engine_flags.asm" +INCLUDE "constants/menu_constants.asm" +INCLUDE "constants/mobile_constants.asm" +INCLUDE "constants/move_constants.asm" +INCLUDE "constants/move_effect_constants.asm" INCLUDE "constants/music_constants.asm" -INCLUDE "constants/sfx_constants.asm" +INCLUDE "constants/npc_trade_constants.asm" INCLUDE "constants/phone_constants.asm" -INCLUDE "constants/credits_constants.asm" -INCLUDE "constants/gfx_constants.asm" -INCLUDE "constants/input_constants.asm" +INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" -INCLUDE "constants/icon_constants.asm" -INCLUDE "constants/serial_constants.asm" -INCLUDE "constants/mobile_constants.asm" -INCLUDE "constants/text_constants.asm" -INCLUDE "constants/misc_constants.asm" -INCLUDE "constants/std_constants.asm" -INCLUDE "constants/deco_constants.asm" +INCLUDE "constants/printer_constants.asm" INCLUDE "constants/radio_constants.asm" -INCLUDE "constants/npctrade_constants.asm" +INCLUDE "constants/scgb_constants.asm" +INCLUDE "constants/scene_constants.asm" +INCLUDE "constants/script_constants.asm" +INCLUDE "constants/serial_constants.asm" +INCLUDE "constants/sfx_constants.asm" +INCLUDE "constants/sprite_anim_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/sprite_data_constants.asm" -INCLUDE "constants/sprite_anim_constants.asm" +INCLUDE "constants/std_constants.asm" INCLUDE "constants/tileset_constants.asm" -INCLUDE "constants/collision_constants.asm" -INCLUDE "constants/scgb_constants.asm" -INCLUDE "constants/battle_tower_constants.asm" -INCLUDE "constants/cry_constants.asm" -INCLUDE "constants/audio_constants.asm" -INCLUDE "constants/printer_constants.asm" -INCLUDE "constants/menu_constants.asm" +INCLUDE "constants/trainer_constants.asm" +INCLUDE "constants/trainer_data_constants.asm" +INCLUDE "constants/type_constants.asm" |