diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-28 20:24:19 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-28 20:24:19 -0500 |
| commit | 575e8da6a971d5b6a54835ac370eb57eacc76db4 (patch) | |
| tree | cfe430adada4d079ca2227fa454f4ed88c4eb511 /src | |
| parent | 948b695ad436ade56858d76c3cd0d836910936ff (diff) | |
Document Seven Island scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_tower.c | 16 | ||||
| -rw-r--r-- | src/field_specials.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 82d3c4d85..ca434fad3 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -825,7 +825,7 @@ void CheckPartyBattleTowerBanlist(void) } } -static void PrintBattleTowerTrainerMessage(const u16 *greeting) +static void BufferBattleTowerTrainerMessage(const u16 *greeting) { s32 i; if (EC_DoesEasyChatStringFitOnLine(greeting, 3, 2, 18)) @@ -847,11 +847,11 @@ static void PrintBattleTowerTrainerMessage(const u16 *greeting) void PrintBattleTowerTrainerGreeting(void) { if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId == BATTLE_TOWER_EREADER_TRAINER_ID) - PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting); + BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting); else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID) - PrintBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting); + BufferBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting); else - PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting); + BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting); } static void CB2_FinishEReaderBattle(void) @@ -1395,9 +1395,9 @@ void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer) ((u32 *)ereaderTrainer)[i] = 0; } -void PrintEReaderTrainerGreeting(void) +void BufferEReaderTrainerGreeting(void) { - PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting); + BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting); } static void PrintEReaderTrainerFarewellMessage(void) @@ -1405,9 +1405,9 @@ static void PrintEReaderTrainerFarewellMessage(void) if (gBattleOutcome == B_OUTCOME_DREW) gStringVar4[0] = EOS; else if (gBattleOutcome == B_OUTCOME_WON) - PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerWon); + BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerWon); else - PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerLost); + BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerLost); } void Dummy_TryEnableBravoTrainerBattleTower(void) diff --git a/src/field_specials.c b/src/field_specials.c index 6554f6116..7f648f32b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -326,7 +326,7 @@ void RemoveCameraObject(void) RemoveObjectEventByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } -void Special_BufferEReaderTrainerName5(void) +void BufferEReaderTrainerName(void) { CopyEReaderTrainerName5(gStringVar1); } |