diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-31 09:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 09:31:33 -0400 |
| commit | c6cd74fed25cbb6e2fa0296960fbcda795311b06 (patch) | |
| tree | 05ae3de2bc0130040d48e800fe4e962f2a818aef /ld_script.txt | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
| parent | 2b0bcdcad9336defc82f50a329b12e631b1f33ce (diff) | |
Merge pull request #120 from PikalaxALT/trade
Trade
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 2b2dff40e..f8e33aa9f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,7 +85,8 @@ SECTIONS { asm/smokescreen.o(.text); asm/pokeball.o(.text); src/load_save.o(.text); - asm/trade.o(.text); + src/trade.o(.text); + src/trade_scene.o(.text); src/play_time.o(.text); src/new_game.o(.text); asm/overworld.o(.text); @@ -399,7 +400,8 @@ SECTIONS { src/battle_gfx_sfx_util.o(.rodata); data/battle_interface.o(.rodata); data/pokeball.o(.rodata); - data/trade.o(.rodata); + src/trade.o(.rodata); + src/trade_scene.o(.rodata); data/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); |
