ref: a7932c7d4acc1d43139d40d31077e37b2ab055f1
parent: 68556184ba2dafd937590e755de154d7a84c2e46
author: Snesrev <[email protected]>
date: Fri Oct 7 13:09:20 EDT 2022
Rename tmp1 in variables.h
--- a/hud.c
+++ b/hud.c
@@ -608,7 +608,7 @@
void Hud_NormalMenu() { // 8ddf15
timer_for_flashing_circle++;
if (!BYTE(joypad1H_last))
- BYTE(tmp1) = 0;
+ BYTE(hud_tmp1) = 0;
if (filtered_joypad_H & 0x10) { // start
overworld_map_state = 5;
@@ -634,7 +634,7 @@
} else if (filtered_joypad_H & 1) {
Hud_ReorderItem(1);
}
- } else if (!BYTE(tmp1)) {
+ } else if (!BYTE(hud_tmp1)) {
// If the x button is down, then move the blue circle
uint8 *item_p = (joypad1L_last & 0x40 && (enhanced_features0 & kFeatures0_SwitchLR)) ? &hud_cur_item_x : &hud_cur_item;
uint16 old_item = *item_p;
@@ -647,7 +647,7 @@
} else if (filtered_joypad_H & 1) {
Hud_EquipNextItem(item_p);
}
- BYTE(tmp1) = filtered_joypad_H;
+ BYTE(hud_tmp1) = filtered_joypad_H;
if (*item_p != old_item) {
timer_for_flashing_circle = 16;
sound_effect_2 = 32;
--- a/variables.h
+++ b/variables.h
@@ -126,7 +126,8 @@
#define dung_load_ptr (*(uint16*)(g_ram+0xB7))
#define dung_load_ptr_bank (*(uint8*)(g_ram+0xB9))
#define dung_load_ptr_offs (*(uint16*)(g_ram+0xBA))
-#define tmp1 (*(uint16*)(g_ram+0xBD))
+#define hud_tmp1 (*(uint16*)(g_ram+0xBD))
+
#define some_menu_ctr (*(uint8*)(g_ram+0xc8))
#define dung_line_ptrs_row3 (*(uint16*)(g_ram+0xDA))
#define dung_line_ptrs_row4 (*(uint16*)(g_ram+0xDD))