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

Use intptr types in overlays and dmadata (#1325)

Browse source
This commit is contained in:
Roman971 2022-07-30 02:29:48 +02:00 • committed by GitHub
parent 3122143f96
commit 7254adec9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 73 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h
View file

@ -11,7 +11,7 @@ typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, PlayState*);
#define COBRA_SHADOW_TEX_WIDTH 64
#define COBRA_SHADOW_TEX_HEIGHT 64
#define COBRA_SHADOW_TEX_SIZE (COBRA_SHADOW_TEX_WIDTH * COBRA_SHADOW_TEX_HEIGHT * G_IM_SIZ_8b_BYTES)
#define COBRA_SHADOW_TEX_PTR(this) (u8*)ALIGN16((u32)(&this->shadowTextureBuffer))
#define COBRA_SHADOW_TEX_PTR(this) (u8*)ALIGN16((uintptr_t)&(this)->shadowTextureBuffer)
typedef struct BgJyaCobra {
/* 0x0000 */ DynaPolyActor dyna;

2
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -1864,7 +1864,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play) {
if (this->light.flicker == 0) {
this->light.flicker = 1;
} else {
disp = (Gfx*)(u32)gEffFlash1DL; // necessary to match, should be able to remove after fake matches are fixed
disp = (Gfx*)(uintptr_t)gEffFlash1DL; // necessary to match but probably fake
alpha = &this->light.alpha;
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1],

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View file

@ -859,7 +859,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
translateZ = this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z;
if (this->unk_150[i].unk_22 < 2) {
disp = (Gfx*)(u32)gEffFlash1DL;
disp = (Gfx*)(uintptr_t)gEffFlash1DL; // necessary to match but probably fake
if (linkAge != LINK_AGE_ADULT) {
Matrix_Translate(translateX, translateY, translateZ, MTXMODE_NEW);
} else {

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

@ -9311,7 +9311,7 @@ void Player_Init(Actor* thisx, PlayState* play2) {
Player_SetEquipmentData(play, this);
this->prevBoots = this->currentBoots;
Player_InitCommon(this, play, gPlayerSkelHeaders[((void)0, gSaveContext.linkAge)]);
this->giObjectSegment = (void*)(((u32)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF);
this->giObjectSegment = (void*)(((uintptr_t)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF);
respawnFlag = gSaveContext.respawnFlag;