mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Kaleido OK & icon_item_vtx_static (Documented) (#1243)
* Begin Kaleido * WIP * DW macros for gbi * More Progress * Match KaleidoScope_GrayOutTextureRGBA32 * DrawGameOver wip * Add some function names * A few more matching, some docs * More docs, data wip * Import Kaleido Data * Data cleanup * Some progress * Match TitleCard_Draw Again (Thanks Roman) * Match KaleidoScope_DrawDebugEditor * KaleidoScope_UpdateDebugEditor WIP * Some cleanup * z_kaleido_debug.c OK * Cleanup * match func_8081B6EC * more wip, data cleanup * match func_80825A50 * match KaleidoScope_InitVertices * cursor progress * name func * item headers * match KaleidoScope_DrawItemSelect * KaleidoScope_UpdateItemEquip WIP * match kaleido item * doc kaleido item * z_kaleido_prompt ok * kaleido mask setup * small cleanup * kaleido mask OK * mask cleanup * small fix * quest page setup * doc save prompt * sync with prompt docs * KaleidoScope_Update WIP * More progress on KaleidoScope_Update * kaleido update cleanup * KaleidoScope_Update OK * Slightly cleaner match in KaleidoScope_Update * match KaleidoScope_DrawPages and KaleidoScope_DrawGameOver, organize data * more cleanup * match KaleidoScope_Draw and KaleidoScope_SetView * match KaleidoScope_UpdateNamePanel * match another 2 funcs, segment docs * another KaleidoScope_UpdateNamePanel ? * swap update name panel names * another match, only 2 large/similar vtx function in kaleido nes * more setup for drawInfoPanel * match KaleidoScope_DrawDungeonStrayFairyCount, 8 funcs left * document KaleidoScope_DrawDungeonStrayFairyCount * KaleidoScope_DrawInfoPanel1 WIP * match KaleidoScope_DrawInfoPanel2 * gameover pause states * name two pause states * match KaleidoScope_UpdateDungeonCursor and KaleidoScope_UpdateWorldMapCursor * match KaleidoScope_DrawDungeonMap * KaleidoScope_DrawWorldMap WIP * cleanup map * some cursor/texture docs * more cursor docs * KaleidoScope_UpdateQuestCursor wip * match KaleidoScope_UpdateQuestCursor * quest cleanup * KaleidoScope_DrawQuestStatus WIP, broke gakufu * match KaleidoScope_DrawInfoPanel1, Kaleido NES OK * pause substates * more cleanup * map progress * very small improvements to KaleidoScope_DrawWorldMap * match KaleidoScope_DrawWorldMap * cleanup KaleidoScope_DrawWorldMap * rematch EnGakufu_ProcessNotes, thanks anon58 * gameover and misc docs * more docs * small cleanup of maps * owl warp and other docs * symmetry in pause state * some docs and cleanup * docs * more docs from OoT WIP * fix * quest page docs * more enums * more cleanup and enums * another round of docs * doc cursor indices * map docs * some docs * cleanup for-loops * cleanup * else if * small docs * icon_item_field_static * dungeon static * eol * icon item jpn static * vtx static * jpn static comments * import parameter texture functions * mask cleanup * sync with PRs * some docs * more docs * fix bss * some docs * sync with PR * quest docs * fix quest vtx * sync with PR * sync with PR * fix typo * small cleanup * vtx madness * more vtx * add quad docs * cleanup vtx * cleanup * cleanup * revert gbi changes * cleanup * more cleanup * another cleanup * remove empty comment * some PR review * more naming suggestions * namefixer * L button to Z button --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
engineer124
co-authored by
Derek Hensley
Derek Hensley
parent
fc475a9756
commit
aa0a968791
+10
-10
@@ -4218,28 +4218,28 @@
|
||||
0x808204AC:("KaleidoScope_UpdateMaskCursor",),
|
||||
0x80820FA4:("KaleidoScope_UpdateMaskEquip",),
|
||||
0x80821730:("KaleidoScope_UpdatePrompt",),
|
||||
0x80821900:("func_80821900",),
|
||||
0x8082192C:("func_8082192C",),
|
||||
0x80821958:("func_80821958",),
|
||||
0x80821900:("Kaleido_LoadMapNameStatic",),
|
||||
0x8082192C:("Kaleido_LoadMapNameStaticLarge",),
|
||||
0x80821958:("Kaleido_LoadItemNameStatic",),
|
||||
0x80821984:("KaleidoScope_MoveCursorToSpecialPos",),
|
||||
0x80821A04:("func_80821A04",),
|
||||
0x80821A04:("KaleidoScope_MoveCursorFromSpecialPos",),
|
||||
0x80821AD4:("KaleidoScope_DrawTexQuadRGBA32",),
|
||||
0x80821CC4:("func_80821CC4",),
|
||||
0x80821CC4:("KaleidoScope_SwitchPage",),
|
||||
0x80821D84:("KaleidoScope_HandlePageToggles",),
|
||||
0x80821F30:("KaleidoScope_DrawPageSections",),
|
||||
0x808221DC:("KaleidoScope_DrawPages",),
|
||||
0x80823350:("func_80823350",),
|
||||
0x80823350:("KaleidoScope_DrawInfoPanel",),
|
||||
0x80824738:("KaleidoScope_UpdateNamePanel",),
|
||||
0x808248D0:("KaleidoScope_DrawOwlWarpMapPage",),
|
||||
0x80824B90:("func_80824B90",),
|
||||
0x80824B90:("KaleidoScope_DrawOwlWarpInfoPanel",),
|
||||
0x808256E4:("KaleidoScope_UpdateOwlWarpNamePanel",),
|
||||
0x8082585C:("KaleidoScope_UpdateSwitchPage",),
|
||||
0x808259D4:("KaleidoScope_SetView",),
|
||||
0x80825A50:("KaleidoScope_SetPageVertices",),
|
||||
0x80825E28:("KaleidoScope_SetVertices",),
|
||||
0x808274DC:("func_808274DC",),
|
||||
0x80827A8C:("func_80827A8C",),
|
||||
0x80827E08:("func_80827E08",),
|
||||
0x808274DC:("KaleidoScope_UpdateCursorSize",),
|
||||
0x80827A8C:("KaleidoScope_DrawCursor",),
|
||||
0x80827E08:("KaleidoScope_DrawGameOver",),
|
||||
0x808283D8:("KaleidoScope_Draw",),
|
||||
0x808286D8:("KaleidoScope_GrayOutTextureRGBA32",),
|
||||
0x80828788:("KaleidoScope_UpdateOpening",),
|
||||
|
||||
+30
-30
@@ -1967,7 +1967,7 @@
|
||||
0x801C6A8C:("D_801C6A8C","UNK_TYPE2","",0x2),
|
||||
0x801C6A90:("D_801C6A90","UNK_TYPE2","",0x2),
|
||||
0x801C6A94:("D_801C6A94","UNK_TYPE2","",0x2),
|
||||
0x801C6A98:("D_801C6A98","UNK_TYPE1","",0x1),
|
||||
0x801C6A98:("gPageSwitchNextButtonStatus","UNK_TYPE1","",0x1),
|
||||
0x801C6AB8:("D_801C6AB8","UNK_TYPE1","",0x1),
|
||||
0x801C6B28:("D_801C6B28","UNK_TYPE1","",0x1),
|
||||
0x801C6B98:("D_801C6B98","UNK_TYPE1","",0x1),
|
||||
@@ -4638,7 +4638,7 @@
|
||||
0x80816004:("sDayRightTextures","TexturePtr","[4]",0x10),
|
||||
0x80816014:("sHoursLeftTextures","TexturePtr","[3]",0xC),
|
||||
0x8082AED0:("sQuestRemainsColorTimerInit","UNK_TYPE1","",0x1),
|
||||
0x8082AED8:("sQuestHpColorTimerInit","UNK_TYPE1","",0x1),
|
||||
0x8082AED8:("sQuestHpColorTimerInits","UNK_TYPE1","",0x1),
|
||||
0x8082AEE0:("sQuestSongPlayedOcarinaButtonsNum","UNK_TYPE2","",0x2),
|
||||
0x8082AEE4:("sQuestSongPlayedOcarinaButtons","UNK_TYPE1","",0x1),
|
||||
0x8082AEF0:("sQuestSongPlayedOcarinaButtonsAlpha","UNK_TYPE2","",0x2),
|
||||
@@ -4744,7 +4744,7 @@
|
||||
0x8082B918:("sPauseCursorLeftX","UNK_TYPE2","",0x2),
|
||||
0x8082B91C:("sPauseCursorRightX","UNK_TYPE2","",0x2),
|
||||
0x8082B920:("D_8082B920","UNK_TYPE2","",0x2),
|
||||
0x8082B924:("D_8082B924","UNK_TYPE2","",0x2),
|
||||
0x8082B924:("sPauseZRCursorColorTimerInits","UNK_TYPE2","",0x2),
|
||||
0x8082B944:("sGameOverRectPosY","UNK_TYPE2","",0x2),
|
||||
0x8082B948:("sCursorPrimColorTarget","UNK_TYPE2","",0x2),
|
||||
0x8082B96C:("sCursorEnvColorTarget","UNK_TYPE2","",0x2),
|
||||
@@ -4752,12 +4752,12 @@
|
||||
0x8082B994:("sCursorColorTargetIndex","UNK_TYPE2","",0x2),
|
||||
0x8082B998:("D_8082B998","UNK_TYPE1","",0x1),
|
||||
0x8082B9A8:("D_8082B9A8","UNK_TYPE1","",0x1),
|
||||
0x8082B9B8:("D_8082B9B8","UNK_TYPE1","",0x1),
|
||||
0x8082B9C8:("D_8082B9C8","UNK_TYPE2","",0x2),
|
||||
0x8082B9CC:("D_8082B9CC","UNK_TYPE2","",0x2),
|
||||
0x8082B9D0:("D_8082B9D0","UNK_TYPE1","",0x1),
|
||||
0x8082B9E0:("D_8082B9E0","UNK_TYPE2","",0x2),
|
||||
0x8082B9E4:("D_8082B9E4","UNK_TYPE2","",0x2),
|
||||
0x8082B9B8:("sPauseZRCursorColorTargets","UNK_TYPE1","",0x1),
|
||||
0x8082B9C8:("sPauseZRCursorColorTimer","UNK_TYPE2","",0x2),
|
||||
0x8082B9CC:("sPauseZRCursorColorIndex","UNK_TYPE2","",0x2),
|
||||
0x8082B9D0:("sPauseZRCursorColorTargets","UNK_TYPE1","",0x1),
|
||||
0x8082B9E0:("sPauseZRCursorColorTimer","UNK_TYPE2","",0x2),
|
||||
0x8082B9E4:("sPauseZRCursorColorIndex","UNK_TYPE2","",0x2),
|
||||
0x8082B9E8:("sVtxPageMaskQuadsX","UNK_TYPE1","",0x1),
|
||||
0x8082B9EC:("sVtxPageItemQuadsX","UNK_TYPE1","",0x1),
|
||||
0x8082B9F0:("sVtxPageMapDungeonQuadsX","UNK_TYPE1","",0x1),
|
||||
@@ -4789,17 +4789,17 @@
|
||||
0x8082BBC4:("sQuestVtxRectTop","UNK_TYPE2","",0x2),
|
||||
0x8082BC14:("sQuestVtxWidths","UNK_TYPE2","",0x2),
|
||||
0x8082BC64:("sQuestVtxHeights","UNK_TYPE2","",0x2),
|
||||
0x8082BCB4:("D_8082BCB4","UNK_TYPE1","",0x1),
|
||||
0x8082BCCC:("D_8082BCCC","UNK_TYPE1","",0x1),
|
||||
0x8082BCDC:("D_8082BCDC","UNK_TYPE1","",0x1),
|
||||
0x8082BD08:("D_8082BD08","UNK_TYPE1","",0x1),
|
||||
0x8082BD34:("D_8082BD34","UNK_TYPE1","",0x1),
|
||||
0x8082BD5C:("D_8082BD5C","UNK_TYPE1","",0x1),
|
||||
0x8082BD84:("D_8082BD84","UNK_TYPE1","",0x1),
|
||||
0x8082BDA8:("D_8082BDA8","UNK_TYPE1","",0x1),
|
||||
0x8082BDCC:("D_8082BDCC","UNK_TYPE1","",0x1),
|
||||
0x8082BE28:("D_8082BE28","UNK_TYPE1","",0x1),
|
||||
0x8082BE84:("D_8082BE84","UNK_TYPE2","",0x2),
|
||||
0x8082BCB4:("sItemMaskCursorsX","UNK_TYPE1","",0x1),
|
||||
0x8082BCCC:("sItemMaskCursorsY","UNK_TYPE1","",0x1),
|
||||
0x8082BCDC:("sWorldMapCursorsX","UNK_TYPE1","",0x1),
|
||||
0x8082BD08:("sWorldMapCursorsY","UNK_TYPE1","",0x1),
|
||||
0x8082BD34:("sOwlWarpWorldMapCursorsX","UNK_TYPE1","",0x1),
|
||||
0x8082BD5C:("sOwlWarpWorldMapCursorsY","UNK_TYPE1","",0x1),
|
||||
0x8082BD84:("sDungeonMapCursorsX","UNK_TYPE1","",0x1),
|
||||
0x8082BDA8:("sDungeonMapCursorsY","UNK_TYPE1","",0x1),
|
||||
0x8082BDCC:("sQuestStatusCursorsX","UNK_TYPE1","",0x1),
|
||||
0x8082BE28:("sQuestStatusCursorsY","UNK_TYPE1","",0x1),
|
||||
0x8082BE84:("sGameOverUlt","UNK_TYPE2","",0x2),
|
||||
0x8082BE88:("sCursorPointsToOcarinaModes","UNK_TYPE1","",0x1),
|
||||
0x8082BE9C:("sUnpausedHudVisibility","UNK_TYPE2","",0x2),
|
||||
0x8082BEA0:("sNextMainState","UNK_TYPE2","",0x2),
|
||||
@@ -4921,23 +4921,23 @@
|
||||
0x8082C0E4:("jtbl_8082C0E4","UNK_PTR","",0x4),
|
||||
0x8082C148:("jtbl_8082C148","UNK_PTR","",0x4),
|
||||
0x8082C18C:("jtbl_8082C18C","UNK_PTR","",0x4),
|
||||
0x8082DA50:("D_8082DA50","UNK_TYPE1","",0x1),
|
||||
0x8082DA52:("D_8082DA52","UNK_TYPE1","",0x1),
|
||||
0x8082DA54:("D_8082DA54","UNK_TYPE1","",0x1),
|
||||
0x8082DA56:("D_8082DA56","UNK_TYPE1","",0x1),
|
||||
0x8082DA50:("sPauseZRCursorRed","UNK_TYPE1","",0x1),
|
||||
0x8082DA52:("sPauseZRCursorGreen","UNK_TYPE1","",0x1),
|
||||
0x8082DA54:("sPauseZRCursorBlue","UNK_TYPE1","",0x1),
|
||||
0x8082DA56:("sPauseZRCursorAlpha","UNK_TYPE1","",0x1),
|
||||
0x8082DA58:("sUnpausedButtonStatus","UNK_TYPE1","",0x1),
|
||||
0x8082DA60:("D_8082DA60","f32","",0x4),
|
||||
0x8082DA60:("sCursorCirclesX","f32","",0x4),
|
||||
0x8082DA64:("D_8082DA64","f32","",0x4),
|
||||
0x8082DA68:("D_8082DA68","f32","",0x4),
|
||||
0x8082DA6C:("D_8082DA6C","f32","",0x4),
|
||||
0x8082DA70:("D_8082DA70","f32","",0x4),
|
||||
0x8082DA70:("sCursorCirclesY","f32","",0x4),
|
||||
0x8082DA74:("D_8082DA74","f32","",0x4),
|
||||
0x8082DA78:("D_8082DA78","f32","",0x4),
|
||||
0x8082DA7C:("D_8082DA7C","f32","",0x4),
|
||||
0x8082DA80:("D_8082DA80","UNK_TYPE1","",0x1),
|
||||
0x8082DA82:("D_8082DA82","UNK_TYPE1","",0x1),
|
||||
0x8082DA84:("D_8082DA84","UNK_TYPE1","",0x1),
|
||||
0x8082DA86:("D_8082DA86","UNK_TYPE1","",0x1),
|
||||
0x8082DA80:("sPauseZRCursorRed","UNK_TYPE1","",0x1),
|
||||
0x8082DA82:("sPauseZRCursorGreen","UNK_TYPE1","",0x1),
|
||||
0x8082DA84:("sPauseZRCursorBlue","UNK_TYPE1","",0x1),
|
||||
0x8082DA86:("sPauseZRCursorAlpha","UNK_TYPE1","",0x1),
|
||||
0x8085B9F0:("D_8085B9F0","UNK_TYPE1","",0x1),
|
||||
0x8085BA08:("D_8085BA08","UNK_TYPE1","",0x1),
|
||||
0x8085BA20:("D_8085BA20","UNK_TYPE1","",0x1),
|
||||
|
||||
Reference in New Issue
Block a user