Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 14:18:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give newly decompiled functions more meaningful names

Browse Source
This commit is contained in:
chordtoll
2024-10-13 23:55:55 -07:00
parent f5be0f933e
commit f4784e8bb7
18 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_022DC2B8.inc
View File

@@ -91,7 +91,7 @@
.public ov29_022E15C8
.public ov29_022E1604
.public ov29_022E1640
.public ov29_022E1A84
.public SetEntityPixelPosXY
.public ov29_022E2B68
.public ov29_022E2DFC
.public ov29_022E34B0

2
asm/include/overlay_29_023047DC.inc
View File

@@ -17,7 +17,7 @@
.public GetTileAtEntity
.public IsFloorOver
.public IsWaterTileset
.public ov29_022E1A90
.public IncrementEntityPixelPosXY
.public ov29_022E8104
.public ov29_022EA370
.public ov29_022EF9BC

4
asm/include/overlay_29_0231F594.inc
View File

@@ -16,8 +16,8 @@
.public LogMessageByIdWithPopupCheckUser
.public MemAlloc
.public MemFree
.public ov29_022E1A84
.public ov29_022E1A90
.public SetEntityPixelPosXY
.public IncrementEntityPixelPosXY
.public ov29_022E56A0
.public ov29_022F62CC
.public ov29_02304B64

2
asm/include/overlay_29_0231FC20.inc
View File

@@ -14,7 +14,7 @@
.public LogMessageByIdWithPopupCheckUserTarget
.public MoveMonsterToPos
.public ov10_022C4570
.public ov29_022E1A90
.public IncrementEntityPixelPosXY
.public ov29_022E56A0
.public ov29_022F9C74
.public ov29_022FFB90

2
asm/include/overlay_29_023201A0.inc
View File

@@ -16,7 +16,7 @@
.public LogMessageByIdWithPopupCheckUser
.public LogMessageByIdWithPopupCheckUserTarget
.public MoveMonsterToPos
.public ov29_022E1A90
.public IncrementEntityPixelPosXY
.public ov29_022E5560
.public ov29_022E55F0
.public ov29_022E56A0

4
asm/include/overlay_29_0232A3FC.inc
View File

@@ -63,8 +63,8 @@
.public ov10_022C5DE0
.public ov10_022C6321
.public ov10_022C6322
.public ov29_022E1A84
.public ov29_022E1A90
.public SetEntityPixelPosXY
.public IncrementEntityPixelPosXY
.public ov29_022E2CA0
.public ov29_022ED868
.public ov29_022F8FF8

4
asm/include/overlay_29_023456BC.inc
View File

@@ -62,8 +62,8 @@
.public ov10_022C48EC
.public ov10_022C4CD8
.public ov29_022E09E8
.public ov29_022E1A84
.public ov29_022E1A90
.public SetEntityPixelPosXY
.public IncrementEntityPixelPosXY
.public ov29_022E563C
.public ov29_022E9488
.public ov29_022EACBC

2
asm/include/overlay_29_02347BC8.inc
View File

@@ -41,7 +41,7 @@
.public ov29_022E0DE4
.public ov29_022E0DFC
.public ov29_022E0E44
.public ov29_022E1A84
.public SetEntityPixelPosXY
.public ov29_022E2CA0
.public ov29_022E9488
.public ov29_022FB9BC

2
asm/overlay_29_022DC2B8.s
View File

@@ -4164,7 +4164,7 @@ _022DF9B0:
add r0, sp, #0x18
mov r1, r1, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r3, #0
mov r0, r4
add r1, sp, #0x18

2
asm/overlay_29_023047DC.s
View File

@@ -792,7 +792,7 @@ _023051C4:
mov r0, r7
ldr r1, [r8, #0x10]
ldr r2, [r8, #0x14]
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
ldrb r0, [sb, #7]
cmp r0, #0
beq _02305258

4
asm/overlay_29_0231F594.s
View File

@@ -200,7 +200,7 @@ _0231F7A0:
add r2, r2, #4
mov r1, r1, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r1, #0
strh r1, [r5, #0x26]
mov r1, #1
@@ -405,7 +405,7 @@ _0231FA9C:
ldr r1, [r2, #0x2f4]
ldr r2, [r2, #0x2f8]
str r0, [sp, #4]
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, r8
bl sub_020018D0
mov r1, #0xc

2
asm/overlay_29_0231FC20.s
View File

@@ -259,7 +259,7 @@ _0231FF84:
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x1c]
mov r0, sb
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, sb
bl ShouldDisplayEntityWrapper
cmp r0, #0

2
asm/overlay_29_023201A0.s
View File

@@ -89,7 +89,7 @@ _023202C4:
mov r0, sl
mov r1, r6
mov r2, r7
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, sl
bl ShouldDisplayEntityWrapper
cmp r0, #0

6
asm/overlay_29_0232A3FC.s
View File

@@ -418,7 +418,7 @@ ov29_0232A834: ; 0x0232A834
add r3, r3, #4
mov r1, r3, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r0, #0
add r1, sp, #8
mov r2, r0
@@ -528,7 +528,7 @@ _0232AA28:
mov r0, sb
mov r1, r5
mov r2, r4
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, fp
bl AdvanceFrame
add r6, r6, #1
@@ -627,7 +627,7 @@ _0232ABA0:
mov r0, sb
mov r1, r5
mov r2, r6
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, r4
bl AdvanceFrame
add r7, r7, #1

16
asm/overlay_29_023456BC.s
View File

@@ -290,7 +290,7 @@ SpawnDroppedItemWrapper: ; 0x02345A3C
add r3, r3, #4
mov r1, r3, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r0, #0
strh r0, [sp, #0x2e]
str r0, [sp]
@@ -595,7 +595,7 @@ _02345E90:
mov r1, r7
mov r2, r8
str r5, [sl, #0x1c]
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r6, #0
_02345EE0:
sub r5, r5, #0x800
@@ -614,7 +614,7 @@ _02345EE0:
mov r0, sl
mov r1, r7
mov r2, r8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r2, #0
str r2, [sl, #0x1c]
mov r0, sl
@@ -1057,7 +1057,7 @@ _023464C4:
add r2, r2, #4
mov r1, r1, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r0, #0
strh r0, [r6, #0x26]
mov r0, r8, lsl #2
@@ -1156,7 +1156,7 @@ _0234665C:
ldr r1, [r1, r8, lsl #3]
ldr r2, [r2, #4]
str r0, [sp, #0xc]
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
mov r0, fp
bl sub_020018D0
mov r1, #0xc
@@ -2368,7 +2368,7 @@ _023474CC:
mov r0, sl
mov r1, r8
mov r2, sb
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r5, #0
str r5, [sl, #0x1c]
cmp r4, #0
@@ -2439,7 +2439,7 @@ ov29_02347518: ; 0x02347518
add r1, r3, #4
mov r1, r1, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
#ifdef JAPAN
mov r0, #0
#else
@@ -2623,7 +2623,7 @@ _02347750:
#else
mov r2, fp
#endif
bl ov29_022E1A90
bl IncrementEntityPixelPosXY
bl IsWaterTileset
cmp r0, #0
ldr r0, [r4, #0xd8]

4
asm/overlay_29_02347BC8.s
View File

@@ -44,7 +44,7 @@ ov29_02347BC8: ; 0x02347BC8
add r3, r3, #4
mov r1, r3, lsl #8
mov r2, r2, lsl #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
mov r0, r5
str r0, [sp, #0x2c]
strh r0, [r4, #0xf2]
@@ -137,7 +137,7 @@ _02347D84:
add r8, r8, r0
add r0, r4, #0xcc
mov fp, r6, asr #8
bl ov29_022E1A84
bl SetEntityPixelPosXY
bl IsWaterTileset
cmp r0, #0
ldr r1, [sp, #0x34]

4
include/dg_object.h
View File

@@ -8,7 +8,7 @@
// return: bool
u8 EntityIsValid__022E1A1C(struct entity *entity);
void UpdateEntityPixelPos(struct entity *entity, struct pixel_position *pixel_pos);
void ov29_022E1A84(struct entity *entity, u32 x, u32 y);
void ov29_022E1A84(struct entity *entity, u32 x, u32 y);
void SetEntityPixelPosXY(struct entity *entity, u32 x, u32 y);
void IncrementEntityPixelPosXY(struct entity *entity, u32 x, u32 y);
#endif //PMDSKY_OVERLAY_29_022E1A1C_H

4
src/dg_object.c
View File

@@ -23,13 +23,13 @@ void UpdateEntityPixelPos(struct entity *entity, struct pixel_position *pixel_po
}
}
void ov29_022E1A84(struct entity *entity, u32 x, u32 y)
void SetEntityPixelPosXY(struct entity *entity, u32 x, u32 y)
{
entity->pixel_pos.x = x;
entity->pixel_pos.y = y;
}
void ov29_022E1A84(struct entity *entity, u32 x, u32 y)
void IncrementEntityPixelPosXY(struct entity *entity, u32 x, u32 y)
{
entity->pixel_pos.x += x;
entity->pixel_pos.y += y;