callba/callab → farcall/callfar

This commit is contained in:
Remy Oukaour
2017-12-24 12:47:30 -05:00
parent d787c66374
commit c66d195089
170 changed files with 1751 additions and 1751 deletions

View File

@@ -293,7 +293,7 @@ HPBarAnim_PaletteUpdate: ; d7b4
call SetHPPal
ld a, [wCurHPAnimPal]
ld c, a
callba ApplyHPBarPals
farcall ApplyHPBarPals
ret
; d7c9

View File

@@ -56,7 +56,7 @@ Predef_StartBattle: ; 8c20f
ld a, [wLinkMode]
cp LINK_MOBILE
jr z, .mobile
callba ReanchorBGMap_NoOAMUpdate
farcall ReanchorBGMap_NoOAMUpdate
call UpdateSprites
call DelayFrame
call .NonMobile_LoadPokeballTiles
@@ -297,7 +297,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
; 8c3e8
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
callba Function5602
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a
@@ -355,7 +355,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
ret
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
callba Function5602
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a
call StartTrainerBattle_NextScene
@@ -497,7 +497,7 @@ ENDM
; 8c578
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
callba Function5602
farcall Function5602
ld a, $5 ; BANK(LYOverrides)
ld [rSVBK], a
call StartTrainerBattle_NextScene
@@ -797,7 +797,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
; 8c768
StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
callba Function5602
farcall Function5602
ld de, .boxes
.loop

View File

@@ -208,7 +208,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
ld [CurPartyMon], a
xor a
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN
ld a, $0
ld [wJumptableIndex], a
@@ -472,7 +472,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ld [CurPartyMon], a
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN
ld a, $0
ld [wJumptableIndex], a
@@ -1125,7 +1125,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld a, $3
ld [MonType], a
callba GetGender
farcall GetGender
jr c, .skip_gender
ld a, "♂"
jr nz, .printgender
@@ -1140,7 +1140,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ret z
ld d, a
callab ItemIsMail
callfar ItemIsMail
jr c, .mail
ld a, $5d ; item icon
jr .printitem
@@ -1656,7 +1656,7 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
ld hl, wBillsPC_ScrollPosition
add [hl]
ld [CurPartyMon], a
callba CheckCurPartyMonFainted
farcall CheckCurPartyMonFainted
jr c, .AllOthersFainted
ld a, [wBillsPC_MonHasMail]
and a
@@ -1773,7 +1773,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
call CloseSRAM
callba CalcwBufferMonStats
farcall CalcwBufferMonStats
ret
.party
@@ -1816,7 +1816,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
ld bc, BOXMON_STRUCT_LENGTH
call CopyMonToTemp
call CloseSRAM
callba CalcwBufferMonStats
farcall CalcwBufferMonStats
ret
DepositPokemon: ; e307c (38:707c)
@@ -1833,7 +1833,7 @@ DepositPokemon: ; e307c (38:707c)
jr c, .asm_boxisfull
xor a
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies]
call PlayCry
hlcoord 0, 0
@@ -1888,7 +1888,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
jr c, .PartyFull
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies]
call PlayCry
hlcoord 0, 0
@@ -2020,7 +2020,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
.dw_return ; e322a
pop af
ld e, a
callba MovePkmnWOMail_InsertMon_SaveGame
farcall MovePkmnWOMail_InsertMon_SaveGame
ret
; e3233
@@ -2056,7 +2056,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
call .CopyFromParty
ld a, $1
ld [wGameLogicPaused], a
callba SaveGameData
farcall SaveGameData
xor a
ld [wGameLogicPaused], a
call .CopyToBox
@@ -2106,7 +2106,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_BackupLoadedBox]
dec a
ld e, a
callba MovePkmnWOMail_SaveGame
farcall MovePkmnWOMail_SaveGame
ld a, [wBillsPC_BackupCursorPosition]
ld hl, wBillsPC_BackupScrollPosition
add [hl]
@@ -2123,10 +2123,10 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld bc, BOXMON_STRUCT_LENGTH
call CopyMonToTemp
call CloseSRAM
callba CalcwBufferMonStats
farcall CalcwBufferMonStats
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
ret
; e32fa
@@ -2134,12 +2134,12 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld a, [wBillsPC_LoadedBox]
dec a
ld e, a
callba MovePkmnWOMail_SaveGame
farcall MovePkmnWOMail_SaveGame
ld a, [wBillsPC_CursorPosition]
ld hl, wBillsPC_ScrollPosition
add [hl]
ld [CurPartyMon], a
callba InsertPokemonIntoBox
farcall InsertPokemonIntoBox
ret
; e3316
@@ -2159,7 +2159,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
call CopyMonToTemp
xor a
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
ret
; e3346
@@ -2168,7 +2168,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld hl, wBillsPC_ScrollPosition
add [hl]
ld [CurPartyMon], a
callba InsertPokemonIntoParty
farcall InsertPokemonIntoParty
ret
; e3357
@@ -2523,7 +2523,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ld a, [MenuSelection]
dec a
ld c, a
callba PrintPCBox
farcall PrintPCBox
call BillsPC_ClearTilemap
and a
ret
@@ -2540,13 +2540,13 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
ld a, [wCurBox]
cp e
ret z
callba ChangeBoxSaveGame
farcall ChangeBoxSaveGame
ret
.Name:
ld b, $4 ; box
ld de, wd002
callba NamingScreen
farcall NamingScreen
call ClearTileMap
call LoadStandardFont
call LoadFontsBattleExtra

View File

@@ -111,16 +111,16 @@ BillsPC_SeeYa: ; e4cb
BillsPC_MovePKMNMenu: ; e4cd
call LoadStandardMenuDataHeader
callba IsAnyMonHoldingMail
farcall IsAnyMonHoldingMail
jr nc, .no_mail
ld hl, .Text_MonHoldingMail
call PrintText
jr .quit
.no_mail
callba StartMovePkmnWOMail_SaveGame
farcall StartMovePkmnWOMail_SaveGame
jr c, .quit
callba _MovePKMNWithoutMail
farcall _MovePKMNWithoutMail
call ReturnToMapFromSubmenu
call ClearPCItemScreen
@@ -136,7 +136,7 @@ BillsPC_MovePKMNMenu: ; e4cd
BillsPC_DepositMenu: ; e4fe (3:64fe)
call LoadStandardMenuDataHeader
callba _DepositPKMN
farcall _DepositPKMN
call ReturnToMapFromSubmenu
call ClearPCItemScreen
call CloseWindow
@@ -205,7 +205,7 @@ CheckCurPartyMonFainted: ; e538
BillsPC_WithdrawMenu: ; e559 (3:6559)
call LoadStandardMenuDataHeader
callba _WithdrawPKMN
farcall _WithdrawPKMN
call ReturnToMapFromSubmenu
call ClearPCItemScreen
call CloseWindow
@@ -231,7 +231,7 @@ UnknownText_0xe57e: ; 0xe57e
db "@"
BillsPC_ChangeBoxMenu: ; e583 (3:6583)
callba _ChangeBox
farcall _ChangeBox
and a
ret

View File

@@ -231,8 +231,8 @@ HatchEggs: ; 16f70 (5:6f70)
push de
callba SetEggMonCaughtData
callba TrainerRankings_EggsHatched
farcall SetEggMonCaughtData
farcall TrainerRankings_EggsHatched
ld a, [CurPartyMon]
ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
@@ -337,7 +337,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld [MonType], a
push de
ld b, $0
callba NamingScreen
farcall NamingScreen
pop hl
ld de, StringBuffer1
call InitName
@@ -687,7 +687,7 @@ EggHatch_DoAnimFrame: ; 1727f (5:727f)
push hl
push de
push bc
callab PlaySpriteAnimations
callfar PlaySpriteAnimations
call DelayFrame
pop bc
pop de
@@ -701,14 +701,14 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
push af
ld de, MUSIC_NONE
call PlayMusic
callba BlankScreen
farcall BlankScreen
call DisableLCD
ld hl, EggHatchGFX
ld de, VTiles0 tile $00
ld bc, $20
ld a, BANK(EggHatchGFX)
call FarCopyBytes
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld de, VTiles2 tile $00
ld a, [wJumptableIndex]
call GetHatchlingFrontpic
@@ -817,7 +817,7 @@ INCBIN "gfx/evo/egg_hatch.2bpp"
; 173b3
Hatch_InitShellFragments: ; 173b3 (5:73b3)
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld hl, .SpriteData
.loop
ld a, [hli]

View File

@@ -6,7 +6,7 @@ SelectQuantityToToss: ; 24fbf
; 24fc9
SelectQuantityToBuy: ; 24fc9
callba GetItemPrice
farcall GetItemPrice
RooftopSale_SelectQuantityToBuy: ; 24fcf
ld a, d
ld [Buffer1], a
@@ -19,7 +19,7 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf
; 24fe1
SelectQuantityToSell: ; 24fe1
callba GetItemPrice
farcall GetItemPrice
ld a, d
ld [Buffer1], a
ld a, e

View File

@@ -52,7 +52,7 @@ CheckPartyFullAfterContest: ; 4d9e5
xor a
ld [MonType], a
ld de, wMonOrItemNameBuffer
callab InitNickname
callfar InitNickname
.Party_SkipNickname:
ld a, [PartyCount]
@@ -103,7 +103,7 @@ CheckPartyFullAfterContest: ; 4d9e5
ld de, wBufferMonOT
ld bc, NAME_LENGTH
call CopyBytes
callab InsertPokemonIntoBox
callfar InsertPokemonIntoBox
ld a, [CurPartySpecies]
ld [wd265], a
call GetPokemonName
@@ -113,7 +113,7 @@ CheckPartyFullAfterContest: ; 4d9e5
ld a, BOXMON
ld [MonType], a
ld de, wMonOrItemNameBuffer
callab InitNickname
callfar InitNickname
ld hl, wMonOrItemNameBuffer
.Box_SkipNickname:

View File

@@ -156,7 +156,7 @@ _CGB_FinishBattleScreenLayout: ; 8e23
InitPartyMenuBGPal7: ; 8e85
callba Function100dc0
farcall Function100dc0
Mobile_InitPartyMenuBGPal7: ; 8e8b
ld hl, Palette_b311
jr nc, .not_mobile
@@ -170,7 +170,7 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b
; 8e9f
InitPartyMenuBGPal0: ; 8e9f
callba Function100dc0
farcall Function100dc0
ld hl, Palette_b311
jr nc, .not_mobile
ld hl, Palette_b309

View File

@@ -202,13 +202,13 @@ RestartClock: ; 20021 (8:4021)
decoord 1, 8
ld a, [Buffer4]
ld b, a
callba PrintDayOfWeek
farcall PrintDayOfWeek
ld a, [Buffer5]
ld b, a
ld a, [Buffer6]
ld c, a
decoord 11, 8
callba PrintHoursMins
farcall PrintHoursMins
ld a, [Buffer2]
lb de, " ", " "
call .PlaceChars

View File

@@ -691,7 +691,7 @@ InitPartyMenuOBPals:
GetBattlemonBackpicPalettePointer:
push de
callba GetPartyMonDVs
farcall GetPartyMonDVs
ld c, l
ld b, h
ld a, [TempBattleMonSpecies]
@@ -701,7 +701,7 @@ GetBattlemonBackpicPalettePointer:
GetEnemyFrontpicPalettePointer:
push de
callba GetEnemyMonDVs
farcall GetEnemyMonDVs
ld c, l
ld b, h
ld a, [TempEnemyMonSpecies]
@@ -1306,7 +1306,7 @@ INCLUDE "gfx/pics/palette_pointers.asm"
INCLUDE "gfx/trainer_palettes.asm"
LoadMapPals:
callba LoadSpecialMapPalette
farcall LoadSpecialMapPalette
jr c, .got_pals
; Which palette group is based on whether we're outside or inside

View File

@@ -17,7 +17,7 @@ ConsumeHeldItem: ; 27192
push af
ld a, [de]
ld b, a
callba GetItemHeldEffect
farcall GetItemHeldEffect
ld hl, .ConsumableEffects
.loop
ld a, [hli]

View File

@@ -5,7 +5,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
ld a, [SGBPredef]
.not_ram
push af
callba ResetBGPals
farcall ResetBGPals
pop af
ld l, a
ld h, 0
@@ -70,8 +70,8 @@ MG_Mobile_Layout00: ; 4936e (12:536e)
call MG_Mobile_Layout_LoadPals
call MG_Mobile_Layout_WipeAttrMap
call MG_Mobile_Layout_CreatePalBoxes
callba ApplyAttrMap
callba ApplyPals
farcall ApplyAttrMap
farcall ApplyPals
ret
MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384)
@@ -167,8 +167,8 @@ MG_Mobile_Layout01: ; 4942f
call Function49496
.asm_49467
callba ApplyAttrMap
callba ApplyPals
farcall ApplyAttrMap
farcall ApplyPals
ld a, $1
ld [hCGBPalUpdate], a
ret
@@ -215,9 +215,9 @@ MG_Mobile_Layout02: ; 49706
ld bc, 1 palettes
ld a, BANK(UnknBGPals)
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
call MG_Mobile_Layout_WipeAttrMap
callba ApplyAttrMap
farcall ApplyAttrMap
ld hl, Palette_4973a
ld de, UnknOBPals
ld bc, 1 palettes
@@ -246,7 +246,7 @@ Function49742: ; 49742
ld bc, $40
ld a, $5
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
ret
; 49757
@@ -312,7 +312,7 @@ LoadTradeRoomBGPals: ; 49811
ld bc, 6 palettes
ld a, BANK(UnknBGPals)
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
ret
; 49826

View File

@@ -18,12 +18,12 @@ Copyright_GFPresents: ; e4579
call SetPalettes
ld c, 10
call DelayFrames
callab Copyright
callfar Copyright
call WaitBGMap
ld c, 100
call DelayFrames
call ClearTileMap
callba GBCOnlyScreen
farcall GBCOnlyScreen
call .GetGFLogoGFX
.joy_loop
call JoyTextDelay
@@ -34,7 +34,7 @@ Copyright_GFPresents: ; e4579
bit 7, a
jr nz, .finish
call PlaceGameFreakPresents
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .joy_loop
@@ -78,7 +78,7 @@ Copyright_GFPresents: ; e4579
pop af
ld [rSVBK], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
call _InitSpriteAnimStruct
@@ -107,7 +107,7 @@ Copyright_GFPresents: ; e4579
; e465e
.StopGamefreakAnim: ; e465e
callba ClearSpriteAnims
farcall ClearSpriteAnims
call ClearTileMap
call ClearSprites
ld c, 16
@@ -253,7 +253,7 @@ GameFreakLogoScene2: ; e470d (39:470d)
add $20
.asm_e4723
ld e, a
callba BattleAnim_Sine_e
farcall BattleAnim_Sine_e
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], e
@@ -368,7 +368,7 @@ CrystalIntro: ; e48ac
bit 7, a
jr nz, .done
call IntroSceneJumper
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jp .loop
@@ -499,7 +499,7 @@ IntroScene1: ; e495b (39:495b)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
xor a
ld [wIntroSceneFrameCounter], a
@@ -638,7 +638,7 @@ IntroScene5: ; e4a7a (39:4a7a)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
xor a
ld [wIntroSceneFrameCounter], a
@@ -749,7 +749,7 @@ IntroScene7: ; e4b3f (39:4b3f)
ld a, $90
ld [hWY], a
call Intro_ResetLYOverrides
callba ClearSpriteAnims
farcall ClearSpriteAnims
depixel 13, 27, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct
@@ -787,7 +787,7 @@ IntroScene8: ; e4bd3 (39:4bd3)
.finish
ld de, SFX_INTRO_SUICUNE_2
call PlaySFX
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call NextIntroScene
ret
@@ -903,7 +903,7 @@ IntroScene11: ; e4c86 (39:4c86)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
xor a
ld [wIntroSceneFrameCounter], a
@@ -1030,7 +1030,7 @@ IntroScene13: ; e4d6d (39:4d6d)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
depixel 13, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct
@@ -1077,7 +1077,7 @@ IntroScene14: ; e4dfa (39:4dfa)
ret
.asm_e4e2c
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
ret
.asm_e4e33
@@ -1140,7 +1140,7 @@ IntroScene15: ; e4e40 (39:4e40)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
depixel 8, 5
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
@@ -1213,7 +1213,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
xor a
ld [wIntroSceneFrameCounter], a
@@ -1288,7 +1288,7 @@ IntroScene19: ; e4f7e (39:4f7e)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld hl, wSpriteAnimDict
xor a
ld [hli], a
@@ -1370,7 +1370,7 @@ IntroScene22: ; e5072 (39:5072)
jr nc, .done
ret
.done
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call NextIntroScene
ret
@@ -1457,7 +1457,7 @@ IntroScene26: ; e50bb (39:50bb)
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call Intro_SetCGBPalUpdate
xor a
ld [wIntroSceneFrameCounter], a

View File

@@ -341,12 +341,12 @@ Function81adb: ; 81adb
.asm_81b7a
ld a, [wd265]
ld [TrainerClass], a
callab GetTrainerAttributes
callfar GetTrainerAttributes
ld de, StringBuffer1
hlcoord 4, 1
call PlaceString
ld de, VTiles2
callab GetTrainerPic
callfar GetTrainerPic
xor a
ld [TempEnemyMonSpecies], a
ld [hGraphicStartTile], a

View File

@@ -1368,7 +1368,7 @@ _GetDecorationSprite: ; 27085
ld c, a
push de
push hl
callba GetDecorationSprite
farcall GetDecorationSprite
pop hl
pop de
ld a, c

View File

@@ -1,5 +1,5 @@
_ResetClock: ; 4d3b1
callba BlankScreen
farcall BlankScreen
ld b, SCGB_DIPLOMA
call GetSGBLayout
call LoadStandardFont
@@ -260,7 +260,7 @@ ClockResetPassword: ; 4d41e
ret
_DeleteSaveData: ; 4d54c
callba BlankScreen
farcall BlankScreen
ld b, SCGB_DIPLOMA
call GetSGBLayout
call LoadStandardFont
@@ -276,7 +276,7 @@ _DeleteSaveData: ; 4d54c
ld a, [wMenuCursorY]
cp $1
ret z
callba EmptyAllSRAMBanks
farcall EmptyAllSRAMBanks
ret
.Text_ClearAllSaveData: ; 0x4d580

View File

@@ -10,7 +10,7 @@ _DummyGame: ; e1e5b (38:5e5b)
call DisableLCD
ld b, SCGB_DIPLOMA
call GetSGBLayout
callab ClearSpriteAnims
callfar ClearSpriteAnims
ld hl, LZ_e2221
ld de, VTiles2 tile $00
call Decompress
@@ -47,7 +47,7 @@ _DummyGame: ; e1e5b (38:5e5b)
bit 7, a
jr nz, .quit
call .ExecuteJumptable
callab PlaySpriteAnimations
callfar PlaySpriteAnimations
call DelayFrame
and a
ret

View File

@@ -120,14 +120,14 @@ StartMap: ; 96724
ld hl, MapStatus
ld bc, wMapStatusEnd - MapStatus
call ByteFill
callba InitCallReceiveDelay
farcall InitCallReceiveDelay
call ClearJoypad
EnterMap: ; 9673e
xor a
ld [wXYComparePointer], a
ld [wXYComparePointer + 1], a
call SetUpFiveStepWildEncounterCooldown
callba RunMapSetupScript
farcall RunMapSetupScript
call DisableEvents
ld a, [hMapEntryMethod]
@@ -159,7 +159,7 @@ UnusedWait30Frames: ; 9676d
HandleMap: ; 96773
call ResetOverworldDelay
call HandleMapTimeAndJoypad
callba HandleCmdQueue ; no need to farcall
farcall HandleCmdQueue ; no need to farcall
call MapEvents
; Not immediately entering a connected map will cause problems.
@@ -188,7 +188,7 @@ MapEvents: ; 96795
.events ; 967a1
call PlayerEvents
call DisableEvents
callba ScriptEvents
farcall ScriptEvents
ret
; 967ae
@@ -227,16 +227,16 @@ HandleMapTimeAndJoypad: ; 967c1
; 967d1
HandleMapObjects: ; 967d1
callba HandleNPCStep ; engine/map_objects.asm
callba _HandlePlayerStep
farcall HandleNPCStep ; engine/map_objects.asm
farcall _HandlePlayerStep
call _CheckObjectEnteringVisibleRange
ret
; 967e1
HandleMapBackground: ; 967e1
callba _UpdateSprites
callba ScrollScreen
callba PlaceMapNameSign
farcall _UpdateSprites
farcall ScrollScreen
farcall PlaceMapNameSign
ret
; 967f4
@@ -264,7 +264,7 @@ _CheckObjectEnteringVisibleRange: ; 96812
ld hl, wPlayerStepFlags
bit 6, [hl]
ret z
callba CheckObjectEnteringVisibleRange
farcall CheckObjectEnteringVisibleRange
ret
; 9681f
@@ -300,7 +300,7 @@ PlayerEvents: ; 9681f
.ok
push af
callba EnableScriptMode
farcall EnableScriptMode
pop af
ld [ScriptRunning], a
@@ -340,7 +340,7 @@ CheckTileEvent: ; 96874
call CheckWarpConnxnScriptFlag
jr z, .connections_disabled
callba CheckMovingOffEdgeOfMap
farcall CheckMovingOffEdgeOfMap
jr c, .map_connection
call CheckWarpTile
@@ -465,8 +465,8 @@ endr
ld hl, ScriptFlags
res 3, [hl]
callba EnableScriptMode
callba ScriptEvents
farcall EnableScriptMode
farcall ScriptEvents
ld hl, ScriptFlags
bit 3, [hl]
@@ -495,15 +495,15 @@ CheckTimeEvents: ; 9693a
bit 2, [hl] ; bug contest
jr z, .do_daily
callba CheckBugContestTimer
farcall CheckBugContestTimer
jr c, .end_bug_contest
xor a
ret
.do_daily
callba CheckDailyResetTimer
callba CheckPokerusTick
callba CheckPhoneCall
farcall CheckDailyResetTimer
farcall CheckPokerusTick
farcall CheckPhoneCall
ret c
.nothing
@@ -532,7 +532,7 @@ OWPlayerInput: ; 96974
jr nz, .NoAction
; Can't perform button actions while sliding on ice.
callba CheckStandingOnIce
farcall CheckStandingOnIce
jr c, .NoAction
call CheckAPressOW
@@ -547,7 +547,7 @@ OWPlayerInput: ; 96974
.Action:
push af
callba StopPlayerForEvent
farcall StopPlayerForEvent
pop af
scf
ret
@@ -576,7 +576,7 @@ PlayTalkObject: ; 969ac
; 969b5
TryObjectEvent: ; 969b5
callba CheckFacingObject
farcall CheckFacingObject
jr c, .IsObject
xor a
ret
@@ -804,7 +804,7 @@ CheckSignFlag: ; 96ad8
; 96af0
PlayerMovement: ; 96af0
callba DoPlayerMovement
farcall DoPlayerMovement
ld a, c
ld hl, .pointers
rst JumpTable
@@ -934,7 +934,7 @@ CountStep: ; 96b79
jr nz, .done
; If there is a special phone call, don't count the step.
callba CheckSpecialPhoneCall
farcall CheckSpecialPhoneCall
jr c, .doscript
; If Repel wore off, don't count the step.
@@ -949,7 +949,7 @@ CountStep: ; 96b79
; Every 256 steps, increase the happiness of all your Pokemon.
jr nz, .skip_happiness
callba StepHappiness
farcall StepHappiness
.skip_happiness
; Every 256 steps, offset from the happiness incrementor by 128 steps,
@@ -959,12 +959,12 @@ CountStep: ; 96b79
cp $80
jr nz, .skip_egg
callba DoEggStep
farcall DoEggStep
jr nz, .hatch
.skip_egg
; Increase the EXP of (both) DayCare Pokemon by 1.
callba DayCareStep
farcall DayCareStep
; Every four steps, deal damage to all Poisoned Pokemon
ld hl, PoisonStepCount
@@ -973,11 +973,11 @@ CountStep: ; 96b79
jr c, .skip_poison
ld [hl], 0
callba DoPoisonStep
farcall DoPoisonStep
jr c, .doscript
.skip_poison
callba DoBikeStep
farcall DoBikeStep
.done
xor a

View File

@@ -54,38 +54,38 @@ CheckFacingTileEvent:: ; 97c5f
call GetFacingTileCoord
ld [EngineBuffer1], a
ld c, a
callba CheckFacingTileForStd
farcall CheckFacingTileForStd
jr c, .done
call CheckCutTreeTile
jr nz, .whirlpool
callba TryCutOW
farcall TryCutOW
jr .done
.whirlpool
ld a, [EngineBuffer1]
call CheckWhirlpoolTile
jr nz, .waterfall
callba TryWhirlpoolOW
farcall TryWhirlpoolOW
jr .done
.waterfall
ld a, [EngineBuffer1]
call CheckWaterfallTile
jr nz, .headbutt
callba TryWaterfallOW
farcall TryWaterfallOW
jr .done
.headbutt
ld a, [EngineBuffer1]
call CheckHeadbuttTreeTile
jr nz, .surf
callba TryHeadbuttOW
farcall TryHeadbuttOW
jr c, .done
jr .noevent
.surf
callba TrySurfOW
farcall TrySurfOW
jr nc, .noevent
jr .done
@@ -111,7 +111,7 @@ RandomEncounter:: ; 97cc0
ld hl, StatusFlags2
bit 2, [hl] ; bug contest
jr nz, .bug_contest
callba TryWildEncounter
farcall TryWildEncounter
jr nz, .nope
jr .ok
@@ -157,7 +157,7 @@ CanUseSweetScent:: ; 97cfd
jr z, .ice_check
cp DUNGEON
jr z, .ice_check
callba CheckGrassCollision
farcall CheckGrassCollision
jr nc, .no
.ice_check
@@ -176,7 +176,7 @@ _TryWildEncounter_BugContest: ; 97d23
call TryWildEncounter_BugContest
ret nc
call ChooseWildEncounter_BugContest
callba CheckRepelEffect
farcall CheckRepelEffect
ret
; 97d31
@@ -242,8 +242,8 @@ TryWildEncounter_BugContest: ; 97d64
ld b, 20 percent
.ok
callba ApplyMusicEffectOnEncounterRate
callba ApplyCleanseTagEffectOnEncounterRate
farcall ApplyMusicEffectOnEncounterRate
farcall ApplyCleanseTagEffectOnEncounterRate
call Random
ld a, [hRandomAdd]
cp b

View File

@@ -1,14 +1,14 @@
ReturnFromMapSetupScript:: ; b8000
xor a
ld [hBGMapMode], a
; For some reson, GameFreak chose to use a callba here instead of just falling through.
; For some reson, GameFreak chose to use a farcall here instead of just falling through.
; No other function in the game references the function at 2E:400A, here labeled
; ReturnFromMapSetupScript.inefficientcallba.
callba .inefficientcallba ; this is a waste of 6 ROM bytes and 6 stack bytes
; ReturnFromMapSetupScript.inefficient_farcall.
farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes
ret
; b800a
.inefficientcallba ; b800a
.inefficient_farcall ; b800a
ld a, [MapGroup]
ld b, a
ld a, [MapNumber]
@@ -45,7 +45,7 @@ ReturnFromMapSetupScript:: ; b8000
ld [wLandmarkSignTimer], a
call LoadMapNameSignGFX
call InitMapNameFrame
callba HDMATransfer_OnlyTopFourRows
farcall HDMATransfer_OnlyTopFourRows
ret
.dont_do_map_sign
@@ -113,7 +113,7 @@ PlaceMapNameSign:: ; b8098 (2e:4098)
jr nz, .skip2
call InitMapNameFrame
call PlaceMapNameCenterAlign
callba HDMATransfer_OnlyTopFourRows
farcall HDMATransfer_OnlyTopFourRows
.skip2
ld a, $80
ld a, $70
@@ -151,7 +151,7 @@ InitMapNameFrame: ; b80d3
PlaceMapNameCenterAlign: ; b80e1 (2e:40e1)
ld a, [wCurrentLandmark]
ld e, a
callba GetLandmarkName
farcall GetLandmarkName
call .GetNameLength
ld a, SCREEN_WIDTH
sub c
@@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172
TreeMonEncounter: ; b81ea
callba TrainerRankings_TreeEncounters
farcall TrainerRankings_TreeEncounters
xor a
ld [TempWildMonSpecies], a

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