pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07: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
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/pokegear/pokegear.asm
View File

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

12
engine/pokegear/radio.asm
View File

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