From 83e6edf470500c5b8cb6b14736b4d45bd79364bd Mon Sep 17 00:00:00 2001 From: theo3 Date: Wed, 5 Aug 2020 20:47:10 -0700 Subject: wisp.c OK --- src/code_0808091C.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'src/code_0808091C.c') diff --git a/src/code_0808091C.c b/src/code_0808091C.c index 1607ddf0..dcb86728 100644 --- a/src/code_0808091C.c +++ b/src/code_0808091C.c @@ -1,4 +1,7 @@ #include "global.h" +#include "entity.h" +#include "structures.h" +#include "functions.h" #include "room.h" extern void sub_0805E5A8(); @@ -6,16 +9,35 @@ extern void sub_0805E5A8(); extern RoomControls gRoomControls; extern u32 gUnk_0200B650; extern u32 gUnk_02025EB0; -extern u8 gScreenTransition[10]; -extern void DoExitTransition(Entity*); +extern void DoExitTransition(ScreenTransitionData*); extern void sub_080809D4(); -void sub_0808091C(Entity* param_1, u32 param_2) +void sub_080808D8(void) { + gScreenTransition.transitionType = 0; +} + +void sub_080808E4(void) { + + if (sub_08052638(gScreenTransition.areaID)) { + gScreenTransition.transitionType = 0; + } else { + gScreenTransition.transitionType = 5; + } +} + +void sub_08080904(void) { + gScreenTransition.transitionType = 1; +} + +void sub_08080910(void) { + gScreenTransition.transitionType = 1; +} +void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) { DoExitTransition(param_1); - gScreenTransition[9] = param_2; + gScreenTransition.transitionType = param_2; return; } -- cgit v1.2.3