diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_setup.c | 2 | ||||
| -rw-r--r-- | src/mevent.c | 2 | ||||
| -rw-r--r-- | src/mevent_client.c | 2 | ||||
| -rw-r--r-- | src/mystery_event_script.c | 2 | ||||
| -rw-r--r-- | src/new_game.c | 2 | ||||
| -rw-r--r-- | src/quest_log_8150454.c | 10 | ||||
| -rw-r--r-- | src/trainer_tower.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 98437e279..b9da39ddb 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -645,7 +645,7 @@ static u8 GetTrainerBattleTransition(void) return sBattleTransitionTable_Trainer[transitionType][1]; } -u8 sub_8080060(void) +u8 BattleSetup_GetBattleTowerBattleTransition(void) { u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL); u8 playerLevel = GetSumOfPlayerPartyLevel(1); diff --git a/src/mevent.c b/src/mevent.c index 846ccbaa8..671e30ee0 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -588,7 +588,7 @@ void DestroyWonderCard(void) ClearRamScript(); sub_806E2D0(); sub_806E370(); - sub_80E7524(&gSaveBlock2Ptr->unk_B0.field_3F0); + sub_80E7524(&gSaveBlock2Ptr->battleTower.ereaderTrainer); } bool32 sub_8143F68(const struct MEWonderCardData * data) diff --git a/src/mevent_client.c b/src/mevent_client.c index f4432cc11..c2a86afdd 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -217,7 +217,7 @@ static u32 client_mainseq_4(struct mevent_client * svr) MEventSetRamScript(svr->recvBuffer, 1000); break; case 18: - memcpy(&gSaveBlock2Ptr->unk_B0.field_3F0, svr->recvBuffer, sizeof(struct BattleTowerEReaderTrainer)); + memcpy(&gSaveBlock2Ptr->battleTower.ereaderTrainer, svr->recvBuffer, sizeof(struct BattleTowerEReaderTrainer)); ValidateEReaderTrainer(); break; case 21: diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 68a045f2c..c73d7445b 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -281,7 +281,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx) bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx) { u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]; - memcpy(&gSaveBlock2Ptr->unk_B0.field_3F0, (void *)data, sizeof(struct BattleTowerEReaderTrainer)); + memcpy(&gSaveBlock2Ptr->battleTower.ereaderTrainer, (void *)data, sizeof(struct BattleTowerEReaderTrainer)); ValidateEReaderTrainer(); StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer); ctx->data[2] = 2; diff --git a/src/new_game.c b/src/new_game.c index 4b5432a95..0d71a5652 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -78,7 +78,7 @@ static void ClearPokedexFlags(void) static void sub_80549D4(void) { - CpuFill32(0, &gSaveBlock2Ptr->unk_B0, sizeof(gSaveBlock2Ptr->unk_B0)); + CpuFill32(0, &gSaveBlock2Ptr->battleTower, sizeof(gSaveBlock2Ptr->battleTower)); } static void WarpToPlayersRoom(void) diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c index 0e603bf63..09cf47f93 100644 --- a/src/quest_log_8150454.c +++ b/src/quest_log_8150454.c @@ -60,7 +60,7 @@ static void sub_81504A8(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_81507BC(mapObject, sub_805C808(0)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x01); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } static void sub_81504E8(void) @@ -68,7 +68,7 @@ static void sub_81504E8(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_81507BC(mapObject, sub_805C808(1)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x02); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); sub_80BD620(0, 0); } @@ -122,7 +122,7 @@ static void sub_81505C4(u8 taskId) sub_805D9C4(sprite); if (sprite->animEnded) { - if (!(gPlayerAvatar.flags & 8)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) sub_81507BC(mapObject, sub_805C808(0)); else sub_81507BC(mapObject, sub_805C808(2)); @@ -141,11 +141,11 @@ static void sub_8150708(void) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; u8 fieldEffectId; - if (!(gPlayerAvatar.flags & 0x08)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)) { sub_81507BC(mapObject, sub_805C808(2)); FieldObjectTurn(mapObject, mapObject->placeholder18); - SetPlayerAvatarStateMask(0x08); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); gFieldEffectArguments[0] = mapObject->coords2.x; gFieldEffectArguments[1] = mapObject->coords2.y; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index cd796bf3a..a4b511725 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -954,7 +954,7 @@ static void sub_815E160(void) BuildEnemyParty(); CreateTask(sub_815E124, 1); PlayMapChosenOrBattleBGM(0); - BT_StartOnField(sub_8080060()); + BT_StartOnField(BattleSetup_GetBattleTowerBattleTransition()); } static void sub_815E1C0(void) |