falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove parameter from KID_HEAP_SHIFT_RIGHT

This commit is contained in:
Tal Hayon 2023-04-23 08:40:57 +03:00
parent 77732aac23
commit 5b5c26f703
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/npc/kid.c
View File

@ -312,7 +312,7 @@ void sub_080621AC(Entity* this) {
} }
} }
#define KID_HEAP_SHIFT_RIGHT(this) \ #define KID_HEAP_SHIFT_RIGHT \
heapPtr = KID_HEAP; \ heapPtr = KID_HEAP; \
heapPtr += (KID_HEAP_COUNT - 2); \ heapPtr += (KID_HEAP_COUNT - 2); \
for (i = 0; i < (KID_HEAP_COUNT - 1); i++) { \ for (i = 0; i < (KID_HEAP_COUNT - 1); i++) { \
@ -361,7 +361,7 @@ void sub_080622F4(Entity* this) {
animIndex = 0; animIndex = 0;
if (item.DWORD != heapPtr->DWORD) { if (item.DWORD != heapPtr->DWORD) {
KID_HEAP_SHIFT_RIGHT(this); KID_HEAP_SHIFT_RIGHT;
heapPtr = KID_HEAP; heapPtr = KID_HEAP;
heapPtr[0] = item; heapPtr[0] = item;
@ -372,7 +372,7 @@ void sub_080622F4(Entity* this) {
} else { } else {
heapPtr += KID_HEAP_COUNT - 1; heapPtr += KID_HEAP_COUNT - 1;
if (heapPtr->FIELDS.z < 0) { if (heapPtr->FIELDS.z < 0) {
KID_HEAP_SHIFT_RIGHT(this); KID_HEAP_SHIFT_RIGHT;
animIndex = 0x4; animIndex = 0x4;
} else { } else {
dist = sub_080041E8(gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, (u16)heapPtr->FIELDS.x, dist = sub_080041E8(gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, (u16)heapPtr->FIELDS.x,
@ -380,7 +380,7 @@ void sub_080622F4(Entity* this) {
dist = ((u32)dist) >> 0x4; dist = ((u32)dist) >> 0x4;
if (dist > 0x18) { if (dist > 0x18) {
KID_HEAP_SHIFT_RIGHT(this); KID_HEAP_SHIFT_RIGHT;
animIndex = 0x4; animIndex = 0x4;
} }
} }