ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Big switch mofo

Browse Source
This commit is contained in:
Diegoisawesome 2018-12-28 02:11:41 -06:00
parent 5691a67629
commit 9cad5e8197
4 changed files with 760 additions and 2349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2190
asm/trade.s
View File

File diff suppressed because it is too large Load Diff

2
include/gba/io_reg.h
View File

@ -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) #define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD)
// BLDALPHA // BLDALPHA
#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) #define BLDALPHA_BLEND(target1, target2) ((target1)) | ((target2) << 8)
// SOUNDCNT_H // SOUNDCNT_H
#define SOUND_CGB_MIX_QUARTER 0x0000 #define SOUND_CGB_MIX_QUARTER 0x0000

6
include/strings.h
View File

@ -1984,4 +1984,10 @@ extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainerCantAcceptPkmn[]; extern const u8 gText_OtherTrainerCantAcceptPkmn[];
extern const u8 gText_CantTradeWithTrainer[]; 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 #endif //GUARD_STRINGS_H

909
src/trade.c
View File

File diff suppressed because it is too large Load Diff