diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
| commit | 9f1842c55f85470646e41611febe798f54d4c7c8 (patch) | |
| tree | 11cb8eefad86cc88f48741456175fff3c8738c66 /src/battle_4.c | |
| parent | 705aa9e4568afe77c856066d595e0b219bd78e82 (diff) | |
| parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) | |
Merge branch 'master' into decompile_berry_blender
Diffstat (limited to 'src/battle_4.c')
| -rw-r--r-- | src/battle_4.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/battle_4.c b/src/battle_4.c index 31d6c76dc..6dd5d7df6 100644 --- a/src/battle_4.c +++ b/src/battle_4.c @@ -246,15 +246,6 @@ extern u8 gUnknown_081D95DB[]; //bs payday money give #define CMP_COMMON_BITS 0x4 #define CMP_NO_COMMON_BITS 0x5 -#define BATTLE_WON 0x1 -#define BATTLE_LOST 0x2 -#define BATTLE_DREW 0x3 -#define BATTLE_RAN 0x4 -#define BATTLE_PLAYER_TELEPORTED 0x5 -#define BATTLE_POKE_FLED 0x6 -#define BATTLE_CAUGHT 0x7 -#define BATTLE_OPPONENT_TELEPORTED 0xA - #define uBYTE0_16(value)(( (u8) (((u16)(value) & (0x000000FF)) >> 0x00))) #define uBYTE1_16(value)(( (u8) (((u16)(value) & (0x0000FF00)) >> 0x08))) |