falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEGMENTED_TO_K0

This commit is contained in:
angie 2023-09-25 15:32:46 -03:00
parent 0976143c76
commit f8d62d670f
19 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/macros.h
View File

@ -21,7 +21,7 @@
#define ARRAY_COUNT_2D(arr) (ARRAY_COUNT(arr) * ARRAY_COUNT(arr[0]))
#define SEGMENTED_TO_VIRTUAL(addr) (void*)((gSegments[SEGMENT_NUMBER(addr)] + K0BASE) + SEGMENT_OFFSET(addr))
#define SEGMENTED_TO_K0(addr) (void*)((gSegments[SEGMENT_NUMBER(addr)] + K0BASE) + SEGMENT_OFFSET(addr))
#define GET_ACTIVE_CAM(play) ((play)->cameraPtrs[(play)->activeCamId])

2
src/code/z_bgcheck.c
View File

@ -3956,7 +3956,7 @@ s32 BgCheck_SphVsFirstDynaPoly(CollisionContext* colCtx, u16 xpFlags, CollisionP
}
/**
* SEGMENTED_TO_VIRTUAL CollisionHeader members
* SEGMENTED_TO_K0 CollisionHeader members
*/
void CollisionHeader_SegmentedToVirtual(CollisionHeader* colHeader) {
colHeader->vtxList = Lib_SegmentedToVirtual(colHeader->vtxList);

4
src/code/z_lib.c
View File

@ -699,14 +699,14 @@ void Lib_Nop801004FC(void) {
}
void* Lib_SegmentedToVirtual(void* ptr) {
return SEGMENTED_TO_VIRTUAL(ptr);
return SEGMENTED_TO_K0(ptr);
}
void* Lib_SegmentedToVirtualNull(void* ptr) {
if (((uintptr_t)ptr >> 28) == 0) {
return ptr;
} else {
return SEGMENTED_TO_VIRTUAL(ptr);
return SEGMENTED_TO_K0(ptr);
}
}

2
src/code/z_player_lib.c
View File

@ -2878,7 +2878,7 @@ void Player_DrawCircusLeadersMask(PlayState* play, Player* player) {
Matrix_Scale(scaleXZ, scaleY, scaleXZ, MTXMODE_APPLY);
gSPMatrix(&gfx[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(&gfx[1], 0x08, OS_K0_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex)));
gSPSegment(&gfx[1], 0x08, OS_K0_TO_PHYSICAL(SESEGMENTED_TO_K0EffBubble1Tex)));
gDPSetPrimColor(&gfx[2], 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(&gfx[3], 150, 150, 150, 0);
gSPDisplayList(&gfx[4], gEffBubbleDL);

4
src/overlays/actors/ovl_Boss_06/z_boss_06.c
View File

@ -147,7 +147,7 @@ void Boss06_Init(Actor* thisx, PlayState* play) {
this->actor.shape.rot.y = -0x8000;
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
temp_v0 = SEGMENTED_TO_VIRTUAL(&object_knight_Tex_019490);
temp_v0 = SEGMENTED_TO_K0(&object_knight_Tex_019490);
for (i = 0; i < ARRAY_COUNT(this->unk_200); i++) {
this->unk_200[i] = temp_v0[i];
}
@ -530,7 +530,7 @@ void Boss06_Draw(Actor* thisx, PlayState* play2) {
if (this->unk_144 & 2) {
temp_s0 = Math_SinS(D_809F4970->unk_144) * 1000.0f;
temp_f10 = (Math_CosS(D_809F4970->unk_144) * -2000.0f) - 2000.0f;
temp_v0_2 = SEGMENTED_TO_VIRTUAL(&object_knight_Vtx_018BD0);
temp_v0_2 = SEGMENTED_TO_K0(&object_knight_Vtx_018BD0);
temp_v0_2[0].v.ob[1] = (s16)this->unk_1A0 + 0xE92;
temp_v0_2[3].v.ob[1] = (s16)this->unk_1A0 + 0xE92;

2
src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
View File

@ -222,7 +222,7 @@ void DmBal_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
DmBal_OverrideLimbDraw, DmBal_PostLimbDraw, &this->actor);

2
src/overlays/actors/ovl_En_Bal/z_en_bal.c
View File

@ -1166,7 +1166,7 @@ void EnBal_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 8, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex]));
gSPSegment(POLY_OPA_DISP++, 8, SEGMENTED_TO_K0(sEyeTextures[this->eyeTexIndex]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnBal_OverrideLimbDraw, EnBal_PostLimbDraw, &this->picto.actor);

2
src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
View File

@ -1120,7 +1120,7 @@ void func_80B2ADB0(EnFish2* this, Vec3f* vec, s16 arg2) {
phi_v0 = gEffBubble1Tex;
}
ptr->unk_20 = OS_K0_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(phi_v0));
ptr->unk_20 = OS_K0_TO_PHYSICAL(SESEGMENTED_TO_K0hi_v0));
ptr->unk_00 = true;
ptr->unk_04 = *vec;
ptr->unk_04.x += Rand_CenteredFloat(ptr->unk_00 + (this->unk_330 * 4000.0f));

2
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View File

@ -769,7 +769,7 @@ void EnGe2_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL37_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->eyeIndex]));
func_800B8050(&this->picto.actor, play, 0);
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnGe2_OverrideLimbDraw, EnGe2_PostLimbDraw, &this->picto.actor);

4
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
View File

@ -388,8 +388,8 @@ void EnGuruguru_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->texIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->texIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->texIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_K0(sMouthTextures[this->texIndex]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnGuruguru_OverrideLimbDraw, NULL, &this->actor);

2
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
View File

@ -2144,7 +2144,7 @@ void EnKaizoku_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->eyeIndex]));
SkelAnime_DrawTransformFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, EnKaizoku_OverrideLimbDraw, EnKaizoku_PostLimbDraw,
EnKaizoku_TransformLimbDraw, &this->picto.actor);

4
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
View File

@ -1083,8 +1083,8 @@ void EnMa4_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->eyeTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_K0(sMouthTextures[this->mouthTexIndex]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMa4_OverrideLimbDraw, EnMa4_PostLimbDraw, &this->actor);

4
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
View File

@ -551,8 +551,8 @@ void EnMaYts_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_K0(sMouthTextures[this->mouthTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(sEyeTextures[this->eyeTexIndex]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnMaYts_OverrideLimbDraw, EnMaYts_PostLimbDraw, &this->actor);

6
src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
View File

@ -556,9 +556,9 @@ void EnPamera_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80BDA604[this->unk_312]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80BDA610[this->unk_314]));
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_80BDA5FC[this->unk_310]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(D_80BDA604[this->unk_312]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_K0(D_80BDA610[this->unk_314]));
gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_K0(D_80BDA5FC[this->unk_310]));
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnPamera_OverrideLimbDraw, EnPamera_PostLimbDraw, &this->actor);

2
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View File

@ -931,7 +931,7 @@ void EnSsh_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80976178[this->blinkState]));
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_K0(D_80976178[this->blinkState]));
SkelAnime_DrawOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSsh_OverrideLimbDraw,
EnSsh_PostLimbDraw, &this->actor);

2
src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
View File

@ -34,7 +34,7 @@ u32 EffectSsBubble_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
{
TexturePtr tex = (Rand_ZeroOne() < 0.5f) ? gEffBubble1Tex : gEffBubble2Tex;
this->gfx = OS_K0_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(tex));
this->gfx = OS_K0_TO_PHYSICAL(SESEGMENTED_TO_K0ex));
}
this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x;

2
src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
View File

@ -50,7 +50,7 @@ u32 EffectSsDtBubble_Init(PlayState* play, u32 index, EffectSs* this, void* init
{
TexturePtr tex = (Rand_ZeroOne() < 0.5f) ? gEffBubble1Tex : gEffBubble2Tex;
this->gfx = OS_K0_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(tex));
this->gfx = OS_K0_TO_PHYSICAL(SESEGMENTED_TO_K0ex));
}
Math_Vec3f_Copy(&this->pos, &initParams->pos);

2
src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
View File

@ -40,7 +40,7 @@ u32 EffectSsSibuki_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
{
TexturePtr tex = (KREG(2) != 0) ? gEffBubble2Tex : gEffBubble1Tex;
this->gfx = OS_K0_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(tex));
this->gfx = OS_K0_TO_PHYSICAL(SESEGMENTED_TO_K0ex));
}
this->life = ((s32)((Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10;

1
tools/namefixer.py
View File

@ -1207,6 +1207,7 @@ wordReplace = {
"WEEKEVENTREG_55_80": "WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE",
"VIRTUAL_TO_PHYSICAL": "OS_K0_TO_PHYSICAL",
"SEGMENTED_TO_VIRTUAL": "SEGMENTED_TO_K0",
# Enums
"TRANS_TYPE_00": "TRANS_TYPE_WIPE",