diff options
Diffstat (limited to 'home')
-rw-r--r-- | home/battle.asm | 10 | ||||
-rw-r--r-- | home/map.asm | 6 | ||||
-rw-r--r-- | home/menu.asm | 14 | ||||
-rw-r--r-- | home/menu_window.asm | 2 | ||||
-rw-r--r-- | home/mobile.asm | 4 | ||||
-rw-r--r-- | home/print_text.asm | 8 | ||||
-rw-r--r-- | home/scrolling_menu.asm | 2 | ||||
-rw-r--r-- | home/text.asm | 30 | ||||
-rw-r--r-- | home/window.asm | 2 |
9 files changed, 39 insertions, 39 deletions
diff --git a/home/battle.asm b/home/battle.asm index 37c2e7b1c..7f2e8bfdd 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -155,18 +155,18 @@ MobileTextBorder:: ld [hl], $5f ; bottom ret -BattleTextBox:: +BattleTextbox:: ; Open a textbox and print text at hl. push hl - call SpeechTextBox + call SpeechTextbox call MobileTextBorder call UpdateSprites call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText ret -StdBattleTextBox:: +StdBattleTextbox:: ; Open a textbox and print battle text at 20:hl. ldh a, [hROMBank] @@ -175,7 +175,7 @@ StdBattleTextBox:: ld a, BANK(BattleText) rst Bankswitch - call BattleTextBox + call BattleTextbox pop af rst Bankswitch diff --git a/home/map.asm b/home/map.asm index 391500eb2..b85599de8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1025,13 +1025,13 @@ MapTextbox:: rst Bankswitch push hl - call SpeechTextBox + call SpeechTextbox call SafeUpdateSprites ld a, 1 ldh [hOAMUpdate], a call ApplyTilemap pop hl - call PrintTextBoxText + call PrintTextboxText xor a ldh [hOAMUpdate], a @@ -1932,7 +1932,7 @@ ReturnToMapWithSpeechTextbox:: call ReloadTilesetAndPalettes hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox ld hl, wVramState set 0, [hl] call UpdateSprites diff --git a/home/menu.asm b/home/menu.asm index 5060a915a..4debb11ad 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -17,16 +17,16 @@ StoreTo_wMenuCursorBuffer:: ld [wMenuCursorBuffer], a ret -MenuTextBox:: +MenuTextbox:: push hl - call LoadMenuTextBox + call LoadMenuTextbox pop hl jp PrintText ; unused ret -LoadMenuTextBox:: +LoadMenuTextbox:: ld hl, .MenuHeader call LoadMenuHeader ret @@ -37,8 +37,8 @@ LoadMenuTextBox:: dw vTiles0 db 0 ; default option -MenuTextBoxBackup:: - call MenuTextBox +MenuTextboxBackup:: + call MenuTextbox call CloseWindow ret @@ -498,8 +498,8 @@ PlayClickSFX:: pop de ret -MenuTextBoxWaitButton:: - call MenuTextBox +MenuTextboxWaitButton:: + call MenuTextbox call WaitButton call ExitMenu ret diff --git a/home/menu_window.asm b/home/menu_window.asm index 7c511097d..b72677702 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -144,7 +144,7 @@ MenuBox:: call GetMenuBoxDims dec b dec c - jp TextBox + jp Textbox GetMenuTextStartCoord:: ld a, [wMenuBorderTopCoord] diff --git a/home/mobile.asm b/home/mobile.asm index e87cdcab4..727518b84 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -159,7 +159,7 @@ Unreferenced_Function3efd:: ld c, 18 call .fill_attr pop hl - call PrintTextBoxText + call PrintTextboxText ret .fill_attr @@ -174,7 +174,7 @@ Unreferenced_Function3efd:: call Function3f35 pop bc pop hl - call TextBoxBorder + call TextboxBorder ret Function3f20:: diff --git a/home/print_text.asm b/home/print_text.asm index 98f50c7c1..b7f76ce64 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -6,15 +6,15 @@ PrintLetterDelay:: ; mid: 3 frames ; slow: 5 frames -; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay. -; wOptions[4] and wTextBoxFlags[!1] disable the delay. +; wTextboxFlags[!0] and A or B override text speed with a one-frame delay. +; wOptions[4] and wTextboxFlags[!1] disable the delay. ld a, [wOptions] bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit NO_TEXT_DELAY_F, a ret z @@ -31,7 +31,7 @@ PrintLetterDelay:: ld [hl], a ; force fast scroll? - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] bit FAST_TEXT_DELAY_F, a jr z, .fast diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 076b43156..cde0e0212 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -38,7 +38,7 @@ InitScrollingMenu:: push de call Coord2Tile pop bc - jp TextBox + jp Textbox JoyTextDelay_ForcehJoyDown:: call DelayFrame diff --git a/home/text.asm b/home/text.asm index 6f6ac95de..af6f9a8f4 100644 --- a/home/text.asm +++ b/home/text.asm @@ -40,18 +40,18 @@ ClearScreen:: call ByteFill jr ClearTileMap -TextBox:: +Textbox:: ; 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 ; text black-and-white scheme. push bc push hl - call TextBoxBorder + call TextboxBorder pop hl pop bc - jr TextBoxPalette + jr TextboxPalette -TextBoxBorder:: +TextboxBorder:: ; Top push hl ld a, "┌" @@ -97,7 +97,7 @@ TextBoxBorder:: jr nz, .loop ret -TextBoxPalette:: +TextboxPalette:: ; Fill text box width c height b at hl with pal 7 ld de, wAttrMap - wTileMap add hl, de @@ -121,12 +121,12 @@ TextBoxPalette:: jr nz, .col ret -SpeechTextBox:: +SpeechTextbox:: ; Standard textbox. hlcoord TEXTBOX_X, TEXTBOX_Y ld b, TEXTBOX_INNERH ld c, TEXTBOX_INNERW - jp TextBox + jp Textbox TestText:: text "ゲームフりーク!" @@ -140,7 +140,7 @@ RadioTerminator:: text_end PrintText:: - call SetUpTextBox + call SetUpTextbox BuenaPrintText:: push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY @@ -148,14 +148,14 @@ BuenaPrintText:: call ClearBox pop hl -PrintTextBoxText:: +PrintTextboxText:: bccoord TEXTBOX_INNERX, TEXTBOX_INNERY call PlaceHLTextAtBC ret -SetUpTextBox:: +SetUpTextbox:: push hl - call SpeechTextBox + call SpeechTextbox call UpdateSprites call ApplyTilemap pop hl @@ -648,15 +648,15 @@ PokeFluteTerminatorCharacter:: text_end PlaceHLTextAtBC:: - ld a, [wTextBoxFlags] + ld a, [wTextboxFlags] push af set NO_TEXT_DELAY_F, a - ld [wTextBoxFlags], a + ld [wTextboxFlags], a call DoTextUntilTerminator pop af - ld [wTextBoxFlags], a + ld [wTextboxFlags], a ret DoTextUntilTerminator:: @@ -822,7 +822,7 @@ TextCommand_BOX:: push hl ld h, d ld l, e - call TextBox + call Textbox pop hl ret diff --git a/home/window.asm b/home/window.asm index 16564af47..be249e845 100644 --- a/home/window.asm +++ b/home/window.asm @@ -51,7 +51,7 @@ OpenText:: rst Bankswitch call ReanchorBGMap_NoOAMUpdate ; clear bgmap - call SpeechTextBox + call SpeechTextbox call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap call LoadFonts_NoOAMUpdate ; load font pop af |