diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-17 11:06:59 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-17 11:06:59 -0500 |
| commit | b786145272491ea33924ffc0526b268a9b102619 (patch) | |
| tree | 44873a5ffa58b0ee53bc5dcf17a73ccaf57d89fa | |
| parent | afbaa190a2caaad1e193f2570da05d55fca14d04 (diff) | |
Address review comments
| -rw-r--r-- | data/save_failed_screen.s | 7 | ||||
| -rw-r--r-- | src/save_failed_screen.c | 2 | ||||
| -rw-r--r-- | sym_ewram.txt | 13 |
3 files changed, 5 insertions, 17 deletions
diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s deleted file mode 100644 index 7b0827b6c..000000000 --- a/data/save_failed_screen.s +++ /dev/null @@ -1,7 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 4065bccef..b6cce890a 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -182,7 +182,7 @@ static bool16 VerifySectorWipe(u32 sector) u16 i; u32 *saveDataBuffer = (void *)&gSaveDataBuffer; ReadFlash(sector0, 0, saveDataBuffer, 0x1000); - for (i = 0; i < 0x1000 / 4; i++, saveDataBuffer++) + for (i = 0; i < 0x1000 / sizeof(u32); i++, saveDataBuffer++) { if (*saveDataBuffer != 0) return TRUE; diff --git a/sym_ewram.txt b/sym_ewram.txt index 74d051544..188ccd3aa 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -16,7 +16,6 @@ .align 2 .include "src/link.o" .space 8 - .align 2 .include "src/battle_controllers.o" .align 2 @@ -144,6 +143,7 @@ gUnknown_20386A4: @ 20386A4 gUnknown_20386A8: @ 20386A8 .space 0x4 + .align 2 .include "src/battle_setup.o" .align 2 .include "src/wild_encounter.o" @@ -154,7 +154,6 @@ gFieldEffectArguments: @ 20386E0 .align 2 .include "src/scanline_effect.o" - .align 2 .include "src/option_menu.o" .align 2 @@ -454,6 +453,7 @@ gUnknown_203B0E8: @ 203B0E8 .include "src/oak_speech.o" .align 2 .include "src/tm_case.o" + .align 2 .include "src/menu_indicators.o" gUnknown_203B140: @ 203B140 @@ -500,13 +500,8 @@ gUnknown_203B170: @ 203B170 .include "src/berry_pouch.o" .align 2 .include "src/slot_machine.o" - -sLocationHistory: @ 203F3A8 - .space 0x6 - -sRoamerLocation: @ 203F3AE - .space 0x2 - + .align 2 + .include "src/roamer.o" .align 2 .include "src/mystery_gift_menu.o" .align 2 |