diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-17 18:16:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:16:12 -0400 |
| commit | 3e14c1f26e91b1fc1d18eed389518ae8454e938f (patch) | |
| tree | 64db6e9f438a62248ef0f0fe8e874ca6cf94b720 /engine/battle/core.asm | |
| parent | 89c2646ccaa2c9a0afb358c1d9738e9bb0d42c97 (diff) | |
| parent | b23f0b2bdaa993f17d8312bcde5f2b8a59ef9c90 (diff) | |
Merge pull request #539 from Rangi42/master
[RTM] Miscellaneous reorganization fixes
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c3c7e9867..57c0d7990 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3619,10 +3619,10 @@ CheckPlayerPartyForFitMon: ld e, a xor a ld hl, wPartyMon1HP - ld bc, wPartyMon2 - (wPartyMon1 + 1) + ld bc, PARTYMON_STRUCT_LENGTH - 1 .loop or [hl] - inc hl + inc hl ; + 1 or [hl] add hl, bc dec e @@ -6992,7 +6992,7 @@ GiveExperiencePoints: ld a, [wCurPartyMon] ld c, a ld b, CHECK_FLAG - ld d, $0 + ld d, FALSE predef SmallFarFlagAction ld a, c and a @@ -7006,7 +7006,7 @@ GiveExperiencePoints: ld e, l ld hl, wEnemyMonBaseStats - 1 push bc - ld c, $5 + ld c, NUM_EXP_STATS .loop1 inc hl ld a, [de] @@ -7286,13 +7286,13 @@ GiveExperiencePoints: ld [wMonType], a predef CopyMonToTempMon hlcoord 9, 0 - ld b, $a - ld c, $9 + ld b, 10 + ld c, 9 call TextBox hlcoord 11, 1 ld bc, 4 predef PrintTempMonStats - ld c, $1e + ld c, 30 call DelayFrames call WaitPressAorB_BlinkCursor call Call_LoadTempTileMapToTileMap |