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 | 32 | ||||
| -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, 37 insertions, 51 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d444664c..6ed7a9cb 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2326,7 +2326,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 @@ -3632,7 +3632,7 @@ CheckPlayerStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove @@ -3834,7 +3834,7 @@ PrintMoveName: ret _PrintMoveName: - TX_FAR _CF4BText + TX_FAR _CF50Text TX_ASM ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num @@ -5216,7 +5216,7 @@ ReloadMoveData: 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 @@ -5717,7 +5717,7 @@ EnemyCanExecuteChargingMove: ld [wNameListType], a call GetName ld de, wcd6d - call CopyStringToCF4B + call CopyStringToCF50 EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a @@ -6154,7 +6154,7 @@ CheckEnemyStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyStringToCF50 xor a ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove @@ -6196,7 +6196,7 @@ GetCurrentMove: ld [wNameListType], a call GetName ld de, wcd6d - jp CopyStringToCF4B + jp CopyStringToCF50 LoadEnemyMonData: ld a, [wLinkState] @@ -7958,7 +7958,7 @@ PrintStatText: jr z, .findStatName_outer jr .findStatName_inner .foundStatName - ld de, wcf4b + ld de, wcf50 ld bc, $a jp CopyData diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index f50f8081..dc7d5668 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: 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: 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 49596782..d3c41885 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -18,7 +18,7 @@ _GivePokemon: 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 be5a4b2e..643fb524 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1306,9 +1306,9 @@ ItemUseMedicine: 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 @@ -2035,7 +2035,7 @@ ItemUsePPRestore: 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 @@ -2212,7 +2212,7 @@ ItemUseTMHM: 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 @@ -2238,7 +2238,7 @@ ItemUseTMHM: 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 @@ -2249,7 +2249,7 @@ ItemUseTMHM: call DisplayPartyMenu push af ld hl,wTempMoveNameBuffer - ld de,wcf4b + ld de,wcf50 ld bc,14 call CopyData pop af @@ -2604,7 +2604,7 @@ TossItem_: 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 @@ -2624,7 +2624,7 @@ TossItem_: 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 23cef72d..7835be97 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -39,7 +39,7 @@ AskName: pop hl pop af ld [wUpdateSpritesEnabled], a - ld a, [wcf4b] + ld a, [wcf50] cp "@" ret nz .declinedNickname @@ -63,7 +63,7 @@ DisplayNameRaterScreen: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal - ld a, [wcf4b] + ld a, [wcf50] cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks @@ -109,7 +109,7 @@ DisplayNamingScreen: ld a, 7 ld [wMaxMenuItem], a ld a, "@" - ld [wcf4b], a + ld [wcf50], a xor a ld hl, wNamingScreenSubmitName ld [hli], a @@ -157,7 +157,7 @@ DisplayNamingScreen: .submitNickname pop de - ld hl, wcf4b + ld hl, wcf50 ld bc, NAME_LENGTH call CopyData call GBPalWhiteOutWithDelay3 @@ -368,23 +368,13 @@ PrintAlphabet: ld [H_AUTOBGTRANSFERENABLED], a jp Delay3 -<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" + db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥MAJUSCULES@" UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" + db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥minuscules@" PrintNicknameAndUnderscores: -======= -LowerCaseAlphabet: ; 6841 (1:6841) - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥MAJUSCULES@" - -UpperCaseAlphabet: ; 6879 (1:6879) - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥minuscules@" - -PrintNicknameAndUnderscores: ; 68b1 (1:68b1) ->>>>>>> Initial decompilation of FR Red call CalcStringLength ld a, c ld [wNamingScreenNameLength], a @@ -392,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] @@ -468,9 +458,9 @@ Handakutens: 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: - ld hl, wcf4b + ld hl, wcf50 ld c, $0 .loop ld a, [hl] @@ -480,11 +470,7 @@ CalcStringLength: inc c jr .loop -<<<<<<< 25c27785aa83a12330ea58e1e35b2fec90dd84f4 PrintNamingText: -======= -PrintNamingText: ; 699b (1:699b) ->>>>>>> Initial decompilation of FR Red coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index c7d71b24..dd7f8083 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -367,7 +367,7 @@ StartMenu_Item: 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 2e54fcb6..462d26b5 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -15,7 +15,7 @@ ChoosePlayerName: 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: 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 13313746..03974684 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -116,7 +116,7 @@ LoadFossilItemAndMonName: 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 823939b1..606e0581 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -159,7 +159,7 @@ DisplayPokemartDialogue_: 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 2dfcffde..b2eab14a 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -445,7 +445,7 @@ SlotMachine_CheckForMatches: 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 c3913a7e..4eb5c6c4 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames: 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 062d5285..461c34cd 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText: 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 |