izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

minigame docs

Browse Source
This commit is contained in:
engineer124
2022-10-18 16:47:12 -04:00
parent 737a50c4da
commit 58e89b3769
5 changed files with 297 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -1705,8 +1705,8 @@ Gfx* Gfx_DrawTexRectI8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textu
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);
void Interface_StartTimer(s16 timerId, s16 seconds);
void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState);
void Interface_NewDay(PlayState* play, s32 day);
void Interface_SetHudVisibility(u16 hudVisibility);
void Interface_UpdateButtonsPart2(PlayState* play);
include/variables.h
+7 -7
View File
@@ -695,8 +695,8 @@ extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE2 sActionVtxWidths;
// extern UNK_TYPE2 sActionVtxPosY;
// extern UNK_TYPE2 sActionVtxHeights;
// extern UNK_TYPE2 sMinigamePerfectVtxPosX;
// extern UNK_TYPE2 sMinigamePerfectVtxPosY;
// extern UNK_TYPE2 sMinigamePerfectLetterEllipseCenterX;
// extern UNK_TYPE2 sMinigamePerfectLetterEllipseCenterY;
// extern UNK_TYPE4 sPostmanTimerInputBtnAPressed;
// extern UNK_TYPE1 sDoActionTextures;
// extern UNK_TYPE1 D_801BFAB8;
@@ -738,15 +738,15 @@ extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE1 D_801BFC10;
// extern UNK_TYPE1 sFinalHoursDigitTextures;
// extern UNK_TYPE1 D_801BFC40;
// extern UNK_TYPE2 D_801BFC50;
// extern UNK_TYPE2 sMinigamePerfectType1AngleOffScreenTargets;
// extern UNK_TYPE2 sMinigamePerfectType1PrimColorTargets;
// extern UNK_TYPE2 D_801BFC62;
// extern UNK_TYPE2 D_801BFC64;
// extern UNK_TYPE2 D_801BFC6C;
// extern UNK_TYPE2 D_801BFC7C;
// extern UNK_TYPE2 sMinigamePerfectType2LetterXOffsetSpellingTargets;
// extern UNK_TYPE2 sMinigamePerfectType2LetterXOffsetOffScreenTargets;
// extern UNK_TYPE1 sMinigamePerfectType2PrimColorTargets;
// extern UNK_TYPE2 D_801BFC98;
// extern UNK_TYPE2 D_801BFCA8;
// extern UNK_TYPE2 sMinigamePerfectType3LetterXOffsetSpellingTargets;
// extern UNK_TYPE2 sMinigamePerfectType3AngleOffScreenTargets;
// extern UNK_TYPE1 sMinigamePerfectType3PrimColorTargets;
// extern UNK_TYPE4 sMinigamePerfectTextures;
// extern UNK_TYPE2 sTimerStateTimer;
include/z64interface.h
+13 -10
View File
@@ -83,13 +83,16 @@ typedef enum {
typedef enum {
/* 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
/* 2 */ MINIGAME_PERFECT_STATE_ENTER,
/* 3 */ MINIGAME_PERFECT_STATE_STATIONARY, // Display for type 1
/* 4 */ MINIGAME_PERFECT_STATE_SPREAD, // Exit for type 1
/* 5 */ MINIGAME_PERFECT_STATE_DISPLAY,
/* 6 */ MINIGAME_PERFECT_STATE_EXIT
} MinigamePerfectState;
#define MINIGAME_PERFECT_NUM_LETTERS 8
#define MINIGAME_PERFECT_ANGLE_PER_LETTER (0x10000 / MINIGAME_PERFECT_NUM_LETTERS)
typedef enum {
/* 0 */ STORY_DMA_IDLE,
/* 1 */ STORY_DMA_LOADING,
@@ -176,11 +179,11 @@ typedef struct {
/* 0x284 */ s16 minigameCountdownScale;
/* 0x286 */ s16 isMinigamePerfect;
/* 0x288 */ s16 minigamePerfectType;
/* 0x28A */ s16 minigamePerfectState[8];
/* 0x29A */ u16 minigamePerfectLetterDirection[8];
/* 0x2AA */ s16 minigamePerfectVtxOffset[8];
/* 0x2BC */ f32 minigamePerfectLetterPosX[8];
/* 0x2DC */ f32 minigamePerfectLetterPosY[8];
/* 0x28A */ s16 minigamePerfectState[MINIGAME_PERFECT_NUM_LETTERS];
/* 0x29A */ u16 minigamePerfectLetterEllipseAngle[MINIGAME_PERFECT_NUM_LETTERS];
/* 0x2AA */ s16 minigamePerfectLetterXOffset[MINIGAME_PERFECT_NUM_LETTERS];
/* 0x2BC */ f32 minigamePerfectLetterEllipseRadiusX[MINIGAME_PERFECT_NUM_LETTERS];
/* 0x2DC */ f32 minigamePerfectLetterEllipseRadiusY[MINIGAME_PERFECT_NUM_LETTERS];
/* 0x2FC */ s16 minigamePerfectPrimColor[4];
/* 0x304 */ s16 minigamePerfectLetterCount;
/* 0x306 */ s16 minigamePerfectUnused;
src/code/z_parameter.c
+268 -174
View File
File diff suppressed because it is too large Load Diff
tools/disasm/variables.txt
+7 -7
View File
@@ -1123,8 +1123,8 @@
0x801BFA1C:("sActionVtxWidths","UNK_TYPE2","",0x2),
0x801BFA34:("sActionVtxPosY","UNK_TYPE2","",0x2),
0x801BFA4C:("sActionVtxHeights","UNK_TYPE2","",0x2),
0x801BFA64:("sMinigamePerfectVtxPosX","UNK_TYPE2","",0x2),
0x801BFA74:("sMinigamePerfectVtxPosY","UNK_TYPE2","",0x2),
0x801BFA64:("sMinigamePerfectLetterEllipseCenterX","UNK_TYPE2","",0x2),
0x801BFA74:("sMinigamePerfectLetterEllipseCenterY","UNK_TYPE2","",0x2),
0x801BFA84:("sPostmanTimerInputBtnAPressed","UNK_TYPE4","",0x4),
0x801BFAB0:("sDoActionTextures","UNK_TYPE1","",0x1),
0x801BFAB8:("magicBorderColors","UNK_TYPE1","",0x1),
@@ -1164,13 +1164,13 @@
0x801BFC10:("D_801BFC10","UNK_TYPE1","",0x1),
0x801BFC14:("sFinalHoursDigitTextures","UNK_TYPE1","",0x1),
0x801BFC40:("D_801BFC40","UNK_TYPE1","",0x1),
0x801BFC50:("D_801BFC50","UNK_TYPE2","",0x2),
0x801BFC50:("sMinigamePerfectType1AngleOffScreenTargets","UNK_TYPE2","",0x2),
0x801BFC60:("sMinigamePerfectType1PrimColorTargets","s16","[6]",0xC),
0x801BFC6C:("D_801BFC6C","UNK_TYPE4","",0x4),
0x801BFC7C:("D_801BFC7C","UNK_TYPE2","",0x2),
0x801BFC6C:("sMinigamePerfectType2LetterXOffsetSpellingTargets","UNK_TYPE4","",0x4),
0x801BFC7C:("sMinigamePerfectType2LetterXOffsetOffScreenTargets","UNK_TYPE2","",0x2),
0x801BFC8C:("sMinigamePerfectType2PrimColorTargets","UNK_TYPE1","",0x1),
0x801BFC98:("D_801BFC98","UNK_TYPE2","",0x2),
0x801BFCA8:("D_801BFCA8","UNK_TYPE2","",0x2),
0x801BFC98:("sMinigamePerfectType3LetterXOffsetSpellingTargets","UNK_TYPE2","",0x2),
0x801BFCA8:("sMinigamePerfectType3AngleOffScreenTargets","UNK_TYPE2","",0x2),
0x801BFCB8:("sMinigamePerfectType3PrimColorTargets","UNK_TYPE1","",0x1),
0x801BFCC4:("sMinigamePerfectTextures","UNK_TYPE4","",0x4),
0x801BFCE4:("sTimerStateTimer","UNK_TYPE4","",0x4),