From ce50d1b2cb4eebf8484cf12e6280c441ec94ae39 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 16:55:11 -0500 Subject: Clearer Battle Tower code --- constants/battle_tower_constants.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'constants/battle_tower_constants.asm') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 74df3a36a..9961d42fd 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -42,10 +42,10 @@ const BATTLETOWER_RECEIVED_REWARD BATTLETOWER_NROFPKMNS EQU 3 -BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_NROFTRAINERS EQU 7 -BATTLETOWER_NRMONSPERLEVELBRACKET EQU BATTLETOWER_NROFPKMNS * BATTLETOWER_NROFTRAINERS -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + 3 * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH + +BATTLETOWER_TRAINERDATALENGTH EQU $24 +BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH ; return value from BattleTowerAction(BATTLETOWERACTION_CHECKMOBILEEVENT) MOBILE_EVENT_OBJECT_GS_BALL EQU $b -- cgit v1.2.3 From 16eb97ae9cca0ce52531860c499c3346e6a2cf9e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:55:44 -0500 Subject: Constant swap explains this Battle Tower bug --- constants/battle_tower_constants.asm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'constants/battle_tower_constants.asm') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 9961d42fd..ad119ddaa 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -44,6 +44,12 @@ BATTLETOWER_NROFPKMNS EQU 3 BATTLETOWER_NROFTRAINERS EQU 7 +BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 +BATTLETOWER_TRAINER_MASK EQU %1111111 + +BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 +BATTLETOWER_PKMN_MASK EQU %11111 + BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH -- cgit v1.2.3 From bc79f17b9dff053ce5613e4008596a55a6110d66 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 13:59:07 -0500 Subject: More maskbits --- constants/battle_tower_constants.asm | 3 --- 1 file changed, 3 deletions(-) (limited to 'constants/battle_tower_constants.asm') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index ad119ddaa..852ebf297 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -45,10 +45,7 @@ BATTLETOWER_NROFPKMNS EQU 3 BATTLETOWER_NROFTRAINERS EQU 7 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 -BATTLETOWER_TRAINER_MASK EQU %1111111 - BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 -BATTLETOWER_PKMN_MASK EQU %11111 BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH -- cgit v1.2.3 From eb3102200f66e3aa1688e4e52429fcac4b0272fa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:26:55 -0500 Subject: More Battle Tower map script constants, fewer raw hex values --- constants/battle_tower_constants.asm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'constants/battle_tower_constants.asm') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 852ebf297..58853da3a 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,4 +1,13 @@ -; BattleTowerAction arguments (see mobile/battle_tower_5c.asm) +BATTLETOWER_NROFPKMNS EQU 3 +BATTLETOWER_NROFTRAINERS 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 + +; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def const BATTLETOWERACTION_CHECK_EXPLANATION_READ const BATTLETOWERACTION_SET_EXPLANATION_READ @@ -33,22 +42,20 @@ const BATTLETOWERACTION_CHOOSEREWARD ; save options const BATTLETOWERACTION_SAVEOPTIONS -; sBattleTowerChallengeState +; BattleTowerAction return values +; - from BATTLETOWERACTION_CHECKMOBILEEVENT +MOBILE_EVENT_OBJECT_GS_BALL EQU $b + +; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm) +const_value set 1 + const BATTLETOWERTEXT_INTRO + const BATTLETOWERTEXT_WIN_TEXT + const BATTLETOWERTEXT_LOSS_TEXT + +; sBattleTowerChallengeState values const_def const BATTLETOWER_NO_CHALLENGE const BATTLETOWER_SAVED_AND_LEFT const BATTLETOWER_CHALLENGE_IN_PROGESS const BATTLETOWER_WON_CHALLENGE const BATTLETOWER_RECEIVED_REWARD - -BATTLETOWER_NROFPKMNS EQU 3 -BATTLETOWER_NROFTRAINERS EQU 7 - -BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 -BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 - -BATTLETOWER_TRAINERDATALENGTH EQU $24 -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH - -; return value from BattleTowerAction(BATTLETOWERACTION_CHECKMOBILEEVENT) -MOBILE_EVENT_OBJECT_GS_BALL EQU $b -- cgit v1.2.3 From 8127d1fbcfccb7cd5c3e210699dd540e370b6634 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:05:16 -0500 Subject: Rename BATTLETOWER_NROF constants --- constants/battle_tower_constants.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'constants/battle_tower_constants.asm') 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 -- cgit v1.2.3 From 05382d3e3c03616d6edf21833e89a8264a8cd10a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 20 Jan 2018 12:25:55 -0500 Subject: PARTY_LENGTH; MON_NAME; sgb_border.bin --- constants/battle_tower_constants.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'constants/battle_tower_constants.asm') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 4083c9d81..71b8de8be 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,11 +1,11 @@ -BATTLETOWER_PARTY_SIZE EQU 3 -BATTLETOWER_STREAK_SIZE EQU 7 +BATTLETOWER_PARTY_LENGTH EQU 3 +BATTLETOWER_STREAK_LENGTH 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_PARTY_SIZE * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH +BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def -- cgit v1.2.3