diff options
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/battle/core.asm | 16 | ||||
-rwxr-xr-x | engine/evos_moves.asm | 6 | ||||
-rwxr-xr-x | engine/give_pokemon.asm | 2 | ||||
-rwxr-xr-x | engine/items/items.asm | 16 | ||||
-rwxr-xr-x | engine/menu/naming_screen.asm | 14 | ||||
-rwxr-xr-x | engine/menu/start_sub_menus.asm | 2 | ||||
-rwxr-xr-x | engine/oak_speech2.asm | 4 | ||||
-rwxr-xr-x | engine/overworld/cinnabar_lab.asm | 2 | ||||
-rwxr-xr-x | engine/overworld/pokemart.asm | 2 | ||||
-rwxr-xr-x | engine/slot_machine.asm | 2 | ||||
-rwxr-xr-x | engine/trade.asm | 2 | ||||
-rwxr-xr-x | engine/trade2.asm | 2 |
12 files changed, 35 insertions, 35 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9f553075..8c3a9c8f 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2324,7 +2324,7 @@ UseBagItem: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name + call CopyStringToCF50 ; copy name xor a ld [wPseudoItemID], a call UseItem @@ -3629,7 +3629,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854) ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove @@ -3831,7 +3831,7 @@ PrintMoveName: ; 3db48 (f:5b48) ret _PrintMoveName: ; 3db4c (f:5b4c) - TX_FAR _CF4BText + TX_FAR _CF50Text TX_ASM ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num @@ -5214,7 +5214,7 @@ ReloadMoveData: ; 3e329 (f:6329) call IncrementMovePP ; the follow two function calls are used to reload the move name call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 ld a,$01 and a ret @@ -5715,7 +5715,7 @@ EnemyCanExecuteChargingMove: ; 3e70b (f:670b) ld [wNameListType], a call GetName ld de, wcd6d - call CopyStringToCF4B + call CopyStringToCF50 EnemyCanExecuteMove: ; 3e72b (f:672b) xor a ld [wMonIsDisobedient], a @@ -6152,7 +6152,7 @@ CheckEnemyStatusConditions: ; 3e88f (f:688f) ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove @@ -6194,7 +6194,7 @@ GetCurrentMove: ; 3eabe (f:6abe) ld [wNameListType], a call GetName ld de, wcd6d - jp CopyStringToCF4B + jp CopyStringToCF50 LoadEnemyMonData: ; 3eb01 (f:6b01) ld a, [wLinkState] @@ -7955,7 +7955,7 @@ PrintStatText: ; 3f688 (f:7688) jr z, .asm_3f68d jr .asm_3f690 .asm_3f696 - ld de, wcf4b + ld de, wcf50 ld bc, $a jp CopyData diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2113e50a..6a8925ae 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -114,7 +114,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - call CopyStringToCF4B + call CopyStringToCF50 ld hl, IsEvolvingText call PrintText ld c, 50 @@ -268,7 +268,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7) pop af ld [wd0b5], a ld hl, wcd6d - ld de, wcf4b + ld de, wcf50 .compareNamesLoop ld a, [de] inc de @@ -368,7 +368,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ld [wMoveNum], a ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 predef LearnMove .done ld a, [wcf91] diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 33e7b426..ba74c08d 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -18,7 +18,7 @@ _GivePokemon: ; 4fda5 (13:7da5) callab LoadEnemyMonData call SetPokedexOwnedFlag callab SendNewMonToBox - ld hl, wcf4b + ld hl, wcf50 ld a, [wCurrentBoxNum] and $7f cp 9 diff --git a/engine/items/items.asm b/engine/items/items.asm index 4d8ac893..09adc1d8 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1304,9 +1304,9 @@ ItemUseMedicine: ; dabb (3:5abb) jr nz,.statNameInnerLoop jr .statNameLoop .gotStatName - ld de,wcf4b + ld de,wcf50 ld bc,10 - call CopyData ; copy the stat's name to wcf4b + call CopyData ; copy the stat's name to wcf50 ld a,SFX_HEAL_AILMENT call PlaySound ld hl,VitaminStatRoseText @@ -2033,7 +2033,7 @@ ItemUsePPRestore: ; e31e (3:631e) ld a,[hl] ld [wd11e],a call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 pop hl ld a,[wPPRestoreItem] cp a,ETHER @@ -2210,7 +2210,7 @@ ItemUseTMHM: ; e479 (3:6479) ld a,[wd11e] ld [wMoveNum],a call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 pop af ld hl,BootedUpTMText jr nc,.printBootedUpMachineText @@ -2236,7 +2236,7 @@ ItemUseTMHM: ; e479 (3:6479) ld a,[wcf91] push af .chooseMon - ld hl,wcf4b + ld hl,wcf50 ld de,wTempMoveNameBuffer ld bc,14 call CopyData ; save the move name because DisplayPartyMenu will overwrite it @@ -2247,7 +2247,7 @@ ItemUseTMHM: ; e479 (3:6479) call DisplayPartyMenu push af ld hl,wTempMoveNameBuffer - ld de,wcf4b + ld de,wcf50 ld bc,14 call CopyData pop af @@ -2602,7 +2602,7 @@ TossItem_: ; e6f1 (3:66f1) ld a,[wcf91] ld [wd11e],a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 ld hl,IsItOKToTossItemText call PrintText coord hl, 14, 7 @@ -2622,7 +2622,7 @@ TossItem_: ; e6f1 (3:66f1) ld a,[wcf91] ld [wd11e],a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 ld hl,ThrewAwayItemText call PrintText pop hl diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 3e0e49c5..4597b794 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -39,7 +39,7 @@ AskName: ; 64eb (1:64eb) pop hl pop af ld [wUpdateSpritesEnabled], a - ld a, [wcf4b] + ld a, [wcf50] cp $50 ret nz .declinedNickname @@ -63,7 +63,7 @@ DisplayNameRaterScreen: ; 655c (1:655c) call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks @@ -109,7 +109,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, 7 ld [wMaxMenuItem], a ld a, $50 - ld [wcf4b], a + ld [wcf50], a xor a ld hl, wNamingScreenSubmitName ld [hli], a @@ -157,7 +157,7 @@ DisplayNamingScreen: ; 6596 (1:6596) .submitNickname pop de - ld hl, wcf4b + ld hl, wcf50 ld bc, NAME_LENGTH call CopyData call GBPalWhiteOutWithDelay3 @@ -382,7 +382,7 @@ PrintNicknameAndUnderscores: ; 68b1 (1:68b1) lb bc, 1, 10 call ClearScreenArea coord hl, 10, 2 - ld de, wcf4b + ld de, wcf50 call PlaceString coord hl, 10, 3 ld a, [wNamingScreenType] @@ -458,9 +458,9 @@ Handakutens: ; 68d6 (1:68d6) db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db $ff -; calculates the length of the string at wcf4b and stores it in c +; calculates the length of the string at wcf50 and stores it in c CalcStringLength: ; 68eb (1:68eb) - ld hl, wcf4b + ld hl, wcf50 ld c, $0 .loop ld a, [hl] diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 12b1441f..435d3356 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -367,7 +367,7 @@ StartMenu_Item: ; 13302 (4:7302) ld a,[wcf91] ld [wd11e],a call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 ld a,[wcf91] cp a,BICYCLE jr nz,.notBicycle2 diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 88670a16..c1f53eb9 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -15,7 +15,7 @@ ChoosePlayerName: ; 695d (1:695d) xor a ; NAME_PLAYER_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .customName call ClearScreen @@ -48,7 +48,7 @@ ChooseRivalName: ; 69a4 (1:69a4) ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .customName call ClearScreen diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index f7c5e326..c83add51 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -116,7 +116,7 @@ LoadFossilItemAndMonName: ; 610eb (18:50eb) ld a, [wFossilMon] ld [wd11e], a call GetMonName - call CopyStringToCF4B + call CopyStringToCF50 ld a, [wFossilItem] ld [wd11e], a call GetItemName diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index ae96c4a9..725bd6a4 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -159,7 +159,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld a,[wcf91] ; item ID ld [wd11e],a ; store item ID for GetItemName call GetItemName - call CopyStringToCF4B ; copy name to wcf4b + call CopyStringToCF50 ; copy name to wcf50 ld hl,PokemartTellBuyPriceText call PrintText coord hl, 14, 7 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index eb1cf3c3..1a6c4824 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -445,7 +445,7 @@ SlotMachine_CheckForMatches: ; 37588 (d:7588) ld a, [hli] ld h, [hl] ld l, a - ld de, wcf4b + ld de, wcf50 ld bc, 4 call CopyData pop hl diff --git a/engine/trade.asm b/engine/trade.asm index 1642e729..0092fd17 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1) ld [wd11e], a call GetMonName ld hl, wcd6d - ld de, wcf4b + ld de, wcf50 ld bc, NAME_LENGTH call CopyData ld a, [wTradedEnemyMonSpecies] diff --git a/engine/trade2.asm b/engine/trade2.asm index 10bef792..9c6cd76e 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) lb bc, LEADING_ZEROES | 1, 3 call PrintNumber coord hl, 5, 2 - ld de,wcf4b + ld de,wcf50 call PlaceString coord hl, 8, 4 ld de,wTradedPlayerMonOT |