Use more Pokemon data constants, create MOVE_NAME_LENGTH (#543)

Author: Narishma-gb

constants/pokemon_data_constants.asm

@@ -44,7 +44,7 @@ DEF MON_SPD_EXP    rw
 DEF MON_SPC_EXP    rw
 DEF MON_DVS        rw
 DEF MON_PP         rb NUM_MOVES
-DEF BOXMON_STRUCT_LENGTH EQU _RS
+DEF BOXMON_STRUCT_LENGTH EQU _RS ; $21
 DEF MON_LEVEL      rb
 DEF MON_STATS      rw NUM_STATS
 rsset MON_STATS
@@ -53,7 +53,7 @@ DEF MON_ATK        rw
 DEF MON_DEF        rw
 DEF MON_SPD        rw
 DEF MON_SPC        rw
-DEF PARTYMON_STRUCT_LENGTH EQU _RS
+DEF PARTYMON_STRUCT_LENGTH EQU _RS ; $2c
 
 DEF PARTY_LENGTH EQU 6
 

constants/text_constants.asm

@@ -1,5 +1,7 @@
+DEF PLAYER_NAME_LENGTH EQU 8
 DEF NAME_LENGTH        EQU 11
 DEF ITEM_NAME_LENGTH   EQU 13
+DEF MOVE_NAME_LENGTH   EQU 14
 DEF NAME_BUFFER_LENGTH EQU 20
 DEF GYM_CITY_LENGTH    EQU 17
 

engine/battle/battle_transitions.asm

@@ -104,11 +104,11 @@ GetBattleTransitionID_CompareLevels:
 	ld a, [hli]
 	or [hl]
 	jr nz, .notFainted
-	ld de, wPartyMon2 - (wPartyMon1 + 1)
+	ld de, PARTYMON_STRUCT_LENGTH - 1
 	add hl, de
 	jr .faintedLoop
 .notFainted
-	ld de, wPartyMon1Level - (wPartyMon1HP + 1)
+	ld de, MON_LEVEL - (MON_HP + 1)
 	add hl, de
 	ld a, [hl]
 	add $3

engine/battle/core.asm

@@ -137,7 +137,7 @@ StartBattle:
 	inc a
 	ld [wFirstMonsNotOutYet], a
 	ld hl, wEnemyMon1HP
-	ld bc, wEnemyMon2 - wEnemyMon1 - 1
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 	ld d, $3
 .findFirstAliveEnemyMonLoop
 	inc d
@@ -736,7 +736,7 @@ FaintEnemyPokemon:
 	jr z, .wild
 	ld a, [wEnemyMonPartyPos]
 	ld hl, wEnemyMon1HP
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hli], a
@@ -876,7 +876,7 @@ AnyEnemyPokemonAliveCheck:
 	ld b, a
 	xor a
 	ld hl, wEnemyMon1HP
-	ld de, wEnemyMon2 - wEnemyMon1
+	ld de, PARTYMON_STRUCT_LENGTH
 .nextPokemon
 	or [hl]
 	inc hl
@@ -1330,7 +1330,7 @@ EnemySendOutFirstMon:
 	ld a, b
 	ld [wWhichPokemon], a
 	push bc
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	inc hl
@@ -1342,7 +1342,7 @@ EnemySendOutFirstMon:
 .next3
 	ld a, [wWhichPokemon]
 	ld hl, wEnemyMon1Level
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hl]
 	ld [wCurEnemyLevel], a
@@ -1457,7 +1457,7 @@ AnyPartyAlive::
 	ld e, a
 	xor a
 	ld hl, wPartyMon1HP
-	ld bc, wPartyMon2 - wPartyMon1 - 1
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 .partyMonsLoop
 	or [hl]
 	inc hl
@@ -1473,7 +1473,7 @@ AnyPartyAlive::
 HasMonFainted:
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1HP
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	or [hl]
@@ -1625,16 +1625,16 @@ GotAwayText:
 ; copies from party data to battle mon data when sending out a new player mon
 LoadBattleMonFromParty:
 	ld a, [wWhichPokemon]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wPartyMon1Species
 	call AddNTimes
 	ld de, wBattleMonSpecies
 	ld bc, wBattleMonDVs - wBattleMonSpecies
 	call CopyData
-	ld bc, wPartyMon1DVs - wPartyMon1OTID
+	ld bc, MON_DVS - MON_OTID
 	add hl, bc
 	ld de, wBattleMonDVs
-	ld bc, wPartyMon1PP - wPartyMon1DVs
+	ld bc, MON_PP - MON_DVS
 	call CopyData
 	ld de, wBattleMonPP
 	ld bc, NUM_MOVES
@@ -1669,16 +1669,16 @@ LoadBattleMonFromParty:
 ; copies from enemy party data to current enemy mon data when sending out a new enemy mon
 LoadEnemyMonFromParty:
 	ld a, [wWhichPokemon]
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wEnemyMons
 	call AddNTimes
 	ld de, wEnemyMonSpecies
 	ld bc, wEnemyMonDVs - wEnemyMonSpecies
 	call CopyData
-	ld bc, wEnemyMon1DVs - wEnemyMon1OTID
+	ld bc, MON_DVS - MON_OTID
 	add hl, bc
 	ld de, wEnemyMonDVs
-	ld bc, wEnemyMon1PP - wEnemyMon1DVs
+	ld bc, MON_PP - MON_DVS
 	call CopyData
 	ld de, wEnemyMonPP
 	ld bc, NUM_MOVES
@@ -1800,7 +1800,7 @@ AnimateRetreatingPlayerMon:
 ReadPlayerMonCurHPAndStatus:
 	ld a, [wPlayerMonNumber]
 	ld hl, wPartyMon1HP
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -2520,7 +2520,7 @@ MoveSelectionMenu:
 .relearnmenu
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1Moves
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	call .loadmoves
 	hlcoord 4, 7
@@ -2798,12 +2798,12 @@ SwapMovesInMenu:
 .swapMovesInPartyMon
 	ld hl, wPartyMon1Moves
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	push hl
 	call .swapBytes ; swap moves
 	pop hl
-	ld bc, wPartyMon1PP - wPartyMon1Moves
+	ld bc, MON_PP - MON_MOVES
 	add hl, bc
 	call .swapBytes ; swap move PP
 	xor a
@@ -3451,7 +3451,7 @@ CheckPlayerStatusConditions:
 	bit PAR, [hl]
 	jr z, .BideCheck
 	call BattleRandom
-	cp $3F ; 25% to be fully paralyzed
+	cp 25 percent ; chance to be fully paralyzed
 	jr nc, .BideCheck
 	ld hl, FullyParalyzedText
 	call PrintText
@@ -3970,7 +3970,7 @@ CheckForDisobedience:
 ; compare the mon's original trainer ID with the player's ID to see if it was traded
 .checkIfMonIsTraded
 	ld hl, wPartyMon1OTID
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wPlayerMonNumber]
 	call AddNTimes
 	ld a, [wPlayerID]
@@ -4197,7 +4197,7 @@ GetDamageVarsForPlayerAttack:
 	push bc
 	ld hl, wPartyMon1Attack
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 	jr .scaleStats
@@ -4229,7 +4229,7 @@ GetDamageVarsForPlayerAttack:
 	push bc
 	ld hl, wPartyMon1Special
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	pop bc
 ; if either the offensive or defensive stat is too large to store in a byte, scale both stats by dividing them by 4
@@ -4303,7 +4303,7 @@ GetDamageVarsForEnemyAttack:
 ; in the case of a critical hit, reset the player's defense and the enemy's attack to their base values
 	ld hl, wPartyMon1Defense
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ld b, a
@@ -4335,7 +4335,7 @@ GetDamageVarsForEnemyAttack:
 ; in the case of a critical hit, reset the player's and enemy's specials to their base values
 	ld hl, wPartyMon1Special
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ld b, a
@@ -4398,7 +4398,7 @@ GetEnemyMonStat:
 	ld b, $0
 	add hl, bc
 	ld a, [wEnemyMonPartyPos]
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ldh [hMultiplicand + 1], a
@@ -5197,7 +5197,7 @@ IncrementMovePP:
 	jr z, .updatePP
 	ld a, [wEnemyMonPartyPos] ; value for enemy turn
 .updatePP
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	inc [hl] ; increment PP in the party memory location
 	ret
@@ -6206,7 +6206,7 @@ LoadEnemyMonData:
 ; if it's a trainer battle, copy moves from enemy party data
 	ld hl, wEnemyMon1Moves
 	ld a, [wWhichPokemon]
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld bc, NUM_MOVES
 	call CopyData

engine/battle/decrement_pp.asm

@@ -31,7 +31,7 @@ DecrementPP:
 
 	ld hl, wPartyMon1PP  ; PP of first move (in party)
 	ld a, [wPlayerMonNumber] ; which mon in party is active
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes       ; calculate address of the mon to modify
 .DecrementPP:
 	ld a, [wPlayerMoveListIndex] ; which move (0, 1, 2, 3) did we use?

engine/battle/draw_hud_pokeball_gfx.asm

@@ -90,7 +90,7 @@ PickPokeball:
 .done
 	ld a, b
 	ld [de], a
-	ld bc, wPartyMon2 - wPartyMon1Status
+	ld bc, PARTYMON_STRUCT_LENGTH - MON_STATUS
 	add hl, bc ; next mon struct
 	ret
 

engine/battle/effects.asm

@@ -323,7 +323,7 @@ CheckDefrost:
 	ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster]
 	ld hl, wEnemyMon1Status
 	ld a, [wEnemyMonPartyPos]
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hl], a ; clear status in roster
@@ -336,7 +336,7 @@ CheckDefrost:
 	ld [wBattleMonStatus], a
 	ld hl, wPartyMon1Status
 	ld a, [wPlayerMonNumber]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hl], a

engine/battle/end_of_battle.asm

@@ -5,7 +5,7 @@ EndOfBattle:
 ; link battle
 	ld a, [wEnemyMonPartyPos]
 	ld hl, wEnemyMon1Status
-	ld bc, wEnemyMon2 - wEnemyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [wEnemyMonStatus]
 	ld [hl], a
@@ -60,8 +60,8 @@ EndOfBattle:
 	ld [hli], a
 	ld [hl], a
 	ld [wListScrollOffset], a
-	ld hl, wPlayerStatsToDouble
-	ld b, $18
+	ld hl, wBattleStatusData
+	ld b, wBattleStatusDataEnd - wBattleStatusData
 .loop
 	ld [hli], a
 	dec b