diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-06 13:47:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 13:47:59 -0400 |
| commit | c480632d5494d04f7f5f0298a31877a2293b564e (patch) | |
| tree | 02483fc07e60d64a4b526ce8b402f26960ad33b2 /engine | |
| parent | 122d715484b79aba71d79caf148bac4a2ec441a5 (diff) | |
| parent | 9c2be80bf3fbdac6505787b00da0f4ff71839a05 (diff) | |
Merge pull request #262 from Rangi42/master
Miscellaneous
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/hidden_objects/school_notebooks.asm | 4 | ||||
| -rwxr-xr-x | engine/events/prize_menu.asm | 10 | ||||
| -rwxr-xr-x | engine/menus/oaks_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 4 |
4 files changed, 10 insertions, 10 deletions
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: 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 |