mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into doc/cutscene_index

Browse source
This commit is contained in:
feacur 2024-11-19 16:31:38 +01:00
commit 3530507e46
4 changed files with 95 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/z64player.h
View file

@ -7,6 +7,28 @@
struct Player;
#define PLAYER_GET_START_MODE(thisx) PARAMS_GET_S(thisx->params, 8, 4)
typedef enum PlayerStartMode {
/* 0 */ PLAYER_START_MODE_0,
/* 1 */ PLAYER_START_MODE_1,
/* 2 */ PLAYER_START_MODE_2,
/* 3 */ PLAYER_START_MODE_3,
/* 4 */ PLAYER_START_MODE_4,
/* 5 */ PLAYER_START_MODE_5,
/* 6 */ PLAYER_START_MODE_6,
/* 7 */ PLAYER_START_MODE_7,
/* 8 */ PLAYER_START_MODE_UNUSED_8, // Unused, behaves the same as PLAYER_START_MODE_14
/* 9 */ PLAYER_START_MODE_UNUSED_9, // Unused, behaves the same as PLAYER_START_MODE_14
/* 10 */ PLAYER_START_MODE_UNUSED_10, // Unused, behaves the same as PLAYER_START_MODE_14
/* 11 */ PLAYER_START_MODE_UNUSED_11, // Unused, behaves the same as PLAYER_START_MODE_14
/* 12 */ PLAYER_START_MODE_UNUSED_12, // Unused, behaves the same as PLAYER_START_MODE_14
/* 13 */ PLAYER_START_MODE_13,
/* 14 */ PLAYER_START_MODE_14,
/* 15 */ PLAYER_START_MODE_15,
/* 16 */ PLAYER_START_MODE_MAX
} PlayerStartMode;
typedef enum PlayerSword {
/* 0 */ PLAYER_SWORD_NONE,
/* 1 */ PLAYER_SWORD_KOKIRI,

2
src/code/z_kankyo.c
View file

@ -1,4 +1,4 @@
#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
#pragma increment_block_number "gc-eu:244 gc-eu-mq:244 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
"ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:248 pal-1.1:248"
#include "global.h"

103
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -153,17 +153,17 @@ s32 func_80835C08(Player* this, PlayState* play);
void Player_UseItem(PlayState* play, Player* this, s32 item);
void func_80839F90(Player* this, PlayState* play);
s32 func_8083C61C(PlayState* play, Player* this);
void func_8083CA20(PlayState* play, Player* this);
void func_8083CA54(PlayState* play, Player* this);
void func_8083CA9C(PlayState* play, Player* this);
void func_80846648(PlayState* play, Player* this);
void func_80846660(PlayState* play, Player* this);
void func_808467D4(PlayState* play, Player* this);
void func_808468A8(PlayState* play, Player* this);
void func_808468E8(PlayState* play, Player* this);
void func_80846978(PlayState* play, Player* this);
void func_808469BC(PlayState* play, Player* this);
void func_80846A68(PlayState* play, Player* this);
void Player_StartMode13(PlayState* play, Player* this);
void Player_StartMode14(PlayState* play, Player* this);
void Player_StartMode15(PlayState* play, Player* this);
void Player_StartMode0(PlayState* play, Player* this);
void Player_StartMode2(PlayState* play, Player* this);
void Player_StartMode1(PlayState* play, Player* this);
void Player_StartMode3(PlayState* play, Player* this);
void Player_StartMode4(PlayState* play, Player* this);
void Player_StartMode7(PlayState* play, Player* this);
void Player_StartMode5(PlayState* play, Player* this);
void Player_StartMode6(PlayState* play, Player* this);
void Player_UpdateCommon(Player* this, PlayState* play, Input* input);
void func_8084FF7C(Player* this);
void Player_UpdateBunnyEars(Player* this);
@ -6682,13 +6682,13 @@ s32 func_8083C910(PlayState* play, Player* this, f32 arg2) {
return 1;
}
void func_8083CA20(PlayState* play, Player* this) {
void Player_StartMode13(PlayState* play, Player* this) {
if (func_8083C910(play, this, 180.0f)) {
this->av2.actionVar2 = -20;
}
}
void func_8083CA54(PlayState* play, Player* this) {
void Player_StartMode14(PlayState* play, Player* this) {
this->speedXZ = 2.0f;
gSaveContext.entranceSpeed = 2.0f;
if (func_8083C910(play, this, 120.0f)) {
@ -6696,7 +6696,7 @@ void func_8083CA54(PlayState* play, Player* this) {
}
}
void func_8083CA9C(PlayState* play, Player* this) {
void Player_StartMode15(PlayState* play, Player* this) {
if (gSaveContext.entranceSpeed < 0.1f) {
gSaveContext.entranceSpeed = 0.1f;
}
@ -10504,12 +10504,12 @@ static ColliderQuadInit D_808546A0 = {
void func_8084663C(Actor* thisx, PlayState* play) {
}
void func_80846648(PlayState* play, Player* this) {
void Player_StartMode0(PlayState* play, Player* this) {
this->actor.update = func_8084663C;
this->actor.draw = NULL;
}
void func_80846660(PlayState* play, Player* this) {
void Player_StartMode2(PlayState* play, Player* this) {
Player_SetupAction(play, this, Player_Action_8084F710, 0);
if ((play->sceneId == SCENE_LAKE_HYLIA) && IS_CUTSCENE_LAYER) {
this->av1.actionVar1 = 1;
@ -10542,7 +10542,7 @@ void func_80846720(PlayState* play, Player* this, s32 arg2) {
static Vec3f D_808546F4 = { -1.0f, 69.0f, 20.0f };
void func_808467D4(PlayState* play, Player* this) {
void Player_StartMode1(PlayState* play, Player* this) {
Player_SetupAction(play, this, Player_Action_8084E9AC, 0);
this->stateFlags1 |= PLAYER_STATE1_29;
Math_Vec3f_Copy(&this->actor.world.pos, &D_808546F4);
@ -10559,14 +10559,14 @@ void func_808467D4(PlayState* play, Player* this) {
this->av2.actionVar2 = 20;
}
void func_808468A8(PlayState* play, Player* this) {
void Player_StartMode3(PlayState* play, Player* this) {
Player_SetupAction(play, this, Player_Action_8084F9A0, 0);
Player_StartAnimMovement(play, this,
ANIM_FLAG_UPDATE_XZ | ANIM_FLAG_UPDATE_Y | ANIM_FLAG_ENABLE_MOVEMENT |
ANIM_FLAG_ADJUST_STARTING_POS | ANIM_FLAG_OVERRIDE_MOVEMENT);
}
void func_808468E8(PlayState* play, Player* this) {
void Player_StartMode4(PlayState* play, Player* this) {
func_808389E8(this, &gPlayerAnim_link_normal_jump, 12.0f, play);
Player_SetupAction(play, this, Player_Action_8084F9C0, 0);
this->stateFlags1 |= PLAYER_STATE1_29;
@ -10574,11 +10574,11 @@ void func_808468E8(PlayState* play, Player* this) {
OnePointCutscene_Init(play, 5110, 40, &this->actor, CAM_ID_MAIN);
}
void func_80846978(PlayState* play, Player* this) {
void Player_StartMode7(PlayState* play, Player* this) {
func_80837C0C(play, this, PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE, 2.0f, 2.0f, this->actor.shape.rot.y + 0x8000, 0);
}
void func_808469BC(PlayState* play, Player* this) {
void Player_StartMode5(PlayState* play, Player* this) {
Player_SetupAction(play, this, Player_Action_8084F698, 0);
this->actor.draw = NULL;
this->stateFlags1 |= PLAYER_STATE1_29;
@ -10591,7 +10591,7 @@ Actor* Player_SpawnMagicSpell(PlayState* play, Player* this, s32 spell) {
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0);
}
void func_80846A68(PlayState* play, Player* this) {
void Player_StartMode6(PlayState* play, Player* this) {
this->actor.draw = NULL;
Player_SetupAction(play, this, Player_Action_8085076C, 0);
this->stateFlags1 |= PLAYER_STATE1_29;
@ -10636,33 +10636,31 @@ void Player_InitCommon(Player* this, PlayState* play, FlexSkeletonHeader* skelHe
Collider_SetQuad(play, &this->shieldQuad, &this->actor, &D_808546A0);
}
static void (*D_80854738[])(PlayState* play, Player* this) = {
/* 0x0 */ func_80846648,
/* 0x1 */ func_808467D4, // From time travel
/* 0x2 */ func_80846660,
/* 0x3 */ func_808468A8,
/* 0x4 */ func_808468E8,
/* 0x5 */ func_808469BC,
/* 0x6 */ func_80846A68,
/* 0x7 */ func_80846978,
/* 0x8 */ func_8083CA54,
/* 0x9 */ func_8083CA54,
/* 0xA */ func_8083CA54,
/* 0xB */ func_8083CA54,
/* 0xC */ func_8083CA54,
/* 0xD */ func_8083CA20,
/* 0xE */ func_8083CA54,
/* 0xF */ func_8083CA9C,
static void (*sStartModeFuncs[PLAYER_START_MODE_MAX])(PlayState* play, Player* this) = {
Player_StartMode0, // PLAYER_START_MODE_0
Player_StartMode1, // PLAYER_START_MODE_1
Player_StartMode2, // PLAYER_START_MODE_2
Player_StartMode3, // PLAYER_START_MODE_3
Player_StartMode4, // PLAYER_START_MODE_4
Player_StartMode5, // PLAYER_START_MODE_5
Player_StartMode6, // PLAYER_START_MODE_6
Player_StartMode7, // PLAYER_START_MODE_7
Player_StartMode14, // PLAYER_START_MODE_UNUSED_8
Player_StartMode14, // PLAYER_START_MODE_UNUSED_9
Player_StartMode14, // PLAYER_START_MODE_UNUSED_10
Player_StartMode14, // PLAYER_START_MODE_UNUSED_11
Player_StartMode14, // PLAYER_START_MODE_UNUSED_12
Player_StartMode13, // PLAYER_START_MODE_13
Player_StartMode14, // PLAYER_START_MODE_14
Player_StartMode15, // PLAYER_START_MODE_15
};
static Vec3f D_80854778 = { 0.0f, 50.0f, 0.0f };
void Player_Init(Actor* thisx, PlayState* play2) {
Player* this = (Player*)thisx;
PlayState* play = play2;
SceneTableEntry* scene = play->loadedScene;
u32 titleFileSize;
s32 initMode;
s32 startMode;
s32 respawnFlag;
s32 respawnMode;
@ -10684,9 +10682,12 @@ void Player_Init(Actor* thisx, PlayState* play2) {
this->heldItemId = ITEM_NONE;
Player_UseItem(play, this, ITEM_NONE);
Player_SetEquipmentData(play, this);
this->prevBoots = this->currentBoots;
Player_InitCommon(this, play, gPlayerSkelHeaders[((void)0, gSaveContext.save.linkAge)]);
// `giObjectSegment` is used for both "get item" objects and title cards. The maximum size for
// get item objects is 0x2000 (see the assert in func_8083AE40), and the maximum size for
// title cards is 0x1000 * LANGUAGE_MAX since each title card image includes all languages.
@ -10722,6 +10723,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
if ((respawnFlag == 0) || (respawnFlag < -1)) {
titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart;
if ((titleFileSize != 0) && gSaveContext.showTitleCard) {
if (!IS_CUTSCENE_LAYER &&
(gEntranceTable[((void)0, gSaveContext.save.entranceIndex) + ((void)0, gSaveContext.sceneLayer)].field &
@ -10736,6 +10738,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, 24, 20);
}
}
gSaveContext.showTitleCard = true;
}
@ -10749,18 +10752,22 @@ void Player_Init(Actor* thisx, PlayState* play2) {
gSaveContext.save.info.infTable[INFTABLE_1AX_INDEX] |= gBitFlags[play->sceneId];
}
initMode = PARAMS_GET_S(thisx->params, 8, 4);
if ((initMode == 5) || (initMode == 6)) {
startMode = PLAYER_GET_START_MODE(thisx);
if ((startMode == PLAYER_START_MODE_5) || (startMode == PLAYER_START_MODE_6)) {
if (gSaveContext.save.cutsceneIndex >= CS_INDEX_0) {
initMode = 13;
startMode = PLAYER_START_MODE_13;
}
}
D_80854738[initMode](play, this);
sStartModeFuncs[startMode](play, this);
if (initMode != 0) {
if (startMode != PLAYER_START_MODE_0) {
if ((gSaveContext.gameMode == GAMEMODE_NORMAL) || (gSaveContext.gameMode == GAMEMODE_END_CREDITS)) {
this->naviActor = Player_SpawnFairy(play, this, &thisx->world.pos, &D_80854778, FAIRY_NAVI);
static Vec3f sNaviSpawnPosOffset = { 0.0f, 50.0f, 0.0f };
this->naviActor = Player_SpawnFairy(play, this, &thisx->world.pos, &sNaviSpawnPosOffset, FAIRY_NAVI);
if (gSaveContext.dogParams != 0) {
gSaveContext.dogParams |= 0x8000;
}

18
sym_info.py
View file

@ -20,7 +20,23 @@ def symInfoMain():
if args.use_expected:
mapPath = "expected" / BUILTMAP
mapfile_parser.frontends.sym_info.doSymInfo(mapPath, args.symname)
# Guess if the input is an VROM/VRAM or a symbol name
as_vram = False
as_vrom = False
as_name = False
try:
address = int(args.symname, 0)
if address >= 0x01000000:
as_vram = True
else:
as_vrom = True
except ValueError:
as_name = True
mapfile_parser.frontends.sym_info.doSymInfo(
mapPath, args.symname, as_vram=as_vram, as_vrom=as_vrom, as_name=as_name
)
if __name__ == "__main__":
symInfoMain()