summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-23 17:03:59 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-23 17:03:59 -0600
commitf2885be7da921ef0a5058b2b36d4473481db1022 (patch)
tree39c92de1fe9228858205b980de4ce9f47d7b3677
parente03633d6bc1e1cd155bc258edbb7783020b4bdb7 (diff)
remove some unnecessary DEBUG conditionals in symbol files
-rw-r--r--src/scene/berry_blender.c2
-rw-r--r--sym_bss.txt10
-rw-r--r--sym_ewram.txt6
3 files changed, 1 insertions, 17 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 5b013e8de..0799531cd 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -3763,7 +3763,7 @@ loc_805654C:\n\
.syntax divided\n");
}
#else
-static bool8 Blender_PrintBlendingResults(void)
+bool8 Blender_PrintBlendingResults(void)
{
u16 i;
diff --git a/sym_bss.txt b/sym_bss.txt
index 947adcce8..7f0aa80f6 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -15,21 +15,15 @@
. = ALIGN(4); src/engine/text_window.o(.bss);
. = ALIGN(4); src/engine/script.o(.bss);
. = ALIGN(4); src/field/start_menu.o(.bss);
-#if DEBUG
. = ALIGN(4); src/debug/start_menu_debug.o(.bss);
-#endif
. = ALIGN(4); src/engine/menu.o(.bss);
. = ALIGN(4); src/engine/tileset_anim.o(.bss);
. = ALIGN(4); src/engine/sound.o(.bss);
. = ALIGN(4); src/field/field_weather.o(.bss);
-#if DEBUG
. = ALIGN(4); src/debug/tomomichi_debug_menu.o(.bss);
. = ALIGN(4); src/debug/nohara_debug_menu.o(.bss);
-#endif
. = ALIGN(4); src/field/field_effect.o(.bss);
-#if DEBUG
. = ALIGN(4); src/engine/trainer_card.o(.bss);
-#endif
. = ALIGN(4); src/field/item_menu.o(.bss);
#if DEBUG
unk_debug_bss_3 = .;
@@ -44,17 +38,13 @@ unk_debug_bss_3 = .;
. = ALIGN(4); src/field/mauville_man.o(.bss);
. = ALIGN(4); src/pokemon/mail.o(.bss);
. = ALIGN(4); src/field/menu_helpers.o(.bss);
-#if DEBUG
. = ALIGN(4); src/field/slot_machine.o(.bss);
-#endif
. = ALIGN(4); src/scene/contest_painting.o(.bss);
. = ALIGN(4); src/field/pokeblock.o(.bss);
. = ALIGN(4); src/field/field_specials.o(.bss);
. = ALIGN(4); src/pokemon/learn_move.o(.bss);
. = ALIGN(4); src/field/player_pc.o(.bss);
-#if DEBUG
. = ALIGN(4); src/debug/nakamura_debug_menu.o(.bss);
-#endif
. = ALIGN(4); src/libs/m4a_1.o(.bss);
. = ALIGN(4); src/libs/agb_flash.o(.bss);
. = ALIGN(4); src/libs/siirtc.o(.bss);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8e2d8a230..5375968d4 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -423,9 +423,7 @@ gUnknown_020384EC = .; /* 20384EC */
. = ALIGN(4); src/contest.o(ewram_data);
. = ALIGN(4); src/field/shop.o(ewram_data);
. = ALIGN(4); src/field/fldeff_escalator.o(ewram_data);
-#if DEBUG
. = ALIGN(4); src/debug/watanabe_debug_menu.o(ewram_data);
-#endif
. = ALIGN(4); src/field/money.o(ewram_data);
. = ALIGN(4); src/engine/record_mixing.o(ewram_data);
. = ALIGN(4); src/debug/sound_check_menu.o(ewram_data);
@@ -476,9 +474,7 @@ gUnknown_02039268 = .; /* 2039268 */
gUnknown_0203926A = .; /* 203926A */
. += 0x2;
-#if DEBUG
. = ALIGN(4); src/roulette.o(ewram_data);
-#endif
. = ALIGN(4); src/battle/battle_message.o(ewram_data);
. = ALIGN(4); src/field/choose_party.o(ewram_data);
. = ALIGN(4); src/scene/cable_car.o(ewram_data);
@@ -495,9 +491,7 @@ gUnknown_0203926A = .; /* 203926A */
. = ALIGN(4); src/engine/mystery_event_menu.o(ewram_data);
. = ALIGN(4); src/engine/save_failed_screen.o(ewram_data);
. = ALIGN(4); src/pokemon/pokeblock_feed.o(ewram_data);
-#if DEBUG
. = ALIGN(4); src/debug/nakamura_debug_menu.o(ewram_data);
-#endif
. = ALIGN(4); src/scene/intro_credits_graphics.o(ewram_data);
/* ??? */