diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 8170cf5a..d7851779 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -195,7 +195,7 @@ RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a) db $01,$00,$04 dbw BANK(OpenRedsPC), OpenRedsPC db $05,$03,$d0 - dbw BANK(PrintRedsNESText), PrintRedsNESText + dbw BANK(PrintRedSNESText), PrintRedSNESText db $FF BluesHouseHiddenObjects: ; 46b67 (11:6b67) db $01,$00,$04 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 90129a7a..ffcc33c3 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,4 +1,4 @@ -PrintRedsNESText: ; 5db79 (17:5b79) +PrintRedSNESText: ; 5db79 (17:5b79) call EnableAutoTextBoxDrawing tx_pre_jump RedBedroomSNESText @@ -379,7 +379,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) and $f ld [wSecondLockTrashCanIndex], a - tx_pre_id VermilionGymTrashSuccesText1 + tx_pre_id VermilionGymTrashSuccessText1 jr .done .trySecondLock @@ -405,7 +405,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) ld hl, wCurrentMapScriptFlags set 6, [hl] - tx_pre_id VermilionGymTrashSuccesText3 + tx_pre_id VermilionGymTrashSuccessText3 .done jp PrintPredefTextID @@ -434,8 +434,8 @@ GymTrashCans: ; 5de7d (17:5e7d) db 2, 11, 13, 0, 0 ; 14 ; 5dec8 -VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) - TX_FAR _VermilionGymTrashSuccesText1 +VermilionGymTrashSuccessText1: ; 5dec8 (17:5ec8) + TX_FAR _VermilionGymTrashSuccessText1 TX_ASM call WaitForSoundToFinish ld a, SFX_SWITCH @@ -444,8 +444,8 @@ VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8) jp TextScriptEnd ; unused -VermilionGymTrashSuccesText2: ; 5dedb (17:5edb) - TX_FAR _VermilionGymTrashSuccesText2 +VermilionGymTrashSuccessText2: ; 5dedb (17:5edb) + TX_FAR _VermilionGymTrashSuccessText2 db "@" ; unused @@ -457,8 +457,8 @@ VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0) call WaitForSoundToFinish jp TextScriptEnd -VermilionGymTrashSuccesText3: ; 5deef (17:5eef) - TX_FAR _VermilionGymTrashSuccesText3 +VermilionGymTrashSuccessText3: ; 5deef (17:5eef) + TX_FAR _VermilionGymTrashSuccessText3 TX_ASM call WaitForSoundToFinish ld a, SFX_GO_INSIDE diff --git a/home.asm b/home.asm index 736e3a42..2090e599 100644 --- a/home.asm +++ b/home.asm @@ -4714,9 +4714,9 @@ TextPredefs:: add_tx_pre FightingDojoText_52a1d ; 38 add_tx_pre NewBicycleText ; 39 add_tx_pre IndigoPlateauStatues ; 3A - add_tx_pre VermilionGymTrashSuccesText1 ; 3B - add_tx_pre VermilionGymTrashSuccesText2 ; 3C XXX unused - add_tx_pre VermilionGymTrashSuccesText3 ; 3D + add_tx_pre VermilionGymTrashSuccessText1 ; 3B + add_tx_pre VermilionGymTrashSuccessText2 ; 3C XXX unused + add_tx_pre VermilionGymTrashSuccessText3 ; 3D add_tx_pre VermilionGymTrashFailText ; 3E add_tx_pre TownMapText ; 3F add_tx_pre BookOrSculptureText ; 40 diff --git a/text.asm b/text.asm index 1e06c202..6555c185 100644 --- a/text.asm +++ b/text.asm @@ -948,7 +948,7 @@ _VermilionGymTrashText:: line "only trash here." done -_VermilionGymTrashSuccesText1:: +_VermilionGymTrashSuccessText1:: text "Hey! There's a" line "switch under the" cont "trash!" @@ -957,14 +957,14 @@ _VermilionGymTrashSuccesText1:: para "The 1st electric" line "lock opened!@@" -_VermilionGymTrashSuccesText2:: +_VermilionGymTrashSuccessText2:: text "Hey! There's" line "another switch" cont "under the trash!" cont "Turn it on!" prompt -_VermilionGymTrashSuccesText3:: +_VermilionGymTrashSuccessText3:: text "The 2nd electric" line "lock opened!"