From a6c0088073949fe3007bf600fd2de8948b3874a7 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 16 Oct 2019 08:28:19 +0800 Subject: battle_main data decomp --- ld_script.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index ef17deaf6..0eabfcb0d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -66,6 +66,7 @@ SECTIONS { src/battle_controllers.o(.text); src/decompress.o(.text); asm/battle_1.o(.text); + src/battle_main.o(.text); asm/battle_2.o(.text); src/battle_util.o(.text); src/battle_script_commands.o(.text); @@ -385,6 +386,7 @@ SECTIONS { data/data.o(.rodata); src/data.o(.rodata); data/data.o(.rodata.82350AC); + src/battle_main.o(.rodata); src/battle_util.o(.rodata); src/battle_script_commands.o(.rodata); src/battle_controller_player.o(.rodata); -- cgit v1.2.3 From a28bb81ab714da3da457734fcce93879f3d121a9 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 18 Oct 2019 09:55:23 +0800 Subject: battle_main remaining funcs --- 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 0eabfcb0d..d0f391018 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -67,7 +67,6 @@ SECTIONS { src/decompress.o(.text); asm/battle_1.o(.text); src/battle_main.o(.text); - asm/battle_2.o(.text); src/battle_util.o(.text); src/battle_script_commands.o(.text); src/battle_util2.o(.text); -- cgit v1.2.3 From b0400ef6ba6e6cf49ad2bdc19a29eb2abef26701 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 21 Oct 2019 03:07:59 +0800 Subject: battle_setup funcs --- 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 d0f391018..063a8dd78 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -119,8 +119,9 @@ SECTIONS { src/reset_save_heap.o(.text); asm/field_weather.o(.text); asm/field_weather_effects.o(.text); - src/field_fadetransition.o(.text);; + src/field_fadetransition.o(.text); asm/field_screen_effect.o(.text); + src/battle_setup.o(.text); asm/battle_setup.o(.text); asm/cable_club.o(.text); asm/trainer_see.o(.text); -- cgit v1.2.3 From cfe2a27b9cd46f4a0c0f716264e868da490a64a6 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 21 Oct 2019 03:55:14 +0800 Subject: clean up --- ld_script.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 063a8dd78..116cfdca2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -423,6 +423,8 @@ SECTIONS { src/title_screen.o(.rodata); data/field_weather.o(.rodata); data/data_835B488.o(.rodata); + src/battle_setup.o(.rodata); + data/data_835B488.o(.rodata.83C6AB0); src/item_menu_icons.o(.rodata); src/battle_anim_mon_movement.o(.rodata); src/item.o(.rodata); -- cgit v1.2.3 From 631eccb92ddbbac3630ebbcad84c3557450577a2 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 25 Oct 2019 05:57:13 +0800 Subject: thru OakOldManHandleSwitchInAnim --- ld_script.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index d9694130a..3538f70bd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -208,6 +208,7 @@ SECTIONS { asm/learn_move.o(.text); src/fldeff_softboiled.o(.text); asm/battle_tower.o(.text); + src/battle_controller_oak_old_man.o(.text); asm/battle_controller_oak.o(.text); src/player_pc.o(.text); src/intro.o(.text); @@ -457,6 +458,7 @@ SECTIONS { data/data_83FECCC.o(.rodata); src/battle_controller_safari.o(.rodata); data/data_83FECCC.o(.rodata.83FEDE4); + src/battle_controller_oak_old_man.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); data/data_83FECCC.o(.rodata.battle_anim_special); -- cgit v1.2.3 From b8c2d14f6adb73f66031d077588fa0a61fd9feb4 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 25 Oct 2019 08:51:14 +0800 Subject: battle_controller_oak_old_man --- 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 3538f70bd..c1d781e0a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -209,7 +209,6 @@ SECTIONS { src/fldeff_softboiled.o(.text); asm/battle_tower.o(.text); src/battle_controller_oak_old_man.o(.text); - asm/battle_controller_oak.o(.text); src/player_pc.o(.text); src/intro.o(.text); asm/battle_anim_special.o(.text); -- cgit v1.2.3 From d99119bad5d71d356d3f5492a3df02bf64075178 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 26 Oct 2019 07:55:16 +0800 Subject: rename battle_bg.s --- 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 fd8ea9c6c..120ff1b98 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -65,7 +65,7 @@ SECTIONS { src/main_menu.o(.text); src/battle_controllers.o(.text); src/decompress.o(.text); - asm/battle_1.o(.text); + asm/battle_bg.o(.text); src/battle_main.o(.text); src/battle_util.o(.text); src/battle_script_commands.o(.text); -- cgit v1.2.3