From 9e5917e65692dd9f9db99f97966d8dfb3245ab6f Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 20 Jun 2017 09:47:54 -0400 Subject: Petalburg Gym field specials --- include/field_specials.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/field_specials.h') diff --git a/include/field_specials.h b/include/field_specials.h index d0eb12065..dcade37a7 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -1,6 +1,16 @@ #ifndef GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H + +extern struct WarpData gUnknown_020297F0; +extern u16 gScriptResult; +extern u8 gUnknown_02039250; +extern u8 gUnknown_02039251; +extern u32 gUnknown_02039254; +extern u16 gSpecialVar_0x8004; +extern u8 gUnknown_02039258; +extern u8 gUnknown_02039259; + void ResetCyclingRoadChallengeData(void); bool32 CountSSTidalStep(u16); u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); -- cgit v1.2.3 From 6c419f362a02a95d9b54638c222b093b22787f71 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 20 Jun 2017 09:55:43 -0400 Subject: Three more small functions in field_specials.s --- include/field_specials.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/field_specials.h') diff --git a/include/field_specials.h b/include/field_specials.h index dcade37a7..a71207656 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -8,6 +8,7 @@ extern u8 gUnknown_02039250; extern u8 gUnknown_02039251; extern u32 gUnknown_02039254; extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; extern u8 gUnknown_02039258; extern u8 gUnknown_02039259; -- cgit v1.2.3 From 5aeef909084e6dd8ea75cfc34cdd2601cab1de39 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 20 Jun 2017 09:58:05 -0400 Subject: Another three small functions in field_specials.s --- include/field_specials.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/field_specials.h') diff --git a/include/field_specials.h b/include/field_specials.h index a71207656..0521c094f 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -11,6 +11,7 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gUnknown_02039258; extern u8 gUnknown_02039259; +extern u8 gUnknown_02024D26; void ResetCyclingRoadChallengeData(void); bool32 CountSSTidalStep(u16); -- cgit v1.2.3 From c8993068c9a9b25b9ea573737646872098829d24 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 20 Jun 2017 13:41:30 -0400 Subject: Some elevator menu related functions --- include/field_specials.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'include/field_specials.h') diff --git a/include/field_specials.h b/include/field_specials.h index 0521c094f..ee7b80e1a 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -1,17 +1,29 @@ #ifndef GUARD_FIELD_SPECIALS_H #define GUARD_FIELD_SPECIALS_H +struct ElevatorMenu { + u8 var0; + u8 var1; + u8 var2; + u8 var3; +}; +extern struct ElevatorMenu gUnknown_03000760[20]; extern struct WarpData gUnknown_020297F0; +extern u8 gUnknown_02024D26; + extern u16 gScriptResult; extern u8 gUnknown_02039250; extern u8 gUnknown_02039251; extern u32 gUnknown_02039254; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; extern u8 gUnknown_02039258; extern u8 gUnknown_02039259; -extern u8 gUnknown_02024D26; +extern u8 gUnknown_0203925A; +extern u8 gUnknown_0203925B; +extern u8 gUnknown_0203925C; + +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; void ResetCyclingRoadChallengeData(void); bool32 CountSSTidalStep(u16); -- cgit v1.2.3 From 27ce8721331d5970c2d15d1a0459e37d094e0aa1 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 20 Jun 2017 14:14:54 -0400 Subject: Elevator menu main task --- include/field_specials.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/field_specials.h') diff --git a/include/field_specials.h b/include/field_specials.h index ee7b80e1a..02b70f99b 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -3,8 +3,8 @@ struct ElevatorMenu { u8 var0; - u8 var1; - u8 var2; + s8 var1; + s8 var2; u8 var3; }; -- cgit v1.2.3