mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 19:13:42 +00:00
Code Issues Projects Releases Wiki Activity

Match NTSC loose ends (#2004)

Browse source 
* Match NTSC loose ends

* Add comment about giObjectSegment size
This commit is contained in:
cadmic 2024-07-27 21:09:05 -07:00 • committed by GitHub
parent 7fcbf3f4b2
commit 067d06bb56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_actor.c
View file

@ -689,7 +689,7 @@ void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void*
SceneTableEntry* loadedScene = play->loadedScene; SceneTableEntry* loadedScene = play->loadedScene;
u32 size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart; u32 size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart;
if ((size != 0) && (size <= 0x3000)) { if ((size != 0) && (size <= 0x1000 * LANGUAGE_MAX)) {
DMA_REQUEST_SYNC(texture, loadedScene->titleFile.vromStart, size, "../z_actor.c", 2765); DMA_REQUEST_SYNC(texture, loadedScene->titleFile.vromStart, size, "../z_actor.c", 2765);
} }
@ -733,7 +733,15 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) {
OPEN_DISPS(play->state.gfxCtx, "../z_actor.c", 2824); OPEN_DISPS(play->state.gfxCtx, "../z_actor.c", 2824);
#if OOT_NTSC
if (gSaveContext.language == LANGUAGE_JPN) {
textureLanguageOffset = 0;
} else {
textureLanguageOffset = width * height;
}
#else
textureLanguageOffset = width * height * gSaveContext.language; textureLanguageOffset = width * height * gSaveContext.language;
#endif
height = (width * height > 0x1000) ? 0x1000 / width : height; height = (width * height > 0x1000) ? 0x1000 / width : height;
titleSecondY = titleY + (height * 4); titleSecondY = titleY + (height * 4);

3
src/code/z_common_data.c
View file

@ -24,4 +24,7 @@ void SaveContext_Init(void) {
gSaveContext.dogIsLost = true; gSaveContext.dogIsLost = true;
gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT; gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT;
gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL; gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL;
#if OOT_NTSC
gSaveContext.language = LANGUAGE_ENG;
#endif
} }

4
src/code/z_play.c
View file

@ -168,7 +168,11 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
break; break;
default: default:
#if OOT_NTSC
HUNGUP_AND_CRASH("../z_play.c", 2287);
#else
HUNGUP_AND_CRASH("../z_play.c", 2290); HUNGUP_AND_CRASH("../z_play.c", 2290);
#endif
break; break;
} }
} }

12
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -5759,8 +5759,18 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sStreamSfxPos, &sStreamSfxProjectedPos, &sProjectedW); SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &sStreamSfxPos, &sStreamSfxProjectedPos, &sProjectedW);
Sfx_PlaySfxAtPos(&sStreamSfxProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG); Sfx_PlaySfxAtPos(&sStreamSfxProjectedPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
// convert length to weight. Theoretical max of 59 lbs (127^2*.0036+.5)
#if OOT_NTSC
if (gSaveContext.language == LANGUAGE_JPN) {
gSaveContext.minigameScore = sFishLengthToWeigh;
} else {
// Convert length to weight. Theoretical max of 59 lbs (127^2*.0036+.5)
gSaveContext.minigameScore = (SQ((f32)sFishLengthToWeigh) * 0.0036f) + 0.5f; gSaveContext.minigameScore = (SQ((f32)sFishLengthToWeigh) * 0.0036f) + 0.5f;
}
#else
// Same as above, but for PAL
gSaveContext.minigameScore = (SQ((f32)sFishLengthToWeigh) * 0.0036f) + 0.5f;
#endif
#if OOT_DEBUG #if OOT_DEBUG
if (BREG(26) != 0) { if (BREG(26) != 0) {

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

@ -10113,7 +10113,11 @@ void Player_Init(Actor* thisx, PlayState* play2) {
Player_SetEquipmentData(play, this); Player_SetEquipmentData(play, this);
this->prevBoots = this->currentBoots; this->prevBoots = this->currentBoots;
Player_InitCommon(this, play, gPlayerSkelHeaders[((void)0, gSaveContext.save.linkAge)]); Player_InitCommon(this, play, gPlayerSkelHeaders[((void)0, gSaveContext.save.linkAge)]);
this->giObjectSegment = (void*)(((uintptr_t)ZELDA_ARENA_MALLOC(0x3008, "../z_player.c", 17175) + 8) & ~0xF); // `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.
this->giObjectSegment =
(void*)(((uintptr_t)ZELDA_ARENA_MALLOC(0x1000 * LANGUAGE_MAX + 8, "../z_player.c", 17175) + 8) & ~0xF);
respawnFlag = gSaveContext.respawnFlag; respawnFlag = gSaveContext.respawnFlag;