thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port pokecrystal's formatting of text commands and special characters

Browse source
This commit is contained in:
Rangi 2020-07-04 17:09:35 -04:00
parent 2718c36065
commit 139a28ff99
397 changed files with 7398 additions and 7026 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engine/events/card_key.asm
View file

@ -72,14 +72,14 @@ SilphCoMapList:
db $FF
CardKeySuccessText::
TX_FAR _CardKeySuccessText1
TX_SFX_ITEM_1
TX_FAR _CardKeySuccessText2
db "@"
text_far _CardKeySuccessText1
sound_get_item_1
text_far _CardKeySuccessText2
text_end
CardKeyFailText::
TX_FAR _CardKeyFailText
db "@"
text_far _CardKeyFailText
text_end
; d = Y
; e = X

16
engine/events/cinnabar_lab.asm
View file

@ -73,20 +73,20 @@ GiveFossilToCinnabarLab::
ret
LabFossil_610ae:
TX_FAR _Lab4Text_610ae
db "@"
text_far _Lab4Text_610ae
text_end
LabFossil_610b3:
TX_FAR _Lab4Text_610b3
db "@"
text_far _Lab4Text_610b3
text_end
LabFossil_610b8:
TX_FAR _Lab4Text_610b8
db "@"
text_far _Lab4Text_610b8
text_end
LabFossil_610bd:
TX_FAR _Lab4Text_610bd
db "@"
text_far _Lab4Text_610bd
text_end
PrintFossilsInBag:
; Prints each fossil in the player's bag on a separate line in the menu.

6
engine/events/diploma.asm
View file

@ -1,3 +1,5 @@
CIRCLE_TILE_ID EQU $70
DisplayDiploma::
call SaveScreenTilesToBuffer2
call GBPalWhiteOutWithDelay3
@ -8,7 +10,7 @@ DisplayDiploma::
set 6, [hl]
call DisableLCD
ld hl, CircleTile
ld de, vChars2 + $700
ld de, vChars2 + CIRCLE_TILE_ID * $10
ld bc, $10
ld a, BANK(CircleTile)
call FarCopyData2
@ -94,7 +96,7 @@ DiplomaTextPointersAndCoords:
dwCoord 9, 16
DiplomaText:
db $70,"Diploma",$70,"@"
db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@"
DiplomaPlayer:
db "Player@"

4
engine/events/elevator.asm
View file

@ -44,5 +44,5 @@ DisplayElevatorFloorMenu:
ret
WhichFloorText:
TX_FAR _WhichFloorText
db "@"
text_far _WhichFloorText
text_end

14
engine/events/give_pokemon.asm
View file

@ -69,14 +69,14 @@ SetPokedexOwnedFlag:
jp PrintText
GotMonText:
TX_FAR _GotMonText
TX_SFX_ITEM_1
db "@"
text_far _GotMonText
sound_get_item_1
text_end
SentToBoxText:
TX_FAR _SentToBoxText
db "@"
text_far _SentToBoxText
text_end
BoxIsFullText:
TX_FAR _BoxIsFullText
db "@"
text_far _BoxIsFullText
text_end

22
engine/events/hidden_items.asm
View file

@ -21,8 +21,8 @@ HiddenItems:
INCLUDE "data/events/hidden_item_coords.asm"
FoundHiddenItemText::
TX_FAR _FoundHiddenItemText
TX_ASM
text_far _FoundHiddenItemText
text_asm
ld a, [wHiddenObjectFunctionArgument] ; item ID
ld b, a
ld c, 1
@ -46,8 +46,8 @@ FoundHiddenItemText::
jp TextScriptEnd
HiddenItemBagFullText::
TX_FAR _HiddenItemBagFullText
db "@"
text_far _HiddenItemBagFullText
text_end
HiddenCoins:
ld b, COIN_CASE
@ -121,15 +121,15 @@ HiddenCoins:
INCLUDE "data/events/hidden_coins.asm"
FoundHiddenCoinsText::
TX_FAR _FoundHiddenCoinsText
TX_SFX_ITEM_2
db "@"
text_far _FoundHiddenCoinsText
sound_get_item_2
text_end
DroppedHiddenCoinsText::
TX_FAR _FoundHiddenCoins2Text
TX_SFX_ITEM_2
TX_FAR _DroppedHiddenCoinsText
db "@"
text_far _FoundHiddenCoins2Text
sound_get_item_2
text_far _DroppedHiddenCoinsText
text_end
FindHiddenItemOrCoinsIndex:
ld a, [wHiddenObjectY]

66
engine/events/hidden_objects/bench_guys.asm
View file

@ -50,59 +50,59 @@ BenchGuyTextPointers:
db $FF
ViridianCityPokecenterBenchGuyText::
TX_FAR _ViridianCityPokecenterGuyText
db "@"
text_far _ViridianCityPokecenterGuyText
text_end
PewterCityPokecenterBenchGuyText::
TX_FAR _PewterCityPokecenterGuyText
db "@"
text_far _PewterCityPokecenterGuyText
text_end
CeruleanCityPokecenterBenchGuyText::
TX_FAR _CeruleanPokecenterGuyText
db "@"
text_far _CeruleanPokecenterGuyText
text_end
LavenderCityPokecenterBenchGuyText::
TX_FAR _LavenderPokecenterGuyText
db "@"
text_far _LavenderPokecenterGuyText
text_end
MtMoonPokecenterBenchGuyText::
TX_FAR _MtMoonPokecenterBenchGuyText
db "@"
text_far _MtMoonPokecenterBenchGuyText
text_end
RockTunnelPokecenterBenchGuyText::
TX_FAR _RockTunnelPokecenterGuyText
db "@"
text_far _RockTunnelPokecenterGuyText
text_end
UnusedBenchGuyText1::
TX_FAR _UnusedBenchGuyText1
db "@"
text_far _UnusedBenchGuyText1
text_end
UnusedBenchGuyText2::
TX_FAR _UnusedBenchGuyText2
db "@"
text_far _UnusedBenchGuyText2
text_end
UnusedBenchGuyText3::
TX_FAR _UnusedBenchGuyText3
db "@"
text_far _UnusedBenchGuyText3
text_end
VermilionCityPokecenterBenchGuyText::
TX_FAR _VermilionPokecenterGuyText
db "@"
text_far _VermilionPokecenterGuyText
text_end
CeladonCityPokecenterBenchGuyText::
TX_FAR _CeladonCityPokecenterGuyText
db "@"
text_far _CeladonCityPokecenterGuyText
text_end
FuchsiaCityPokecenterBenchGuyText::
TX_FAR _FuchsiaCityPokecenterGuyText
db "@"
text_far _FuchsiaCityPokecenterGuyText
text_end
CinnabarIslandPokecenterBenchGuyText::
TX_FAR _CinnabarPokecenterGuyText
db "@"
text_far _CinnabarPokecenterGuyText
text_end
SaffronCityPokecenterBenchGuyText::
TX_ASM
text_asm
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2
@ -112,13 +112,13 @@ SaffronCityPokecenterBenchGuyText::
jp TextScriptEnd
SaffronCityPokecenterBenchGuyText1:
TX_FAR _SaffronCityPokecenterGuyText1
db "@"
text_far _SaffronCityPokecenterGuyText1
text_end
SaffronCityPokecenterBenchGuyText2:
TX_FAR _SaffronCityPokecenterGuyText2
db "@"
text_far _SaffronCityPokecenterGuyText2
text_end
CeladonCityHotelText::
TX_FAR _CeladonCityHotelText
db "@"
text_far _CeladonCityHotelText
text_end

20
engine/events/hidden_objects/bills_house_pc.asm
View file

@ -45,13 +45,13 @@ BillsHousePC:
ret
BillsHouseMonitorText::
TX_FAR _BillsHouseMonitorText
db "@"
text_far _BillsHouseMonitorText
text_end
BillsHouseInitiatedText::
TX_FAR _BillsHouseInitiatedText
TX_BLINK
TX_ASM
text_far _BillsHouseInitiatedText
text_promptbutton
text_asm
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
@ -65,7 +65,7 @@ BillsHouseInitiatedText::
jp TextScriptEnd
BillsHousePokemonList::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, BillsHousePokemonListText1
call PrintText
@ -119,8 +119,8 @@ BillsHousePokemonList::
jp TextScriptEnd
BillsHousePokemonListText1:
TX_FAR _BillsHousePokemonListText1
db "@"
text_far _BillsHousePokemonListText1
text_end
BillsMonListText:
db "EEVEE"
@ -130,5 +130,5 @@ BillsMonListText:
next "CANCEL@"
BillsHousePokemonListText2:
TX_FAR _BillsHousePokemonListText2
db "@"
text_far _BillsHousePokemonListText2
text_end

4
engine/events/hidden_objects/blues_room.asm
View file

@ -9,5 +9,5 @@ PrintBookcaseText:
tx_pre_jump BookcaseText
BookcaseText::
TX_FAR _BookcaseText
db "@"
text_far _BookcaseText
text_end

10
engine/events/hidden_objects/book_or_sculpture.asm
View file

@ -1,5 +1,5 @@
BookOrSculptureText::
TX_ASM
text_asm
ld hl, PokemonBooksText
ld a, [wCurMapTileset]
cp MANSION ; Celadon Mansion tileset
@ -13,9 +13,9 @@ BookOrSculptureText::
jp TextScriptEnd
PokemonBooksText:
TX_FAR _PokemonBooksText
db "@"
text_far _PokemonBooksText
text_end
DiglettSculptureText:
TX_FAR _DiglettSculptureText
db "@"
text_far _DiglettSculptureText
text_end

42
engine/events/hidden_objects/cinnabar_gym_quiz.asm
View file

@ -6,7 +6,7 @@ PrintCinnabarQuiz:
tx_pre_jump CinnabarGymQuiz
CinnabarGymQuiz::
TX_ASM
text_asm
xor a
ld [wOpponentAfterWrongAnswer], a
ld a, [wHiddenObjectFunctionArgument]
@ -36,8 +36,8 @@ CinnabarGymQuiz::
jp TextScriptEnd
CinnabarGymQuizIntroText:
TX_FAR _CinnabarGymQuizIntroText
db "@"
text_far _CinnabarGymQuizIntroText
text_end
CinnabarQuizQuestions:
dw CinnabarQuizQuestionsText1
@ -48,28 +48,28 @@ CinnabarQuizQuestions:
dw CinnabarQuizQuestionsText6
CinnabarQuizQuestionsText1:
TX_FAR _CinnabarQuizQuestionsText1
db "@"
text_far _CinnabarQuizQuestionsText1
text_end
CinnabarQuizQuestionsText2:
TX_FAR _CinnabarQuizQuestionsText2
db "@"
text_far _CinnabarQuizQuestionsText2
text_end
CinnabarQuizQuestionsText3:
TX_FAR _CinnabarQuizQuestionsText3
db "@"
text_far _CinnabarQuizQuestionsText3
text_end
CinnabarQuizQuestionsText4:
TX_FAR _CinnabarQuizQuestionsText4
db "@"
text_far _CinnabarQuizQuestionsText4
text_end
CinnabarQuizQuestionsText5:
TX_FAR _CinnabarQuizQuestionsText5
db "@"
text_far _CinnabarQuizQuestionsText5
text_end
CinnabarQuizQuestionsText6:
TX_FAR _CinnabarQuizQuestionsText6
db "@"
text_far _CinnabarQuizQuestionsText6
text_end
CinnabarGymGateFlagAction:
EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
@ -117,10 +117,10 @@ CinnabarGymQuiz_1ea92:
ret
CinnabarGymQuizCorrectText:
TX_SFX_ITEM_1
TX_FAR _CinnabarGymQuizCorrectText
TX_BLINK
TX_ASM
sound_get_item_1
text_far _CinnabarGymQuizCorrectText
text_promptbutton
text_asm
ld a, [hBackupGymGateIndex]
AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0
@ -137,8 +137,8 @@ CinnabarGymQuizCorrectText:
jp TextScriptEnd
CinnabarGymQuizIncorrectText:
TX_FAR _CinnabarGymQuizIncorrectText
db "@"
text_far _CinnabarGymQuizIncorrectText
text_end
UpdateCinnabarGymGateTileBlocks_::
; Update the overworld map with open floor blocks or locked gate blocks

4
engine/events/hidden_objects/elevator.asm
View file

@ -1,3 +1,3 @@
ElevatorText::
TX_FAR _ElevatorText
db "@"
text_far _ElevatorText
text_end

12
engine/events/hidden_objects/fighting_dojo.asm
View file

@ -3,21 +3,21 @@ PrintFightingDojoText2:
tx_pre_jump EnemiesOnEverySideText
EnemiesOnEverySideText::
TX_FAR _EnemiesOnEverySideText
db "@"
text_far _EnemiesOnEverySideText
text_end
PrintFightingDojoText3:
call EnableAutoTextBoxDrawing
tx_pre_jump WhatGoesAroundComesAroundText
WhatGoesAroundComesAroundText::
TX_FAR _WhatGoesAroundComesAroundText
db "@"
text_far _WhatGoesAroundComesAroundText
text_end
PrintFightingDojoText:
call EnableAutoTextBoxDrawing
tx_pre_jump FightingDojoText
FightingDojoText::
TX_FAR _FightingDojoText
db "@"
text_far _FightingDojoText
text_end

8
engine/events/hidden_objects/gym_statues.asm
View file

@ -40,9 +40,9 @@ GymStatues:
db $ff
GymStatueText1::
TX_FAR _GymStatueText1
db "@"
text_far _GymStatueText1
text_end
GymStatueText2::
TX_FAR _GymStatueText2
db "@"
text_far _GymStatueText2
text_end

4
engine/events/hidden_objects/indigo_plateau_hq.asm
View file

@ -6,5 +6,5 @@ PrintIndigoPlateauHQText:
tx_pre_jump IndigoPlateauHQText
IndigoPlateauHQText::
TX_FAR _IndigoPlateauHQText
db "@"
text_far _IndigoPlateauHQText
text_end

14
engine/events/hidden_objects/indigo_plateau_statues.asm
View file

@ -1,5 +1,5 @@
IndigoPlateauStatues::
TX_ASM
text_asm
ld hl, IndigoPlateauStatuesText1
call PrintText
ld a, [wXCoord]
@ -12,13 +12,13 @@ IndigoPlateauStatues::
jp TextScriptEnd
IndigoPlateauStatuesText1:
TX_FAR _IndigoPlateauStatuesText1
db "@"
text_far _IndigoPlateauStatuesText1
text_end
IndigoPlateauStatuesText2:
TX_FAR _IndigoPlateauStatuesText2
db "@"
text_far _IndigoPlateauStatuesText2
text_end
IndigoPlateauStatuesText3:
TX_FAR _IndigoPlateauStatuesText3
db "@"
text_far _IndigoPlateauStatuesText3
text_end

4
engine/events/hidden_objects/magazines.asm
View file

@ -4,5 +4,5 @@ PrintMagazinesText:
ret
MagazinesText::
TX_FAR _MagazinesText
db "@"
text_far _MagazinesText
text_end

8
engine/events/hidden_objects/museum_fossils.asm
View file

@ -7,8 +7,8 @@ AerodactylFossil:
ret
AerodactylFossilText::
TX_FAR _AerodactylFossilText
db "@"
text_far _AerodactylFossilText
text_end
KabutopsFossil:
ld a, FOSSIL_KABUTOPS
@ -19,8 +19,8 @@ KabutopsFossil:
ret
KabutopsFossilText::
TX_FAR _KabutopsFossilText
db "@"
text_far _KabutopsFossilText
text_end
DisplayMonFrontSpriteInBox:
; Displays a pokemon's front sprite in a pop-up window.

4
engine/events/hidden_objects/new_bike.asm
View file

@ -3,5 +3,5 @@ PrintNewBikeText:
tx_pre_jump NewBicycleText
NewBicycleText::
TX_FAR _NewBicycleText
db "@"
text_far _NewBicycleText
text_end

4
engine/events/hidden_objects/oaks_lab_email.asm
View file

@ -6,5 +6,5 @@ DisplayOakLabEmailText:
tx_pre_jump OakLabEmailText
OakLabEmailText::
TX_FAR _OakLabEmailText
db "@"
text_far _OakLabEmailText
text_end

12
engine/events/hidden_objects/oaks_lab_posters.asm
View file

@ -3,8 +3,8 @@ DisplayOakLabLeftPoster:
tx_pre_jump PushStartText
PushStartText::
TX_FAR _PushStartText
db "@"
text_far _PushStartText
text_end
DisplayOakLabRightPoster:
call EnableAutoTextBoxDrawing
@ -21,9 +21,9 @@ DisplayOakLabRightPoster:
jp PrintPredefTextID
SaveOptionText::
TX_FAR _SaveOptionText
db "@"
text_far _SaveOptionText
text_end
StrengthsAndWeaknessesText::
TX_FAR _StrengthsAndWeaknessesText
db "@"
text_far _StrengthsAndWeaknessesText
text_end

2
engine/events/hidden_objects/pokecenter_pc.asm
View file

@ -8,4 +8,4 @@ OpenPokemonCenterPC:
tx_pre_jump PokemonCenterPCText
PokemonCenterPCText::
TX_POKECENTER_PC
script_pokecenter_pc

4
engine/events/hidden_objects/pokemon_stuff.asm
View file

@ -1,3 +1,3 @@
PokemonStuffText::
TX_FAR _PokemonStuffText
db "@"
text_far _PokemonStuffText
text_end

6
engine/events/hidden_objects/reds_room.asm
View file

@ -3,12 +3,12 @@ PrintRedSNESText:
tx_pre_jump RedBedroomSNESText
RedBedroomSNESText::
TX_FAR _RedBedroomSNESText
db "@"
text_far _RedBedroomSNESText
text_end
OpenRedsPC:
call EnableAutoTextBoxDrawing
tx_pre_jump RedBedroomPCText
RedBedroomPCText::
TX_PLAYERS_PC
script_players_pc

4
engine/events/hidden_objects/route_15_binoculars.asm
View file

@ -10,5 +10,5 @@ Route15GateLeftBinoculars:
jp DisplayMonFrontSpriteInBox
Route15UpstairsBinocularsText::
TX_FAR _Route15UpstairsBinocularsText
db "@"
text_far _Route15UpstairsBinocularsText
text_end

10
engine/events/hidden_objects/safari_game.asm
View file

@ -59,7 +59,7 @@ PrintSafariGameOverText::
jp PrintText
SafariGameOverText:
TX_ASM
text_asm
ld a, [wNumSafariBalls]
and a
jr z, .noMoreSafariBalls
@ -71,9 +71,9 @@ SafariGameOverText:
jp TextScriptEnd
TimesUpText:
TX_FAR _TimesUpText
db "@"
text_far _TimesUpText
text_end
GameOverText:
TX_FAR _GameOverText
db "@"
text_far _GameOverText
text_end

56
engine/events/hidden_objects/school_blackboard.asm
View file

@ -7,7 +7,7 @@ PrintBlackboardLinkCableText:
ret
LinkCableHelp::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, LinkCableHelpText1
call PrintText
@ -60,12 +60,12 @@ LinkCableHelp::
jp TextScriptEnd
LinkCableHelpText1:
TX_FAR _LinkCableHelpText1
db "@"
text_far _LinkCableHelpText1
text_end
LinkCableHelpText2:
TX_FAR _LinkCableHelpText2
db "@"
text_far _LinkCableHelpText2
text_end
HowToLinkText:
db "HOW TO LINK"
@ -79,19 +79,19 @@ LinkCableInfoTexts:
dw LinkCableInfoText3
LinkCableInfoText1:
TX_FAR _LinkCableInfoText1
db "@"
text_far _LinkCableInfoText1
text_end
LinkCableInfoText2:
TX_FAR _LinkCableInfoText2
db "@"
text_far _LinkCableInfoText2
text_end
LinkCableInfoText3:
TX_FAR _LinkCableInfoText3
db "@"
text_far _LinkCableInfoText3
text_end
ViridianSchoolBlackboard::
TX_ASM
text_asm
call SaveScreenTilesToBuffer1
ld hl, ViridianSchoolBlackboardText1
call PrintText
@ -177,12 +177,12 @@ ViridianSchoolBlackboard::
jp TextScriptEnd
ViridianSchoolBlackboardText1:
TX_FAR _ViridianSchoolBlackboardText1
db "@"
text_far _ViridianSchoolBlackboardText1
text_end
ViridianSchoolBlackboardText2:
TX_FAR _ViridianSchoolBlackboardText2
db "@"
text_far _ViridianSchoolBlackboardText2
text_end
StatusAilmentText1:
db " SLP"
@ -192,7 +192,9 @@ StatusAilmentText1:
StatusAilmentText2:
db " BRN"
next " FRZ"
next " QUIT@@"
next " QUIT@"
db "@" ; unused
ViridianBlackboardStatusPointers:
dw ViridianBlackboardSleepText
@ -202,21 +204,21 @@ ViridianBlackboardStatusPointers:
dw ViridianBlackboardFrozenText
ViridianBlackboardSleepText:
TX_FAR _ViridianBlackboardSleepText
db "@"
text_far _ViridianBlackboardSleepText
text_end
ViridianBlackboardPoisonText:
TX_FAR _ViridianBlackboardPoisonText
db "@"
text_far _ViridianBlackboardPoisonText
text_end
ViridianBlackboardPrlzText:
TX_FAR _ViridianBlackboardPrlzText
db "@"
text_far _ViridianBlackboardPrlzText
text_end
ViridianBlackboardBurnText:
TX_FAR _ViridianBlackboardBurnText
db "@"
text_far _ViridianBlackboardBurnText
text_end
ViridianBlackboardFrozenText:
TX_FAR _ViridianBlackboardFrozenText
db "@"
text_far _ViridianBlackboardFrozenText
text_end

34
engine/events/hidden_objects/school_notebooks.asm
View file

@ -6,12 +6,12 @@ PrintNotebookText:
jp PrintPredefTextID
TMNotebook::
TX_FAR TMNotebookText
TX_WAIT
db "@"
text_far TMNotebookText
text_linkpromptbutton
text_end
ViridianSchoolNotebook::
TX_ASM
text_asm
ld hl, ViridianSchoolNotebookText1
call PrintText
call TurnPageSchoolNotebook
@ -40,26 +40,26 @@ TurnPageSchoolNotebook:
ret
TurnPageText:
TX_FAR _TurnPageText
db "@"
text_far _TurnPageText
text_end
ViridianSchoolNotebookText5:
TX_FAR _ViridianSchoolNotebookText5
TX_WAIT
db "@"
text_far _ViridianSchoolNotebookText5
text_linkpromptbutton
text_end
ViridianSchoolNotebookText1:
TX_FAR _ViridianSchoolNotebookText1
db "@"
text_far _ViridianSchoolNotebookText1
text_end
ViridianSchoolNotebookText2:
TX_FAR _ViridianSchoolNotebookText2
db "@"
text_far _ViridianSchoolNotebookText2
text_end
ViridianSchoolNotebookText3:
TX_FAR _ViridianSchoolNotebookText3
db "@"
text_far _ViridianSchoolNotebookText3
text_end
ViridianSchoolNotebookText4:
TX_FAR _ViridianSchoolNotebookText4
db "@"
text_far _ViridianSchoolNotebookText4
text_end

6
engine/events/hidden_objects/town_map.asm
View file

@ -1,7 +1,7 @@
TownMapText::
TX_FAR _TownMapText
TX_BLINK
TX_ASM
text_far _TownMapText
text_promptbutton
text_asm
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd730

22
engine/events/hidden_objects/vermilion_gym_trash.asm
View file

@ -3,8 +3,8 @@ PrintTrashText:
tx_pre_jump VermilionGymTrashText
VermilionGymTrashText::
TX_FAR _VermilionGymTrashText
db "@"
text_far _VermilionGymTrashText
text_end
GymTrashScript:
call EnableAutoTextBoxDrawing
@ -128,8 +128,8 @@ GymTrashCans:
db 2, 11, 13, 0, 0 ; 14
VermilionGymTrashSuccessText1::
TX_FAR _VermilionGymTrashSuccessText1
TX_ASM
text_far _VermilionGymTrashSuccessText1
text_asm
call WaitForSoundToFinish
ld a, SFX_SWITCH
call PlaySound
@ -138,12 +138,12 @@ VermilionGymTrashSuccessText1::
; unused
VermilionGymTrashSuccessText2::
TX_FAR _VermilionGymTrashSuccessText2
db "@"
text_far _VermilionGymTrashSuccessText2
text_end
; unused
VermilionGymTrashSuccesPlaySfx:
TX_ASM
text_asm
call WaitForSoundToFinish
ld a, SFX_SWITCH
call PlaySound
@ -151,8 +151,8 @@ VermilionGymTrashSuccesPlaySfx:
jp TextScriptEnd
VermilionGymTrashSuccessText3::
TX_FAR _VermilionGymTrashSuccessText3
TX_ASM
text_far _VermilionGymTrashSuccessText3
text_asm
call WaitForSoundToFinish
ld a, SFX_GO_INSIDE
call PlaySound
@ -160,8 +160,8 @@ VermilionGymTrashSuccessText3::
jp TextScriptEnd
VermilionGymTrashFailText::
TX_FAR _VermilionGymTrashFailText
TX_ASM
text_far _VermilionGymTrashFailText
text_asm
call WaitForSoundToFinish
ld a, SFX_DENIED
call PlaySound

75
engine/events/in_game_trades.asm
View file

@ -230,8 +230,7 @@ InGameTrade_GetReceivedMonPointer:
ret
InGameTrade_TrainerString:
; "TRAINER@@@@@@@@@@"
db $5d, "@@@@@@@@@@"
db "<TRAINER>@@@@@@@@@@"
InGameTradeTextPointers:
dw TradeTextPointers1
@ -260,71 +259,71 @@ TradeTextPointers3:
dw AfterTrade3Text
ConnectCableText:
TX_FAR _ConnectCableText
db "@"
text_far _ConnectCableText
text_end
TradedForText:
TX_FAR _TradedForText
TX_SFX_KEY_ITEM
TX_DELAY
db "@"
text_far _TradedForText
sound_get_key_item
text_pause
text_end
WannaTrade1Text:
TX_FAR _WannaTrade1Text
db "@"
text_far _WannaTrade1Text
text_end
NoTrade1Text:
TX_FAR _NoTrade1Text
db "@"
text_far _NoTrade1Text
text_end
WrongMon1Text:
TX_FAR _WrongMon1Text
db "@"
text_far _WrongMon1Text
text_end
Thanks1Text:
TX_FAR _Thanks1Text
db "@"
text_far _Thanks1Text
text_end
AfterTrade1Text:
TX_FAR _AfterTrade1Text
db "@"
text_far _AfterTrade1Text
text_end
WannaTrade2Text:
TX_FAR _WannaTrade2Text
db "@"
text_far _WannaTrade2Text
text_end
NoTrade2Text:
TX_FAR _NoTrade2Text
db "@"
text_far _NoTrade2Text
text_end
WrongMon2Text:
TX_FAR _WrongMon2Text
db "@"
text_far _WrongMon2Text
text_end
Thanks2Text:
TX_FAR _Thanks2Text
db "@"
text_far _Thanks2Text
text_end
AfterTrade2Text:
TX_FAR _AfterTrade2Text
db "@"
text_far _AfterTrade2Text
text_end
WannaTrade3Text:
TX_FAR _WannaTrade3Text
db "@"
text_far _WannaTrade3Text
text_end
NoTrade3Text:
TX_FAR _NoTrade3Text
db "@"
text_far _NoTrade3Text
text_end
WrongMon3Text:
TX_FAR _WrongMon3Text
db "@"
text_far _WrongMon3Text
text_end
Thanks3Text:
TX_FAR _Thanks3Text
db "@"
text_far _Thanks3Text
text_end
AfterTrade3Text:
TX_FAR _AfterTrade3Text
db "@"
text_far _AfterTrade3Text
text_end

26
engine/events/oaks_aide.asm
View file

@ -46,26 +46,26 @@ OaksAideScript:
ret
OaksAideHiText:
TX_FAR _OaksAideHiText
db "@"
text_far _OaksAideHiText
text_end
OaksAideUhOhText:
TX_FAR _OaksAideUhOhText
db "@"
text_far _OaksAideUhOhText
text_end
OaksAideComeBackText:
TX_FAR _OaksAideComeBackText
db "@"
text_far _OaksAideComeBackText
text_end
OaksAideHereYouGoText:
TX_FAR _OaksAideHereYouGoText
db "@"
text_far _OaksAideHereYouGoText
text_end
OaksAideGotItemText:
TX_FAR _OaksAideGotItemText
TX_SFX_ITEM_1
db "@"
text_far _OaksAideGotItemText
sound_get_item_1
text_end
OaksAideNoRoomText:
TX_FAR _OaksAideNoRoomText
db "@"
text_far _OaksAideNoRoomText
text_end

10
engine/events/pick_up_item.asm
View file

@ -45,10 +45,10 @@ PickUpItem:
ret
FoundItemText:
TX_FAR _FoundItemText
TX_SFX_ITEM_1
db "@"
text_far _FoundItemText
sound_get_item_1
text_end
NoMoreRoomForItemText:
TX_FAR _NoMoreRoomForItemText
db "@"
text_far _NoMoreRoomForItemText
text_end

24
engine/events/pokecenter.asm
View file

@ -46,23 +46,23 @@ DisplayPokemonCenterDialogue_::
jp UpdateSprites
PokemonCenterWelcomeText:
TX_FAR _PokemonCenterWelcomeText
db "@"
text_far _PokemonCenterWelcomeText
text_end
ShallWeHealYourPokemonText:
TX_DELAY
TX_FAR _ShallWeHealYourPokemonText
db "@"
text_pause
text_far _ShallWeHealYourPokemonText
text_end
NeedYourPokemonText:
TX_FAR _NeedYourPokemonText
db "@"
text_far _NeedYourPokemonText
text_end
PokemonFightingFitText:
TX_FAR _PokemonFightingFitText
db "@"
text_far _PokemonFightingFitText
text_end
PokemonCenterFarewellText:
TX_DELAY
TX_FAR _PokemonCenterFarewellText
db "@"
text_pause
text_far _PokemonCenterFarewellText
text_end

68
engine/events/pokedex_rating.asm
View file

@ -52,8 +52,8 @@ DisplayDexRating:
ret
PokedexRatingText_441cc:
TX_FAR _OaksLabText_441cc
db "@"
text_far _OaksLabText_441cc
text_end
DexRatingsTable:
db 10
@ -90,65 +90,65 @@ DexRatingsTable:
dw PokedexRatingText_4424c
PokedexRatingText_44201:
TX_FAR _OaksLabText_44201
db "@"
text_far _OaksLabText_44201
text_end
PokedexRatingText_44206:
TX_FAR _OaksLabText_44206
db "@"
text_far _OaksLabText_44206
text_end
PokedexRatingText_4420b:
TX_FAR _OaksLabText_4420b
db "@"
text_far _OaksLabText_4420b
text_end
PokedexRatingText_44210:
TX_FAR _OaksLabText_44210
db "@"
text_far _OaksLabText_44210
text_end
PokedexRatingText_44215:
TX_FAR _OaksLabText_44215
db "@"
text_far _OaksLabText_44215
text_end
PokedexRatingText_4421a:
TX_FAR _OaksLabText_4421a
db "@"
text_far _OaksLabText_4421a
text_end
PokedexRatingText_4421f:
TX_FAR _OaksLabText_4421f
db "@"
text_far _OaksLabText_4421f
text_end
PokedexRatingText_44224:
TX_FAR _OaksLabText_44224
db "@"
text_far _OaksLabText_44224
text_end
PokedexRatingText_44229:
TX_FAR _OaksLabText_44229
db "@"
text_far _OaksLabText_44229
text_end
PokedexRatingText_4422e:
TX_FAR _OaksLabText_4422e
db "@"
text_far _OaksLabText_4422e
text_end
PokedexRatingText_44233:
TX_FAR _OaksLabText_44233
db "@"
text_far _OaksLabText_44233
text_end
PokedexRatingText_44238:
TX_FAR _OaksLabText_44238
db "@"
text_far _OaksLabText_44238
text_end
PokedexRatingText_4423d:
TX_FAR _OaksLabText_4423d
db "@"
text_far _OaksLabText_4423d
text_end
PokedexRatingText_44242:
TX_FAR _OaksLabText_44242
db "@"
text_far _OaksLabText_44242
text_end
PokedexRatingText_44247:
TX_FAR _OaksLabText_44247
db "@"
text_far _OaksLabText_44247
text_end
PokedexRatingText_4424c:
TX_FAR _OaksLabText_4424c
db "@"
text_far _OaksLabText_4424c
text_end

44
engine/events/pokemart.asm
View file

@ -228,45 +228,45 @@ DisplayPokemartDialogue_::
ret
PokemartBuyingGreetingText:
TX_FAR _PokemartBuyingGreetingText
db "@"
text_far _PokemartBuyingGreetingText
text_end
PokemartTellBuyPriceText:
TX_FAR _PokemartTellBuyPriceText
db "@"
text_far _PokemartTellBuyPriceText
text_end
PokemartBoughtItemText:
TX_FAR _PokemartBoughtItemText
db "@"
text_far _PokemartBoughtItemText
text_end
PokemartNotEnoughMoneyText:
TX_FAR _PokemartNotEnoughMoneyText
db "@"
text_far _PokemartNotEnoughMoneyText
text_end
PokemartItemBagFullText:
TX_FAR _PokemartItemBagFullText
db "@"
text_far _PokemartItemBagFullText
text_end
PokemonSellingGreetingText:
TX_FAR _PokemonSellingGreetingText
db "@"
text_far _PokemonSellingGreetingText
text_end
PokemartTellSellPriceText:
TX_FAR _PokemartTellSellPriceText
db "@"
text_far _PokemartTellSellPriceText
text_end
PokemartItemBagEmptyText:
TX_FAR _PokemartItemBagEmptyText
db "@"
text_far _PokemartItemBagEmptyText
text_end
PokemartUnsellableItemText:
TX_FAR _PokemartUnsellableItemText
db "@"
text_far _PokemartUnsellableItemText
text_end
PokemartThankYouText:
TX_FAR _PokemartThankYouText
db "@"
text_far _PokemartThankYouText
text_end
PokemartAnythingElseText:
TX_FAR _PokemartAnythingElseText
db "@"
text_far _PokemartAnythingElseText
text_end

42
engine/events/prize_menu.asm
View file

@ -43,17 +43,17 @@ CeladonPrizeMenu::
ret
RequireCoinCaseTextPtr:
TX_FAR _RequireCoinCaseText
TX_WAIT
db "@"
text_far _RequireCoinCaseText
text_linkpromptbutton
text_end
ExchangeCoinsForPrizesTextPtr:
TX_FAR _ExchangeCoinsForPrizesText
db "@"
text_far _ExchangeCoinsForPrizesText
text_end
WhichPrizeTextPtr:
TX_FAR _WhichPrizeText
db "@"
text_far _WhichPrizeText
text_end
GetPrizeMenuId:
; determine which one among the three
@ -263,28 +263,28 @@ UnknownPrizeData:
db $00,$01,$00,$01,$00,$01,$00,$00,$01
HereYouGoTextPtr:
TX_FAR _HereYouGoText
TX_WAIT
db "@"
text_far _HereYouGoText
text_linkpromptbutton
text_end
SoYouWantPrizeTextPtr:
TX_FAR _SoYouWantPrizeText
db "@"
text_far _SoYouWantPrizeText
text_end
SorryNeedMoreCoinsText:
TX_FAR _SorryNeedMoreCoinsText
TX_WAIT
db "@"
text_far _SorryNeedMoreCoinsText
text_linkpromptbutton
text_end
PrizeRoomBagIsFullTextPtr:
TX_FAR _OopsYouDontHaveEnoughRoomText
TX_WAIT
db "@"
text_far _OopsYouDontHaveEnoughRoomText
text_linkpromptbutton
text_end
OhFineThenTextPtr:
TX_FAR _OhFineThenText
TX_WAIT
db "@"
text_far _OhFineThenText
text_linkpromptbutton
text_end
GetPrizeMonLevel:
ld a, [wcf91]

20
engine/events/vending_machine.asm
View file

@ -81,8 +81,8 @@ VendingMachineMenu::
jp PrintText
VendingMachineText1:
TX_FAR _VendingMachineText1
db "@"
text_far _VendingMachineText1
text_end
DrinkText:
db "FRESH WATER"
@ -97,20 +97,20 @@ DrinkPriceText:
next "@"
VendingMachineText4:
TX_FAR _VendingMachineText4
db "@"
text_far _VendingMachineText4
text_end
VendingMachineText5:
TX_FAR _VendingMachineText5
db "@"
text_far _VendingMachineText5
text_end
VendingMachineText6:
TX_FAR _VendingMachineText6
db "@"
text_far _VendingMachineText6
text_end
VendingMachineText7:
TX_FAR _VendingMachineText7
db "@"
text_far _VendingMachineText7
text_end
LoadVendingMachineItem:
ld hl, VendingPrices