Fix useless selection to deploy Merlinus before chapter begin caused …

…by isStorageAvailableInPrepScreen().
laqieer · Aug 20, 2022 · 896baca · 896baca
1 parent 7325dea
commit 896baca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/linkerscript/storage.lds b/linkerscript/storage.lds
@@ -1,5 +1,5 @@
-. = 0x808f834;
-.text.isStorageAvailableInPrepScreen : {*(.text.isStorageAvailableInPrepScreen)}
+. = 0x808f863;
+.rodata.unlockStorageInPrepScreen : {*(.rodata.unlockStorageInPrepScreen)}
 . = 0x8023198;
 .text.isStorageAvailableInActionMenu : {*(.text.isStorageAvailableInActionMenu)}
 . = 0x802ece4;

diff --git a/source/storage.c b/source/storage.c
@@ -1,10 +1,11 @@
 #include <tonc.h>
 
 // Always allow storage to be accessed in prep screen
-int isStorageAvailableInPrepScreen()
-{
- return TRUE;
-}
+// 00 29: cmp r1, #0
+// 03 D1: bne ...
+// -> 03 E0: beq ...
+cu8 unlockStorageInPrepScreen = 0xE0;
+
 // Always allow storage to be accessed in action menu
 int isStorageAvailableInActionMenu()
 {