mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Kaleido_Update OK and documented (#1113)
* Kaleido Update Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * fill in enums * PR Suggestions * more PR Suggestions * missed one * pause state range macros * fix bss * PR suggestions, doc roll Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
This commit is contained in:
engineer124
co-authored by
Derek-Hensley
Derek-Hensley
parent
d863e7aeef
commit
7b81d6e950
+6
-6
@@ -1556,7 +1556,7 @@ void func_80106644(PlayState* play, s16 arg1, s16 arg2, s16 arg3);
|
||||
// void func_8010683C(void);
|
||||
// void func_801068B4(void);
|
||||
// void func_801068D8(void);
|
||||
// void func_801068FC(void);
|
||||
void* func_801068FC(PlayState* play, void* arg1, size_t size);
|
||||
// void func_80106BEC(void);
|
||||
// void func_80106D08(void);
|
||||
// void func_80106D5C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
|
||||
@@ -1569,7 +1569,7 @@ void func_80108AF8(PlayState* play);
|
||||
s32 func_801090B0(s32 arg0);
|
||||
s32 func_80109124(s16 arg0);
|
||||
// void func_801091F0(void);
|
||||
// void func_80109428(void);
|
||||
void func_80109428(PlayState* play);
|
||||
// void func_801094A0(void);
|
||||
// void func_801094C8(void);
|
||||
// void func_801094F8(void);
|
||||
@@ -1712,13 +1712,13 @@ void Interface_StartTimer(s16 timerId, s16 seconds);
|
||||
void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState);
|
||||
void func_8010EE74(PlayState* play, s32 day);
|
||||
void Interface_SetHudVisibility(u16 hudVisibility);
|
||||
// void func_80110038(void);
|
||||
void func_80110038(PlayState* play);
|
||||
// void func_80111CB4(void);
|
||||
// void func_801129E4(void);
|
||||
void func_80112AFC(PlayState* play);
|
||||
void Interface_LoadItemIconImpl(PlayState* play, u8 btn);
|
||||
void Interface_LoadItemIcon(PlayState* play, u8 btn);
|
||||
// void func_80112C0C(void);
|
||||
void func_80112C0C(PlayState* play, u16 flag);
|
||||
u8 Item_Give(PlayState* play, u8 item);
|
||||
u8 Item_CheckObtainability(u8 item);
|
||||
void Inventory_DeleteItem(s16 item, s16 slot);
|
||||
@@ -2589,8 +2589,8 @@ s32 func_80178A94(s32 param_1, s32 param_2);
|
||||
// void func_80178C80(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
// void func_80178D7C(void);
|
||||
// void func_80178DAC(void);
|
||||
// void func_80178E3C(void);
|
||||
// void func_80178E7C(void);
|
||||
void func_80178E3C(u8*, s32, s32, s32);
|
||||
void func_80178E7C(uintptr_t arg0, void* arg1, size_t size);
|
||||
// void Check_WriteRGBA16Pixel(u16* buffer, u32 x, u32 y, u32 value);
|
||||
// void Check_WriteI4Pixel(u16* buffer, u32 x, u32 y, u32 value);
|
||||
// void Check_DrawI4Texture(u16* buffer, u32 x, u32 y, u32 width, u32 height, u8* texture);
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@
|
||||
#define R_ENABLE_ARENA_DBG SREG(0) // Same as OoT
|
||||
#define R_RUN_SPEED_LIMIT REG(45)
|
||||
#define R_UPDATE_RATE SREG(30)
|
||||
#define R_PAUSE_MENU_MODE SREG(94)
|
||||
#define R_PAUSE_BG_PRERENDER_STATE SREG(94)
|
||||
#define R_PLAY_FILL_SCREEN_ON MREG(64)
|
||||
#define R_PLAY_FILL_SCREEN_R MREG(65)
|
||||
#define R_PLAY_FILL_SCREEN_G MREG(66)
|
||||
|
||||
@@ -53,7 +53,9 @@ DECLARE_ROM_SEGMENT(map_grand_static)
|
||||
DECLARE_ROM_SEGMENT(item_name_static)
|
||||
DECLARE_ROM_SEGMENT(map_name_static)
|
||||
DECLARE_ROM_SEGMENT(icon_item_static_test)
|
||||
DECLARE_ROM_SEGMENT(icon_item_static_old)
|
||||
DECLARE_ROM_SEGMENT(icon_item_24_static_test)
|
||||
DECLARE_ROM_SEGMENT(icon_item_24_static_old)
|
||||
DECLARE_ROM_SEGMENT(schedule_dma_static_test)
|
||||
DECLARE_ROM_SEGMENT(schedule_static)
|
||||
DECLARE_ROM_SEGMENT(story_static)
|
||||
|
||||
+2
-2
@@ -797,7 +797,7 @@ extern TexturePtr gItemIcons[];
|
||||
extern u8 gItemSlots[];
|
||||
extern s16 gItemPrices[];
|
||||
extern u16 gSceneIdsPerRegion[11][27];
|
||||
extern u32 D_801C2410[];
|
||||
extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
|
||||
extern s16 gPlayerFormObjectIndices[8];
|
||||
extern RomFile gObjectTable[643];
|
||||
extern SceneTableEntry gSceneTable[];
|
||||
@@ -826,7 +826,7 @@ extern struct_801C5F44 D_801C5F44[]; // D_801C5F44
|
||||
// extern UNK_TYPE2 D_801C6A8C;
|
||||
// extern UNK_TYPE2 D_801C6A90;
|
||||
// extern UNK_TYPE2 D_801C6A94;
|
||||
// extern UNK_TYPE1 D_801C6A98;
|
||||
extern u8 D_801C6A98[5][5];
|
||||
// extern UNK_TYPE1 D_801C6AB8;
|
||||
// extern UNK_TYPE1 D_801C6B28;
|
||||
// extern UNK_TYPE1 D_801CED40;
|
||||
|
||||
+19
-19
@@ -386,10 +386,10 @@ typedef struct {
|
||||
/* 0x000 */ View view;
|
||||
/* 0x168 */ u8* iconItemSegment;
|
||||
/* 0x16C */ u8* iconItem24Segment;
|
||||
/* 0x170 */ u8* unk_170;
|
||||
/* 0x174 */ u8* unk_174;
|
||||
/* 0x178 */ u8* unk_178;
|
||||
/* 0x17C */ u8* unk_17C;
|
||||
/* 0x170 */ u8* iconItemAltSegment;
|
||||
/* 0x174 */ u8* iconItemLangSegment;
|
||||
/* 0x178 */ u8* nameSegment;
|
||||
/* 0x17C */ u8* iconItemVtxSegment;
|
||||
/* 0x180 */ Vtx* itemPageVtx;
|
||||
/* 0x184 */ Vtx* mapPageVtx;
|
||||
/* 0x188 */ Vtx* questPageVtx;
|
||||
@@ -402,24 +402,24 @@ typedef struct {
|
||||
/* 0x1A4 */ Vtx* unk_1A4;
|
||||
/* 0x1A8 */ Vtx* cursorVtx;
|
||||
/* 0x1AC */ OcarinaStaff* ocarinaStaff;
|
||||
/* 0x1B0 */ DmaRequest unk_1B0;
|
||||
/* 0x1B0 */ UNK_TYPE1 unk_1B0[0x20];
|
||||
/* 0x1D0 */ OSMesgQueue loadQueue;
|
||||
/* 0x1E8 */ OSMesg loadMsg;
|
||||
/* 0x1EC */ u16 state;
|
||||
/* 0x1EE */ u16 debugEditor;
|
||||
/* 0x1F0 */ u8 bombersNotebookOpen;
|
||||
/* 0x1F4 */ Vec3f eye;
|
||||
/* 0x200 */ u16 unk_200;
|
||||
/* 0x202 */ u16 mode;
|
||||
/* 0x200 */ u16 mainState;
|
||||
/* 0x202 */ u16 nextPageMode; // (2 * prev pageIndex) + (scroll left ? 1 : 0)
|
||||
/* 0x204 */ u16 pageIndex;
|
||||
/* 0x206 */ u16 unk_206;
|
||||
/* 0x208 */ u16 unk_208;
|
||||
/* 0x206 */ u16 switchPageTimer;
|
||||
/* 0x208 */ u16 savePromptState;
|
||||
/* 0x20C */ f32 unk_20C;
|
||||
/* 0x210 */ f32 unk_210;
|
||||
/* 0x214 */ f32 unk_214;
|
||||
/* 0x218 */ f32 unk_218;
|
||||
/* 0x21C */ f32 unk_21C;
|
||||
/* 0x220 */ f32 unk_220;
|
||||
/* 0x210 */ f32 itemPageRoll; // rotation (-z) of the item page into the screen
|
||||
/* 0x214 */ f32 mapPageRoll; // rotation (+x) of the map page into the screen
|
||||
/* 0x218 */ f32 questPageRoll; // rotation (+z) of the quest page into the screen
|
||||
/* 0x21C */ f32 maskPageRoll; // rotation (-z) of the mask page into the screen
|
||||
/* 0x220 */ f32 roll;
|
||||
/* 0x224 */ u16 alpha;
|
||||
/* 0x226 */ s16 offsetY;
|
||||
/* 0x228 */ UNK_TYPE1 unk_228[0x8];
|
||||
@@ -431,7 +431,7 @@ typedef struct {
|
||||
/* 0x256 */ s16 unk_256; // Uses DungeonItem enum
|
||||
/* 0x258 */ s16 cursorSpecialPos;
|
||||
/* 0x25A */ s16 pageSwitchTimer;
|
||||
/* 0x25C */ u16 unk_25C;
|
||||
/* 0x25C */ u16 namedItem;
|
||||
/* 0x25E */ u16 cursorItem[5];
|
||||
/* 0x268 */ u16 cursorSlot[5];
|
||||
/* 0x272 */ u16 equipTargetItem;
|
||||
@@ -440,7 +440,7 @@ typedef struct {
|
||||
/* 0x278 */ s16 equipAnimX;
|
||||
/* 0x27A */ s16 equipAnimY;
|
||||
/* 0x27C */ s16 equipAnimAlpha;
|
||||
/* 0x27E */ s16 unk_27E;
|
||||
/* 0x27E */ s16 infoPanelOffsetY;
|
||||
/* 0x280 */ u16 unk_280;
|
||||
/* 0x282 */ u16 nameColorSet;
|
||||
/* 0x284 */ s16 cursorColorSet;
|
||||
@@ -454,9 +454,9 @@ typedef struct {
|
||||
/* 0x29E */ s16 promptAlpha;
|
||||
/* 0x2A0 */ s16 ocarinaSongIndex;
|
||||
/* 0x2A2 */ u8 worldMapPoints[20];
|
||||
/* 0x2B6 */ u8 unk_2B6;
|
||||
/* 0x2B7 */ u8 unk_2B7;
|
||||
/* 0x2B8 */ u8 unk_2B8;
|
||||
/* 0x2B6 */ u8 unk_2B6; // unused red?
|
||||
/* 0x2B7 */ u8 unk_2B7; // unused green?
|
||||
/* 0x2B8 */ u8 unk_2B8; // unused blue?
|
||||
/* 0x2B9 */ u8 itemDescriptionOn; // helpful description of item given through a message box
|
||||
/* 0x2BA */ s16 equipAnimScale; // scale of item icon while moving being equipped to c-button
|
||||
/* 0x2BC */ s16 equipAnimShrinkRate; // rate the scale is shrinking for the item icon while moving being equipped to c-button
|
||||
|
||||
Reference in New Issue
Block a user