diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-08-15 16:22:54 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-08-15 16:22:54 -0700 |
| commit | 13dc7a4170bcb44d10c80099b704103915c4d49d (patch) | |
| tree | c9511c79c597830fdae81ea30ad26a432f5998d8 /ld_script.txt | |
| parent | e7da51438286bceaa085aad524065cbfe645faf0 (diff) | |
| parent | f65da613cf04772d55cfcdaca8266479ea2c662b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 2311301b0..19a08c7c5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -203,7 +203,7 @@ SECTIONS { src/save.o(.text); src/mystery_event_script.o(.text); asm/field_effect_helpers.o(.text); - asm/contest_ai.o(.text); + src/contest_ai.o(.text); src/battle_anim_sound_tasks.o(.text); src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); @@ -490,7 +490,7 @@ SECTIONS { data/cable_car.o(.rodata); src/save.o(.rodata); data/field_effect_helpers.o(.rodata); - data/contest_ai.o(.rodata); + src/contest_ai.o(.rodata); src/battle_controller_safari.o(.rodata); data/battle_anim_815A0D4.o(.rodata); src/learn_move.o(.rodata); |