From 172b12a8cb4651b59658740443d6786db5875b5c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Apr 2019 12:11:10 -0400 Subject: Port m4a from emerald --- ld_script.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index bd94c2055..867510f1a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -30,7 +30,7 @@ SECTIONS { /* .bss.code starts at 0x30028E0 */ - src/m4a_2.o(.bss.code); + src/m4a.o(.bss.code); /* COMMON starts at 0x30030E0 */ @@ -289,9 +289,7 @@ SECTIONS { { asm/libgcnmultiboot.o(.text); asm/m4a_1.o(.text); - src/m4a_2.o(.text); - asm/m4a_3.o(.text); - src/m4a_4.o(.text); + src/m4a.o(.text); src/agb_flash.o(.text); src/agb_flash_1m.o(.text); src/agb_flash_mx.o(.text); -- cgit v1.2.3 From 2ef974d7766f899bbe3c3d4af8974232c6a13610 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 17:14:11 -0400 Subject: Decompile seagallop --- ld_script.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 867510f1a..283c711f7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -248,7 +248,7 @@ SECTIONS { src/mevent_server.o(.text); src/mevent_8145654.o(.text); src/menews_jisan.o(.text); - asm/seagallop.o(.text); + src/seagallop.o(.text); asm/unk_8147500.o(.text); asm/unk_8147AA8.o(.text); asm/unk_814B6F0.o(.text); @@ -418,6 +418,8 @@ SECTIONS { data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); + . = ALIGN(4); + src/seagallop.o(.rodata); data/data_8468C98.o(.rodata); src/quest_log_8150454.o(.rodata); data/data_8471F00.o(.rodata); -- cgit v1.2.3 From 9575eba4814cfa96ae863ea2716afecbf2565b71 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 08:52:36 -0400 Subject: start to port mystery gift 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 283c711f7..6c50d0e5a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -241,6 +241,7 @@ SECTIONS { asm/buy_menu_helpers.o(.text); asm/slot_machine.o(.text); src/roamer.o(.text); + src/mystery_gift_menu.o(.text); asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); @@ -409,7 +410,7 @@ SECTIONS { data/buy_menu_helpers.o(.rodata); data/slot_machine.o(.rodata); src/roamer.o(.rodata); - data/mystery_gift_menu.o(.rodata); + src/mystery_gift_menu.o(.rodata); data/link_rfu_4.o(.rodata); src/mevent.o(.rodata); src/mevent_server_helpers.o(.rodata); -- cgit v1.2.3 From f95188d887ca8073347f13c56e5e7acf53a75ac2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 10:20:18 -0400 Subject: link_rfu_4 is part of mystery_gift_menu --- 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 6c50d0e5a..429cc7533 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -243,7 +243,6 @@ SECTIONS { src/roamer.o(.text); src/mystery_gift_menu.o(.text); asm/mystery_gift_menu.o(.text); - asm/link_rfu_4.o(.text); src/mevent.o(.text); src/mevent_server_helpers.o(.text); src/mevent_server.o(.text); @@ -411,7 +410,7 @@ SECTIONS { data/slot_machine.o(.rodata); src/roamer.o(.rodata); src/mystery_gift_menu.o(.rodata); - data/link_rfu_4.o(.rodata); + data/mystery_gift_menu.o(.rodata); src/mevent.o(.rodata); src/mevent_server_helpers.o(.rodata); src/mevent_server.o(.rodata); -- cgit v1.2.3 From 76a421f6f1787c013e8f8ba4403f5b995c648c41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 20:35:26 -0400 Subject: Port data from emerald --- 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 429cc7533..fb24a9060 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -410,7 +410,6 @@ SECTIONS { data/slot_machine.o(.rodata); src/roamer.o(.rodata); src/mystery_gift_menu.o(.rodata); - data/mystery_gift_menu.o(.rodata); src/mevent.o(.rodata); src/mevent_server_helpers.o(.rodata); src/mevent_server.o(.rodata); -- cgit v1.2.3 From 274151836b44d960ab357d861a4d79602a8722d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 26 Apr 2019 12:49:08 -0400 Subject: Finish mystery_gift_menu.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 fb24a9060..88c2c59bc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -242,7 +242,6 @@ SECTIONS { asm/slot_machine.o(.text); src/roamer.o(.text); src/mystery_gift_menu.o(.text); - asm/mystery_gift_menu.o(.text); src/mevent.o(.text); src/mevent_server_helpers.o(.text); src/mevent_server.o(.text); -- cgit v1.2.3 From 523c53506da69eccebb95af1d1cb76803d0fb88f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 27 Apr 2019 12:39:26 -0400 Subject: Port blit 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 88c2c59bc..53385c39f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -55,7 +55,7 @@ SECTIONS { src/text_printer.o(.text); asm/text_printer.o(.text); src/window.o(.text); - asm/blit.o(.text); + src/blit.o(.text); src/window_8bpp.o(.text); src/text.o(.text); src/sprite.o(.text); -- cgit v1.2.3