summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorReinmmar <herwig.orlich@gmail.com>2023-09-17 21:07:48 +0200
committerReinmmar <herwig.orlich@gmail.com>2023-09-17 21:07:48 +0200
commitab3e4ef0f4d0e7c081ccc00b283df15324629489 (patch)
treea921ba1820b378cb6042fb6f483f8ddd04ff89ca /src/object
parente994fab66a6ef731908b0655f3c8d2bbb8b4ac5d (diff)
Labeled one Portal Type and some animations
Diffstat (limited to 'src/object')
-rw-r--r--src/object/jarPortal.c2
-rw-r--r--src/object/keyStealingTakkuri.c2
-rw-r--r--src/object/lilypadLarge.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index 5c5fdc2d..19c05a57 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -122,7 +122,7 @@ void sub_0808C01C(JarPortalEntity* this, u32 r1) {
gArea.portal_x = super->x.HALF.HI;
gArea.portal_y = super->y.HALF.HI;
gArea.portal_exit_dir = 2;
- type = 4;
+ type = PT_POT;
if (r1 != 0)
type = 2;
gArea.portal_type = type;
diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c
index 5d5f02ba..8a5a40b1 100644
--- a/src/object/keyStealingTakkuri.c
+++ b/src/object/keyStealingTakkuri.c
@@ -477,7 +477,7 @@ void sub_0809E1F0(KeyStealingTakkuriEntity* this) {
void sub_0809E210(KeyStealingTakkuriEntity* this) {
gPlayerEntity.animationState = GetAnimationStateForDirection8(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
- gPlayerState.animation = 0x100;
+ gPlayerState.animation = ANIM_DEFAULT;
}
void sub_0809E238(KeyStealingTakkuriEntity* this) {
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 9b380797..5c1e9949 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -551,7 +551,7 @@ void sub_08085E74(LilypadLargeEntity* this) {
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = super->direction;
- gPlayerState.animation = 0x100;
+ gPlayerState.animation = ANIM_DEFAULT;
gRoomControls.camera_target = super;
if (gPlayerState.item != NULL) {
DeleteEntity(gPlayerState.item);