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

@@ -200,7 +200,7 @@ SpecialNone: ; c224
Special_SetPlayerPalette: ; c225
ld a, [ScriptVar]
ld d, a
callba SetPlayerPalette
farcall SetPlayerPalette
ret
; c230
@@ -215,7 +215,7 @@ Special_GameCornerPrizeMonCheckDex: ; c230
call FadeToMenu
ld a, [ScriptVar]
ld [wd265], a
callba NewPokedexEntry
farcall NewPokedexEntry
call ExitAllMenus
ret
; c252
@@ -230,28 +230,28 @@ SpecialSeenMon: ; c252
Special_FindGreaterThanThatLevel: ; c25a
ld a, [ScriptVar]
ld b, a
callba _FindGreaterThanThatLevel
farcall _FindGreaterThanThatLevel
jr z, FoundNone
jr FoundOne
Special_FindAtLeastThatHappy: ; c268
ld a, [ScriptVar]
ld b, a
callba _FindAtLeastThatHappy
farcall _FindAtLeastThatHappy
jr z, FoundNone
jr FoundOne
Special_FindThatSpecies: ; c276
ld a, [ScriptVar]
ld b, a
callba _FindThatSpecies
farcall _FindThatSpecies
jr z, FoundNone
jr FoundOne
Special_FindThatSpeciesYourTrainerID: ; c284
ld a, [ScriptVar]
ld b, a
callba _FindThatSpeciesYourTrainerID
farcall _FindThatSpeciesYourTrainerID
jr z, FoundNone
jr FoundOne
@@ -269,7 +269,7 @@ FoundNone: ; c298
SpecialNameRival: ; 0xc29d
ld b, $2 ; rival
ld de, RivalName
callba _NamingScreen
farcall _NamingScreen
; default to "SILVER"
ld hl, RivalName
ld de, DefaultRivalName
@@ -281,27 +281,27 @@ DefaultRivalName: ; 0xc2b2
db "SILVER@"
SpecialNameRater: ; c2b9
callba NameRater
farcall NameRater
ret
; c2c0
Special_TownMap: ; c2c0
call FadeToMenu
callba _TownMap
farcall _TownMap
call ExitAllMenus
ret
; c2cd
Special_UnownPrinter: ; c2cd
call FadeToMenu
callba UnownPrinter
farcall UnownPrinter
call ExitAllMenus
ret
; c2da
Special_DisplayLinkRecord: ; c2da
call FadeToMenu
callba DisplayLinkRecord
farcall DisplayLinkRecord
call ExitAllMenus
ret
; c2e7
@@ -309,7 +309,7 @@ Special_DisplayLinkRecord: ; c2da
Special_KrissHousePC: ; c2e7
xor a
ld [ScriptVar], a
callba _KrissHousePC
farcall _KrissHousePC
ld a, c
ld [ScriptVar], a
ret
@@ -365,7 +365,7 @@ Special_GetMysteryGiftItem: ; c309
; 0xc34a
BugContestJudging: ; c34a
callba _BugContestJudging
farcall _BugContestJudging
ld a, b
ld [ScriptVar], a
ret
@@ -374,13 +374,13 @@ BugContestJudging: ; c34a
MapRadio: ; c355
ld a, [ScriptVar]
ld e, a
callba PlayRadio
farcall PlayRadio
ret
; c360
Special_UnownPuzzle: ; c360
call FadeToMenu
callba UnownPuzzle
farcall UnownPuzzle
ld a, [wSolvedUnownPuzzle]
ld [ScriptVar], a
call ExitAllMenus
@@ -485,7 +485,7 @@ ScriptReturnCarry: ; c3e2
; c3ef
Special_CheckUnusedTwoDayTimer: ; c3ef
callba CheckUnusedTwoDayTimer
farcall CheckUnusedTwoDayTimer
ld a, [wUnusedTwoDayTimer]
ld [ScriptVar], a
ret
@@ -520,20 +520,20 @@ StoreSwarmMapIndices:: ; c403
SpecialCheckPokerus: ; c419
; Check if a monster in your party has Pokerus
callba CheckPokerus
farcall CheckPokerus
jp ScriptReturnCarry
; c422
Special_ResetLuckyNumberShowFlag: ; c422
callba RestartLuckyNumberCountdown
farcall RestartLuckyNumberCountdown
ld hl, wLuckyNumberShowFlag
res 0, [hl]
callba LoadOrRegenerateLuckyIDNumber
farcall LoadOrRegenerateLuckyIDNumber
ret
; c434
Special_CheckLuckyNumberShowFlag: ; c434
callba CheckLuckyNumberShowFlag
farcall CheckLuckyNumberShowFlag
jp ScriptReturnCarry
; c43d
@@ -628,14 +628,14 @@ Special_FadeOutMusic: ; c48f
Diploma: ; c49f
call FadeToMenu
callba _Diploma
farcall _Diploma
call ExitAllMenus
ret
; c4ac
PrintDiploma: ; c4ac
call FadeToMenu
callba _PrintDiploma
farcall _PrintDiploma
call ExitAllMenus
ret
; c4b9