pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)

Browse Source
This commit is contained in:
xCrystal 2023-08-11 12:28:14 +02:00
parent 1e02f136fd
commit 052d246ee3
85 changed files with 448 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/wram_constants.asm
View File

@ -56,7 +56,7 @@ DEF NUM_FRAMES EQU const_value
; wTextboxFlags:: ; wTextboxFlags::
const_def const_def
const FAST_TEXT_DELAY_F ; 0 const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1 const TEXT_DELAY_F ; 1
; wGBPrinterBrightness:: ; wGBPrinterBrightness::
DEF GBPRINTER_LIGHTEST EQU $00 DEF GBPRINTER_LIGHTEST EQU $00

4
data/maps/attributes.asm
View File

@ -96,7 +96,9 @@ MACRO connection
endc endc
ENDM ENDM
map_attributes Level1_Map1, LEVEL_1_MAP_1, $ff, 0 map_attributes Level1_Map1, LEVEL_1_MAP_1, $00, SOUTH | NORTH
connection south, Level1_Map1, LEVEL_1_MAP_1, 0
connection north, Level1_Map1, LEVEL_1_MAP_1, 0
; map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST ; map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
; connection west, Route29, ROUTE_29, 0 ; connection west, Route29, ROUTE_29, 0

4
engine/battle/ai/items.asm
View File

@ -697,7 +697,7 @@ AI_Switch:
jr c, .skiptext jr c, .skiptext
ld hl, EnemyWithdrewText ld hl, EnemyWithdrewText
call PrintText call PrintText1bpp
.skiptext .skiptext
ld a, 1 ld a, 1
@ -838,7 +838,7 @@ PrintText_UsedItemOn:
ld bc, ITEM_NAME_LENGTH ld bc, ITEM_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, EnemyUsedOnText ld hl, EnemyUsedOnText
jp PrintText jp PrintText1bpp
EnemyUsedOnText: EnemyUsedOnText:
text_far _EnemyUsedOnText text_far _EnemyUsedOnText

14
engine/battle/core.asm
View File

@ -2716,7 +2716,7 @@ SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu?
JumpToPartyMenuAndPrintText: JumpToPartyMenuAndPrintText:
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -4833,7 +4833,7 @@ BattleMenu_Pack:
call UpdateBattleHUDs call UpdateBattleHUDs
call WaitBGMap call WaitBGMap
call LoadTilemapToTempTilemap call LoadTilemapToTempTilemap
call ClearWindowData call ClearMenuAndWindowData
call FinishBattleAnim call FinishBattleAnim
and a and a
ret ret
@ -4844,7 +4844,7 @@ BattleMenu_Pack:
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN ld [wBattleResult], a ; WIN
call ClearWindowData call ClearMenuAndWindowData
call SetPalettes call SetPalettes
scf scf
ret ret
@ -5144,7 +5144,7 @@ MoveSelectionScreen:
ld b, 4 ld b, 4
ld c, 14 ld c, 14
.got_dims .got_dims
call Textbox call Textbox1bpp
hlcoord 6, 17 - NUM_MOVES hlcoord 6, 17 - NUM_MOVES
ld a, [wMoveSelectionMenuType] ld a, [wMoveSelectionMenuType]
@ -5423,7 +5423,7 @@ MoveInfoBox:
hlcoord 0, 8 hlcoord 0, 8
ld b, 3 ld b, 3
ld c, 9 ld c, 9
call Textbox call Textbox1bpp
ld a, [wPlayerDisableCount] ld a, [wPlayerDisableCount]
and a and a
@ -7126,7 +7126,7 @@ GiveExperiencePoints:
hlcoord 9, 0 hlcoord 9, 0
ld b, 10 ld b, 10
ld c, 9 ld c, 9
call Textbox call Textbox1bpp
hlcoord 11, 1 hlcoord 11, 1
ld bc, 4 ld bc, 4
predef PrintTempMonStats predef PrintTempMonStats
@ -8686,7 +8686,7 @@ InitBattleDisplay:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
hlcoord 1, 5 hlcoord 1, 5
lb bc, 3, 7 lb bc, 3, 7
call ClearBox call ClearBox

2
engine/battle/start_battle.asm
View File

@ -167,7 +167,7 @@ ClearBattleRAM:
callfar ResetEnemyStatLevels callfar ResetEnemyStatLevels
call ClearWindowData call ClearMenuAndWindowData
ld hl, hBGMapAddress ld hl, hBGMapAddress
xor a ; LOW(vBGMap0) xor a ; LOW(vBGMap0)

2
engine/battle/trainer_huds.asm
View File

@ -238,7 +238,7 @@ _ShowLinkBattleParticipants:
hlcoord 2, 3 hlcoord 2, 3
ld b, 9 ld b, 9
ld c, 14 ld c, 14
call Textbox call Textbox1bpp
hlcoord 4, 5 hlcoord 4, 5
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString

2
engine/debug/debug_room.asm
View File

@ -584,7 +584,7 @@ DebugRoom_EditPagedValues:
hlcoord 0, 0 hlcoord 0, 0
ld b, SCREEN_HEIGHT - 2 ld b, SCREEN_HEIGHT - 2
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
hlcoord 8, 17 hlcoord 8, 17
ld de, DebugRoom_PageString ld de, DebugRoom_PageString
call PlaceString call PlaceString

4
engine/events/buena.asm
View File

@ -69,7 +69,7 @@ BuenaPrize:
call Buena_PlacePrizeMenuBox call Buena_PlacePrizeMenuBox
call Buena_DisplayBlueCardBalance call Buena_DisplayBlueCardBalance
ld hl, .BuenaAskWhichPrizeText ld hl, .BuenaAskWhichPrizeText
call PrintText call PrintText1bpp
jr .okay jr .okay
.loop .loop
@ -139,7 +139,7 @@ BuenaPrize:
call CloseWindow call CloseWindow
call CloseWindow call CloseWindow
ld hl, .BuenaComeAgainText ld hl, .BuenaComeAgainText
call PrintText call PrintText1bpp
call JoyWaitAorB call JoyWaitAorB
call PlayClickSFX call PlayClickSFX
ret ret

2
engine/events/bug_contest/caught_mon.asm
View File

@ -15,7 +15,7 @@ BugContest_SetCaughtContestMon:
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, .ContestCaughtMonText ld hl, .ContestCaughtMonText
call PrintText call PrintText1bpp
ret ret
.generatestats .generatestats

8
engine/events/bug_contest/display_stats.asm
View File

@ -12,12 +12,12 @@ DisplayCaughtContestMonStats:
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4
ld c, 13 ld c, 13
call Textbox call Textbox1bpp
hlcoord 0, 6 hlcoord 0, 6
ld b, 4 ld b, 4
ld c, 13 ld c, 13
call Textbox call Textbox1bpp
hlcoord 2, 0 hlcoord 2, 0
ld de, .Stock ld de, .Stock
@ -68,7 +68,7 @@ DisplayCaughtContestMonStats:
call PrintNum call PrintNum
ld hl, ContestAskSwitchText ld hl, ContestAskSwitchText
call PrintText call PrintText1bpp
pop af pop af
ld [wOptions], a ld [wOptions], a
@ -93,7 +93,7 @@ ContestAskSwitchText:
DisplayAlreadyCaughtText: DisplayAlreadyCaughtText:
call GetPokemonName call GetPokemonName
ld hl, .ContestAlreadyCaughtText ld hl, .ContestAlreadyCaughtText
jp PrintText jp PrintText1bpp
.ContestAlreadyCaughtText: .ContestAlreadyCaughtText:
text_far _ContestAlreadyCaughtText text_far _ContestAlreadyCaughtText

6
engine/events/bug_contest/judging.asm
View File

@ -7,21 +7,21 @@ _BugContestJudging:
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, ContestJudging_ThirdPlaceText ld hl, ContestJudging_ThirdPlaceText
call PrintText call PrintText2bpp
ld a, [wBugContestSecondPlaceWinnerID] ld a, [wBugContestSecondPlaceWinnerID]
call LoadContestantName call LoadContestantName
ld a, [wBugContestSecondPlaceMon] ld a, [wBugContestSecondPlaceMon]
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, ContestJudging_SecondPlaceText ld hl, ContestJudging_SecondPlaceText
call PrintText call PrintText2bpp
ld a, [wBugContestFirstPlaceWinnerID] ld a, [wBugContestFirstPlaceWinnerID]
call LoadContestantName call LoadContestantName
ld a, [wBugContestFirstPlaceMon] ld a, [wBugContestFirstPlaceMon]
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, ContestJudging_FirstPlaceText ld hl, ContestJudging_FirstPlaceText
call PrintText call PrintText2bpp
jp BugContest_GetPlayersResult jp BugContest_GetPlayersResult
ContestJudging_FirstPlaceText: ContestJudging_FirstPlaceText:

12
engine/events/daycare.asm
View File

@ -268,7 +268,7 @@ PrintDayCareText:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText1bpp
ret ret
.TextTable: .TextTable:
@ -379,7 +379,7 @@ DayCareManOutside:
bit DAYCAREMAN_HAS_EGG_F, [hl] bit DAYCAREMAN_HAS_EGG_F, [hl]
jr nz, .AskGiveEgg jr nz, .AskGiveEgg
ld hl, .NotYetText ld hl, .NotYetText
call PrintText call PrintText1bpp
ret ret
.NotYetText: .NotYetText:
@ -388,7 +388,7 @@ DayCareManOutside:
.AskGiveEgg: .AskGiveEgg:
ld hl, .FoundAnEggText ld hl, .FoundAnEggText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .Declined jr c, .Declined
ld a, [wPartyCount] ld a, [wPartyCount]
@ -399,7 +399,7 @@ DayCareManOutside:
res DAYCAREMAN_HAS_EGG_F, [hl] res DAYCAREMAN_HAS_EGG_F, [hl]
call DayCare_InitBreeding call DayCare_InitBreeding
ld hl, .ReceivedEggText ld hl, .ReceivedEggText
call PrintText call PrintText1bpp
ld de, SFX_GET_EGG ld de, SFX_GET_EGG
call PlaySFX call PlaySFX
ld c, 120 ld c, 120
@ -411,14 +411,14 @@ DayCareManOutside:
ld hl, .IllKeepItThanksText ld hl, .IllKeepItThanksText
.Load0: .Load0:
call PrintText call PrintText1bpp
xor a ; FALSE xor a ; FALSE
ld [wScriptVar], a ld [wScriptVar], a
ret ret
.PartyFull: .PartyFull:
ld hl, .NoRoomForEggText ld hl, .NoRoomForEggText
call PrintText call PrintText1bpp
ld a, TRUE ld a, TRUE
ld [wScriptVar], a ld [wScriptVar], a
ret ret

4
engine/events/elevator.asm
View File

@ -117,7 +117,7 @@ Elevator_GoToFloor:
Elevator_AskWhichFloor: Elevator_AskWhichFloor:
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, AskFloorElevatorText ld hl, AskFloorElevatorText
call PrintText call PrintText1bpp
call Elevator_GetCurrentFloorText call Elevator_GetCurrentFloorText
ld hl, Elevator_MenuHeader ld hl, Elevator_MenuHeader
call CopyMenuHeader call CopyMenuHeader
@ -150,7 +150,7 @@ Elevator_GetCurrentFloorText:
hlcoord 0, 0 hlcoord 0, 0
ld b, 4 ld b, 4
ld c, 8 ld c, 8
call Textbox call Textbox1bpp
hlcoord 1, 2 hlcoord 1, 2
ld de, Elevator_CurrentFloorText ld de, Elevator_CurrentFloorText
call PlaceString call PlaceString

8
engine/events/halloffame.asm
View File

@ -457,10 +457,10 @@ DisplayHOFMon:
call ByteFill call ByteFill
hlcoord 0, 0 hlcoord 0, 0
lb bc, 3, SCREEN_WIDTH - 2 lb bc, 3, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
ld a, [wTempMonSpecies] ld a, [wTempMonSpecies]
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
ld [wTextDecimalByte], a ld [wTextDecimalByte], a
@ -564,10 +564,10 @@ HOF_AnimatePlayerPic:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 2 hlcoord 0, 2
lb bc, 8, 9 lb bc, 8, 9
call Textbox call Textbox1bpp
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
hlcoord 2, 4 hlcoord 2, 4
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString

4
engine/events/kurt.asm
View File

@ -1,6 +1,6 @@
Kurt_PrintTextWhichApricorn: Kurt_PrintTextWhichApricorn:
ld hl, .WhichApricornText ld hl, .WhichApricornText
call PrintText call PrintText1bpp
ret ret
.WhichApricornText: .WhichApricornText:
@ -9,7 +9,7 @@ Kurt_PrintTextWhichApricorn:
Kurt_PrintTextHowMany: Kurt_PrintTextHowMany:
ld hl, .HowManyShouldIMakeText ld hl, .HowManyShouldIMakeText
call PrintText call PrintText1bpp
ret ret
.HowManyShouldIMakeText: .HowManyShouldIMakeText:

2
engine/events/lucky_number.asm
View File

@ -116,7 +116,7 @@ CheckForLuckyNumberWinners:
ld hl, .LuckyNumberMatchPCText ld hl, .LuckyNumberMatchPCText
.print .print
jp PrintText jp PrintText2bpp
.CompareLuckyNumberToMonID: .CompareLuckyNumberToMonID:
push bc push bc

4
engine/events/magikarp.asm
View File

@ -29,7 +29,7 @@ CheckMagikarpLength:
call CalcMagikarpLength call CalcMagikarpLength
call PrintMagikarpLength call PrintMagikarpLength
ld hl, .MagikarpGuruMeasureText ld hl, .MagikarpGuruMeasureText
call PrintText call PrintText2bpp
; Did we beat the record? ; Did we beat the record?
ld hl, wMagikarpLength ld hl, wMagikarpLength
@ -294,7 +294,7 @@ MagikarpHouseSign:
ld [wMagikarpLength + 1], a ld [wMagikarpLength + 1], a
call PrintMagikarpLength call PrintMagikarpLength
ld hl, .KarpGuruRecordText ld hl, .KarpGuruRecordText
call PrintText call PrintText2bpp
ret ret
.KarpGuruRecordText: .KarpGuruRecordText:

34
engine/events/mom.asm
View File

@ -49,11 +49,11 @@ BankOfMom:
.InitializeBank: .InitializeBank:
ld hl, MomLeavingText1 ld hl, MomLeavingText1
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .DontSaveMoney jr c, .DontSaveMoney
ld hl, MomLeavingText2 ld hl, MomLeavingText2
call PrintText call PrintText1bpp
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
jr .done_1 jr .done_1
@ -63,14 +63,14 @@ BankOfMom:
.done_1 .done_1
ld [wMomSavingMoney], a ld [wMomSavingMoney], a
ld hl, MomLeavingText3 ld hl, MomLeavingText3
call PrintText call PrintText1bpp
ld a, $8 ld a, $8
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.IsThisAboutYourMoney: .IsThisAboutYourMoney:
ld hl, MomIsThisAboutYourMoneyText ld hl, MomIsThisAboutYourMoneyText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .nope jr c, .nope
ld a, $3 ld a, $3
@ -85,7 +85,7 @@ BankOfMom:
.AccessBankOfMom: .AccessBankOfMom:
ld hl, MomBankWhatDoYouWantToDoText ld hl, MomBankWhatDoYouWantToDoText
call PrintText call PrintText1bpp
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, BankOfMom_MenuHeader ld hl, BankOfMom_MenuHeader
call CopyMenuHeader call CopyMenuHeader
@ -121,7 +121,7 @@ BankOfMom:
.StoreMoney: .StoreMoney:
ld hl, MomStoreMoneyText ld hl, MomStoreMoneyText
call PrintText call PrintText1bpp
xor a xor a
ld hl, wStringBuffer2 ld hl, wStringBuffer2
ld [hli], a ld [hli], a
@ -164,18 +164,18 @@ BankOfMom:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
ld hl, MomStoredMoneyText ld hl, MomStoredMoneyText
call PrintText call PrintText1bpp
ld a, $8 ld a, $8
jr .done_4 jr .done_4
.InsufficientFundsInWallet: .InsufficientFundsInWallet:
ld hl, MomInsufficientFundsInWalletText ld hl, MomInsufficientFundsInWalletText
call PrintText call PrintText1bpp
ret ret
.NotEnoughRoomInBank: .NotEnoughRoomInBank:
ld hl, MomNotEnoughRoomInBankText ld hl, MomNotEnoughRoomInBankText
call PrintText call PrintText1bpp
ret ret
.CancelDeposit: .CancelDeposit:
@ -187,7 +187,7 @@ BankOfMom:
.TakeMoney: .TakeMoney:
ld hl, MomTakeMoneyText ld hl, MomTakeMoneyText
call PrintText call PrintText1bpp
xor a xor a
ld hl, wStringBuffer2 ld hl, wStringBuffer2
ld [hli], a ld [hli], a
@ -230,18 +230,18 @@ BankOfMom:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
ld hl, MomTakenMoneyText ld hl, MomTakenMoneyText
call PrintText call PrintText1bpp
ld a, $8 ld a, $8
jr .done_5 jr .done_5
.InsufficientFundsInBank: .InsufficientFundsInBank:
ld hl, MomHaventSavedThatMuchText ld hl, MomHaventSavedThatMuchText
call PrintText call PrintText1bpp
ret ret
.NotEnoughRoomInWallet: .NotEnoughRoomInWallet:
ld hl, MomNotEnoughRoomInWalletText ld hl, MomNotEnoughRoomInWalletText
call PrintText call PrintText1bpp
ret ret
.CancelWithdraw: .CancelWithdraw:
@ -253,13 +253,13 @@ BankOfMom:
.StopOrStartSavingMoney: .StopOrStartSavingMoney:
ld hl, MomSaveMoneyText ld hl, MomSaveMoneyText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .StopSavingMoney jr c, .StopSavingMoney
ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F) ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
ld [wMomSavingMoney], a ld [wMomSavingMoney], a
ld hl, MomStartSavingMoneyText ld hl, MomStartSavingMoneyText
call PrintText call PrintText1bpp
ld a, $8 ld a, $8
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@ -273,7 +273,7 @@ BankOfMom:
.JustDoWhatYouCan: .JustDoWhatYouCan:
ld hl, MomJustDoWhatYouCanText ld hl, MomJustDoWhatYouCanText
call PrintText call PrintText1bpp
.AskDST: .AskDST:
ld hl, wJumptableIndex ld hl, wJumptableIndex
@ -292,7 +292,7 @@ Mom_ContinueMenuSetup:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 0 hlcoord 0, 0
lb bc, 6, 18 lb bc, 6, 18
call Textbox call Textbox1bpp
hlcoord 1, 2 hlcoord 1, 2
ld de, Mom_SavedString ld de, Mom_SavedString
call PlaceString call PlaceString

16
engine/events/move_deleter.asm
View File

@ -1,10 +1,10 @@
MoveDeletion: MoveDeletion:
ld hl, .DeleterIntroText ld hl, .DeleterIntroText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .declined jr c, .declined
ld hl, .DeleterAskWhichMonText ld hl, .DeleterAskWhichMonText
call PrintText call PrintText1bpp
farcall SelectMonFromParty farcall SelectMonFromParty
jr c, .declined jr c, .declined
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
@ -18,7 +18,7 @@ MoveDeletion:
and a and a
jr z, .onlyonemove jr z, .onlyonemove
ld hl, .DeleterAskWhichMoveText ld hl, .DeleterAskWhichMoveText
call PrintText call PrintText1bpp
call LoadStandardMenuHeader call LoadStandardMenuHeader
farcall ChooseMoveToDelete farcall ChooseMoveToDelete
push af push af
@ -31,7 +31,7 @@ MoveDeletion:
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetMoveName call GetMoveName
ld hl, .AskDeleteMoveText ld hl, .AskDeleteMoveText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
pop bc pop bc
jr c, .declined jr c, .declined
@ -41,22 +41,22 @@ MoveDeletion:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
ld hl, .DeleterForgotMoveText ld hl, .DeleterForgotMoveText
call PrintText call PrintText1bpp
ret ret
.egg .egg
ld hl, .MailEggText ld hl, .MailEggText
call PrintText call PrintText1bpp
ret ret
.declined .declined
ld hl, .DeleterNoComeAgainText ld hl, .DeleterNoComeAgainText
call PrintText call PrintText1bpp
ret ret
.onlyonemove .onlyonemove
ld hl, .MoveKnowsOneText ld hl, .MoveKnowsOneText
call PrintText call PrintText1bpp
ret ret
.MoveKnowsOneText: .MoveKnowsOneText:

2
engine/events/move_tutor.asm
View File

@ -72,7 +72,7 @@ CheckCanLearnMoveTutorMove:
pop de pop de
ld a, BANK(TMHMNotCompatibleText) ld a, BANK(TMHMNotCompatibleText)
ld hl, TMHMNotCompatibleText ld hl, TMHMNotCompatibleText
call FarPrintText call FarPrintText1bpp
jr .didnt_learn jr .didnt_learn
.can_learn .can_learn

12
engine/events/name_rater.asm
View File

@ -1,12 +1,12 @@
_NameRater: _NameRater:
; Introduce himself ; Introduce himself
ld hl, NameRaterHelloText ld hl, NameRaterHelloText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jp c, .cancel jp c, .cancel
; Select a Pokemon from your party ; Select a Pokemon from your party
ld hl, NameRaterWhichMonText ld hl, NameRaterWhichMonText
call PrintText call PrintText1bpp
farcall SelectMonFromParty farcall SelectMonFromParty
jr c, .cancel jr c, .cancel
; He can't rename an egg... ; He can't rename an egg...
@ -19,12 +19,12 @@ _NameRater:
jr c, .traded jr c, .traded
; This name is good, but we can do better. How about it? ; This name is good, but we can do better. How about it?
ld hl, NameRaterBetterNameText ld hl, NameRaterBetterNameText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jr c, .cancel jr c, .cancel
; What name shall I give it then? ; What name shall I give it then?
ld hl, NameRaterWhatNameText ld hl, NameRaterWhatNameText
call PrintText call PrintText1bpp
; Load the new nickname into wStringBuffer2 ; Load the new nickname into wStringBuffer2
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
@ -59,7 +59,7 @@ _NameRater:
push hl push hl
call GetCurNickname call GetCurNickname
ld hl, NameRaterNamedText ld hl, NameRaterNamedText
call PrintText call PrintText1bpp
pop hl pop hl
jr .done jr .done
@ -75,7 +75,7 @@ _NameRater:
ld hl, NameRaterEggText ld hl, NameRaterEggText
.done .done
call PrintText call PrintText1bpp
ret ret
CheckIfMonIsYourOT: CheckIfMonIsYourOT:

6
engine/events/npc_trade.asm
View File

@ -35,14 +35,14 @@ NPCTrade::
call TradeFlagAction call TradeFlagAction
ld hl, NPCTradeCableText ld hl, NPCTradeCableText
call PrintText call PrintText1bpp
call DoNPCTrade call DoNPCTrade
call .TradeAnimation call .TradeAnimation
call GetTradeMonNames call GetTradeMonNames
ld hl, TradedForText ld hl, TradedForText
call PrintText call PrintText1bpp
call RestartMapMusic call RestartMapMusic
@ -400,7 +400,7 @@ PrintTradeText:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText1bpp
ret ret
TradeTexts: TradeTexts:

1
engine/events/overworld.asm
View File

@ -620,7 +620,6 @@ FlyFunction:
farcall RespawnPlayer farcall RespawnPlayer
call DelayFrame call DelayFrame
call UpdatePlayerSprite call UpdatePlayerSprite
call LoadOverworldFontAndFrame
ret ret
WaterfallFunction: WaterfallFunction:

2
engine/events/poisonstep.asm
View File

@ -130,7 +130,7 @@ DoPoisonStep::
farcall ChangeHappiness farcall ChangeHappiness
farcall GetPartyNickname farcall GetPartyNickname
ld hl, .PoisonFaintText ld hl, .PoisonFaintText
call PrintText call PrintText2bpp
.mon_not_fainted .mon_not_fainted
pop de pop de

4
engine/events/poke_seer.asm
View File

@ -278,7 +278,7 @@ PrintSeerText:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText2bpp
ret ret
SeerTexts: SeerTexts:
@ -346,7 +346,7 @@ SeerAdvice:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText2bpp
ret ret
SeerAdviceTexts: SeerAdviceTexts:

8
engine/events/pokecenter_pc.asm
View File

@ -174,7 +174,7 @@ HallOfFamePC:
TurnOffPC: TurnOffPC:
ld hl, PokecenterPCOaksClosedText ld hl, PokecenterPCOaksClosedText
call PrintText call PrintText1bpp
scf scf
ret ret
@ -536,12 +536,12 @@ PlayerDepositItemMenu:
call TossItem call TossItem
predef PartyMonItemName predef PartyMonItemName
ld hl, .PlayersPCDepositItemsText ld hl, .PlayersPCDepositItemsText
call PrintText call PrintText1bpp
ret ret
.NoRoomInPC: .NoRoomInPC:
ld hl, .PlayersPCNoRoomDepositText ld hl, .PlayersPCNoRoomDepositText
call PrintText call PrintText1bpp
ret ret
.DeclinedToDeposit: .DeclinedToDeposit:
@ -578,7 +578,7 @@ PCItemsJoypad:
hlcoord 0, 0 hlcoord 0, 0
ld b, 10 ld b, 10
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
ld a, [wPCItemsCursor] ld a, [wPCItemsCursor]
ld [wMenuCursorPosition], a ld [wMenuCursorPosition], a
ld a, [wPCItemsScrollPosition] ld a, [wPCItemsScrollPosition]

6
engine/events/print_photo.asm
View File

@ -1,6 +1,6 @@
PhotoStudio: PhotoStudio:
ld hl, .WhichMonPhotoText ld hl, .WhichMonPhotoText
call PrintText call PrintText2bpp
farcall SelectMonFromParty farcall SelectMonFromParty
jr c, .cancel jr c, .cancel
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
@ -8,7 +8,7 @@ PhotoStudio:
jr z, .egg jr z, .egg
ld hl, .HoldStillText ld hl, .HoldStillText
call PrintText call PrintText2bpp
call DisableSpriteUpdates call DisableSpriteUpdates
farcall PrintPartymon farcall PrintPartymon
call ReturnToMapWithSpeechTextbox call ReturnToMapWithSpeechTextbox
@ -26,7 +26,7 @@ PhotoStudio:
ld hl, .EggPhotoText ld hl, .EggPhotoText
.print_text .print_text
call PrintText call PrintText2bpp
ret ret
.WhichMonPhotoText: .WhichMonPhotoText:

6
engine/events/print_unown.asm
View File

@ -29,15 +29,15 @@ _UnownPrinter:
hlcoord 0, 0 hlcoord 0, 0
lb bc, 3, 18 lb bc, 3, 18
call Textbox call Textbox1bpp
hlcoord 0, 5 hlcoord 0, 5
lb bc, 7, 7 lb bc, 7, 7
call Textbox call Textbox1bpp
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call Textbox call Textbox1bpp
hlcoord 1, 2 hlcoord 1, 2
ld de, AlphRuinsStampString ld de, AlphRuinsStampString

8
engine/events/prof_oaks_pc.asm
View File

@ -6,14 +6,14 @@ ProfOaksPC:
call ProfOaksPCBoot ; player chose "yes"? call ProfOaksPCBoot ; player chose "yes"?
.shutdown .shutdown
ld hl, OakPCText4 ld hl, OakPCText4
call PrintText call PrintText1bpp
call JoyWaitAorB call JoyWaitAorB
call ExitMenu call ExitMenu
ret ret
ProfOaksPCBoot: ProfOaksPCBoot:
ld hl, OakPCText2 ld hl, OakPCText2
call PrintText call PrintText1bpp
call Rate call Rate
call PlaySFX ; sfx loaded by previous Rate function call call PlaySFX ; sfx loaded by previous Rate function call
call JoyWaitAorB call JoyWaitAorB
@ -45,13 +45,13 @@ Rate:
; print appropriate rating ; print appropriate rating
call .UpdateRatingBuffers call .UpdateRatingBuffers
ld hl, OakPCText3 ld hl, OakPCText3
call PrintText call PrintText1bpp
call JoyWaitAorB call JoyWaitAorB
ld a, [wTempPokedexCaughtCount] ld a, [wTempPokedexCaughtCount]
ld hl, OakRatings ld hl, OakRatings
call FindOakRating call FindOakRating
push de push de
call PrintText call PrintText1bpp
pop de pop de
ret ret

2
engine/events/specials.asm
View File

@ -201,7 +201,7 @@ CheckCoinsAndCoinCase:
ld hl, .NoCoinCaseText ld hl, .NoCoinCaseText
.print .print
call PrintText call PrintText2bpp
scf scf
ret ret

8
engine/games/card_flip.asm
View File

@ -302,7 +302,7 @@ _CardFlip:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call CardFlip_ShuffleDeck call CardFlip_ShuffleDeck
ld hl, .CardFlipShuffledText ld hl, .CardFlipShuffledText
call PrintText call PrintText1bpp
jr .LoopAround jr .LoopAround
.KeepTheCurrentDeck: .KeepTheCurrentDeck:
@ -475,7 +475,7 @@ CardFlip_UpdateCoinBalanceDisplay:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
pop hl pop hl
call PrintTextboxText call PrintTextboxText
call CardFlip_PrintCoinBalance call CardFlip_PrintCoinBalance
@ -485,7 +485,7 @@ CardFlip_PrintCoinBalance:
hlcoord 9, 15 hlcoord 9, 15
ld b, 1 ld b, 1
ld c, 9 ld c, 9
call Textbox call Textbox1bpp
hlcoord 10, 16 hlcoord 10, 16
ld de, .CoinStr ld de, .CoinStr
call PlaceString call PlaceString
@ -511,7 +511,7 @@ CardFlip_InitTilemap:
call CardFlip_CopyToBox call CardFlip_CopyToBox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
ret ret
CardFlip_FillGreenBox: CardFlip_FillGreenBox:

6
engine/games/memory_game.asm
View File

@ -289,7 +289,7 @@ MemoryGame_CheckMatch:
add hl, de add hl, de
call MemoryGame_PlaceCard call MemoryGame_PlaceCard
ld hl, .VictoryText ld hl, .VictoryText
call PrintText call PrintText1bpp
ret ret
.no_match .no_match
@ -305,7 +305,7 @@ MemoryGame_CheckMatch:
call MemoryGame_PlaceCard call MemoryGame_PlaceCard
ld hl, MemoryGameDarnText ld hl, MemoryGameDarnText
call PrintText call PrintText1bpp
ret ret
.VictoryText: .VictoryText:
@ -457,7 +457,7 @@ MemoryGame_InitStrings:
ld de, .japstr2 ld de, .japstr2
call PlaceString call PlaceString
ld hl, .dummy_text ld hl, .dummy_text
call PrintText call PrintText1bpp
ret ret
.dummy_text .dummy_text

14
engine/games/slot_machine.asm
View File

@ -1717,7 +1717,7 @@ Slots_TurnLightsOnOrOff:
Slots_AskBet: Slots_AskBet:
.loop .loop
ld hl, .SlotsBetHowManyCoinsText ld hl, .SlotsBetHowManyCoinsText
call PrintText call PrintText1bpp
ld hl, .MenuHeader ld hl, .MenuHeader
call LoadMenuHeader call LoadMenuHeader
call VerticalMenu call VerticalMenu
@ -1737,7 +1737,7 @@ Slots_AskBet:
cp c cp c
jr nc, .Start jr nc, .Start
ld hl, .SlotsNotEnoughCoinsText ld hl, .SlotsNotEnoughCoinsText
call PrintText call PrintText1bpp
jr .loop jr .loop
.Start: .Start:
@ -1752,7 +1752,7 @@ Slots_AskBet:
ld de, SFX_PAY_DAY ld de, SFX_PAY_DAY
call PlaySFX call PlaySFX
ld hl, .SlotsStartText ld hl, .SlotsStartText
call PrintText call PrintText1bpp
and a and a
ret ret
@ -1787,14 +1787,14 @@ Slots_AskPlayAgain:
or [hl] or [hl]
jr nz, .you_have_coins jr nz, .you_have_coins
ld hl, .SlotsRanOutOfCoinsText ld hl, .SlotsRanOutOfCoinsText
call PrintText call PrintText1bpp
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
jr .exit_slots jr .exit_slots
.you_have_coins .you_have_coins
ld hl, .SlotsPlayAgainText ld hl, .SlotsPlayAgainText
call PrintText call PrintText1bpp
call LoadMenuTextbox call LoadMenuTextbox
lb bc, 14, 12 lb bc, 14, 12
call PlaceYesNoBox call PlaceYesNoBox
@ -1857,7 +1857,7 @@ Slots_PayoutText:
cp SLOTS_NO_MATCH cp SLOTS_NO_MATCH
jr nz, .MatchedSomething jr nz, .MatchedSomething
ld hl, .SlotsDarnText ld hl, .SlotsDarnText
call PrintText call PrintText1bpp
ret ret
.MatchedSomething: .MatchedSomething:
@ -1880,7 +1880,7 @@ Slots_PayoutText:
.return .return
ld hl, .Text_PrintPayout ld hl, .Text_PrintPayout
call PrintText call PrintText1bpp
ret ret
.PayoutStrings: .PayoutStrings:

1
engine/gfx/dma_transfer.asm
View File

@ -57,7 +57,6 @@ ReloadMapPart::
ret ret
OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
; OpenText
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode

54
engine/items/item_effects.asm
View File

@ -237,7 +237,7 @@ PokeBallEffect:
ld hl, wOptions ld hl, wOptions
res NO_TEXT_SCROLL, [hl] res NO_TEXT_SCROLL, [hl]
ld hl, ItemUsedText ld hl, ItemUsedText
call PrintText call PrintText1bpp
ld a, [wEnemyMonCatchRate] ld a, [wEnemyMonCatchRate]
ld b, a ld b, a
@ -503,7 +503,7 @@ PokeBallEffect:
jp z, .FinishTutorial jp z, .FinishTutorial
ld hl, Text_GotchaMonWasCaught ld hl, Text_GotchaMonWasCaught
call PrintText call PrintText1bpp
call ClearSprites call ClearSprites
@ -524,7 +524,7 @@ PokeBallEffect:
jr z, .skip_pokedex jr z, .skip_pokedex
ld hl, NewDexDataText ld hl, NewDexDataText
call PrintText call PrintText1bpp
call ClearSprites call ClearSprites
@ -569,7 +569,7 @@ PokeBallEffect:
.SkipPartyMonFriendBall: .SkipPartyMonFriendBall:
ld hl, AskGiveNicknameText ld hl, AskGiveNicknameText
call PrintText call PrintText1bpp
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
@ -629,7 +629,7 @@ PokeBallEffect:
call CloseSRAM call CloseSRAM
ld hl, AskGiveNicknameText ld hl, AskGiveNicknameText
call PrintText call PrintText1bpp
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
@ -672,7 +672,7 @@ PokeBallEffect:
call CloseSRAM call CloseSRAM
ld hl, BallSentToPCText ld hl, BallSentToPCText
call PrintText call PrintText1bpp
call RotateThreePalettesRight call RotateThreePalettesRight
call LoadStandardFont call LoadStandardFont
@ -686,7 +686,7 @@ PokeBallEffect:
ld hl, Text_GotchaMonWasCaught ld hl, Text_GotchaMonWasCaught
.shake_and_break_free .shake_and_break_free
call PrintText call PrintText1bpp
call ClearSprites call ClearSprites
.return_from_capture .return_from_capture
@ -1190,7 +1190,7 @@ VitaminEffect:
call Play_SFX_FULL_HEAL call Play_SFX_FULL_HEAL
ld hl, ItemStatRoseText ld hl, ItemStatRoseText
call PrintText call PrintText1bpp
ld c, HAPPINESS_USEDITEM ld c, HAPPINESS_USEDITEM
farcall ChangeHappiness farcall ChangeHappiness
@ -1199,7 +1199,7 @@ VitaminEffect:
NoEffectMessage: NoEffectMessage:
ld hl, ItemWontHaveEffectText ld hl, ItemWontHaveEffectText
call PrintText call PrintText1bpp
jp ClearPalettes jp ClearPalettes
UpdateStatsAfterItem: UpdateStatsAfterItem:
@ -1341,7 +1341,7 @@ RareCandyEffect:
hlcoord 9, 0 hlcoord 9, 0
ld b, 10 ld b, 10
ld c, 9 ld c, 9
call Textbox call Textbox1bpp
hlcoord 11, 1 hlcoord 11, 1
ld bc, 4 ld bc, 4
@ -1722,7 +1722,7 @@ ChooseMonToUseItemOn:
farcall InitPartyMenuWithCancel farcall InitPartyMenuWithCancel
farcall InitPartyMenuGFX farcall InitPartyMenuGFX
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -2073,7 +2073,7 @@ UseRepel:
ld a, [wRepelEffect] ld a, [wRepelEffect]
and a and a
ld hl, RepelUsedEarlierIsStillInEffectText ld hl, RepelUsedEarlierIsStillInEffectText
jp nz, PrintText jp nz, PrintText1bpp
ld a, b ld a, b
ld [wRepelEffect], a ld [wRepelEffect], a
@ -2189,9 +2189,9 @@ PokeFluteEffect:
ld a, [wPokeFluteCuredSleep] ld a, [wPokeFluteCuredSleep]
and a and a
ld hl, .PlayedFluteText ld hl, .PlayedFluteText
jp z, PrintText jp z, PrintText1bpp
ld hl, .PlayedTheFlute ld hl, .PlayedTheFlute
call PrintText call PrintText1bpp
ld a, [wLowHealthAlarm] ld a, [wLowHealthAlarm]
and 1 << DANGER_ON_F and 1 << DANGER_ON_F
@ -2199,7 +2199,7 @@ PokeFluteEffect:
; more code was dummied out here ; more code was dummied out here
.dummy .dummy
ld hl, .FluteWakeUpText ld hl, .FluteWakeUpText
jp PrintText jp PrintText1bpp
.CureSleep: .CureSleep:
ld de, PARTYMON_STRUCT_LENGTH ld de, PARTYMON_STRUCT_LENGTH
@ -2305,7 +2305,7 @@ RestorePPEffect:
ld hl, RestoreThePPOfWhichMoveText ld hl, RestoreThePPOfWhichMoveText
.ppup .ppup
call PrintText call PrintText1bpp
ld a, [wCurMoveNum] ld a, [wCurMoveNum]
push af push af
@ -2346,7 +2346,7 @@ RestorePPEffect:
.CantUsePPUpOnSketch: .CantUsePPUpOnSketch:
ld hl, PPIsMaxedOutText ld hl, PPIsMaxedOutText
call PrintText call PrintText1bpp
jr .loop2 jr .loop2
.do_ppup .do_ppup
@ -2359,7 +2359,7 @@ RestorePPEffect:
call Play_SFX_FULL_HEAL call Play_SFX_FULL_HEAL
ld hl, PPsIncreasedText ld hl, PPsIncreasedText
call PrintText call PrintText1bpp
FinishPPRestore: FinishPPRestore:
call ClearPalettes call ClearPalettes
@ -2382,7 +2382,7 @@ BattleRestorePP:
.not_in_battle .not_in_battle
call Play_SFX_FULL_HEAL call Play_SFX_FULL_HEAL
ld hl, PPRestoredText ld hl, PPRestoredText
call PrintText call PrintText1bpp
jr FinishPPRestore jr FinishPPRestore
.UpdateBattleMonPP: .UpdateBattleMonPP:
@ -2557,7 +2557,7 @@ OpenBox:
farcall SetSpecificDecorationFlag farcall SetSpecificDecorationFlag
ld hl, .SentTrophyHomeText ld hl, .SentTrophyHomeText
call PrintText call PrintText1bpp
jp UseDisposableItem jp UseDisposableItem
@ -2577,7 +2577,7 @@ Play_SFX_FULL_HEAL:
UseItemText: UseItemText:
ld hl, ItemUsedText ld hl, ItemUsedText
call PrintText call PrintText1bpp
call Play_SFX_FULL_HEAL call Play_SFX_FULL_HEAL
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
UseDisposableItem: UseDisposableItem:
@ -2599,14 +2599,14 @@ UseBallInTrainerBattle:
ld [wNumHits], a ld [wNumHits], a
predef PlayBattleAnim predef PlayBattleAnim
ld hl, BallBlockedText ld hl, BallBlockedText
call PrintText call PrintText1bpp
ld hl, BallDontBeAThiefText ld hl, BallDontBeAThiefText
call PrintText call PrintText1bpp
jr UseDisposableItem jr UseDisposableItem
WontHaveAnyEffect_NotUsedMessage: WontHaveAnyEffect_NotUsedMessage:
ld hl, ItemWontHaveEffectText ld hl, ItemWontHaveEffectText
call PrintText call PrintText1bpp
; Item wasn't used. ; Item wasn't used.
ld a, $2 ld a, $2
@ -2615,11 +2615,11 @@ WontHaveAnyEffect_NotUsedMessage:
LooksBitterMessage: LooksBitterMessage:
ld hl, ItemLooksBitterText ld hl, ItemLooksBitterText
jp PrintText jp PrintText1bpp
Ball_BoxIsFullMessage: Ball_BoxIsFullMessage:
ld hl, BallBoxFullText ld hl, BallBoxFullText
call PrintText call PrintText1bpp
; Item wasn't used. ; Item wasn't used.
ld a, $2 ld a, $2
@ -2654,7 +2654,7 @@ CantUseItemMessage:
; Item couldn't be used. ; Item couldn't be used.
xor a xor a
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
jp PrintText jp PrintText1bpp
ItemLooksBitterText: ItemLooksBitterText:
text_far _ItemLooksBitterText text_far _ItemLooksBitterText

14
engine/items/mart.asm
View File

@ -163,7 +163,7 @@ StandardMart:
.HowMayIHelpYou: .HowMayIHelpYou:
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, MartWelcomeText ld hl, MartWelcomeText
call PrintText call PrintText1bpp
ld a, STANDARDMART_TOPMENU ld a, STANDARDMART_TOPMENU
ret ret
@ -211,7 +211,7 @@ StandardMart:
.AnythingElse: .AnythingElse:
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, MartAskMoreText ld hl, MartAskMoreText
call PrintText call PrintText1bpp
ld a, STANDARDMART_TOPMENU ld a, STANDARDMART_TOPMENU
ret ret
@ -364,7 +364,7 @@ LoadBuyMenuText:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call PrintText call PrintText1bpp
ret ret
MartAskPurchaseQuantity: MartAskPurchaseQuantity:
@ -441,7 +441,7 @@ BuyMenuLoop:
ld [wMenuScrollPositionBackup], a ld [wMenuScrollPositionBackup], a
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld [wMenuCursorPositionBackup], a ld [wMenuCursorPositionBackup], a
call SpeechTextbox call SpeechTextbox1bpp
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
jr z, .set_carry jr z, .set_carry
@ -476,7 +476,7 @@ BuyMenuLoop:
call JoyWaitAorB call JoyWaitAorB
.cancel .cancel
call SpeechTextbox call SpeechTextbox1bpp
and a and a
ret ret
@ -758,13 +758,13 @@ SellMenu:
and a and a
jr z, .okay_to_sell jr z, .okay_to_sell
ld hl, MartCantBuyText ld hl, MartCantBuyText
call PrintText call PrintText1bpp
and a and a
ret ret
.okay_to_sell .okay_to_sell
ld hl, MartSellHowManyText ld hl, MartSellHowManyText
call PrintText call PrintText1bpp
farcall PlaceMoneyAtTopLeftOfTextbox farcall PlaceMoneyAtTopLeftOfTextbox
farcall SelectQuantityToSell farcall SelectQuantityToSell
call ExitMenu call ExitMenu

8
engine/items/pack.asm
View File

@ -572,7 +572,7 @@ GiveItem:
farcall InitPartyMenuGFX farcall InitPartyMenuGFX
.loop .loop
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -582,7 +582,7 @@ GiveItem:
cp EGG cp EGG
jr nz, .give jr nz, .give
ld hl, .AnEggCantHoldAnItemText ld hl, .AnEggCantHoldAnItemText
call PrintText call PrintText1bpp
jr .loop jr .loop
.give .give
@ -1200,7 +1200,7 @@ Pack_PrintTextNoScroll:
push af push af
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
call PrintText call PrintText1bpp
pop af pop af
ld [wOptions], a ld [wOptions], a
ret ret
@ -1357,7 +1357,7 @@ Pack_InitGFX:
; Place the textbox for displaying the item description ; Place the textbox for displaying the item description
hlcoord 0, SCREEN_HEIGHT - 4 - 2 hlcoord 0, SCREEN_HEIGHT - 4 - 2
lb bc, 4, SCREEN_WIDTH - 2 lb bc, 4, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
call EnableLCD call EnableLCD
call DrawPackGFX call DrawPackGFX
ret ret

12
engine/items/tmhm.asm
View File

@ -60,9 +60,9 @@ AskTeachTMHM:
jr c, .TM jr c, .TM
ld hl, BootedHMText ; Booted up an HM ld hl, BootedHMText ; Booted up an HM
.TM: .TM:
call PrintText call PrintText1bpp
ld hl, ContainedMoveText ld hl, ContainedMoveText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
.NotTMHM: .NotTMHM:
pop bc pop bc
@ -84,7 +84,7 @@ ChooseMonToLearnTMHM_NoRefresh:
ld [wPartyMenuActionText], a ld [wPartyMenuActionText], a
.loopback .loopback
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -133,7 +133,7 @@ TeachTMHM:
call PlaySFX call PlaySFX
pop de pop de
ld hl, TMHMNotCompatibleText ld hl, TMHMNotCompatibleText
call PrintText call PrintText1bpp
jr .nope jr .nope
.compatible .compatible
@ -242,7 +242,7 @@ TMHM_ShowTMMoveDescription:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
ld a, [wCurItem] ld a, [wCurItem]
cp NUM_TMS + NUM_HMS + 1 cp NUM_TMS + NUM_HMS + 1
jr nc, TMHM_JoypadLoop jr nc, TMHM_JoypadLoop
@ -491,7 +491,7 @@ VerboseReceiveTMHM: ; unreferenced
jr nc, .print jr nc, .print
ld hl, .ReceivedTMHMText ld hl, .ReceivedTMHMText
.print .print
jp PrintText jp PrintText1bpp
.NoRoomTMHMText: .NoRoomTMHMText:
text_far _NoRoomTMHMText text_far _NoRoomTMHMText

2
engine/items/update_item_description.asm
View File

@ -4,7 +4,7 @@ UpdateItemDescription:
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
ld a, [wMenuSelection] ld a, [wMenuSelection]
cp -1 cp -1
ret z ret z

8
engine/link/link.asm
View File

@ -522,7 +522,7 @@ LinkTimeout:
pop de pop de
pop hl pop hl
bccoord 1, 14 bccoord 1, 14
call PlaceHLTextAtBC call PrintHLTextAtBC
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearScreen call ClearScreen
ld b, CGB_DIPLOMA ld b, CGB_DIPLOMA
@ -1465,7 +1465,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .LinkTradeCantBattleText ld hl, .LinkTradeCantBattleText
bccoord 1, 14 bccoord 1, 14
call PlaceHLTextAtBC call PrintHLTextAtBC
jr .cancel_trade jr .cancel_trade
.abnormal .abnormal
@ -1487,7 +1487,7 @@ LinkTrade_TradeStatsMenu:
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .LinkAbnormalMonText ld hl, .LinkAbnormalMonText
bccoord 1, 14 bccoord 1, 14
call PlaceHLTextAtBC call PrintHLTextAtBC
.cancel_trade .cancel_trade
hlcoord 0, 12 hlcoord 0, 12
@ -1660,7 +1660,7 @@ LinkTrade:
call GetPokemonName call GetPokemonName
ld hl, LinkAskTradeForText ld hl, LinkAskTradeForText
bccoord 1, 14 bccoord 1, 14
call PlaceHLTextAtBC call PrintHLTextAtBC
call LoadStandardMenuHeader call LoadStandardMenuHeader
hlcoord 10, 7 hlcoord 10, 7
ld b, 3 ld b, 3

2
engine/link/place_waiting_text.asm
View File

@ -7,7 +7,7 @@ PlaceWaitingText::
and a and a
jr z, .notinbattle jr z, .notinbattle
call Textbox call Textbox1bpp
jr .proceed jr .proceed
.notinbattle .notinbattle

2
engine/menus/delete_save.asm
View File

@ -7,7 +7,7 @@ _DeleteSaveData:
ld de, MUSIC_MAIN_MENU ld de, MUSIC_MAIN_MENU
call PlayMusic call PlayMusic
ld hl, .ClearAllSaveDataText ld hl, .ClearAllSaveDataText
call PrintText call PrintText1bpp
ld hl, .NoYesMenuHeader ld hl, .NoYesMenuHeader
call CopyMenuHeader call CopyMenuHeader
call VerticalMenu call VerticalMenu

2
engine/menus/init_gender.asm
View File

@ -23,7 +23,7 @@ InitGender:
call WaitBGMap2 call WaitBGMap2
call SetPalettes call SetPalettes
ld hl, AreYouABoyOrAreYouAGirlText ld hl, AreYouABoyOrAreYouAGirlText
call PrintText call PrintText1bpp
ld hl, .MenuHeader ld hl, .MenuHeader
call LoadMenuHeader call LoadMenuHeader
call WaitBGMap2 call WaitBGMap2

16
engine/menus/intro_menu.asm
View File

@ -42,7 +42,7 @@ NewGame_ClearTilemapEtc:
call ClearTilemap call ClearTilemap
call LoadFrame call LoadFrame
call LoadStandardFont call LoadStandardFont
call ClearWindowData call ClearMenuAndWindowData
ret ret
Option: Option:
@ -535,7 +535,7 @@ OakSpeech:
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
ld hl, OakText1 ld hl, OakText1
call PrintText call PrintText1bpp
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTilemap call ClearTilemap
@ -556,9 +556,9 @@ OakSpeech:
call Intro_WipeInFrontpic call Intro_WipeInFrontpic
ld hl, OakText2 ld hl, OakText2
call PrintText call PrintText1bpp
ld hl, OakText4 ld hl, OakText4
call PrintText call PrintText1bpp
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTilemap call ClearTilemap
@ -573,7 +573,7 @@ OakSpeech:
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
ld hl, OakText5 ld hl, OakText5
call PrintText call PrintText1bpp
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTilemap call ClearTilemap
@ -586,10 +586,10 @@ OakSpeech:
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
ld hl, OakText6 ld hl, OakText6
call PrintText call PrintText1bpp
call NamePlayer call NamePlayer
ld hl, OakText7 ld hl, OakText7
call PrintText call PrintText1bpp
ret ret
OakText1: OakText1:
@ -1124,7 +1124,7 @@ CopyrightString:
GameInit:: GameInit::
farcall TryLoadSaveData farcall TryLoadSaveData
call ClearWindowData call ClearMenuAndWindowData
call ClearBGPalettes call ClearBGPalettes
call ClearTilemap call ClearTilemap
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)

4
engine/menus/main_menu.asm
View File

@ -147,7 +147,7 @@ MainMenu_PrintCurrentTimeAndDay:
hlcoord 0, 14 hlcoord 0, 14
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
ret ret
.PlaceTime: .PlaceTime:
@ -212,7 +212,7 @@ ClearTilemapEtc:
call ClearTilemap call ClearTilemap
call LoadFrame call LoadFrame
call LoadStandardFont call LoadStandardFont
call ClearWindowData call ClearMenuAndWindowData
ret ret
MainMenu_NewGame: MainMenu_NewGame:

2
engine/menus/menu.asm
View File

@ -647,7 +647,7 @@ RestoreOverworldMapTiles: ; unreferenced
Error_Cant_ExitMenu: Error_Cant_ExitMenu:
ld hl, .WindowPoppingErrorText ld hl, .WindowPoppingErrorText
call PrintText call PrintText1bpp
call WaitBGMap call WaitBGMap
.infinite_loop .infinite_loop
jr .infinite_loop jr .infinite_loop

8
engine/menus/menu_2.asm
View File

@ -69,7 +69,7 @@ DisplayCoinCaseBalance:
hlcoord 11, 0 hlcoord 11, 0
ld b, 1 ld b, 1
ld c, 7 ld c, 7
call Textbox call Textbox1bpp
hlcoord 12, 0 hlcoord 12, 0
ld de, CoinString ld de, CoinString
call PlaceString call PlaceString
@ -86,7 +86,7 @@ DisplayMoneyAndCoinBalance:
hlcoord 5, 0 hlcoord 5, 0
ld b, 3 ld b, 3
ld c, 13 ld c, 13
call Textbox call Textbox1bpp
hlcoord 6, 1 hlcoord 6, 1
ld de, MoneyString ld de, MoneyString
call PlaceString call PlaceString
@ -118,7 +118,7 @@ StartMenu_PrintSafariGameStatus: ; unreferenced
hlcoord 0, 0 hlcoord 0, 0
ld b, 3 ld b, 3
ld c, 7 ld c, 7
call Textbox call Textbox1bpp
hlcoord 1, 1 hlcoord 1, 1
ld de, wSafariTimeRemaining ld de, wSafariTimeRemaining
lb bc, 2, 3 lb bc, 2, 3
@ -146,7 +146,7 @@ StartMenu_DrawBugContestStatusBox:
hlcoord 0, 0 hlcoord 0, 0
ld b, 5 ld b, 5
ld c, 17 ld c, 17
call Textbox call Textbox1bpp
ret ret
StartMenu_PrintBugContestStatus: StartMenu_PrintBugContestStatus:

2
engine/menus/options_menu.asm
View File

@ -20,7 +20,7 @@ _Option:
hlcoord 0, 0 hlcoord 0, 0
ld b, SCREEN_HEIGHT - 2 ld b, SCREEN_HEIGHT - 2
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
hlcoord 2, 2 hlcoord 2, 2
ld de, StringOptions ld de, StringOptions
call PlaceString call PlaceString

10
engine/menus/save.asm
View File

@ -1,7 +1,7 @@
SaveMenu: SaveMenu:
call LoadStandardMenuHeader call LoadStandardMenuHeader
farcall DisplaySaveInfoOnSave farcall DisplaySaveInfoOnSave
call SpeechTextbox call SpeechTextbox2bpp
call UpdateSprites call UpdateSprites
farcall SaveMenu_CopyTilemapAtOnce farcall SaveMenu_CopyTilemapAtOnce
ld hl, WouldYouLikeToSaveTheGameText ld hl, WouldYouLikeToSaveTheGameText
@ -18,7 +18,6 @@ SaveMenu:
.refused .refused
call ExitMenu call ExitMenu
call GSReloadPalettes
farcall SaveMenu_CopyTilemapAtOnce farcall SaveMenu_CopyTilemapAtOnce
scf scf
ret ret
@ -209,7 +208,6 @@ SaveTheGame_yesorno:
dec a dec a
call CloseWindow call CloseWindow
push af push af
call GSReloadPalettes
pop af pop af
and a and a
ret ret
@ -244,7 +242,7 @@ SavedTheGame:
ld [wOptions], a ld [wOptions], a
; <PLAYER> saved the game! ; <PLAYER> saved the game!
ld hl, SavedTheGameText ld hl, SavedTheGameText
call PrintText call PrintText1bpp
; restore the original text speed setting ; restore the original text speed setting
pop af pop af
ld [wOptions], a ld [wOptions], a
@ -328,7 +326,7 @@ SavingDontTurnOffThePower:
ld [wOptions], a ld [wOptions], a
; SAVING... DON'T TURN OFF THE POWER. ; SAVING... DON'T TURN OFF THE POWER.
ld hl, SavingDontTurnOffThePowerText ld hl, SavingDontTurnOffThePowerText
call PrintText call PrintText1bpp
; Restore the text speed setting ; Restore the text speed setting
pop af pop af
ld [wOptions], a ld [wOptions], a
@ -536,7 +534,7 @@ TryLoadSaveFile:
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
ld hl, SaveFileCorruptedText ld hl, SaveFileCorruptedText
call PrintText call PrintText1bpp
pop af pop af
ld [wOptions], a ld [wOptions], a
scf scf

5
engine/menus/scrolling_menu.asm
View File

@ -78,11 +78,6 @@ ScrollingMenuJoyAction:
jp nz, .d_down jp nz, .d_down
jr .loop jr .loop
.no_zero_no_carry ; unreferenced
ld a, -1
and a
ret
.a_button .a_button
call PlaceHollowCursor call PlaceHollowCursor
ld a, [wMenuCursorY] ld a, [wMenuCursorY]

7
engine/menus/start_menu.asm
View File

@ -11,7 +11,7 @@
const STARTMENUITEM_QUIT ; 8 const STARTMENUITEM_QUIT ; 8
StartMenu:: StartMenu::
call ClearWindowData call ClearMenuAndWindowData
ld de, SFX_MENU ld de, SFX_MENU
call PlaySFX call PlaySFX
@ -34,7 +34,7 @@ StartMenu::
call .DrawBugContestStatusBox call .DrawBugContestStatusBox
call SafeUpdateSprites call SafeUpdateSprites
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
farcall LoadFonts_NoOAMUpdate farcall LoadFont_NoOAMUpdate
call .DrawBugContestStatus call .DrawBugContestStatus
call UpdateTimePals call UpdateTimePals
jr .Select jr .Select
@ -151,7 +151,6 @@ StartMenu::
call DrawVariableLengthMenuBox call DrawVariableLengthMenuBox
call .DrawBugContestStatus call .DrawBugContestStatus
call UpdateSprites call UpdateSprites
call GSReloadPalettes
call FinishExitMenu call FinishExitMenu
ret ret
@ -512,7 +511,7 @@ StartMenu_Pokemon:
.menunoreload .menunoreload
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes ; load regular palettes? call SetPalettes ; load regular palettes?
call DelayFrame call DelayFrame

2
engine/movie/init_hof_credits.asm
View File

@ -18,7 +18,7 @@ InitDisplayForHallOfFame:
ldh [hSCX], a ldh [hSCX], a
call EnableLCD call EnableLCD
ld hl, .SavingRecordText ld hl, .SavingRecordText
call PrintText call PrintText1bpp
call WaitBGMap2 call WaitBGMap2
call SetPalettes call SetPalettes
ret ret

24
engine/movie/trade_animation.asm
View File

@ -927,7 +927,7 @@ TrademonStats_MonTemplate:
hlcoord 3, 0 hlcoord 3, 0
ld b, $6 ld b, $6
ld c, $d ld c, $d
call Textbox call Textbox1bpp
hlcoord 4, 0 hlcoord 4, 0
ld de, .OTMonData ld de, .OTMonData
call PlaceString call PlaceString
@ -947,7 +947,7 @@ TrademonStats_Egg:
hlcoord 3, 0 hlcoord 3, 0
ld b, 6 ld b, 6
ld c, 13 ld c, 13
call Textbox call Textbox1bpp
hlcoord 4, 2 hlcoord 4, 2
ld de, .EggData ld de, .EggData
call PlaceString call PlaceString
@ -1167,11 +1167,11 @@ TradeAnim_SentToOTText:
cp LINK_TIMECAPSULE cp LINK_TIMECAPSULE
jr z, .time_capsule jr z, .time_capsule
ld hl, .MonNameSentToText ld hl, .MonNameSentToText
call PrintText call PrintText1bpp
ld c, 189 ld c, 189
call DelayFrames call DelayFrames
ld hl, .MonWasSentToText ld hl, .MonWasSentToText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld c, 128 ld c, 128
call DelayFrames call DelayFrames
@ -1180,7 +1180,7 @@ TradeAnim_SentToOTText:
.time_capsule .time_capsule
ld hl, .MonWasSentToText ld hl, .MonWasSentToText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ret ret
@ -1195,10 +1195,10 @@ TradeAnim_SentToOTText:
TradeAnim_OTBidsFarewell: TradeAnim_OTBidsFarewell:
ld hl, .BidsFarewellToMonText ld hl, .BidsFarewellToMonText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld hl, .MonNameBidsFarewellText ld hl, .MonNameBidsFarewellText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ret ret
@ -1219,7 +1219,7 @@ TradeAnim_TakeCareOfText:
call ByteFill call ByteFill
call WaitBGMap call WaitBGMap
ld hl, .TakeGoodCareOfMonText ld hl, .TakeGoodCareOfMonText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ret ret
@ -1230,10 +1230,10 @@ TradeAnim_TakeCareOfText:
TradeAnim_OTSendsText1: TradeAnim_OTSendsText1:
ld hl, .ForYourMonSendsText ld hl, .ForYourMonSendsText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld hl, .OTSendsText ld hl, .OTSendsText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld c, 14 ld c, 14
call DelayFrames call DelayFrames
@ -1250,10 +1250,10 @@ TradeAnim_OTSendsText1:
TradeAnim_OTSendsText2: TradeAnim_OTSendsText2:
ld hl, .WillTradeText ld hl, .WillTradeText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld hl, .ForYourMonWillTradeText ld hl, .ForYourMonWillTradeText
call PrintText call PrintText1bpp
call TradeAnim_Wait80Frames call TradeAnim_Wait80Frames
ld c, 14 ld c, 14
call DelayFrames call DelayFrames

12
engine/overworld/init_map.asm
View File

@ -56,24 +56,20 @@ ReanchorBGMap_NoOAMUpdate::
ldh [hBGMapAddress], a ldh [hBGMapAddress], a
ret ret
LoadFonts_NoOAMUpdate:: LoadFont_NoOAMUpdate::
ldh a, [hOAMUpdate] ldh a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
call .LoadGFX
pop af
ldh [hOAMUpdate], a
ret
.LoadGFX:
call LoadFrame call LoadFrame
ld a, $90 ld a, $90
ldh [hWY], a ldh [hWY], a
call SafeUpdateSprites call SafeUpdateSprites
call LoadStandardFont call LoadStandardFont
pop af
ldh [hOAMUpdate], a
ret ret
HDMATransfer_FillBGMap0WithBlack: HDMATransfer_FillBGMap0WithBlack:

14
engine/overworld/scripting.asm
View File

@ -383,6 +383,8 @@ Script_promptbutton:
ret ret
Script_yesorno: Script_yesorno:
ld a, TRUE
ld [wMenuBoxUse2bppFrame], a
call YesNoBox call YesNoBox
ld a, FALSE ld a, FALSE
jr c, .no jr c, .no
@ -423,6 +425,8 @@ Script_closepokepic:
ret ret
Script_verticalmenu: Script_verticalmenu:
ld a, TRUE
ld [wMenuBoxUse2bppFrame], a
ld a, [wScriptBank] ld a, [wScriptBank]
ld hl, VerticalMenu ld hl, VerticalMenu
rst FarCall rst FarCall
@ -434,6 +438,8 @@ Script_verticalmenu:
ret ret
Script__2dmenu: Script__2dmenu:
ld a, TRUE
ld [wMenuBoxUse2bppFrame], a
ld a, [wScriptBank] ld a, [wScriptBank]
ld hl, _2DMenu ld hl, _2DMenu
rst FarCall rst FarCall
@ -445,7 +451,11 @@ Script__2dmenu:
ret ret
Script_battletowertext: Script_battletowertext:
call SetUpTextbox push hl
call SpeechTextbox2bpp
call UpdateSprites
call ApplyTilemap
pop hl
call GetScriptByte call GetScriptByte
ret ret
@ -2188,7 +2198,7 @@ Script_reloadend:
jp Script_end jp Script_end
Script_opentext: Script_opentext:
call OpenText call OpenText2bpp
ret ret
Script_refreshscreen: Script_refreshscreen:

6
engine/overworld/select_menu.asm
View File

@ -4,7 +4,7 @@ SelectMenu::
jp UseRegisteredItem jp UseRegisteredItem
.NotRegistered: .NotRegistered:
call OpenText call OpenText2bpp
ld b, BANK(MayRegisterItemText) ld b, BANK(MayRegisterItemText)
ld hl, MayRegisterItemText ld hl, MayRegisterItemText
call MapTextbox call MapTextbox
@ -125,14 +125,14 @@ UseRegisteredItem:
dw .Overworld dw .Overworld
.NoFunction: .NoFunction:
call OpenText call OpenText2bpp
call CantUseItem call CantUseItem
call CloseText call CloseText
and a and a
ret ret
.Current: .Current:
call OpenText call OpenText2bpp
call DoItemEffect call DoItemEffect
call CloseText call CloseText
and a and a

1
engine/overworld/warp_connection.asm
View File

@ -287,7 +287,6 @@ LoadMapGraphics:
xor a xor a
ldh [hTileAnimFrame], a ldh [hTileAnimFrame], a
farcall RefreshSprites farcall RefreshSprites
call LoadFrame
call LoadOverworldFontAndFrame call LoadOverworldFontAndFrame
ret ret

2
engine/overworld/wildmons.asm
View File

@ -816,7 +816,7 @@ RandomUnseenWildMon:
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, .JustSawSomeRareMonText ld hl, .JustSawSomeRareMonText
call PrintText call PrintText2bpp
xor a xor a
ld [wScriptVar], a ld [wScriptVar], a
ret ret

8
engine/phone/phone.asm
View File

@ -519,7 +519,7 @@ HangUp_ShutDown: ; unreferenced
HangUp_Beep: HangUp_Beep:
ld hl, PhoneClickText ld hl, PhoneClickText
call PrintText call PrintText2bpp
ld de, SFX_HANG_UP ld de, SFX_HANG_UP
call PlaySFX call PlaySFX
ret ret
@ -530,7 +530,7 @@ PhoneClickText:
HangUp_BoopOn: HangUp_BoopOn:
ld hl, PhoneEllipseText ld hl, PhoneEllipseText
call PrintText call PrintText2bpp
ret ret
PhoneEllipseText: PhoneEllipseText:
@ -538,7 +538,7 @@ PhoneEllipseText:
text_end text_end
HangUp_BoopOff: HangUp_BoopOff:
call SpeechTextbox call SpeechTextbox2bpp
ret ret
Phone_StartRinging: Phone_StartRinging:
@ -576,7 +576,7 @@ Phone_CallerTextbox:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, SCREEN_WIDTH - 2 ld c, SCREEN_WIDTH - 2
call Textbox call Textbox1bpp
ret ret
GetCallerClassAndName: GetCallerClassAndName:

30
engine/pokegear/pokegear.asm
View File

@ -274,7 +274,7 @@ InitPokegearTilemap:
call PlaceString call PlaceString
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
ret ret
.switch .switch
@ -300,7 +300,7 @@ InitPokegearTilemap:
call Pokegear_LoadTilemapRLE call Pokegear_LoadTilemapRLE
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
ret ret
.Phone: .Phone:
@ -308,7 +308,7 @@ InitPokegearTilemap:
call Pokegear_LoadTilemapRLE call Pokegear_LoadTilemapRLE
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
call .PlacePhoneBars call .PlacePhoneBars
call PokegearPhone_UpdateDisplayList call PokegearPhone_UpdateDisplayList
ret ret
@ -400,7 +400,7 @@ PokegearJumptable:
PokegearClock_Init: PokegearClock_Init:
call InitPokegearTilemap call InitPokegearTilemap
ld hl, PokegearPressButtonText ld hl, PokegearPressButtonText
call PrintText call PrintText1bpp
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
call ExitPokegearRadio_HandleMusic call ExitPokegearRadio_HandleMusic
@ -698,7 +698,7 @@ PokegearPhone_Init:
call InitPokegearTilemap call InitPokegearTilemap
call ExitPokegearRadio_HandleMusic call ExitPokegearRadio_HandleMusic
ld hl, PokegearAskWhoCallText ld hl, PokegearAskWhoCallText
call PrintText call PrintText1bpp
ret ret
PokegearPhone_Joypad: PokegearPhone_Joypad:
@ -788,12 +788,12 @@ PokegearPhone_MakePhoneCall:
ld de, SFX_CALL ld de, SFX_CALL
call PlaySFX call PlaySFX
ld hl, .GearEllipseText ld hl, .GearEllipseText
call PrintText call PrintText1bpp
call WaitSFX call WaitSFX
ld de, SFX_CALL ld de, SFX_CALL
call PlaySFX call PlaySFX
ld hl, .GearEllipseText ld hl, .GearEllipseText
call PrintText call PrintText1bpp
call WaitSFX call WaitSFX
ld a, [wPokegearPhoneSelectedPerson] ld a, [wPokegearPhoneSelectedPerson]
ld b, a ld b, a
@ -812,11 +812,11 @@ PokegearPhone_MakePhoneCall:
.no_service .no_service
farcall Phone_NoSignal farcall Phone_NoSignal
ld hl, .GearOutOfServiceText ld hl, .GearOutOfServiceText
call PrintText call PrintText1bpp
ld a, POKEGEARSTATE_PHONEJOYPAD ld a, POKEGEARSTATE_PHONEJOYPAD
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld hl, PokegearAskWhoCallText ld hl, PokegearAskWhoCallText
call PrintText call PrintText1bpp
ret ret
.GearEllipseText: .GearEllipseText:
@ -835,7 +835,7 @@ PokegearPhone_FinishPhoneCall:
ld a, POKEGEARSTATE_PHONEJOYPAD ld a, POKEGEARSTATE_PHONEJOYPAD
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld hl, PokegearAskWhoCallText ld hl, PokegearAskWhoCallText
call PrintText call PrintText1bpp
ret ret
PokegearPhone_GetDPad: PokegearPhone_GetDPad:
@ -1017,7 +1017,7 @@ PokegearPhoneContactSubmenu:
ld b, a ld b, a
ld c, 8 ld c, 8
push de push de
call Textbox call Textbox1bpp
pop de pop de
pop hl pop hl
inc hl inc hl
@ -1086,7 +1086,7 @@ PokegearPhoneContactSubmenu:
.Cancel: .Cancel:
ld hl, PokegearAskWhoCallText ld hl, PokegearAskWhoCallText
call PrintText call PrintText1bpp
scf scf
ret ret
@ -1101,7 +1101,7 @@ PokegearPhoneContactSubmenu:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call PokegearPhone_UpdateDisplayList call PokegearPhone_UpdateDisplayList
ld hl, PokegearAskWhoCallText ld hl, PokegearAskWhoCallText
call PrintText call PrintText1bpp
call WaitBGMap call WaitBGMap
.CancelDelete: .CancelDelete:
scf scf
@ -1565,7 +1565,7 @@ NoRadioName:
call ClearBox call ClearBox
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
ret ret
OaksPKMNTalkName: db "OAK's <PK><MN> Talk@" OaksPKMNTalkName: db "OAK's <PK><MN> Talk@"
@ -1775,7 +1775,7 @@ PlayRadio:
push de push de
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
hlcoord 1, 14 hlcoord 1, 14
ld [hl], "“" ld [hl], "“"
pop de pop de

12
engine/pokegear/radio.asm
View File

@ -129,7 +129,7 @@ PrintRadioLine:
cp 2 cp 2
jr nz, .print jr nz, .print
bccoord 1, 16 bccoord 1, 16
call PlaceHLTextAtBC call PrintHLTextAtBC
jr .skip jr .skip
.print .print
call PrintTextboxText call PrintTextboxText
@ -538,10 +538,10 @@ OaksPKMNTalk9:
OaksPKMNTalk10: OaksPKMNTalk10:
farcall RadioMusicRestartPokemonChannel farcall RadioMusicRestartPokemonChannel
ld hl, OPT_RestartText ld hl, OPT_RestartText
call PrintText call PrintText1bpp
call WaitBGMap call WaitBGMap
ld hl, OPT_PokemonChannelText ld hl, OPT_PokemonChannelText
call PrintText call PrintText1bpp
ld a, OAKS_POKEMON_TALK_11 ld a, OAKS_POKEMON_TALK_11
ld [wCurRadioLine], a ld [wCurRadioLine], a
ld a, 100 ld a, 100
@ -598,7 +598,7 @@ OaksPKMNTalk14:
ld de, MUSIC_POKEMON_TALK ld de, MUSIC_POKEMON_TALK
callfar RadioMusicRestartDE callfar RadioMusicRestartDE
ld hl, .terminator ld hl, .terminator
call PrintText call PrintText1bpp
ld a, OAKS_POKEMON_TALK_4 ld a, OAKS_POKEMON_TALK_4
ld [wNextRadioLine], a ld [wNextRadioLine], a
xor a xor a
@ -858,7 +858,7 @@ BenFernMusic7:
StartPokemonMusicChannel: StartPokemonMusicChannel:
call RadioTerminator call RadioTerminator
call PrintText call PrintText1bpp
ld de, MUSIC_POKEMON_MARCH ld de, MUSIC_POKEMON_MARCH
call GetWeekday call GetWeekday
and 1 and 1
@ -1792,7 +1792,7 @@ StartRadioStation:
and a and a
ret nz ret nz
call RadioTerminator call RadioTerminator
call PrintText call PrintText1bpp
ld hl, RadioChannelSongs ld hl, RadioChannelSongs
ld a, [wCurRadioLine] ld a, [wCurRadioLine]
ld c, a ld c, a

24
engine/pokemon/bills_pc.asm
View File

@ -960,7 +960,7 @@ BillsPC_PlaceString:
push de push de
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
pop de pop de
hlcoord 1, 16 hlcoord 1, 16
call PlaceString call PlaceString
@ -977,7 +977,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows:
BillsPC_BoxName: BillsPC_BoxName:
hlcoord 8, 0 hlcoord 8, 0
lb bc, 1, 10 lb bc, 1, 10
call Textbox call Textbox1bpp
ld a, [wBillsPC_LoadedBox] ld a, [wBillsPC_LoadedBox]
and a and a
@ -1216,7 +1216,7 @@ BillsPC_LoadMonStats:
BillsPC_RefreshTextboxes: BillsPC_RefreshTextboxes:
hlcoord 8, 2 hlcoord 8, 2
lb bc, 10, 10 lb bc, 10, 10
call Textbox call Textbox1bpp
hlcoord 8, 2 hlcoord 8, 2
ld [hl], "└" ld [hl], "└"
@ -1771,7 +1771,7 @@ DepositPokemon:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
call WaitBGMap call WaitBGMap
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Stored ld de, PCString_Stored
@ -1826,7 +1826,7 @@ TryWithdrawPokemon:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
call WaitBGMap call WaitBGMap
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Got ld de, PCString_Got
@ -1862,7 +1862,7 @@ ReleasePKMN_ByePKMN:
call ClearBox call ClearBox
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
call WaitBGMap call WaitBGMap
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
@ -1883,7 +1883,7 @@ ReleasePKMN_ByePKMN:
call DelayFrames call DelayFrames
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
hlcoord 1, 16 hlcoord 1, 16
ld de, PCString_Bye ld de, PCString_Bye
call PlaceString call PlaceString
@ -1906,7 +1906,7 @@ MovePKMNWithoutMail_InsertMon:
push af push af
hlcoord 0, 15 hlcoord 0, 15
lb bc, 1, 18 lb bc, 1, 18
call Textbox call Textbox1bpp
hlcoord 1, 16 hlcoord 1, 16
ld de, .Saving_LeaveOn ld de, .Saving_LeaveOn
call PlaceString call PlaceString
@ -2212,7 +2212,7 @@ _ChangeBox:
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
hlcoord 0, 4 hlcoord 0, 4
lb bc, 8, 9 lb bc, 8, 9
call Textbox call Textbox1bpp
call ScrollingMenu call ScrollingMenu
ld a, [wMenuJoypad] ld a, [wMenuJoypad]
cp B_BUTTON cp B_BUTTON
@ -2275,7 +2275,7 @@ GetBoxName:
BillsPC_PrintBoxCountAndCapacity: BillsPC_PrintBoxCountAndCapacity:
hlcoord 11, 7 hlcoord 11, 7
lb bc, 5, 7 lb bc, 5, 7
call Textbox call Textbox1bpp
ld a, [wMenuSelection] ld a, [wMenuSelection]
cp -1 cp -1
ret z ret z
@ -2350,7 +2350,7 @@ BillsPC_PrintBoxName:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
hlcoord 1, 2 hlcoord 1, 2
ld de, .Current ld de, .Current
call PlaceString call PlaceString
@ -2478,7 +2478,7 @@ BillsPC_PlaceChangeBoxString:
push de push de
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call Textbox call Textbox1bpp
pop de pop de
hlcoord 1, 16 hlcoord 1, 16
call PlaceString call PlaceString

8
engine/pokemon/bills_pc_top.asm
View File

@ -28,7 +28,7 @@ _BillsPC:
push af push af
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
ld hl, .PCWhatText ld hl, .PCWhatText
call PrintText call PrintText1bpp
pop af pop af
ld [wOptions], a ld [wOptions], a
call LoadFontsBattleExtra call LoadFontsBattleExtra
@ -111,7 +111,7 @@ BillsPC_MovePKMNMenu:
farcall IsAnyMonHoldingMail farcall IsAnyMonHoldingMail
jr nc, .no_mail jr nc, .no_mail
ld hl, .PCMonHoldingMailText ld hl, .PCMonHoldingMailText
call PrintText call PrintText1bpp
jr .quit jr .quit
.no_mail .no_mail
@ -240,10 +240,10 @@ ClearPCItemScreen:
call ByteFill call ByteFill
hlcoord 0, 0 hlcoord 0, 0
lb bc, 10, 18 lb bc, 10, 18
call Textbox call Textbox1bpp
hlcoord 0, 12 hlcoord 0, 12
lb bc, 4, 18 lb bc, 4, 18
call Textbox call Textbox1bpp
call WaitBGMap2 call WaitBGMap2
call SetPalettes ; load regular palettes? call SetPalettes ; load regular palettes?
ret ret

14
engine/pokemon/breeding.asm
View File

@ -301,7 +301,7 @@ HatchEggs:
ld hl, wPlayerName ld hl, wPlayerName
call CopyBytes call CopyBytes
ld hl, .Text_HatchEgg ld hl, .Text_HatchEgg
call PrintText call PrintText1bpp
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
@ -310,7 +310,7 @@ HatchEggs:
ld e, l ld e, l
push de push de
ld hl, .BreedAskNicknameText ld hl, .BreedAskNicknameText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
pop de pop de
jr c, .nonickname jr c, .nonickname
@ -357,7 +357,7 @@ HatchEggs:
push af push af
call EggHatch_AnimationSequence call EggHatch_AnimationSequence
ld hl, .BreedClearboxText ld hl, .BreedClearboxText
call PrintText call PrintText1bpp
pop af pop af
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
pop bc pop bc
@ -854,7 +854,7 @@ Hatch_ShellFragmentLoop:
DayCareMon1: DayCareMon1:
ld hl, LeftWithDayCareManText ld hl, LeftWithDayCareManText
call PrintText call PrintText1bpp
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
call PlayMonCry call PlayMonCry
ld a, [wDayCareLady] ld a, [wDayCareLady]
@ -863,11 +863,11 @@ DayCareMon1:
call PromptButton call PromptButton
ld hl, wBreedMon2Nickname ld hl, wBreedMon2Nickname
call DayCareMonCompatibilityText call DayCareMonCompatibilityText
jp PrintText jp PrintText1bpp
DayCareMon2: DayCareMon2:
ld hl, LeftWithDayCareLadyText ld hl, LeftWithDayCareLadyText
call PrintText call PrintText1bpp
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
call PlayMonCry call PlayMonCry
ld a, [wDayCareMan] ld a, [wDayCareMan]
@ -876,7 +876,7 @@ DayCareMon2:
call PromptButton call PromptButton
ld hl, wBreedMon1Nickname ld hl, wBreedMon1Nickname
call DayCareMonCompatibilityText call DayCareMonCompatibilityText
jp PrintText jp PrintText1bpp
DayCareMonCursor: DayCareMonCursor:
jp WaitPressAorB_BlinkCursor jp WaitPressAorB_BlinkCursor

2
engine/pokemon/caught_data.asm
View File

@ -149,7 +149,7 @@ CheckPartyFullAfterContest:
GiveANickname_YesNo: GiveANickname_YesNo:
ld hl, CaughtAskNicknameText ld hl, CaughtAskNicknameText
call PrintText call PrintText1bpp
jp YesNoBox jp YesNoBox
CaughtAskNicknameText: CaughtAskNicknameText:

6
engine/pokemon/evolve.asm
View File

@ -205,7 +205,7 @@ EvolveAfterBattle_MasterLoop:
call GetNickname call GetNickname
call CopyName1 call CopyName1
ld hl, EvolvingText ld hl, EvolvingText
call PrintText call PrintText1bpp
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
@ -228,7 +228,7 @@ EvolveAfterBattle_MasterLoop:
jp c, CancelEvolution jp c, CancelEvolution
ld hl, CongratulationsYourPokemonText ld hl, CongratulationsYourPokemonText
call PrintText call PrintText1bpp
pop hl pop hl
@ -377,7 +377,7 @@ UpdateSpeciesNameIfNotNicknamed:
CancelEvolution: CancelEvolution:
ld hl, StoppedEvolvingText ld hl, StoppedEvolvingText
call PrintText call PrintText1bpp
call ClearTilemap call ClearTilemap
pop hl pop hl
jp EvolveAfterBattle_MasterLoop jp EvolveAfterBattle_MasterLoop

2
engine/pokemon/knows_move.asm
View File

@ -15,7 +15,7 @@ KnowsMove:
.knows_move .knows_move
ld hl, .KnowsMoveText ld hl, .KnowsMoveText
call PrintText call PrintText1bpp
scf scf
ret ret

16
engine/pokemon/learn.asm
View File

@ -52,7 +52,7 @@ LearnMove:
call GetMoveName call GetMoveName
ld hl, Text_1_2_and_Poof ; 1, 2 and… ld hl, Text_1_2_and_Poof ; 1, 2 and…
call PrintText call PrintText1bpp
pop de pop de
pop hl pop hl
@ -103,25 +103,25 @@ LearnMove:
.cancel .cancel
ld hl, StopLearningMoveText ld hl, StopLearningMoveText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
jp c, .loop jp c, .loop
ld hl, DidNotLearnMoveText ld hl, DidNotLearnMoveText
call PrintText call PrintText1bpp
ld b, 0 ld b, 0
ret ret
.learned .learned
ld hl, LearnedMoveText ld hl, LearnedMoveText
call PrintText call PrintText1bpp
ld b, 1 ld b, 1
ret ret
ForgetMove: ForgetMove:
push hl push hl
ld hl, AskForgetMoveText ld hl, AskForgetMoveText
call PrintText call PrintText1bpp
call YesNoBox call YesNoBox
pop hl pop hl
ret c ret c
@ -135,11 +135,11 @@ ForgetMove:
.loop .loop
push hl push hl
ld hl, MoveAskForgetText ld hl, MoveAskForgetText
call PrintText call PrintText1bpp
hlcoord 5, 2 hlcoord 5, 2
ld b, NUM_MOVES * 2 ld b, NUM_MOVES * 2
ld c, MOVE_NAME_LENGTH ld c, MOVE_NAME_LENGTH
call Textbox call Textbox1bpp
hlcoord 5 + 2, 2 + 2 hlcoord 5 + 2, 2 + 2
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [wListMovesLineSpacing], a ld [wListMovesLineSpacing], a
@ -192,7 +192,7 @@ ForgetMove:
.hmmove .hmmove
ld hl, MoveCantForgetHMText ld hl, MoveCantForgetHMText
call PrintText call PrintText1bpp
pop hl pop hl
jr .loop jr .loop

8
engine/pokemon/mail.asm
View File

@ -488,7 +488,7 @@ MailboxPC:
farcall InitPartyMenuWithCancel farcall InitPartyMenuWithCancel
farcall InitPartyMenuGFX farcall InitPartyMenuGFX
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
@ -503,12 +503,12 @@ MailboxPC:
and a and a
jr z, .attach_mail jr z, .attach_mail
ld hl, .MailAlreadyHoldingItemText ld hl, .MailAlreadyHoldingItemText
call PrintText call PrintText1bpp
jr .try_again jr .try_again
.egg .egg
ld hl, .MailEggText ld hl, .MailEggText
call PrintText call PrintText1bpp
jr .try_again jr .try_again
.attach_mail .attach_mail
@ -517,7 +517,7 @@ MailboxPC:
ld b, a ld b, a
call MoveMailFromPCToParty call MoveMailFromPCToParty
ld hl, .MailMovedFromBoxText ld hl, .MailMovedFromBoxText
call PrintText call PrintText1bpp
.exit2 .exit2
jp CloseSubmenu jp CloseSubmenu

14
engine/pokemon/mon_menu.asm
View File

@ -164,7 +164,7 @@ SwitchPartyMons:
ld a, PARTYMENUACTION_MOVE ld a, PARTYMENUACTION_MOVE
ld [wPartyMenuActionText], a ld [wPartyMenuActionText], a
farcall WritePartyMenuTilemap farcall WritePartyMenuTilemap
farcall PrintPartyMenuText farcall PlacePartyMenuText
hlcoord 0, 1 hlcoord 0, 1
ld bc, SCREEN_WIDTH * 2 ld bc, SCREEN_WIDTH * 2
@ -268,7 +268,7 @@ GiveTakePartyMonItem:
ret ret
TryGiveItemToPartymon: TryGiveItemToPartymon:
call SpeechTextbox call SpeechTextbox1bpp
call PartyMonItemName call PartyMonItemName
call GetPartyItemLocation call GetPartyItemLocation
ld a, [hl] ld a, [hl]
@ -342,7 +342,7 @@ GivePartyItem:
ret ret
TakePartyItem: TakePartyItem:
call SpeechTextbox call SpeechTextbox1bpp
call GetPartyItemLocation call GetPartyItemLocation
ld a, [hl] ld a, [hl]
and a and a
@ -728,7 +728,7 @@ MonMenu_Softboiled_MilkDrink:
.NotEnoughHP: .NotEnoughHP:
ld hl, .PokemonNotEnoughHPText ld hl, .PokemonNotEnoughHPText
call PrintText call PrintText1bpp
.finish .finish
xor a xor a
@ -1106,11 +1106,11 @@ SetUpMoveScreenBG:
hlcoord 0, 1 hlcoord 0, 1
ld b, 9 ld b, 9
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
hlcoord 0, 11 hlcoord 0, 11
ld b, 5 ld b, 5
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
hlcoord 2, 0 hlcoord 2, 0
lb bc, 2, 3 lb bc, 2, 3
call ClearBox call ClearBox
@ -1157,7 +1157,7 @@ SetUpMoveList:
hlcoord 0, 11 hlcoord 0, 11
ld b, 5 ld b, 5
ld c, 18 ld c, 18
jp Textbox jp Textbox1bpp
PrepareToPlaceMoveData: PrepareToPlaceMoveData:
ld hl, wPartyMon1Moves ld hl, wPartyMon1Moves

2
engine/pokemon/move_mon.asm
View File

@ -1784,7 +1784,7 @@ GivePoke::
and a and a
ret z ret z
ld hl, WasSentToBillsPCText ld hl, WasSentToBillsPCText
call PrintText call PrintText1bpp
ld a, BANK(sBoxMonNicknames) ld a, BANK(sBoxMonNicknames)
call OpenSRAM call OpenSRAM
ld hl, wMonOrItemNameBuffer ld hl, wMonOrItemNameBuffer

8
engine/pokemon/party_menu.asm
View File

@ -31,7 +31,7 @@ InitPartyMenuLayout:
call InitPartyMenuWithCancel call InitPartyMenuWithCancel
call InitPartyMenuGFX call InitPartyMenuGFX
call WritePartyMenuTilemap call WritePartyMenuTilemap
call PrintPartyMenuText call PlacePartyMenuText
ret ret
LoadPartyMenuGFX: LoadPartyMenuGFX:
@ -625,10 +625,10 @@ PartyMenuSelect:
scf scf
ret ret
PrintPartyMenuText: PlacePartyMenuText:
hlcoord 0, 14 hlcoord 0, 14
lb bc, 2, 18 lb bc, 2, 18
call Textbox call Textbox1bpp
ld a, [wPartyCount] ld a, [wPartyCount]
and a and a
jr nz, .haspokemon jr nz, .haspokemon
@ -769,7 +769,7 @@ PrintPartyMenuActionText:
push af push af
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
call PrintText call PrintText1bpp
pop af pop af
ld [wOptions], a ld [wOptions], a
ret ret

4
engine/printer/print_party.asm
View File

@ -159,7 +159,7 @@ PrintPartyMonPage1:
hlcoord 0, 7 hlcoord 0, 7
ld b, 9 ld b, 9
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
hlcoord 8, 2 hlcoord 8, 2
ld a, [wTempMonLevel] ld a, [wTempMonLevel]
call PrintLevel_Force3Digits call PrintLevel_Force3Digits
@ -241,7 +241,7 @@ PrintPartyMonPage2:
hlcoord 0, 0 hlcoord 0, 0
ld b, 15 ld b, 15
ld c, 18 ld c, 18
call Textbox call Textbox1bpp
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
decoord 0, 0 decoord 0, 0
hlcoord 0, 1 hlcoord 0, 1

2
engine/printer/printer.asm
View File

@ -562,7 +562,7 @@ PlacePrinterStatusString:
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 5 hlcoord 0, 5
lb bc, 10, 18 lb bc, 10, 18
call Textbox call Textbox1bpp
pop af pop af
ld e, a ld e, a
ld d, 0 ld d, 0

2
home/battle.asm
View File

@ -161,7 +161,7 @@ FarCopyRadioText::
BattleTextbox:: BattleTextbox::
; Open a textbox and print text at hl. ; Open a textbox and print text at hl.
push hl push hl
call SpeechTextbox call SpeechTextbox1bpp
call UpdateSprites call UpdateSprites
call ApplyTilemap call ApplyTilemap
pop hl pop hl

10
home/map.asm
View File

@ -1012,7 +1012,9 @@ MapTextbox::
rst Bankswitch rst Bankswitch
push hl push hl
call SpeechTextbox call ClearTextbox
lda_coord 17, 17
ldcoord_a 18, 17
call SafeUpdateSprites call SafeUpdateSprites
ld a, 1 ld a, 1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
@ -1900,7 +1902,6 @@ CloseSubmenu::
call ReloadTilesetAndPalettes call ReloadTilesetAndPalettes
call UpdateSprites call UpdateSprites
call Call_ExitMenu call Call_ExitMenu
call GSReloadPalettes
jr FinishExitMenu jr FinishExitMenu
ExitAllMenus:: ExitAllMenus::
@ -1908,7 +1909,6 @@ ExitAllMenus::
call Call_ExitMenu call Call_ExitMenu
call ReloadTilesetAndPalettes call ReloadTilesetAndPalettes
call UpdateSprites call UpdateSprites
call GSReloadPalettes
FinishExitMenu:: FinishExitMenu::
ld b, CGB_MAPPALS ld b, CGB_MAPPALS
call GetCGBLayout call GetCGBLayout
@ -1924,9 +1924,7 @@ ReturnToMapWithSpeechTextbox::
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ReloadTilesetAndPalettes call ReloadTilesetAndPalettes
hlcoord 0, 12 call SpeechTextbox1bpp
lb bc, 4, 18
call Textbox
ld hl, wVramState ld hl, wVramState
set 0, [hl] set 0, [hl]
call UpdateSprites call UpdateSprites

11
home/menu.asm
View File

@ -209,7 +209,12 @@ MenuBox::
call GetMenuBoxDims call GetMenuBoxDims
dec b dec b
dec c dec c
jp Textbox ld a, [wMenuBoxUse2bppFrame]
and a
jp z, Textbox1bpp
ld d, h
ld e, l
jp Textbox2bpp
GetMenuTextStartCoord:: GetMenuTextStartCoord::
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]
@ -329,7 +334,7 @@ MenuTextbox::
push hl push hl
call LoadMenuTextbox call LoadMenuTextbox
pop hl pop hl
jp PrintText jp PrintText1bpp
LoadMenuTextbox:: LoadMenuTextbox::
ld hl, .MenuHeader ld hl, .MenuHeader
@ -734,7 +739,7 @@ GetMenuDataPointerTableEntry::
add hl, de add hl, de
ret ret
ClearWindowData:: ClearMenuAndWindowData::
ld hl, wMenuMetadata ld hl, wMenuMetadata
call .ClearMenuData call .ClearMenuData
ld hl, wMenuHeader ld hl, wMenuHeader

3
home/palettes.asm
View File

@ -272,9 +272,6 @@ ClearVBank1::
ldh [rVBK], a ldh [rVBK], a
ret ret
GSReloadPalettes:: ; dummied out
ret
ReloadSpritesNoPalettes:: ReloadSpritesNoPalettes::
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af

6
home/print_text.asm
View File

@ -15,7 +15,7 @@ PrintLetterDelay::
; non-scrolling text? ; non-scrolling text?
ld a, [wTextboxFlags] ld a, [wTextboxFlags]
bit NO_TEXT_DELAY_F, a bit TEXT_DELAY_F, a
ret z ret z
push hl push hl
@ -102,14 +102,14 @@ PrintNum::
homecall _PrintNum homecall _PrintNum
ret ret
FarPrintText:: FarPrintText1bpp::
ldh [hTempBank], a ldh [hTempBank], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ldh a, [hTempBank] ldh a, [hTempBank]
rst Bankswitch rst Bankswitch
call PrintText call PrintText1bpp
pop af pop af
rst Bankswitch rst Bankswitch

2
home/scrolling_menu.asm
View File

@ -38,7 +38,7 @@ InitScrollingMenu::
push de push de
call Coord2Tile call Coord2Tile
pop bc pop bc
jp Textbox jp Textbox1bpp
JoyTextDelay_ForcehJoyDown:: JoyTextDelay_ForcehJoyDown::
call DelayFrame call DelayFrame

78
home/text.asm
View File

@ -40,7 +40,13 @@ ClearScreen::
call ByteFill call ByteFill
jr ClearTilemap jr ClearTilemap
Textbox:: SpeechTextbox1bpp::
; Standard 1bpp textbox.
hlcoord TEXTBOX_X, TEXTBOX_Y
ld b, TEXTBOX_INNERH
ld c, TEXTBOX_INNERW
Textbox1bpp::
; Draw a text box at hl with room for b lines of c characters each. ; Draw a text box at hl with room for b lines of c characters each.
; Places a border around the textbox, then switches the palette to the ; Places a border around the textbox, then switches the palette to the
; text black-and-white scheme. ; text black-and-white scheme.
@ -121,20 +127,18 @@ TextboxPalette::
jr nz, .col jr nz, .col
ret ret
SpeechTextbox:: SpeechTextbox2bpp::
; Standard textbox. ; Standard 2bpp textbox (with overworld frame).
hlcoord TEXTBOX_X, TEXTBOX_Y decoord TEXTBOX_X, TEXTBOX_Y
ld b, TEXTBOX_INNERH lb bc, 4, SCREEN_WIDTH - 2
ld c, TEXTBOX_INNERW
jp Textbox Textbox2bpp::
; decoord TEXTBOX_X, TEXTBOX_Y push bc
; lb bc, 4, SCREEN_WIDTH - 2 push de
; push bc farcall _OverworldTextbox
; push de pop hl
; farcall OverworldTextbox pop bc
; pop hl jp TextboxPalette
; pop bc
; jp TextboxPalette
RadioTerminator:: RadioTerminator::
ld hl, .stop ld hl, .stop
@ -143,29 +147,35 @@ RadioTerminator::
.stop: .stop:
text_end text_end
PrintText:: ClearTextbox:
call SetUpTextbox hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
jp ClearBox
PrintText1bpp::
push hl
call SpeechTextbox1bpp
jr _PrintText
PrintText2bpp::
push hl
call SpeechTextbox2bpp
_PrintText:
call UpdateSprites
call ApplyTilemap
pop hl
; fallthrough ; fallthrough
BuenaPrintText:: BuenaPrintText::
push hl push hl
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY call ClearTextbox
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
call ClearBox
pop hl pop hl
; fallthrough ; fallthrough
PrintTextboxText:: PrintTextboxText::
bccoord TEXTBOX_INNERX, TEXTBOX_INNERY bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
call PlaceHLTextAtBC call PrintHLTextAtBC
ret
SetUpTextbox::
push hl
call SpeechTextbox
call UpdateSprites
call ApplyTilemap
pop hl
ret ret
PlaceString:: PlaceString::
@ -415,9 +425,7 @@ Paragraph::
.linkbattle .linkbattle
call Text_WaitBGMap call Text_WaitBGMap
call PromptButton call PromptButton
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY call ClearTextbox
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
call ClearBox
call UnloadBlinkingCursor call UnloadBlinkingCursor
ld c, 20 ld c, 20
call DelayFrames call DelayFrames
@ -583,10 +591,10 @@ PokeFluteTerminator::
.stop: .stop:
text_end text_end
PlaceHLTextAtBC:: PrintHLTextAtBC::
ld a, [wTextboxFlags] ld a, [wTextboxFlags]
push af push af
set NO_TEXT_DELAY_F, a set TEXT_DELAY_F, a
ld [wTextboxFlags], a ld [wTextboxFlags], a
call DoTextUntilTerminator call DoTextUntilTerminator
@ -738,7 +746,7 @@ TextCommand_BOX::
push hl push hl
ld h, d ld h, d
ld l, e ld l, e
call Textbox call Textbox1bpp
pop hl pop hl
ret ret

2
home/trainers.asm
View File

@ -225,7 +225,7 @@ PrintWinLossText::
ld h, [hl] ld h, [hl]
ld l, a ld l, a
call GetMapScriptsBank call GetMapScriptsBank
call FarPrintText call FarPrintText1bpp
call WaitBGMap call WaitBGMap
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
ret ret

53
home/window.asm
View File

@ -1,13 +1,14 @@
RefreshScreen:: RefreshScreen::
call ClearWindowData call ClearMenuAndWindowData
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate) ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFont_NoOAMUpdate)
rst Bankswitch rst Bankswitch
call ReanchorBGMap_NoOAMUpdate call ReanchorBGMap_NoOAMUpdate
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call LoadFonts_NoOAMUpdate ld a, $90
ldh [hWY], a
pop af pop af
rst Bankswitch rst Bankswitch
@ -19,16 +20,7 @@ CloseText::
ld a, $1 ld a, $1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
call .CloseText call ClearMenuAndWindowData
pop af
ldh [hOAMUpdate], a
ld hl, wVramState
res 6, [hl]
ret
.CloseText:
call ClearWindowData
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call OverworldTextModeSwitch call OverworldTextModeSwitch
@ -41,20 +33,43 @@ CloseText::
call UpdatePlayerSprite call UpdatePlayerSprite
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadOverworldFontAndFrame
pop af
ldh [hOAMUpdate], a
ld hl, wVramState
res 6, [hl]
ret ret
OpenText:: OpenText2bpp::
call ClearWindowData call ClearMenuAndWindowData
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFonts_NoOAMUpdate) ld a, BANK(ReanchorBGMap_NoOAMUpdate)
rst Bankswitch
; assumes that the overworld 2bpp font and frame are loaded when calling this
call ReanchorBGMap_NoOAMUpdate ; clear bgmap
call SpeechTextbox2bpp
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
ld a, $90
ldh [hWY], a
pop af
rst Bankswitch
ret
OpenText1bpp::
call ClearMenuAndWindowData
ldh a, [hROMBank]
push af
ld a, BANK(ReanchorBGMap_NoOAMUpdate) ; aka BANK(LoadFont_NoOAMUpdate)
rst Bankswitch rst Bankswitch
call ReanchorBGMap_NoOAMUpdate ; clear bgmap call ReanchorBGMap_NoOAMUpdate ; clear bgmap
call SpeechTextbox call SpeechTextbox1bpp
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
call LoadFonts_NoOAMUpdate ; load font call LoadFont_NoOAMUpdate ; load 1bpp font and frame, hide window
pop af pop af
rst Bankswitch rst Bankswitch

56
maps/Level1_Map1.asm
View File

@ -3,6 +3,7 @@
const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_1
const PLAYERSHOUSE2F_DOLL_2 const PLAYERSHOUSE2F_DOLL_2
const PLAYERSHOUSE2F_BIG_DOLL const PLAYERSHOUSE2F_BIG_DOLL
const PLAYERSHOUSE2F_TRAINER
Level1_Map1_MapScripts: Level1_Map1_MapScripts:
def_scene_scripts def_scene_scripts
@ -10,16 +11,26 @@ Level1_Map1_MapScripts:
def_callbacks def_callbacks
PlayersHouseDoll1Script:: PlayersHouseDoll1Script::
describedecoration DECODESC_LEFT_DOLL opentext
pokemart MARTTYPE_STANDARD, MART_AZALEA
closetext
end
; describedecoration DECODESC_LEFT_DOLL
PlayersHouseDoll2Script: PlayersHouseDoll2Script:
describedecoration DECODESC_RIGHT_DOLL jumpstd PokecenterNurseScript
; describedecoration DECODESC_RIGHT_DOLL
PlayersHouseBigDollScript: PlayersHouseBigDollScript:
describedecoration DECODESC_BIG_DOLL jumpstd PCScript
; describedecoration DECODESC_BIG_DOLL
PlayersHouseGameConsoleScript: PlayersHouseGameConsoleScript:
describedecoration DECODESC_CONSOLE randomwildmon
startbattle
reloadmapafterbattle
end
; describedecoration DECODESC_CONSOLE
PlayersHousePosterScript: PlayersHousePosterScript:
describedecoration DECODESC_POSTER describedecoration DECODESC_POSTER
@ -67,10 +78,46 @@ PlayersRadioText4:
line "#MON CHANNEL…" line "#MON CHANNEL…"
done done
TrainerYoungsterMikey:
trainer YOUNGSTER, MIKEY, EVENT_DECO_BED_1, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
.Script:
endifjustbattled
opentext
writetext YoungsterMikeyAfterText
waitbutton
closetext
end
YoungsterMikeySeenText:
text "You're a #MON"
line "trainer, right?"
para "Then you have to"
line "battle!"
done
YoungsterMikeyBeatenText:
text "That's strange."
line "I won before."
done
YoungsterMikeyAfterText:
text "Becoming a good"
line "trainer is really"
cont "tough."
para "I'm going to bat-"
line "tle other people"
cont "to get better."
done
Level1_Map1_MapEvents: Level1_Map1_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 7, 0, LEVEL_1_MAP_1, 1
def_coord_events def_coord_events
@ -85,3 +132,4 @@ Level1_Map1_MapEvents:
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, -1 object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, -1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, -1 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, -1
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1 object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1
object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1

3
ram/wram.asm
View File

@ -1188,7 +1188,8 @@ wMenuCursorY:: db
wMenuCursorX:: db wMenuCursorX:: db
wCursorOffCharacter:: db wCursorOffCharacter:: db
wCursorCurrentTile:: dw wCursorCurrentTile:: dw
ds 3 wMenuBoxUse2bppFrame:: db
ds 2
wMoreMenuDataEnd:: wMoreMenuDataEnd::
wOverworldDelay:: db wOverworldDelay:: db