diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-01-21 14:38:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 14:38:09 -0600 |
| commit | f4455bb2a522f4b99f17fb9ddc4e44d3ada011c9 (patch) | |
| tree | 267b12b275a02bba2a7b58240e83f31beffb2ead /include | |
| parent | 5feb270e97b135d3b9ffe6a3d51d151afa6631c8 (diff) | |
| parent | fbf91fabcf6c3ce07c78a0962754f32994cced9e (diff) | |
Merge pull request #180 from DizzyEggg/decompile_mystery_event_script
Decompile mystery event script
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 4 | ||||
| -rw-r--r-- | include/mystery_event_msg.h | 16 | ||||
| -rw-r--r-- | include/mystery_event_script.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 4 |
5 files changed, 26 insertions, 4 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 941f40efb..63e053cbd 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -484,7 +484,7 @@ #define FLAG_0x1E1 0x1E1 #define FLAG_0x1E2 0x1E2 #define FLAG_0x1E3 0x1E3 -#define FLAG_0x1E4 0x1E4 +#define FLAG_MYSTERY_EVENT_DONE 0x1E4 #define FLAG_0x1E5 0x1E5 #define FLAG_0x1E6 0x1E6 #define FLAG_0x1E7 0x1E7 diff --git a/include/constants/vars.h b/include/constants/vars.h index b8bd46a96..c0e3313b6 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -48,7 +48,7 @@ #define VAR_HAPPINESS_STEP_COUNTER 0x402A #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C -#define VAR_0x402D 0x402D +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D #define VAR_0x402E 0x402E #define VAR_FRONTIER_MANIAC_FACILITY 0x402F @@ -226,7 +226,7 @@ #define VAR_0x40DA 0x40DA #define VAR_0x40DB 0x40DB #define VAR_0x40DC 0x40DC -#define VAR_0x40DD 0x40DD +#define VAR_EVENT_PICHU_SLOT 0x40DD #define VAR_0x40DE 0x40DE #define VAR_0x40DF 0x40DF #define VAR_0x40E0 0x40E0 diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h new file mode 100644 index 000000000..465b60ccb --- /dev/null +++ b/include/mystery_event_msg.h @@ -0,0 +1,16 @@ +#ifndef GUARD_MYSTERY_EVENT_MSG_H +#define GUARD_MYSTERY_EVENT_MSG_H + +extern const u8 gText_MysteryGiftBerry[]; +extern const u8 gText_MysteryGiftBerryTransform[]; +extern const u8 gText_MysteryGiftBerryObtained[]; +extern const u8 gText_MysteryGiftSpecialRibbon[]; +extern const u8 gText_MysteryGiftNationalDex[]; +extern const u8 gText_MysteryGiftRareWord[]; +extern const u8 gText_MysteryGiftSentOver[]; +extern const u8 gText_MysteryGiftFullParty[]; +extern const u8 gText_MysteryGiftNewTrainer[]; +extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[]; +extern const u8 gText_MysteryGiftCantBeUsed[]; + +#endif // GUARD_MYSTERY_EVENT_MSG_H diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index ab23a8d00..991cab53a 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -1,7 +1,9 @@ #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H #define GUARD_MYSTERY_EVENT_SCRIPT_H -u32 RunMysteryEventScript(u8 *); +void sub_8153870(u8 *script); +bool32 sub_8153884(u32 *a0); +u32 RunMysteryEventScript(u8 *script); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); diff --git a/include/strings.h b/include/strings.h index 7527e56fb..8af8e629e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -148,6 +148,10 @@ extern const u8 gText_MoveItemsDescription[]; extern const u8 gText_SeeYa[]; extern const u8 gText_SeeYaDescription[]; +extern const u8 gText_EggNickname[]; +extern const u8 gText_Pokemon[]; +extern const u8 gText_InGameClockUsable[]; + // menu texts extern const u8 gText_MenuPokedex[]; extern const u8 gText_MenuPokemon[]; |