summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2021-05-12 20:48:51 -0400
committerPheenoh <pheenoh@gmail.com>2021-05-12 20:48:51 -0400
commitd205963aeff2732016c0d82066ce2aa43c39bb03 (patch)
treeb7475c355237816550f7bbc95c554ef29555fdc6
parent7dde1425ea8478aae64e1747d72d8702793568cd (diff)
parent75bfbe7915077ee9fe8502070dbff5195d74a271 (diff)
Merge remote-tracking branch 'upstream/master' into save_fix
-rwxr-xr-xexternal/misc/asm-inject.sh4
-rw-r--r--include/commands.h2
-rw-r--r--src/menus/tools_menu.cpp5
-rw-r--r--src/utils/card.cpp2
4 files changed, 7 insertions, 6 deletions
diff --git a/external/misc/asm-inject.sh b/external/misc/asm-inject.sh
index 7690d33..60784b9 100755
--- a/external/misc/asm-inject.sh
+++ b/external/misc/asm-inject.sh
@@ -41,7 +41,7 @@ elif [ $1 == "GCN_PAL" ]; then
DEBUG_INSTRUCTION="0x48000014"
elif [ $1 == "WII_NTSCU_10" ]; then
ARENALO="0x803449dc"
- ARENALO_VAL="0x3c608058"
+ ARENALO_VAL="0x3c608059"
MAIN="0x80008cec"
MAIN_TRAMPOLINE="0x803ce3dc"
FIRST_INSTRUCTION="0x542b06fe"
@@ -65,7 +65,7 @@ elif [ $1 == "WII_PAL" ]; then
SET_WATER_DROP_COLOR="0x800c3dd4"
DEBUG="0x80012084"
DEBUG_INSTRUCTION="0x48000190"
-else
+else
echo "Invalid region: $1"
exit 1
fi
diff --git a/include/commands.h b/include/commands.h
index ded9a43..0cf65fb 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -23,7 +23,6 @@
#define FREE_CAM_TEXT "Z+B+A"
#define MOVE_LINK_TEXT "L+R+Y"
#define FRAME_ADVANCE_TEXT "L+R+X"
-#define LOAD_TIMER_TEXT "Z+B"
#endif
#ifdef WII_PLATFORM
#define COMMANDS_AMNT 10
@@ -49,7 +48,6 @@
#define FREE_CAM_TEXT "Z+C+B+Minus"
#define MOVE_LINK_TEXT "Z+C+B+Plus"
#define FRAME_ADVANCE_TEXT "Z+C+B+D-PAD right"
-#define LOAD_TIMER_TEXT "Z+B"
#endif
extern bool reload_area_flag;
diff --git a/src/menus/tools_menu.cpp b/src/menus/tools_menu.cpp
index 2edab9f..fd374df 100644
--- a/src/menus/tools_menu.cpp
+++ b/src/menus/tools_menu.cpp
@@ -64,9 +64,10 @@ Line lines[LINES] = {
{"timer", TIMER_INDEX,
"Frame timer: " TIMER_TOGGLE_TEXT " to start/stop, " TIMER_RESET_TEXT " to reset", true,
&ToolItems[TIMER_INDEX].active},
- {"load timer", LOAD_TIMER_INDEX, "Loading zone timer: " LOAD_TIMER_TEXT " to reset", true,
+ {"load timer", LOAD_TIMER_INDEX, "Loading zone timer: " TIMER_RESET_TEXT " to reset", true,
&ToolItems[LOAD_TIMER_INDEX].active},
- {"igt timer", IGT_TIMER_INDEX, "In-game time timer: Z+A to start/stop, Z+B to reset", true,
+ {"igt timer", IGT_TIMER_INDEX,
+ "In-game time timer: " TIMER_TOGGLE_TEXT " to start/stop, " TIMER_RESET_TEXT " to reset", true,
&ToolItems[IGT_TIMER_INDEX].active},
{"free cam", FREE_CAM_INDEX,
FREE_CAM_TEXT " to activate, " FREE_CAM_MOVEMENT_TEXT " to move, " FREE_CAM_VIEW_TEXT
diff --git a/src/utils/card.cpp b/src/utils/card.cpp
index 1689590..fb00acb 100644
--- a/src/utils/card.cpp
+++ b/src/utils/card.cpp
@@ -210,6 +210,7 @@ void store_mem_card(Card& card) {
}
void store_memfile(Card& card) {
+#ifndef WII_PLATFORM
PositionData posData;
posData.link = tp_zelAudio.link_debug_ptr->position;
posData.cam.target = tp_matrixInfo.matrix_info->target;
@@ -247,6 +248,7 @@ void store_memfile(Card& card) {
card.card_result = CARDClose(&card.card_info);
}
}
+#endif
}
void load_mem_card(Card& card) {