mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

Match Player_Init (player_actor OK) (#651)

Browse source
This commit is contained in:
Roman971 2021-01-21 14:48:21 +01:00 • committed by GitHub
parent 0e76c84c45
commit 70a3acf111
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9084,14 +9084,12 @@ void (*D_80854738[])(GlobalContext* globalCtx, Player* this) = {
Vec3f D_80854778 = { 0.0f, 50.0f, 0.0f };
#ifdef NON_MATCHING
// single regalloc difference
void Player_Init(Actor* thisx, GlobalContext* globalCtx2) {
Player* this = THIS;
GlobalContext* globalCtx = globalCtx2;
Scene* scene = globalCtx->loadedScene;
u32 titleFileSize;
s32 initMode;
s32 pad;
s32 sp50;
s32 sp4C;
@ -9146,7 +9144,8 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) {
}
if ((sp50 == 0) || (sp50 < -1)) {
if ((scene->titleFile.vromStart != scene->titleFile.vromEnd) && gSaveContext.showTitleCard) {
titleFileSize = scene->titleFile.vromEnd - scene->titleFile.vromStart;
if ((titleFileSize != 0) && gSaveContext.showTitleCard) {
if ((gSaveContext.sceneSetupIndex < 4) &&
(gEntranceTable[(0, gSaveContext.entranceIndex) + (0, gSaveContext.sceneSetupIndex)].field & 0x4000) &&
((globalCtx->sceneNum != SCENE_DDAN) || (gSaveContext.eventChkInf[11] & 1)) &&
@ -9200,9 +9199,6 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) {
Map_SavePlayerInitialInfo(globalCtx);
MREG(64) = 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s")
#endif
void func_808471F4(s16* pValue) {
s16 step;