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

Match a few functions (#324)

Browse source 
* match a few functions

* run formath.sh

* minor fixes
This commit is contained in:
Random 2020-08-15 19:23:29 +02:00 • committed by GitHub
parent d3b88e1b1c
commit d8d789d2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 145 additions and 1528 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/code/fault.c
View file

@ -719,12 +719,10 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) {
FaultDrawer_SetCharPad(0, 0);
}
#ifdef NON_MATCHING
// regalloc differences
void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
Input* curInput = &sFaultStructPtr->padInput;
u32 addr = pc;
u32 count;
s32 count;
u32 off;
do {
@ -766,34 +764,33 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
if (CHECK_PAD(curInput->cur, Z_TRIG)) {
off = 0x100;
}
if (CHECK_PAD(curInput->cur, B_BUTTON)) {
off <<= 8;
}
if (CHECK_PAD(curInput->cur, U_JPAD)) {
if (CHECK_PAD(curInput->press, U_JPAD)) {
addr -= off;
}
if (CHECK_PAD(curInput->cur, D_JPAD)) {
if (CHECK_PAD(curInput->press, D_JPAD)) {
addr += off;
}
if (CHECK_PAD(curInput->cur, U_CBUTTONS)) {
if (CHECK_PAD(curInput->press, U_CBUTTONS)) {
addr = pc;
}
if (CHECK_PAD(curInput->cur, D_CBUTTONS)) {
if (CHECK_PAD(curInput->press, D_CBUTTONS)) {
addr = sp;
}
if (CHECK_PAD(curInput->cur, L_CBUTTONS)) {
if (CHECK_PAD(curInput->press, L_CBUTTONS)) {
addr = unk0;
}
if (CHECK_PAD(curInput->cur, R_CBUTTONS)) {
if (CHECK_PAD(curInput->press, R_CBUTTONS)) {
addr = unk1;
}
} while (!CHECK_PAD(curInput->cur, L_TRIG));
} while (!CHECK_PAD(curInput->press, L_TRIG));
sFaultStructPtr->faultActive = true;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_DrawMemDump.s")
#endif
void Fault_WalkStack(u32* spPtr, u32* pcPtr, u32* raPtr) {
u32 sp = *spPtr;