diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/battle/experience.asm | |
| parent | db0ac16b6b4f257de338d1aaac561e681ca8723a (diff) | |
| parent | 7e112672b436afee27f1a5a0d6e7a5964e7829b2 (diff) | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'engine/battle/experience.asm')
| -rw-r--r-- | engine/battle/experience.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index f43a7354..9946c6c6 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -1,4 +1,4 @@ -GainExperience: ; 5524f (15:525f) +GainExperience: ld a, [wLinkState] cp LINK_STATE_BATTLING ret z ; return if link battle @@ -297,7 +297,7 @@ GainExperience: ; 5524f (15:525f) predef_jump FlagActionPredef ; set the fought current enemy flag for the mon that is currently out ; divide enemy base stats, catch rate, and base exp by the number of mons gaining exp -DivideExpDataByNumMonsGainingExp: ; 5547b (15:547b) +DivideExpDataByNumMonsGainingExp: ld a, [wPartyGainExpFlags] ld b, a xor a @@ -331,7 +331,7 @@ DivideExpDataByNumMonsGainingExp: ; 5547b (15:547b) ret ; multiplies exp by 1.5 -BoostExp: ; 554ae (15:54ae) +BoostExp: ld a, [H_QUOTIENT + 2] ld b, a ld a, [H_QUOTIENT + 3] @@ -345,11 +345,11 @@ BoostExp: ; 554ae (15:54ae) ld [H_QUOTIENT + 2], a ret -Bankswitch15ToF: ; 554c1 (15:54c1) +Bankswitch15ToF: ld b, BANK(BattleCore) jp Bankswitch -GainedText: ; 554c6 (15:54c6) +GainedText: TX_FAR _GainedText TX_ASM ld a, [wBoostExpByExpAll] @@ -363,20 +363,20 @@ GainedText: ; 554c6 (15:54c6) ld hl, BoostedText ret -WithExpAllText: ; 554df (15:54df) +WithExpAllText: TX_FAR _WithExpAllText TX_ASM ld hl, ExpPointsText ret -BoostedText: ; 554e8 (15:54e8) +BoostedText: TX_FAR _BoostedText -ExpPointsText: ; 554ec (15:54ec) +ExpPointsText: TX_FAR _ExpPointsText db "@" -GrewLevelText: ; 554f1 (15:54f1) +GrewLevelText: TX_FAR _GrewLevelText db $0b db "@" |