diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-09 15:45:50 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-09 15:45:50 +0200 |
| commit | 10a525d5a072892d2e94c2cf31d5abc9197cae20 (patch) | |
| tree | 8cc165f2f24f7b09823ab43a91a281ef22b7f6a3 /include | |
| parent | 2a1e63f2b2d7d136b56fb382d924901342f83bb5 (diff) | |
decomp safari zone
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 12 | ||||
| -rw-r--r-- | include/safari_zone.h | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 585f42b32..1db546de3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -34,6 +34,15 @@ #define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID) +#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 STATUS_SLEEP 0x7 #define STATUS_POISON 0x8 #define STATUS_BURN 0x10 @@ -299,7 +308,8 @@ struct BattleResults u8 unk12; u8 battleTurnCounter; // 0x13 u8 pokeString2[10]; // 0x14 - u8 filler1E[2]; + u8 field_1E; // 0x1E + u8 field_1F; // 0x1F u16 lastOpponentSpecies; // 0x20 u16 lastUsedMove; // 0x22 u16 opponentMove; // 0x24 diff --git a/include/safari_zone.h b/include/safari_zone.h index 0649bab6a..9a81894b8 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -13,7 +13,6 @@ void ExitSafariMode(void); bool8 SafariZoneTakeStep(void); void SafariZoneRetirePrompt(void); -void SafariZoneGetPokeblockNameInFeeder(void); struct Pokeblock *SafariZoneGetActivePokeblock(void); void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index); |