diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-06-25 20:17:18 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-06-25 20:17:18 -0700 |
| commit | ad6e271dec7ac0d23a8e140a6fb7efabe094f5eb (patch) | |
| tree | 7f7e53e14ae9d9af1c26cfe8536842fab1825b6b | |
| parent | 4b2d4337b4f1edbac50fc369c0207043e0a9cce3 (diff) | |
| parent | fb931fe616504a8cf141521dec6fc6f7d236bff8 (diff) | |
Merge pull request #148 from yenatch/master
Re-organizing some engine-related asm and constants.
| -rw-r--r-- | constants.asm | 17 | ||||
| -rw-r--r-- | constants/battle_constants.asm (renamed from battle_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/item_constants.asm (renamed from item_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/map_constants.asm (renamed from map_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/move_constants.asm (renamed from move_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/music_constants.asm (renamed from music_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm (renamed from pokemon_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/script_constants.asm (renamed from script_constants.asm) | 0 | ||||
| -rw-r--r-- | constants/trainer_constants.asm (renamed from trainer_constants.asm) | 0 | ||||
| -rw-r--r-- | engine/bittable2.asm (renamed from bittable2.asm) | 0 | ||||
| -rw-r--r-- | engine/credits.asm (renamed from credits.asm) | 0 | ||||
| -rw-r--r-- | engine/joypad.asm (renamed from joypad.asm) | 0 | ||||
| -rw-r--r-- | engine/landmarks.asm (renamed from landmarks.asm) | 0 | ||||
| -rw-r--r-- | engine/scripting.asm (renamed from scripting.asm) | 0 | ||||
| -rw-r--r-- | engine/vblank.asm (renamed from vblank.asm) | 0 | ||||
| -rw-r--r-- | main.asm | 12 |
16 files changed, 14 insertions, 15 deletions
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 index a1858da1f..a1858da1f 100644 --- a/battle_constants.asm +++ b/constants/battle_constants.asm diff --git a/item_constants.asm b/constants/item_constants.asm index 7fc132378..7fc132378 100644 --- a/item_constants.asm +++ b/constants/item_constants.asm diff --git a/map_constants.asm b/constants/map_constants.asm index 7861a7d44..7861a7d44 100644 --- a/map_constants.asm +++ b/constants/map_constants.asm diff --git a/move_constants.asm b/constants/move_constants.asm index 302255a57..302255a57 100644 --- a/move_constants.asm +++ b/constants/move_constants.asm diff --git a/music_constants.asm b/constants/music_constants.asm index b4e65b5c5..b4e65b5c5 100644 --- a/music_constants.asm +++ b/constants/music_constants.asm diff --git a/pokemon_constants.asm b/constants/pokemon_constants.asm index 40b450b85..40b450b85 100644 --- a/pokemon_constants.asm +++ b/constants/pokemon_constants.asm diff --git a/script_constants.asm b/constants/script_constants.asm index 30fdff8bc..30fdff8bc 100644 --- a/script_constants.asm +++ b/constants/script_constants.asm diff --git a/trainer_constants.asm b/constants/trainer_constants.asm index cfc0e26f0..cfc0e26f0 100644 --- a/trainer_constants.asm +++ b/constants/trainer_constants.asm diff --git a/bittable2.asm b/engine/bittable2.asm index 5527226e4..5527226e4 100644 --- a/bittable2.asm +++ b/engine/bittable2.asm diff --git a/credits.asm b/engine/credits.asm index d5e4399b9..d5e4399b9 100644 --- a/credits.asm +++ b/engine/credits.asm diff --git a/joypad.asm b/engine/joypad.asm index b9702d33a..b9702d33a 100644 --- a/joypad.asm +++ b/engine/joypad.asm diff --git a/landmarks.asm b/engine/landmarks.asm index 2109bd556..2109bd556 100644 --- a/landmarks.asm +++ b/engine/landmarks.asm diff --git a/scripting.asm b/engine/scripting.asm index 2875781f0..2875781f0 100644 --- a/scripting.asm +++ b/engine/scripting.asm diff --git a/vblank.asm b/engine/vblank.asm index 5080a56ad..5080a56ad 100644 --- a/vblank.asm +++ b/engine/vblank.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 |