From b5a8e3b3b32b2734d8fc642c77d96a0d4ef9c6d1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 25 Dec 2017 23:45:54 -0500 Subject: Follow the X_constants/X_data_constants convention --- constants.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index b8c38cc46..acc2553ee 100644 --- a/constants.asm +++ b/constants.asm @@ -8,11 +8,12 @@ INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" -INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_constants.asm" +INCLUDE "constants/map_data_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/script_constants.asm" INCLUDE "constants/event_flags.asm" -- cgit v1.2.3 From b5417fafec7dd37cb4be391f3bd3d4541a2a381e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 17:47:05 -0500 Subject: Split battle/ into data/ and engine/ components --- constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index acc2553ee..3e0f5311d 100644 --- a/constants.asm +++ b/constants.asm @@ -35,6 +35,7 @@ INCLUDE "constants/radio_constants.asm" INCLUDE "constants/npctrade_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/sprite_data_constants.asm" +INCLUDE "constants/sprite_anim_constants.asm" INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/collision_constants.asm" INCLUDE "constants/cgb_constants.asm" -- cgit v1.2.3 From 35a3a19fda87d95e829aa99bf1b6cf18a839c1a6 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 18:45:04 -0500 Subject: Use "battle_anims" and "sprite_anims" for clarity, not just "anims" --- constants.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 3e0f5311d..116f194a1 100644 --- a/constants.asm +++ b/constants.asm @@ -8,6 +8,7 @@ INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_anim_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_setup_constants.asm" @@ -20,12 +21,12 @@ INCLUDE "constants/event_flags.asm" INCLUDE "constants/engine_flags.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" -INCLUDE "constants/animation_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_data_constants.asm" +INCLUDE "constants/icon_constants.asm" INCLUDE "constants/serial_constants.asm" INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/misc_constants.asm" -- cgit v1.2.3 From d15429e3b78b55c5f111898bd1aaf58b1273d5d7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 22:25:11 -0500 Subject: Separate constants in a consistent way --- constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 116f194a1..a665c4dad 100644 --- a/constants.asm +++ b/constants.asm @@ -7,6 +7,7 @@ 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/battle_anim_constants.asm" INCLUDE "constants/map_constants.asm" @@ -16,6 +17,7 @@ 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" -- cgit v1.2.3 From c4a18b13295cd9f2777bfa27a37aafc09eb31684 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 22:36:01 -0500 Subject: Correct documentation Split out text_constants.asm --- constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index a665c4dad..7de20dfe2 100644 --- a/constants.asm +++ b/constants.asm @@ -31,6 +31,7 @@ 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" -- cgit v1.2.3