Decomped ov29_022E1AAC

Decomped by @chordtoll
This commit is contained in:
AnonymousRandomPerson 2024-10-28 21:06:08 -04:00
parent dd2bf7ca6b
commit 2f9c4d0018
5 changed files with 16 additions and 16 deletions

View File

@ -1,22 +1,8 @@
.include "asm/macros.inc"
.include "overlay_29_022E1AAC.inc"
.include "overlay_29_022E1AD4.inc"
.text
arm_func_start ov29_022E1AAC
ov29_022E1AAC: ; 0x022E1AAC
stmdb sp!, {r3, r4, r5, lr}
mov r5, r1
bl GetSpriteSize
mov r4, r0
mov r0, r5
bl ov29_022DE954
cmp r0, #0
movne r4, r4, lsl #1
mov r0, r4
ldmia sp!, {r3, r4, r5, pc}
arm_func_end ov29_022E1AAC
arm_func_start ov29_022E1AD4
ov29_022E1AD4: ; 0x022E1AD4
stmdb sp!, {r4, lr}

View File

@ -10,5 +10,6 @@ bool8 EntityIsValid__022E1A1C(struct entity *entity);
void UpdateEntityPixelPos(struct entity *entity, struct pixel_position *pixel_pos);
void SetEntityPixelPosXY(struct entity *entity, u32 x, u32 y);
void IncrementEntityPixelPosXY(struct entity *entity, u32 x, u32 y);
u32 ov29_022E1AAC(u32 param_0, u32 param_1);
#endif //PMDSKY_OVERLAY_29_022E1A1C_H

View File

@ -221,7 +221,7 @@ Overlay OVY_29
Object src/dg.o
Object asm/overlay_29_022E0378.o
Object src/dg_object.o
Object asm/overlay_29_022E1AAC.o
Object asm/overlay_29_022E1AD4.o
Object src/dg_camera.o
Object asm/overlay_29_022E330C.o
Object src/dg_effect.o

View File

@ -2,6 +2,9 @@
// file starts at 0x022e1608
extern s32 GetSpriteSize(u32);
extern s32 ov29_022DE954(u32);
bool8 EntityIsValid__022E1A1C(struct entity *entity)
{
if (entity == NULL)
@ -34,3 +37,13 @@ void IncrementEntityPixelPosXY(struct entity *entity, u32 x, u32 y)
entity->pixel_pos.x += x;
entity->pixel_pos.y += y;
}
u32 ov29_022E1AAC(u32 param_0, u32 param_1) {
s32 iVar1;
iVar1 = GetSpriteSize(param_0);
if (ov29_022DE954(param_1) != 0) {
iVar1 = iVar1 << 1;
}
return iVar1;
}