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

Reword Magikarp length comments

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-02 11:50:08 -05:00
parent 802cf616e7
commit d435bd8911
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
engine/battle/core.asm
View File

@ -6376,9 +6376,9 @@ LoadEnemyMon: ; 3e8eb
; but the value is in feet and inches (one byte each). ; but the value is in feet and inches (one byte each).
; The first filter is supposed to make very large Magikarp even rarer, ; The first filter is supposed to make very large Magikarp even rarer,
; by targeting those 1600 mm or larger. ; by targeting those 1600 mm (= 5'3") or larger.
; After the conversion to feet, it is unable to target any, ; After the conversion to feet, it is unable to target any,
; as the largest possible Magikarp is 5'3'', which reads as 1283. ; since the largest possible Magikarp is 5'3", and $0503 = 1283 mm.
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
cp MAGIKARP cp MAGIKARP
jr nz, .Happiness jr nz, .Happiness
@ -6388,42 +6388,43 @@ LoadEnemyMon: ; 3e8eb
ld bc, PlayerID ld bc, PlayerID
callfar CalcMagikarpLength callfar CalcMagikarpLength
; No reason to keep going if length > 1536 (i.e. if length / 256 != 6) ; No reason to keep going if length > 1536 mm (i.e. if HIGH(length) > 6)
ld a, [wMagikarpLength] ld a, [wMagikarpLength]
cp HIGH(1536) ; this compares to 6'0'', should be cp 5 cp HIGH(1536) ; should be "cp 5", since 1536 mm = 5'0", but HIGH(1536) = 6
jr nz, .CheckMagikarpArea jr nz, .CheckMagikarpArea
; 5% chance of skipping both size checks ; 5% chance of skipping both size checks
call Random call Random
cp 5 percent cp 5 percent
jr c, .CheckMagikarpArea jr c, .CheckMagikarpArea
; Try again if length > 1615 ; Try again if length >= 1616 mm
ld a, [wMagikarpLength + 1] ld a, [wMagikarpLength + 1]
cp LOW(1616) ; this compares to 6'80'', should be cp 3 cp LOW(1616) ; should be "cp 3", since 1616 mm = 5'3", but LOW(1616) = 80
jr nc, .GenerateDVs jr nc, .GenerateDVs
; 20% chance of skipping this check ; 20% chance of skipping this check
call Random call Random
cp 20 percent - 1 cp 20 percent - 1
jr c, .CheckMagikarpArea jr c, .CheckMagikarpArea
; Try again if length > 1599 ; Try again if length >= 1600 mm
ld a, [wMagikarpLength + 1] ld a, [wMagikarpLength + 1]
cp LOW(1600) ; this compares to 6'64'', should be cp 2 cp LOW(1600) ; should be "cp 2", since 1600 mm = 5'2", but LOW(1600) = 64
jr nc, .GenerateDVs jr nc, .GenerateDVs
.CheckMagikarpArea: .CheckMagikarpArea:
; The z checks are supposed to be nz ; The "jr z" checks are supposed to be "jr nz".
; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
; and routes 20 and 44 are treated as Lake of Rage ; Instead, all maps in GROUP_LAKE_OF_RAGE (Mahogany area)
; and Routes 20 and 44 are treated as Lake of Rage.
; This also means Lake of Rage Magikarp can be smaller than ones ; This also means Lake of Rage Magikarp can be smaller than ones
; caught elsewhere rather than the other way around ; caught elsewhere rather than the other way around.
; Intended behavior enforces a minimum size at Lake of Rage ; Intended behavior enforces a minimum size at Lake of Rage.
; The real behavior prevents size flooring in the Lake of Rage area ; The real behavior prevents a minimum size in the Lake of Rage area.
; Moreover, due to the check not being translated to feet, all Magikarp ; Moreover, due to the check not being translated to feet+inches, all Magikarp
; smaller than 4'0'' may be caught by the filter, a lot more than intended ; smaller than 4'0" may be caught by the filter, a lot more than intended.
ld a, [MapGroup] ld a, [MapGroup]
cp GROUP_LAKE_OF_RAGE cp GROUP_LAKE_OF_RAGE
jr z, .Happiness jr z, .Happiness
@ -6434,9 +6435,9 @@ LoadEnemyMon: ; 3e8eb
call Random call Random
cp 40 percent - 2 cp 40 percent - 2
jr c, .Happiness jr c, .Happiness
; Floor at length 1024 ; Try again if length < 1024 mm
ld a, [wMagikarpLength] ld a, [wMagikarpLength]
cp HIGH(1024) ; compares to 4'0'', cp 3 would be closer to intended value cp HIGH(1024) ; should be "cp 3", since 1024 mm = 3'4", but HIGH(1024) = 4
jr c, .GenerateDVs ; try again jr c, .GenerateDVs ; try again
; Finally done with DVs ; Finally done with DVs