Merge branch 'master' of https://github.com/pret/pokered

engine/battle/core.asm

@@ -1642,7 +1642,7 @@ LoadBattleMonFromParty:
 	ld bc, wPartyMon1DVs - wPartyMon1OTID
 	add hl, bc
 	ld de, wBattleMonDVs
-	ld bc, NUM_DVS
+	ld bc, wPartyMon1PP - wPartyMon1DVs
 	call CopyData
 	ld de, wBattleMonPP
 	ld bc, NUM_MOVES
@@ -1686,7 +1686,7 @@ LoadEnemyMonFromParty:
 	ld bc, wEnemyMon1DVs - wEnemyMon1OTID
 	add hl, bc
 	ld de, wEnemyMonDVs
-	ld bc, NUM_DVS
+	ld bc, wEnemyMon1PP - wEnemyMon1DVs
 	call CopyData
 	ld de, wEnemyMonPP
 	ld bc, NUM_MOVES
@@ -5110,7 +5110,7 @@ ReloadMoveData:
 	ld [wd11e], a
 	dec a
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld a, BANK(Moves)
 	call FarCopyData ; copy the move's stats
@@ -5142,7 +5142,7 @@ MetronomePickMove:
 	call BattleRandom
 	and a
 	jr z, .pickMoveLoop
-	cp NUM_ATTACKS + 1 ; max normal move number + 1 (this is Struggle's move number)
+	cp NUM_ATTACKS ; max move number (including Struggle)
 	jr nc, .pickMoveLoop
 	cp METRONOME
 	jr z, .pickMoveLoop
@@ -6086,7 +6086,7 @@ GetCurrentMove:
 	ld [wd0b5], a
 	dec a
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld a, BANK(Moves)
 	call FarCopyData

engine/battle/effects.asm

@@ -740,7 +740,7 @@ FellText:
 	text_end
 
 PrintStatText:
-	ld hl, StatsTextStrings
+	ld hl, StatModTextStrings
 	ld c, "@"
 .findStatName_outer
 	dec b
@@ -755,7 +755,7 @@ PrintStatText:
 	ld bc, $a
 	jp CopyData
 
-INCLUDE "data/battle/stat_names.asm"
+INCLUDE "data/battle/stat_mod_names.asm"
 
 INCLUDE "data/battle/stat_modifiers.asm"
 

engine/battle/trainer_ai.asm

@@ -264,7 +264,7 @@ ReadMove:
 	push bc
 	dec a
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wEnemyMoveNum
 	call CopyData

engine/events/heal_party.asm

@@ -35,7 +35,7 @@ HealParty:
 	push bc
 
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wcd6d
 	ld a, BANK(Moves)

engine/items/item_effects.asm

@@ -1292,7 +1292,7 @@ ItemUseMedicine:
 	ld [hl], a
 	pop hl
 	call .recalculateStats
-	ld hl, VitaminText
+	ld hl, VitaminStats
 	ld a, [wcf91]
 	sub HP_UP - 1
 	ld c, a
@@ -1425,12 +1425,7 @@ VitaminNoEffectText:
 	text_far _VitaminNoEffectText
 	text_end
 
-VitaminText:
-	db "HEALTH@"
-	db "ATTACK@"
-	db "DEFENSE@"
-	db "SPEED@"
-	db "SPECIAL@"
+INCLUDE "data/battle/stat_names.asm"
 
 ItemUseBait:
 	ld hl, ThrewBaitText
@@ -2495,7 +2490,7 @@ GetMaxPP:
 	dec a
 	push hl
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wcd6d
 	ld a, BANK(Moves)

engine/pokemon/add_mon.asm

@@ -259,7 +259,7 @@ AddPartyMon_WriteMovePP:
 	push de
 	push bc
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wcd6d
 	ld a, BANK(Moves)

engine/pokemon/bills_pc.asm

@@ -552,4 +552,3 @@ JustAMomentText::
 
 OpenBillsPCText::
 	script_bills_pc
-

engine/pokemon/evos_moves.asm

@@ -161,7 +161,7 @@ Evolution_PartyMonLoop: ; loop over party mons
 	ld a, [wd11e]
 	dec a
 	ld hl, BaseStats
-	ld bc, MonBaseStatsEnd - MonBaseStats
+	ld bc, BASE_DATA_SIZE
 	call AddNTimes
 	ld de, wMonHeader
 	call CopyData
@@ -479,7 +479,7 @@ WriteMonMoves:
 	push hl
 	dec a
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wBuffer
 	ld a, BANK(Moves)

engine/pokemon/learn_move.asm

@@ -44,7 +44,7 @@ DontAbandonLearning:
 	push de
 	dec a
 	ld hl, Moves
-	ld bc, MoveEnd - Moves
+	ld bc, MOVE_LENGTH
 	call AddNTimes
 	ld de, wBuffer
 	ld a, BANK(Moves)