diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 11:13:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 11:13:02 -0600 |
| commit | 37ded1d150197b3784bc351eeeb0a8d9713c2e35 (patch) | |
| tree | fcb7bd8f3090cb9f7b47a76af7e474122efe36e4 /engine/overworld/wild_mons.asm | |
| parent | Merge pull request #174 from Rangi42/master (diff) | |
| parent | Add space between arguments in assembly instructions and remove redundant a i... (diff) | |
| download | pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.gz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.xz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.zip | |
Merge pull request #171 from xCrystal/master
Misc style fixes
Diffstat (limited to 'engine/overworld/wild_mons.asm')
| -rw-r--r-- | engine/overworld/wild_mons.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index 6444ab7e..dae57f23 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -1,33 +1,33 @@ LoadWildData: - ld hl,WildDataPointers - ld a,[wCurMap] + ld hl, WildDataPointers + ld a, [wCurMap] ; get wild data for current map - ld c,a - ld b,0 - add hl,bc - add hl,bc - ld a,[hli] - ld h,[hl] - ld l,a ; hl now points to wild data for current map - ld a,[hli] - ld [wGrassRate],a + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a ; hl now points to wild data for current map + ld a, [hli] + ld [wGrassRate], a and a - jr z,.NoGrassData ; if no grass data, skip to surfing data + jr z, .NoGrassData ; if no grass data, skip to surfing data push hl - ld de,wGrassMons ; otherwise, load grass data - ld bc,$0014 + ld de, wGrassMons ; otherwise, load grass data + ld bc, $0014 call CopyData pop hl - ld bc,$0014 - add hl,bc + ld bc, $0014 + add hl, bc .NoGrassData - ld a,[hli] - ld [wWaterRate],a + ld a, [hli] + ld [wWaterRate], a and a ret z ; if no water data, we're done - ld de,wWaterMons ; otherwise, load surfing data - ld bc,$0014 + ld de, wWaterMons ; otherwise, load surfing data + ld bc, $0014 jp CopyData INCLUDE "data/wild_mons.asm" |