mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-25 06:06:05 +00:00
padutils.c, line numbers (#2040)
This commit is contained in:
parent
fda0e6ad4b
commit
1649bf32d6
4 changed files with 32 additions and 0 deletions
|
@ -581,7 +581,11 @@ void DmaMgr_Init(void) {
|
|||
PRINTF("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart,
|
||||
gDmaDataTable[0].file.vromEnd);
|
||||
//! @bug The main code file where fault.c resides is not yet loaded
|
||||
#if PLATFORM_N64
|
||||
Fault_AddHungupAndCrash("../z_std_dma.c", 840);
|
||||
#else
|
||||
Fault_AddHungupAndCrash("../z_std_dma.c", 1055);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Start the DMA manager
|
||||
|
|
|
@ -366,14 +366,22 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
|
|||
PRINTF("%c", BEL);
|
||||
// "Dynamic area head is destroyed"
|
||||
PRINTF(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST);
|
||||
#if PLATFORM_N64
|
||||
Fault_AddHungupAndCrash("../graph.c", 951);
|
||||
#else
|
||||
Fault_AddHungupAndCrash("../graph.c", 1070);
|
||||
#endif
|
||||
}
|
||||
if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) {
|
||||
problem = true;
|
||||
PRINTF("%c", BEL);
|
||||
// "Dynamic region tail is destroyed"
|
||||
PRINTF(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST);
|
||||
#if PLATFORM_N64
|
||||
Fault_AddHungupAndCrash("../graph.c", 957);
|
||||
#else
|
||||
Fault_AddHungupAndCrash("../graph.c", 1076);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -465,6 +473,8 @@ void Graph_ThreadEntry(void* arg0) {
|
|||
|
||||
sprintf(faultMsg, "CLASS SIZE= %d bytes", size);
|
||||
Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg);
|
||||
#elif PLATFORM_N64
|
||||
Fault_AddHungupAndCrash("../graph.c", 1081);
|
||||
#else
|
||||
Fault_AddHungupAndCrash("../graph.c", 1200);
|
||||
#endif
|
||||
|
|
|
@ -334,7 +334,11 @@ void PadMgr_UpdateInputs(PadMgr* padMgr) {
|
|||
default:
|
||||
// Unknown error response
|
||||
LOG_HEX("padnow1->errno", pad->errno, "../padmgr.c", 396);
|
||||
#if PLATFORM_N64
|
||||
Fault_AddHungupAndCrash("../padmgr.c", 382);
|
||||
#else
|
||||
Fault_AddHungupAndCrash("../padmgr.c", 397);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,10 @@ void func_800FCB70(void) {
|
|||
|
||||
void PadUtils_ResetPressRel(Input* input) {
|
||||
input->press.button = 0;
|
||||
#if PLATFORM_N64
|
||||
input->press.stick_x = 0;
|
||||
input->press.stick_y = 0;
|
||||
#endif
|
||||
input->rel.button = 0;
|
||||
}
|
||||
|
||||
|
@ -65,6 +69,16 @@ s8 PadUtils_GetRelY(Input* input) {
|
|||
return PadUtils_GetRelYImpl(input);
|
||||
}
|
||||
|
||||
#if PLATFORM_N64
|
||||
s8 PadUtils_GetPressX(Input* input) {
|
||||
return input->press.stick_x;
|
||||
}
|
||||
|
||||
s8 PadUtils_GetPressY(Input* input) {
|
||||
return input->press.stick_y;
|
||||
}
|
||||
#endif
|
||||
|
||||
void PadUtils_UpdateRelXY(Input* input) {
|
||||
s32 curX = PadUtils_GetCurX(input);
|
||||
s32 curY = PadUtils_GetCurY(input);
|
||||
|
|
Loading…
Reference in a new issue