From 1c92cb8b48b96d861ceb2d14dfbf775223006edf Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 6 May 2018 12:16:57 -0400 Subject: [PATCH] 'rept' is not indented --- data/events/unown_walls.asm | 2 +- data/party_menu_qualities.asm | 2 +- data/pokemon/unown_words.asm | 4 ++-- engine/battle/effect_commands.asm | 4 ++-- engine/gfx/pic_animation.asm | 4 ++-- engine/items/item_effects.asm | 8 ++++---- engine/pokemon/move_mon.asm | 10 +++++----- macros/coords.asm | 4 ++-- mobile/mobile_5f.asm | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm index 13ffdfaf9..d7fa26cbc 100644 --- a/data/events/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -12,7 +12,7 @@ else x = 2 * (\1 - "A") endc db x -shift + shift endr db -1 ; end ENDM diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm index 9ccc9745d..c0c1b3df9 100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm @@ -13,7 +13,7 @@ partymenuqualities: MACRO rept _NARG db PARTYMENUQUALITY_\1 -shift + shift endr db -1 ; end ENDM diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 4283d3708..0b7d93ac2 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -1,9 +1,9 @@ unownword: MACRO x = 1 - rept STRLEN(\1) +rept STRLEN(\1) db STRSUB(\1, x, 1) - $40 x = x + 1 - endr +endr db -1 ENDM 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 diff --git a/macros/coords.asm b/macros/coords.asm index 95c4cb041..0833c242c 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -26,11 +26,11 @@ ENDM dwcoord: MACRO ; x, y - rept _NARG / 2 +rept _NARG / 2 dw (\2) * SCREEN_WIDTH + (\1) + wTileMap shift shift - endr +endr ENDM ldcoord_a: MACRO diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 9157353b0..05a1fc34c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1651,17 +1651,17 @@ Function17da31: ; 17da31 Unknown_17da8c: x = 0 - rept 8 +rept 8 db 1 << x x = x + 1 - endr +endr Unknown_17da94: x = 0 - rept 8 +rept 8 db (1 << x) ^ $ff x = x + 1 - endr +endr ; 17da9c Function17da9c: ; 17da9c