diff options
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ld_script.txt b/ld_script.txt index 9c47146af..b42df50db 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -48,8 +48,7 @@ SECTIONS { src/rom3.o(.text); src/decompress.o(.text); asm/battle_1.o(.text); - src/rom_800D42C.o(.text); - asm/battle_1.o(.text_800DC24); + src/battle/battle_bg.o(.text); src/battle/battle_2.o(.text); src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); @@ -116,7 +115,6 @@ SECTIONS { src/battle/battle_setup.o(.text); src/cable_club.o(.text); src/debug/tomomichi_debug_menu.o(.text); - asm/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); asm/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); @@ -495,6 +493,8 @@ SECTIONS { src/rtc.o(.rodata); src/main_menu.o(.rodata); data/mon_attrs.o(.rodata); + src/battle/battle_1.o(.rodata); + src/battle/battle_bg.o(.rodata); data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); @@ -515,7 +515,8 @@ SECTIONS { src/util.o(.rodata); src/daycare.o(.rodata); src/egg_hatch.o(.rodata); - data/battle_interface.o(.rodata); + src/battle/battle_7.o(.rodata); + src/battle/battle_interface.o(.rodata); src/battle/pokeball.o(.rodata); src/trade.o(.rodata); src/berry_blender.o(.rodata); @@ -560,7 +561,7 @@ SECTIONS { src/field_screen_effect.o(.rodata); src/battle/battle_setup.o(.rodata); src/cable_club.o(.rodata); - data/debug_menu_tomomichi.o(.rodata); + src/debug/tomomichi_debug_menu.o(.rodata); data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); data/debug_menu_taya.o(.rodata); |