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

misc docs

Browse Source
This commit is contained in:
engineer124
2022-09-29 21:13:54 -04:00
parent 615d945bf9
commit 9bf6bedd75
18 changed files with 448 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -1817,7 +1817,7 @@ void Interface_StartTimer(s16 timerId, s16 timeLimit);
void Interface_StartPostmanTimer(s16 timeLimit, s16 bunnyHoodState);
void Interface_NewDay(PlayState* play, s32 day);
void Interface_SetHudVisibility(u16 hudVisibility);
void func_80110038(PlayState* play);
void Interface_UpdateButtonsPart2(PlayState* play);
void Interface_SetSceneRestrictions(PlayState* play);
void Interface_InitMinigame(PlayState* play);
void Interface_LoadItemIconImpl(PlayState* play, u8 btn);
include/variables.h
+2 -2
View File
@@ -1020,8 +1020,8 @@ extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE1 D_801BF68C;
// extern UNK_TYPE1 D_801BF6C0;
// extern UNK_TYPE1 D_801BF79E;
// extern UNK_TYPE2 D_801BF884;
// extern UNK_TYPE2 D_801BF888;
// extern UNK_TYPE2 sPictographState;
// extern UNK_TYPE2 sPictographPhotoBeingTaken;
// extern UNK_TYPE2 sHBAScoreTier;
// extern UNK_TYPE2 sMinigameScoreDigits;
// extern UNK_TYPE2 sCUpInvisible;
include/z64.h
+1 -1
View File
@@ -1212,7 +1212,7 @@ struct PlayState {
/* 0x1883C */ Mtx* billboardMtx;
/* 0x18840 */ u32 gameplayFrames;
/* 0x18844 */ u8 unk_18844;
/* 0x18845 */ u8 unk_18845;
/* 0x18845 */ u8 haltAllActors;
/* 0x18846 */ s16 numSetupActors;
/* 0x18848 */ u8 numRooms;
/* 0x1884C */ RomFile* roomList;
include/z64actor.h
+1 -1
View File
@@ -309,7 +309,7 @@ typedef enum {
#define ACTORCTX_FLAG_0 (1 << 0)
#define ACTORCTX_FLAG_1 (1 << 1)
#define ACTORCTX_FLAG_2 (1 << 2)
#define ACTORCTX_FLAG_PICTOGRAPH_ON (1 << 2)
#define ACTORCTX_FLAG_3 (1 << 3)
#define ACTORCTX_FLAG_4 (1 << 4)
#define ACTORCTX_FLAG_5 (1 << 5)
include/z64player.h
+1 -1
View File
@@ -636,7 +636,7 @@ typedef struct Player {
/* 0xB5D */ u8 unk_B5D;
/* 0xB5E */ u8 unk_B5E;
/* 0xB5F */ u8 unk_B5F;
/* 0xB60 */ u16 unk_B60; // blast mask timer?
/* 0xB60 */ u16 blastMaskTimer;
/* 0xB62 */ s16 unk_B62;
/* 0xB64 */ u8 unk_B64;
/* 0xB65 */ u8 unk_B65;
include/z64save.h
+1 -1
View File
@@ -297,7 +297,7 @@ typedef struct SaveContext {
/* 0x0000 */ Save save;
/* 0x100C */ u8 eventInf[8]; // "event_inf"
/* 0x1014 */ u8 unk_1014; // "stone_set_flag"
/* 0x1015 */ u8 unk_1015;
/* 0x1015 */ u8 bButtonStatus;
/* 0x1016 */ u16 jinxTimer;
/* 0x1018 */ s16 rupeeAccumulator; // "lupy_udct"
/* 0x101A */ u8 bottleTimerStates[BOTTLE_MAX]; // See the `BottleTimerState` enum. "bottle_status"
src/code/code_8012EC80.c
+1 -1
View File
@@ -477,7 +477,7 @@ u16 gScenesPerRegion[11][27] = {
s32 Inventory_GetBtnBItem(PlayState* play) {
if (gSaveContext.buttonStatus[EQUIP_SLOT_B] == BTN_DISABLED) {
return ITEM_NONE;
} else if (gSaveContext.unk_1015 == ITEM_NONE) {
} else if (gSaveContext.bButtonStatus == BTN_DISABLED) {
return ITEM_NONE;
} else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) {
if (play->interfaceCtx.bButtonDoActionActive) {
src/code/z_demo.c
+2 -2
View File
@@ -233,10 +233,10 @@ void Cutscene_Command_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdBase* c
}
break;
case 0xE:
play->unk_18845 = 1;
play->haltAllActors = true;
break;
case 0xF:
play->unk_18845 = 0;
play->haltAllActors = false;
break;
case 0x10:
if (isStartFrame) {
src/code/z_kaleido_setup.c
+1 -1
View File
@@ -79,7 +79,7 @@ void KaleidoSetup_Update(PlayState* play) {
(gSaveContext.magicState != MAGIC_STATE_FILL)) {
if (!(gSaveContext.eventInf[1] & 0x80) && !(player->stateFlags1 & 0x20)) {
if (!(play->actorCtx.flags & ACTORCTX_FLAG_1) &&
!(play->actorCtx.flags & ACTORCTX_FLAG_2)) {
!(play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON)) {
if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) {
gSaveContext.prevHudVisibility = gSaveContext.hudVisibility;
pauseCtx->itemDescriptionOn = false;
src/code/z_parameter.c
+425 -418
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c
+1 -1
View File
@@ -273,7 +273,7 @@ void func_80A70F2C(BgCraceMovebg* this, PlayState* play) {
func_80A70C04(this, play);
if (Math_StepToF(&this->unk160, 0.0f, 1.0f)) {
if (!(this->unk170 & 2) && !Flags_GetSwitch(play, BGCRACEMOVEBG_GET_7F0(&this->dyna.actor) + 1)) {
play->unk_18845 = 1;
play->haltAllActors = true;
func_80169FDC(&play->state);
play_sound(NA_SE_OC_ABYSS);
}
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
+1 -1
View File
@@ -650,7 +650,7 @@ void func_80B814B8(BgIkanaRotaryroom* this, PlayState* play) {
func_800B8E58(player, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92);
func_80169EFC(&play->state);
func_800B8E58(player, NA_SE_VO_LI_TAKEN_AWAY + player->ageProperties->unk_92);
play->unk_18845 = 1;
play->haltAllActors = true;
play_sound(NA_SE_OC_ABYSS);
this->actionFunc = NULL;
}
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+1 -1
View File
@@ -216,7 +216,7 @@ void func_80953F9C(BgIngate* this, PlayState* play) {
if (ActorCutscene_GetCurrentIndex() != -1) {
Camera_ChangeSetting(mainCam, CAM_SET_NORMAL0);
player->stateFlags1 |= 0x20;
play->actorCtx.flags &= ~ACTORCTX_FLAG_2;
play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON;
} else {
Camera_ChangeSetting(mainCam, CAM_SET_BOAT_CRUISE);
player->stateFlags1 &= ~0x20;
src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+1 -1
View File
@@ -346,7 +346,7 @@ void EnKakasi_IdleStanding(EnKakasi* this, PlayState* play) {
EnKakasi_SetupDialogue(this);
return;
}
if (play->actorCtx.flags & ACTORCTX_FLAG_2) {
if (play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON) {
Actor_GetScreenPos(play, &this->picto.actor, &x, &y);
if (this->picto.actor.projectedPos.z > -20.0f && x > 0 && x < SCREEN_WIDTH && y > 0 && y < SCREEN_HEIGHT &&
this->animIndex != ENKAKASI_ANIM_SIDEWAYS_SHAKING) {
src/overlays/actors/ovl_En_Test4/z_en_test4.c
+2 -2
View File
@@ -385,8 +385,8 @@ void func_80A42AB8(EnTest4* this, PlayState* play) {
if ((temp_a3 * temp_a2) <= 0) {
gSaveContext.unk_3CA7 = 1;
if (play->actorCtx.flags & ACTORCTX_FLAG_2) {
play->actorCtx.flags &= ~ACTORCTX_FLAG_2;
if (play->actorCtx.flags & ACTORCTX_FLAG_PICTOGRAPH_ON) {
play->actorCtx.flags &= ~ACTORCTX_FLAG_PICTOGRAPH_ON;
}
if (temp_a0 != CLOCK_TIME(6, 0)) {
tools/disasm/functions.txt
+2 -2
View File
@@ -2104,8 +2104,8 @@
0x8010EF9C:("Interface_UpdateButtonAlphasByStatus",),
0x8010F0D4:("Interface_UpdateButtonAlphas",),
0x8010F1A8:("Interface_UpdateHudAlphas",),
0x80110038:("func_80110038",),
0x80111CB4:("func_80111CB4",),
0x80110038:("Interface_UpdateButtonsPart2",),
0x80111CB4:("Interface_UpdateButtonsPart1",),
0x801129E4:("Interface_SetSceneRestrictions",),
0x80112AF4:("Interface_Noop",),
0x80112AFC:("Interface_InitMinigame",),
tools/disasm/variables.txt
+2 -2
View File
@@ -1063,8 +1063,8 @@
0x801BF5C0:("D_801BF5C0","UNK_PTR","",0x4),
0x801BF68C:("D_801BF68C","UNK_TYPE1","",0x1),
0x801BF6C0:("sRestrictionFlags","RestrictionFlags","[113]",0x1c4),
0x801BF884:("D_801BF884","UNK_TYPE2","",0x2),
0x801BF888:("D_801BF888","UNK_TYPE2","",0x2),
0x801BF884:("sPictographState","UNK_TYPE2","",0x2),
0x801BF888:("sPictographPhotoBeingTaken","UNK_TYPE2","",0x2),
0x801BF88C:("sHBAScoreTier","UNK_TYPE2","",0x2),
0x801BF890:("sMinigameScoreDigits","UNK_TYPE2","",0x2),
0x801BF898:("sCUpInvisible","UNK_TYPE2","",0x2),
tools/sizes/code_functions.csv
+2 -2
View File
@@ -1618,8 +1618,8 @@ asm/non_matchings/code/z_parameter/Interface_SetHudVisibility.s,Interface_SetHud
asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphasByStatus.s,Interface_UpdateButtonAlphasByStatus,0x8010EF9C,0x4E
asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphas.s,Interface_UpdateButtonAlphas,0x8010F0D4,0x35
asm/non_matchings/code/z_parameter/Interface_UpdateHudAlphas.s,Interface_UpdateHudAlphas,0x8010F1A8,0x3A4
asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71F
asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C
asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart2.s,Interface_UpdateButtonsPart2,0x80110038,0x71F
asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart1.s,Interface_UpdateButtonsPart1,0x80111CB4,0x34C
asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s,Interface_SetSceneRestrictions,0x801129E4,0x44
asm/non_matchings/code/z_parameter/Interface_Noop.s,Interface_Noop,0x80112AF4,0x2
asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1618 asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphasByStatus.s Interface_UpdateButtonAlphasByStatus 0x8010EF9C 0x4E
1619 asm/non_matchings/code/z_parameter/Interface_UpdateButtonAlphas.s Interface_UpdateButtonAlphas 0x8010F0D4 0x35
1620 asm/non_matchings/code/z_parameter/Interface_UpdateHudAlphas.s Interface_UpdateHudAlphas 0x8010F1A8 0x3A4
1621 asm/non_matchings/code/z_parameter/func_80110038.s asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart2.s func_80110038 Interface_UpdateButtonsPart2 0x80110038 0x71F
1622 asm/non_matchings/code/z_parameter/func_80111CB4.s asm/non_matchings/code/z_parameter/Interface_UpdateButtonsPart1.s func_80111CB4 Interface_UpdateButtonsPart1 0x80111CB4 0x34C
1623 asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s Interface_SetSceneRestrictions 0x801129E4 0x44
1624 asm/non_matchings/code/z_parameter/Interface_Noop.s Interface_Noop 0x80112AF4 0x2
1625 asm/non_matchings/code/z_parameter/Interface_InitMinigame.s Interface_InitMinigame 0x80112AFC 0x11