summaryrefslogtreecommitdiff
path: root/src/object/lilypadLarge.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-31 17:29:08 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-31 17:34:02 -0800
commit37ac9cb0fb2d9ccb64286bab2cdf648e6f2541c5 (patch)
tree1556b8aba35a82f1cc0d538b93251a1b401f32f5 /src/object/lilypadLarge.c
parent5049daabc59d113152143d123aea2798d9487a0c (diff)
document tile asm functions
Diffstat (limited to 'src/object/lilypadLarge.c')
-rw-r--r--src/object/lilypadLarge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 9bc15399..b4bd9c60 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -329,10 +329,10 @@ void LilypadLarge_Action2(LilypadLargeEntity* this) {
void sub_08085A44(LilypadLargeEntity* this) {
super->speed = 0x200;
- if (GetRelativeCollisionTile(super, 0x10, 0x18) != 0x11) {
+ if (GetActTileRelative(super, 0x10, 0x18) != 0x11) {
super->direction = 0x18;
} else {
- if (GetRelativeCollisionTile(super, -0x10, 0x18) != 0x11) {
+ if (GetActTileRelative(super, -0x10, 0x18) != 0x11) {
super->direction = 8;
} else {
super->direction = 0x10;
@@ -353,7 +353,7 @@ void sub_08085A98(LilypadLargeEntity* this) {
this->unk_78.WORD -= 0x20000;
SetAffineInfo(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI);
}
- if (GetRelativeCollisionTile(super, 0, 0x18) != 0x11) {
+ if (GetActTileRelative(super, 0, 0x18) != 0x11) {
super->subAction = 2;
if (gArea.locationIndex == 0x1b) {
super->y.HALF.HI += 0xd0;
@@ -456,7 +456,7 @@ void LilypadLarge_Action5(LilypadLargeEntity* this) {
void sub_08085D28(LilypadLargeEntity* this) {
if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) &&
- (GetRelativeCollisionTile(super, 0, 0x18) == 0x11)) {
+ (GetActTileRelative(super, 0, 0x18) == 0x11)) {
super->action = 2;
super->subAction = 0;
PausePlayer();