mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
z_parameter: Minigames (#1131)
* minigame docs * cleanup * vertices and cleanup * fix bss * change to perfectLetters * fix parameter static * more PR, namefixer * PR Suggestions
This commit is contained in:
+11
-11
@@ -2092,7 +2092,7 @@
|
||||
0x8010D9F4:("Gfx_DrawTexRect4b",),
|
||||
0x8010DC58:("Gfx_DrawTexQuadIA8",),
|
||||
0x8010DE38:("Gfx_DrawTexQuad4b",),
|
||||
0x8010E028:("func_8010E028",),
|
||||
0x8010E028:("Interface_SetVertices",),
|
||||
0x8010E968:("Interface_PostmanTimerCallback",),
|
||||
0x8010E9F0:("Interface_StartTimer",),
|
||||
0x8010EA9C:("Interface_StartPostmanTimer",),
|
||||
@@ -2108,7 +2108,7 @@
|
||||
0x80111CB4:("func_80111CB4",),
|
||||
0x801129E4:("func_801129E4",),
|
||||
0x80112AF4:("func_80112AF4",),
|
||||
0x80112AFC:("func_80112AFC",),
|
||||
0x80112AFC:("Interface_InitMinigame",),
|
||||
0x80112B40:("Interface_LoadItemIconImpl",),
|
||||
0x80112BE4:("Interface_LoadItemIcon",),
|
||||
0x80112C0C:("func_80112C0C",),
|
||||
@@ -2151,22 +2151,22 @@
|
||||
0x80118BA4:("func_80118BA4",),
|
||||
0x80119030:("func_80119030",),
|
||||
0x80119610:("func_80119610",),
|
||||
0x8011B4E0:("func_8011B4E0",),
|
||||
0x8011B5C0:("func_8011B5C0",),
|
||||
0x8011B9E0:("func_8011B9E0",),
|
||||
0x8011BF70:("func_8011BF70",),
|
||||
0x8011C4C4:("func_8011C4C4",),
|
||||
0x8011B4E0:("Interface_SetPerfectLetters",),
|
||||
0x8011B5C0:("Interface_UpdatePerfectLettersType1",),
|
||||
0x8011B9E0:("Interface_UpdatePerfectLettersType2",),
|
||||
0x8011BF70:("Interface_UpdatePerfectLettersType3",),
|
||||
0x8011C4C4:("Interface_DrawPerfectLetters",),
|
||||
0x8011C808:("Interface_StartMoonCrash",),
|
||||
0x8011C898:("Interface_GetTimerDigits",),
|
||||
0x8011CA64:("Interface_DrawTimers",),
|
||||
0x8011E3B4:("Interface_UpdateBottleTimers",),
|
||||
0x8011E730:("func_8011E730",),
|
||||
0x8011F0E0:("func_8011F0E0",),
|
||||
0x8011E730:("Interface_DrawMinigameIcons",),
|
||||
0x8011F0E0:("Interface_Draw",),
|
||||
0x80120F90:("func_80120F90",),
|
||||
0x80121064:("func_80121064",),
|
||||
0x801210E0:("func_801210E0",),
|
||||
0x801210E0:("Interface_Update",),
|
||||
0x80121F94:("Interface_Destroy",),
|
||||
0x80121FC4:("func_80121FC4",),
|
||||
0x80121FC4:("Interface_Init",),
|
||||
0x801224E0:("Path_GetByIndex",),
|
||||
0x80122524:("Path_OrientAndGetDistSq",),
|
||||
0x801225CC:("Path_CopyLastPoint",),
|
||||
|
||||
+15
-15
@@ -1119,12 +1119,12 @@
|
||||
0x801BF9F8:("sFinalHoursClockFrameEnvBlue","UNK_TYPE2","",0x2),
|
||||
0x801BF9FC:("sFinalHoursClockColorTimer","UNK_TYPE2","",0x2),
|
||||
0x801BFA00:("sFinalHoursClockColorTargetIndex","UNK_TYPE2","",0x2),
|
||||
0x801BFA04:("D_801BFA04","UNK_TYPE2","",0x2),
|
||||
0x801BFA1C:("D_801BFA1C","UNK_TYPE2","",0x2),
|
||||
0x801BFA34:("D_801BFA34","UNK_TYPE2","",0x2),
|
||||
0x801BFA4C:("D_801BFA4C","UNK_TYPE2","",0x2),
|
||||
0x801BFA64:("D_801BFA64","UNK_TYPE2","",0x2),
|
||||
0x801BFA74:("D_801BFA74","UNK_TYPE2","",0x2),
|
||||
0x801BFA04:("sActionVtxPosX","UNK_TYPE2","",0x2),
|
||||
0x801BFA1C:("sActionVtxWidths","UNK_TYPE2","",0x2),
|
||||
0x801BFA34:("sActionVtxPosY","UNK_TYPE2","",0x2),
|
||||
0x801BFA4C:("sActionVtxHeights","UNK_TYPE2","",0x2),
|
||||
0x801BFA64:("sPerfectLettersCenterX","UNK_TYPE2","",0x2),
|
||||
0x801BFA74:("sPerfectLettersCenterY","UNK_TYPE2","",0x2),
|
||||
0x801BFA84:("sPostmanTimerInputBtnAPressed","UNK_TYPE4","",0x4),
|
||||
0x801BFAB0:("sDoActionTextures","UNK_TYPE1","",0x1),
|
||||
0x801BFAB8:("magicBorderColors","UNK_TYPE1","",0x1),
|
||||
@@ -1164,15 +1164,15 @@
|
||||
0x801BFC10:("D_801BFC10","UNK_TYPE1","",0x1),
|
||||
0x801BFC14:("D_801BFC14","UNK_TYPE1","",0x1),
|
||||
0x801BFC40:("D_801BFC40","UNK_TYPE1","",0x1),
|
||||
0x801BFC50:("D_801BFC50","UNK_TYPE2","",0x2),
|
||||
0x801BFC60:("D_801BFC60","s16","[6]",0xC),
|
||||
0x801BFC6C:("D_801BFC6C","UNK_TYPE4","",0x4),
|
||||
0x801BFC7C:("D_801BFC7C","UNK_TYPE2","",0x2),
|
||||
0x801BFC8C:("D_801BFC8C","UNK_TYPE1","",0x1),
|
||||
0x801BFC98:("D_801BFC98","UNK_TYPE2","",0x2),
|
||||
0x801BFCA8:("D_801BFCA8","UNK_TYPE2","",0x2),
|
||||
0x801BFCB8:("D_801BFCB8","UNK_TYPE1","",0x1),
|
||||
0x801BFCC4:("D_801BFCC4","UNK_TYPE4","",0x4),
|
||||
0x801BFC50:("sPerfectLettersType1OffScreenAngles","UNK_TYPE2","",0x2),
|
||||
0x801BFC60:("sPerfectLettersType1PrimColorTargets","s16","[6]",0xC),
|
||||
0x801BFC6C:("sPerfectLettersType2SpellingOffsetsX","UNK_TYPE4","",0x4),
|
||||
0x801BFC7C:("sPerfectLettersType2OffScreenOffsetsX","UNK_TYPE2","",0x2),
|
||||
0x801BFC8C:("sPerfectLettersType2PrimColorTargets","UNK_TYPE1","",0x1),
|
||||
0x801BFC98:("sPerfectLettersType3SpellingOffsetsX","UNK_TYPE2","",0x2),
|
||||
0x801BFCA8:("sPerfectLettersType3OffScreenAngles","UNK_TYPE2","",0x2),
|
||||
0x801BFCB8:("sPerfectLettersType3PrimColorTargets","UNK_TYPE1","",0x1),
|
||||
0x801BFCC4:("sPerfectLettersTextures","UNK_TYPE4","",0x4),
|
||||
0x801BFCE4:("sTimerStateTimer","UNK_TYPE4","",0x4),
|
||||
0x801BFCE8:("sTimerDigits","u16","[8]",0x10),
|
||||
0x801BFCF8:("sTimerBeepSfxSeconds","UNK_TYPE4","",0x4),
|
||||
|
||||
@@ -499,6 +499,8 @@ wordReplace = {
|
||||
"func_80169E6C": "Play_SetupRespawnPoint",
|
||||
"func_8016A0AC": "Play_IsUnderwater",
|
||||
"func_801690CC": "Play_InCsMode",
|
||||
"func_8011B4E0": "Interface_SetPerfectLetters",
|
||||
"func_80112AFC": "Interface_InitMinigame",
|
||||
"func_8010E9F0": "Interface_StartTimer",
|
||||
"func_8010EA9C": "Interface_StartPostmanTimer",
|
||||
"func_80121F94": "Interface_Destroy",
|
||||
@@ -714,6 +716,8 @@ wordReplace = {
|
||||
"gSaveContext.sceneSetupIndex": "gSaveContext.sceneLayer",
|
||||
"gSaveContext.seqIndex": "gSaveContext.seqId",
|
||||
"gSaveContext.nightSeqIndex": "gSaveContext.ambienceId",
|
||||
"gSaveContext.minigameState": "gSaveContext.minigameStatus",
|
||||
"gSaveContext.unk_3F3C": "gSaveContext.minigameHiddenScore",
|
||||
|
||||
"player->unk_A87": "player->exchangeItemId",
|
||||
"player->leftHandActor": "player->heldActor",
|
||||
@@ -754,6 +758,11 @@ wordReplace = {
|
||||
"globalCtx->interfaceCtx.unk_21E": "play->interfaceCtx.bButtonDoAction",
|
||||
"play->interfaceCtx.unk_31A": "play->interfaceCtx.storyState",
|
||||
"play->interfaceCtx.unk_31B": "play->interfaceCtx.storyType",
|
||||
"play->interfaceCtx.unk_25C": "play->interfaceCtx.minigamePoints",
|
||||
"play->interfaceCtx.unk_25E": "play->interfaceCtx.minigameHiddenPoints",
|
||||
"play->interfaceCtx.unk_280": "play->interfaceCtx.minigameState",
|
||||
"play->interfaceCtx.unk_286": "play->interfaceCtx.perfectLettersOn",
|
||||
"play->interfaceCtx.hbaAmmo": "play->interfaceCtx.minigameAmmo",
|
||||
|
||||
# "play->actorCtx.flags": "play->actorCtx.sceneFlags",
|
||||
# "play->actorCtx.unk5": "play->actorCtx.flags",
|
||||
|
||||
@@ -1606,7 +1606,7 @@ asm/non_matchings/code/z_parameter/Gfx_DrawTexRectI8.s,Gfx_DrawTexRectI8,0x8010D
|
||||
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/func_8010E028.s,func_8010E028,0x8010E028,0x250
|
||||
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
|
||||
@@ -1622,7 +1622,7 @@ asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71
|
||||
asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C
|
||||
asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
|
||||
asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
|
||||
asm/non_matchings/code/z_parameter/func_80112AFC.s,func_80112AFC,0x80112AFC,0x11
|
||||
asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11
|
||||
asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s,Interface_LoadItemIconImpl,0x80112B40,0x29
|
||||
asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112BE4,0xA
|
||||
asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
|
||||
@@ -1665,22 +1665,22 @@ asm/non_matchings/code/z_parameter/func_80118890.s,func_80118890,0x80118890,0xC5
|
||||
asm/non_matchings/code/z_parameter/func_80118BA4.s,func_80118BA4,0x80118BA4,0x123
|
||||
asm/non_matchings/code/z_parameter/func_80119030.s,func_80119030,0x80119030,0x178
|
||||
asm/non_matchings/code/z_parameter/func_80119610.s,func_80119610,0x80119610,0x7B4
|
||||
asm/non_matchings/code/z_parameter/func_8011B4E0.s,func_8011B4E0,0x8011B4E0,0x38
|
||||
asm/non_matchings/code/z_parameter/func_8011B5C0.s,func_8011B5C0,0x8011B5C0,0x108
|
||||
asm/non_matchings/code/z_parameter/func_8011B9E0.s,func_8011B9E0,0x8011B9E0,0x164
|
||||
asm/non_matchings/code/z_parameter/func_8011BF70.s,func_8011BF70,0x8011BF70,0x155
|
||||
asm/non_matchings/code/z_parameter/func_8011C4C4.s,func_8011C4C4,0x8011C4C4,0xD1
|
||||
asm/non_matchings/code/z_parameter/Interface_SetPerfectLetters.s,Interface_SetPerfectLetters,0x8011B4E0,0x38
|
||||
asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType1.s,Interface_UpdatePerfectLettersType1,0x8011B5C0,0x108
|
||||
asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType2.s,Interface_UpdatePerfectLettersType2,0x8011B9E0,0x164
|
||||
asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType3.s,Interface_UpdatePerfectLettersType3,0x8011BF70,0x155
|
||||
asm/non_matchings/code/z_parameter/Interface_DrawPerfectLetters.s,Interface_DrawPerfectLetters,0x8011C4C4,0xD1
|
||||
asm/non_matchings/code/z_parameter/Interface_StartMoonCrash.s,Interface_StartMoonCrash,0x8011C808,0x24
|
||||
asm/non_matchings/code/z_parameter/Interface_GetTimerDigits.s,Interface_GetTimerDigits,0x8011C898,0x73
|
||||
asm/non_matchings/code/z_parameter/Interface_DrawTimers.s,Interface_DrawTimers,0x8011CA64,0x654
|
||||
asm/non_matchings/code/z_parameter/Interface_UpdateBottleTimers.s,Interface_UpdateBottleTimers,0x8011E3B4,0xDF
|
||||
asm/non_matchings/code/z_parameter/func_8011E730.s,func_8011E730,0x8011E730,0x26C
|
||||
asm/non_matchings/code/z_parameter/func_8011F0E0.s,func_8011F0E0,0x8011F0E0,0x7AC
|
||||
asm/non_matchings/code/z_parameter/Interface_DrawMinigameIcons.s,Interface_DrawMinigameIcons,0x8011E730,0x26C
|
||||
asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC
|
||||
asm/non_matchings/code/z_parameter/func_80120F90.s,func_80120F90,0x80120F90,0x35
|
||||
asm/non_matchings/code/z_parameter/func_80121064.s,func_80121064,0x80121064,0x1F
|
||||
asm/non_matchings/code/z_parameter/func_801210E0.s,func_801210E0,0x801210E0,0x3AD
|
||||
asm/non_matchings/code/z_parameter/Interface_Update.s,Interface_Update,0x801210E0,0x3AD
|
||||
asm/non_matchings/code/z_parameter/Interface_Destroy.s,Interface_Destroy,0x80121F94,0xC
|
||||
asm/non_matchings/code/z_parameter/func_80121FC4.s,func_80121FC4,0x80121FC4,0x147
|
||||
asm/non_matchings/code/z_parameter/Interface_Init.s,Interface_Init,0x80121FC4,0x147
|
||||
asm/non_matchings/code/z_path/func_801224E0.s,func_801224E0,0x801224E0,0x11
|
||||
asm/non_matchings/code/z_path/func_80122524.s,func_80122524,0x80122524,0x2A
|
||||
asm/non_matchings/code/z_path/func_801225CC.s,func_801225CC,0x801225CC,0x25
|
||||
|
||||
|
Reference in New Issue
Block a user