diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:09:50 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:09:50 -0500 |
| commit | c63a889bf45d9cd6da0668703fad55941e531fa2 (patch) | |
| tree | 25e9fd93a9a0e27be52e424d366f6385607f9777 | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
Floor beaten --> floor cleared
| -rw-r--r-- | asm/macros/trainer_tower.inc | 4 | ||||
| -rw-r--r-- | data/scripts/trainer_tower.inc | 4 | ||||
| -rw-r--r-- | include/constants/trainer_tower.h | 2 | ||||
| -rw-r--r-- | src/trainer_tower.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/asm/macros/trainer_tower.inc b/asm/macros/trainer_tower.inc index 3a97b3ffd..8e5f606ee 100644 --- a/asm/macros/trainer_tower.inc +++ b/asm/macros/trainer_tower.inc @@ -37,8 +37,8 @@ .endm @ TRUE if the trainers on this floor were already beaten, FALSE otherwise - .macro ttower_isfloorbeaten - setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_BEATEN + .macro ttower_isfloorcleared + setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED special CallTrainerTowerFunc .endm diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 224bbdd19..45ffc285d 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -48,7 +48,7 @@ TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 setflag HIDE_TRAINER_SINGLES setflag HIDE_TRAINER_KNOCKOUT setvar DISABLE_SINGLES_TRIGGER, TRUE - ttower_isfloorbeaten + ttower_isfloorcleared compare VAR_RESULT, TRUE goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 @@ -84,7 +84,7 @@ TrainerTower_OnFrame:: @ 81C5046 TrainerTower_EventScript_EnterFloor:: @ 81C5050 setvar VAR_TEMP_2, 1 - ttower_isfloorbeaten + ttower_isfloorcleared compare VAR_RESULT, FALSE goto_if_eq TrainerTower_EventScript_EndEnterFloor setvar DISABLE_SINGLES_TRIGGER, TRUE diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h index 52c9bb3a0..6372a30e8 100644 --- a/include/constants/trainer_tower.h +++ b/include/constants/trainer_tower.h @@ -19,7 +19,7 @@ #define TRAINER_TOWER_FUNC_DO_BATTLE 2 #define TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE 3 #define TRAINER_TOWER_FUNC_CLEARED_FLOOR 4 -#define TRAINER_TOWER_FUNC_GET_FLOOR_BEATEN 5 +#define TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED 5 #define TRAINER_TOWER_FUNC_START_CHALLENGE 6 #define TRAINER_TOWER_FUNC_GET_OWNER_STATE 7 #define TRAINER_TOWER_FUNC_GIVE_PRIZE 8 diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 85bcb4e3e..0546f9bae 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -90,7 +90,7 @@ static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass); static void DoTrainerTowerBattle(void); static void TrainerTowerGetChallengeType(void); static void TrainerTowerAddFloorCleared(void); -static void GetFloorAlreadyBeaten(void); +static void GetFloorAlreadyCleared(void); static void StartTrainerTowerChallenge(void); static void GetOwnerState(void); static void GiveChallengePrize(void); @@ -338,7 +338,7 @@ static void (*const sTrainerTowerFunctions[])(void) = { [TRAINER_TOWER_FUNC_DO_BATTLE] = DoTrainerTowerBattle, [TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE] = TrainerTowerGetChallengeType, [TRAINER_TOWER_FUNC_CLEARED_FLOOR] = TrainerTowerAddFloorCleared, - [TRAINER_TOWER_FUNC_GET_FLOOR_BEATEN] = GetFloorAlreadyBeaten, + [TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED] = GetFloorAlreadyCleared, [TRAINER_TOWER_FUNC_START_CHALLENGE] = StartTrainerTowerChallenge, [TRAINER_TOWER_FUNC_GET_OWNER_STATE] = GetOwnerState, [TRAINER_TOWER_FUNC_GIVE_PRIZE] = GiveChallengePrize, @@ -765,7 +765,7 @@ static void TrainerTowerAddFloorCleared(void) } // So the player can safely go back through defeated floors to use the Poke Center (or exit challenge) -static void GetFloorAlreadyBeaten(void) +static void GetFloorAlreadyCleared(void) { u16 mapLayoutId = gMapHeader.mapLayoutId; if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared |