diff options
Diffstat (limited to 'engine/pokecenter_pc.asm')
| -rwxr-xr-x | engine/pokecenter_pc.asm | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm index f6b970ede..7045dc1c8 100755 --- a/engine/pokecenter_pc.asm +++ b/engine/pokecenter_pc.asm @@ -2,9 +2,9 @@ PokemonCenterPC: ; 1559a call PC_CheckPartyForPokemon ret c call PC_PlayBootSound - ld hl, PokeCenterPCText_BootedUpPC + ld hl, PokecenterPCText_BootedUpPC call PC_DisplayText - ld hl, PokeCenterPCText_AccessWhosePC + ld hl, PokecenterPCText_AccessWhosePC call PC_DisplayTextWaitMenu ld hl, .TopMenu call LoadMenuDataHeader @@ -103,16 +103,16 @@ PC_CheckPartyForPokemon: ; 15650 BillsPC: ; 15668 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedBillsPC + ld hl, PokecenterPCText_AccessedBillsPC call PC_DisplayText - callba _BillsPC + farcall _BillsPC and a ret ; 15679 (5:5679) PlayersPC: ; 15679 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedOwnPC + ld hl, PokecenterPCText_AccessedOwnPC call PC_DisplayText ld b, $0 call _PlayersPC @@ -122,9 +122,9 @@ PlayersPC: ; 15679 OaksPC: ; 15689 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedOaksPC + ld hl, PokecenterPCText_AccessedOaksPC call PC_DisplayText - callba ProfOaksPC + farcall ProfOaksPC and a ret ; 1569a @@ -132,14 +132,14 @@ OaksPC: ; 15689 HallOfFamePC: ; 1569a call PC_PlayChoosePCSound call FadeToMenu - callba _HallOfFamePC + farcall _HallOfFamePC call CloseSubmenu and a ret ; 156ab TurnOffPC: ; 156ab - ld hl, PokeCenterPCText_LinkClosed + ld hl, PokecenterPCText_LinkClosed call PrintText scf ret @@ -308,7 +308,7 @@ UnknownText_0x157cc: ; 0x157cc KrisWithdrawItemMenu: ; 0x157d1 call LoadStandardMenuDataHeader - callba ClearPCItemScreen + farcall ClearPCItemScreen .loop call PCItemsJoypad jr c, .quit @@ -322,7 +322,7 @@ KrisWithdrawItemMenu: ; 0x157d1 .Submenu: ; check if the item has a quantity - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .askquantity @@ -335,7 +335,7 @@ KrisWithdrawItemMenu: ; 0x157d1 .askquantity ld hl, .HowManyText call MenuTextBox - callba SelectQuantityToToss + farcall SelectQuantityToToss call ExitMenu call ExitMenu jr c, .done @@ -384,12 +384,12 @@ KrisWithdrawItemMenu: ; 0x157d1 KrisTossItemMenu: ; 0x1585f call LoadStandardMenuDataHeader - callba ClearPCItemScreen + farcall ClearPCItemScreen .loop call PCItemsJoypad jr c, .quit ld de, PCItems - callba TossItemFromPC + farcall TossItemFromPC jr .loop .quit @@ -399,7 +399,7 @@ KrisTossItemMenu: ; 0x1585f ; 0x1587d KrisDecorationMenu: ; 0x1587d - callba _KrisDecorationMenu + farcall _KrisDecorationMenu ld a, c and a ret z @@ -418,14 +418,14 @@ KrisDepositItemMenu: ; 0x1588b jr c, .nope call DisableSpriteUpdates call LoadStandardMenuDataHeader - callba DepositSellInitPackBuffers + farcall DepositSellInitPackBuffers .loop - callba DepositSellPack + farcall DepositSellPack ld a, [wcf66] and a jr z, .close call .TryDepositItem - callba CheckRegisteredItem + farcall CheckRegisteredItem jr .loop .close @@ -436,7 +436,7 @@ KrisDepositItemMenu: ; 0x1588b ret .CheckItemsInBag: - callba HasNoItems + farcall HasNoItems ret nc ld hl, .NoItemsInBag call MenuTextBoxBackup @@ -453,7 +453,7 @@ KrisDepositItemMenu: ; 0x1588b push af ld a, $0 ld [wSpriteUpdatesEnabled], a - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .dw rst JumpTable @@ -486,7 +486,7 @@ KrisDepositItemMenu: ; 0x1588b ret .DepositItem_: - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .AskQuantity @@ -497,7 +497,7 @@ KrisDepositItemMenu: ; 0x1588b .AskQuantity: ld hl, .HowManyText call MenuTextBox - callba SelectQuantityToToss + farcall SelectQuantityToToss push af call ExitMenu call ExitMenu @@ -545,7 +545,7 @@ KrisDepositItemMenu: ; 0x1588b db "@" KrisMailBoxMenu: ; 0x1597d - callba _KrisMailBoxMenu + farcall _KrisMailBoxMenu xor a ret ; 0x15985 @@ -605,12 +605,12 @@ PCItemsJoypad: ; 0x15985 .a_select_2 call PC_PlaySwapItemsSound .select_1 - callba SwitchItemsInBag + farcall SwitchItemsInBag .next jp .loop .a_1 - callba ScrollingMenu_ClearLeftColumn + farcall ScrollingMenu_ClearLeftColumn call PlaceHollowCursor and a ret @@ -641,37 +641,37 @@ PC_DisplayText: ; 15a20 ret ; 15a27 -PokeCenterPCText_BootedUpPC: ; 0x15a27 +PokecenterPCText_BootedUpPC: ; 0x15a27 ; turned on the PC. text_jump UnknownText_0x1c144d db "@" ; 0x15a2c -PokeCenterPCText_AccessWhosePC: ; 0x15a2c +PokecenterPCText_AccessWhosePC: ; 0x15a2c ; Access whose PC? text_jump UnknownText_0x1c1462 db "@" ; 0x15a31 -PokeCenterPCText_AccessedBillsPC: ; 0x15a31 +PokecenterPCText_AccessedBillsPC: ; 0x15a31 ; BILL's PC accessed. #MON Storage System opened. text_jump UnknownText_0x1c1474 db "@" ; 0x15a36 -PokeCenterPCText_AccessedOwnPC: ; 0x15a36 +PokecenterPCText_AccessedOwnPC: ; 0x15a36 ; Accessed own PC. Item Storage System opened. text_jump UnknownText_0x1c14a4 db "@" ; 0x15a3b -PokeCenterPCText_AccessedOaksPC: ; 0x15a3b +PokecenterPCText_AccessedOaksPC: ; 0x15a3b ; PROF.OAK's PC accessed. #DEX Rating System opened. text_jump UnknownText_0x1c14d2 db "@" ; 0x15a40 -PokeCenterPCText_LinkClosed: ; 0x15a40 +PokecenterPCText_LinkClosed: ; 0x15a40 ; … Link closed… text_jump UnknownText_0x1c1505 db "@" |