ref: 8127d1fbcfccb7cd5c3e210699dd540e370b6634
parent: b071dd364f715165d6eec99ebbd1e4aed4b84bde
author: Remy Oukaour <[email protected]>
date: Sat Jan 20 07:05:16 EST 2018
Rename BATTLETOWER_NROF constants
--- 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
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -363,7 +363,7 @@
; 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 @@
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 @@
Function17042c: ; 17042c
ld hl, w3_d202TrainerData
- ld a, BATTLETOWER_NROFTRAINERS
+ ld a, BATTLETOWER_STREAK_SIZE
.loop
push af
push hl
@@ -956,7 +956,7 @@
ld a, $ff
ld hl, sBTTrainers
- ld bc, BATTLETOWER_NROFTRAINERS
+ ld bc, BATTLETOWER_STREAK_SIZE
call ByteFill
xor a
--- a/engine/events/battle_tower/load_trainer.asm
+++ b/engine/events/battle_tower/load_trainer.asm
@@ -41,7 +41,7 @@
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 @@
Function_LoadRandomBattleTowerPkmn: ; 1f8081
- ld c, BATTLETOWER_NROFPKMNS
+ ld c, BATTLETOWER_PARTY_SIZE
.loop
push bc
ld a, BANK(sBTPkmnPrevTrainer1)
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -213,7 +213,7 @@
BattleTower_CheckPartyLengthIs3: ; 8b2bb
ld a, [PartyCount]
- cp BATTLETOWER_NROFPKMNS
+ cp BATTLETOWER_PARTY_SIZE
ret
; 8b2c1
@@ -235,13 +235,13 @@
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
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -37,7 +37,7 @@
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
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -219,7 +219,7 @@
; 170c98
CheckBTMonMovesForErrors: ; 170c98
- ld c, BATTLETOWER_NROFPKMNS
+ ld c, BATTLETOWER_PARTY_SIZE
ld hl, wBT_OTTempPkmn1Moves
.loop
push hl
--- a/sram.asm
+++ b/sram.asm
@@ -203,7 +203,7 @@
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