diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-19 16:31:37 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-19 16:31:37 -0400 |
| commit | 316fa4b69558a1930a1a1ae44a40221a1ddd4f26 (patch) | |
| tree | 4706eaec78ee5706e16e944eba4abfe1e7316168 /engine/events | |
| parent | 35219230960f0dc85c0cb6a5723877b247609e46 (diff) | |
Use rgbds 0.5.0
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rw-r--r-- | engine/events/buena.asm | 10 | ||||
| -rw-r--r-- | engine/events/print_unown_2.asm | 16 |
3 files changed, 8 insertions, 22 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 6b58203ca..55e65a126 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -386,11 +386,9 @@ ValidateBTParty: ; unreferenced ld c, l ld a, [hl] and a -x = $ff -rept $ff - NUM_POKEMON +for x, $ff, NUM_POKEMON, -1 jr z, .invalid cp x -x = x - 1 endr jr nz, .valid diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 62cb8bb4a..bc175d34f 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -43,10 +43,8 @@ BuenasPassword: .PasswordIndices: db NUM_PASSWORDS_PER_CATEGORY -x = 0 -rept NUM_PASSWORDS_PER_CATEGORY +for x, NUM_PASSWORDS_PER_CATEGORY db x -x = x + 1 endr db -1 @@ -264,10 +262,8 @@ Buena_PrizeMenu: .Prizes: db NUM_BUENA_PRIZES -x = 1 -rept NUM_BUENA_PRIZES - db x -x = x + 1 +for x, NUM_BUENA_PRIZES + db x + 1 endr db -1 diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 4926bf532..aae80b11c 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -95,17 +95,9 @@ RotateUnownFrontpic: jr nz, .loop_count ret -gbprinterrect: MACRO -y = 0 -rept \1 -x = \1 * (\2 - 1) + y -rept \2 - dw wGameboyPrinter2bppSource tile x -x = x - \2 +UnownPrinter_GBPrinterRectangle: +for y, 7 +for x, 7 - 1, -1, -1 + dw wGameboyPrinter2bppSource tile (x * 7 + y) endr -y = y + 1 endr -ENDM - -UnownPrinter_GBPrinterRectangle: - gbprinterrect 7, 7 |