From 9fe74ac590f75a0571de8ebcd499fdf892419328 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 14 Oct 2019 09:40:17 -0400 Subject: trade through sub_804C728 (nonmatching --- ld_script.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 0e8edea06..56525bce7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,6 +85,7 @@ SECTIONS { asm/smokescreen.o(.text); asm/pokeball.o(.text); src/load_save.o(.text); + src/trade.o(.text); asm/trade.o(.text); src/play_time.o(.text); src/new_game.o(.text); -- cgit v1.2.3 From 2c2c179eb9b92d0998922cc96a115d3d1671a64b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 12:49:16 -0400 Subject: Finish trade code --- 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 1765ff6f1..78c7d089d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -86,7 +86,6 @@ SECTIONS { asm/pokeball.o(.text); src/load_save.o(.text); src/trade.o(.text); - asm/trade.o(.text); src/play_time.o(.text); src/new_game.o(.text); asm/overworld.o(.text); @@ -400,6 +399,7 @@ SECTIONS { src/battle_gfx_sfx_util.o(.rodata); data/battle_interface.o(.rodata); data/pokeball.o(.rodata); + src/trade.o(.rodata); data/trade.o(.rodata); data/overworld.o(.rodata); data/tilesets.o(.rodata); -- cgit v1.2.3 From f6d768d5ed9899f5814349cb232da861f85cbc60 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 14:20:32 -0400 Subject: Trade data; split off trade_scene --- 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 78c7d089d..b66aa6b85 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -86,6 +86,7 @@ SECTIONS { asm/pokeball.o(.text); src/load_save.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); @@ -400,6 +401,7 @@ SECTIONS { data/battle_interface.o(.rodata); data/pokeball.o(.rodata); src/trade.o(.rodata); + src/trade_scene.o(.rodata); data/trade.o(.rodata); data/overworld.o(.rodata); data/tilesets.o(.rodata); -- cgit v1.2.3 From 4fae033d1a6ba2520baca924c544a8d7195ff024 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 16:01:31 -0400 Subject: Finish trade_scene data --- 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 b66aa6b85..f8e33aa9f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -402,7 +402,6 @@ SECTIONS { data/pokeball.o(.rodata); src/trade.o(.rodata); src/trade_scene.o(.rodata); - data/trade.o(.rodata); data/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); -- cgit v1.2.3