some docs

This commit is contained in:
engineer124
2022-10-02 09:18:23 -04:00
parent c0b227ff17
commit cd05be7049
7 changed files with 153 additions and 152 deletions
+5 -5
View File
@@ -1807,11 +1807,11 @@ Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b);
void OLib_DbCameraVec3fDiff(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
void OLib_DbCameraVec3fSum(PosRot* a, Vec3f* b, Vec3f* dest, s16 mode);
Gfx* Gfx_DrawRectTextureRGBA16(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawRectTextureI8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawQuadTextureIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawQuadTexture(Gfx* gfx, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawTexRectRGBA16(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawTexRectIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawTexRectI8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy);
Gfx* Gfx_DrawTexQuadIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 point);
Gfx* Gfx_DrawTexQuad4b(Gfx* gfx, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
void Interface_StartTimer(s16 timerId, s16 timeLimit);
void Interface_StartPostmanTimer(s16 timeLimit, s16 bunnyHoodState);
+5 -5
View File
@@ -73,11 +73,11 @@ typedef enum {
} MinigamePerfectType;
typedef enum {
/* 0 */ MINIGAME_PERFECT_STATE_0,
/* 1 */ MINIGAME_PERFECT_STATE_1,
/* 2 */ MINIGAME_PERFECT_STATE_2,
/* 3 */ MINIGAME_PERFECT_STATE_3,
/* 4 */ MINIGAME_PERFECT_STATE_4,
/* 0 */ MINIGAME_PERFECT_STATE_OFF,
/* 1 */ MINIGAME_PERFECT_STATE_INIT,
/* 2 */ MINIGAME_PERFECT_STATE_SWIRL_IN,
/* 3 */ MINIGAME_PERFECT_STATE_STATIONARY,
/* 4 */ MINIGAME_PERFECT_STATE_SWIRL_OUT,
/* 5 */ MINIGAME_PERFECT_STATE_5,
/* 6 */ MINIGAME_PERFECT_STATE_6
} MinigamePerfectState;
+119 -118
View File
File diff suppressed because it is too large Load Diff
@@ -224,14 +224,14 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
// Draw upper digit
if (ammoUpperDigit != 0) {
POLY_OPA_DISP =
Gfx_DrawRectTextureIA8(POLY_OPA_DISP, ((u8*)gAmmoDigit0Tex + (8 * 8 * ammoUpperDigit)), 8, 8,
sAmmoRectLeft[ammoIndex], sAmmoRectHeight[ammoIndex], 8, 8, 1 << 10, 1 << 10);
Gfx_DrawTexRectIA8(POLY_OPA_DISP, ((u8*)gAmmoDigit0Tex + (8 * 8 * ammoUpperDigit)), 8, 8,
sAmmoRectLeft[ammoIndex], sAmmoRectHeight[ammoIndex], 8, 8, 1 << 10, 1 << 10);
}
// Draw lower digit
POLY_OPA_DISP =
Gfx_DrawRectTextureIA8(POLY_OPA_DISP, ((u8*)gAmmoDigit0Tex + (8 * 8 * ammo)), 8, 8,
sAmmoRectLeft[ammoIndex] + 6, sAmmoRectHeight[ammoIndex], 8, 8, 1 << 10, 1 << 10);
Gfx_DrawTexRectIA8(POLY_OPA_DISP, ((u8*)gAmmoDigit0Tex + (8 * 8 * ammo)), 8, 8, sAmmoRectLeft[ammoIndex] + 6,
sAmmoRectHeight[ammoIndex], 8, 8, 1 << 10, 1 << 10);
CLOSE_DISPS(gfxCtx);
}
@@ -262,7 +262,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
if (GET_CUR_FORM_BTN_ITEM(i + 1) != ITEM_NONE) {
if (GET_CUR_FORM_BTN_SLOT(i + 1) < 24) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->itemVtx[j], 4, 0);
POLY_OPA_DISP = Gfx_DrawQuadTextureIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
POLY_OPA_DISP = Gfx_DrawTexQuadIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
}
}
}
@@ -208,7 +208,7 @@ void KaleidoScope_DrawMaskSelect(PlayState* play) {
if (GET_CUR_FORM_BTN_ITEM(i + 1) != ITEM_NONE) {
if (GET_CUR_FORM_BTN_SLOT(i + 1) >= NUM_ITEM_SLOTS) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->maskVtx[j], 4, 0);
POLY_OPA_DISP = Gfx_DrawQuadTextureIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
POLY_OPA_DISP = Gfx_DrawTexQuadIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
}
}
}
+9 -9
View File
@@ -2083,16 +2083,16 @@
0x8010C930:("OLib_Vec3fDiffBinAng",),
0x8010C9C8:("OLib_DbCameraVec3fDiff",),
0x8010CAA0:("OLib_DbCameraVec3fSum",),
0x8010CB80:("Gfx_DrawRectTextureRGBA16",),
0x8010CD98:("Gfx_DrawRectTextureIA8",),
0x8010CFBC:("Gfx_DrawRectTextureIA8_DropShadow",),
0x8010CB80:("Gfx_DrawTexRectRGBA16",),
0x8010CD98:("Gfx_DrawTexRectIA8",),
0x8010CFBC:("Gfx_DrawTexRectIA8_DropShadow",),
0x8010D2D4:("Gfx_DrawRect_DropShadow",),
0x8010D480:("Gfx_DrawRectTextureIA8_DropShadowOffset",),
0x8010D7D0:("Gfx_DrawRectTextureI8",),
0x8010D9F4:("Gfx_DrawRectTexture",),
0x8010DC58:("Gfx_DrawQuadTextureIA8",),
0x8010DE38:("Gfx_DrawQuadTexture",),
0x8010E028:("Interface_InitVertices",),
0x8010D480:("Gfx_DrawTexRectIA8_DropShadowOffset",),
0x8010D7D0:("Gfx_DrawTexRectI8",),
0x8010D9F4:("Gfx_DrawTexRect4b",),
0x8010DC58:("Gfx_DrawTexQuadIA8",),
0x8010DE38:("Gfx_DrawTexQuad4b",),
0x8010E028:("Interface_SetVertices",),
0x8010E968:("Interface_PostmanTimerCallback",),
0x8010E9F0:("Interface_StartTimer",),
0x8010EA9C:("Interface_StartPostmanTimer",),
+9 -9
View File
@@ -1597,16 +1597,16 @@ asm/non_matchings/code/z_olib/OLib_Vec3fDiffDegF.s,OLib_Vec3fDiffDegF,0x8010C8C8
asm/non_matchings/code/z_olib/OLib_Vec3fDiffBinAng.s,OLib_Vec3fDiffBinAng,0x8010C930,0x26
asm/non_matchings/code/z_olib/OLib_DbCameraVec3fDiff.s,OLib_DbCameraVec3fDiff,0x8010C9C8,0x36
asm/non_matchings/code/z_olib/OLib_DbCameraVec3fSum.s,OLib_DbCameraVec3fSum,0x8010CAA0,0x34
asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureRGBA16.s,Gfx_DrawRectTextureRGBA16,0x8010CB80,0x86
asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8.s,Gfx_DrawRectTextureIA8,0x8010CD98,0x89
asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8_DropShadow.s,Gfx_DrawRectTextureIA8_DropShadow,0x8010CFBC,0xC6
asm/non_matchings/code/z_parameter/Gfx_DrawTexRectRGBA16.s,Gfx_DrawTexRectRGBA16,0x8010CB80,0x86
asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8.s,Gfx_DrawTexRectIA8,0x8010CD98,0x89
asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8_DropShadow.s,Gfx_DrawTexRectIA8_DropShadow,0x8010CFBC,0xC6
asm/non_matchings/code/z_parameter/Gfx_DrawRect_DropShadow.s,Gfx_DrawRect_DropShadow,0x8010D2D4,0x6B
asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8_DropShadowOffset.s,Gfx_DrawRectTextureIA8_DropShadowOffset,0x8010D480,0xD4
asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureI8.s,Gfx_DrawRectTextureI8,0x8010D7D0,0x89
asm/non_matchings/code/z_parameter/Gfx_DrawRectTexture.s,Gfx_DrawRectTexture,0x8010D9F4,0x99
asm/non_matchings/code/z_parameter/Gfx_DrawQuadTextureIA8.s,Gfx_DrawQuadTextureIA8,0x8010DC58,0x78
asm/non_matchings/code/z_parameter/Gfx_DrawQuadTexture.s,Gfx_DrawQuadTexture,0x8010DE38,0x7C
asm/non_matchings/code/z_parameter/Interface_InitVertices.s,Interface_InitVertices,0x8010E028,0x250
asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8_DropShadowOffset.s,Gfx_DrawTexRectIA8_DropShadowOffset,0x8010D480,0xD4
asm/non_matchings/code/z_parameter/Gfx_DrawTexRectI8.s,Gfx_DrawTexRectI8,0x8010D7D0,0x89
asm/non_matchings/code/z_parameter/Gfx_DrawTexRect4b.s,Gfx_DrawTexRect4b,0x8010D9F4,0x99
asm/non_matchings/code/z_parameter/Gfx_DrawTexQuadIA8.s,Gfx_DrawTexQuadIA8,0x8010DC58,0x78
asm/non_matchings/code/z_parameter/Gfx_DrawTexQuad4b.s,Gfx_DrawTexQuad4b,0x8010DE38,0x7C
asm/non_matchings/code/z_parameter/Interface_SetVertices.s,Interface_SetVertices,0x8010E028,0x250
asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s,Interface_PostmanTimerCallback,0x8010E968,0x22
asm/non_matchings/code/z_parameter/Interface_StartTimer.s,Interface_StartTimer,0x8010E9F0,0x2B
asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s,Interface_StartPostmanTimer,0x8010EA9C,0x2D
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1597 asm/non_matchings/code/z_olib/OLib_Vec3fDiffBinAng.s OLib_Vec3fDiffBinAng 0x8010C930 0x26
1598 asm/non_matchings/code/z_olib/OLib_DbCameraVec3fDiff.s OLib_DbCameraVec3fDiff 0x8010C9C8 0x36
1599 asm/non_matchings/code/z_olib/OLib_DbCameraVec3fSum.s OLib_DbCameraVec3fSum 0x8010CAA0 0x34
1600 asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureRGBA16.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRectRGBA16.s Gfx_DrawRectTextureRGBA16 Gfx_DrawTexRectRGBA16 0x8010CB80 0x86
1601 asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8.s Gfx_DrawRectTextureIA8 Gfx_DrawTexRectIA8 0x8010CD98 0x89
1602 asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8_DropShadow.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8_DropShadow.s Gfx_DrawRectTextureIA8_DropShadow Gfx_DrawTexRectIA8_DropShadow 0x8010CFBC 0xC6
1603 asm/non_matchings/code/z_parameter/Gfx_DrawRect_DropShadow.s Gfx_DrawRect_DropShadow 0x8010D2D4 0x6B
1604 asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureIA8_DropShadowOffset.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRectIA8_DropShadowOffset.s Gfx_DrawRectTextureIA8_DropShadowOffset Gfx_DrawTexRectIA8_DropShadowOffset 0x8010D480 0xD4
1605 asm/non_matchings/code/z_parameter/Gfx_DrawRectTextureI8.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRectI8.s Gfx_DrawRectTextureI8 Gfx_DrawTexRectI8 0x8010D7D0 0x89
1606 asm/non_matchings/code/z_parameter/Gfx_DrawRectTexture.s asm/non_matchings/code/z_parameter/Gfx_DrawTexRect4b.s Gfx_DrawRectTexture Gfx_DrawTexRect4b 0x8010D9F4 0x99
1607 asm/non_matchings/code/z_parameter/Gfx_DrawQuadTextureIA8.s asm/non_matchings/code/z_parameter/Gfx_DrawTexQuadIA8.s Gfx_DrawQuadTextureIA8 Gfx_DrawTexQuadIA8 0x8010DC58 0x78
1608 asm/non_matchings/code/z_parameter/Gfx_DrawQuadTexture.s asm/non_matchings/code/z_parameter/Gfx_DrawTexQuad4b.s Gfx_DrawQuadTexture Gfx_DrawTexQuad4b 0x8010DE38 0x7C
1609 asm/non_matchings/code/z_parameter/Interface_InitVertices.s asm/non_matchings/code/z_parameter/Interface_SetVertices.s Interface_InitVertices Interface_SetVertices 0x8010E028 0x250
1610 asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s Interface_PostmanTimerCallback 0x8010E968 0x22
1611 asm/non_matchings/code/z_parameter/Interface_StartTimer.s Interface_StartTimer 0x8010E9F0 0x2B
1612 asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s Interface_StartPostmanTimer 0x8010EA9C 0x2D