diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
| commit | 761edc7db37df18a6e7f41e0d3bb9edd1e3cf721 (patch) | |
| tree | ae116b7a1e65bf0b7c0cc4e574a5655a074e8e7a /engine | |
| parent | 8d10a987a375a93045659422779c30d25d1aa89b (diff) | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/effect_commands.asm | 4 | ||||
| -rw-r--r-- | engine/gfx/pic_animation.asm | 4 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 580c25583..fad5b27a0 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -2404,10 +2404,10 @@ GetFailureResultText: ; 350e4 ld hl, wCurDamage ld a, [hli] ld b, [hl] - rept 3 +rept 3 srl a rr b - endr +endr ld [hl], b dec hl ld [hli], a diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 8781c2fd0..54999a6bb 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -53,14 +53,14 @@ AnimateMon_Unused: ; d003a ; d0042 pokeanim: MACRO - rept _NARG +rept _NARG ; Workaround for a bug where macro args can't come after the start of a symbol if !DEF(\1_POKEANIM) \1_POKEANIM EQUS "PokeAnim_\1_" endc db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 shift - endr +endr db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2 ENDM diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 597a75e47..a32ce0ef7 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -806,10 +806,10 @@ HeavyBallMultiplier: ld b, h ld c, l - rept 4 +rept 4 srl b rr c - endr +endr call .subbc srl b @@ -2529,9 +2529,9 @@ BattleRestorePP: ; f652 push hl push de push bc - rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves +rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves inc de - endr +endr ld bc, MON_PP - MON_MOVES add hl, bc ld a, [hl] diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 8ccf319f0..630479797 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -115,20 +115,20 @@ GeneratePartyMonStats: ; d906 and a jr nz, .randomlygeneratemoves ld de, wEnemyMonMoves - rept NUM_MOVES + -1 +rept NUM_MOVES + -1 ld a, [de] inc de ld [hli], a - endr +endr ld a, [de] ld [hl], a jr .next .randomlygeneratemoves xor a - rept NUM_MOVES + -1 +rept NUM_MOVES + -1 ld [hli], a - endr +endr ld [hl], a ld [wBuffer1], a predef FillMoves @@ -220,7 +220,7 @@ endr call FillPP pop de pop hl -rept 4 +rept NUM_MOVES inc de endr |