From 9772c722ac8fc6c41c5427ce7ca0d106a19db36e Mon Sep 17 00:00:00 2001 From: JimB16 Date: Sun, 23 Aug 2015 07:09:36 +0200 Subject: added comments and labels to BattleTower-Code --- data/battle_tower.asm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 025807ac8..aea1df2dd 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -1,4 +1,4 @@ -Function1f8000: ; 1f8000 +Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ld a, [rSVBK] push af ld a, $3 @@ -52,7 +52,7 @@ ENDC call AddNTimes ld bc, 11 call CopyBytes - call Function1f8081 + call Function_LoadRandomBattleTowerPkmn pop af ld hl, Unknown_1f0000 ld bc, $0024 @@ -73,14 +73,16 @@ ENDC ret ; 1f8081 -Function1f8081: ; 1f8081 - ld c, $3 +Function_LoadRandomBattleTowerPkmn: ; 1f8081 + ld c, $3 .loop push bc ld a, BANK(sbe51) call GetSRAMBank .asm_1f8089 + ; From Which LevelGroup are the Pkmn loaded + ; a = 1..10 ld a, [$d800] dec a ld hl, BattleTowerMons @@ -97,7 +99,9 @@ Function1f8081: ; 1f8081 and $1f cp (BattleTowerMons2 - BattleTowerMons1) / ($3b) jr nc, .asm_1f8099 + ; in register 'a' is the chosen Pkmn of the LevelGroup + ; Check if Pkmn was already loaded before ld bc, $3b call AddNTimes ld a, [hli] -- cgit v1.2.3 From 3922ad2c3cf4bc15ede67b3b1814e4c2fced9243 Mon Sep 17 00:00:00 2001 From: JimB16 Date: Sun, 23 Aug 2015 15:09:56 +0200 Subject: changed labels and added comments --- data/battle_tower.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index aea1df2dd..375072a46 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -74,7 +74,7 @@ ENDC ; 1f8081 Function_LoadRandomBattleTowerPkmn: ; 1f8081 - ld c, $3 + ld c, $3 .loop push bc ld a, BANK(sbe51) -- cgit v1.2.3 From b9c1d1b61e529ccda59cafda037c54964af544f3 Mon Sep 17 00:00:00 2001 From: JimB16 Date: Tue, 25 Aug 2015 17:02:13 +0200 Subject: named labels and commented WRAMVars in battle_tower.asm --- data/battle_tower.asm | 70 ++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 375072a46..a204920f5 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -14,11 +14,11 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ld de, w3_d100 ld a, [hRandomAdd] ld b, a -.asm_1f8022 +.asm_1f8022 ; loop to find a random trainer call Random ld a, [hRandomAdd] add b - ld b, a + ld b, a ; b contains the nr of the trainer IF DEF(CRYSTAL11) and $7f cp $46 @@ -31,14 +31,14 @@ ENDC ld a, BANK(sbe46) call GetSRAMBank ld c, $7 - ld hl, sbe48 + ld hl, sBTTrainers .asm_1f803a ld a, [hli] cp b jr z, .asm_1f8022 dec c - jr nz, .asm_1f803a - ld hl, sbe48 + jr nz, .asm_1f803a ; c <= 7 initialise all 7 trainers? + ld hl, sBTTrainers ld a, [sbe46] ld c, a ld a, b @@ -77,10 +77,10 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld c, $3 .loop push bc - ld a, BANK(sbe51) + ld a, BANK(sBTPkmnPrevTrainer1) call GetSRAMBank -.asm_1f8089 +.FindARandomBattleTowerPkmn ; From Which LevelGroup are the Pkmn loaded ; a = 1..10 ld a, [$d800] @@ -102,6 +102,8 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ; in register 'a' is the chosen Pkmn of the LevelGroup ; Check if Pkmn was already loaded before + ; Check current and the 2 previous teams + ; includes check if item is double at the current team ld bc, $3b call AddNTimes ld a, [hli] @@ -110,40 +112,40 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld c, a ld a, [w3_d100 + $0b] cp b - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld a, [w3_d100 + $0c] cp c - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld a, [w3_d100 + $46] cp b - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld a, [w3_d100 + $47] cp c - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld a, [w3_d100 + $81] cp b - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld a, [w3_d100 + $82] cp c - jr z, .asm_1f8089 - ld a, [sbe51] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer1] cp b - jr z, .asm_1f8089 - ld a, [sbe52] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer2] cp b - jr z, .asm_1f8089 - ld a, [sbe53] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer3] cp b - jr z, .asm_1f8089 - ld a, [sbe54] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer1] cp b - jr z, .asm_1f8089 - ld a, [sbe55] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer2] cp b - jr z, .asm_1f8089 - ld a, [sbe56] + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer3] cp b - jr z, .asm_1f8089 + jr z, .FindARandomBattleTowerPkmn ld bc, $3b call CopyBytes @@ -170,18 +172,18 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 dec c jp nz, .loop - ld a, [sbe51] - ld [sbe54], a - ld a, [sbe52] - ld [sbe55], a - ld a, [sbe53] - ld [sbe56], a + ld a, [sBTPkmnPrevTrainer1] + ld [sBTPkmnPrevPrevTrainer1], a + ld a, [sBTPkmnPrevTrainer2] + ld [sBTPkmnPrevPrevTrainer2], a + ld a, [sBTPkmnPrevTrainer3] + ld [sBTPkmnPrevPrevTrainer3], a ld a, [w3_d100 + $0b] - ld [sbe51], a + ld [sBTPkmnPrevTrainer1], a ld a, [w3_d100 + $46] - ld [sbe52], a + ld [sBTPkmnPrevTrainer2], a ld a, [w3_d100 + $81] - ld [sbe53], a + ld [sBTPkmnPrevTrainer3], a call CloseSRAM ret ; 1f814e -- cgit v1.2.3 From 2f4a0179feb846ac2eba945ba5365d0ebf6a6179 Mon Sep 17 00:00:00 2001 From: JimB16 Date: Wed, 26 Aug 2015 01:40:34 +0200 Subject: changed constants to SRAMLabels --- data/battle_tower.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index a204920f5..e10a47a96 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -54,12 +54,12 @@ ENDC call CopyBytes call Function_LoadRandomBattleTowerPkmn pop af - ld hl, Unknown_1f0000 + ld hl, BattleTowerTrainerData ld bc, $0024 call AddNTimes ld bc, $0024 .asm_1f8070 - ld a, BANK(Unknown_1f0000) + ld a, BANK(BattleTowerTrainerData) call GetFarByte ld [de], a inc hl -- cgit v1.2.3 From 4cd354ec3285cb24a0ab468c75e466b670036bbe Mon Sep 17 00:00:00 2001 From: JimB16 Date: Wed, 26 Aug 2015 03:11:19 +0200 Subject: fixed the BT_OTrainer Labels --- data/battle_tower.asm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index e10a47a96..f6d7b95de 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -3,15 +3,22 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 push af ld a, $3 ld [rSVBK], a + + ; Fill BT_OTrainer with zeros xor a - ld hl, w3_d100 - ld bc, $00e0 + ld hl, BT_OTrainer + ld bc, BT_OTrainerEnd - BT_OTrainer call ByteFill + + ; Write $ff into the Item-Slots ld a, $ff - ld [w3_d100 + $0c], a - ld [w3_d100 + $47], a - ld [w3_d100 + $82], a - ld de, w3_d100 + ld [BT_OTPkmn1Item], a + ld [BT_OTPkmn2Item], a + ld [BT_OTPkmn3Item], a + + ; Set BT_OTTrainer as start address to write the following data to + ld de, BT_OTrainer + ld a, [hRandomAdd] ld b, a .asm_1f8022 ; loop to find a random trainer @@ -110,22 +117,22 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld b, a ld a, [hld] ld c, a - ld a, [w3_d100 + $0b] + ld a, [BT_OTPkmn1] cp b jr z, .FindARandomBattleTowerPkmn - ld a, [w3_d100 + $0c] + ld a, [BT_OTPkmn1Item] cp c jr z, .FindARandomBattleTowerPkmn - ld a, [w3_d100 + $46] + ld a, [BT_OTPkmn2] cp b jr z, .FindARandomBattleTowerPkmn - ld a, [w3_d100 + $47] + ld a, [BT_OTPkmn2Item] cp c jr z, .FindARandomBattleTowerPkmn - ld a, [w3_d100 + $81] + ld a, [BT_OTPkmn3] cp b jr z, .FindARandomBattleTowerPkmn - ld a, [w3_d100 + $82] + ld a, [BT_OTPkmn3Item] cp c jr z, .FindARandomBattleTowerPkmn ld a, [sBTPkmnPrevTrainer1] @@ -178,11 +185,11 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld [sBTPkmnPrevPrevTrainer2], a ld a, [sBTPkmnPrevTrainer3] ld [sBTPkmnPrevPrevTrainer3], a - ld a, [w3_d100 + $0b] + ld a, [BT_OTPkmn1] ld [sBTPkmnPrevTrainer1], a - ld a, [w3_d100 + $46] + ld a, [BT_OTPkmn2] ld [sBTPkmnPrevTrainer2], a - ld a, [w3_d100 + $81] + ld a, [BT_OTPkmn3] ld [sBTPkmnPrevTrainer3], a call CloseSRAM ret -- cgit v1.2.3 From bcc11712a578f1a0020fb0ab4543205324ec018d Mon Sep 17 00:00:00 2001 From: JimB16 Date: Mon, 31 Aug 2015 14:31:13 +0200 Subject: added 'wBT_OTTempCopy'-label and the data structure that comes after --- data/battle_tower.asm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index f6d7b95de..dc96b3822 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -35,9 +35,11 @@ ELSE ENDC jr nc, .asm_1f8022 ld b, a + ld a, BANK(sbe46) call GetSRAMBank - ld c, $7 + + ld c, BATTLETOWER_NROFTRAINERS ld hl, sBTTrainers .asm_1f803a ld a, [hli] @@ -45,6 +47,7 @@ ENDC jr z, .asm_1f8022 dec c jr nz, .asm_1f803a ; c <= 7 initialise all 7 trainers? + ld hl, sBTTrainers ld a, [sbe46] ld c, a @@ -53,18 +56,22 @@ ENDC add hl, bc ld [hl], a call CloseSRAM + push af +; Copy name (10 bytes) and class (1 byte) of trainer ld hl, BattleTowerTrainers ld bc, 11 call AddNTimes ld bc, 11 call CopyBytes + call Function_LoadRandomBattleTowerPkmn pop af + ld hl, BattleTowerTrainerData - ld bc, $0024 + ld bc, BATTLETOWER_TRAINERDATALENGTH call AddNTimes - ld bc, $0024 + ld bc, BATTLETOWER_TRAINERDATALENGTH .asm_1f8070 ld a, BANK(BattleTowerTrainerData) call GetFarByte @@ -78,10 +85,9 @@ ENDC pop af ld [rSVBK], a ret -; 1f8081 Function_LoadRandomBattleTowerPkmn: ; 1f8081 - ld c, $3 + ld c, BATTLETOWER_NROFPKMNS .loop push bc ld a, BANK(sBTPkmnPrevTrainer1) @@ -156,6 +162,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld bc, $3b call CopyBytes + ld a, [wd265] push af push de @@ -172,6 +179,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 pop de ld bc, PKMN_NAME_LENGTH call CopyBytes + pop de pop af ld [wd265], a -- cgit v1.2.3 From d6a4dada406f8ee010f08a16d24907bde50e1d6c Mon Sep 17 00:00:00 2001 From: JimB16 Date: Tue, 1 Sep 2015 06:26:31 +0200 Subject: added/renamed constants and labels --- data/battle_tower.asm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/battle_tower.asm b/data/battle_tower.asm index dc96b3822..281c359d7 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -36,7 +36,7 @@ ENDC jr nc, .asm_1f8022 ld b, a - ld a, BANK(sbe46) + ld a, BANK(sNrOfBeatenBattleTowerTrainers) call GetSRAMBank ld c, BATTLETOWER_NROFTRAINERS @@ -49,12 +49,13 @@ ENDC jr nz, .asm_1f803a ; c <= 7 initialise all 7 trainers? ld hl, sBTTrainers - ld a, [sbe46] + ld a, [sNrOfBeatenBattleTowerTrainers] ld c, a ld a, b ld b, 0 add hl, bc ld [hl], a + call CloseSRAM push af @@ -82,10 +83,13 @@ ENDC ld a, b or c jr nz, .asm_1f8070 + pop af ld [rSVBK], a + ret + Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld c, BATTLETOWER_NROFPKMNS .loop @@ -96,7 +100,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 .FindARandomBattleTowerPkmn ; From Which LevelGroup are the Pkmn loaded ; a = 1..10 - ld a, [$d800] + ld a, [wBTChoiceOfLvlGroup] ; [$d800] dec a ld hl, BattleTowerMons ld bc, BattleTowerMons2 - BattleTowerMons1 @@ -117,7 +121,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ; Check if Pkmn was already loaded before ; Check current and the 2 previous teams ; includes check if item is double at the current team - ld bc, $3b + ld bc, BATTLETOWER_PKMNSTRUCTLENGTH + $b call AddNTimes ld a, [hli] ld b, a @@ -160,17 +164,17 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 cp b jr z, .FindARandomBattleTowerPkmn - ld bc, $3b + ld bc, BATTLETOWER_PKMNSTRUCTLENGTH + $b call CopyBytes ld a, [wd265] push af push de - ld hl, -$3b + ld hl, - (BATTLETOWER_PKMNSTRUCTLENGTH + $b) add hl, de ld a, [hl] ld [wd265], a - ld bc, $0030 + ld bc, BATTLETOWER_PKMNSTRUCTLENGTH add hl, bc push hl call GetPokemonName -- cgit v1.2.3