diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
| commit | bf79edbd8b5b398921d4094abfe44d16c4a182a1 (patch) | |
| tree | 5ad51360de30eda07c4e1df0bed5e74076bceadb /ld_script.txt | |
| parent | 1a63f6607e187a58973cff05eb150fd66f77b9b9 (diff) | |
| parent | 18f6c5c9d460c019453227abe033d84f1feb6310 (diff) | |
Merge branch 'master' into watanabe
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index 0655384af..219dd51ed 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -498,7 +498,7 @@ SECTIONS { data/battle_7.o(.rodata); src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); - data/battle_moves.o(.rodata); + src/data/battle_moves.o(.rodata); src/battle/battle_util.o(.rodata); src/pokemon_1.o(.rodata); src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */ |