Verify data table and name list sizes with assertion macros

Fixes #312
This commit is contained in:
Rangi 2021-03-25 16:33:05 -04:00
parent e1f6bb5393
commit 95ec2cf039
139 changed files with 863 additions and 437 deletions

View file

@ -1633,7 +1633,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
@ -1677,7 +1677,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
@ -5101,7 +5101,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
@ -5133,7 +5133,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
@ -6077,7 +6077,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

View file

@ -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"

View file

@ -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

View file

@ -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)

View file

@ -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
@ -2490,7 +2485,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)

View file

@ -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)

View file

@ -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)

View file

@ -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)