pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

most of pra (#924)

Browse Source 
* halfway

* five more

* mergin

* standardize foliage model lists

* alignment

* cleanup

* include reorg

* additional reorg

* more pra

* pra_19

* misc sprite

* missed sprite stuff

* enum value names

* FoldTypes

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-01-27 17:26:26 -05:00 committed by GitHub
parent dfff7bce1a
commit b5052b5bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
683 changed files with 7587 additions and 4813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common_structs.h
View File

@ -1579,7 +1579,7 @@ typedef struct ActorPart {
/* 0x78 */ u32* defenseTable;
/* 0x7C */ s32 eventFlags;
/* 0x80 */ s32 partFlags3;
/* 0x84 */ s32 unk_84;
/* 0x84 */ s32 spriteInstanceID;
/* 0x88 */ u32 currentAnimation;
/* 0x8C */ s32 animNotifyValue;
/* 0x90 */ f32 animationRate;
@ -1702,7 +1702,7 @@ typedef struct DecorationTable {
/* 0x7D9 */ s8 unk_7D9;
/* 0x7DA */ char unk_7DA;
/* 0x7DB */ s8 unk_7DB;
/* 0x7DC */ s16 scale[16];
/* 0x7DC */ s16 yaw[16];
/* 0x7FC */ s16 posX[16];
/* 0x81C */ s16 posY[16];
/* 0x83C */ s16 posZ[16];

8
include/macros.h
View File

@ -37,7 +37,7 @@
// standardized padding macros for map overlays
#define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {};
#define MAP_STATIC_PAD(n,name) static s32 N(static_pad_##name)[n];
#define MAP_STATIC_PAD(n,name) BSS s32 N(static_pad_##name)[n];
// standardized macro for reseting data section after a INCLUDE_ASM
//TODO these should all be removed after map decomp is done
@ -183,4 +183,10 @@
#define INTEGER_LOG2(x) ((x) <= 2 ? 1 : (x) <= 4 ? 2 : (x) <= 8 ? 3 : (x) <= 16 ? 4 : (x) <= 32 ? 5 : (x) <= 64 ? 6 : (x) <= 128 ? 7 : (x) <= 256 ? 8 : (x) <= 512 ? 9 : 10)
#define FOLIAGE_MODEL_LIST(names...) \
{ \
.count = __NARG__(names), \
.models = { names } \
}
#endif

4
src/16c8e0.c
View File

@ -1132,9 +1132,9 @@ void btl_delete_actor(Actor* actor) {
}
if (partsTable->idleAnimations != NULL) {
func_802DE894(partsTable->unk_84, 0, 0, 0, 0, 0, 0);
func_802DE894(partsTable->spriteInstanceID, 0, 0, 0, 0, 0, 0);
ASSERT(spr_free_sprite(partsTable->unk_84) == 0);
ASSERT(spr_free_sprite(partsTable->spriteInstanceID) == 0);
if (!(partsTable->flags & 0x80000000)) {
heap_free(partsTable->movement);

228
src/182B30.c
View File

@ -115,7 +115,7 @@ void enable_actor_blur(Actor* actor) {
decorationTable->posX[j] = partsTable->currentPos.x;
decorationTable->posY[j] = partsTable->currentPos.y;
decorationTable->posZ[j] = partsTable->currentPos.z;
decorationTable->scale[j] = actor->yaw;
decorationTable->yaw[j] = actor->yaw;
decorationTable->rotationPivotOffsetX[j] = (s32)(actor->rotationPivotOffset.x * actor->scalingFactor);
decorationTable->rotationPivotOffsetY[j] = (s32)(actor->rotationPivotOffset.y * actor->scalingFactor);
@ -202,7 +202,7 @@ void enable_player_blur(void) {
decorationTable->posX[i] = partsTable->currentPos.x;
decorationTable->posY[i] = partsTable->currentPos.y;
decorationTable->posZ[i] = partsTable->currentPos.z;
decorationTable->scale[i] = playerActor->yaw;
decorationTable->yaw[i] = playerActor->yaw;
decorationTable->rotationPivotOffsetX[i] = playerActor->rotationPivotOffset.x * playerActor->scalingFactor;
decorationTable->rotationPivotOffsetY[i] = playerActor->rotationPivotOffset.y * playerActor->scalingFactor;
@ -262,10 +262,10 @@ void func_802549F4(Actor* actor) {
decorationTable->posX[i] = partsTable->currentPos.x;
decorationTable->posY[i] = partsTable->currentPos.y;
decorationTable->posZ[i] = partsTable->currentPos.z;
decorationTable->scale[i] = actor->yaw;
decorationTable->yaw[i] = actor->yaw;
decorationTable->rotationPivotOffsetX[i] = (s32)(actor->rotationPivotOffset.x * actor->scalingFactor);
decorationTable->rotationPivotOffsetY[i] = (s32)(actor->rotationPivotOffset.y * actor->scalingFactor);
decorationTable->rotationPivotOffsetX[i] = actor->rotationPivotOffset.x * actor->scalingFactor;
decorationTable->rotationPivotOffsetY[i] = actor->rotationPivotOffset.y * actor->scalingFactor;
decorationTable->rotX[i] = clamp_angle(actor->rotation.x) * 0.5f;
decorationTable->rotY[i] = clamp_angle(actor->rotation.y) * 0.5f;
@ -286,7 +286,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
Matrix4f mtxTransform, mtxTemp;
s32 delay;
s32 num;
s32 scale;
s32 yaw;
ActorPart* partTable;
DecorationTable* decorationTable;
f32 rotX, rotY, rotZ;
@ -336,7 +336,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
y = decorationTable->posY[bufPos];
z = decorationTable->posZ[bufPos];
scale = decorationTable->scale[bufPos];
yaw = decorationTable->yaw[bufPos];
pivotOffsetX = decorationTable->rotationPivotOffsetX[bufPos];
pivotOffsetY = decorationTable->rotationPivotOffsetY[bufPos];
@ -375,7 +375,7 @@ void appendGfx_player_actor_blur(Actor* actor) {
guMtxCatF(mtxTemp, mtxTranslate, mtxTransform);
prevOpacity = partTable->opacity;
partTable->opacity = newOpacityBase - (num * newOpacityModulus);
func_802591EC(0, partTable, clamp_angle(scale + 180), mtxTransform, 1);
func_802591EC(0, partTable, clamp_angle(yaw + 180), mtxTransform, 1);
partTable->opacity = prevOpacity;
}
}
@ -398,7 +398,7 @@ void func_802550BC(s32 arg0, Actor* actor) {
decorationTable->posX[j] = partsTable->currentPos.x;
decorationTable->posY[j] = partsTable->currentPos.y;
decorationTable->posZ[j] = partsTable->currentPos.z;
decorationTable->scale[j] = actor->yaw;
decorationTable->yaw[j] = actor->yaw;
decorationTable->rotationPivotOffsetX[j] = actor->rotationPivotOffset.x;
decorationTable->rotationPivotOffsetY[j] = actor->rotationPivotOffset.y;
@ -428,7 +428,7 @@ void func_802552EC(s32 arg0, Actor* actor) {
s32 i, j, k, l;
f32 x, y, z;
f32 rotX, rotY, rotZ;
s32 scale;
s32 yaw;
s32 opacity;
s32 pivotX;
s32 pivotY;
@ -507,7 +507,7 @@ void func_802552EC(s32 arg0, Actor* actor) {
y = decorationTable->posY[j];
z = decorationTable->posZ[j];
scale = decorationTable->scale[j];
yaw = decorationTable->yaw[j];
pivotX = decorationTable->rotationPivotOffsetX[j];
pivotY = decorationTable->rotationPivotOffsetY[j];
@ -558,9 +558,9 @@ void func_802552EC(s32 arg0, Actor* actor) {
flags = ACTOR_PART_FLAG_80000000;
temp = phi_fp - l * phi_s6;
if (arg0 == 0) {
spr_draw_npc_sprite(partTable->unk_84 | flags, scale, temp, 0, mtxTransform);
spr_draw_npc_sprite(partTable->spriteInstanceID | flags, yaw, temp, 0, mtxTransform);
} else {
spr_draw_npc_sprite(partTable->unk_84 | flags, clamp_angle(scale + 0xB4), temp, 0, mtxTransform);
spr_draw_npc_sprite(partTable->spriteInstanceID | flags, clamp_angle(yaw + 180), temp, 0, mtxTransform);
}
}
}
@ -623,10 +623,10 @@ void update_actor_shadow(s32 arg0, Actor* actor) {
for (i = 0; i < numParts; i++) {
if (!(actorPart->flags & ACTOR_PART_FLAG_INVISIBLE) && actorPart->idleAnimations != NULL) {
spriteID = actorPart->unk_84;
spriteID = actorPart->spriteInstanceID;
if (spriteID >= 0) {
spr_update_sprite(spriteID, actorPart->currentAnimation, actorPart->animationRate);
actorPart->animNotifyValue = spr_get_notify_value(actorPart->unk_84);
actorPart->animNotifyValue = spr_get_notify_value(actorPart->spriteInstanceID);
}
if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
@ -903,7 +903,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
do {
if (actor->koStatus == 0) {
part->currentAnimation = func_80265CE8(part->idleAnimations, STATUS_TURN_DONE);
spr_update_sprite(part->unk_84, part->currentAnimation, part->animationRate);
spr_update_sprite(part->spriteInstanceID, part->currentAnimation, part->animationRate);
animChanged = TRUE;
}
} while (0); // required to match
@ -1062,10 +1062,10 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
enable_status_transparent(actor->hudElementDataIndex);
enable_status_chill_out(actor->hudElementDataIndex);
}
if (part->unk_84 >= 0) {
if (part->spriteInstanceID >= 0) {
if (lastAnim != part->currentAnimation) {
spr_update_sprite(part->unk_84, part->currentAnimation, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->unk_84);
spr_update_sprite(part->spriteInstanceID, part->currentAnimation, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
}
}
if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) {
@ -1112,7 +1112,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) {
part->currentPos.y = partPosY + part->unkOffset[1];
part->currentPos.z = partPosZ;
if (part->unk_84 >= 0) {
if (part->spriteInstanceID >= 0) {
if (!isPartner) {
func_8025C840(1, part, partYaw, 0);
func_8025CCC8(1, part, partYaw, 0);
@ -1301,7 +1301,7 @@ void update_player_actor_shadow(void) {
Shadow* shadow;
f32 x, y, z, distance;
parts->animNotifyValue = spr_update_player_sprite(0, parts->currentAnimation, parts->animationRate);
parts->animNotifyValue = spr_update_player_sprite(PLAYER_SPRITE_MAIN, parts->currentAnimation, parts->animationRate);
if (player->flags & ACTOR_FLAG_BLUR_ENABLED) {
func_802549F4(player);
@ -1538,7 +1538,7 @@ void appendGfx_player_actor(void* arg0) {
} else {
playerParts->currentAnimation = func_80265D44(0x12);
}
spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
cond1 = TRUE;
}
}
@ -1557,7 +1557,7 @@ void appendGfx_player_actor(void* arg0) {
if (player->stoneStatus == STATUS_STONE) {
playerParts->currentAnimation = func_80265D44(0xC);
spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
cond1 = TRUE;
if (!cond2) {
@ -1783,7 +1783,7 @@ end:
guMtxCatF(mtxTemp, mtxTranslate, mtxTransform);
if (lastAnim != playerParts->currentAnimation) {
spr_update_player_sprite(0, playerParts->currentAnimation, playerParts->animationRate);
spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerParts->currentAnimation, playerParts->animationRate);
}
func_8025C840(0, playerParts, clamp_angle(playerYaw + 180.0f), 0);
func_8025CCC8(0, playerParts, clamp_angle(playerYaw + 180.0f), 0);
@ -1842,30 +1842,30 @@ void appendGfx_player_actor_reflection(void* arg0) {
s32 func_802591EC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
s32 opacity;
s32 sprMask;
s32 sprDrawOpts;
if (part->flags & ACTOR_PART_FLAG_2) {
opacity = 255;
sprMask = 0;
sprDrawOpts = 0;
if (part->opacity < 255) {
sprMask = 0x80000000;
sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
opacity = opacity * 120 / 255;
sprMask = 0x80000000;
sprDrawOpts = DRAW_SPRITE_OVERRIDE_ALPHA;
}
if (arg0 == 0) {
if (opacity == 255) {
spr_draw_player_sprite(0, yaw, 0, NULL, mtx);
spr_draw_player_sprite(PLAYER_SPRITE_MAIN, yaw, 0, NULL, mtx);
} else {
spr_draw_player_sprite(sprMask, yaw, opacity, NULL, mtx);
spr_draw_player_sprite(PLAYER_SPRITE_MAIN | sprDrawOpts, yaw, opacity, NULL, mtx);
}
} else {
if (opacity == 255) {
spr_draw_npc_sprite(part->unk_84, yaw, 0, NULL, mtx);
spr_draw_npc_sprite(part->spriteInstanceID, yaw, 0, NULL, mtx);
} else {
spr_draw_npc_sprite(part->unk_84 | sprMask, yaw, opacity, NULL, mtx);
spr_draw_npc_sprite(part->spriteInstanceID | sprDrawOpts, yaw, opacity, NULL, mtx);
}
}
return 0;
@ -1922,8 +1922,8 @@ s32 func_802591EC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_80259494(ActorPart* part) {
DecorationTable* decor = part->decorationTable;
u16* src;
u16* dest;
PAL_PTR src;
PAL_PTR dest;
s32 i, j;
for (i = 0; i < decor->numSpritePalettes; i++) {
@ -1931,7 +1931,7 @@ void func_80259494(ActorPart* part) {
src = decor->unk_6D4[i];
dest = decor->copiedPalettes[1][i];
for (j = 0; j < 0x10; j++) {
for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[1][i]); j++) {
*dest = *src | 0xFFFE;
src++;
dest++;
@ -1946,16 +1946,16 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
DecorationTable* decor = part->decorationTable;
s32 opacity = 255;
s32 idMask = 0;
s32 ii, jj;
u16* dest;
u16* src;
PAL_PTR dest;
PAL_PTR src;
s32 i, j;
if (part->opacity < 0xFF) {
idMask = 0x80000000;
if (part->opacity < 255) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & 0x100) {
idMask = 0x80000000;
if (part->flags & ACTOR_PART_FLAG_100) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
@ -1966,11 +1966,11 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
decor->numSpritePalettes++;
}
for (ii = 0; ii < decor->numSpritePalettes; ii++) {
src = decor->spritePalettes[ii];
dest = decor->copiedPalettes[0][ii];
for (i = 0; i < decor->numSpritePalettes; i++) {
src = decor->spritePalettes[i];
dest = decor->copiedPalettes[0][i];
if (src != NULL) {
for (jj = 0; jj < 16; jj++) {
for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[0][i]); j++) {
*dest = *src;
src++;
dest++;
@ -1978,13 +1978,13 @@ void func_8025950C(ActorPart* part, s32 yaw, Matrix4f mtx) {
}
}
for (ii = 0; ii < decor->numSpritePalettes; ii++) {
decor->unk_6D4[ii] = decor->copiedPalettes[0][ii];
for (i = 0; i < decor->numSpritePalettes; i++) {
decor->unk_6D4[i] = decor->copiedPalettes[0][i];
}
func_802596C0(part, yaw, mtx);
} else {
spr_draw_npc_sprite(part->unk_84 | idMask, yaw, opacity, NULL, mtx);
spr_draw_npc_sprite(part->spriteInstanceID | idMask, yaw, opacity, NULL, mtx);
}
}
@ -1994,20 +1994,20 @@ void func_802596C0(ActorPart* part, s32 yaw, Matrix4f mtx) {
s32 idMask = 0;
if (part->opacity < 255) {
idMask = 0x80000000;
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & ACTOR_PART_FLAG_100) {
idMask = 0x80000000;
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
if (decorationTable->unk_768 != 0) {
func_80259494(part);
spr_draw_npc_sprite(part->unk_84 | 0x20000000 | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
spr_draw_npc_sprite(part->spriteInstanceID | DRAW_SPRITE_OVERRIDE_PALETTES | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
} else {
spr_draw_npc_sprite(part->unk_84 | 0x20000000 | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
spr_draw_npc_sprite(part->spriteInstanceID | DRAW_SPRITE_OVERRIDE_PALETTES | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
}
}
@ -2015,16 +2015,16 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
DecorationTable* decor = part->decorationTable;
s32 opacity = 255;
s32 idMask = 0;
s32 i, j;
PAL_PTR src;
PAL_PTR dest;
s32 i, j;
if (part->opacity < 255) {
idMask = 0x80000000;
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & 0x100) {
idMask = 0x80000000;
if (part->flags & ACTOR_PART_FLAG_100) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
@ -2040,7 +2040,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
src = decor->spritePalettes[i];
dest = decor->copiedPalettes[0][i];
if (decor->spritePalettes[i] != NULL) {
for (j = 0; j < 16; j++) {
for (j = 0; j < ARRAY_COUNT(decor->copiedPalettes[0][i]); j++) {
*dest = *src;
dest++;
src++;
@ -2052,7 +2052,7 @@ void func_802597B0(ActorPart* part, s32 yaw, Matrix4f mtx) {
}
func_8025995C(part, yaw, mtx);
} else {
spr_draw_player_sprite(idMask, yaw, opacity, NULL, mtx);
spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, NULL, mtx);
}
}
@ -2062,25 +2062,25 @@ void func_8025995C(ActorPart* part, s32 yaw, Matrix4f mtx) {
s32 idMask = 0;
if (part->opacity < 255) {
idMask = 0x80000000;
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = part->opacity;
}
if (part->flags & 0x100) {
idMask = 0x80000000;
if (part->flags & ACTOR_PART_FLAG_100) {
idMask = DRAW_SPRITE_OVERRIDE_ALPHA;
opacity = (opacity * 120) / 255;
}
if (decorationTable->unk_768 != 0) {
func_80259494(part);
idMask |= 0x20000000;
spr_draw_player_sprite(idMask, yaw, opacity, decorationTable->unk_76C, mtx);
idMask |= DRAW_SPRITE_OVERRIDE_PALETTES;
spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, decorationTable->unk_76C, mtx);
} else {
idMask |= 0x20000000;
spr_draw_player_sprite(idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
idMask |= DRAW_SPRITE_OVERRIDE_PALETTES;
spr_draw_player_sprite(PLAYER_SPRITE_MAIN | idMask, yaw, opacity, decorationTable->unk_6D4, mtx);
}
}
void func_80259A48(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_80259A48(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
if (decorationTable->unk_6C1 != 0) {
@ -2089,19 +2089,19 @@ void func_80259A48(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
part->unkOffset[1] = 0;
decorationTable->unk_6C1 = 0;
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802597B0(part, yaw, mtx);
} else {
func_8025950C(part, yaw, mtx);
}
}
void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_80259AAC(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
s32 i, j;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2141,7 +2141,7 @@ void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
switch (decorationTable->unk_6C2) {
case 0:
case 1:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2150,7 +2150,7 @@ void func_80259AAC(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
}
void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_80259D9C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
u16* palIn;
u16* palOut;
@ -2158,7 +2158,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
s32 temp;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2252,7 +2252,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2263,7 +2263,7 @@ void func_80259D9C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
}
void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025A2C4(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
u16* palIn;
u16* palOut;
@ -2271,7 +2271,7 @@ void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
s32 temp;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 2;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2319,21 +2319,21 @@ void func_8025A2C4(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6C8--;
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
}
}
void func_8025A50C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025A50C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
u16* palIn;
u16* palOut;
s32 i, j;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2377,21 +2377,21 @@ void func_8025A50C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
}
}
void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025A74C(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
u16* palIn;
u16* palOut;
s32 i, j;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2460,7 +2460,7 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
switch (decorationTable->unk_6CA) {
case 10:
case 12:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2470,7 +2470,7 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6CA = 0;
// fallthrough
default:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802597B0(part, yaw, mtx);
} else {
func_8025950C(part, yaw, mtx);
@ -2485,12 +2485,12 @@ void func_8025A74C(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
}
void func_8025AA80(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025AA80(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
s32 i, j;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2534,14 +2534,14 @@ void func_8025AA80(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
}
}
void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025AD90(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
PAL_PTR palIn;
PAL_PTR palOut;
@ -2549,7 +2549,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
s32 temp;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2633,7 +2633,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2644,7 +2644,7 @@ void func_8025AD90(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
}
void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025B1A8(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decorationTable = part->decorationTable;
u16* palIn;
u16* palOut;
@ -2652,7 +2652,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
s32 temp;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2736,7 +2736,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
decorationTable->unk_6D4[i] = decorationTable->copiedPalettes[0][i];
}
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2747,7 +2747,7 @@ void func_8025B1A8(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
}
void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s32 arg5) {
void func_8025B5C0(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s32 arg5) {
DecorationTable* decorationTable = part->decorationTable;
PAL_PTR color2;
PAL_PTR color1;
@ -2756,7 +2756,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
u8 alpha;
if (decorationTable->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decorationTable->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decorationTable->numSpritePalettes = 0;
while ((s32)decorationTable->spritePalettes[decorationTable->numSpritePalettes] != -1) {
@ -2863,7 +2863,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
switch (decorationTable->unk_6C2) {
case 0:
case 1:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -2872,7 +2872,7 @@ void func_8025B5C0(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4, s
}
}
void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s32 arg5) {
void func_8025BAA0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s32 arg5) {
DecorationTable* decor = part->decorationTable;
PAL_PTR color1;
PAL_PTR color2;
@ -2883,7 +2883,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
u8 r1, g1, b1;
if (decor->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decor->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decor->numSpritePalettes = 0;
while ((s32)decor->spritePalettes[decor->numSpritePalettes] != -1) {
@ -3030,7 +3030,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
case 1:
case 2:
case 3:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -3039,7 +3039,7 @@ void func_8025BAA0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3, Matrix4f mtx, s
}
}
void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
void func_8025C120(s32 isNpcSprite, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
DecorationTable* decor = part->decorationTable;
PAL_PTR color1;
PAL_PTR color2;
@ -3050,7 +3050,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
u8 r1, g1, b1;
if (decor->unk_6C1 != 0) {
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
decor->spritePalettes = spr_get_player_palettes(part->currentAnimation >> 16);
decor->numSpritePalettes = 0;
while (decor->spritePalettes[decor->numSpritePalettes] != (PAL_PTR) -1) {
@ -3196,7 +3196,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
case 1:
case 2:
case 3:
if (arg0 == 0) {
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_8025995C(part, yaw, mtx);
} else {
func_802596C0(part, yaw, mtx);
@ -3206,7 +3206,7 @@ void func_8025C120(s32 arg0, ActorPart* part, s32 yaw, Matrix4f mtx, s32 arg4) {
}
s32 func_8025C840(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
if (!(part->flags & 2)) {
if (!(part->flags & ACTOR_PART_FLAG_2)) {
switch (part->decorationTable->unk_750) {
case 0:
func_8025C8A0(arg0, part, yaw, arg3);
@ -3219,18 +3219,18 @@ s32 func_8025C840(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
return 0;
}
void func_8025C8A0(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
void func_8025C8A0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
if (part->decorationTable->unk_751 != 0) {
part->decorationTable->unk_751 = 0;
if (arg0 == 0) {
func_802DDFF8(0, 0, 0, 0, 0, 0, 0);
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(PLAYER_SPRITE_MAIN, 0, 0, 0, 0, 0, 0);
} else {
func_802DE894(part->unk_84, 0, 0, 0, 0, 0, 0);
func_802DE894(part->spriteInstanceID, 0, 0, 0, 0, 0, 0);
}
}
}
void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) {
DecorationTable* decor = part->decorationTable;
u8 rbuf[20];
u8 gbuf[20];
@ -3245,10 +3245,10 @@ void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
decor->unk75A = 0;
decor->unk_751 = 0;
decor->unk758 = 0;
if (arg0 == 0) {
func_802DDFF8(0, 0x11, 0x14, 0, 0, 0xFF, 0);
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(0, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0);
} else {
func_802DE894(part->unk_84, 0x11, 0x14, 0, 0, 0xFF, 0);
func_802DE894(part->spriteInstanceID, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0);
}
}
@ -3275,10 +3275,10 @@ void func_8025C918(s32 arg0, ActorPart* part, s32 yaw, s32 arg3) {
for (i = 0; i < ARRAY_COUNT(rbuf); i++) {
color = (rbuf[i] << 0x18) | (gbuf[i] << 0x10) | (bbuf[i] << 8) | alpha;
if (arg0 == 0) {
func_802DDFF8(0, 0xC, i, color, 0, 0xFF, 0);
if (isNpcSprite == SPRITE_MODE_PLAYER) {
func_802DDFF8(PLAYER_SPRITE_MAIN, 0xC, i, color, 0, 0xFF, 0);
} else {
func_802DE894(part->unk_84, 0xC, i, color, 0, 0xFF, 0);
func_802DE894(part->spriteInstanceID, 0xC, i, color, 0, 0xFF, 0);
}
}

24
src/190B20.c
View File

@ -977,7 +977,7 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) {
part = &actor->partsTable[0];
if (part->currentAnimation != animationIndex) {
part->currentAnimation = animationIndex;
spr_update_player_sprite(0, animationIndex, part->animationRate);
spr_update_player_sprite(PLAYER_SPRITE_MAIN, animationIndex, part->animationRate);
}
break;
case ACTOR_CLASS_PARTNER:
@ -993,16 +993,16 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) {
if (part->currentAnimation != animationIndex) {
part->currentAnimation = animationIndex;
spr_update_sprite(part->unk_84, animationIndex, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->unk_84);
spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
}
break;
case ACTOR_CLASS_ENEMY:
part = get_actor_part(actor, partIdx);
if (part->currentAnimation != animationIndex) {
part->currentAnimation = animationIndex;
spr_update_sprite(part->unk_84, animationIndex, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->unk_84);
spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
}
break;
}
@ -1015,15 +1015,15 @@ void func_80263E08(Actor* actor, ActorPart* part, s32 anim) {
case ACTOR_CLASS_PLAYER:
if (part->currentAnimation != anim) {
part->currentAnimation = anim;
spr_update_player_sprite(0, anim, part->animationRate);
spr_update_player_sprite(PLAYER_SPRITE_MAIN, anim, part->animationRate);
}
break;
case ACTOR_CLASS_PARTNER:
case ACTOR_CLASS_ENEMY:
if (part->currentAnimation != anim) {
part->currentAnimation = anim;
spr_update_sprite(part->unk_84, anim, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->unk_84);
spr_update_sprite(part->spriteInstanceID, anim, part->animationRate);
part->animNotifyValue = spr_get_notify_value(part->spriteInstanceID);
}
break;
}
@ -1605,11 +1605,11 @@ void load_partner_actor(void) {
part->animationRate = 1.0f;
part->currentAnimation = 0;
part->unk_84 = -1;
part->spriteInstanceID = -1;
if (part->idleAnimations != NULL) {
part->currentAnimation = func_80265CE8(part->idleAnimations, 1);
part->unk_84 = spr_load_npc_sprite(part->currentAnimation | SPRITE_ID_TAIL_ALLOCATE, NULL);
part->spriteInstanceID = spr_load_npc_sprite(part->currentAnimation | SPRITE_ID_TAIL_ALLOCATE, NULL);
}
if (i + 1 >= partCount) {
@ -1872,11 +1872,11 @@ Actor* create_actor(Formation formation) {
part->animationRate = 1.0f;
part->currentAnimation = 0;
part->unk_84 = -1;
part->spriteInstanceID = -1;
if (part->idleAnimations != NULL) {
part->currentAnimation = func_80265CE8(part->idleAnimations, 1) & ~SPRITE_ID_TAIL_ALLOCATE;
part->unk_84 = spr_load_npc_sprite(part->currentAnimation, NULL);
part->spriteInstanceID = spr_load_npc_sprite(part->currentAnimation, NULL);
}
if (j + 1 >= partCount) {

2
src/1A5830.c
View File

@ -3267,7 +3267,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) {
while (it != NULL) {
if (it->idleAnimations != NULL) {
func_802DE894(it->unk_84, 0, 0, 0, 0, 0, 0);
func_802DE894(it->spriteInstanceID, 0, 0, 0, 0, 0, 0);
}
it = it->nextPart;
}

32
src/77480.c
View File

@ -1386,7 +1386,7 @@ void player_sprite_behaviour(void) {
if (playerStatus->flags & PS_FLAG_TIME_STOPPED) {
timescale = 0.0f;
}
playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, timescale);
playerStatus->animNotifyValue = spr_update_player_sprite(PLAYER_SPRITE_MAIN, playerStatus->trueAnimation, timescale);
playerStatus->flags |= PS_FLAG_SPRITE_REDRAW;
}
@ -1465,11 +1465,11 @@ void render_player_model(void) {
}
playerStatus->renderMode = renderModeTemp;
func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
} else {
playerStatus->renderMode = RENDER_MODE_ALPHATEST;
func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
}
}
@ -1504,7 +1504,7 @@ void appendGfx_player(void* data) {
PlayerStatus* playerStatus = &gPlayerStatus;
Matrix4f sp20, sp60, spA0, spE0;
f32 temp_f0 = -gCameras[gCurrentCamID].currentYaw;
s32 flags;
s32 spriteIdx;
if (playerStatus->actionState == ACTION_STATE_SLIDING) {
guScaleF(spE0, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D, SPRITE_WORLD_SCALE_D);
@ -1514,7 +1514,7 @@ void appendGfx_player(void* data) {
guMtxCatF(sp20, spA0, sp20);
guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y - 1.0f, playerStatus->position.z);
guMtxCatF(sp20, sp60, sp20);
spr_draw_player_sprite(0, 0, 0, 0, sp20);
spr_draw_player_sprite(PLAYER_SPRITE_MAIN, 0, 0, 0, sp20);
} else {
guRotateF(spA0, temp_f0, 0.0f, -1.0f, 0.0f);
guRotateF(sp20, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@ -1535,24 +1535,24 @@ void appendGfx_player(void* data) {
if (playerStatus->animFlags & PA_FLAG_SHIVERING) {
playerStatus->animFlags = playerStatus->animFlags & ~PA_FLAG_SHIVERING;
playerStatus->shiverTime = 22;
func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
func_802DDFF8(playerStatus->anim, 5, 1, 1, 1, 0, 0);
}
if (playerStatus->shiverTime != 0) {
playerStatus->shiverTime--;
if (playerStatus->shiverTime == 0) {
func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0);
}
}
if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
flags = 0x10000000;
spriteIdx = PLAYER_SPRITE_MAIN | DRAW_SPRITE_UPSIDE_DOWN;
} else {
flags = 0;
spriteIdx = PLAYER_SPRITE_MAIN;
}
spr_draw_player_sprite(flags, 0, 0, 0, sp20);
spr_draw_player_sprite(spriteIdx, 0, 0, 0, sp20);
}
D_800F7B4C++;
@ -1575,7 +1575,7 @@ void appendGfx_player_spin(void* data) {
f32 px, py, pz;
s32 x, y, z;
s32 i;
s32 flags;
s32 spriteIdx;
for (i = 0; i < 2; i++) {
yaw = -gCameras[gCurrentCamID].currentYaw;
@ -1599,7 +1599,7 @@ void appendGfx_player_spin(void* data) {
tint = 100;
}
func_802DDFF8(0, 6, tint, tint, tint, 255, 0);
func_802DDFF8(0, FOLD_TYPE_6, tint, tint, tint, 255, 0);
guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
guRotateF(mtx, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f);
@ -1618,7 +1618,7 @@ void appendGfx_player_spin(void* data) {
px = playerStatus->position.x;
pz = playerStatus->position.z;
func_802DDEE4(0, -1, 7, 0, 0, 0, 64, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, 64, 0);
guRotateF(mtx, yaw, 0.0f, -1.0f, 0.0f);
guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f);
guRotateF(mtx, blurAngle, 0.0f, 1.0f, 0.0f);
@ -1639,12 +1639,12 @@ void appendGfx_player_spin(void* data) {
guMtxCatF(mtx, translation, mtx);
if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) {
flags = 0x10000000;
spriteIdx = PLAYER_SPRITE_MAIN | DRAW_SPRITE_UPSIDE_DOWN;
} else {
flags = 0;
spriteIdx = PLAYER_SPRITE_MAIN;
}
spr_draw_player_sprite(flags, 0, 0, 0, mtx);
spr_draw_player_sprite(spriteIdx, 0, 0, 0, mtx);
}
}

2
src/7fd10_len_b40.c
View File

@ -30,7 +30,7 @@ void func_800E6860(void) {
if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE && gPartnerActionStatus.actingPartner == PARTNER_BOW) {
Npc* partner = get_npc_unsafe(NPC_PARTNER);
func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 7, 0, 0, 0, playerStatus->alpha1, 0);
func_8003D624(partner, 7, playerStatus->alpha1, 0, 0, 0, 0);
playerStatus->alpha2 = 0;
}

2
src/C50A0.c
View File

@ -922,7 +922,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic
ItemEntitiesCreated++;
ASSERT(itemEntity != NULL);
itemEntity->renderGroup = ((u32)itemID >> 0x10) & 0xF;
itemEntity->renderGroup = (itemID & 0xF0000) >> 16;
if (itemEntity->renderGroup == VIS_GROUP_5) {
itemEntity->renderGroup = -1;
}

2
src/actor_api.c
View File

@ -2137,7 +2137,7 @@ ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) {
actorID = script->owner1.actorID;
}
evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_84);
evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->spriteInstanceID);
return ApiStatus_DONE2;
}

2
src/battle/area_arn/stage/arn_01.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_arn_arn_01
EvtScript N(beforeBattle_802278F0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_arn/stage/arn_02.c
View File

@ -20,7 +20,7 @@ EvtScript N(80227960) = {
};
EvtScript N(beforeBattle_80227A0C) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_SET(LVar0, 8)
EVT_EXEC_WAIT(N(80227960))
EVT_RETURN

2
src/battle/area_arn/stage/arn_03.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_arn_arn_03
EvtScript N(beforeBattle_80227A90) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_arn/stage/arn_04.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_arn_arn_04
EvtScript N(beforeBattle_80227B00) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_arn/stage/arn_05.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_arn_arn_05
EvtScript N(beforeBattle_80227B80) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_arn/stage/arn_06.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_arn_arn_06
EvtScript N(beforeBattle_80227C00) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dgb/stage/dgb_01.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_dgb_dgb_01
EvtScript N(beforeBattle_8021B050) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dgb/stage/dgb_02.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_dgb_dgb_02
EvtScript N(beforeBattle_8021B0B0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dgb/stage/dgb_03.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_dgb_dgb_03
EvtScript N(beforeBattle_8021B110) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dgb/stage/dgb_04.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_dgb_dgb_04
EvtScript N(beforeBattle_8021B170) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dgb/stage/dgb_05.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_dgb_dgb_05
EvtScript N(beforeBattle_8021B1D0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dig/stage/dig_01.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_dig_dig_01
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_dig/stage/dig_02.c
View File

@ -6,7 +6,7 @@
#define NAMESPACE b_area_dig_dig_02
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetGroupEnabled, MODEL_a, FALSE)
EVT_RETURN
EVT_END

2
src/battle/area_dig/stage/dig_03.c
View File

@ -29,7 +29,7 @@ EvtScript N(updateModels) = {
};
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_SET(LVar0, MODEL_g60)
EVT_SET(LVar1, 0)
EVT_EXEC(N(updateModels))

2
src/battle/area_dig/stage/dig_04.c
View File

@ -10,7 +10,7 @@ extern ActorBlueprint N(slot_machine_stop);
extern ActorBlueprint N(slot_machine_start);
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetTexPanner, 29, TEX_PANNER_A)
EVT_THREAD

2
src/battle/area_dig/stage/dig_05.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_dig_dig_05
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_flo/stage/flo_01.c
View File

@ -62,7 +62,7 @@ EvtScript N(802310C0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 1)
EVT_CALL(SetGroupEnabled, 28, 0)

2
src/battle/area_flo/stage/flo_01b.c
View File

@ -62,7 +62,7 @@ EvtScript N(80231560) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 0)
EVT_CALL(SetGroupEnabled, 28, 1)

2
src/battle/area_flo/stage/flo_01c.c
View File

@ -62,7 +62,7 @@ EvtScript N(802319F0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 0)
EVT_CALL(SetGroupEnabled, 28, 0)

2
src/battle/area_flo/stage/flo_02.c
View File

@ -62,7 +62,7 @@ EvtScript N(80231E90) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 1)
EVT_CALL(SetGroupEnabled, 47, 0)

2
src/battle/area_flo/stage/flo_02b.c
View File

@ -62,7 +62,7 @@ EvtScript N(80232310) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 0)
EVT_CALL(SetGroupEnabled, 47, 1)

2
src/battle/area_flo/stage/flo_02c.c
View File

@ -62,7 +62,7 @@ EvtScript N(802327C0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 1)
EVT_CALL(SetGroupEnabled, 47, 0)

2
src/battle/area_flo/stage/flo_03.c
View File

@ -78,7 +78,7 @@ s32 N(modelList)[] = {
};
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, N(modelList))
EVT_EXEC(N(80232A30))

2
src/battle/area_flo/stage/flo_04.c
View File

@ -26,7 +26,7 @@ EvtScript N(80233470) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, 14)
EVT_EXEC(N(80233470))

2
src/battle/area_flo/stage/flo_05.c
View File

@ -6,7 +6,7 @@
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_EXEC_WAIT(N(MakeSun))
EVT_RETURN

2
src/battle/area_flo/stage/flo_06.c
View File

@ -6,7 +6,7 @@
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_EXEC_WAIT(N(MakeSun))
EVT_RETURN

2
src/battle/area_flo2/stage/flo_01.c
View File

@ -62,7 +62,7 @@ EvtScript N(802310C0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 1)
EVT_CALL(SetGroupEnabled, 28, 0)

2
src/battle/area_flo2/stage/flo_01b.c
View File

@ -62,7 +62,7 @@ EvtScript N(80231560) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 0)
EVT_CALL(SetGroupEnabled, 28, 1)

2
src/battle/area_flo2/stage/flo_01c.c
View File

@ -62,7 +62,7 @@ EvtScript N(802319F0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 37, 0)
EVT_CALL(SetGroupEnabled, 28, 0)

2
src/battle/area_flo2/stage/flo_02.c
View File

@ -62,7 +62,7 @@ EvtScript N(80231E90) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 1)
EVT_CALL(SetGroupEnabled, 47, 0)

2
src/battle/area_flo2/stage/flo_02b.c
View File

@ -62,7 +62,7 @@ EvtScript N(80232310) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 0)
EVT_CALL(SetGroupEnabled, 47, 1)

2
src/battle/area_flo2/stage/flo_02c.c
View File

@ -62,7 +62,7 @@ EvtScript N(802327C0) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 35, 1)
EVT_CALL(SetGroupEnabled, 47, 0)

2
src/battle/area_flo2/stage/flo_03.c
View File

@ -78,7 +78,7 @@ s32 N(modelList)[] = {
};
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, N(modelList))
EVT_EXEC(N(80232A30))

2
src/battle/area_flo2/stage/flo_04.c
View File

@ -26,7 +26,7 @@ EvtScript N(80233470) = {
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, 14)
EVT_EXEC(N(80233470))

2
src/battle/area_flo2/stage/flo_05.c
View File

@ -6,7 +6,7 @@
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_EXEC_WAIT(N(MakeSun))
EVT_RETURN

2
src/battle/area_flo2/stage/flo_06.c
View File

@ -6,7 +6,7 @@
#include "common/MakeSun.inc.c"
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_EXEC_WAIT(N(MakeSun))
EVT_RETURN

2
src/battle/area_hos/stage/hos_00.c
View File

@ -25,7 +25,7 @@ EvtScript N(802255E0) = {
};
EvtScript N(beforeBattle_802256E8) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_THREAD
EVT_SET(LVar0, MODEL_h1)
EVT_EXEC(N(802255E0))

2
src/battle/area_hos/stage/hos_01.c
View File

@ -104,7 +104,7 @@ void func_80218CEC_47FD9C(s32 arg0) {
}
EvtScript N(beforeBattle_80224BD0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(MakeLocalVertexCopy, VTX_COPY_0, MODEL_o345, TRUE)
EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(func_802184C0_47F570), 0)

2
src/battle/area_isk_part_1/stage/isk_00.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_1_isk_00
EvtScript N(beforeBattle_802238B0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_1/stage/isk_01.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_1_isk_01
EvtScript N(beforeBattle_80223930) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_1/stage/isk_02b.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_isk_part_1_isk_02b
EvtScript N(beforeBattle_80223D90) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(EnableModel, MODEL_o365, FALSE)
EVT_CALL(EnableModel, MODEL_o366, FALSE)

2
src/battle/area_isk_part_1/stage/isk_02c.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_isk_part_1_isk_02c
EvtScript N(beforeBattle_80223E90) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(EnableModel, MODEL_kai2, 0)
EVT_CALL(EnableModel, MODEL_kai1, 0)

2
src/battle/area_isk_part_1/stage/isk_03.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_1_isk_03
EvtScript N(beforeBattle_80223A40) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_1/stage/isk_03b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_1_isk_03b
EvtScript N(beforeBattle_80223D10) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_1/stage/isk_04.c
View File

@ -21,7 +21,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223AC0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(N(CreateTorchFX))
EVT_RETURN

2
src/battle/area_isk_part_1/stage/isk_05.c
View File

@ -20,7 +20,7 @@ ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223B60) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(N(CreateTorchFX))
EVT_RETURN

2
src/battle/area_isk_part_1/stage/isk_06.c
View File

@ -17,7 +17,7 @@ ApiStatus func_80218A98_4E31D8(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223BF0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218A50_4E3190)
EVT_RETURN

2
src/battle/area_isk_part_1/stage/isk_06b.c
View File

@ -18,7 +18,7 @@ ApiStatus func_80218B78_4E32B8(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223F40) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(func_80218B30_4E3270)
EVT_CALL(EnableModel, MODEL_kesu, FALSE)

2
src/battle/area_isk_part_1/stage/isk_07.c
View File

@ -17,7 +17,7 @@ ApiStatus func_80218B08_4E3248(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223C80) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218AC0_4E3200)
EVT_RETURN

2
src/battle/area_isk_part_1/stage/isk_08.c
View File

@ -17,7 +17,7 @@ ApiStatus func_80218BE8_4E3328(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80223FE0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218BA0_4E32E0)
EVT_RETURN

2
src/battle/area_isk_part_2/stage/isk_00.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_2_isk_00
EvtScript N(beforeBattle_8021FCF0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_2/stage/isk_01.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_2_isk_01
EvtScript N(beforeBattle_8021FD70) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_2/stage/isk_02b.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_isk_part_2_isk_02b
EvtScript N(beforeBattle_8021FE80) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(EnableModel, MODEL_o365, FALSE)
EVT_CALL(EnableModel, MODEL_o366, FALSE)

2
src/battle/area_isk_part_2/stage/isk_02c.c
View File

@ -5,7 +5,7 @@
#define NAMESPACE b_area_isk_part_2_isk_02c
EvtScript N(beforeBattle_8021FF80) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(EnableModel, MODEL_kai2, 0)
EVT_CALL(EnableModel, MODEL_kai1, 0)

2
src/battle/area_isk_part_2/stage/isk_03.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_2_isk_03
EvtScript N(beforeBattle_80220030) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_2/stage/isk_03b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_isk_part_2_isk_03b
EvtScript N(beforeBattle_802200B0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_isk_part_2/stage/isk_04.c
View File

@ -21,7 +21,7 @@ ApiStatus func_802188E4_4EFD84(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80220130) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218850_4EFCF0)
EVT_RETURN

2
src/battle/area_isk_part_2/stage/isk_05.c
View File

@ -20,7 +20,7 @@ ApiStatus func_802189B0_4EFE50(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_802201D0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218920_4EFDC0)
EVT_RETURN

2
src/battle/area_isk_part_2/stage/isk_06.c
View File

@ -17,7 +17,7 @@ ApiStatus func_80218A38_4EFED8(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80220260) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_802189F0_4EFE90)
EVT_RETURN

2
src/battle/area_isk_part_2/stage/isk_06b.c
View File

@ -18,7 +18,7 @@ ApiStatus func_80218AA8_4EFF48(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_802202F0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0)
EVT_CALL(func_80218A60_4EFF00)
EVT_CALL(EnableModel, MODEL_kesu, FALSE)

2
src/battle/area_isk_part_2/stage/isk_07.c
View File

@ -17,7 +17,7 @@ ApiStatus func_80218B18_4EFFB8(Evt* script, s32 isInitialCall) {
}
EvtScript N(beforeBattle_80220390) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(func_80218AD0_4EFF70)
EVT_RETURN

2
src/battle/area_iwa/stage/iwa_01.c
View File

@ -10,7 +10,7 @@ extern ActorBlueprint N(whacka);
extern Formation N(specialFormation_802208E4);
EvtScript N(beforeBattle_80220860) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetGroupEnabled, MODEL_b, FALSE)
EVT_RETURN
EVT_END

2
src/battle/area_iwa/stage/iwa_01b.c
View File

@ -6,7 +6,7 @@
#define NAMESPACE b_area_iwa_iwa_01b
EvtScript N(beforeBattle_80221510) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetGroupEnabled, MODEL_a, FALSE)
EVT_RETURN
EVT_END

2
src/battle/area_iwa/stage/iwa_02.c
View File

@ -9,7 +9,7 @@
extern ActorBlueprint N(whacka);
EvtScript N(beforeBattle_80221590) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_jan/stage/jan_00.c
View File

@ -102,7 +102,7 @@ EvtScript N(80226C18) = {
};
EvtScript N(beforeBattle_802271C4) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, 32)
EVT_EXEC(N(80226B00))

2
src/battle/area_jan/stage/jan_01.c
View File

@ -101,7 +101,7 @@ EvtScript N(802273E8) = {
};
EvtScript N(beforeBattle_80227994) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 63, 0)
EVT_THREAD

2
src/battle/area_jan/stage/jan_01b.c
View File

@ -101,7 +101,7 @@ EvtScript N(80227BC8) = {
};
EvtScript N(beforeBattle_80228174) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 40, 0)
EVT_THREAD

2
src/battle/area_jan/stage/jan_02.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan_jan_02
EvtScript N(beforeBattle_80228290) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_jan/stage/jan_03.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan_jan_03
EvtScript N(beforeBattle_80228320) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 22, 0)
EVT_RETURN

2
src/battle/area_jan/stage/jan_03b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan_jan_03b
EvtScript N(beforeBattle_802283C0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 66, 0)
EVT_RETURN

2
src/battle/area_jan/stage/jan_04.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan_jan_04
EvtScript N(beforeBattle_80228460) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 65, 0)
EVT_RETURN

2
src/battle/area_jan/stage/jan_04b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan_jan_04b
EvtScript N(beforeBattle_802284F0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 33, 0)
EVT_RETURN

2
src/battle/area_jan2/stage/jan_00.c
View File

@ -102,7 +102,7 @@ EvtScript N(8021DC48) = {
};
EvtScript N(beforeBattle_8021E1F4) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_SET(LVar0, 32)
EVT_EXEC(N(8021DB30))

2
src/battle/area_jan2/stage/jan_01.c
View File

@ -101,7 +101,7 @@ EvtScript N(8021E418) = {
};
EvtScript N(beforeBattle_8021E9C4) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 63, 0)
EVT_THREAD

2
src/battle/area_jan2/stage/jan_01b.c
View File

@ -101,7 +101,7 @@ EvtScript N(8021EBF8) = {
};
EvtScript N(beforeBattle_8021F1A4) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 40, 0)
EVT_THREAD

2
src/battle/area_jan2/stage/jan_02.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan2_jan_02
EvtScript N(beforeBattle_8021F2C0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_RETURN
EVT_END

2
src/battle/area_jan2/stage/jan_03.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan2_jan_03
EvtScript N(beforeBattle_8021F350) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 22, 0)
EVT_RETURN

2
src/battle/area_jan2/stage/jan_03b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan2_jan_03b
EvtScript N(beforeBattle_8021F3F0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 66, 0)
EVT_RETURN

2
src/battle/area_jan2/stage/jan_04.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan2_jan_04
EvtScript N(beforeBattle_8021F490) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 65, 0)
EVT_RETURN

2
src/battle/area_jan2/stage/jan_04b.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_jan2_jan_04b
EvtScript N(beforeBattle_8021F520) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_CALL(SetGroupEnabled, 33, 0)
EVT_RETURN

2
src/battle/area_kgr/stage/kgr_01.c
View File

@ -6,7 +6,7 @@
#include "common/UnkModelStuff2.inc.c"
EvtScript N(beforeBattle_8021D3B4) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(SetCamBGColor, 1, 0, 0, 0)
EVT_THREAD
EVT_SET(LVar0, 19)

2
src/battle/area_kkj/stage/kpa_05.c
View File

@ -52,7 +52,7 @@ EvtScript N(createLightnings2) = {
};
EvtScript N(beforeBattle) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_EXEC(N(createLightnings1))
EVT_EXEC(N(createLightnings2))
EVT_RETURN

2
src/battle/area_kmr_part_1/stage/kmr_02.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_kmr_part_1_kmr_02
EvtScript N(beforeBattle_8021FDA0) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_kmr_part_1/stage/kmr_03.c
View File

@ -6,7 +6,7 @@
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80220188) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_SET(LVar0, 1)
EVT_SET(LVar2, 0)
EVT_EXEC(N(clouds1))

2
src/battle/area_kmr_part_1/stage/kmr_04.c
View File

@ -6,7 +6,7 @@
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_802205D8) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_SET(LVar0, 1)
EVT_SET(LVar2, 0)
EVT_EXEC(N(clouds1))

2
src/battle/area_kmr_part_1/stage/kmr_05.c
View File

@ -6,7 +6,7 @@
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80220A28) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(EnableModel, 27, 0)
EVT_RETURN
EVT_END

2
src/battle/area_kmr_part_1/stage/kmr_06.c
View File

@ -7,7 +7,7 @@
#include "common/UnkFogFunc.inc.c"
EvtScript N(beforeBattle_80220E28) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_CALL(N(UnkFogFunc))
EVT_SET(LVar0, 1)
EVT_SET(LVar2, 0)

11
src/battle/area_kmr_part_2/actor/goomnut_tree.c
View File

@ -306,15 +306,8 @@ EvtScript N(EVS_ShakeTree) = {
EVT_END
};
FoliageModelList N(tree_leaves) = {
.count = 2,
.models = { 33, 36 }
};
FoliageModelList N(tree_trunk) = {
.count = 3,
.models = { 38, 39, 40 }
};
FoliageModelList N(tree_leaves) = FOLIAGE_MODEL_LIST(33, 36 );
FoliageModelList N(tree_trunk) = FOLIAGE_MODEL_LIST(38, 39, 40 );
FoliageVectorList N(D_80223D60_41D7F0) = {
.count = 2,

2
src/battle/area_kmr_part_2/stage/kmr_02.c
View File

@ -4,7 +4,7 @@
#define NAMESPACE b_area_kmr_part_2_kmr_02
EvtScript N(beforeBattle_80224700) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_RETURN
EVT_END
};

2
src/battle/area_kmr_part_2/stage/kmr_03.c
View File

@ -6,7 +6,7 @@
#include "world/common/todo/clouds.inc.c"
EvtScript N(beforeBattle_80224AE8) = {
EVT_CALL(SetSpriteShading, -1)
EVT_CALL(SetSpriteShading, SHADING_NONE)
EVT_SET(LVar0, 1)
EVT_SET(LVar2, 0)
EVT_EXEC(N(clouds1))

Some files were not shown because too many files have changed in this diff Show More