diff options
| author | Henny022p <73211432+Henny022p@users.noreply.github.com> | 2026-02-08 18:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-08 18:32:38 +0100 |
| commit | 5ab63f00e522ff69c5bc987e379f0163943f2833 (patch) | |
| tree | 53622222ac729c6ab6dc75ef7f9bafa8031daf18 /src/beanstalkSubtask.c | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'src/beanstalkSubtask.c')
| -rw-r--r-- | src/beanstalkSubtask.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index 9da2f7eb..c18bd945 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -4,7 +4,6 @@ #include "collision.h" #include "common.h" #include "fade.h" -#include "functions.h" #include "game.h" #include "item.h" #include "main.h" @@ -12,10 +11,16 @@ #include "manager/diggingCaveEntranceManager.h" #include "menu.h" #include "object.h" +#include "asm.h" +#include "flags.h" +#include "room.h" +#include "player.h" #include "screen.h" #include "scroll.h" -#include "structures.h" #include "tiles.h" +#include "affine.h" +#include "subtask.h" +#include "ui.h" extern void sub_0807C898(void); extern void sub_0805BB74(s32); @@ -63,7 +68,7 @@ extern void sub_0804B388(u32 a1, u32 a2); extern u32 sub_080A7CFC(u32 a1, u32 tmp); // TODO does this really have a second param? extern void OpenSmallChest(u32 pos, u32 layer); extern bool32 sub_08079778(); -extern Transition* sub_08080734(u32, u32); +extern Transition* FindApplicableAreaTransition(u32, u32); extern const s16 gUnk_080B4490[]; extern const s16 gUnk_080B4468[]; @@ -206,8 +211,8 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.collisionLayer) == COLLISION_DATA_255) { if ((((gPlayerState.flags & (PL_FLAGS10000 | PL_FLAGS2)) != 0) || ((gPlayerState.sword_state & 0x10) != 0)) || - ((sub_080806BC(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x, - gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y, index, 5) == 0 && + ((DoApplicableTransition(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x, + gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y, index, 5) == 0 && (((gPlayerState.heldObject != 0 || ((gPlayerState.gustJarState & 0xf) != 0)) || (sub_0807BD14(&gPlayerEntity.base, index) == 0)))))) { return 3; @@ -269,8 +274,9 @@ u32 UpdatePlayerCollision(void) { } ptr1 = &gUnk_080B4478[gPlayerEntity.base.animationState & 6]; - transition = sub_08080734((gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) + ptr1[0], - (gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y) + ptr1[1]); + transition = + FindApplicableAreaTransition((gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) + ptr1[0], + (gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y) + ptr1[1]); if (transition == NULL) { return 0; } |