From e518a40508555d55bff7b2f020da092a0501eb1b Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Fri, 16 Feb 2018 15:21:27 +0530 Subject: [WIP} Start decomp Ground Shake --- include/fldeff_groundshake.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'include') diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h index 685a6d27c..77af19876 100644 --- a/include/fldeff_groundshake.h +++ b/include/fldeff_groundshake.h @@ -1,7 +1,30 @@ #ifndef GUARD_FLDEFF_GROUNDSHAKE_H #define GUARD_FLDEFF_GROUNDSHAKE_H +struct InnerStruct203CF18 +{ + u8 filler[0xC4]; +}; + + +struct Struct203CF18 { + u8 taskId; + struct InnerStruct203CF18 unk4; +}; //size = 0xC8 + + +void sub_8151B68(struct InnerStruct203CF18 *, const u8*); +void sub_8151B3C(struct InnerStruct203CF18 *); +void sub_8151CA8(struct InnerStruct203CF18 *, u8, u8); +void sub_8151C50(struct InnerStruct203CF18 *, u8, u8); +void sub_8151D28(struct InnerStruct203CF18 *, u8, u8); +void sub_8151E50(struct InnerStruct203CF18 *); + void sub_81BE6B8(void); void sub_81BE72C(void); +extern struct Struct203CF18 *gUnknown_0203CF18; + +extern const u8 gUnknown_08617E18[]; + #endif // GUARD_FLDEFF_GROUNDSHAKE_H -- cgit v1.2.3 From 52b631a092f0e5357eea2d72d22c5db7ad03f7f2 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 18 Feb 2018 04:30:20 +0530 Subject: Decompile more functions --- include/fldeff_groundshake.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h index 77af19876..3111ec28e 100644 --- a/include/fldeff_groundshake.h +++ b/include/fldeff_groundshake.h @@ -22,9 +22,16 @@ void sub_8151E50(struct InnerStruct203CF18 *); void sub_81BE6B8(void); void sub_81BE72C(void); +void sub_81BE808(u8 taskId); +void sub_81BE900(u8 taskId); +void sub_81BE968(void); +void sub_81BE9C0(u8 taskId); +void sub_81BEA00(u8 taskId); +void sub_81BEA20(void); -extern struct Struct203CF18 *gUnknown_0203CF18; +extern struct Struct203CF18 *gUnknown_0203CF18; +extern const u16 gUnknown_08617D64[]; extern const u8 gUnknown_08617E18[]; #endif // GUARD_FLDEFF_GROUNDSHAKE_H -- cgit v1.2.3 From b1cb82fc670ebbb7bcb8de85c780344e6dbd9349 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 18 Feb 2018 17:33:48 +0530 Subject: Finish fldeff_groundshake --- include/fldeff_groundshake.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h index 3111ec28e..07fdaf9c2 100644 --- a/include/fldeff_groundshake.h +++ b/include/fldeff_groundshake.h @@ -29,9 +29,8 @@ void sub_81BE9C0(u8 taskId); void sub_81BEA00(u8 taskId); void sub_81BEA20(void); - extern struct Struct203CF18 *gUnknown_0203CF18; -extern const u16 gUnknown_08617D64[]; +extern const s16 gUnknown_08617D64[][3]; extern const u8 gUnknown_08617E18[]; #endif // GUARD_FLDEFF_GROUNDSHAKE_H -- cgit v1.2.3 From a3c17fad22523551b78ba60321688f1ed1e39b6a Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Thu, 22 Feb 2018 12:17:46 +0530 Subject: Decompile Fossil Special & Groundshake Data --- include/fldeff_groundshake.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 include/fldeff_groundshake.h (limited to 'include') diff --git a/include/fldeff_groundshake.h b/include/fldeff_groundshake.h deleted file mode 100644 index 07fdaf9c2..000000000 --- a/include/fldeff_groundshake.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef GUARD_FLDEFF_GROUNDSHAKE_H -#define GUARD_FLDEFF_GROUNDSHAKE_H - -struct InnerStruct203CF18 -{ - u8 filler[0xC4]; -}; - - -struct Struct203CF18 { - u8 taskId; - struct InnerStruct203CF18 unk4; -}; //size = 0xC8 - - -void sub_8151B68(struct InnerStruct203CF18 *, const u8*); -void sub_8151B3C(struct InnerStruct203CF18 *); -void sub_8151CA8(struct InnerStruct203CF18 *, u8, u8); -void sub_8151C50(struct InnerStruct203CF18 *, u8, u8); -void sub_8151D28(struct InnerStruct203CF18 *, u8, u8); -void sub_8151E50(struct InnerStruct203CF18 *); - -void sub_81BE6B8(void); -void sub_81BE72C(void); -void sub_81BE808(u8 taskId); -void sub_81BE900(u8 taskId); -void sub_81BE968(void); -void sub_81BE9C0(u8 taskId); -void sub_81BEA00(u8 taskId); -void sub_81BEA20(void); - -extern struct Struct203CF18 *gUnknown_0203CF18; -extern const s16 gUnknown_08617D64[][3]; -extern const u8 gUnknown_08617E18[]; - -#endif // GUARD_FLDEFF_GROUNDSHAKE_H -- cgit v1.2.3 From 835777dec2e978bb6e89e46830950aa4b357d51c Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Tue, 27 Feb 2018 10:33:23 +0530 Subject: Decompile fleff_flash rodata --- include/braille_puzzles.h | 7 +++++++ include/event_scripts.h | 4 ++++ include/roulette_util.h | 17 +++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 include/braille_puzzles.h create mode 100644 include/roulette_util.h (limited to 'include') diff --git a/include/braille_puzzles.h b/include/braille_puzzles.h new file mode 100644 index 000000000..780abeeba --- /dev/null +++ b/include/braille_puzzles.h @@ -0,0 +1,7 @@ +#ifndef GUARD_BRAILLE_PUZZLES_H +#define GUARD_BRAILLE_PUZZLES_H + +bool8 ShouldDoBrailleFlyEffect(void); +void sub_8179918(void); + +#endif // GUARD_BRAILLE_PUZZLES_H diff --git a/include/event_scripts.h b/include/event_scripts.h index a835782ed..4c5dfd544 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -22,6 +22,7 @@ extern const u8 EventScript_2713D1[]; extern const u8 EventScript_2766A2[]; extern const u8 EventScript_2766A6[]; + extern const u8 gTVBravoTrainerText00[]; extern const u8 gTVBravoTrainerText01[]; extern const u8 gTVBravoTrainerText02[]; @@ -381,6 +382,9 @@ extern const u8 SecretBase_RedCave1_Text_2751E1[]; extern const u8 SecretBase_RedCave1_Text_2754F6[]; extern const u8 SecretBase_RedCave1_Text_2758CC[]; +//field effects extern const u8 FieryPath_EventScript_2908FD[]; extern const u8 EventScript_290CAE[]; +extern const u8 EventScript_2926F8[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/roulette_util.h b/include/roulette_util.h new file mode 100644 index 000000000..f59c4e44c --- /dev/null +++ b/include/roulette_util.h @@ -0,0 +1,17 @@ +#ifndef GUARD_ROULETTE_UTIL_H +#define GUARD_ROULETTE_UTIL_H + +// structures +struct InnerStruct203CF18 +{ + u8 filler[0xC4]; +}; + +void sub_8151B68(struct InnerStruct203CF18 *, const u8*); +void sub_8151B3C(struct InnerStruct203CF18 *); +void sub_8151CA8(struct InnerStruct203CF18 *, u8, u8); +void sub_8151C50(struct InnerStruct203CF18 *, u8, u8); +void sub_8151D28(struct InnerStruct203CF18 *, u8, u8); +void sub_8151E50(struct InnerStruct203CF18 *); + +#endif // GUARD_ROULETTE_UTIL_H -- cgit v1.2.3