diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-24 17:49:10 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-24 18:50:44 -0500 |
| commit | cba70d36059d01175a0fcb77dde33eaab30df3c2 (patch) | |
| tree | 79446649a09bfab3222689f3111b98a68ff9fec3 | |
| parent | e76b56b000739b418f04d286764652b101bbd8a8 (diff) | |
Fix debug build
| -rw-r--r-- | src/pokemon_storage_system_4.c | 16 | ||||
| -rw-r--r-- | sym_ewram.txt | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 43aef277a..fff545492 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -26,7 +26,7 @@ struct WallpaperTable { EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; #if DEBUG -EWRAM_DATA u32 unk_2038790 = 0; +EWRAM_DATA u8 unk_2038790 = 0; EWRAM_DATA u32 unk_2038794 = 0; EWRAM_DATA u32 unk_2038798 = 0; #endif @@ -3167,15 +3167,13 @@ void sub_809CA8C(void) #if DEBUG u8 debug_sub_80AA40C(void) { - if (sub_809AB8C()) - { - sub_809CDCC(); - sub_809CDEC(32); - sub_809CDEC(6); - return 1; - } + if (!sub_809AB8C()) + return 0; - return 0; + sub_809CDCC(); + sub_809CDEC(32); + sub_809CDEC(6); + return 1; } #endif diff --git a/sym_ewram.txt b/sym_ewram.txt index de0d1b1aa..20a845653 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -339,7 +339,6 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/pokemon_storage_system_2.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_3.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_4.o(ewram_data); -. = ALIGN(4); src/pokemon_storage_system_5.o(ewram_data); . = ALIGN(4); src/pokemon_summary_screen.o(ewram_data); . = ALIGN(4); src/script_movement.o(ewram_data); . = ALIGN(4); src/map_name_popup.o(ewram_data); |