mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

padmgr and related (#71)

Browse source 
* 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
This commit is contained in:
silv3rwing07 2020-04-14 10:17:25 -07:00 • committed by GitHub
parent 16646aa34d
commit 5aef81071e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 640 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/boot/z_locale.c
View file

@ -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;
}