diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/defines.h | 1 | ||||
| -rw-r--r-- | include/pokeball.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 65561f10a..8c92d7b64 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -76,6 +76,7 @@ #define RGB_BLACK RGB(0, 0, 0) #define RGB_WHITE RGB(31, 31, 31) +#define RGB_WHITEALPHA (0xFFFF) #define NAKED __attribute__((naked)) #define UNUSED __attribute__((unused)) diff --git a/include/pokeball.h b/include/pokeball.h index ee0478eab..884ded22e 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -25,7 +25,7 @@ enum u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); -u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); +u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); void sub_8076918(u8 bank); void DoHitAnimHealthboxEffect(u8 bank); diff --git a/include/strings.h b/include/strings.h index 43043b537..2c1e93b38 100644 --- a/include/strings.h +++ b/include/strings.h @@ -662,5 +662,9 @@ extern const u8 gText_SevenIsland[]; // trade extern const u8 gUnknown_841E0A5[]; +extern const u8 gText_XWillBeSentToY[]; +extern const u8 gText_ByeByeVar1[]; +extern const u8 gText_XSentOverY[]; +extern const u8 gText_TakeGoodCareOfX[]; #endif //GUARD_STRINGS_H |