TextBox -> Textbox

Homogenizing names.
This commit is contained in:
mid-kid
2019-04-08 14:15:10 +02:00
parent 2184b60a0c
commit 3e78e5b2b6
115 changed files with 478 additions and 478 deletions

View File

@@ -37,7 +37,7 @@ TEXT_DELAY_FAST EQU %001 ; 1
TEXT_DELAY_MED EQU %011 ; 3 TEXT_DELAY_MED EQU %011 ; 3
TEXT_DELAY_SLOW EQU %101 ; 5 TEXT_DELAY_SLOW EQU %101 ; 5
; wTextBoxFrame:: ; cfce ; wTextboxFrame:: ; cfce
const_def const_def
const FRAME_1 ; 0 const FRAME_1 ; 0
const FRAME_2 ; 1 const FRAME_2 ; 1
@@ -49,7 +49,7 @@ TEXT_DELAY_SLOW EQU %101 ; 5
const FRAME_8 ; 7 const FRAME_8 ; 7
NUM_FRAMES EQU const_value NUM_FRAMES EQU const_value
; wTextBoxFlags:: ; cfcf ; wTextboxFlags:: ; cfcf
const_def const_def
const FAST_TEXT_DELAY_F ; 0 const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1 const NO_TEXT_DELAY_F ; 1

View File

@@ -3,9 +3,9 @@ DefaultOptions:
db TEXT_DELAY_MED db TEXT_DELAY_MED
; wSaveFileExists: no ; wSaveFileExists: no
db FALSE db FALSE
; wTextBoxFrame: frame 1 ; wTextboxFrame: frame 1
db FRAME_1 db FRAME_1
; wTextBoxFlags: use text speed ; wTextboxFlags: use text speed
db 1 << FAST_TEXT_DELAY_F db 1 << FAST_TEXT_DELAY_F
; wGBPrinter: normal brightness ; wGBPrinter: normal brightness
db GBPRINTER_NORMAL db GBPRINTER_NORMAL

View File

@@ -306,7 +306,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
... ...
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
call HitSelfInConfusion call HitSelfInConfusion
- call BattleCommand_DamageCalc - call BattleCommand_DamageCalc
@@ -319,7 +319,7 @@ Then edit four routines in [engine/battle/effect_commands.asm](https://github.co
```diff ```diff
HitConfusion: HitConfusion:
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextbox
xor a xor a
ld [wCriticalHit], a ld [wCriticalHit], a
@@ -412,7 +412,7 @@ Add this to the end of each file:
.force_struggle .force_struggle
ld hl, BattleText_MonHasNoMovesLeft ld hl, BattleText_MonHasNoMovesLeft
call StdBattleTextBox call StdBattleTextbox
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
xor a xor a

View File

@@ -12,7 +12,7 @@
## `ScrollingMenu` ## `ScrollingMenu`
This is the only menu that does scrolling. It doesn't draw any `TextBox` around the menu. This is the only menu that does scrolling. It doesn't draw any `Textbox` around the menu.
Structure: Structure:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@ BattleCommand_Attract:
; 'fell in love!' ; 'fell in love!'
ld hl, FellInLoveText ld hl, FellInLoveText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

View File

@@ -52,7 +52,7 @@ BattleCommand_BeatUp:
ld a, $1 ld a, $1
ld [wBeatUpHitAtLeastOnce], a ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
ld a, [wEnemyMonSpecies] ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a ld [wCurSpecies], a
@@ -159,12 +159,12 @@ BattleCommand_BeatUp:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
jp EnemyAttackDamage jp EnemyAttackDamage
.finish_beatup .finish_beatup
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextbox
ld a, [wBattleMonSpecies] ld a, [wBattleMonSpecies]
ld [wCurSpecies], a ld [wCurSpecies], a

View File

@@ -27,7 +27,7 @@ BattleCommand_BellyDrum:
jr nz, .max_attack_loop jr nz, .max_attack_loop
ld hl, BellyDrumText ld hl, BellyDrumText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove

View File

@@ -20,7 +20,7 @@ BattleCommand_StoreEnergy:
res SUBSTATUS_BIDE, [hl] res SUBSTATUS_BIDE, [hl]
ld hl, UnleashedEnergyText ld hl, UnleashedEnergyText
call StdBattleTextBox call StdBattleTextbox
ld a, BATTLE_VARS_MOVE_POWER ld a, BATTLE_VARS_MOVE_POWER
call GetBattleVarAddr call GetBattleVarAddr
@@ -66,7 +66,7 @@ BattleCommand_StoreEnergy:
.still_storing .still_storing
ld hl, StoringEnergyText ld hl, StoringEnergyText
call StdBattleTextBox call StdBattleTextbox
jp EndMoveEffect jp EndMoveEffect
BattleCommand_UnleashEnergy: BattleCommand_UnleashEnergy:

View File

@@ -93,4 +93,4 @@ BattleCommand_Conversion:
farcall GetTypeName farcall GetTypeName
call AnimateCurrentMove call AnimateCurrentMove
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextbox

View File

@@ -58,7 +58,7 @@ BattleCommand_Conversion2:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
predef GetTypeName predef GetTypeName
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

View File

@@ -76,7 +76,7 @@ BattleCommand_Curse:
call CallBattleCore call CallBattleCore
call UpdateUserInParty call UpdateUserInParty
ld hl, PutACurseText ld hl, PutACurseText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
call AnimateFailedMove call AnimateFailedMove
@@ -90,4 +90,4 @@ BattleCommand_Curse:
call GetStatName call GetStatName
call AnimateFailedMove call AnimateFailedMove
ld hl, WontRiseAnymoreText ld hl, WontRiseAnymoreText
jp StdBattleTextBox jp StdBattleTextbox

View File

@@ -6,4 +6,4 @@ BattleCommand_DestinyBond:
set SUBSTATUS_DESTINY_BOND, [hl] set SUBSTATUS_DESTINY_BOND, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, DestinyBondEffectText ld hl, DestinyBondEffectText
jp StdBattleTextBox jp StdBattleTextbox

View File

@@ -66,7 +66,7 @@ BattleCommand_Disable:
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetMoveName call GetMoveName
ld hl, WasDisabledText ld hl, WasDisabledText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

View File

@@ -114,7 +114,7 @@ BattleCommand_Encore:
.finish_move .finish_move
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GotAnEncoreText ld hl, GotAnEncoreText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp PrintDidntAffect2 jp PrintDidntAffect2

View File

@@ -13,4 +13,4 @@ BattleCommand_Endure:
call AnimateCurrentMove call AnimateCurrentMove
ld hl, BracedItselfText ld hl, BracedItselfText
jp StdBattleTextBox jp StdBattleTextbox

View File

@@ -8,7 +8,7 @@ BattleCommand_FocusEnergy:
set SUBSTATUS_FOCUS_ENERGY, [hl] set SUBSTATUS_FOCUS_ENERGY, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GettingPumpedText ld hl, GettingPumpedText
jp StdBattleTextBox jp StdBattleTextbox
.already_pumped .already_pumped
call AnimateFailedMove call AnimateFailedMove

View File

@@ -16,7 +16,7 @@ BattleCommand_Foresight:
set SUBSTATUS_IDENTIFIED, [hl] set SUBSTATUS_IDENTIFIED, [hl]
call AnimateCurrentMove call AnimateCurrentMove
ld hl, IdentifiedText ld hl, IdentifiedText
jp StdBattleTextBox jp StdBattleTextbox
.failed .failed
jp FailMove jp FailMove

View File

@@ -54,7 +54,7 @@ BattleCommand_FutureSight:
call BattleCommand_LowerSub call BattleCommand_LowerSub
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, ForesawAttackText ld hl, ForesawAttackText
call StdBattleTextBox call StdBattleTextbox
call BattleCommand_RaiseSub call BattleCommand_RaiseSub
ld de, wPlayerFutureSightDamage ld de, wPlayerFutureSightDamage
ldh a, [hBattleTurn] ldh a, [hBattleTurn]

Some files were not shown because too many files have changed in this diff Show More