github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-16 10:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update XMLs from upstream (#1448)

Browse source 
* litle less than half way

* done?

* revert ganon for now

* anime1

* anime 2-3

* object_ganon

* rest of gaBon

* missed some changes

* player
This commit is contained in:
louist103 2022-09-18 23:29:24 -04:00 • committed by GitHub
parent e2e0a070ea
commit e76890a796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 5442 additions and 5572 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/src/code/z_actor.c
View file

@ -885,7 +885,7 @@ void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCt
texture = gFairysFountainTitleCardENGTex;
break;
case SCENE_HAKAANA_OUKE:
texture = gRoyalFamilysTumbTitleCardENGTex;
texture = gRoyalFamilysTombTitleCardENGTex;
break;
case SCENE_SYATEKIJYOU:
texture = gShootingGalleryTitleCardENGTex;

2
soh/src/code/z_draw.c
View file

@ -371,7 +371,7 @@ DrawItemTableEntry sDrawItemTable[] = {
// kokiri sword, OBJECT_GI_SWORD_1
{ GetItem_DrawOpa0, { gGiKokiriSwordDL } },
// gold skulltula token, OBJECT_ST
{ GetItem_DrawSkullToken, { object_st_DL_004DB0, object_st_DL_004EB8 } },
{ GetItem_DrawSkullToken, { gSkulltulaTokenDL, gSkulltulaTokenFlameDL } },
{ GetItem_DrawJewelKokiri, { gGiKokiriEmeraldGemDL, gGiKokiriEmeraldSettingDL } },
{ GetItem_DrawJewelGoron, { gGiGoronRubyGemDL, gGiGoronRubySettingDL } },

8
soh/src/code/z_fbdemo_circle.c
View file

@ -43,16 +43,16 @@ void TransitionCircle_Start(void* thisx) {
switch (this->effect) {
case 1:
this->texture = sCircleWipeWaveTex;
this->texture = sTransCircleWaveTex;
break;
case 2:
this->texture = sCircleWipeRippleTex;
this->texture = sTransCircleRippleTex;
break;
case 3:
this->texture = sCircleWipeStarburstTex;
this->texture = sTransCircleStarburstTex;
break;
default:
this->texture = sCircleWipeDefaultTex;
this->texture = sTransCircleNormalTex;
break;
}

10
soh/src/code/z_parameter.c
View file

@ -3168,11 +3168,11 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
}
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMagicBorder.r, sMagicBorder.g, sMagicBorder.b, interfaceCtx->magicAlpha);
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicBarEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10);
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, PosX_Start, magicBarY, 8, 16, 1 << 10, 1 << 10);
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicBarMidTex, 24, 16, PosX_MidEnd, magicBarY, gSaveContext.unk_13F4, 16, 1 << 10, 1 << 10);
OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, PosX_MidEnd, magicBarY, gSaveContext.unk_13F4, 16, 1 << 10, 1 << 10);
gDPLoadTextureBlock(OVERLAY_DISP++, gMagicBarEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 16, 0,
gDPLoadTextureBlock(OVERLAY_DISP++, gMagicMeterEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 16, 0,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPWideTextureRectangle(OVERLAY_DISP++, ((rMagicBarX + gSaveContext.unk_13F4) + 8) << 2, magicBarY << 2,
@ -3192,7 +3192,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_yellow.r, magicbar_yellow.g, magicbar_yellow.b, interfaceCtx->magicAlpha);
}
gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicBarFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD);
@ -3219,7 +3219,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, magicbar_green.r, magicbar_green.g, magicbar_green.b, interfaceCtx->magicAlpha);
}
gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicBarFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
gDPLoadMultiBlock_4b(OVERLAY_DISP++, gMagicMeterFillTex, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD);

44
soh/src/code/z_player_lib.c
View file

@ -1494,7 +1494,7 @@ u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) {
gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800);
SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_003238, 9,
SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[gSaveContext.linkAge], &gPlayerAnim_link_normal_wait, 9,
ptr, ptr, PLAYER_LIMB_MAX);
return size + 0x8800 + 0x90;
@ -1676,20 +1676,20 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime,
uintptr_t* PauseMenuAnimSet[15][4] = {
{ 0, 0, 0, 0 }, // 0 = none
// IDLE // Two Handed // No shield // Kid Hylian Shield
{ gPlayerAnim_003238, gPlayerAnim_002BE0, gPlayerAnim_003240, gPlayerAnim_003240 }, // Idle
{ gPlayerAnim_003200, gPlayerAnim_003200, gPlayerAnim_003200, gPlayerAnim_003200 }, // Idle look around
{ gPlayerAnim_0033E0, gPlayerAnim_0033E0, gPlayerAnim_0033E0, gPlayerAnim_0033E0 }, // Idle Belt
{ gPlayerAnim_003418, gPlayerAnim_003418, gPlayerAnim_003418, gPlayerAnim_003418 }, // Idle shield adjust
{ gPlayerAnim_003420, gPlayerAnim_003428, gPlayerAnim_003420, gPlayerAnim_003420 }, // Idle test sword
{ gPlayerAnim_0033F0, gPlayerAnim_0033F0, gPlayerAnim_0033F0, gPlayerAnim_0033F0 }, // Idle yawn
{ gPlayerAnim_0025D0, gPlayerAnim_002BD0, gPlayerAnim_0025D0, gPlayerAnim_0025D0 }, // Battle Stance
{ gPlayerAnim_003290, gPlayerAnim_002BF8, gPlayerAnim_003290, gPlayerAnim_003290 }, // Walking (No shield)
{ gPlayerAnim_003268, gPlayerAnim_002BF8, gPlayerAnim_003268, gPlayerAnim_003268 }, // Walking (Holding shield)
{ gPlayerAnim_003138, gPlayerAnim_002B40, gPlayerAnim_003138, gPlayerAnim_003138 }, // Running (No shield)
{ gPlayerAnim_003140, gPlayerAnim_002B40, gPlayerAnim_003140, gPlayerAnim_003140 }, // Running (Holding shield)
{ gPlayerAnim_0031A8, gPlayerAnim_0031A8, gPlayerAnim_0031A8, gPlayerAnim_0031A8 }, // Hand on hip
{ gPlayerAnim_002AF0, gPlayerAnim_002928, gPlayerAnim_002AF0, gPlayerAnim_002AF0 }, // Spin Charge
{ gPlayerAnim_002820, gPlayerAnim_002820, gPlayerAnim_002820, gPlayerAnim_002820 }, // Look at hand
{ gPlayerAnim_link_normal_wait, gPlayerAnim_link_fighter_wait_long, gPlayerAnim_link_normal_wait_free, gPlayerAnim_link_normal_wait_free }, // Idle
{ gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f, gPlayerAnim_link_normal_waitF_typeA_20f }, // Idle look around
{ gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f, gPlayerAnim_link_waitF_itemA_20f }, // Idle Belt
{ gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f, gPlayerAnim_link_wait_itemC_20f }, // Idle shield adjust
{ gPlayerAnim_link_wait_itemD1_20f, gPlayerAnim_link_wait_itemD2_20f, gPlayerAnim_link_wait_itemD1_20f, gPlayerAnim_link_wait_itemD1_20f }, // Idle test sword
{ gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f, gPlayerAnim_link_waitF_typeD_20f }, // Idle yawn
{ gPlayerAnim_link_anchor_waitR, gPlayerAnim_link_fighter_waitR_long, gPlayerAnim_link_anchor_waitR, gPlayerAnim_link_anchor_waitR }, // Battle Stance
{ gPlayerAnim_link_normal_walk_free, gPlayerAnim_link_fighter_walk_long, gPlayerAnim_link_normal_walk_free, gPlayerAnim_link_normal_walk_free }, // Walking (No shield)
{ gPlayerAnim_link_normal_walk, gPlayerAnim_link_fighter_walk_long, gPlayerAnim_link_normal_walk, gPlayerAnim_link_normal_walk }, // Walking (Holding shield)
{ gPlayerAnim_link_normal_run, gPlayerAnim_link_fighter_run_long, gPlayerAnim_link_normal_run, gPlayerAnim_link_normal_run }, // Running (No shield)
{ gPlayerAnim_link_normal_run_free, gPlayerAnim_link_fighter_run_long, gPlayerAnim_link_normal_run_free, gPlayerAnim_link_normal_run_free }, // Running (Holding shield)
{ gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait, gPlayerAnim_link_normal_talk_free_wait }, // Hand on hip
{ gPlayerAnim_link_fighter_power_kiru_wait, gPlayerAnim_link_fighter_Lpower_kiru_wait, gPlayerAnim_link_fighter_power_kiru_wait, gPlayerAnim_link_fighter_power_kiru_wait }, // Spin Charge
{ gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait, gPlayerAnim_link_demo_look_hand_wait }, // Look at hand
};
s16 AnimArraySize = ARRAY_COUNT(PauseMenuAnimSet);
@ -1848,10 +1848,10 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime,
anim = PauseMenuAnimSet[SelectedAnim][EquipedStance];
//anim = gPlayerAnim_003428; // Use for biggoron sword?
//anim = gPlayerAnim_link_wait_itemD2_20f; // Use for biggoron sword?
if (CVar_GetS32("gPauseTriforce", 0)) {
anim = gPlayerAnim_002D00;
anim = gPlayerAnim_link_magic_kaze2;
sword = 0;
shield = 0;
}
@ -1871,17 +1871,17 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime,
if (!LINK_IS_ADULT) {
if (shield == PLAYER_SHIELD_DEKU) {
srcTable = D_040020D0;
srcTable = gLinkPauseChildDekuShieldJointTable;
} else {
srcTable = D_04002040;
srcTable = gLinkPauseChildJointTable;
}
} else {
if (sword == 3) {
srcTable = D_04002160;
srcTable = gLinkPauseAdultBgsJointTable;
} else if (shield != PLAYER_SHIELD_NONE) {
srcTable = D_04002280;
srcTable = gLinkPauseAdultShieldJointTable;
} else {
srcTable = D_040021F0;
srcTable = gLinkPauseAdultJointTable;
}
}

158
soh/src/code/z_vr_box.c
View file

@ -467,7 +467,7 @@ static const char* sSBVRFine0Tex[] =
static const char* sSBVRFine0Pal[] =
{
gSunriseSkyboxTlut
gSunriseSkyboxTLUT
};
static const char* sSBVRFine1Tex[] =
@ -477,7 +477,7 @@ static const char* sSBVRFine1Tex[] =
static const char* sSBVRFine1Pal[] =
{
gDaySkyboxTlut
gDaySkyboxTLUT
};
static const char* sSBVRFine2Tex[] =
@ -487,7 +487,7 @@ static const char* sSBVRFine2Tex[] =
static const char* sSBVRFine2Pal[] =
{
gSunsetSkyboxTlut
gSunsetSkyboxTLUT
};
static const char* sSBVRFine3Tex[] =
@ -497,7 +497,7 @@ static const char* sSBVRFine3Tex[] =
static const char* sSBVRFine3Pal[] =
{
gNightSkyboxTlut
gNightSkyboxTLUT
};
static const char* sSBVRCloud0Tex[] =
@ -507,7 +507,7 @@ static const char* sSBVRCloud0Tex[] =
static const char* sSBVRCloud0Pal[] =
{
gSunriseOvercastSkyboxTlut
gSunriseOvercastSkyboxTLUT
};
static const char* sSBVRCloud1Tex[] =
@ -517,7 +517,7 @@ static const char* sSBVRCloud1Tex[] =
static const char* sSBVRCloud1Pal[] =
{
gDayOvercastSkyboxTlut
gDayOvercastSkyboxTLUT
};
static const char* sSBVRCloud2Tex[] =
@ -527,7 +527,7 @@ static const char* sSBVRCloud2Tex[] =
static const char* sSBVRCloud2Pal[] =
{
gSunsetOvercastSkyboxTlut
gSunsetOvercastSkyboxTLUT
};
static const char* sSBVRCloud3Tex[] =
@ -537,7 +537,7 @@ static const char* sSBVRCloud3Tex[] =
static const char* sSBVRCloud3Pal[] =
{
gNightOvercastSkyboxTlut
gNightOvercastSkyboxTLUT
};
static const char* sSBVRHoly0Tex[] =
@ -547,7 +547,7 @@ static const char* sSBVRHoly0Tex[] =
static const char* sSBVRHoly0Pal[] =
{
gHoly0SkyboxTlut
gHoly0SkyboxTLUT
};
@ -656,8 +656,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gBazaarBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gBazaar2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gBazaarBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBazaarBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
case SKYBOX_HOUSE_LINK:
@ -668,10 +668,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gLinksHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gLinksHouse4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gLinksHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gLinksHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gLinksHouseBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gLinksHouseBg4TLUT, 16, 16);
break;
case SKYBOX_OVERCAST_SUNSET:
LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gSunsetOvercastSkybox1Tex, 128, 64, 0x0);
@ -680,7 +680,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTexAtOffset(skyboxCtx, 0, 3, gSunsetOvercastSkybox4Tex, 128, 64, 0x6000);
LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gSunsetOvercastSkybox5Tex, 128, 128, 0x8000);
LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTlut, 16, 8);
LoadSkyboxPalette(skyboxCtx, 0, gSunsetOvercastSkyboxTLUT, 16, 8);
break;
case SKYBOX_MARKET_ADULT:
skyboxCtx->unk_140 = 1;
@ -690,10 +690,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gMarketRuins3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gMarketRuins4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMarketRuinsBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketRuinsBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketRuinsBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketRuinsBg4TLUT, 16, 16);
break;
case SKYBOX_CUTSCENE_MAP:
LoadSkyboxTexAtOffset(skyboxCtx, 0, 0, gHoly0Skybox1Tex, 128, 64, 0x0);
@ -703,7 +703,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTexAtOffset(skyboxCtx, 0, 4, gHoly0Skybox5Tex, 128, 128, 0x8000);
LoadSkyboxTexAtOffset(skyboxCtx, 0, 5, gHoly0Skybox6Tex, 128, 128, 0xC000);
LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTlut, 16, 8);
LoadSkyboxPalette(skyboxCtx, 0, gHoly0SkyboxTLUT, 16, 8);
LoadSkyboxTexAtOffset(skyboxCtx, 1, 0, gHoly1Skybox1Tex, 128, 64, 0x0);
LoadSkyboxTexAtOffset(skyboxCtx, 1, 1, gHoly1Skybox2Tex, 128, 64, 0x2000);
@ -713,7 +713,7 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTexAtOffset(skyboxCtx, 1, 5, gHoly1Skybox6Tex, 128, 128, 0xC000);
LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTlut, 16, 8);
LoadSkyboxPalette(skyboxCtx, 1, gHoly1SkyboxTLUT, 16, 8);
break;
case SKYBOX_MARKET_CHILD_DAY:
skyboxCtx->unk_140 = 1;
@ -723,10 +723,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gMarketDay3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gMarketDay4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMarketDayBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketDayBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketDayBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketDayBg4TLUT, 16, 16);
break;
case SKYBOX_MARKET_CHILD_NIGHT:
skyboxCtx->unk_140 = 1;
@ -736,10 +736,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gMarketNight3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gMarketNight4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMarketNightBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketNightBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMarketNightBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gMarketNightBg4TLUT, 16, 16);
break;
case SKYBOX_HAPPY_MASK_SHOP:
skyboxCtx->unk_140 = 1;
@ -747,8 +747,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gMaskShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gMaskShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMaskShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMaskShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -760,10 +760,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gKnowItAllBrosHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gKnowItAllBrosHouse4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gKnowItAllBrosHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKnowItAllBrosHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gKnowItAllBrosHouseBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gKnowItAllBrosHouseBg4TLUT, 16, 16);
break;
case SKYBOX_HOUSE_OF_TWINS:
skyboxCtx->unk_140 = 2;
@ -772,9 +772,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 1, gHouseOfTwins2BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 2, gHouseOfTwins3BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gHouseOfTwinsBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gHouseOfTwinsBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gHouseOfTwinsBg3TLUT, 16, 16);
break;
case SKYBOX_STABLES:
skyboxCtx->unk_140 = 1;
@ -784,10 +784,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gStable3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gStable4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gStableBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gStableBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gStableBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gStableBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gStableBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gStableBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gStableBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gStableBg4TLUT, 16, 16);
break;
case SKYBOX_HOUSE_KAKARIKO:
skyboxCtx->unk_140 = 1;
@ -797,10 +797,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gCarpentersHouse4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gCarpentersHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCarpentersHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCarpentersHouseBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gCarpentersHouseBg4TLUT, 16, 16);
break;
case SKYBOX_KOKIRI_SHOP:
skyboxCtx->unk_140 = 1;
@ -808,8 +808,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gKokiriShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gKokiriShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gKokiriShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKokiriShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -819,8 +819,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gGoronShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gGoronShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gGoronShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gGoronShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -830,8 +830,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gZoraShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gZoraShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gZoraShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gZoraShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -841,8 +841,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gKakPotionShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gKakPotionShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gKakPotionShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gKakPotionShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -852,8 +852,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gMarketPotionShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gMarketPotionShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMarketPotionShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMarketPotionShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -863,8 +863,8 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 0, gBombchuShopBgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 1, gBombchuShop2BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gBombchuShopBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBombchuShopBg2TLUT, 16, 16);
skyboxCtx->rot.y = 0.8f;
break;
@ -876,10 +876,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gRichardsHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gRichardsHouse4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gRichardsHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gRichardsHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gRichardsHouseBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gRichardsHouseBg4TLUT, 16, 16);
break;
case SKYBOX_HOUSE_IMPA:
skyboxCtx->unk_140 = 1;
@ -889,10 +889,10 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 2, gCowHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 3, gCowHouse4BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gCowHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCowHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCowHouseBg3TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 3, gCowHouseBg4TLUT, 16, 16);
break;
case SKYBOX_TENT:
skyboxCtx->unk_140 = 2;
@ -901,9 +901,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 1, gCarpentersTent2BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 2, gCarpentersTent3BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gCarpentersTentBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gCarpentersTentBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gCarpentersTentBg3TLUT, 16, 16);
break;
case SKYBOX_HOUSE_MIDO:
skyboxCtx->unk_140 = 2;
@ -912,9 +912,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 1, gMidosHouse2BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 2, gMidosHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gMidosHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gMidosHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gMidosHouseBg3TLUT, 16, 16);
break;
case SKYBOX_HOUSE_SARIA:
skyboxCtx->unk_140 = 2;
@ -923,9 +923,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 1, gSariasHouse2BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 2, gSariasHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gSariasHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gSariasHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gSariasHouseBg3TLUT, 16, 16);
break;
case SKYBOX_HOUSE_ALLEY:
skyboxCtx->unk_140 = 2;
@ -934,9 +934,9 @@ void Skybox_Setup(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skybox
LoadSkyboxTex(skyboxCtx, 0, 1, gBackAlleyHouse2BgTex, 256, 256, 256, 256);
LoadSkyboxTex(skyboxCtx, 0, 2, gBackAlleyHouse3BgTex, 256, 256, 256, 256);
LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3Tlut, 16, 16);
LoadSkyboxPalette(skyboxCtx, 0, gBackAlleyHouseBgTLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 1, gBackAlleyHouseBg2TLUT, 16, 16);
LoadSkyboxPalette(skyboxCtx, 2, gBackAlleyHouseBg3TLUT, 16, 16);
break;
default:
break;