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/subtask/subtaskFastTravel.c | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'src/subtask/subtaskFastTravel.c')
| -rw-r--r-- | src/subtask/subtaskFastTravel.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/subtask/subtaskFastTravel.c b/src/subtask/subtaskFastTravel.c index b457a10c..400291e1 100644 --- a/src/subtask/subtaskFastTravel.c +++ b/src/subtask/subtaskFastTravel.c @@ -7,17 +7,20 @@ #include "subtask.h" #include "common.h" #include "menu.h" -#include "functions.h" #include "message.h" #include "sound.h" #include "save.h" +#include "affine.h" +#include "asm.h" +#include "pauseMenu.h" +#include "fade.h" extern void (*const Subtask_FastTravel_Functions[])(void); void sub_080A6E70(void); u32 sub_080A6D74(u32); void sub_080A6EE0(u32 param_1); -extern const ScreenTransitionData gUnk_08128024[]; +extern const Transition gUnk_08128024[]; void Subtask_FastTravel(void) { FlushSprites(); @@ -179,10 +182,10 @@ void sub_080A6EE0(u32 param_1) { u32 x; u32 y; RoomHeader* roomHeader; - const ScreenTransitionData* ptr = &gUnk_08128024[param_1]; + const Transition* ptr = &gUnk_08128024[param_1]; - x = (u16)ptr->playerXPos; - y = (u16)ptr->playerYPos; + x = (u16)ptr->endX; + y = (u16)ptr->endY; roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room]; x += roomHeader->map_x; y += roomHeader->map_y; |