diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-04-08 14:15:10 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-04-09 16:09:18 +0200 |
| commit | 3e78e5b2b604568b13a37e4603dbd798373b9805 (patch) | |
| tree | 3485a00674f17a929aa21e8e9bc0bb5b1d36554f /engine/pokemon | |
| parent | 2184b60a0cb5e3d1c2b64f7787f3fc0da5efbcab (diff) | |
TextBox -> Textbox
Homogenizing names.
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 24 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/evolve.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/learn.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/mail.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 46 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 10 |
8 files changed, 53 insertions, 53 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 8127c8ff5..d7138646e 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -963,7 +963,7 @@ BillsPC_PlaceString: push de hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString @@ -980,7 +980,7 @@ BillsPC_MoveMonWOMail_BoxNameAndArrows: BillsPC_BoxName: hlcoord 8, 0 lb bc, 1, 10 - call TextBox + call Textbox ld a, [wBillsPC_LoadedBox] and a @@ -1219,7 +1219,7 @@ BillsPC_LoadMonStats: BillsPC_RefreshTextboxes: hlcoord 8, 2 lb bc, 10, 10 - call TextBox + call Textbox hlcoord 8, 2 ld [hl], "└" @@ -1790,7 +1790,7 @@ DepositPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Stored @@ -1845,7 +1845,7 @@ TryWithdrawPokemon: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap hlcoord 1, 16 ld de, PCString_Got @@ -1881,7 +1881,7 @@ ReleasePKMN_ByePKMN: call ClearBox hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox call WaitBGMap ld a, [wCurPartySpecies] @@ -1902,7 +1902,7 @@ ReleasePKMN_ByePKMN: call DelayFrames hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, PCString_Bye call PlaceString @@ -1925,7 +1925,7 @@ MovePKMNWitoutMail_InsertMon: push af hlcoord 0, 15 lb bc, 1, 18 - call TextBox + call Textbox hlcoord 1, 16 ld de, .Saving_LeaveOn call PlaceString @@ -2241,7 +2241,7 @@ _ChangeBox: ld [wMenuScrollPosition], a hlcoord 0, 4 lb bc, 8, 9 - call TextBox + call Textbox call ScrollingMenu ld a, [wMenuJoypad] cp B_BUTTON @@ -2306,7 +2306,7 @@ GetBoxName: BillsPC_PrintBoxCountAndCapacity: hlcoord 11, 7 lb bc, 5, 7 - call TextBox + call Textbox ld a, [wMenuSelection] cp -1 ret z @@ -2394,7 +2394,7 @@ BillsPC_PrintBoxName: hlcoord 0, 0 ld b, 2 ld c, 18 - call TextBox + call Textbox hlcoord 1, 2 ld de, .Current call PlaceString @@ -2522,7 +2522,7 @@ BillsPC_PlaceChangeBoxString: push de hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox pop de hlcoord 1, 16 call PlaceString diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index a213bc79a..700c59d35 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -10,7 +10,7 @@ _BillsPC: and a ret nz ld hl, .Text_GottaHavePokemon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -153,13 +153,13 @@ Unreferenced_Functione512: .no_mon ld hl, .Text_NoMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret .only_one_mon ld hl, .Text_ItsYourLastMon - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -220,7 +220,7 @@ Unreferenced_Functione56d: .asm_e576 ld hl, UnknownText_0xe57e - call MenuTextBoxBackup + call MenuTextboxBackup scf ret @@ -246,10 +246,10 @@ ClearPCItemScreen: call ByteFill hlcoord 0, 0 lb bc, 10, 18 - call TextBox + call Textbox hlcoord 0, 12 lb bc, 4, 18 - call TextBox + call Textbox call WaitBGMap2 call SetPalettes ; load regular palettes? ret diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 9b6dd4cb5..0ee10eac8 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -241,7 +241,7 @@ EvolveAfterBattle_MasterLoop: push hl ld hl, Text_EvolvedIntoPKMN - call PrintTextBoxText + call PrintTextboxText farcall StubbedTrainerRankings_MonsEvolved ld de, MUSIC_NONE diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 55e673ecc..d73dd7094 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -139,7 +139,7 @@ ForgetMove: hlcoord 5, 2 ld b, NUM_MOVES * 2 ld c, MOVE_NAME_LENGTH - call TextBox + call Textbox hlcoord 5 + 2, 2 + 2 ld a, SCREEN_WIDTH * 2 ld [wBuffer1], a diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 91026d2a2..04c9a98e2 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -307,7 +307,7 @@ _PlayerMailBoxMenu: .nomail ld hl, .EmptyMailboxText - jp MenuTextBoxBackup + jp MenuTextboxBackup .EmptyMailboxText: text_far _EmptyMailboxText @@ -429,7 +429,7 @@ MailboxPC: .PutInPack: ld hl, .MessageLostText - call MenuTextBox + call MenuTextbox call YesNoBox call ExitMenu ret c @@ -442,7 +442,7 @@ MailboxPC: call ReceiveItem jr c, .put_in_bag ld hl, .PackFullText - jp MenuTextBoxBackup + jp MenuTextboxBackup .put_in_bag ld a, [wMenuSelection] @@ -450,7 +450,7 @@ MailboxPC: ld b, a call DeleteMailFromPC ld hl, .PutAwayText - jp MenuTextBoxBackup + jp MenuTextboxBackup .PutAwayText: text_far ClearedMailPutAwayText diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 0d71412b6..19fecff19 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -30,7 +30,7 @@ TossItemFromPC: and a jr nz, .key_item ld hl, .TossHowMany - call MenuTextBox + call MenuTextbox farcall SelectQuantityToToss push af call CloseWindow @@ -38,7 +38,7 @@ TossItemFromPC: pop af jr c, .quit ld hl, .ConfirmToss - call MenuTextBox + call MenuTextbox call YesNoBox push af call ExitMenu @@ -49,7 +49,7 @@ TossItemFromPC: call TossItem call PartyMonItemName ld hl, .TossedThisMany - call MenuTextBox + call MenuTextbox call ExitMenu and a ret @@ -78,7 +78,7 @@ TossItemFromPC: .CantToss: ld hl, .TooImportantToToss - call MenuTextBoxBackup + call MenuTextboxBackup ret .TooImportantToToss: @@ -88,7 +88,7 @@ TossItemFromPC: CantUseItem: ld hl, CantUseItemText - call MenuTextBoxWaitButton + call MenuTextboxWaitButton ret CantUseItemText: @@ -265,14 +265,14 @@ GiveTakePartyMonItem: .next ld hl, CantBeHeldText - call MenuTextBoxBackup + call MenuTextboxBackup jr .loop .quit ret TryGiveItemToPartymon: - call SpeechTextBox + call SpeechTextbox call PartyMonItemName call GetPartyItemLocation ld a, [hl] @@ -290,13 +290,13 @@ TryGiveItemToPartymon: .give_item_to_mon call GiveItemToPokemon ld hl, MadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup call GivePartyItem ret .please_remove_mail ld hl, PleaseRemoveMailText - call MenuTextBoxBackup + call MenuTextboxBackup ret .already_holding_item @@ -317,7 +317,7 @@ TryGiveItemToPartymon: jr nc, .bag_full ld hl, TookAndMadeHoldText - call MenuTextBoxBackup + call MenuTextboxBackup ld a, [wNamedObjectIndexBuffer] ld [wCurItem], a call GivePartyItem @@ -328,7 +328,7 @@ TryGiveItemToPartymon: ld [wCurItem], a call ReceiveItemFromPokemon ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .abort ret @@ -346,7 +346,7 @@ GivePartyItem: ret TakePartyItem: - call SpeechTextBox + call SpeechTextbox call GetPartyItemLocation ld a, [hl] and a @@ -363,17 +363,17 @@ TakePartyItem: ld [hl], NO_ITEM call GetItemName ld hl, TookFromText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c8c ld hl, IsntHoldingAnythingText - call MenuTextBoxBackup + call MenuTextboxBackup jr .asm_12c9a .asm_12c94 ld hl, ItemStorageIsFullText - call MenuTextBoxBackup + call MenuTextboxBackup .asm_12c9a ret @@ -442,7 +442,7 @@ GiveItemToPokemon: jp TossItem StartMenuYesNo: - call MenuTextBox + call MenuTextbox call YesNoBox jp ExitMenu @@ -514,12 +514,12 @@ MonMailAction: farcall SendMailToPC jr c, .MailboxFull ld hl, .sentmailtopctext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .MailboxFull: ld hl, .mailboxfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .RemoveMailToBag: @@ -535,12 +535,12 @@ MonMailAction: ld [hl], $0 call GetCurNick ld hl, .tookmailfrommontext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .BagIsFull: ld hl, .bagfulltext - call MenuTextBoxBackup + call MenuTextboxBackup jr .done .done @@ -1118,11 +1118,11 @@ SetUpMoveScreenBG: hlcoord 0, 1 ld b, 9 ld c, 18 - call TextBox + call Textbox hlcoord 0, 11 ld b, 5 ld c, 18 - call TextBox + call Textbox hlcoord 2, 0 lb bc, 2, 3 call ClearBox @@ -1169,7 +1169,7 @@ SetUpMoveList: hlcoord 0, 11 ld b, 5 ld c, 18 - jp TextBox + jp Textbox PrepareToPlaceMoveData: ld hl, wPartyMon1Moves diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 617039db8..43e7af7cb 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -712,7 +712,7 @@ PartyMenuSelect: PrintPartyMenuText: hlcoord 0, 14 lb bc, 2, 18 - call TextBox + call Textbox ld a, [wPartyCount] and a jr nz, .haspokemon diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 84af2bf49..1d8d7da77 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -843,7 +843,7 @@ StatsScreen_PlaceFrontpic: ld a, [wCurPartySpecies] call IsAPokemon ret c - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic hlcoord 0, 0 @@ -919,7 +919,7 @@ StatsScreen_GetAnimationParam: xor a ret -StatsScreen_LoadTextBoxSpaceGFX: +StatsScreen_LoadTextboxSpaceGFX: nop push hl push de @@ -930,8 +930,8 @@ StatsScreen_LoadTextBoxSpaceGFX: push af ld a, $1 ldh [rVBK], a - ld de, TextBoxSpaceGFX - lb bc, BANK(TextBoxSpaceGFX), 1 + ld de, TextboxSpaceGFX + lb bc, BANK(TextboxSpaceGFX), 1 ld hl, vTiles2 tile " " call Get2bpp pop af @@ -1042,7 +1042,7 @@ StatsScreen_AnimateEgg: push de ld a, $1 ld [wBoxAlignment], a - call StatsScreen_LoadTextBoxSpaceGFX + call StatsScreen_LoadTextboxSpaceGFX ld de, vTiles2 tile $00 predef GetAnimatedFrontpic pop de |
