pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove all address comments

Browse Source
This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
engine/events/battle_tower/battle_tower.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/events/battle_tower/get_trainer_class.asm
View File

@@ -5,7 +5,7 @@ GetMobileOTTrainerClass: ; mobile function
ld c, a
ret
.GetMobileOTTrainerClass: ; 4e930
.GetMobileOTTrainerClass:
ld a, [hli]
xor [hl]
ld c, a

5
engine/events/battle_tower/load_trainer.asm
View File

@@ -1,4 +1,4 @@
Function_LoadOpponentTrainerAndPokemons: ; 1f8000
Function_LoadOpponentTrainerAndPokemons:
ld a, [rSVBK]
push af
ld a, BANK(wBT_OTTrainer)
@@ -92,7 +92,7 @@ endc
ret
Function_LoadRandomBattleTowerMon: ; 1f8081
Function_LoadRandomBattleTowerMon:
ld c, BATTLETOWER_PARTY_LENGTH
.loop
push bc
@@ -207,7 +207,6 @@ Function_LoadRandomBattleTowerMon: ; 1f8081
ld [sBTMonPrevTrainer3], a
call CloseSRAM
ret
; 1f814e
INCLUDE "data/battle_tower/classes.asm"

79
engine/events/battle_tower/rules.asm
View File

@@ -1,27 +1,24 @@
CheckForMobileBattleRules: ; 8b1e1
CheckForMobileBattleRules:
ld de, .PointerTables
call BattleTower_ExecuteJumptable
ret z
call BattleTower_PleaseReturnWhenReady
scf
ret
; 8b1ed
.PointerTables: ; 8b1ed
.PointerTables:
db 2
dw .Functions
dw .TextPointers
.Functions: ; 8b1f2
.Functions:
dw BattleTower_CheckPartyLengthIs3
dw BattleTower_CheckPartyHasThreeMonsThatAreNotEggs
; 8b1f6
.TextPointers: ; 8b1f6
.TextPointers:
dw .ExcuseMeText
dw JumpText_NeedAtLeastThreeMon
dw JumpText_EggDoesNotQualify
; 8b1fc
.ExcuseMeText: ; 0x8b1fc
; Excuse me!
@@ -29,7 +26,7 @@ CheckForMobileBattleRules: ; 8b1e1
db "@"
; 0x8b201
_CheckForBattleTowerRules: ; 8b201
_CheckForBattleTowerRules:
ld hl, wStringBuffer2
ld [hl], "3"
inc hl
@@ -40,27 +37,24 @@ _CheckForBattleTowerRules: ; 8b201
call BattleTower_PleaseReturnWhenReady
scf
ret
; 8b215
.PointerTables: ; 8b215
.PointerTables:
db 4
dw .Functions
dw .TextPointers
.Functions: ; 8b21a
.Functions:
dw Function_PartyCountEq3
dw Function_PartySpeciesAreUnique
dw Function_PartyItemsAreUnique
dw Function_HasPartyAnEgg
; 8b222
.TextPointers: ; 8b222
.TextPointers:
dw JumpText_ExcuseMeYoureNotReady
dw JumpText_OnlyThreeMonMayBeEntered
dw JumpText_TheMonMustAllBeDifferentKinds
dw JumpText_TheMonMustNotHoldTheSameItems
dw JumpText_YouCantTakeAnEgg
; 8b22c
JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
; Excuse me. You're not ready.
@@ -68,11 +62,10 @@ JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
db "@"
; 0x8b231
BattleTower_PleaseReturnWhenReady: ; 8b231
BattleTower_PleaseReturnWhenReady:
ld hl, .PleaseReturnWhenReady
call PrintText
ret
; 8b238
.PleaseReturnWhenReady: ; 0x8b238
; Please return when you're ready.
@@ -116,7 +109,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
db "@"
; 0x8b25b
BattleTower_ExecuteJumptable: ; 8b25b
BattleTower_ExecuteJumptable:
ld bc, 0
.loop
call .DoJumptableFunction
@@ -126,9 +119,8 @@ BattleTower_ExecuteJumptable: ; 8b25b
ld a, b
and a
ret
; 8b26c
.DoJumptableFunction: ; 8b26c
.DoJumptableFunction:
push de
push bc
call .GetFunctionPointer
@@ -137,16 +129,14 @@ BattleTower_ExecuteJumptable: ; 8b25b
pop bc
pop de
ret
; 8b276
.Next_CheckReachedEnd: ; 8b276
.Next_CheckReachedEnd:
inc c
ld a, [de]
cp c
ret
; 8b27a
.GetFunctionPointer: ; 8b27a
.GetFunctionPointer:
inc de
ld a, [de]
ld l, a
@@ -154,9 +144,8 @@ BattleTower_ExecuteJumptable: ; 8b25b
ld a, [de]
ld h, a
ret
; 8b281
.GetTextPointers: ; 8b281
.GetTextPointers:
inc de
inc de
inc de
@@ -166,16 +155,14 @@ BattleTower_ExecuteJumptable: ; 8b25b
ld a, [de]
ld h, a
ret
; 8b28a
.LoadTextPointer: ; 8b28a
.LoadTextPointer:
ld a, [hli]
ld h, [hl]
ld l, a
ret
; 8b28e
.PrintFailureText: ; 8b28e
.PrintFailureText:
push de
push bc
ld a, b
@@ -186,18 +173,16 @@ BattleTower_ExecuteJumptable: ; 8b25b
ld b, $1
pop de
ret
; 8b29d
.PrintFirstText: ; 8b29d
.PrintFirstText:
push de
call .GetTextPointers
call .LoadTextPointer
call PrintText
pop de
ret
; 8b2a9
.PrintNthText: ; 8b2a9
.PrintNthText:
push bc
call .GetTextPointers
inc hl
@@ -209,15 +194,13 @@ BattleTower_ExecuteJumptable: ; 8b25b
call PrintText
pop bc
ret
; 8b2bb
BattleTower_CheckPartyLengthIs3: ; 8b2bb
BattleTower_CheckPartyLengthIs3:
ld a, [wPartyCount]
cp BATTLETOWER_PARTY_LENGTH
ret
; 8b2c1
BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
BattleTower_CheckPartyHasThreeMonsThatAreNotEggs:
ld hl, wPartyCount
ld a, [hli]
ld b, $0
@@ -237,23 +220,20 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
ld a, b
cp BATTLETOWER_PARTY_LENGTH
ret
; 8b2da
Function_PartyCountEq3: ; 8b2da
Function_PartyCountEq3:
ld a, [wPartyCount]
cp BATTLETOWER_PARTY_LENGTH
ret z
scf
ret
; 8b2e2
Function_PartySpeciesAreUnique: ; 8b2e2
Function_PartySpeciesAreUnique:
ld hl, wPartyMon1Species
call VerifyUniqueness
ret
; 8b2e9
VerifyUniqueness: ; 8b2e9
VerifyUniqueness:
ld de, wPartyCount
ld a, [de]
inc de
@@ -296,18 +276,16 @@ VerifyUniqueness: ; 8b2e9
pop hl
scf
ret
; 8b31a
.nextmon ; 8b31a
.nextmon
push bc
ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc
inc de
pop bc
ret
; 8b322
.isegg ; 8b322
.isegg
push bc
ld b, a
ld a, [de]
@@ -315,15 +293,13 @@ VerifyUniqueness: ; 8b2e9
ld a, b
pop bc
ret
; 8b32a
Function_PartyItemsAreUnique: ; 8b32a
Function_PartyItemsAreUnique:
ld hl, wPartyMon1Item
call VerifyUniqueness
ret
; 8b331
Function_HasPartyAnEgg: ; 8b331
Function_HasPartyAnEgg:
ld hl, wPartyCount
ld a, [hli]
ld c, a
@@ -339,4 +315,3 @@ Function_HasPartyAnEgg: ; 8b331
.found
scf
ret
; 8b342

17
engine/events/battle_tower/trainer_text.asm
View File

@@ -1,4 +1,4 @@
BattleTowerText:: ; 11c000
BattleTowerText::
; Print text c for trainer [wBT_OTTrainerClass]
; 1: Intro text
; 2: Player lost
@@ -83,19 +83,18 @@ endc
ld [rSVBK], a
call PlaceHLTextAtBC
ret
; 11c05d
INCLUDE "mobile/fixed_words.asm"
INCLUDE "data/trainers/genders.asm"
BTMaleTrainerTexts: ; 11f332
BTMaleTrainerTexts:
dw .Greetings
dw .PlayerLost
dw .PlayerWon
.Greetings: ; 11f338
.Greetings:
dw BTGreetingM1
dw BTGreetingM2
dw BTGreetingM3
@@ -122,7 +121,7 @@ BTMaleTrainerTexts: ; 11f332
dw BTGreetingM24
dw BTGreetingM25
.PlayerLost: ; 11f36a
.PlayerLost:
dw BTLossM1
dw BTLossM2
dw BTLossM3
@@ -149,7 +148,7 @@ BTMaleTrainerTexts: ; 11f332
dw BTLossM24
dw BTLossM25
.PlayerWon: ; 11f39c
.PlayerWon:
dw BTWinM1
dw BTWinM2
dw BTWinM3
@@ -182,7 +181,7 @@ BTFemaleTrainerTexts:
dw .PlayerLost
dw .PlayerWon
.Greetings: ; 11f3d4
.Greetings:
dw BTGreetingF1
dw BTGreetingF2
dw BTGreetingF3
@@ -199,7 +198,7 @@ BTFemaleTrainerTexts:
dw BTGreetingF14
dw BTGreetingF15
.PlayerLost: ; 11f3f2
.PlayerLost:
dw BTLossF1
dw BTLossF2
dw BTLossF3
@@ -216,7 +215,7 @@ BTFemaleTrainerTexts:
dw BTLossF14
dw BTLossF15
.PlayerWon: ; 11f410
.PlayerWon:
dw BTWinF1
dw BTWinF2
dw BTWinF3