From 8127d1fbcfccb7cd5c3e210699dd540e370b6634 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:05:16 -0500 Subject: [PATCH] Rename BATTLETOWER_NROF constants --- constants/battle_tower_constants.asm | 6 +++--- engine/events/battle_tower/battle_tower.asm | 8 ++++---- engine/events/battle_tower/load_trainer.asm | 4 ++-- engine/events/battle_tower/rules.asm | 6 +++--- maps/BattleTowerBattleRoom.asm | 2 +- mobile/mobile_5c.asm | 2 +- sram.asm | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 58853da3a..4083c9d81 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,11 +1,11 @@ -BATTLETOWER_NROFPKMNS EQU 3 -BATTLETOWER_NROFTRAINERS EQU 7 +BATTLETOWER_PARTY_SIZE EQU 3 +BATTLETOWER_STREAK_SIZE EQU 7 BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH +BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_SIZE * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index bb2c23ca2..dcf4d5ccf 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -363,7 +363,7 @@ ReadBTTrainerParty: ; 1702b7 ; Copy Pkmn into Memory from the address in hl ld de, OTPartyMon1Species ld bc, OTPartyCount - ld a, BATTLETOWER_NROFPKMNS ; Number of Pkmn the BattleTower-Trainer has + ld a, BATTLETOWER_PARTY_SIZE ld [bc], a inc bc .otpartymon_loop @@ -399,7 +399,7 @@ ReadBTTrainerParty: ; 1702b7 ValidateBTParty: ; 170394 ; Check for and fix errors in party data ld hl, wBT_OTTempPkmn1Species - ld d, BATTLETOWER_NROFPKMNS + ld d, BATTLETOWER_PARTY_SIZE .pkmn_loop push de push hl @@ -509,7 +509,7 @@ BT_ChrisName: ; 170426 Function17042c: ; 17042c ld hl, w3_d202TrainerData - ld a, BATTLETOWER_NROFTRAINERS + ld a, BATTLETOWER_STREAK_SIZE .loop push af push hl @@ -956,7 +956,7 @@ ResetBattleTowerTrainersSRAM: ; 1706d6 (5c:46d6) BattleTowerAction $1a ld a, $ff ld hl, sBTTrainers - ld bc, BATTLETOWER_NROFTRAINERS + ld bc, BATTLETOWER_STREAK_SIZE call ByteFill xor a diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 7c229219f..a7a978311 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -41,7 +41,7 @@ endc ld a, BANK(sBTTrainers) call GetSRAMBank - ld c, BATTLETOWER_NROFTRAINERS + ld c, BATTLETOWER_STREAK_SIZE ld hl, sBTTrainers .next_trainer ld a, [hli] @@ -93,7 +93,7 @@ endc Function_LoadRandomBattleTowerPkmn: ; 1f8081 - ld c, BATTLETOWER_NROFPKMNS + ld c, BATTLETOWER_PARTY_SIZE .loop push bc ld a, BANK(sBTPkmnPrevTrainer1) diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 8d037951b..b41c51078 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -213,7 +213,7 @@ BattleTower_ExecuteJumptable: ; 8b25b BattleTower_CheckPartyLengthIs3: ; 8b2bb ld a, [PartyCount] - cp BATTLETOWER_NROFPKMNS + cp BATTLETOWER_PARTY_SIZE ret ; 8b2c1 @@ -235,13 +235,13 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1 cp b ret z ld a, b - cp BATTLETOWER_NROFPKMNS + cp BATTLETOWER_PARTY_SIZE ret ; 8b2da Function_PartyCountEq3: ; 8b2da ld a, [PartyCount] - cp BATTLETOWER_NROFPKMNS + cp BATTLETOWER_PARTY_SIZE ret z scf ret diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 6e13536fc..8fcc8dba4 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -37,7 +37,7 @@ Script_BattleRoomLoop: ; 0x9f425 reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 - if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers + if_equal BATTLETOWER_STREAK_SIZE, Script_BeatenAllTrainers applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear BATTLETOWERBATTLEROOM_YOUNGSTER diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index c55ddcecf..1b6c71a3d 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -219,7 +219,7 @@ Function170c8b: ; 170c8b ; 170c98 CheckBTMonMovesForErrors: ; 170c98 - ld c, BATTLETOWER_NROFPKMNS + ld c, BATTLETOWER_PARTY_SIZE ld hl, wBT_OTTempPkmn1Moves .loop push hl diff --git a/sram.asm b/sram.asm index 1d2fd348f..84d2a8f5a 100644 --- a/sram.asm +++ b/sram.asm @@ -203,7 +203,7 @@ sBattleTower:: ; be46 sNrOfBeatenBattleTowerTrainers:: db sBTChoiceOfLevelGroup:: db ; Battle Tower trainers are saved here, so nobody appears more than once -sBTTrainers:: ds BATTLETOWER_NROFTRAINERS ; sbe48 +sBTTrainers:: ds BATTLETOWER_STREAK_SIZE ; sbe48 sBattleTowerSaveFileFlags:: db sBattleTowerReward:: db