diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-21 10:10:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 10:10:04 -0500 |
| commit | b787f8ca045b03521f03d84df8ea06ff87a2ab01 (patch) | |
| tree | 63467bde2f08295e231eec02610f6e041ca38944 /src/recorded_battle.c | |
| parent | 25e469b6644377ec4e4f82eab294437a61ea7635 (diff) | |
| parent | 66fd9b2ddfef147159033271046f62b4f2c8adad (diff) | |
Merge pull request #335 from DizzyEggg/battledoc
Document some not labeled battle things
Diffstat (limited to 'src/recorded_battle.c')
| -rw-r--r-- | src/recorded_battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index fc3b8b94a..355ed5e07 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -19,7 +19,7 @@ #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE \ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ - | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ + | BATTLE_TYPE_RECORDED | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_SECRET_BASE \ | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)) extern u8 gUnknown_03001278; @@ -273,7 +273,7 @@ void sub_81851A8(u8 *arg0) return; } - if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) + if (!(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER)) { for (var2 = *arg0; var2 != 0;) { @@ -360,7 +360,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)); battleSave->battleFlags |= BATTLE_TYPE_x2000000; - if (sBattleFlags & BATTLE_TYPE_WILD) + if (sBattleFlags & BATTLE_TYPE_IS_MASTER) { battleSave->battleFlags |= BATTLE_TYPE_x80000000; } |