From 6c20ff9e200499f7c245653a9e5aa269649c8639 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 7 Jan 2018 13:11:29 -0500 Subject: Reorganize some macros * tileset data macros go atop their related files, like all the ones in data/ * charmaps are not macros --- constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 7de20dfe2..4e52c9e42 100644 --- a/constants.asm +++ b/constants.asm @@ -1,3 +1,5 @@ +INCLUDE "charmap.asm" + INCLUDE "macros.asm" INCLUDE "hram.asm" -- cgit v1.2.3 From 2847e1d720d7ac0e69628be634271227b96a38f8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 7 Jan 2018 13:18:53 -0500 Subject: constants.asm and includes.asm are redundant --- constants.asm | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 constants.asm (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm deleted file mode 100644 index 4e52c9e42..000000000 --- a/constants.asm +++ /dev/null @@ -1,51 +0,0 @@ -INCLUDE "charmap.asm" - -INCLUDE "macros.asm" - -INCLUDE "hram.asm" - -INCLUDE "constants/hardware_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/battle_anim_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/trainer_data_constants.asm" -INCLUDE "constants/script_constants.asm" -INCLUDE "constants/event_flags.asm" -INCLUDE "constants/engine_flags.asm" -INCLUDE "constants/music_constants.asm" -INCLUDE "constants/sfx_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/text_constants.asm" -INCLUDE "constants/misc_constants.asm" -INCLUDE "constants/std_constants.asm" -INCLUDE "constants/deco_constants.asm" -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" -INCLUDE "constants/battle_tower_constants.asm" -INCLUDE "constants/cry_constants.asm" -INCLUDE "constants/audio_constants.asm" -INCLUDE "constants/printer_constants.asm" -- cgit v1.2.3 From d0a8e8e7441a5ac4eee6e40cfeb6c3e77d6aace4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:36:15 -0500 Subject: =?UTF-8?q?includes.asm=20=E2=86=92=20constants.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants.asm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 constants.asm (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm new file mode 100644 index 000000000..2f0a436ea --- /dev/null +++ b/constants.asm @@ -0,0 +1,53 @@ +INCLUDE "version.asm" + +INCLUDE "charmap.asm" + +INCLUDE "macros.asm" + +INCLUDE "hram.asm" + +INCLUDE "constants/hardware_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/battle_anim_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/trainer_data_constants.asm" +INCLUDE "constants/script_constants.asm" +INCLUDE "constants/event_flags.asm" +INCLUDE "constants/engine_flags.asm" +INCLUDE "constants/music_constants.asm" +INCLUDE "constants/sfx_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/text_constants.asm" +INCLUDE "constants/misc_constants.asm" +INCLUDE "constants/std_constants.asm" +INCLUDE "constants/deco_constants.asm" +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" +INCLUDE "constants/battle_tower_constants.asm" +INCLUDE "constants/cry_constants.asm" +INCLUDE "constants/audio_constants.asm" +INCLUDE "constants/printer_constants.asm" -- cgit v1.2.3 From 05e5eaf12fbb422d56615f15c3481d1cf53ed17b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:51:53 -0500 Subject: Eliminate version.asm (resolves #464) --- constants.asm | 2 -- 1 file changed, 2 deletions(-) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 2f0a436ea..4e52c9e42 100644 --- a/constants.asm +++ b/constants.asm @@ -1,5 +1,3 @@ -INCLUDE "version.asm" - INCLUDE "charmap.asm" INCLUDE "macros.asm" -- cgit v1.2.3 From 11d67567d2c0182864a755a7bebcff0f29e877d6 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 14 Jan 2018 11:59:56 +0100 Subject: Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them. --- constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 7de20dfe2..16bd4be08 100644 --- a/constants.asm +++ b/constants.asm @@ -47,3 +47,4 @@ 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" -- cgit v1.2.3 From 4161ec98b4ab19863ae35502c9959892effbf6ea Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 22:37:04 -0500 Subject: Partially document SGB data from pokered --- constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants.asm') diff --git a/constants.asm b/constants.asm index 3f93ccf24..4931bdd5f 100644 --- a/constants.asm +++ b/constants.asm @@ -44,7 +44,7 @@ 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" +INCLUDE "constants/scgb_constants.asm" INCLUDE "constants/battle_tower_constants.asm" INCLUDE "constants/cry_constants.asm" INCLUDE "constants/audio_constants.asm" -- cgit v1.2.3