pushing so I can merge
This commit is contained in:
-3223
File diff suppressed because it is too large
Load Diff
@@ -12,7 +12,8 @@ enum
|
|||||||
AILMENT_SLP,
|
AILMENT_SLP,
|
||||||
AILMENT_FRZ,
|
AILMENT_FRZ,
|
||||||
AILMENT_BRN,
|
AILMENT_BRN,
|
||||||
AILMENT_FNT = 7
|
AILMENT_PKRS,
|
||||||
|
AILMENT_FNT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -35,12 +36,12 @@ struct Struct203CEC8 {
|
|||||||
s8 unkA;
|
s8 unkA;
|
||||||
u8 unkB;
|
u8 unkB;
|
||||||
u8 unkD;
|
u8 unkD;
|
||||||
u8 unkE;
|
s16 unkE;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct Struct203CEC8 gUnknown_0203CEC8;
|
extern struct Struct203CEC8 gUnknown_0203CEC8;
|
||||||
|
|
||||||
extern const u16 gUnknown_0861500C[];
|
extern const u16 gUnknown_0861500C[]; // tutor table
|
||||||
|
|
||||||
bool8 pokemon_has_move(struct Pokemon *, u16);
|
bool8 pokemon_has_move(struct Pokemon *, u16);
|
||||||
void sub_81B58A8(void);
|
void sub_81B58A8(void);
|
||||||
|
|||||||
@@ -11,5 +11,6 @@ void sub_8018438(void);
|
|||||||
u16 mevent_081445C0(u8);
|
u16 mevent_081445C0(u8);
|
||||||
void sub_801B990(u32, u32);
|
void sub_801B990(u32, u32);
|
||||||
u8 sub_8013F78(void);
|
u8 sub_8013F78(void);
|
||||||
|
bool32 sub_802C908(u16);
|
||||||
|
|
||||||
#endif //GUARD_rom_8011DC0_H
|
#endif //GUARD_rom_8011DC0_H
|
||||||
|
|||||||
@@ -370,6 +370,12 @@ extern const u8 gText_ThreeDashes[];
|
|||||||
extern const u8 gText_PkmnHPRestoredByVar2[];
|
extern const u8 gText_PkmnHPRestoredByVar2[];
|
||||||
extern const u8 gText_CantBeUsedOnPkmn[];
|
extern const u8 gText_CantBeUsedOnPkmn[];
|
||||||
extern const u8 gText_CancelParticipation[];
|
extern const u8 gText_CancelParticipation[];
|
||||||
|
extern const u8 gText_PkmnWasGivenItem[];
|
||||||
|
extern const u8 gText_RecievedItemFromPkmn[];
|
||||||
|
extern const u8 gText_SwitchPkmnItem[];
|
||||||
|
extern const u8 gText_SwitchedPkmnItem[];
|
||||||
|
extern const u8 gText_BagFullCouldNotRemoveItem[];
|
||||||
|
extern const u8 gText_PkmnCantParticipate[];
|
||||||
|
|
||||||
//pokedex text
|
//pokedex text
|
||||||
extern const u8 gText_CryOf[];
|
extern const u8 gText_CryOf[];
|
||||||
|
|||||||
+1607
-10
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user