diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-27 11:13:32 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-27 11:13:32 -0500 |
| commit | 9202e8d4c0b8ae285d0dae4ead2582c04c5d100f (patch) | |
| tree | d2c0257b7b9b289b054c85d38445718fcd9b126b | |
| parent | 42a36959b95aad5a55a2f7bb17dcdc941dd89750 (diff) | |
data2c.s -> battle_moves.s
| -rw-r--r-- | data/battle_moves.s (renamed from data/battle_moves.inc) | 5 | ||||
| -rw-r--r-- | data/data2c.s | 10 | ||||
| -rw-r--r-- | ld_script.txt | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/data/battle_moves.inc b/data/battle_moves.s index ff7e2cb33..ea32446d2 100644 --- a/data/battle_moves.inc +++ b/data/battle_moves.s @@ -1,3 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 gBattleMoves:: @ 81FB12C @ NONE diff --git a/data/data2c.s b/data/data2c.s deleted file mode 100644 index 260b451cf..000000000 --- a/data/data2c.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - -@ 81FB12C - .include "data/battle_moves.inc" - diff --git a/ld_script.txt b/ld_script.txt index 4a9775673..4f3ff093d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -335,7 +335,7 @@ SECTIONS { data/data2b.o(.rodata); src/battle_controller_opponent.o(.rodata); src/battle_controller_linkopponent2.o(.rodata); - data/data2c.o(.rodata); + data/battle_moves.o(.rodata); src/battle_3.o(.rodata); src/pokemon_data.o(.rodata); . = ALIGN(4); |