From 41dbd3b4a6f43439f691918815f26cfad9c06231 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 17 Jun 2013 21:16:16 -0400 Subject: [PATCH 1/2] move constants files into constants/ --- constants.asm | 17 ++++++++--------- .../battle_constants.asm | 0 .../item_constants.asm | 0 .../map_constants.asm | 0 .../move_constants.asm | 0 .../music_constants.asm | 0 .../pokemon_constants.asm | 0 .../script_constants.asm | 0 .../trainer_constants.asm | 0 9 files changed, 8 insertions(+), 9 deletions(-) rename battle_constants.asm => constants/battle_constants.asm (100%) rename item_constants.asm => constants/item_constants.asm (100%) rename map_constants.asm => constants/map_constants.asm (100%) rename move_constants.asm => constants/move_constants.asm (100%) rename music_constants.asm => constants/music_constants.asm (100%) rename pokemon_constants.asm => constants/pokemon_constants.asm (100%) rename script_constants.asm => constants/script_constants.asm (100%) rename trainer_constants.asm => constants/trainer_constants.asm (100%) diff --git a/constants.asm b/constants.asm index e3d1ddf95..9c7348e9b 100644 --- a/constants.asm +++ b/constants.asm @@ -1,14 +1,13 @@ _CRYSTAL EQU 1 - -INCLUDE "pokemon_constants.asm" -INCLUDE "move_constants.asm" -INCLUDE "battle_constants.asm" -INCLUDE "map_constants.asm" -INCLUDE "item_constants.asm" -INCLUDE "trainer_constants.asm" -INCLUDE "script_constants.asm" -INCLUDE "music_constants.asm" +INCLUDE "constants/pokemon_constants.asm" +INCLUDE "constants/move_constants.asm" +INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/map_constants.asm" +INCLUDE "constants/item_constants.asm" +INCLUDE "constants/trainer_constants.asm" +INCLUDE "constants/script_constants.asm" +INCLUDE "constants/music_constants.asm" ; rst vectors diff --git a/battle_constants.asm b/constants/battle_constants.asm similarity index 100% rename from battle_constants.asm rename to constants/battle_constants.asm diff --git a/item_constants.asm b/constants/item_constants.asm similarity index 100% rename from item_constants.asm rename to constants/item_constants.asm diff --git a/map_constants.asm b/constants/map_constants.asm similarity index 100% rename from map_constants.asm rename to constants/map_constants.asm diff --git a/move_constants.asm b/constants/move_constants.asm similarity index 100% rename from move_constants.asm rename to constants/move_constants.asm diff --git a/music_constants.asm b/constants/music_constants.asm similarity index 100% rename from music_constants.asm rename to constants/music_constants.asm diff --git a/pokemon_constants.asm b/constants/pokemon_constants.asm similarity index 100% rename from pokemon_constants.asm rename to constants/pokemon_constants.asm diff --git a/script_constants.asm b/constants/script_constants.asm similarity index 100% rename from script_constants.asm rename to constants/script_constants.asm diff --git a/trainer_constants.asm b/constants/trainer_constants.asm similarity index 100% rename from trainer_constants.asm rename to constants/trainer_constants.asm From fb931fe616504a8cf141521dec6fc6f7d236bff8 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 17 Jun 2013 21:26:33 -0400 Subject: [PATCH 2/2] move miscellaneous asm into engine/ --- bittable2.asm => engine/bittable2.asm | 0 credits.asm => engine/credits.asm | 0 joypad.asm => engine/joypad.asm | 0 landmarks.asm => engine/landmarks.asm | 0 scripting.asm => engine/scripting.asm | 0 vblank.asm => engine/vblank.asm | 0 main.asm | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename bittable2.asm => engine/bittable2.asm (100%) rename credits.asm => engine/credits.asm (100%) rename joypad.asm => engine/joypad.asm (100%) rename landmarks.asm => engine/landmarks.asm (100%) rename scripting.asm => engine/scripting.asm (100%) rename vblank.asm => engine/vblank.asm (100%) diff --git a/bittable2.asm b/engine/bittable2.asm similarity index 100% rename from bittable2.asm rename to engine/bittable2.asm diff --git a/credits.asm b/engine/credits.asm similarity index 100% rename from credits.asm rename to engine/credits.asm diff --git a/joypad.asm b/engine/joypad.asm similarity index 100% rename from joypad.asm rename to engine/joypad.asm diff --git a/landmarks.asm b/engine/landmarks.asm similarity index 100% rename from landmarks.asm rename to engine/landmarks.asm diff --git a/scripting.asm b/engine/scripting.asm similarity index 100% rename from scripting.asm rename to engine/scripting.asm diff --git a/vblank.asm b/engine/vblank.asm similarity index 100% rename from vblank.asm rename to engine/vblank.asm diff --git a/main.asm b/main.asm index 3dd69c930..df7433011 100644 --- a/main.asm +++ b/main.asm @@ -60,7 +60,7 @@ INCBIN "baserom.gbc", $150, $283 - $150 VBlank: ; 283 -INCLUDE "vblank.asm" +INCLUDE "engine/vblank.asm" DelayFrame: ; 45a @@ -437,7 +437,7 @@ SetClock: ; 691 INCBIN "baserom.gbc", $6c4, $92e - $6c4 -INCLUDE "joypad.asm" +INCLUDE "engine/joypad.asm" INCBIN "baserom.gbc", $a1b, $b40 - $a1b @@ -12984,7 +12984,7 @@ GetFlag2: ; 80430 BitTable2: ; 80462 -INCLUDE "bittable2.asm" +INCLUDE "engine/bittable2.asm" ; 80648 @@ -14938,7 +14938,7 @@ INCLUDE "maps/second_map_headers.asm" INCBIN "baserom.gbc", $966b0, $96cb1 - $966b0 -INCLUDE "scripting.asm" +INCLUDE "engine/scripting.asm" INCBIN "baserom.gbc", $97c20, $35e @@ -19353,7 +19353,7 @@ INCBIN "gfx/intro/logo.lz" INCBIN "baserom.gbc", $10983f, $1099aa - $10983f ; Credits -INCLUDE "credits.asm" +INCLUDE "engine/credits.asm" SECTION "bank43",DATA,BANK[$43] @@ -21354,7 +21354,7 @@ MoveNames: INCLUDE "battle/move_names.asm" -INCLUDE "landmarks.asm" +INCLUDE "engine/landmarks.asm" RegionCheck: ; 0x1caea1