diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-28 02:11:41 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-28 02:11:41 -0600 |
| commit | 9cad5e8197c797c1aa6382c7143f48a73250d0f8 (patch) | |
| tree | 0c7265a291794af42c1b4bf8247756b83ab8228c /include | |
| parent | 5691a676293c3b7e5ab01d88eb03552d175a70f3 (diff) | |
Big switch mofo
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/io_reg.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index c20b69886..448fae06d 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -600,7 +600,7 @@ #define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA -#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) +#define BLDALPHA_BLEND(target1, target2) ((target1)) | ((target2) << 8) // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 diff --git a/include/strings.h b/include/strings.h index 64222cddb..528990bfe 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1984,4 +1984,10 @@ extern const u8 gText_EggCantBeTradedNow[]; extern const u8 gText_OtherTrainerCantAcceptPkmn[]; extern const u8 gText_CantTradeWithTrainer[]; +// trade +extern const u8 gText_XWillBeSentToY[]; +extern const u8 gText_ByeByeVar1[]; +extern const u8 gText_XSentOverY[]; +extern const u8 gText_TakeGoodCareOfX[]; + #endif //GUARD_STRINGS_H |