From 8a79315635ee9ebb6eed5c9648fe89746085d0b1 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Mon, 6 Jul 2020 12:28:31 -0400
Subject: Capitalize rgbds control structures (EQU/EQUS, IF/ELIF/ELSE/ENDC,
 REPT/ENDR, MACRO/ENDM, etc)

---
 engine/overworld/healing_machine.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine')

diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 836af44d..a09a7590 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -89,9 +89,9 @@ FlashSprite8Times:
 
 CopyHealingMachineOAM:
 ; copy one OAM entry and advance the pointers
-	rept 4
+	REPT 4
 	ld a, [de]
 	inc de
 	ld [hli], a
-	endr
+	ENDR
 	ret
-- 
cgit v1.2.3


From 9c2be80bf3fbdac6505787b00da0f4ff71839a05 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Mon, 6 Jul 2020 12:39:29 -0400
Subject: text_linkpromptbutton -> text_waitbutton

Fixes #260
---
 engine/events/hidden_objects/school_notebooks.asm |  4 ++--
 engine/events/prize_menu.asm                      | 10 +++++-----
 engine/menus/oaks_pc.asm                          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engine')

diff --git a/engine/events/hidden_objects/school_notebooks.asm b/engine/events/hidden_objects/school_notebooks.asm
index 9fccf6c0..96a44ab5 100644
--- a/engine/events/hidden_objects/school_notebooks.asm
+++ b/engine/events/hidden_objects/school_notebooks.asm
@@ -7,7 +7,7 @@ PrintNotebookText:
 
 TMNotebook::
 	text_far TMNotebookText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ViridianSchoolNotebook::
@@ -45,7 +45,7 @@ TurnPageText:
 
 ViridianSchoolNotebookText5:
 	text_far _ViridianSchoolNotebookText5
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ViridianSchoolNotebookText1:
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index c79fdbbc..0030aafb 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -44,7 +44,7 @@ CeladonPrizeMenu::
 
 RequireCoinCaseTextPtr:
 	text_far _RequireCoinCaseText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ExchangeCoinsForPrizesTextPtr:
@@ -264,7 +264,7 @@ UnknownPrizeData:
 
 HereYouGoTextPtr:
 	text_far _HereYouGoText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 SoYouWantPrizeTextPtr:
@@ -273,17 +273,17 @@ SoYouWantPrizeTextPtr:
 
 SorryNeedMoreCoinsText:
 	text_far _SorryNeedMoreCoinsText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 PrizeRoomBagIsFullTextPtr:
 	text_far _OopsYouDontHaveEnoughRoomText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 OhFineThenTextPtr:
 	text_far _OhFineThenText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 GetPrizeMonLevel:
diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm
index cdb97aca..7743e5df 100755
--- a/engine/menus/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
@@ -20,7 +20,7 @@ GetDexRatedText:
 
 ClosedOaksPCText:
 	text_far _ClosedOaksPCText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 AccessedOaksPCText:
-- 
cgit v1.2.3