From f77b0feba6f1152216eba3b2c1edf63ba76c5a80 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 16:57:00 -0500 Subject: Port berry_crush.c part 1 from Emerald --- ld_script.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 65666ddc0..1f819d6c7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -279,7 +279,7 @@ SECTIONS { src/pokemon_jump_4.o(.text); src/pokemon_jump_5.o(.text); src/pokemon_jump_6.o(.text); - asm/berry_crush.o(.text); + src/berry_crush.o(.text); asm/berry_crush_2.o(.text); asm/berry_crush_3.o(.text); src/wireless_communication_status_screen.o(.text); -- cgit v1.2.3 From 8594e7f72d070ce10fcc41a8c2dfe32420e7c560 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 21:36:30 -0500 Subject: Port berry_crush_2 from emerald --- ld_script.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 1f819d6c7..8eac99b18 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -280,7 +280,7 @@ SECTIONS { src/pokemon_jump_5.o(.text); src/pokemon_jump_6.o(.text); src/berry_crush.o(.text); - asm/berry_crush_2.o(.text); + src/berry_crush_2.o(.text); asm/berry_crush_3.o(.text); src/wireless_communication_status_screen.o(.text); src/braille_text.o(.text); @@ -572,6 +572,7 @@ SECTIONS { src/pokemon_jump_4.o(.rodata); src/pokemon_jump_5.o(.rodata); src/pokemon_jump_6.o(.rodata); + src/berry_crush_2.o(.rodata); data/berry_crush.o(.rodata); src/wireless_communication_status_screen.o(.rodata); src/braille_text.o(.rodata); -- cgit v1.2.3 From 8a7c2ded11a2adf4f09ddca814eb06fdbca13fd1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 12:24:18 -0500 Subject: Port berry_crush_3 from Emerald --- ld_script.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 8eac99b18..814bea4cd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -281,7 +281,7 @@ SECTIONS { src/pokemon_jump_6.o(.text); src/berry_crush.o(.text); src/berry_crush_2.o(.text); - asm/berry_crush_3.o(.text); + src/berry_crush_3.o(.text); src/wireless_communication_status_screen.o(.text); src/braille_text.o(.text); src/text_window.o(.text); @@ -573,7 +573,7 @@ SECTIONS { src/pokemon_jump_5.o(.rodata); src/pokemon_jump_6.o(.rodata); src/berry_crush_2.o(.rodata); - data/berry_crush.o(.rodata); + src/berry_crush_3.o(.rodata); src/wireless_communication_status_screen.o(.rodata); src/braille_text.o(.rodata); src/text_window_graphics.o(.rodata); -- cgit v1.2.3 From d047e6631066139abe81fe5924b724cc9d02af62 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 13:59:54 -0500 Subject: Duplicate data in dodrio_berry_picking.c --- ld_script.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 814bea4cd..0b2c0e06c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -578,7 +578,6 @@ SECTIONS { src/braille_text.o(.rodata); src/text_window_graphics.o(.rodata); src/quest_log_player.o(.rodata); - data/berry_powder.o(.rodata); src/dodrio_berry_picking.o(.rodata); src/battle_controller_pokedude.o(.rodata); src/teachy_tv.o(.rodata); -- cgit v1.2.3 From df08e8645bb4c6f6abe34383fcb863b5165956f3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 3 Mar 2020 14:05:38 -0500 Subject: Port some standalone rodata objects to C --- ld_script.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 0b2c0e06c..2fa7fe805 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -582,14 +582,13 @@ SECTIONS { src/battle_controller_pokedude.o(.rodata); src/teachy_tv.o(.rodata); src/digit_obj_util.o(.rodata); - data/data_8479668.o(.rodata); src/ss_anne.o(.rodata); src/cereader_tool.o(.rodata); src/renewable_hidden_items.o(.rodata); src/trainer_tower.o(.rodata); src/minigame_countdown.o(.rodata); src/berry_fix_program.o(.rodata); - data/data_8479668.o(.rodata.after_trainer_tower); + data/data_8479668.o(.rodata); /* These should not be moved to C files */ src/mystery_event_msg.o(.rodata); -- cgit v1.2.3