summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt18
1 files changed, 10 insertions, 8 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 5e273c049..1ebafb51b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -147,7 +147,6 @@ SECTIONS {
asm/script_menu.o(.text);
asm/naming_screen.o(.text);
src/money.o(.text);
- asm/money.o(.text);
asm/contest_effect.o(.text);
asm/record_mixing.o(.text);
asm/secret_base.o(.text);
@@ -157,8 +156,7 @@ SECTIONS {
asm/field_poison.o(.text);
src/pokemon_size_record.o(.text);
asm/fldeff_80F9BCC.o(.text);
- asm/truck_scene.o(.text);
- asm/porthole.o(.text);
+ src/field_special_scene.o(.text);
asm/rotating_gate.o(.text);
src/safari_zone.o(.text);
asm/contest_link_80FC4F4.o(.text);
@@ -210,7 +208,7 @@ SECTIONS {
asm/learn_move.o(.text);
asm/fldeff_softboiled.o(.text);
asm/decoration_inventory.o(.text);
- asm/roamer.o(.text);
+ src/roamer.o(.text);
asm/battle_tower.o(.text);
asm/use_pokeblock.o(.text);
asm/battle_controller_wally.o(.text);
@@ -331,7 +329,7 @@ SECTIONS {
data/data2b.o(.rodata);
src/battle_script_commands.o(.rodata);
data/battle_controller_player.o(.rodata);
- data/data2b_2.o(.rodata);
+ data/smokescreen.o(.rodata);
data/battle_controller_opponent.o(.rodata);
data/battle_controller_link_opponent.o(.rodata);
data/data2c.o(.rodata);
@@ -384,7 +382,7 @@ SECTIONS {
src/berry.o(.rodata);
data/script_menu.o(.rodata);
data/naming_screen.o(.rodata);
- data/money.o(.rodata);
+ src/money.o(.rodata);
data/contest_effect.o(.rodata);
data/record_mixing.o(.rodata);
data/secret_base.o(.rodata);
@@ -393,7 +391,7 @@ SECTIONS {
data/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata)
data/field_effect_misc.o(.rodata);
- data/truck_scene_porthole.o(.rodata);
+ data/field_special_scene.o(.rodata);
data/rotating_gate.o(.rodata);
data/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata);
@@ -418,7 +416,11 @@ SECTIONS {
data/field_effect_helpers.o(.rodata);
data/contest_ai.o(.rodata);
data/battle_controller_safari.o(.rodata);
- data/rom_8158B30.o(.rodata);
+ data/battle_anim_815A0D4.o(.rodata);
+ data/learn_move.o(.rodata);
+ src/roamer.o(.rodata);
+ data/battle_tower.o(.rodata);
+ data/use_pokeblock.o(.rodata);
data/battle_controller_wally.o(.rodata);
data/player_pc.o(.rodata);
data/intro.o(.rodata);