Use rgbds 0.5.0

6 files changed, 10 insertions, 26 deletions

diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm
index 4926bf53..aae80b11 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
diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index daf98738..d230c534 100644
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -721,10 +721,8 @@ ConvertLoadedPuzzlePieces:
 	ret
 
 .EnlargedTiles:
-x = 0
-rept 16
+for x, 16
 	db ((x & %1000) * %11000) + ((x & %0100) * %1100) + ((x & %0010) * %110) + ((x & %0001) * %11)
-x = x + 1
 endr
 
 UnownPuzzle_AddPuzzlePieceBorders:
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 9b744f72..a791b6d3 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -1115,8 +1115,7 @@ if \1 == 0 && \2 == 0
 _dx = 0
 endc
 	dbpixel \1, \2, _dx, 0
-	shift
-	shift
+	shift 2
 endr
 ENDM
 	; frame 0 y, x; frame 1 y, x
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index f5a0e0be..0005f28e 100644
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -40,7 +40,6 @@ PlayerObjectTemplate:
 ; A dummy map object used to initialize the player object.
 ; Shorter than the actual amount copied by two bytes.
 ; Said bytes seem to be unused.
-_NUM_OBJECT_EVENTS = 0
 	object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
 
 CopyDECoordsToMapObject::
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index b369aa01..08d8a3ae 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -990,11 +990,9 @@ PokegearPhone_GetDPad:
 
 PokegearPhone_UpdateCursor:
 	ld a, " "
-x = 4
-rept PHONE_DISPLAY_HEIGHT
-	hlcoord 1, x
+for y, PHONE_DISPLAY_HEIGHT
+	hlcoord 1, 4 + y * 2
 	ld [hl], a
-x = x + 2
 endr
 	hlcoord 1, 4
 	ld a, [wPokegearPhoneCursorPosition]
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 937bac8e..05251b43 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -2258,10 +2258,8 @@ _ChangeBox_MenuHeader:
 
 .Boxes:
 	db NUM_BOXES
-x = 1
-rept NUM_BOXES
-	db x
-x = x + 1
+for x, NUM_BOXES
+	db x + 1
 endr
 	db -1