diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 20:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 20:29:55 -0500 |
| commit | c2a7216d9b8689591ede817015bf96f263396bb8 (patch) | |
| tree | 008635aac62c3fdbb446453d308c2255fb0554d9 /battle/core.asm | |
| parent | 0b8b6f9259bedacad55bb4667de5b2bbe6eafda7 (diff) | |
| parent | c6b12b07b302b82765181b2521e1e0f2ca5f7725 (diff) | |
Merge pull request #424 from roukaour/master
Rename a routine and some maps; remove all code from main.asm
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/battle/core.asm b/battle/core.asm index 57088ebdd..9cae539c3 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2573,11 +2573,11 @@ WinTrainerBattle: ; 3cfa4 .CheckMaxedOutMomMoney: ; 3d0b1 ld hl, wMomsMoney + 2 ld a, [hld] - cp 999999 % $100 + cp MAX_MONEY % $100 ld a, [hld] - sbc 999999 / $100 % $100 + sbc MAX_MONEY / $100 % $100 ld a, [hl] - sbc 999999 / $10000 % $100 + sbc MAX_MONEY / $10000 % $100 ret ; 3d0be @@ -2602,17 +2602,17 @@ AddBattleMoneyToAccount: ; 3d0be jr nz, .loop pop hl ld a, [hld] - cp 999999 % $100 + cp MAX_MONEY % $100 ld a, [hld] - sbc 999999 / $100 % $100 + sbc MAX_MONEY / $100 % $100 ld a, [hl] - sbc 999999 / $10000 % $100 + sbc MAX_MONEY / $10000 % $100 ret c - ld [hl], 999999 / $10000 % $100 + ld [hl], MAX_MONEY / $10000 % $100 inc hl - ld [hl], 999999 / $100 % $100 + ld [hl], MAX_MONEY / $100 % $100 inc hl - ld [hl], 999999 % $100 + ld [hl], MAX_MONEY % $100 ret ; 3d0ea @@ -7009,14 +7009,14 @@ ApplyStatLevelMultiplier: ; 3ecb7 ; Cap at 999. ld a, [hQuotient + 2] - sub 999 % $100 + sub MAX_STAT_VALUE % $100 ld a, [hQuotient + 1] - sbc 999 / $100 + sbc MAX_STAT_VALUE / $100 jp c, .okay3 - ld a, 999 / $100 + ld a, MAX_STAT_VALUE / $100 ld [hQuotient + 1], a - ld a, 999 % $100 + ld a, MAX_STAT_VALUE % $100 ld [hQuotient + 2], a .okay3 @@ -7132,13 +7132,13 @@ BoostStat: ; 3ed7c ; Cap at 999. ld a, [hld] - sub 999 % $100 + sub MAX_STAT_VALUE % $100 ld a, [hl] - sbc 999 / $100 + sbc MAX_STAT_VALUE / $100 ret c - ld a, 999 / $100 + ld a, MAX_STAT_VALUE / $100 ld [hli], a - ld a, 999 % $100 + ld a, MAX_STAT_VALUE % $100 ld [hld], a ret ; 3ed9f @@ -9135,10 +9135,10 @@ AddLastMobileBattleToLinkRecord: ; 3fa42 dec hl ld a, [hl] inc hl - cp 9999 / $100 + cp MAX_LINK_RECORD / $100 ret c ld a, [hl] - cp 9999 % $100 + cp MAX_LINK_RECORD % $100 ret ; 3fac8 |