summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorsilv3rwing07 <62714207+silv3rwing07@users.noreply.github.com>2020-04-14 10:17:25 -0700
committerGitHub <noreply@github.com>2020-04-14 13:17:25 -0400
commit5aef81071e501fbbe5298a433ead06a625cdb3d8 (patch)
tree686ccf568a7f05bd7741be96cd22f51d358451d4 /src/boot
parent16646aa34d533b36e3a93985ae59cbefdf58b6d4 (diff)
padmgr and related (#71)
* In process of moving changes over from old repo * Merged in changes * Finished import of padmgr changes from old repo * Adjusted some volatile * Improving padmgr volatile situation * Almost matched osReadMempak * Working on osMempakDataCRC * Explanations and equivalents but no matches for osMempakAddrCRC and osMempakDataCRC * OK after merge * Matched osMempakAddrCRC and osMempakDataCRC * Matched osReadMempak * Updated PadMgr function names to be less like original code * Changed variable names to make them further from original code * Changed names and it stopped matching * Undid clang-format steamrollering whitespace memes * Cleaned up Input names * More formatting changes * Moved padmgr to z64.h, deleted padmgr.h
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/z_locale.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c
index 4d2956e3e..10f6bb437 100644
--- a/src/boot/z_locale.c
+++ b/src/boot/z_locale.c
@@ -1,7 +1,6 @@
#include <ultra64.h>
#include <global.h>
#include <vt.h>
-#include <padmgr.h>
u32 gCurrentRegion = 0;
LocaleCartInfo sCartInfo;
@@ -39,13 +38,11 @@ void Locale_ResetRegion() {
}
u32 func_80001F48() {
- PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match
-
if (gCurrentRegion == REGION_NATIVE) {
return 0;
}
- if (padMgr->unk_2A8 & 4) {
+ if (gPadMgr.validCtrlrsMask & 4) {
return 0;
}
@@ -53,13 +50,11 @@ u32 func_80001F48() {
}
u32 func_80001F8C() {
- PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match
-
if (gCurrentRegion == REGION_NATIVE) {
return 0;
}
- if (padMgr->unk_2A8 & 4) {
+ if (gPadMgr.validCtrlrsMask & 4) {
return 1;
}