From ecc8dee645858c909f97cc27cac2b5399b72090a Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 18:10:52 +0100 Subject: testing something --- 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 6d4e0832f..88b86e06d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -495,6 +495,7 @@ SECTIONS { src/field/daycare.o(.rodata); src/scene/egg_hatch.o(.rodata); data/battle_interface.o(.rodata); + src/battle/battle_interface.o(.rodata); src/battle/pokeball.o(.rodata); src/engine/trade.o(.rodata); src/scene/berry_blender.o(.rodata); -- cgit v1.2.3 From af35c8e429c09197eb46346696792ad89bf0c7d3 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 15 Jan 2018 23:22:16 +0100 Subject: Done decompiling battle_interfaces.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 54dfe644d..9a5cf1bd6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -499,7 +499,7 @@ SECTIONS { src/engine/util.o(.rodata); src/field/daycare.o(.rodata); src/scene/egg_hatch.o(.rodata); - data/battle_interface.o(.rodata); + src/battle/battle_7.o(.rodata); src/battle/battle_interface.o(.rodata); src/battle/pokeball.o(.rodata); src/engine/trade.o(.rodata); -- cgit v1.2.3 From f9745abae0277c1000f4816abc38f9b69828aea2 Mon Sep 17 00:00:00 2001 From: Blampharos Date: Mon, 22 Jan 2018 11:32:52 +0100 Subject: Begin decompiling battle_1.c Enemy backsprite data (palettes, coords, sprites) and foe elevation data are converted in this commit --- 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 5dcdf948d..ce6765a3f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -483,6 +483,7 @@ SECTIONS { src/engine/rtc.o(.rodata); src/engine/main_menu.o(.rodata); data/mon_attrs.o(.rodata); + src/battle/battle_1.o(.rodata); data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); -- cgit v1.2.3 From 48ef425d46b5879940fdad6641a5040cba900ca0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 28 Jan 2018 14:31:39 -0500 Subject: try to match trailing battle_1 section --- 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 fc13444f1..ca3d68ddc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -49,7 +49,6 @@ SECTIONS { src/engine/decompress.o(.text); asm/battle_1.o(.text); src/rom_800D42C.o(.text); - asm/battle_1.o(.text_800DC24); src/battle/battle_2.o(.text); src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); -- cgit v1.2.3 From 78ba4a3f3d75a0224e2b2592ff8f0953d01e5229 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Mar 2018 09:54:44 -0500 Subject: through TomomichiDebugMenu_ContestGraphics --- 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 d66631d62..3887d59e7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -560,6 +560,7 @@ SECTIONS { src/field/field_screen_effect.o(.rodata); src/battle/battle_setup.o(.rodata); src/engine/cable_club.o(.rodata); + src/debug/tomomichi_debug_menu.o(.rodata); data/debug_menu_tomomichi.o(.rodata); data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); -- cgit v1.2.3 From 79df78752440b70646399fc2a02901d8c3d4eff9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Mar 2018 20:02:27 -0400 Subject: Remaining 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 3887d59e7..d7e0f0e6b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -561,7 +561,6 @@ SECTIONS { src/battle/battle_setup.o(.rodata); src/engine/cable_club.o(.rodata); src/debug/tomomichi_debug_menu.o(.rodata); - data/debug_menu_tomomichi.o(.rodata); data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); data/debug_menu_taya.o(.rodata); -- cgit v1.2.3 From 3f8fdccac5909e7dc80de42a3fae24ccab45b321 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Mar 2018 08:45:25 -0400 Subject: Complete decompilation of tomomichi_debug_menu --- 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 d7e0f0e6b..e14e25bd7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -116,7 +116,6 @@ SECTIONS { src/battle/battle_setup.o(.text); src/engine/cable_club.o(.text); src/debug/tomomichi_debug_menu.o(.text); - asm/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); asm/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); -- cgit v1.2.3 From 7eb178c36e5d4c5dba5f600346228969f4e33b9a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Mar 2018 08:49:22 -0400 Subject: Start decompiling contest_effect --- 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 619e06350..2eae4d81c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -160,6 +160,7 @@ SECTIONS { src/script_menu.o(.text); src/naming_screen.o(.text); src/money.o(.text); + src/contest_effect.o(.text); asm/contest_effect.o(.text); src/record_mixing.o(.text); src/debug/sound_check_menu.o(.text); @@ -594,6 +595,7 @@ SECTIONS { src/script_menu.o(.rodata); src/naming_screen.o(.rodata); src/money.o(.rodata); + src/contest_effect.o(.rodata); data/contest_effect.o(.rodata); src/record_mixing.o(.data); src/record_mixing.o(.rodata); -- cgit v1.2.3 From e6a71d1c3759fa3f5b4d71a8cd08b21905948a8c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Mar 2018 15:11:41 -0400 Subject: Remainder of contest_effect.o(.text) --- 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 2eae4d81c..3e3cb622f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -161,7 +161,6 @@ SECTIONS { src/naming_screen.o(.text); src/money.o(.text); src/contest_effect.o(.text); - asm/contest_effect.o(.text); src/record_mixing.o(.text); src/debug/sound_check_menu.o(.text); src/secret_base.o(.text); -- cgit v1.2.3 From ca3d39512ce4857f6389888045c5d6d562331302 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 30 Mar 2018 15:48:09 -0400 Subject: Decompile contest effect 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 3e3cb622f..9c47146af 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -595,7 +595,6 @@ SECTIONS { src/naming_screen.o(.rodata); src/money.o(.rodata); src/contest_effect.o(.rodata); - data/contest_effect.o(.rodata); src/record_mixing.o(.data); src/record_mixing.o(.rodata); src/debug/sound_check_menu.o(.rodata); -- cgit v1.2.3 From a47e145fa914a580875fd39eefd4a22e76587892 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Apr 2018 21:47:46 -0400 Subject: Finish decompiling nakamura --- 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 c7ed19a0b..c72169b68 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -394,7 +394,6 @@ SECTIONS { src/pokeblock_feed.o(.text); src/clear_save_data_menu.o(.text); src/debug/nakamura_debug_menu.o(.text); - asm/nakamura_debug_menu.o(.text); src/intro_credits_graphics.o(.text); src/evolution_graphics.o(.text); src/bard_music.o(.text); -- cgit v1.2.3 From f3dc669f5dfb953215663ac801bf31b5d621b6f5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 4 Apr 2018 18:51:33 -0700 Subject: Port function/file names from pokeemerald --- 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 06fffa357..245dbdb19 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -48,7 +48,7 @@ SECTIONS { src/rom3.o(.text); src/decompress.o(.text); asm/battle_1.o(.text); - src/rom_800D42C.o(.text); + src/battle/battle_bg.o(.text); src/battle/battle_2.o(.text); src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); -- cgit v1.2.3 From 64c9fd3a29cfd56c1b7ba5812ca84e62427971a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 5 Apr 2018 19:09:30 -0700 Subject: Move some data into battle_bg.c --- 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 b3c7b18ec..74cca392b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -493,7 +493,8 @@ SECTIONS { src/rtc.o(.rodata); src/main_menu.o(.rodata); data/mon_attrs.o(.rodata); - src/battle/battle_1.o(.rodata); + src/battle/battle_1.o(.rodata); + src/battle/battle_bg.o(.rodata); data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); -- cgit v1.2.3 From 90380f68bd0725eb77f38f5c00828efba89e5219 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 5 Apr 2018 20:39:07 -0700 Subject: Rename cute_sketch to contest_painting_effects, and battle_1 to decompress --- ld_script.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index b42df50db..2442d8da0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -47,7 +47,7 @@ SECTIONS { src/main_menu.o(.text); src/rom3.o(.text); src/decompress.o(.text); - asm/battle_1.o(.text); + asm/decompress.o(.text); src/battle/battle_bg.o(.text); src/battle/battle_2.o(.text); src/battle/battle_util.o(.text); @@ -326,8 +326,8 @@ SECTIONS { src/dewford_trend.o(.text); src/heal_location.o(.text); src/region_map.o(.text); - src/cute_sketch.o(.text); - asm/cute_sketch.o(.text); + src/contest_painting_effects.o(.text); + asm/contest_painting_effects.o(.text); src/decoration.o(.text); src/slot_machine.o(.text); src/contest_painting.o(.text); @@ -624,7 +624,7 @@ SECTIONS { src/menu_helpers.o(.rodata); src/heal_location.o(.rodata); src/region_map.o(.rodata); - data/cute_sketch.o(.rodata); + data/contest_painting_effects.o(.rodata); src/decoration.o(.rodata); src/slot_machine.o(.rodata); src/contest_painting.o(.rodata); -- cgit v1.2.3 From 888109935e9c35d6794c340759e4fd8c8c96760d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 6 Apr 2018 10:55:04 -0700 Subject: Start decompiling battle_9 --- 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 2442d8da0..34d3eae38 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -55,6 +55,7 @@ SECTIONS { src/battle/battle_controller_player.o(.text); src/battle/battle_7.o(.text); src/battle/battle_controller_opponent.o(.text); + src/battle/battle_9.o(.text); asm/battle_9.o(.text); src/battle/battle_controller_linkopponent.o(.text); src/pokemon_1.o(.text); -- cgit v1.2.3 From 818801cf5ab0c696f2460922753f921726aac6bb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 6 Apr 2018 16:02:31 -0700 Subject: Finish decompiling battle_9 --- 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 34d3eae38..03ad9105c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -55,8 +55,7 @@ SECTIONS { src/battle/battle_controller_player.o(.text); src/battle/battle_7.o(.text); src/battle/battle_controller_opponent.o(.text); - src/battle/battle_9.o(.text); - asm/battle_9.o(.text); + src/battle/battle_ai_switch_items.o(.text); src/battle/battle_controller_linkopponent.o(.text); src/pokemon_1.o(.text); src/battle/calculate_base_damage.o(.text); -- cgit v1.2.3 From 4d3098e89b5aebf080547a99e68640138dc74599 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Apr 2018 21:30:05 -0400 Subject: Start decompiling unk_debug_menu_3 code --- 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 74cca392b..2cfd8bf6f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -363,6 +363,7 @@ SECTIONS { src/unused_8124F94.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); + src/debug/unk_debug_menu_3.o(.text); asm/unk_debug_menu_3.o(.text); src/field_effect_helpers.o(.text); src/contest_ai.o(.text); @@ -648,6 +649,7 @@ SECTIONS { src/choose_party.o(.rodata); src/cable_car.o(.rodata); src/save.o(.rodata); + src/debug/unk_debug_menu_3.o(.rodata); data/unk_debug_menu_3.o(.rodata); src/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); -- cgit v1.2.3 From eaaa093ccaca498e79a0630941cfba0f31fbd9fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 13:39:52 -0400 Subject: finish decompiling unk_debug_menu_3 code --- 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 56d1ac39f..dffcb1fef 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -364,7 +364,6 @@ SECTIONS { src/save.o(.text); src/mystery_event_script.o(.text); src/debug/unk_debug_menu_3.o(.text); - asm/unk_debug_menu_3.o(.text); src/field_effect_helpers.o(.text); src/contest_ai.o(.text); src/unused_81258BC.o(.text); -- cgit v1.2.3 From b8aa92332113127b908973d681c287b32e538a15 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 13:50:24 -0400 Subject: Decompile rodata --- 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 dffcb1fef..d6a7bfb98 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -648,7 +648,6 @@ SECTIONS { src/cable_car.o(.rodata); src/save.o(.rodata); src/debug/unk_debug_menu_3.o(.rodata); - data/unk_debug_menu_3.o(.rodata); src/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); -- cgit v1.2.3 From e651e6a7847bb8f1a55506c8f7729176f84fabf9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Apr 2018 21:41:23 -0400 Subject: Remaining functions and data in start_menu_debug --- 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 d6a7bfb98..ac2711841 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -538,7 +538,6 @@ SECTIONS { src/start_menu.o(.rodata); src/debug/start_menu_debug.o(.data); src/debug/start_menu_debug.o(.rodata); - data/start_menu_debug.o(.rodata); src/menu.o(.rodata); src/tileset_anim.o(.rodata); src/palette.o(.rodata); -- cgit v1.2.3 From b7d7e5ec71d81ae8fed415080c7042e1f4c3aaa6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 14:00:21 -0400 Subject: Rename me_script.inc to mystery_event_script.inc, debug_menu_3.s to debug_mystery_event_scripts.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 ac2711841..527805658 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -677,7 +677,7 @@ SECTIONS { data/strings2.o(.rodata); src/menu_cursor.o(.rodata); src/mystery_event_msg.o(.rodata); - data/debug_menu_3.o(.rodata); + data/debug_mystery_event_scripts.o(.rodata); src/libs/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 -- cgit v1.2.3 From 91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 14:01:40 -0400 Subject: Rename unk_debug_menu_3 to ereader_debug_menu --- 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 527805658..0bacb1d50 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -363,7 +363,7 @@ SECTIONS { src/unused_8124F94.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); - src/debug/unk_debug_menu_3.o(.text); + src/debug/ereader_debug_menu.o(.text); src/field_effect_helpers.o(.text); src/contest_ai.o(.text); src/unused_81258BC.o(.text); @@ -646,7 +646,7 @@ SECTIONS { src/choose_party.o(.rodata); src/cable_car.o(.rodata); src/save.o(.rodata); - src/debug/unk_debug_menu_3.o(.rodata); + src/debug/ereader_debug_menu.o(.rodata); src/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); -- cgit v1.2.3 From 9b961c030b28170731844916dd03caf8d0bfce1b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 15:30:34 -0400 Subject: through debug_sub_808F648 --- 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 0bacb1d50..518267bb5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -560,6 +560,7 @@ SECTIONS { src/battle/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/debug/tomomichi_debug_menu.o(.rodata); + src/debug/nohara_debug_menu.o(.rodata); data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); data/debug_menu_taya.o(.rodata); -- cgit v1.2.3 From 4987b746365ec09af10bc2a1ce11dbffaa284b50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 20:04:51 -0400 Subject: Remainder of nohara --- ld_script.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 518267bb5..33fdee0eb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -116,7 +116,6 @@ SECTIONS { src/cable_club.o(.text); src/debug/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); - asm/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); asm/taya_debug_window.o(.text); src/debug/taya_debug_window.o(.text); @@ -561,7 +560,6 @@ SECTIONS { src/cable_club.o(.rodata); src/debug/tomomichi_debug_menu.o(.rodata); src/debug/nohara_debug_menu.o(.rodata); - data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); data/debug_menu_taya.o(.rodata); src/trainer_see.o(.rodata); -- cgit v1.2.3 From b9222b359ff6e848888cc779720bd15c45a82a37 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 11 Apr 2018 18:06:56 -0400 Subject: Basically all of taya in one commit. Aren't I grand? --- 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 33fdee0eb..2c861fdb7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -117,7 +117,6 @@ SECTIONS { src/debug/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); - asm/taya_debug_window.o(.text); src/debug/taya_debug_window.o(.text); src/trainer_see.o(.text); src/wild_encounter.o(.text); @@ -561,7 +560,7 @@ SECTIONS { src/debug/tomomichi_debug_menu.o(.rodata); src/debug/nohara_debug_menu.o(.rodata); src/debug/mori_debug_menu.o(.rodata); - data/debug_menu_taya.o(.rodata); + src/debug/taya_debug_window.o(.rodata); src/trainer_see.o(.rodata); src/wild_encounter.o(.rodata); src/field_effect.o(.rodata); -- cgit v1.2.3 From 95bf34a6d4af0eca83d9ca3bf7e9a898e00429c8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 12 Apr 2018 08:37:45 -0400 Subject: debug_80C35DC --- 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 2c861fdb7..e45408439 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -587,6 +587,7 @@ SECTIONS { src/shop.o(.rodata); src/fldeff_escalator.o(.rodata); src/berry.o(.rodata); + src/debug/watanabe_debug_menu.o(.rodata); data/debug_menu_watanabe.o(.rodata); src/script_menu.o(.rodata); src/naming_screen.o(.rodata); -- cgit v1.2.3 From d86e8008b34c9fffad032cb3b212399f79bfbcd3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 16 Apr 2018 23:20:01 -0400 Subject: through debug_80C4F48 --- 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 e45408439..df91d85cc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -589,6 +589,7 @@ SECTIONS { src/berry.o(.rodata); src/debug/watanabe_debug_menu.o(.rodata); data/debug_menu_watanabe.o(.rodata); + src/debug/watanabe_debug_menu.o(.data); src/script_menu.o(.rodata); src/naming_screen.o(.rodata); src/money.o(.rodata); -- cgit v1.2.3 From e0e2f0218d5d558a375ae972ab8b5eb225784051 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 18 Apr 2018 22:02:34 -0400 Subject: move gBattleMoves to c --- 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 2c861fdb7..b4d764a09 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -499,7 +499,7 @@ SECTIONS { data/battle_7.o(.rodata); src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); - data/battle_moves.o(.rodata); + src/data/battle_moves.o(.rodata); src/battle/battle_util.o(.rodata); src/pokemon_1.o(.rodata); src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */ -- cgit v1.2.3 From 936981f6698cd489c91c1dd419a6dbaa6179eaef Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 21 Apr 2018 14:09:13 -0400 Subject: Remaining functions in watanabe --- 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 df91d85cc..2497e1d91 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -152,7 +152,6 @@ SECTIONS { src/fldeff_escalator.o(.text); src/berry.o(.text); src/debug/watanabe_debug_menu.o(.text); - asm/watanabe_debug_menu.o(.text); src/script_menu.o(.text); src/naming_screen.o(.text); src/money.o(.text); -- cgit v1.2.3 From 557248ffc9a2c7fd65f8282172a76f1e65602611 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 21 Apr 2018 15:07:26 -0400 Subject: Decompile watanabe 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 2497e1d91..0655384af 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -587,7 +587,6 @@ SECTIONS { src/fldeff_escalator.o(.rodata); src/berry.o(.rodata); src/debug/watanabe_debug_menu.o(.rodata); - data/debug_menu_watanabe.o(.rodata); src/debug/watanabe_debug_menu.o(.data); src/script_menu.o(.rodata); src/naming_screen.o(.rodata); -- cgit v1.2.3 From 23dabccb292749aeee7ac7e7adb943dc6d8c979b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Apr 2018 17:29:45 -0400 Subject: PC Screen Effect data --- 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 219dd51ed..e7572c8fc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -600,7 +600,7 @@ SECTIONS { data/contest_link_80C2020.o(.rodata); src/pokemon_size_record.o(.rodata); src/pc_screen_effect.o(.rodata); - data/pc_screen_effect.o(.rodata); + src/pc_screen_effect.o(.data); src/fldeff_secretpower.o(.rodata); src/fldeff_decoration.o(.rodata); src/fldeff_recordmixing.o(.rodata); -- cgit v1.2.3 From b9e256c05071021e138bb4de2ad014beb73fc2af Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 22 Apr 2018 18:29:34 -0400 Subject: Decompile remaining pc_screen_effect functions --- 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 e7572c8fc..d3f41018a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -165,7 +165,6 @@ SECTIONS { src/field_poison.o(.text); src/pokemon_size_record.o(.text); src/pc_screen_effect.o(.text); - asm/pc_screen_effect.o(.text); src/fldeff_secretpower.o(.text); src/fldeff_secret_base_pc.o(.text); src/fldeff_decoration.o(.text); -- cgit v1.2.3 From 4e9d76d3052db037bd92870eb6a7e086a566065f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Apr 2018 08:43:45 -0400 Subject: through CB2_UnusedPokedexAreaScreen --- 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 d3f41018a..382feba7c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -340,6 +340,7 @@ SECTIONS { src/hof_pc.o(.text); src/field_specials.o(.text); src/battle/battle_records.o(.text); + src/pokedex_area_screen.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); src/roulette.o(.text); -- cgit v1.2.3 From 33bb43db0de5d7d60ab8eff6db0ac305d403474f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Apr 2018 23:00:25 -0400 Subject: Decompile some data objects --- 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 382feba7c..047638fd7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -633,6 +633,7 @@ SECTIONS { src/time_events.o(.rodata); src/field_specials.o(.rodata); src/battle/battle_records.o(.rodata); + src/pokedex_area_screen.o(.rodata); data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); -- cgit v1.2.3 From bedf072c371990c991203d7ffca6e4c0941a891f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Apr 2018 08:21:39 -0400 Subject: Finish decompilation of pokedex_area_screen --- ld_script.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 047638fd7..0b3622a1b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -341,7 +341,6 @@ SECTIONS { src/field_specials.o(.text); src/battle/battle_records.o(.text); src/pokedex_area_screen.o(.text); - asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); src/roulette.o(.text); asm/pokedex_cry_screen.o(.text); @@ -634,7 +633,6 @@ SECTIONS { src/field_specials.o(.rodata); src/battle/battle_records.o(.rodata); src/pokedex_area_screen.o(.rodata); - data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); data/pokedex_cry_screen.o(.rodata); -- cgit v1.2.3 From ca09158b73ba10b566db1f815ea2d826fc0f9024 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 25 Apr 2018 15:11:44 -0400 Subject: Decompile remaining easy chat data --- 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 d3f41018a..957dc76fb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -611,7 +611,7 @@ SECTIONS { src/bike.o(.rodata); src/easy_chat_1.o(.rodata); src/easy_chat_2.o(.rodata); - data/easy_chat.o(.rodata); + src/easy_chat_2.o(.data); data/pokenav.o(.rodata); src/mon_markings.o(.rodata); src/mauville_man.o(.rodata); -- cgit v1.2.3 From 21415be0d3bcd5edffbd83777660af319a01e51b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 26 Apr 2018 19:49:36 -0400 Subject: Fix the swiss cheese in pokedex_cry_screen --- 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 688682a34..d7e2a5820 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -345,7 +345,6 @@ SECTIONS { src/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/pokedex_cry_screen.o(.text); - asm/pokedex_cry_screen.o(.text_811A4F8); src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); -- cgit v1.2.3 From 051a6b380164f85c863dcf460f2a296ed5930775 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 25 Apr 2018 20:22:55 -0700 Subject: Start decompiling current.s --- 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 688682a34..8628f5331 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -293,6 +293,7 @@ SECTIONS { src/battle/anim/thunder.o(.text); src/battle/anim/beta_beat_up.o(.text); src/battle/anim/shock.o(.text); + src/battle/anim/current.o(.text); asm/current.o(.text); asm/ice.o(.text); src/battle/anim/fight.o(.text); -- cgit v1.2.3 From aa111f33373e0481df975e6e8298dbec9ececc3f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 27 Apr 2018 18:38:42 -0700 Subject: Finish decompiling current.s --- 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 8628f5331..a0c9a8bb7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -294,7 +294,6 @@ SECTIONS { src/battle/anim/beta_beat_up.o(.text); src/battle/anim/shock.o(.text); src/battle/anim/current.o(.text); - asm/current.o(.text); asm/ice.o(.text); src/battle/anim/fight.o(.text); src/battle/anim/poison.o(.text); -- cgit v1.2.3 From 4f66d1b7f2630aa1b805ac8e848ebae38faaacd3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 28 Apr 2018 14:09:33 -0400 Subject: through sub_811A15C (two nonmatching) --- 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 d7e2a5820..872386a69 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -343,8 +343,9 @@ SECTIONS { src/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); src/roulette.o(.text); - asm/pokedex_cry_screen.o(.text); src/pokedex_cry_screen.o(.text); + asm/pokedex_cry_screen.o(.text); + src/pokedex_cry_screen.o(.text.ShowPokedexCryScreen); src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); -- cgit v1.2.3 From bceafd3a21512167deb76fb46c3f5c4499361409 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 28 Apr 2018 12:07:43 -0700 Subject: Start moving .rodata into src/battle/anim files --- ld_script.txt | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index a0c9a8bb7..86829f0b5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -181,7 +181,6 @@ SECTIONS { src/battle/anim/seed.o(.text); src/battle/anim/orbit.o(.text); src/battle/anim/leaf.o(.text); - src/battle/anim/cutter.o(.text); src/battle/anim/tendrils.o(.text); src/battle/anim/silhouette.o(.text); src/battle/anim/copy_orb.o(.text); @@ -606,6 +605,25 @@ SECTIONS { src/field_special_scene.o(.rodata); src/rotating_gate.o(.rodata); src/item_use.o(.rodata); + src/battle/anim/powder.o(.rodata); + src/battle/anim/orbs.o(.rodata); + src/battle/anim/seed.o(.rodata); + src/battle/anim/orbit.o(.rodata); + src/battle/anim/leaf.o(.rodata); + src/battle/anim/tendrils.o(.rodata); + src/battle/anim/copy_orb.o(.rodata); + src/battle/anim/roots.o(.rodata); + src/battle/anim/osmose.o(.rodata); + src/battle/anim/hop.o(.rodata); + src/battle/anim/heal.o(.rodata); + src/battle/anim/hop_2.o(.rodata); + src/battle/anim/switch.o(.rodata); + src/battle/anim/flying_path.o(.rodata); + src/battle/anim/flying_petals.o(.rodata); + src/battle/anim/shimmer.o(.rodata); + src/battle/anim/homing.o(.rodata); + src/battle/anim/whip.o(.rodata); + src/battle/anim/unused_1.o(.rodata); data/battle_anim_80CA710.o(.rodata); src/battle/anim/battle_intro.o(.rodata); src/bike.o(.rodata); -- cgit v1.2.3 From e79f35324a846fa99be5f2a6e368c6fddf34d8a1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 28 Apr 2018 21:18:01 -0400 Subject: Finish decompilation of pokedex_cry_screen.o(.text) --- ld_script.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 872386a69..ebca15811 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -344,8 +344,6 @@ SECTIONS { src/evolution_scene.o(.text); src/roulette.o(.text); src/pokedex_cry_screen.o(.text); - asm/pokedex_cry_screen.o(.text); - src/pokedex_cry_screen.o(.text.ShowPokedexCryScreen); src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); -- cgit v1.2.3 From db5067c512a33ef913bb3e2d4cbef589d32a48a6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 28 Apr 2018 19:11:47 -0700 Subject: Move more .rodata into battle anim files --- ld_script.txt | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 86829f0b5..7295d8063 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -204,14 +204,11 @@ SECTIONS { src/battle/anim/unused_3.o(.text); src/battle/anim/sleep.o(.text); src/battle/anim/scan.o(.text); - src/battle/anim/lunge_1.o(.text); - src/battle/anim/unused_4.o(.text); - src/battle/anim/lunge_2.o(.text); + src/battle/anim/lunge.o(.text); src/battle/anim/slash.o(.text); src/battle/anim/brace.o(.text); src/battle/anim/cube.o(.text); - src/battle/anim/tile_in.o(.text); - src/battle/anim/tile_out.o(.text); + src/battle/anim/tile.o(.text); src/battle/anim/moon.o(.text); src/battle/anim/twinkle.o(.text); src/battle/anim/flash.o(.text); @@ -624,6 +621,23 @@ SECTIONS { src/battle/anim/homing.o(.rodata); src/battle/anim/whip.o(.rodata); src/battle/anim/unused_1.o(.rodata); + src/battle/anim/slice.o(.rodata); + src/battle/anim/unused_2.o(.rodata); + src/battle/anim/shield.o(.rodata); + src/battle/anim/bottle.o(.rodata); + src/battle/anim/glitter.o(.rodata); + src/battle/anim/unused_3.o(.rodata); + src/battle/anim/sleep.o(.rodata); + src/battle/anim/scan.o(.rodata); + src/battle/anim/lunge.o(.rodata); + src/battle/anim/slash.o(.rodata); + src/battle/anim/brace.o(.rodata); + src/battle/anim/cube.o(.rodata); + src/battle/anim/tile.o(.rodata); + src/battle/anim/moon.o(.rodata); + src/battle/anim/twinkle.o(.rodata); + src/battle/anim/strike.o(.rodata); + src/battle/anim/fang.o(.rodata); data/battle_anim_80CA710.o(.rodata); src/battle/anim/battle_intro.o(.rodata); src/bike.o(.rodata); -- cgit v1.2.3 From 63d3135bde32ed110ddf7624ea4dc8a76b20523b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 29 Apr 2018 10:42:47 -0400 Subject: Decompile pokedex_cry_screen data --- 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 ebca15811..35b15d44f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -633,7 +633,8 @@ SECTIONS { src/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); - data/pokedex_cry_screen.o(.rodata); + src/pokedex_cry_screen.o(.rodata); + src/pokedex_cry_screen.o(.data); src/landmark.o(.rodata); src/battle/battle_transition.o(.rodata); src/battle/battle_controller_linkpartner.o(.rodata); -- cgit v1.2.3 From c88cf196af0f099f4daa7cbc06b9b0df9a31c60c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 29 Apr 2018 12:52:21 -0700 Subject: Move another chunk of battle anim .rodata --- ld_script.txt | 64 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 14 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 7295d8063..57512c53d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -215,14 +215,9 @@ SECTIONS { src/battle/anim/strike.o(.text); src/battle/anim/evasion.o(.text); src/battle/anim/fang.o(.text); - src/battle/anim/note_wave.o(.text); - src/battle/anim/note_scatter.o(.text); - src/battle/anim/drum.o(.text); - src/battle/anim/note_scatter_2.o(.text); + src/battle/anim/musical.o(.text); src/battle/anim/thought.o(.text); - src/battle/anim/wave_finger.o(.text); - src/battle/anim/spin_finger.o(.text); - src/battle/anim/taunt_finger.o(.text); + src/battle/anim/finger.o(.text); src/battle/anim/unused_5.o(.text); src/battle/anim/unused_6.o(.text); src/battle/anim/unused_7.o(.text); @@ -231,7 +226,6 @@ SECTIONS { src/battle/anim/alert.o(.text); src/battle/anim/sword.o(.text); src/battle/anim/sonic.o(.text); - src/battle/anim/sonic_task.o(.text); src/battle/anim/unused_9.o(.text); src/battle/anim/money.o(.text); src/battle/anim/bullet.o(.text); @@ -247,11 +241,8 @@ SECTIONS { src/battle/anim/thrashing.o(.text); src/battle/anim/draw.o(.text); src/battle/anim/ring.o(.text); - src/battle/anim/egg.o(.text); src/battle/anim/espeed.o(.text); - src/battle/anim/smoke.o(.text); - src/battle/anim/glow.o(.text); - src/battle/anim/note_rain.o(.text); + src/battle/anim/heal_bell.o(.text); src/battle/anim/heart_1.o(.text); src/battle/anim/curtain.o(.text); src/battle/anim/startle.o(.text); @@ -260,8 +251,7 @@ SECTIONS { src/battle/anim/flying_hearts.o(.text); src/battle/anim/love_bg.o(.text); src/battle/anim/scary_face.o(.text); - src/battle/anim/orbit_fast.o(.text); - src/battle/anim/orbit_scatter.o(.text); + src/battle/anim/hidden_power_orbit.o(.text); src/battle/anim/spit.o(.text); src/battle/anim/perceive.o(.text); src/battle/anim/angel.o(.text); @@ -638,6 +628,52 @@ SECTIONS { src/battle/anim/twinkle.o(.rodata); src/battle/anim/strike.o(.rodata); src/battle/anim/fang.o(.rodata); + src/battle/anim/musical.o(.rodata); + src/battle/anim/thought.o(.rodata); + src/battle/anim/finger.o(.rodata); + src/battle/anim/unused_5.o(.rodata); + src/battle/anim/unused_6.o(.rodata); + src/battle/anim/unused_7.o(.rodata); + src/battle/anim/unused_8.o(.rodata); + src/battle/anim/alert.o(.rodata); + src/battle/anim/sword.o(.rodata); + src/battle/anim/sonic.o(.rodata); + src/battle/anim/egg.o(.rodata); + src/battle/anim/unused_9.o(.rodata); + src/battle/anim/money.o(.rodata); + src/battle/anim/bullet.o(.rodata); + src/battle/anim/cyclone.o(.rodata); + src/battle/anim/grip.o(.rodata); + src/battle/anim/guillotine.o(.rodata); + src/battle/anim/splash.o(.rodata); + src/battle/anim/grow.o(.rodata); + src/battle/anim/breath.o(.rodata); + src/battle/anim/anger.o(.rodata); + src/battle/anim/thrashing.o(.rodata); + src/battle/anim/draw.o(.rodata); + src/battle/anim/ring.o(.rodata); + src/battle/anim/espeed.o(.rodata); + src/battle/anim/heal_bell.o(.rodata); + src/battle/anim/heart_1.o(.rodata); + src/battle/anim/startle.o(.rodata); + src/battle/anim/blow_kiss.o(.rodata); + src/battle/anim/kiss_fountain.o(.rodata); + src/battle/anim/flying_hearts.o(.rodata); + src/battle/anim/hidden_power_orbit.o(.rodata); + src/battle/anim/spit.o(.rodata); + src/battle/anim/perceive.o(.rodata); + src/battle/anim/angel.o(.rodata); + src/battle/anim/angel_kiss.o(.rodata); + src/battle/anim/devil.o(.rodata); + src/battle/anim/swipe.o(.rodata); + src/battle/anim/struggle.o(.rodata); + src/battle/anim/uproar.o(.rodata); + src/battle/anim/noise.o(.rodata); + src/battle/anim/note_spin.o(.rodata); + src/battle/anim/guard.o(.rodata); + src/battle/anim/rain.o(.rodata); + src/battle/anim/bubble.o(.rodata); + src/battle/anim/aurora.o(.rodata); data/battle_anim_80CA710.o(.rodata); src/battle/anim/battle_intro.o(.rodata); src/bike.o(.rodata); -- cgit v1.2.3 From d68e8b09eecd136fc0dcc32c1e08b946b8981adc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 30 Apr 2018 10:46:34 -0700 Subject: Finish moving battle anim .rodata into .c files --- ld_script.txt | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 57512c53d..22895c297 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -273,24 +273,28 @@ SECTIONS { src/battle/anim/fire.o(.text); src/battle/anim/sunlight.o(.text); src/battle/anim/fire_2.o(.text); - src/battle/anim/heated_rock.o(.text); src/battle/anim/wisp_orb.o(.text); src/battle/anim/wisp_fire.o(.text); src/battle/anim/thunder.o(.text); src/battle/anim/beta_beat_up.o(.text); src/battle/anim/shock.o(.text); src/battle/anim/current.o(.text); + src/battle/anim/ice.o(.text); asm/ice.o(.text); src/battle/anim/fight.o(.text); src/battle/anim/poison.o(.text); + src/battle/anim/flying.o(.text); asm/flying.o(.text); src/battle/anim/psychic.o(.text); src/battle/anim/bug.o(.text); src/battle/anim/rock.o(.text); + src/battle/anim/ghost.o(.text); asm/ghost.o(.text); src/battle/anim/dragon.o(.text); src/battle/anim/dark.o(.text); + src/battle/anim/ground.o(.text); asm/ground.o(.text); + src/battle/anim/normal.o(.text); asm/normal.o(.text); src/battle/anim/battle_intro.o(.text); src/bike.o(.text); @@ -674,7 +678,29 @@ SECTIONS { src/battle/anim/rain.o(.rodata); src/battle/anim/bubble.o(.rodata); src/battle/anim/aurora.o(.rodata); - data/battle_anim_80CA710.o(.rodata); + src/battle/anim/energy_wave.o(.rodata); + src/battle/anim/water.o(.rodata); + src/battle/anim/fire.o(.rodata); + src/battle/anim/sunlight.o(.rodata); + src/battle/anim/fire_2.o(.rodata); + src/battle/anim/wisp_orb.o(.rodata); + src/battle/anim/wisp_fire.o(.rodata); + src/battle/anim/thunder.o(.rodata); + src/battle/anim/beta_beat_up.o(.rodata); + src/battle/anim/shock.o(.rodata); + src/battle/anim/current.o(.rodata); + src/battle/anim/ice.o(.rodata); + src/battle/anim/fight.o(.rodata); + src/battle/anim/poison.o(.rodata); + src/battle/anim/flying.o(.rodata); + src/battle/anim/psychic.o(.rodata); + src/battle/anim/bug.o(.rodata); + src/battle/anim/rock.o(.rodata); + src/battle/anim/ghost.o(.rodata); + src/battle/anim/dragon.o(.rodata); + src/battle/anim/dark.o(.rodata); + src/battle/anim/ground.o(.rodata); + src/battle/anim/normal.o(.rodata); src/battle/anim/battle_intro.o(.rodata); src/bike.o(.rodata); src/easy_chat_1.o(.rodata); -- cgit v1.2.3 From e2ea3d44cad21c699e9958586d3282c5e66ecfe1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 5 May 2018 19:03:19 -0700 Subject: Start decompiling battle_anim_812C144 --- 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 52f66c537..869e61e5b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -354,6 +354,7 @@ SECTIONS { src/battle/anim/sfx.o(.text); src/battle/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); + src/battle/battle_anim_812C144.o(.text); asm/battle_anim_812C144.o(.text); src/learn_move.o(.text); src/fldeff_softboiled.o(.text); -- cgit v1.2.3 From 97a933ceeaa1f360eea4322b8e8b47b200ad0fe2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 26 May 2018 19:06:26 -0500 Subject: Update Makefile and installation instructions for devkitpro r48 --- ld_script.txt | 104 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'ld_script.txt') diff --git a/ld_script.txt b/ld_script.txt index 869e61e5b..a9314d060 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -27,7 +27,7 @@ SECTIONS { /* COMMON starts at 0x3001760 */ INCLUDE "sym_common.ld" - tools/agbcc/lib/libc.a:sbrkr.o(COMMON); + *libc.a:sbrkr.o(COMMON); end = .; . = 0x8000; } @@ -414,54 +414,54 @@ SECTIONS { src/libs/agb_flash_mx.o(.text); src/libs/siirtc.o(.text); src/libs/libagbsyscall.o(.text); - tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text); - tools/agbcc/lib/libgcc.a:_divsi3.o(.text); - tools/agbcc/lib/libgcc.a:_dvmd_tls.o(.text); - tools/agbcc/lib/libgcc.a:_fixunsdfsi.o(.text); - tools/agbcc/lib/libgcc.a:_fixunssfsi.o(.text); - tools/agbcc/lib/libgcc.a:_modsi3.o(.text); - tools/agbcc/lib/libgcc.a:_muldi3.o(.text); - tools/agbcc/lib/libgcc.a:_udivdi3.o(.text); - tools/agbcc/lib/libgcc.a:_udivsi3.o(.text); - tools/agbcc/lib/libgcc.a:_umodsi3.o(.text); - tools/agbcc/lib/libgcc.a:dp-bit.o(.text); - tools/agbcc/lib/libgcc.a:fp-bit.o(.text); - tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text); - tools/agbcc/lib/libgcc.a:_negdi2.o(.text); - tools/agbcc/lib/libc.a:memcpy.o(.text); - tools/agbcc/lib/libc.a:memset.o(.text); - tools/agbcc/lib/libc.a:strcmp.o(.text); - tools/agbcc/lib/libc.a:vfprintf.o(.text); - tools/agbcc/lib/libc.a:vsprintf.o(.text); - tools/agbcc/lib/libc.a:fvwrite.o(.text); - tools/agbcc/lib/libc.a:locale.o(.text); - tools/agbcc/lib/libc.a:findfp.o(.text); - tools/agbcc/lib/libc.a:fflush.o(.text); - tools/agbcc/lib/libc.a:wsetup.o(.text); - tools/agbcc/lib/libc.a:mbtowc_r.o(.text); - tools/agbcc/lib/libc.a:s_isinf.o(.text); - tools/agbcc/lib/libc.a:s_isnan.o(.text); - tools/agbcc/lib/libc.a:memchr.o(.text); - tools/agbcc/lib/libc.a:strlen.o(.text); - tools/agbcc/lib/libc.a:dtoa.o(.text); - tools/agbcc/lib/libc.a:memmove.o(.text); - tools/agbcc/lib/libc.a:stdio.o(.text); - tools/agbcc/lib/libc.a:mprec.o(.text); - tools/agbcc/lib/libc.a:mallocr.o(.text); - tools/agbcc/lib/libc.a:fwalk.o(.text); - tools/agbcc/lib/libc.a:freer.o(.text); - tools/agbcc/lib/libc.a:makebuf.o(.text); - tools/agbcc/lib/libc.a:readr.o(.text); - tools/agbcc/lib/libc.a:writer.o(.text); - tools/agbcc/lib/libc.a:lseekr.o(.text); - tools/agbcc/lib/libc.a:closer.o(.text); - tools/agbcc/lib/libc.a:callocr.o(.text); - tools/agbcc/lib/libc.a:sbrkr.o(.text); - tools/agbcc/lib/libc.a:mlock.o(.text); - tools/agbcc/lib/libc.a:fstatr.o(.text); - tools/agbcc/lib/libc.a:libcfunc.o(.text); - tools/agbcc/lib/libc.a:syscalls.o(.text); - tools/agbcc/lib/libc.a:errno.o(.text); + *libgcc.a:_call_via_rX.o(.text); + *libgcc.a:_divsi3.o(.text); + *libgcc.a:_dvmd_tls.o(.text); + *libgcc.a:_fixunsdfsi.o(.text); + *libgcc.a:_fixunssfsi.o(.text); + *libgcc.a:_modsi3.o(.text); + *libgcc.a:_muldi3.o(.text); + *libgcc.a:_udivdi3.o(.text); + *libgcc.a:_udivsi3.o(.text); + *libgcc.a:_umodsi3.o(.text); + *libgcc.a:dp-bit.o(.text); + *libgcc.a:fp-bit.o(.text); + *libgcc.a:_lshrdi3.o(.text); + *libgcc.a:_negdi2.o(.text); + *libc.a:memcpy.o(.text); + *libc.a:memset.o(.text); + *libc.a:strcmp.o(.text); + *libc.a:vfprintf.o(.text); + *libc.a:vsprintf.o(.text); + *libc.a:fvwrite.o(.text); + *libc.a:locale.o(.text); + *libc.a:findfp.o(.text); + *libc.a:fflush.o(.text); + *libc.a:wsetup.o(.text); + *libc.a:mbtowc_r.o(.text); + *libc.a:s_isinf.o(.text); + *libc.a:s_isnan.o(.text); + *libc.a:memchr.o(.text); + *libc.a:strlen.o(.text); + *libc.a:dtoa.o(.text); + *libc.a:memmove.o(.text); + *libc.a:stdio.o(.text); + *libc.a:mprec.o(.text); + *libc.a:mallocr.o(.text); + *libc.a:fwalk.o(.text); + *libc.a:freer.o(.text); + *libc.a:makebuf.o(.text); + *libc.a:readr.o(.text); + *libc.a:writer.o(.text); + *libc.a:lseekr.o(.text); + *libc.a:closer.o(.text); + *libc.a:callocr.o(.text); + *libc.a:sbrkr.o(.text); + *libc.a:mlock.o(.text); + *libc.a:fstatr.o(.text); + *libc.a:libcfunc.o(.text); + *libc.a:syscalls.o(.text); + *libc.a:errno.o(.text); src/libs/libisagbprn.o(.text); } =0 @@ -1203,9 +1203,9 @@ SECTIONS { src/libs/agb_flash_mx.o(.rodata); src/libs/agb_flash_le.o(.rodata); src/libs/siirtc.o(.rodata); - tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata); - tools/agbcc/lib/libc.a(.rodata); - tools/agbcc/lib/libc.a(.data); + *libgcc.a:_udivdi3.o(.rodata); + *libc.a(.rodata); + *libc.a(.data); src/libs/libisagbprn.o(.rodata); } =0 -- cgit v1.2.3 From 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 May 2018 17:53:42 -0500 Subject: Unify 'map object' and 'field object' terms into 'event object' --- 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 a9314d060..f8cc8abf9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,7 +85,7 @@ SECTIONS { src/field_player_avatar.o(.text); src/event_object_movement.o(.text); src/field_message_box.o(.text); - src/map_obj_lock.o(.text); + src/event_obj_lock.o(.text); src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); -- cgit v1.2.3 From 2e80477ea11c265e69658b852c57097fd8a21492 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 10 Jun 2018 11:01:29 -0500 Subject: Label move_tutor_menu.c --- 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 f8cc8abf9..dbecbe3f1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -356,7 +356,7 @@ SECTIONS { src/fldeff_sweetscent.o(.text); src/battle/battle_anim_812C144.o(.text); asm/battle_anim_812C144.o(.text); - src/learn_move.o(.text); + src/move_tutor_menu.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); @@ -742,7 +742,7 @@ SECTIONS { src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); data/battle_anim_812C144.o(.rodata); - src/learn_move.o(.rodata); + src/move_tutor_menu.o(.rodata); src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); src/battle_tower.o(.rodata); -- cgit v1.2.3