diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-12-01 11:32:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 11:32:01 -0600 |
| commit | 0250aefb73a995a6812a657193abeb96eb34d489 (patch) | |
| tree | 90c7868689507a6c189e1fc01c4d553f5776d843 /include | |
| parent | 54da96309186b98263b4434911e1c5b8d4b4e3ec (diff) | |
| parent | 921011592cbe9018f558b7977525e49252274947 (diff) | |
Merge pull request #118 from PikalaxALT/field_poison
Decompile field poison
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 1 | ||||
| -rw-r--r-- | include/battle_frontier_2.h | 1 | ||||
| -rw-r--r-- | include/field_poison.h | 19 | ||||
| -rw-r--r-- | include/fldeff_80F9BCC.h | 1 | ||||
| -rw-r--r-- | include/party_menu.h | 10 | ||||
| -rw-r--r-- | include/pokenav.h | 6 | ||||
| -rw-r--r-- | include/strings.h | 1 |
7 files changed, 39 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index c172cb0f6..3f39db374 100644 --- a/include/battle.h +++ b/include/battle.h @@ -88,6 +88,7 @@ #define BATTLE_OUTCOME_BIT_x80 0x80 +#define STATUS_NONE 0x0 #define STATUS_SLEEP 0x7 #define STATUS_POISON 0x8 #define STATUS_BURN 0x10 diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 4f37248cc..801c3f3ec 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -5,5 +5,6 @@ void sub_81A8934(u8); void sub_81A895C(void); u16 sub_81A89A0(u8); void sub_81A8AF8(void); +bool8 InBattlePike(void); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/field_poison.h b/include/field_poison.h new file mode 100644 index 000000000..d1a4c823b --- /dev/null +++ b/include/field_poison.h @@ -0,0 +1,19 @@ +#ifndef GUARD_FIELD_POISON_H +#define GUARD_FIELD_POISON_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +enum { + FLDPSN_NONE, + FLDPSN_PSN, + FLDPSN_FNT +}; + +void sub_80F972C(void); +unsigned int overworld_poison(void); + +#endif //GUARD_FIELD_POISON_H diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h index ecce04943..d57665c68 100644 --- a/include/fldeff_80F9BCC.h +++ b/include/fldeff_80F9BCC.h @@ -9,5 +9,6 @@ void sub_80FA5E4(s16 id, s16 x, s16 y); void sub_80FA794(s16 x, s16 y); +void overworld_poison_effect(void); #endif //GUARD_FLDEFF_80F9BCC_H diff --git a/include/party_menu.h b/include/party_menu.h index 7a7d59cd0..c787bafb1 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,8 +1,18 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H +enum { + AILMENT_NONE, + AILMENT_PSN, + AILMENT_PRZ, + AILMENT_SLP, + AILMENT_FRZ, + AILMENT_BRN +}; + bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); +u8 pokemon_ailments_get_primary(u32 status); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokenav.h b/include/pokenav.h new file mode 100644 index 000000000..06676610a --- /dev/null +++ b/include/pokenav.h @@ -0,0 +1,6 @@ +#ifndef GUARD_POKENAV_H +#define GUARD_POKENAV_H + +bool8 sub_81D5C18(void); + +#endif //GUARD_POKENAV_H diff --git a/include/strings.h b/include/strings.h index a32ba4c83..a2745d382 100644 --- a/include/strings.h +++ b/include/strings.h @@ -82,6 +82,7 @@ extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; #endif //GUARD_STRINGS_H |