dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify SetObjectSubpriorityByElevation (#737)

Browse Source 
* Simplify SetObjectSubpriorityByElevation

* 0xFF
This commit is contained in:
SiliconA-Z
2026-03-23 08:47:11 -04:00
committed by GitHub
parent 5bbc876c44
commit c1d63525d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+6 -6
View File
@@ -8413,12 +8413,12 @@ void ObjectEventUpdateElevation(struct ObjectEvent *objEvent)
void SetObjectSubpriorityByElevation(u8 elevation, struct Sprite *sprite, u8 subpriority) void SetObjectSubpriorityByElevation(u8 elevation, struct Sprite *sprite, u8 subpriority)
{ {
s32 tmp = sprite->centerToCornerVecY; u16 y;
u32 tmpa = *(u16 *)&sprite->y;
u32 tmpb = *(u16 *)&gSpriteCoordOffsetY; y = (sprite->y - sprite->centerToCornerVecY + gSpriteCoordOffsetY + 8) & 0xFF;
s32 tmp2 = (tmpa - tmp) + tmpb; y = (16 - (y >> 4)) << 1;
u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2;
sprite->subpriority = tmp3 + sElevationToSubpriority[elevation] + subpriority; sprite->subpriority = sElevationToSubpriority[elevation] + y + subpriority;
} }
static void ObjectEventUpdateSubpriority(struct ObjectEvent *objEvent, struct Sprite *sprite) static void ObjectEventUpdateSubpriority(struct ObjectEvent *objEvent, struct Sprite *sprite)