pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #423 from roukaour/master

Browse Source 
Fix issues #262, #345, #347, #396, #408, and #412
This commit is contained in:
yenatch 2017-12-24 17:39:50 -05:00 committed by GitHub
commit e400fe5142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
591 changed files with 7112 additions and 7094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
battle/ai/items.asm
View File

@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
and a
ret nz
callba CheckEnemyLockedIn
farcall CheckEnemyLockedIn
ret nz
ld a, [PlayerSubStatus5]
@ -44,7 +44,7 @@ DontSwitch: ; 38041
; 38045
SwitchOften: ; 38045
callab CheckAbleToSwitch
callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam]
and $f0
jp z, DontSwitch
@ -80,7 +80,7 @@ SwitchOften: ; 38045
; 38083
SwitchRarely: ; 38083
callab CheckAbleToSwitch
callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam]
and $f0
jp z, DontSwitch
@ -115,7 +115,7 @@ SwitchRarely: ; 38083
; 380c1
SwitchSometimes: ; 380c1
callab CheckAbleToSwitch
callfar CheckAbleToSwitch
ld a, [wEnemySwitchMonParam]
and $f0
jp z, DontSwitch
@ -358,12 +358,12 @@ AI_Items: ; 39196
ld a, [bc]
bit CONTEXT_USE_F, a
jr nz, .CheckHalfOrQuarterHP
callab AICheckEnemyHalfHP
callfar AICheckEnemyHalfHP
jp c, .DontUse
ld a, [bc]
bit UNKNOWN_USE_F, a
jp nz, .CheckQuarterHP
callab AICheckEnemyQuarterHP
callfar AICheckEnemyQuarterHP
jp nc, .UseHealItem
call Random
cp 1 + 50 percent
@ -371,7 +371,7 @@ AI_Items: ; 39196
jp .DontUse
.CheckQuarterHP: ; 38254 (e:4254)
callab AICheckEnemyQuarterHP
callfar AICheckEnemyQuarterHP
jp c, .DontUse
call Random
cp -1 + 20 percent
@ -379,9 +379,9 @@ AI_Items: ; 39196
jr .UseHealItem
.CheckHalfOrQuarterHP: ; 38267 (e:4267)
callab AICheckEnemyHalfHP
callfar AICheckEnemyHalfHP
jp c, .DontUse
callab AICheckEnemyQuarterHP
callfar AICheckEnemyQuarterHP
jp nc, .UseHealItem
call Random
cp -1 + 20 percent
@ -416,7 +416,7 @@ AI_Items: ; 39196
; 382ae
.asm_382ae ; This appears to be unused
callab AICheckEnemyMaxHP
callfar AICheckEnemyMaxHP
jr c, .dont_use
push bc
ld de, EnemyMonMaxHP + 1
@ -433,7 +433,7 @@ AI_Items: ; 39196
ld a, c
cp b
jp c, .check_50_percent
callab AICheckEnemyQuarterHP
callfar AICheckEnemyQuarterHP
jr c, .check_40_percent
.check_50_percent
@ -545,7 +545,7 @@ AI_Items: ; 39196
AIUpdateHUD: ; 38387
call UpdateEnemyMonInParty
callba UpdateEnemyHUD
farcall UpdateEnemyHUD
ld a, $1
ld [hBGMapMode], a
ld hl, wEnemyItemState
@ -705,7 +705,7 @@ AI_Switch: ; 3846c
res SUBSTATUS_RAGE, [hl]
xor a
ld [hBattleTurn], a
callab PursuitSwitch
callfar PursuitSwitch
push af
ld a, [CurOTMon]
@ -726,12 +726,12 @@ AI_Switch: ; 3846c
.skiptext
ld a, 1
ld [wBattleHasJustStarted], a
callab NewEnemyMonStatus
callab ResetEnemyStatLevels
callfar NewEnemyMonStatus
callfar ResetEnemyStatLevels
ld hl, PlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl]
callba EnemySwitch
callba ResetBattleParticipants
farcall EnemySwitch
farcall ResetBattleParticipants
xor a
ld [wBattleHasJustStarted], a
ld a, [wLinkMode]
@ -851,7 +851,7 @@ EnemyUsedXItem:
push bc
call PrintText_UsedItemOn
pop bc
callba CheckIfStatCanBeRaised
farcall CheckIfStatCanBeRaised
jp AIUpdateHUD
; 38568

2
battle/ai/move.asm
View File

@ -12,7 +12,7 @@ AIChooseMove: ; 440ce
ret nz
; No use picking a move if there's no choice.
callba CheckEnemyLockedIn
farcall CheckEnemyLockedIn
ret nz

4
battle/ai/redundant.asm
View File

@ -141,7 +141,7 @@ AI_Redundant: ; 2c41a
jr .NotRedundant
.Attract: ; 2c4fe
callba CheckOppositeGender
farcall CheckOppositeGender
jr c, .Redundant
ld a, [PlayerSubStatus1]
bit SUBSTATUS_IN_LOVE, a
@ -184,7 +184,7 @@ AI_Redundant: ; 2c41a
.MorningSun:
.Synthesis:
.Moonlight: ; 2c539
callba AICheckEnemyMaxHP
farcall AICheckEnemyMaxHP
jr nc, .NotRedundant
.Teleport:

46
battle/ai/scoring.asm
View File

@ -29,7 +29,7 @@ AI_Basic: ; 38591
push hl
push de
push bc
callba AI_Redundant
farcall AI_Redundant
pop bc
pop de
pop hl
@ -176,7 +176,7 @@ AI_Types: ; 38635
push de
ld a, 1
ld [hBattleTurn], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
pop de
pop bc
pop hl
@ -429,7 +429,7 @@ AI_Smart_LeechHit: ; 387f7
push hl
ld a, 1
ld [hBattleTurn], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
pop hl
; 60% chance to discourage this move if not very effective.
@ -510,7 +510,7 @@ AI_Smart_LockOn: ; 3881d
push hl
push bc
callba BattleCheckTypeMatchup
farcall BattleCheckTypeMatchup
ld a, [wd265]
cp $a
pop bc
@ -572,7 +572,7 @@ AI_Smart_Selfdestruct: ; 388a6
; Unless this is the enemy's last Pokemon...
push hl
callba FindAliveEnemyMons
farcall FindAliveEnemyMons
pop hl
jr nc, .asm_388b7
@ -970,7 +970,7 @@ AI_Smart_ForceSwitch: ; 38a2a
; Consider player's type(s) if its moves are unknown.
push hl
callab CheckPlayerMoveTypeMatchups
callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore]
cp 10 ; neutral
pop hl
@ -1368,7 +1368,7 @@ AI_Smart_Mimic: ; 38ba8
ld a, $1
ld [hBattleTurn], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
ld a, [wd265]
cp $a
@ -1763,9 +1763,9 @@ AI_Smart_PriorityHit: ; 38d5a
ld a, $1
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
callab BattleCommand_DamageCalc
callab BattleCommand_Stab
callfar EnemyAttackDamage
callfar BattleCommand_DamageCalc
callfar BattleCommand_Stab
pop hl
ld a, [CurDamage + 1]
ld c, a
@ -1811,7 +1811,7 @@ AI_Smart_Conversion2: ; 38d98
xor a
ld [hBattleTurn], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
ld a, [wd265]
cp $a
@ -1890,7 +1890,7 @@ AI_Smart_MeanLook: ; 38dfb
; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl
callab CheckPlayerMoveTypeMatchups
callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore]
cp $b ; not very effective
pop hl
@ -2008,7 +2008,7 @@ AI_Smart_Curse: ; 38e5c
jp nz, AIDiscourageMove
push hl
callba FindAliveEnemyMons
farcall FindAliveEnemyMons
pop hl
jr nc, .asm_38eb0
@ -2137,7 +2137,7 @@ AI_Smart_Foresight: ; 38f1d
AI_Smart_PerishSong: ; 38f4a
push hl
callab FindAliveEnemyMons
callfar FindAliveEnemyMons
pop hl
jr c, .no
@ -2146,7 +2146,7 @@ AI_Smart_PerishSong: ; 38f4a
jr nz, .yes
push hl
callab CheckPlayerMoveTypeMatchups
callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore]
cp 10 ; 1.0
pop hl
@ -2404,7 +2404,7 @@ AI_Smart_BatonPass: ; 39062
; Consider player's type(s) if its moves are unknown.
push hl
callab CheckPlayerMoveTypeMatchups
callfar CheckPlayerMoveTypeMatchups
ld a, [wEnemyAISwitchScore]
cp 10 ; neutral
pop hl
@ -2466,8 +2466,8 @@ AI_Smart_HiddenPower: ; 3909e
ld [hBattleTurn], a
; Calculate Hidden Power's type and base power based on enemy's DVs.
callab HiddenPowerDamage
callab BattleCheckTypeMatchup
callfar HiddenPowerDamage
callfar BattleCheckTypeMatchup
pop hl
; Discourage Hidden Power if not very effective.
@ -3336,13 +3336,13 @@ AIDamageCalc: ; 393e7
ld hl, .ConstantDamageEffects
call IsInArray
jr nc, .asm_39400
callab BattleCommand_ConstantDamage
callfar BattleCommand_ConstantDamage
ret
.asm_39400
callab EnemyAttackDamage
callab BattleCommand_DamageCalc
callab BattleCommand_Stab
callfar EnemyAttackDamage
callfar BattleCommand_DamageCalc
callfar BattleCommand_Stab
ret
.ConstantDamageEffects:
@ -3459,7 +3459,7 @@ AI_Status: ; 39453
push de
ld a, 1
ld [hBattleTurn], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
pop de
pop bc
pop hl

22
battle/anim_commands.asm
View File

@ -61,7 +61,7 @@ BattleAnimRunScript: ; cc11c
and a
jr nz, .hi_byte
callba CheckBattleScene
farcall CheckBattleScene
jr c, .disabled
call BattleAnimClearHud
@ -169,7 +169,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld hl, UpdateBattleHuds
ld a, BANK(UpdatePlayerHUD)
rst FarCall ; Why the heck is this a callab?
rst FarCall ; Why not "call UpdateBattleHuds"?
pop af
ld [rSVBK], a
@ -907,7 +907,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ret
BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0)
callab GetPokeBallWobble
callfar GetPokeBallWobble
ld a, c
ld [BattleAnimVar], a
ret
@ -932,7 +932,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld hl, BattleMonDVs ; BattleMonDVs
predef GetUnownLetter
ld de, VTiles0 tile $00
predef GetFrontpic
predef GetMonFrontpic
jr .done
.player
@ -941,7 +941,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld hl, EnemyMonDVs ; EnemyMonDVs
predef GetUnownLetter
ld de, VTiles0 tile $00
predef GetBackpic
predef GetMonBackpic
.done
pop af
@ -1128,11 +1128,11 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750)
and a
jr z, .player
callab DropEnemySub
callfar DropEnemySub
jr .done
.player
callab DropPlayerSub
callfar DropPlayerSub
.done
pop af
@ -1159,14 +1159,14 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
ld hl, BattleMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $00
predef GetFrontpic
predef GetMonFrontpic
jr .done
.player
ld hl, EnemyMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $31
predef GetBackpic
predef GetMonBackpic
.done
pop af
@ -1221,7 +1221,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
call GetBattleAnimByte
ld e, a
ld d, 0
callab PlayStereoSFX
callfar PlayStereoSFX
ret
; cc7f8 (33:47f8)
@ -1311,7 +1311,7 @@ endr
ld a, 1
ld [wStereoPanningMask], a
callab _PlayCryHeader
callfar _PlayCryHeader
.done
pop af

6
battle/bg_effects.asm
View File

@ -550,7 +550,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
ret
_QueueBattleAnimation: ; c82ee (32:42ee)
callab QueueBattleAnimation
callfar QueueBattleAnimation
ret
BattleBGEffect_27: ; c82f5 (32:42f5)
@ -2944,13 +2944,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059)
BattleBGEffects_Sine: ; c905d (32:505d)
ld e, a
callab BattleAnim_Sine_e
callfar BattleAnim_Sine_e
ld a, e
ret
BattleBGEffects_Cosine: ; c9066 (32:5066)
ld e, a
callab BattleAnim_Cosine_e
callfar BattleAnim_Cosine_e
ld a, e
ret

280
battle/core.asm
View File

@ -175,13 +175,13 @@ BattleTurn: ; 3c12f
call HandleBerserkGene
call UpdateBattleMonInParty
callba AIChooseMove
farcall AIChooseMove
call IsMobileBattle
jr nz, .not_disconnected
callba Function100da5
callba StartMobileInactivityTimer
callba Function100dd8
farcall Function100da5
farcall StartMobileInactivityTimer
farcall Function100dd8
jp c, .quit
.not_disconnected
@ -377,7 +377,7 @@ HandleBerserkGene: ; 3c27c
.go
push de
push bc
callab GetUserItem
callfar GetUserItem
ld a, [hl]
ld [wd265], a
sub BERSERK_GENE
@ -405,14 +405,14 @@ HandleBerserkGene: ; 3c27c
ld [hl], a
ld [AttackMissed], a
ld [EffectFailed], a
callba BattleCommand_AttackUp2
farcall BattleCommand_AttackUp2
pop af
pop hl
ld [hl], a
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox
callab BattleCommand_StatUpMessage
callfar BattleCommand_StatUpMessage
pop af
bit SUBSTATUS_CONFUSED, a
ret nz
@ -473,7 +473,7 @@ DetermineMoveOrder: ; 3c314
jp .player_first
.switch
callab AI_Switch
callfar AI_Switch
call SetEnemyTurn
call SpikesDamage
jp .enemy_first
@ -489,9 +489,9 @@ DetermineMoveOrder: ; 3c314
.equal_priority
call SetPlayerTurn
callab GetUserItem
callfar GetUserItem
push bc
callab GetOpponentItem
callfar GetOpponentItem
pop de
ld a, d
cp HELD_QUICK_CLAW
@ -651,7 +651,7 @@ ParsePlayerAction: ; 3c434
.encored
call SetPlayerTurn
callab UpdateMoveData
callfar UpdateMoveData
xor a
ld [wPlayerCharging], a
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
@ -894,7 +894,7 @@ Battle_EnemyFirst: ; 3c5fe
call SetEnemyTurn
ld a, $1
ld [wEnemyGoesFirst], a
callab AI_SwitchOrTryItem
callfar AI_SwitchOrTryItem
jr c, .switch_item
call EnemyTurn_EndOpponentProtectEndureDestinyBond
call CheckMobileBattleError
@ -935,7 +935,7 @@ Battle_PlayerFirst: ; 3c664
xor a
ld [wEnemyGoesFirst], a
call SetEnemyTurn
callab AI_SwitchOrTryItem
callfar AI_SwitchOrTryItem
push af
call PlayerTurn_EndOpponentProtectEndureDestinyBond
pop bc
@ -984,14 +984,14 @@ Battle_PlayerFirst: ; 3c664
PlayerTurn_EndOpponentProtectEndureDestinyBond: ; 3c6cf
call SetPlayerTurn
call EndUserDestinyBond
callab DoPlayerTurn
callfar DoPlayerTurn
jp EndOpponentProtectEndureDestinyBond
; 3c6de
EnemyTurn_EndOpponentProtectEndureDestinyBond: ; 3c6de
call SetEnemyTurn
call EndUserDestinyBond
callab DoEnemyTurn
callfar DoEnemyTurn
jp EndOpponentProtectEndureDestinyBond
; 3c6ed
@ -1323,7 +1323,7 @@ HandleLeftovers: ; 3c8eb
call SetPlayerTurn
.do_it
callab GetUserItem
callfar GetUserItem
ld a, [hl]
ld [wd265], a
call GetItemName
@ -1373,7 +1373,7 @@ HandleMysteryberry: ; 3c93c
call SetPlayerTurn
.do_it
callab GetUserItem
callfar GetUserItem
ld a, b
cp HELD_RESTORE_PP
jr nz, .quit
@ -1470,7 +1470,7 @@ HandleMysteryberry: ; 3c93c
add b
ld [de], a
.skip_checks
callab GetUserItem
callfar GetUserItem
ld a, [hl]
ld [wd265], a
xor a
@ -1536,13 +1536,13 @@ HandleFutureSight: ; 3ca26
ld a, FUTURE_SIGHT
ld [hl], a
callab UpdateMoveData
callfar UpdateMoveData
xor a
ld [AttackMissed], a
ld [AlreadyDisobeyed], a
ld a, 10
ld [TypeModifier], a
callab DoMove
callfar DoMove
xor a
ld [CurDamage], a
ld [CurDamage + 1], a
@ -2359,7 +2359,7 @@ HandleEnemySwitch: ; 3cf4a
ld e, HP_BAR_LENGTH_PX
call UpdateHPPal
call WaitBGMap
callba EnemySwitch_TrainerHud
farcall EnemySwitch_TrainerHud
ld a, [wLinkMode]
and a
jr z, .not_linked
@ -2417,7 +2417,7 @@ WinTrainerBattle: ; 3cfa4
and a
ld a, b
call z, PlayVictoryMusic
callab Battle_GetTrainerName
callfar Battle_GetTrainerName
ld hl, BattleText_EnemyWasDefeated
call StdBattleTextBox
@ -2452,7 +2452,7 @@ WinTrainerBattle: ; 3cfa4
ld c, 40
call DelayFrames
ld c, $4 ; win
callba Mobile_PrintOpponentBattleMessage
farcall Mobile_PrintOpponentBattleMessage
ret
.battle_tower
@ -2461,7 +2461,7 @@ WinTrainerBattle: ; 3cfa4
call DelayFrames
call EmptyBattleTextBox
ld c, $3
callba BattleTowerText
farcall BattleTowerText
call WaitPressAorB_BlinkCursor
ld hl, wPayDayMoney
ld a, [hli]
@ -2589,7 +2589,7 @@ AddBattleMoneyToAccount: ; 3d0be
push bc
ld b, h
ld c, l
callba TrainerRankings_AddToBattlePayouts
farcall TrainerRankings_AddToBattlePayouts
pop bc
pop hl
.loop
@ -2783,7 +2783,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa
.got_param
ld a, [CurBattleMon]
ld [CurPartyMon], a
callab ChangeHappiness
callfar ChangeHappiness
ld a, [wBattleResult]
and %11000000
add $1
@ -2932,16 +2932,16 @@ IsMobileBattle: ; 3d2f1
SetUpBattlePartyMenu_NoLoop: ; 3d2f7
call ClearBGPalettes
SetUpBattlePartyMenu: ; switch to fullscreen menu?
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitPartyMenuBGPal7
callba InitPartyMenuGFX
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
farcall InitPartyMenuBGPal7
farcall InitPartyMenuGFX
ret
; 3d313
JumpToPartyMenuAndPrintText: ; 3d313
callba WritePartyMenuTilemap
callba PrintPartyMenuText
farcall WritePartyMenuTilemap
farcall PrintPartyMenuText
call WaitBGMap
call SetPalettes
call DelayFrame
@ -2951,11 +2951,11 @@ JumpToPartyMenuAndPrintText: ; 3d313
SelectBattleMon: ; 3d329
call IsMobileBattle
jr z, .mobile
callba PartyMenuSelect
farcall PartyMenuSelect
ret
.mobile
callba Mobile_PartyMenuSelect
farcall Mobile_PartyMenuSelect
ret
; 3d33c
@ -3067,7 +3067,7 @@ LostBattle: ; 3d38e
call EmptyBattleTextBox
ld c, 2
callba BattleTowerText
farcall BattleTowerText
call WaitPressAorB_BlinkCursor
call ClearTileMap
call ClearBGPalettes
@ -3118,7 +3118,7 @@ LostBattle: ; 3d38e
call DelayFrames
ld c, $3 ; lost
callba Mobile_PrintOpponentBattleMessage
farcall Mobile_PrintOpponentBattleMessage
scf
ret
; 3d432
@ -3424,7 +3424,7 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
ld a, BANK(Moves)
call FarCopyBytes
call SetEnemyTurn
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
pop bc
pop de
pop hl
@ -3460,13 +3460,13 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
ld a, [BattleMonType1]
ld [wPlayerMoveStruct + MOVE_TYPE], a
call SetPlayerTurn
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
ld a, [wd265]
cp 10 + 1 ; 1.0 + 0.1
jr nc, .super_effective
ld a, [BattleMonType2]
ld [wPlayerMoveStruct + MOVE_TYPE], a
callab BattleCheckTypeMatchup
callfar BattleCheckTypeMatchup
ld a, [wd265]
cp 10 + 1 ; 1.0 + 0.1
jr nc, .super_effective
@ -3608,7 +3608,7 @@ CheckWhetherToAskSwitch: ; 3d714
push af
ld a, [CurBattleMon]
ld [CurPartyMon], a
callba CheckCurPartyMonFainted
farcall CheckCurPartyMonFainted
pop bc
ld a, b
ld [CurPartyMon], a
@ -3624,7 +3624,7 @@ CheckWhetherToAskSwitch: ; 3d714
OfferSwitch: ; 3d74b
ld a, [CurPartyMon]
push af
callab Battle_GetTrainerName
callfar Battle_GetTrainerName
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn
call StdBattleTextBox
lb bc, 1, 7
@ -3675,7 +3675,7 @@ ClearEnemyMonBox: ; 3d7a0
; 3d7b8
Function_BattleTextEnemySentOut: ; 3d7b8
callab Battle_GetTrainerName
callfar Battle_GetTrainerName
ld hl, BattleText_EnemySentOut
call StdBattleTextBox
jp WaitBGMap
@ -3689,7 +3689,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
ld a, OTPARTYMON
ld [MonType], a
predef CopyPkmnToTempMon
call GetMonFrontpic
call GetEnemyMonFrontpic
xor a
ld [wNumHits], a
@ -3707,9 +3707,9 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
.not_shiny
ld bc, TempMonSpecies
callba CheckFaintedFrzSlp
farcall CheckFaintedFrzSlp
jr c, .skip_cry
callba CheckBattleScene
farcall CheckBattleScene
jr c, .cry_no_anim
hlcoord 12, 0
ld d, $0
@ -3851,7 +3851,7 @@ TryToRunAwayFromBattle: ; 3d8b3
ld a, [BattleMonItem]
ld [wd265], a
ld b, a
callab GetItemHeldEffect
callfar GetItemHeldEffect
ld a, b
cp HELD_ESCAPE
pop de
@ -4054,7 +4054,7 @@ BattleCheckEnemyShininess: ; 3da79
BattleCheckShininess: ; 3da7c
ld b, h
ld c, l
callab CheckShininess
callfar CheckShininess
ret
; 3da85
@ -4176,7 +4176,7 @@ SendOutPlayerMon: ; 3db5f
call WaitBGMap
xor a
ld [hBGMapMode], a
call GetMonBackpic
call GetBattleMonBackpic
xor a
ld [hGraphicStartTile], a
ld [wBattleMenuCursorBuffer], a
@ -4208,7 +4208,7 @@ SendOutPlayerMon: ; 3db5f
call GetPartyParamLocation
ld b, h
ld c, l
callba CheckFaintedFrzSlp
farcall CheckFaintedFrzSlp
jr c, .statused
ld a, $f0
ld [CryTracks], a
@ -4418,7 +4418,7 @@ HandleHealingItems: ; 3dcf9
; 3dd2f
HandleHPHealingItem: ; 3dd2f
callab GetOpponentItem
callfar GetOpponentItem
ld a, b
cp HELD_BERRY
ret nz
@ -4502,11 +4502,11 @@ HandleHPHealingItem: ; 3dd2f
predef AnimateHPBar
UseOpponentItem:
call RefreshBattleHuds
callab GetOpponentItem
callfar GetOpponentItem
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
call GetItemName
callab ConsumeHeldItem
callfar ConsumeHeldItem
ld hl, RecoveredUsingText
jp StdBattleTextBox
; 3ddc8
@ -4531,7 +4531,7 @@ ItemRecoveryAnim: ; 3ddc8
; 3dde9
UseHeldStatusHealingItem: ; 3dde9
callab GetOpponentItem
callfar GetOpponentItem
ld hl, .Statuses
.loop
ld a, [hli]
@ -4600,7 +4600,7 @@ UseConfusionHealingItem: ; 3de51
call GetBattleVar
bit SUBSTATUS_CONFUSED, a
ret z
callab GetOpponentItem
callfar GetOpponentItem
ld a, b
cp HELD_HEAL_CONFUSION
jr z, .heal_status
@ -4667,7 +4667,7 @@ HandleStatBoostingHeldItems: ; 3de97
push bc
ld a, [bc]
ld b, a
callab GetItemHeldEffect
callfar GetItemHeldEffect
ld hl, .StatUpItems
.loop
ld a, [hli]
@ -4699,7 +4699,7 @@ HandleStatBoostingHeldItems: ; 3de97
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox
callab BattleCommand_StatUpMessage
callfar BattleCommand_StatUpMessage
ret
.finish
@ -4774,7 +4774,7 @@ DrawPlayerHUD: ; 3df58
lb bc, 5, 11
call ClearBox
callba DrawPlayerHUDBorder
farcall DrawPlayerHUDBorder
hlcoord 18, 9
ld [hl], $73 ; vertical bar
@ -4867,7 +4867,7 @@ PrintPlayerHUD: ; 3dfbf
ld a, TEMPMON
ld [MonType], a
callab GetGender
callfar GetGender
ld a, " "
jr c, .got_gender_char
ld a, "♂"
@ -4916,7 +4916,7 @@ DrawEnemyHUD: ; 3e043
lb bc, 4, 11
call ClearBox
callba DrawEnemyHUDBorder
farcall DrawEnemyHUDBorder
ld a, [TempEnemyMonSpecies]
ld [CurSpecies], a
@ -4945,7 +4945,7 @@ DrawEnemyHUD: ; 3e043
ld a, TEMPMON
ld [MonType], a
callab GetGender
callfar GetGender
ld a, " "
jr c, .got_gender
ld a, "♂"
@ -5080,7 +5080,7 @@ BattleMenu: ; 3e139
ld a, [BattleType]
cp BATTLETYPE_CONTEST
jr nz, .not_contest
callba ContestBattleMenu
farcall ContestBattleMenu
jr .next
.not_contest
@ -5088,7 +5088,7 @@ BattleMenu: ; 3e139
ld a, [InputType]
or a
jr z, .skip_dude_pack_select
callba _DudeAutoInput_DownA
farcall _DudeAutoInput_DownA
.skip_dude_pack_select
call LoadBattleMenu2
ret c
@ -5120,12 +5120,12 @@ LoadBattleMenu2: ; 3e19b
call IsMobileBattle
jr z, .mobile
callba LoadBattleMenu
farcall LoadBattleMenu
and a
ret
.mobile
callba Function100b12
farcall Function100b12
ld a, [wcd2b]
and a
ret z
@ -5159,14 +5159,14 @@ BattleMenu_Pack: ; 3e1c7
cp BATTLETYPE_CONTEST
jr z, .contest
callba BattlePack
farcall BattlePack
ld a, [wPlayerAction]
and a
jr z, .didnt_use_item
jr .got_item
.tutorial
callba TutorialPack
farcall TutorialPack
ld a, POKE_BALL
ld [CurItem], a
call DoItemEffect
@ -5185,8 +5185,8 @@ BattleMenu_Pack: ; 3e1c7
call ClearPalettes
call DelayFrame
call _LoadBattleFontsHPBar
call GetMonBackpic
call GetMonFrontpic
call GetBattleMonBackpic
call GetEnemyMonFrontpic
call ExitMenu
call WaitBGMap
call FinishBattleAnim
@ -5204,7 +5204,7 @@ BattleMenu_Pack: ; 3e1c7
ld a, [wWildMon]
and a
jr nz, .run
callab CheckItemPocket
callfar CheckItemPocket
ld a, [wItemAttributeParamBuffer]
cp BALL
jr z, .ball
@ -5218,10 +5218,10 @@ BattleMenu_Pack: ; 3e1c7
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .tutorial2
call GetMonBackpic
call GetBattleMonBackpic
.tutorial2
call GetMonFrontpic
call GetEnemyMonFrontpic
ld a, $1
ld [wMenuCursorY], a
call ExitMenu
@ -5259,7 +5259,7 @@ BattleMenuPKMN_Loop:
call SelectBattleMon
jr c, .Cancel
.loop
callba FreezeMonIcons
farcall FreezeMonIcons
call .GetMenu
jr c, .PressedB
call PlaceHollowCursor
@ -5298,11 +5298,11 @@ BattleMenuPKMN_Loop:
.GetMenu: ; 3e2f5
call IsMobileBattle
jr z, .mobile
callba BattleMonMenu
farcall BattleMonMenu
ret
.mobile
callba MobileBattleMonMenu
farcall MobileBattleMonMenu
ret
; 3e308
@ -5325,7 +5325,7 @@ Battle_StatsScreen: ; 3e308
call LowVolume
xor a ; PARTYMON
ld [MonType], a
callba BattleStatsScreenInit
farcall BattleStatsScreenInit
call MaxVolume
call DisableLCD
@ -5434,7 +5434,7 @@ PlayerSwitch: ; 3e3ad
; 3e3ff
EnemyMonEntrance: ; 3e3ff
callab AI_Switch
callfar AI_Switch
call SetEnemyTurn
jp SpikesDamage
; 3e40b
@ -5517,7 +5517,7 @@ BattleMenu_Run: ; 3e489
CheckAmuletCoin: ; 3e4a8
ld a, [BattleMonItem]
ld b, a
callab GetItemHeldEffect
callfar GetItemHeldEffect
ld a, b
cp HELD_AMULET_COIN
ret nz
@ -5529,7 +5529,7 @@ CheckAmuletCoin: ; 3e4a8
MoveSelectionScreen: ; 3e4bc
call IsMobileBattle
jr nz, .not_mobile
callba MobileMoveSelectionScreen
farcall MobileMoveSelectionScreen
ret
.not_mobile
@ -5884,7 +5884,7 @@ MoveInfoBox: ; 3e6c8
ld [CurPartyMon], a
ld a, WILDMON
ld [MonType], a
callab GetMaxPPOfMove
callfar GetMaxPPOfMove
ld hl, wMenuCursorY
ld c, [hl]
@ -5904,7 +5904,7 @@ MoveInfoBox: ; 3e6c8
hlcoord 7, 11
ld [hl], "/"
callab UpdateMoveData
callfar UpdateMoveData
ld a, [wPlayerMoveStruct + MOVE_ANIM]
ld b, a
hlcoord 2, 10
@ -6104,7 +6104,7 @@ ParseEnemyAction: ; 3e7c1
.skip_load
call SetEnemyTurn
callab UpdateMoveData
callfar UpdateMoveData
call CheckEnemyLockedIn
jr nz, .raging
xor a
@ -6167,7 +6167,7 @@ CheckEnemyLockedIn: ; 3e8d1
; 3e8e4
LinkBattleSendReceiveAction: ; 3e8e4
callba _LinkBattleSendReceiveAction
farcall _LinkBattleSendReceiveAction
ret
; 3e8eb
@ -6276,7 +6276,7 @@ LoadEnemyMon: ; 3e8eb
; All trainers have preset DVs, determined by class
; See GetTrainerDVs for more on that
callba GetTrainerDVs
farcall GetTrainerDVs
; These are the DVs we'll use if we're actually in a trainer battle
ld a, [wBattleMode]
dec a
@ -6380,7 +6380,7 @@ LoadEnemyMon: ; 3e8eb
; Get Magikarp's length
ld de, EnemyMonDVs
ld bc, PlayerID
callab CalcMagikarpLength
callfar CalcMagikarpLength
; We're clear if the length is < 1536
ld a, [wMagikarpLength]
@ -6780,7 +6780,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
ld a, [OtherTrainerClass]
ld [TrainerClass], a
ld de, VTiles2
callab GetTrainerPic
callfar GetTrainerPic
hlcoord 19, 0
ld c, 0
@ -7144,12 +7144,12 @@ BoostStat: ; 3ed7c
; 3ed9f
_LoadBattleFontsHPBar: ; 3ed9f
callab LoadBattleFontsHPBar
callfar LoadBattleFontsHPBar
ret
; 3eda6
_LoadHPBar: ; 3eda6
callab LoadHPBar
callfar LoadHPBar
ret
; 3edad
@ -7455,7 +7455,7 @@ GiveExperiencePoints: ; 3ee3b
call GetBaseData
push bc
ld d, MAX_LEVEL
callab CalcExpAtLevel
callfar CalcExpAtLevel
pop bc
ld hl, MON_STAT_EXP - 1
add hl, bc
@ -7484,7 +7484,7 @@ GiveExperiencePoints: ; 3ee3b
xor a ; PARTYMON
ld [MonType], a
predef CopyPkmnToTempMon
callab CalcLevel
callfar CalcLevel
pop bc
ld hl, MON_LEVEL
add hl, bc
@ -7571,16 +7571,16 @@ GiveExperiencePoints: ; 3ee3b
xor a
ld [wd265], a
call ApplyStatLevelMultiplierOnAllStats
callab ApplyStatusEffectOnPlayerStats
callab BadgeStatBoosts
callab UpdatePlayerHUD
callfar ApplyStatusEffectOnPlayerStats
callfar BadgeStatBoosts
callfar UpdatePlayerHUD
call EmptyBattleTextBox
call LoadTileMapToTempTileMap
ld a, $1
ld [hBGMapMode], a
.skip_animation
callba LevelUpHappinessMod
farcall LevelUpHappinessMod
ld a, [CurBattleMon]
ld b, a
ld a, [CurPartyMon]
@ -7781,7 +7781,7 @@ AnimateExpBar: ; 3f136
.NoOverflow:
ld d, MAX_LEVEL
callab CalcExpAtLevel
callfar CalcExpAtLevel
ld a, [hProduct + 1]
ld b, a
ld a, [hProduct + 2]
@ -7804,7 +7804,7 @@ AnimateExpBar: ; 3f136
ld [hld], a
.AlreadyAtMaxExp:
callab CalcLevel
callfar CalcLevel
ld a, d
pop bc
pop de
@ -7836,7 +7836,7 @@ AnimateExpBar: ; 3f136
call TerminateExpBarSound
ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX
callba AnimateEndOfExpBar
farcall AnimateEndOfExpBar
call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel
call StdBattleTextBox
@ -8142,7 +8142,7 @@ CalcExpBar: ; 3f39c
push de
ld d, b
push de
callab CalcExpAtLevel
callfar CalcExpAtLevel
pop de
; exp at current level gets pushed to the stack
ld hl, hMultiplicand
@ -8154,7 +8154,7 @@ CalcExpBar: ; 3f39c
push af
; next level
inc d
callab CalcExpAtLevel
callfar CalcExpAtLevel
; back up the next level exp, and subtract the two levels
ld hl, hMultiplicand + 2
ld a, [hl]
@ -8269,17 +8269,17 @@ PlaceExpBar: ; 3f41c
ret
; 3f43d
GetMonBackpic: ; 3f43d
GetBattleMonBackpic: ; 3f43d
ld a, [PlayerSubStatus4]
bit SUBSTATUS_SUBSTITUTE, a
ld hl, BattleAnimCmd_RaiseSub
jr nz, GetBackpic_DoAnim ; substitute
jr nz, GetBattleMonBackpic_DoAnim ; substitute
DropPlayerSub: ; 3f447
ld a, [wPlayerMinimized]
and a
ld hl, BattleAnimCmd_MinimizeOpp
jr nz, GetBackpic_DoAnim
jr nz, GetBattleMonBackpic_DoAnim
ld a, [CurPartySpecies]
push af
ld a, [BattleMonSpecies]
@ -8287,13 +8287,13 @@ DropPlayerSub: ; 3f447
ld hl, BattleMonDVs
predef GetUnownLetter
ld de, VTiles2 tile $31
predef GetBackpic
predef GetMonBackpic
pop af
ld [CurPartySpecies], a
ret
; 3f46f
GetBackpic_DoAnim: ; 3f46f
GetBattleMonBackpic_DoAnim: ; 3f46f
ld a, [hBattleTurn]
push af
xor a
@ -8305,17 +8305,17 @@ GetBackpic_DoAnim: ; 3f46f
ret
; 3f47c
GetMonFrontpic: ; 3f47c
GetEnemyMonFrontpic: ; 3f47c
ld a, [EnemySubStatus4]
bit SUBSTATUS_SUBSTITUTE, a
ld hl, BattleAnimCmd_RaiseSub
jr nz, GetFrontpic_DoAnim
jr nz, GetEnemyMonFrontpic_DoAnim
DropEnemySub: ; 3f486
ld a, [wEnemyMinimized]
and a
ld hl, BattleAnimCmd_MinimizeOpp
jr nz, GetFrontpic_DoAnim
jr nz, GetEnemyMonFrontpic_DoAnim
ld a, [CurPartySpecies]
push af
@ -8326,13 +8326,13 @@ DropEnemySub: ; 3f486
ld hl, EnemyMonDVs
predef GetUnownLetter
ld de, VTiles2
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
pop af
ld [CurPartySpecies], a
ret
; 3f4b4
GetFrontpic_DoAnim: ; 3f4b4
GetEnemyMonFrontpic_DoAnim: ; 3f4b4
ld a, [hBattleTurn]
push af
call SetEnemyTurn
@ -8369,18 +8369,18 @@ _DoBattle: ; 3f4d9
; 3f4dd
BattleIntro: ; 3f4dd
callba TrainerRankings_Battles ; mobile
farcall TrainerRankings_Battles ; mobile
call LoadTrainerOrWildMonPic
xor a
ld [TempBattleMonSpecies], a
ld [wBattleMenuCursorBuffer], a
xor a
ld [hMapAnims], a
callba PlayBattleMusic
callba ShowLinkBattleParticipants
callba FindFirstAliveMonAndStartBattle
farcall PlayBattleMusic
farcall ShowLinkBattleParticipants
farcall FindFirstAliveMonAndStartBattle
call DisableSpriteUpdates
callba ClearBattleRAM
farcall ClearBattleRAM
call InitEnemy
call BackUpVBGMap2
ld b, SCGB_BATTLE_GRAYSCALE
@ -8454,11 +8454,11 @@ BackUpVBGMap2: ; 3f568
InitEnemyTrainer: ; 3f594
ld [TrainerClass], a
callba TrainerRankings_TrainerBattles
farcall TrainerRankings_TrainerBattles
xor a
ld [TempEnemyMonSpecies], a
callab GetTrainerAttributes
callab ReadTrainerParty
callfar GetTrainerAttributes
callfar ReadTrainerParty
ld a, [TrainerClass]
cp RIVAL1
@ -8468,7 +8468,7 @@ InitEnemyTrainer: ; 3f594
.ok
ld de, VTiles2
callab GetTrainerPic
callfar GetTrainerPic
xor a
ld [hGraphicStartTile], a
dec a
@ -8495,7 +8495,7 @@ InitEnemyTrainer: ; 3f594
or [hl]
jr z, .skipfaintedmon
ld c, HAPPINESS_GYMBATTLE
callab ChangeHappiness
callfar ChangeHappiness
.skipfaintedmon
pop bc
dec b
@ -8510,7 +8510,7 @@ InitEnemyTrainer: ; 3f594
InitEnemyWildmon: ; 3f607
ld a, WILD_BATTLE
ld [wBattleMode], a
callba TrainerRankings_WildBattles
farcall TrainerRankings_WildBattles
call LoadEnemyMon
ld hl, EnemyMonMoves
ld de, wWildMonMoves
@ -8532,7 +8532,7 @@ InitEnemyWildmon: ; 3f607
ld [wFirstUnownSeen], a
.skip_unown
ld de, VTiles2
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
xor a
ld [TrainerClass], a
ld [hGraphicStartTile], a
@ -8619,7 +8619,7 @@ ExitBattle: ; 3f69e
xor a
ld [wForceEvolution], a
predef EvolveAfterBattle
callba GivePokerusAndConvertBerries
farcall GivePokerusAndConvertBerries
ret
; 3f6d0
@ -8693,20 +8693,20 @@ CheckPayDay: ; 3f71d
; 3f759
ShowLinkBattleParticipantsAfterEnd: ; 3f759
callba TrainerRankings_LinkBattles
callba BackupMobileEventIndex
farcall TrainerRankings_LinkBattles
farcall BackupMobileEventIndex
ld a, [CurOTMon]
ld hl, OTPartyMon1Status
call GetPartyLocation
ld a, [EnemyMonStatus]
ld [hl], a
call ClearTileMap
callba _ShowLinkBattleParticipants
farcall _ShowLinkBattleParticipants
ret
; 3f77c
DisplayLinkBattleResult: ; 3f77c
callba CheckMobileBattleError
farcall CheckMobileBattleError
jp c, .Mobile_InvalidBattle
call IsMobileBattle2
jr nz, .proceed
@ -8715,7 +8715,7 @@ DisplayLinkBattleResult: ; 3f77c
bit 4, [hl]
jr z, .proceed
callba DetermineLinkBattleResult
farcall DetermineLinkBattleResult
.proceed
ld a, [wBattleResult]
@ -8723,24 +8723,24 @@ DisplayLinkBattleResult: ; 3f77c
cp $1
jr c, .victory
jr z, .loss
callba TrainerRankings_ColosseumDraws
farcall TrainerRankings_ColosseumDraws
ld de, .Draw
jr .store_result
.victory
callba TrainerRankings_ColosseumWins
farcall TrainerRankings_ColosseumWins
ld de, .Win
jr .store_result
.loss
callba TrainerRankings_ColosseumLosses
farcall TrainerRankings_ColosseumLosses
ld de, .Lose
jr .store_result
.store_result
hlcoord 6, 8
call PlaceString
callba BackupMobileEventIndex
farcall BackupMobileEventIndex
ld c, 200
call DelayFrames
@ -8977,7 +8977,7 @@ BattleEnd_HandleRoamMons: ; 3f998
ret nz
.update_roam_mons
callab UpdateRoamMons
callfar UpdateRoamMons
ret
; 3f9d1
@ -9269,7 +9269,7 @@ InitBattleDisplay: ; 3fb6c
ld b, 4
ld c, 18
call TextBox
callba MobileTextBorder
farcall MobileTextBorder
hlcoord 1, 5
lb bc, 3, 7
call ClearBox
@ -9285,7 +9285,7 @@ InitBattleDisplay: ; 3fb6c
call WaitBGMap
xor a
ld [hBGMapMode], a
callba BattleIntroSlidingPics
farcall BattleIntroSlidingPics
ld a, $1
ld [hBGMapMode], a
ld a, $31
@ -9354,7 +9354,7 @@ GetTrainerBackpic: ; 3fbff
jr z, .Chris
; It's a girl.
callba GetKrisBackpic
farcall GetKrisBackpic
ret
.Chris:
@ -9439,7 +9439,7 @@ BattleStartMessage: ; 3fc8b
ld c, 20
call DelayFrames
callba Battle_GetTrainerName
farcall Battle_GetTrainerName
ld hl, WantsToBattleText
jr .PlaceBattleStartText
@ -9458,10 +9458,10 @@ BattleStartMessage: ; 3fc8b
call Call_PlayBattleAnim
.not_shiny
callba CheckSleepingTreeMon
farcall CheckSleepingTreeMon
jr c, .skip_cry
callba CheckBattleScene
farcall CheckBattleScene
jr c, .cry_no_anim
hlcoord 12, 0
@ -9481,7 +9481,7 @@ BattleStartMessage: ; 3fc8b
cp BATTLETYPE_FISH
jr nz, .NotFishing
callba TrainerRankings_HookedEncounters
farcall TrainerRankings_HookedEncounters
ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText
@ -9497,7 +9497,7 @@ BattleStartMessage: ; 3fc8b
.PlaceBattleStartText:
push hl
callba BattleStart_TrainerHuds
farcall BattleStart_TrainerHuds
pop hl
call StdBattleTextBox
@ -9505,7 +9505,7 @@ BattleStartMessage: ; 3fc8b
ret nz
ld c, $2 ; start
callba Mobile_PrintOpponentBattleMessage
farcall Mobile_PrintOpponentBattleMessage
ret
; 3fd26

74
battle/effect_commands.asm
View File

@ -1016,7 +1016,7 @@ IgnoreSleepOnly: ; 3451f
BattleCommand_UsedMoveText: ; 34541
; usedmovetext
callba DisplayUsedMoveText
farcall DisplayUsedMoveText
ret
; 34548
@ -1385,14 +1385,14 @@ BattleCommand_Stab: ; 346d2
push hl
push de
push bc
callba DoWeatherModifiers
farcall DoWeatherModifiers
pop bc
pop de
pop hl
push de
push bc
callba DoBadgeTypeBoosts
farcall DoBadgeTypeBoosts
pop bc
pop de
@ -3862,7 +3862,7 @@ BattleCommand_Counter: ; 35813
ret z
ld b, a
callab GetMoveEffect
callfar GetMoveEffect
ld a, b
cp EFFECT_COUNTER
ret z
@ -4068,7 +4068,7 @@ BattleCommand_PainSplit: ; 35926
call ResetDamage
hlcoord 2, 2
predef AnimateHPBar
callba _UpdateBattleHUDs
farcall _UpdateBattleHUDs
ld hl, SharedPainText
jp StdBattleTextBox
@ -4518,7 +4518,7 @@ BattleCommand_SleepTalk: ; 35b33
push bc
ld b, a
callab GetMoveEffect
callfar GetMoveEffect
ld a, b
pop bc
@ -4747,7 +4747,7 @@ PlayFXAnimID: ; 35d08
ld c, 3
call DelayFrames
callab PlayBattleAnim
callfar PlayBattleAnim
ret
@ -5017,7 +5017,7 @@ BattleCommand_SleepTarget: ; 35e5c
ld hl, FellAsleepText
call StdBattleTextBox
callba UseHeldStatusHealingItem
farcall UseHeldStatusHealingItem
jp z, OpponentCantMove
ret
@ -5094,7 +5094,7 @@ BattleCommand_PoisonTarget: ; 35eee
ld hl, WasPoisonedText
call StdBattleTextBox
callba UseHeldStatusHealingItem
farcall UseHeldStatusHealingItem
ret
; 35f2c
@ -5179,7 +5179,7 @@ BattleCommand_Poison: ; 35f2c
call StdBattleTextBox
.finished
callba UseHeldStatusHealingItem
farcall UseHeldStatusHealingItem
ret
.failed
@ -5382,7 +5382,7 @@ BattleCommand_BurnTarget: ; 3608c
ld hl, WasBurnedText
call StdBattleTextBox
callba UseHeldStatusHealingItem
farcall UseHeldStatusHealingItem
ret
; 360dd
@ -5455,7 +5455,7 @@ BattleCommand_FreezeTarget: ; 36102
ld hl, WasFrozenText
call StdBattleTextBox
callba UseHeldStatusHealingItem
farcall UseHeldStatusHealingItem
ret nz
call OpponentCantMove
@ -6299,11 +6299,11 @@ BattleCommand_Curl: ; 365a7
BattleCommand_RaiseSubNoAnim: ; 365af
ld hl, GetMonBackpic
ld hl, GetBattleMonBackpic
ld a, [hBattleTurn]
and a
jr z, .PlayerTurn
ld hl, GetMonFrontpic
ld hl, GetEnemyMonFrontpic
.PlayerTurn:
xor a
ld [hBGMapMode], a
@ -6816,7 +6816,7 @@ BattleCommand_ForceSwitch: ; 3680f
ld a, d
inc a
ld [wEnemySwitchMonIndex], a
callab ForceEnemySwitch
callfar ForceEnemySwitch
ld hl, DraggedOutText
call StdBattleTextBox
@ -8081,7 +8081,7 @@ BattleCommand_LeechSeed: ; 36f9d
BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove
callba TrainerRankings_Splash
farcall TrainerRankings_Splash
jp PrintNothingHappened
; 36fed
@ -8285,7 +8285,7 @@ BattleCommand_Conversion: ; 3707f
inc de
ld [de], a
ld [wNamedObjectIndexBuffer], a
callba GetTypeName
farcall GetTypeName
call AnimateCurrentMove
ld hl, TransformedTypeText
jp StdBattleTextBox
@ -8608,7 +8608,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_Selfdestruct: ; 37380
callba TrainerRankings_Selfdestruct
farcall TrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld c, 3
@ -8632,8 +8632,8 @@ BattleCommand_Selfdestruct: ; 37380
res SUBSTATUS_DESTINY_BOND, [hl]
call _CheckBattleScene
ret nc
callba DrawPlayerHUD
callba DrawEnemyHUD
farcall DrawPlayerHUD
farcall DrawEnemyHUD
call WaitBGMap
jp RefreshBattleHuds
@ -9032,13 +9032,13 @@ BattleCommand_BatonPass: ; 379c9
; Transition into switchmon menu
call LoadStandardMenuDataHeader
callba SetUpBattlePartyMenu_NoLoop
farcall SetUpBattlePartyMenu_NoLoop
callba ForcePickSwitchMonInBattle
farcall ForcePickSwitchMonInBattle
; Return to battle scene
call ClearPalettes
callba _LoadBattleFontsHPBar
farcall _LoadBattleFontsHPBar
call CloseWindow
call ClearSprites
hlcoord 1, 0
@ -9050,7 +9050,7 @@ BattleCommand_BatonPass: ; 379c9
call BatonPass_LinkPlayerSwitch
; Mobile link battles handle entrances differently
callba CheckMobileBattleError
farcall CheckMobileBattleError
jp c, EndMoveEffect
ld hl, PassedBattleMonEntrance
@ -9075,7 +9075,7 @@ BattleCommand_BatonPass: ; 379c9
call BatonPass_LinkEnemySwitch
; Mobile link battles handle entrances differently
callba CheckMobileBattleError
farcall CheckMobileBattleError
jp c, EndMoveEffect
; Passed enemy PartyMon entrance
@ -9403,7 +9403,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
call AnimateCurrentMove
call BattleCommand_SwitchTurn
callab RestoreHP
callfar RestoreHP
call BattleCommand_SwitchTurn
call UpdateUserInParty
@ -9433,7 +9433,7 @@ BattleCommand_HiddenPower: ; 37be8
ld a, [AttackMissed]
and a
ret nz
callba HiddenPowerDamage
farcall HiddenPowerDamage
ret
; 37bf4
@ -9475,14 +9475,14 @@ BattleCommand_BellyDrum: ; 37c1a
and a
jr nz, .failed
callab GetHalfMaxHP
callab CheckUserHasEnoughHP
callfar GetHalfMaxHP
callfar CheckUserHasEnoughHP
jr nc, .failed
push bc
call AnimateCurrentMove
pop bc
callab SubtractHPFromUser
callfar SubtractHPFromUser
call UpdateUserInParty
ld a, 5
@ -9568,7 +9568,7 @@ BattleCommand_MirrorCoat: ; 37c95
ret z
ld b, a
callab GetMoveEffect
callfar GetMoveEffect
ld a, b
cp EFFECT_MIRROR_COAT
ret z
@ -9914,7 +9914,7 @@ PlayUserBattleAnim: ; 37e47
push hl
push de
push bc
callab PlayBattleAnim
callfar PlayBattleAnim
pop bc
pop de
pop hl
@ -9936,7 +9936,7 @@ PlayOpponentBattleAnim: ; 37e54
push bc
call BattleCommand_SwitchTurn
callab PlayBattleAnim
callfar PlayBattleAnim
call BattleCommand_SwitchTurn
pop bc
@ -10035,21 +10035,21 @@ GetMoveByte: ; 37ebb
DisappearUser: ; 37ec0
callba _DisappearUser
farcall _DisappearUser
ret
; 37ec7
AppearUserLowerSub: ; 37ec7
callba _AppearUserLowerSub
farcall _AppearUserLowerSub
ret
; 37ece
AppearUserRaiseSub: ; 37ece
callba _AppearUserRaiseSub
farcall _AppearUserRaiseSub
ret
; 37ed5
@ -10060,7 +10060,7 @@ _CheckBattleScene: ; 37ed5
push hl
push de
push bc
callba CheckBattleScene
farcall CheckBattleScene
pop bc
pop de
pop hl

4
battle/effects/attract.asm
View File

@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5
xor a
ld [MonType], a
callba GetGender
farcall GetGender
jr c, .genderless_samegender
ld b, 1
@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5
ld [TempMonDVs + 1], a
ld a, 3
ld [MonType], a
callba GetGender
farcall GetGender
pop bc
jr c, .genderless_samegender

4
battle/effects/thief.asm
View File

@ -23,7 +23,7 @@ BattleCommand_Thief: ; 37492
ld [wd265], a
ld d, a
callba ItemIsMail
farcall ItemIsMail
ret c
ld a, [EffectFailed]
@ -71,7 +71,7 @@ BattleCommand_Thief: ; 37492
ld [wd265], a
ld d, a
callba ItemIsMail
farcall ItemIsMail
ret c
ld a, [EffectFailed]

2
battle/hidden_power.asm
View File

@ -104,7 +104,7 @@ HiddenPowerDamage: ; fbced
; based on the new type, but keep base power.
ld a, d
push af
callba BattleCommand_DamageStats ; damagestats
farcall BattleCommand_DamageStats ; damagestats
pop af
ld d, a
ret

2
battle/link_result.asm
View File

@ -1,5 +1,5 @@
DetermineLinkBattleResult: ; 2b930
callba UpdateEnemyMonInParty
farcall UpdateEnemyMonInParty
ld hl, PartyMon1HP
call .CountMonsRemaining
push bc

4
battle/misc.asm
View File

@ -13,11 +13,11 @@ _DisappearUser: ; fbd54
jr FinishAppearDisappearUser
_AppearUserRaiseSub: ; fbd69 (3e:7d69)
callba BattleCommand_RaiseSubNoAnim
farcall BattleCommand_RaiseSubNoAnim
jr AppearUser
_AppearUserLowerSub: ; fbd71 (3e:7d71)
callba BattleCommand_LowerSubNoAnim
farcall BattleCommand_LowerSubNoAnim
AppearUser: ; fbd77 (3e:7d77)
xor a

4
battle/objects/engine.asm
View File

@ -302,13 +302,13 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31)
ret
_ExecuteBGEffects: ; ccb48
callab ExecuteBGEffects
callfar ExecuteBGEffects
ret
; ccb4f
_QueueBGEffect: ; ccb4f (33:4b4f)
callab QueueBGEffect
callfar QueueBGEffect
ret
; ccb56 (33:4b56)

2
battle/trainer_huds.asm
View File

@ -259,7 +259,7 @@ _ShowLinkBattleParticipants: ; 2c1b2
ld a, "<BOLD_V>"
ld [hli], a
ld [hl], "<BOLD_S>"
callba LinkBattle_TrainerHuds ; no need to callba
farcall LinkBattle_TrainerHuds ; no need to farcall
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes

2
battle/used_move_text.asm
View File

@ -32,7 +32,7 @@ UsedMoveText: ; 105db9
ld [wd265], a
push hl
callba CheckUserIsCharging
farcall CheckUserIsCharging
pop hl
jr nz, .grammar

4
constants/event_flags.asm
View File

@ -130,7 +130,7 @@
const EVENT_GOT_TM12_SWEET_SCENT
const EVENT_RELEASED_THE_BEASTS
const EVENT_GOT_MASTER_BALL_FROM_ELM
; Johto signpost items
; Johto hidden items
const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
@ -236,7 +236,7 @@
const EVENT_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC
; Kanto signpost items
; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL

55
constants/map_constants.asm
View File

@ -3,17 +3,30 @@ MAP_N_A EQU -1
GROUP_NONE EQU 0
MAP_NONE EQU 0
; map permissions (wPermission)
; map header fields (see maps/map_headers.asm)
const_def
const MAPHEADER_MAPHEADER2_BANK ; 0
const MAPHEADER_TILESET ; 1
const MAPHEADER_ENVIRONMENT ; 2
const MAPHEADER_MAPHEADER2 ; 3
const MAPHEADER_MAPHEADER2_HI ; 4
const MAPHEADER_LOCATION ; 5
const MAPHEADER_MUSIC ; 6
const MAPHEADER_PALETTE ; 7
const MAPHEADER_FISHGROUP ; 8
NUM_MAPHEADER_ATTRIBUTES EQU const_value
; map environments (wEnvironment)
const_value SET 1
const TOWN
const ROUTE
const INDOOR
const CAVE
const PERM_5
const ENVIRONMENT_5
const GATE
const DUNGEON
; map palettes (wPermission)
; map palettes (wEnvironment)
const_def
const PALETTE_AUTO
const PALETTE_DAY
@ -163,28 +176,28 @@ const_value = -1
NUM_SPAWNS EQU const_value
; TryReadSign arguments (see engine/events.asm)
; TryBGEvent arguments (see engine/events.asm)
const_def
const SIGNPOST_READ
const SIGNPOST_UP
const SIGNPOST_DOWN
const SIGNPOST_RIGHT
const SIGNPOST_LEFT
const SIGNPOST_IFSET
const SIGNPOST_IFNOTSET
const SIGNPOST_ITEM
const SIGNPOST_COPY
const BGEVENT_READ
const BGEVENT_UP
const BGEVENT_DOWN
const BGEVENT_RIGHT
const BGEVENT_LEFT
const BGEVENT_IFSET
const BGEVENT_IFNOTSET
const BGEVENT_ITEM
const BGEVENT_COPY
; person_event types
; object_event types
; TryObjectEvent arguments (see engine/events.asm)
const_def
const PERSONTYPE_SCRIPT
const PERSONTYPE_ITEMBALL
const PERSONTYPE_TRAINER
const PERSONTYPE_3
const PERSONTYPE_4
const PERSONTYPE_5
const PERSONTYPE_6
const OBJECTTYPE_SCRIPT
const OBJECTTYPE_ITEMBALL
const OBJECTTYPE_TRAINER
const OBJECTTYPE_3
const OBJECTTYPE_4
const OBJECTTYPE_5
const OBJECTTYPE_6
; EmotesPointers indexes (see engine/overworld.asm)

38
constants/sprite_data_constants.asm
View File

@ -25,7 +25,7 @@ const_value SET 1
const PAL_OW_TREE ; 6
const PAL_OW_ROCK ; 7
; person_events set bit 3 so as not to use the sprite's default palette
; object_events set bit 3 so as not to use the sprite's default palette
const_value set (1 << 3)
const PAL_NPC_RED ; 8
const PAL_NPC_BLUE ; 9
@ -138,25 +138,25 @@ SPRITEMOVEDATA_FIELDS EQU 6
const STEP_TYPE_18 ; 18
const STEP_TYPE_SKYFALL_TOP ; 19
; PersonActionPairPointers indexes (see engine/map_object_action.asm)
; ObjectActionPairPointers indexes (see engine/map_object_action.asm)
const_def
const PERSON_ACTION_00 ; 00
const PERSON_ACTION_STAND ; 01
const PERSON_ACTION_STEP ; 02
const PERSON_ACTION_BUMP ; 03
const PERSON_ACTION_SPIN ; 04
const PERSON_ACTION_SPIN_FLICKER ; 05
const PERSON_ACTION_FISHING ; 06
const PERSON_ACTION_SHADOW ; 07
const PERSON_ACTION_EMOTE ; 08
const PERSON_ACTION_BIG_SNORLAX ; 09
const PERSON_ACTION_BOUNCE ; 0a
const PERSON_ACTION_WEIRD_TREE ; 0b
const PERSON_ACTION_BIG_LAPRAS ; 0c
const PERSON_ACTION_BIG_DOLL ; 0d
const PERSON_ACTION_BOULDER_DUST ; 0e
const PERSON_ACTION_GRASS_SHAKE ; 0f
const PERSON_ACTION_SKYFALL ; 10
const OBJECT_ACTION_00 ; 00
const OBJECT_ACTION_STAND ; 01
const OBJECT_ACTION_STEP ; 02
const OBJECT_ACTION_BUMP ; 03
const OBJECT_ACTION_SPIN ; 04
const OBJECT_ACTION_SPIN_FLICKER ; 05
const OBJECT_ACTION_FISHING ; 06
const OBJECT_ACTION_SHADOW ; 07
const OBJECT_ACTION_EMOTE ; 08
const OBJECT_ACTION_BIG_SNORLAX ; 09
const OBJECT_ACTION_BOUNCE ; 0a
const OBJECT_ACTION_WEIRD_TREE ; 0b
const OBJECT_ACTION_BIG_LAPRAS ; 0c
const OBJECT_ACTION_BIG_DOLL ; 0d
const OBJECT_ACTION_BOULDER_DUST ; 0e
const OBJECT_ACTION_GRASS_SHAKE ; 0f
const OBJECT_ACTION_SKYFALL ; 10
; Facings indexes (see data/facings.asm)
const_def

14
constants/trainer_constants.asm
View File

@ -680,13 +680,13 @@ NUM_TRAINER_CLASSES EQU __enum__
; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm)
const_def
const TRNATTR_ITEM1
const TRNATTR_ITEM2
const TRNATTR_BASEMONEY
const TRNATTR_AI_MOVE_WEIGHTS
const TRNATTR_AI2
const TRNATTR_AI_ITEM_SWITCH
const TRNATTR_AI4
const TRNATTR_ITEM1 ; 0
const TRNATTR_ITEM2 ; 1
const TRNATTR_BASEMONEY ; 2
const TRNATTR_AI_MOVE_WEIGHTS ; 3
const TRNATTR_AI2 ; 4
const TRNATTR_AI_ITEM_SWITCH ; 5
const TRNATTR_AI4 ; 6
NUM_TRAINER_ATTRIBUTES EQU const_value
; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags)

2
data/engine_flags.asm
View File

@ -118,7 +118,7 @@ EngineFlags: ; 80462
engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58
engine_flag WeeklyFlags, 1 ; union cave lapras
engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used
engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07
engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
engine_flag WeeklyFlags, 4 ; tea in blues house
engine_flag WeeklyFlags, 5 ; indigo plateau rival fight
engine_flag WeeklyFlags, 6 ; move tutor

2
data/items/item_descriptions.asm
View File

@ -7,7 +7,7 @@ PrintItemDescription: ; 0x1c8955
ld [CurItem], a
push de
callba GetTMHMItemMove
farcall GetTMHMItemMove
pop hl
ld a, [wd265]
ld [CurSpecies], a

76
data/map_objects.asm
View File

@ -6,42 +6,42 @@ endm
SpriteMovementData:: ; 4273
; entries correspond to SPRITEMOVEDATA_* constants
; function, facing, action, flags1, flags2, palette flags
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 00
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 01
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 02
sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 03
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 04
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 05
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 06
sprite_movement_data SPRITEMOVEFN_STANDING, UP, PERSON_ACTION_STAND, $00, $00, %0000 ; 07
sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, PERSON_ACTION_STAND, $00, $00, %0000 ; 08
sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, PERSON_ACTION_STAND, $00, $00, %0000 ; 09
sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0a
sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 0b
sprite_movement_data SPRITEMOVEFN_08, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0c
sprite_movement_data SPRITEMOVEFN_09, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0d
sprite_movement_data SPRITEMOVEFN_0A, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0e
sprite_movement_data SPRITEMOVEFN_0B, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0f
sprite_movement_data SPRITEMOVEFN_0C, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 10
sprite_movement_data SPRITEMOVEFN_0D, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 11
sprite_movement_data SPRITEMOVEFN_0E, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 12
sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 13
sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 14
sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, PERSON_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; 15
sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, PERSON_ACTION_BOUNCE, $2e, $00, %0000 ; 16
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 17
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $2e, $10, %0000 ; 18
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_STAND, $2e, $00, %0100 ; 19
sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 1a
sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, PERSON_ACTION_00, $8e, $01, %0000 ; 1b
sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, PERSON_ACTION_EMOTE, $8e, $02, %0000 ; 1c
sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, PERSON_ACTION_00, $82, $00, %0000 ; 1d
sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, PERSON_ACTION_STAND, $00, $00, %0000 ; 1e
sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, PERSON_ACTION_STAND, $00, $00, %0000 ; 1f
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; 20
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_BIG_DOLL, $2e, $01, %1100 ; 21
sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, PERSON_ACTION_BOULDER_DUST, $8e, $01, %0000 ; 22
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, PERSON_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0010 ; 24
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 25
sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 00
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 01
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 02
sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 03
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 04
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 05
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 06
sprite_movement_data SPRITEMOVEFN_STANDING, UP, OBJECT_ACTION_STAND, $00, $00, %0000 ; 07
sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 08
sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 09
sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0a
sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 0b
sprite_movement_data SPRITEMOVEFN_08, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0c
sprite_movement_data SPRITEMOVEFN_09, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0d
sprite_movement_data SPRITEMOVEFN_0A, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0e
sprite_movement_data SPRITEMOVEFN_0B, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0f
sprite_movement_data SPRITEMOVEFN_0C, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 10
sprite_movement_data SPRITEMOVEFN_0D, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 11
sprite_movement_data SPRITEMOVEFN_0E, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 12
sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 13
sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 14
sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; 15
sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, OBJECT_ACTION_BOUNCE, $2e, $00, %0000 ; 16
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 17
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $2e, $10, %0000 ; 18
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_STAND, $2e, $00, %0100 ; 19
sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 1a
sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, OBJECT_ACTION_00, $8e, $01, %0000 ; 1b
sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, OBJECT_ACTION_EMOTE, $8e, $02, %0000 ; 1c
sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, OBJECT_ACTION_00, $82, $00, %0000 ; 1d
sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1e
sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1f
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; 20
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; 21
sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; 22
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; 24
sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 25
; 4357

89
data/maps/map_scenes.asm Normal file
View File

@ -0,0 +1,89 @@
scene_def: MACRO
; db group, map
; dw address
map \1
dw \2
ENDM
MapScenes:: ; 4d01e
scene_def POKECENTER_2F, wPokecenter2FSceneID
scene_def TRADE_CENTER, wTradeCenterSceneID
scene_def COLOSSEUM, wColosseumSceneID
scene_def TIME_CAPSULE, wTimeCapsuleSceneID
scene_def POWER_PLANT, wPowerPlantSceneID
scene_def CERULEAN_GYM, wCeruleanGymSceneID
scene_def ROUTE_25, wRoute25SceneID
scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID
scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID
scene_def SAFFRON_TRAIN_STATION, wSaffronTrainStationSceneID
scene_def ROUTE_16_GATE, wRoute16GateSceneID
scene_def ROUTE_17_18_GATE, wRoute1718GateSceneID
scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID
scene_def WILLS_ROOM, wWillsRoomSceneID
scene_def KOGAS_ROOM, wKogasRoomSceneID
scene_def BRUNOS_ROOM, wBrunosRoomSceneID
scene_def KARENS_ROOM, wKarensRoomSceneID
scene_def LANCES_ROOM, wLancesRoomSceneID
scene_def HALL_OF_FAME, wHallOfFameSceneID
scene_def ROUTE_27, wRoute27SceneID
scene_def NEW_BARK_TOWN, wNewBarkTownSceneID
scene_def ELMS_LAB, wElmsLabSceneID
scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID
scene_def ROUTE_29, wRoute29SceneID
scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID
scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID
scene_def ROUTE_32, wRoute32SceneID
scene_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID
scene_def ROUTE_36, wRoute36SceneID
scene_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID
scene_def AZALEA_TOWN, wAzaleaTownSceneID
scene_def GOLDENROD_GYM, wGoldenrodGymSceneID
scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID
scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID
scene_def OLIVINE_CITY, wOlivineCitySceneID
scene_def ROUTE_34, wRoute34SceneID
scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID
scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID
scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID
scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
scene_def ECRUTEAK_GYM, wEcruteakGymSceneID
scene_def MAHOGANY_TOWN, wMahoganyTownSceneID
scene_def ROUTE_42, wRoute42SceneID
scene_def CIANWOOD_CITY, wCianwoodCitySceneID
scene_def BATTLE_TOWER_1F, wBattleTower1FSceneID
scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID
scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID
scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID
scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID
scene_def ROUTE_43_GATE, wRoute43GateSceneID
scene_def MOUNT_MOON, wMountMoonSceneID
scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID
scene_def TIN_TOWER_1F, wTinTower1FSceneID
scene_def BURNED_TOWER_1F, wBurnedTower1FSceneID
scene_def BURNED_TOWER_B1F, wBurnedTowerB1FSceneID
scene_def RADIO_TOWER_5F, wRadioTower5FSceneID
scene_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID
scene_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID
scene_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID
scene_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID
scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID
scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID
scene_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID
scene_def MAHOGANY_MART_1F, wMahoganyMart1FSceneID
scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID
scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
scene_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesSceneID
scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID
scene_def VICTORY_ROAD, wVictoryRoadSceneID
scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID
scene_def DRAGON_SHRINE, wDragonShrineSceneID
scene_def OLIVINE_PORT, wOlivinePortSceneID
scene_def VERMILION_PORT, wVermilionPortSceneID
scene_def FAST_SHIP_1F, wFastShip1FSceneID
scene_def FAST_SHIP_B1F, wFastShipB1FSceneID
scene_def MOUNT_MOON_SQUARE, wMountMoonSquareSceneID
scene_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileSceneID
scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID
db -1
; 4d15b

89
data/maps/map_triggers.asm
View File

@ -1,89 +0,0 @@
trigger_def: MACRO
; db group, map
; dw address
map \1
dw \2
ENDM
MapTriggers:: ; 4d01e
trigger_def POKECENTER_2F, wPokecenter2FTrigger
trigger_def TRADE_CENTER, wTradeCenterTrigger
trigger_def COLOSSEUM, wColosseumTrigger
trigger_def TIME_CAPSULE, wTimeCapsuleTrigger
trigger_def POWER_PLANT, wPowerPlantTrigger
trigger_def CERULEAN_GYM, wCeruleanGymTrigger
trigger_def ROUTE_25, wRoute25Trigger
trigger_def TRAINER_HOUSE_B1F, wTrainerHouseB1FTrigger
trigger_def VICTORY_ROAD_GATE, wVictoryRoadGateTrigger
trigger_def SAFFRON_TRAIN_STATION, wSaffronTrainStationTrigger
trigger_def ROUTE_16_GATE, wRoute16GateTrigger
trigger_def ROUTE_17_18_GATE, wRoute1718GateTrigger
trigger_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FTrigger
trigger_def WILLS_ROOM, wWillsRoomTrigger
trigger_def KOGAS_ROOM, wKogasRoomTrigger
trigger_def BRUNOS_ROOM, wBrunosRoomTrigger
trigger_def KARENS_ROOM, wKarensRoomTrigger
trigger_def LANCES_ROOM, wLancesRoomTrigger
trigger_def HALL_OF_FAME, wHallOfFameTrigger
trigger_def ROUTE_27, wRoute27Trigger
trigger_def NEW_BARK_TOWN, wNewBarkTownTrigger
trigger_def ELMS_LAB, wElmsLabTrigger
trigger_def KRISS_HOUSE_1F, wKrissHouse1FTrigger
trigger_def ROUTE_29, wRoute29Trigger
trigger_def CHERRYGROVE_CITY, wCherrygroveCityTrigger
trigger_def MR_POKEMONS_HOUSE, wMrPokemonsHouseTrigger
trigger_def ROUTE_32, wRoute32Trigger
trigger_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateTrigger
trigger_def ROUTE_36, wRoute36Trigger
trigger_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateTrigger
trigger_def AZALEA_TOWN, wAzaleaTownTrigger
trigger_def GOLDENROD_GYM, wGoldenrodGymTrigger
trigger_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationTrigger
trigger_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FTrigger
trigger_def OLIVINE_CITY, wOlivineCityTrigger
trigger_def ROUTE_34, wRoute34Trigger
trigger_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateTrigger
trigger_def ECRUTEAK_HOUSE, wEcruteakHouseTrigger
trigger_def WISE_TRIOS_ROOM, wWiseTriosRoomTrigger
trigger_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FTrigger
trigger_def ECRUTEAK_GYM, wEcruteakGymTrigger
trigger_def MAHOGANY_TOWN, wMahoganyTownTrigger
trigger_def ROUTE_42, wRoute42Trigger
trigger_def CIANWOOD_CITY, wCianwoodCityTrigger
trigger_def BATTLE_TOWER_1F, wBattleTower1FTrigger
trigger_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomTrigger
trigger_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorTrigger
trigger_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwayTrigger
trigger_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideTrigger
trigger_def ROUTE_43_GATE, wRoute43GateTrigger
trigger_def MOUNT_MOON, wMountMoonTrigger
trigger_def SPROUT_TOWER_3F, wSproutTower3FTrigger
trigger_def TIN_TOWER_1F, wTinTower1FTrigger
trigger_def BURNED_TOWER_1F, wBurnedTower1FTrigger
trigger_def BURNED_TOWER_B1F, wBurnedTowerB1FTrigger
trigger_def RADIO_TOWER_5F, wRadioTower5FTrigger
trigger_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideTrigger
trigger_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterTrigger
trigger_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberTrigger
trigger_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberTrigger
trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger
trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger
trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger
trigger_def MAHOGANY_MART_1F, wMahoganyMart1FTrigger
trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger
trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger
trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger
trigger_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesTrigger
trigger_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3Trigger
trigger_def VICTORY_ROAD, wVictoryRoadTrigger
trigger_def DRAGONS_DEN_B1F, wDragonsDenB1FTrigger
trigger_def DRAGON_SHRINE, wDragonShrineTrigger
trigger_def OLIVINE_PORT, wOlivinePortTrigger
trigger_def VERMILION_PORT, wVermilionPortTrigger
trigger_def FAST_SHIP_1F, wFastShip1FTrigger
trigger_def FAST_SHIP_B1F, wFastShipB1FTrigger
trigger_def MOUNT_MOON_SQUARE, wMountMoonSquareTrigger
trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger
trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger
db -1
; 4d15b

2
data/maps/outdoor_sprites.asm
View File

@ -1,5 +1,5 @@
; Valid sprite IDs for each map group.
; Maps with permission ROUTE or TOWN can only use these sprites.
; Maps with environment ROUTE or TOWN can only use these sprites.
OutdoorSprites: ; 144b8
dw OlivineGroupSprites

30
docs/event_commands.md
View File

@ -37,13 +37,13 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr
## `$10`: `ptcallasm` *asm*
## `$11`: `checkmaptriggers` *map*
## `$11`: `checkmapscene` *map*
## `$12`: `domaptrigger` *map*, *trigger_id*
## `$12`: `setmapscene` *map*, *scene_id*
## `$13`: `checktriggers`
## `$13`: `checkscene`
## `$14`: `dotrigger` *trigger_id*
## `$14`: `setscene` *scene_id*
## `$15`: `writebyte` *value*
@ -215,37 +215,37 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr
## `$67`: `check_just_battled`
## `$68`: `setlasttalked` *person*
## `$68`: `setlasttalked` *object_id*
## `$69`: `applymovement` *person*, *data_pointer*
## `$69`: `applymovement` *object_id*, *data_pointer*
## `$6A`: `applymovement2` *data_pointer*
## `$6B`: `faceplayer`
## `$6C`: `faceperson` *person1*, *person2*
## `$6C`: `faceobject` *object1*, *object2*
## `$6D`: `variablesprite` *variable_sprite_id*, *sprite_id*
## `$6E`: `disappear` *person*
## `$6E`: `disappear` *object_id*
## `$6F`: `appear` *person*
## `$6F`: `appear` *object_id*
## `$70`: `follow` *person2*, *person1*
## `$70`: `follow` *object2*, *object1*
## `$71`: `stopfollow`
## `$72`: `moveperson` *person*, *x*, *y*
## `$72`: `moveobject` *object_id*, *x*, *y*
## `$73`: `writepersonxy` *person*
## `$73`: `writeobjectxy` *object_id*
## `$74`: `loademote` *emote_id*
## `$75`: `showemote` *emote_id*, *person*, *length*
## `$75`: `showemote` *emote_id*, *object_id*, *length*
## `$76`: `spriteface` *person*, *facing*
## `$76`: `spriteface` *object_id*, *facing*
## `$77`: `follownotexact` *person2*, *person1*
## `$77`: `follownotexact` *object2*, *object1*
## `$78`: `earthquake` *param*

38
docs/map_scripts.md
View File

@ -3,15 +3,15 @@
## `const_value set 2`
- **`const` *`MAPNAME_PERSONNAME`***
- **`const` *`MAPNAME_OBJECTNAME`***
## `MapName_MapScriptHeader:`
## `.MapTriggers: db` *N*
## `.SceneScripts: db` *N*
- **`maptrigger` *script***
- **`scene_script` *script***
## `.MapCallbacks: db` *N*
@ -63,34 +63,34 @@ Callback types:
- **`warp_def` *y*, *x*, *warp_id*, *map***
## `.XYTriggers: db` *N*
## `.CoordEvents: db` *N*
- **`xy_trigger` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`**
- **`coord_event` *scene id*, *y*, *x*, *script***
## `.Signposts: db` *N*
## `.BGEvents: db` *N*
- **`signpost` *y*, *x*, *type*, *script***
- **`bg_event` *y*, *x*, *type*, *script***
Signpost types:
BG event types:
- **`SIGNPOST_READ`**
- **`BGEVENT_READ`**
- **`SIGNPOST_UP/DOWN/LEFT/RIGHT`**
- **`BGEVENT_UP/DOWN/LEFT/RIGHT`**
- **`SIGNPOST_IFSET/IFNOTSET`**
- **`BGEVENT_IFSET/IFNOTSET`**
**`dw` *event_flag*, *script***
- **`SIGNPOST_ITEM`**
- **`BGEVENT_ITEM`**
**`dwb` *event_flag*, *item_id***
- **`SIGNPOST_COPY`**
- **`BGEVENT_COPY`**
## `.PersonEvents: db` *N*
## `.ObjectEvents: db` *N*
- **`person_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag***
- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *h1*, *h2*, *palette*, *type*, *range*, *script*, *event_flag***
Movement types:
@ -126,14 +126,14 @@ Movement types:
- **`SPRITEMOVEDATA_LAPRAS`**
Person types:
Object types:
- **`PERSONTYPE_SCRIPT`**
- **`OBJECTTYPE_SCRIPT`**
- **`PERSONTYPE_ITEMBALL`**
- **`OBJECTTYPE_ITEMBALL`**
**`itemball` *item_id***
- **`PERSONTYPE_TRAINER`**
- **`OBJECTTYPE_TRAINER`**
**`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script***

6
docs/movement_commands.md
View File

@ -39,9 +39,9 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
## `$3B`: `fix_facing`
## `$3C`: `show_person`
## `$3C`: `show_object`
## `$3D`: `hide_person`
## `$3D`: `hide_object`
## `$3E`−`$46`: `step_sleep` *length*
@ -49,7 +49,7 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
## `$48`: `step_48` *param*
## `$49`: `remove_person`
## `$49`: `remove_object`
## `$4A`: `step_loop`

2
engine/anim_hp_bar.asm
View File

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

14
engine/battle_transition.asm
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
@ -208,10 +208,10 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
jr nc, .okay
set 0, e
.okay
ld a, [wPermission]
ld a, [wEnvironment]
cp CAVE
jr z, .okay2
cp PERM_5
cp ENVIRONMENT_5
jr z, .okay2
cp DUNGEON
jr z, .okay2
@ -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

44
engine/billspc.asm
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
@ -1108,7 +1108,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
predef GetUnownLetter
call GetBaseData
ld de, VTiles2 tile $00
predef GetFrontpic
predef GetMonFrontpic
xor a
ld [wBillsPC_MonHasMail], a
ld a, [CurPartySpecies]
@ -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

12
engine/billspctop.asm
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

18
engine/breeding.asm
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
@ -649,7 +649,7 @@ GetEggFrontpic: ; 17224 (5:7224)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
predef_jump GetFrontpic
predef_jump GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c)
push de
@ -659,7 +659,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
predef_jump FrontpicPredef
predef_jump GetAnimatedFrontpicPredef
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af
@ -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]

4
engine/buy_sell_toss.asm
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

6
engine/caught_data.asm
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:

4
engine/cgb_layouts.asm
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

4
engine/clock_reset.asm
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

12
engine/color.asm
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,11 +1306,11 @@ 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
ld a, [wPermission]
ld a, [wEnvironment]
and 7
ld e, a
ld d, 0
@ -1377,7 +1377,7 @@ LoadMapPals:
ld a, BANK(UnknOBPals)
call FarCopyWRAM
ld a, [wPermission]
ld a, [wEnvironment]
cp TOWN
jr z, .outside
cp ROUTE
@ -1411,7 +1411,7 @@ endr
dw .OutdoorColors ; ROUTE
dw .IndoorColors ; INDOOR
dw .DungeonColors ; CAVE
dw .Perm5Colors ; PERM_5
dw .Perm5Colors ; ENVIRONMENT_5
dw .IndoorColors ; GATE
dw .DungeonColors ; DUNGEON

2
engine/consume_held_item.asm
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]

18
engine/crystal_colors.asm
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

38
engine/crystal_intro.asm
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

6
engine/debug.asm
View File

@ -315,7 +315,7 @@ Function81adb: ; 81adb
hlcoord 12, 3
call _PrepMonFrontpic
ld de, VTiles2 tile $31
predef GetBackpic
predef GetMonBackpic
ld a, $31
ld [hGraphicStartTile], a
hlcoord 2, 4
@ -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

2
engine/decorations.asm
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

6
engine/delete_save_change_clock.asm
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

37
engine/dma_transfer.asm
View File

@ -5,10 +5,10 @@ HDMATransferAttrMapAndTileMapToWRAMBank3:: ; 104000
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
ld a, $0
ld [rVBK], a
ld hl, wScratchTileMap
@ -27,7 +27,7 @@ HDMATransferTileMapToWRAMBank3:: ; 10402d
.Function:
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
ld a, $0
ld [rVBK], a
ld hl, wScratchTileMap
@ -42,7 +42,7 @@ HDMATransferAttrMapToWRAMBank3: ; 104047
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
ld a, $1
ld [rVBK], a
ld hl, wScratchAttrMap
@ -57,10 +57,10 @@ ReloadMapPart:: ; 104061
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@ -88,10 +88,10 @@ Mobile_ReloadMapPart: ; 104099
.Function:
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@ -161,10 +161,10 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110
; Fill vBGTiles with " "
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteTilemap
call PadTilemapForHDMATransfer
call DelayFrame
di
@ -194,11 +194,11 @@ Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148)
; Fill vBGTiles with $ff
decoord 0, 0, AttrMap
ld hl, wScratchAttrMap
call CutAndPasteAttrMap
call PadAttrMapForHDMATransfer
ld c, $ff
decoord 0, 0
ld hl, wScratchTileMap
call CutAndPasteMap
call PadMapForHDMATransfer
ld a, $1
ld [rVBK], a
@ -422,15 +422,16 @@ _LoadHDMAParameters: ; 10424e (41:424e)
ld [rHDMA4], a
ret
CutAndPasteTilemap: ; 10425f (41:425f)
PadTilemapForHDMATransfer: ; 10425f (41:425f)
ld c, " "
jr CutAndPasteMap
jr PadMapForHDMATransfer
CutAndPasteAttrMap: ; 104263 (41:4263)
PadAttrMapForHDMATransfer: ; 104263 (41:4263)
ld c, $0
CutAndPasteMap: ; 104265 (41:4265)
; back up the value of c to hMapObjectIndexBuffer
PadMapForHDMATransfer: ; 104265 (41:4265)
; pad a 20x18 map to 32x18 for HDMA transfer
; back up the padding value in c to hMapObjectIndexBuffer
ld a, [hMapObjectIndexBuffer]
push af
ld a, c
@ -449,7 +450,7 @@ CutAndPasteMap: ; 104265 (41:4265)
dec b
jr nz, .loop2
; load the original value of c into hl 12 times
; load the original padding value of c into hl for 32 - 20 = 12 rows
ld a, [hMapObjectIndexBuffer]
ld b, BG_MAP_WIDTH - SCREEN_WIDTH
.loop3

4
engine/dummy_game.asm
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

110
engine/events.asm
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
@ -286,7 +286,7 @@ PlayerEvents: ; 9681f
call RunMemScript
jr c, .ok
call DoMapTrigger
call RunSceneScript
jr c, .ok
call CheckTimeEvents
@ -300,7 +300,7 @@ PlayerEvents: ; 9681f
.ok
push af
callba EnableScriptMode
farcall EnableScriptMode
pop af
ld [ScriptRunning], a
@ -335,12 +335,12 @@ CheckTrainerBattle3: ; 96867
; 96874
CheckTileEvent: ; 96874
; Check for warps, tile triggers or wild battles.
; Check for warps, coord events, or wild battles.
call CheckWarpConnxnScriptFlag
jr z, .connections_disabled
callba CheckMovingOffEdgeOfMap
farcall CheckMovingOffEdgeOfMap
jr c, .map_connection
call CheckWarpTile
@ -350,7 +350,7 @@ CheckTileEvent: ; 96874
call CheckCoordEventScriptFlag
jr z, .coord_events_disabled
call CheckCurrentMapXYTriggers
call CheckCurrentMapCoordEvents
jr c, .coord_event
.coord_events_disabled
@ -437,19 +437,19 @@ Dummy_CheckScriptFlags3Bit5: ; 968e4
ret
; 968ec
DoMapTrigger: ; 968ec
ld a, [wCurrMapTriggerCount]
RunSceneScript: ; 968ec
ld a, [wCurrMapSceneScriptCount]
and a
jr z, .nope
ld c, a
call CheckTriggers
call CheckScenes
cp c
jr nc, .nope
ld e, a
ld d, 0
ld hl, wCurrMapTriggerHeaderPointer
ld hl, wCurrMapSceneScriptHeaderPointer
ld a, [hli]
ld h, [hl]
ld l, a
@ -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
@ -559,9 +559,9 @@ CheckAPressOW: ; 96999
ret z
call TryObjectEvent
ret c
call TryReadSign
call TryBGEvent
ret c
call CheckFacingTileEvent
call TryTileCollisionEvent
ret c
xor a
ret
@ -576,7 +576,7 @@ PlayTalkObject: ; 969ac
; 969b5
TryObjectEvent: ; 969b5
callba CheckFacingObject
farcall CheckFacingObject
jr c, .IsObject
xor a
ret
@ -617,14 +617,14 @@ TryObjectEvent: ; 969b5
ret
.pointers
dbw PERSONTYPE_SCRIPT, .script
dbw PERSONTYPE_ITEMBALL, .itemball
dbw PERSONTYPE_TRAINER, .trainer
dbw OBJECTTYPE_SCRIPT, .script
dbw OBJECTTYPE_ITEMBALL, .itemball
dbw OBJECTTYPE_TRAINER, .trainer
; the remaining four are dummy events
dbw PERSONTYPE_3, .three
dbw PERSONTYPE_4, .four
dbw PERSONTYPE_5, .five
dbw PERSONTYPE_6, .six
dbw OBJECTTYPE_3, .three
dbw OBJECTTYPE_4, .four
dbw OBJECTTYPE_5, .five
dbw OBJECTTYPE_6, .six
db -1
; 96a04
@ -681,19 +681,19 @@ TryObjectEvent: ; 969b5
ret
; 96a38
TryReadSign: ; 96a38
call CheckFacingSign
jr c, .IsSign
TryBGEvent: ; 96a38
call CheckFacingBGEvent
jr c, .is_bg_event
xor a
ret
.IsSign:
.is_bg_event:
ld a, [EngineBuffer3]
ld hl, .signs
ld hl, .bg_events
rst JumpTable
ret
.signs
.bg_events
dw .read
dw .up
dw .down
@ -736,7 +736,7 @@ TryReadSign: ; 96a38
ret
.itemifset
call CheckSignFlag
call CheckBGEventFlag
jp nz, .dontread
call PlayTalkObject
call GetMapScriptHeaderBank
@ -750,7 +750,7 @@ TryReadSign: ; 96a38
ret
.copy
call CheckSignFlag
call CheckBGEventFlag
jr nz, .dontread
call GetMapScriptHeaderBank
ld de, EngineBuffer1
@ -759,12 +759,12 @@ TryReadSign: ; 96a38
jr .dontread
.ifset
call CheckSignFlag
call CheckBGEventFlag
jr z, .dontread
jr .thenread
.ifnotset
call CheckSignFlag
call CheckBGEventFlag
jr nz, .dontread
.thenread
@ -785,7 +785,7 @@ TryReadSign: ; 96a38
ret
; 96ad8
CheckSignFlag: ; 96ad8
CheckBGEventFlag: ; 96ad8
ld hl, EngineBuffer4
ld a, [hli]
ld h, [hl]
@ -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

26
engine/events_2.asm
View File

@ -50,42 +50,42 @@ LoadScriptBDE:: ; 97c4f
ret
; 97c5f
CheckFacingTileEvent:: ; 97c5f
TryTileCollisionEvent:: ; 97c5f
call GetFacingTileCoord
ld [EngineBuffer1], a
ld c, a
callba CheckFacingTileForStd
farcall CheckFacingTileForStdScript
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
@ -152,12 +152,12 @@ CanUseSweetScent:: ; 97cfd
ld hl, StatusFlags
bit 5, [hl]
jr nz, .no
ld a, [wPermission]
ld a, [wEnvironment]
cp CAVE
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

48
engine/events_3.asm
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]
@ -18,7 +18,7 @@ ReturnFromMapSetupScript:: ; b8000
call .CheckNationalParkGate
jr z, .nationalparkgate
call GetMapPermission
call GetMapEnvironment
cp GATE
jr nz, .not_gate
@ -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
@ -283,30 +283,30 @@ CheckForHiddenItems: ; b8172
ld a, [YCoord]
add SCREEN_HEIGHT / 4
ld [Buffer3], a
; Get the pointer for the first signpost header in the map...
ld hl, wCurrentMapSignpostHeaderPointer
; Get the pointer for the first BG event header in the map...
ld hl, wCurrMapBGEventHeaderPointer
ld a, [hli]
ld h, [hl]
ld l, a
; ... before even checking to see if there are any signposts on this map.
ld a, [wCurrentMapSignpostCount]
; ... before even checking to see if there are any BG events on this map.
ld a, [wCurrMapBGEventCount]
and a
jr z, .nosignpostitems
; For i = 1:wCurrentMapSignpostCount...
jr z, .nobgeventitems
; For i = 1:wCurrMapBGEventCount...
.loop
; Store the counter in Buffer2, and store the signpost header pointer in the stack.
; Store the counter in Buffer2, and store the BG event header pointer in the stack.
ld [Buffer2], a
push hl
; Get the Y coordinate of the signpost.
; Get the Y coordinate of the BG event.
call .GetFarByte
ld e, a
; Is the Y coordinate of the signpost on the screen? If not, go to the next signpost.
; Is the Y coordinate of the BG event on the screen? If not, go to the next BG event.
ld a, [Buffer3]
sub e
jr c, .next
cp SCREEN_HEIGHT / 2
jr nc, .next
; Is the X coordinate of the signpost on the screen? If not, go to the next signpost.
; Is the X coordinate of the BG event on the screen? If not, go to the next BG event.
call .GetFarByte
ld d, a
ld a, [Buffer4]
@ -314,9 +314,9 @@ CheckForHiddenItems: ; b8172
jr c, .next
cp SCREEN_WIDTH / 2
jr nc, .next
; Is this signpost a hidden item? If not, go to the next signpost.
; Is this BG event a hidden item? If not, go to the next BG event.
call .GetFarByte
cp SIGNPOST_ITEM
cp BGEVENT_ITEM
jr nz, .next
; Has this item already been found? If not, set off the Itemfinder.
ld a, [Buffer1]
@ -332,16 +332,16 @@ CheckForHiddenItems: ; b8172
jr z, .itemnearby
.next
; Restore the signpost header pointer and increment it by the length of a signpost header.
; Restore the BG event header pointer and increment it by the length of a BG event header.
pop hl
ld bc, 5
add hl, bc
; Restore the signpost counter and decrement it. If it hits zero, there are no hidden items in range.
; Restore the BG event counter and decrement it. If it hits zero, there are no hidden items in range.
ld a, [Buffer2]
dec a
jr nz, .loop
.nosignpostitems
.nobgeventitems
xor a
ret
@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172
TreeMonEncounter: ; b81ea
callba TrainerRankings_TreeEncounters
farcall TrainerRankings_TreeEncounters
xor a
ld [TempWildMonSpecies], a

12
engine/evolution_animation.asm
View File

@ -36,7 +36,7 @@ EvolutionAnimation: ; 4e5e1
ld de, MUSIC_NONE
call PlayMusic
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld de, .GFX
ld hl, VTiles0
@ -106,7 +106,7 @@ EvolutionAnimation: ; 4e5e1
ld c, $0
call .GetSGBLayout
call .PlayEvolvedSFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
call .check_statused
jr c, .no_anim
@ -143,7 +143,7 @@ EvolutionAnimation: ; 4e5e1
ld c, $0
call .GetSGBLayout
call .PlayEvolvedSFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
call .check_statused
ret c
@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1
ld a, $1
ld [wBoxAlignment], a
ld de, VTiles2
predef FrontpicPredef
predef GetAnimatedFrontpicPredef
xor a
ld [wBoxAlignment], a
ret
@ -263,7 +263,7 @@ EvolutionAnimation: ; 4e5e1
call GetPartyLocation
ld b, h
ld c, l
callba CheckFaintedFrzSlp
farcall CheckFaintedFrzSlp
ret
; 4e7a6
@ -337,7 +337,7 @@ EvolutionAnimation: ; 4e5e1
.AnimateBallsOfLight: ; 4e80c
push bc
callab PlaySpriteAnimations
callfar PlaySpriteAnimations
; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES
ld a, [hVBlankCounter]
and %1110

6
engine/evolve.asm
View File

@ -225,7 +225,7 @@ EvolveAfterBattle_MasterLoop
ld [hBGMapMode], a
call ClearSprites
callba EvolutionAnimation
farcall EvolutionAnimation
push af
call ClearSprites
@ -247,7 +247,7 @@ EvolveAfterBattle_MasterLoop
push hl
ld hl, Text_EvolvedIntoPKMN
call PrintTextBoxText
callba TrainerRankings_MonsEvolved
farcall TrainerRankings_MonsEvolved
ld de, MUSIC_NONE
call PlayMusic
@ -312,7 +312,7 @@ EvolveAfterBattle_MasterLoop
ld hl, TempMonDVs
predef GetUnownLetter
callab UpdateUnownDex
callfar UpdateUnownDex
.skip_unown
pop de

2
engine/fruit_trees.asm
View File

@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
; 4405f
PickedFruitTree: ; 4405f
callba TrainerRankings_FruitPicked
farcall TrainerRankings_FruitPicked
ld b, 1
jp GetFruitTreeFlag
; 4406a

4
engine/get_breedmon_growth.asm
View File

@ -3,7 +3,7 @@ GetBreedMon1LevelGrowth: ; e698
ld de, TempMon
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
callab CalcLevel
callfar CalcLevel
ld a, [wBreedMon1Level]
ld b, a
ld a, d
@ -17,7 +17,7 @@ GetBreedMon2LevelGrowth: ; e6b3
ld de, TempMon
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
callab CalcLevel
callfar CalcLevel
ld a, [wBreedMon2Level]
ld b, a
ld a, d

2
engine/health.asm
View File

@ -49,7 +49,7 @@ HealPartyMon: ; c677
ld a, [hl]
ld [bc], a
callba RestoreAllPP
farcall RestoreAllPP
ret
ComputeHPBarPixels: ; c699

2
engine/init_gender.asm
View File

@ -92,7 +92,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
ld bc, 1 palettes
ld a, $5
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
ret
; 48e5c (12:4e5c)

6
engine/init_map.asm
View File

@ -30,14 +30,14 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
ld a, VBGMap1 / $100
call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
callba LoadOW_BGPal7
callba ApplyPals
farcall LoadOW_BGPal7
farcall ApplyPals
ld a, $1
ld [hCGBPalUpdate], a
xor a
ld [hBGMapMode], a
ld [hWY], a
callba HDMATransfer_FillBGMap0WithBlack ; no need to farcall
farcall HDMATransfer_FillBGMap0WithBlack ; no need to farcall
ld a, VBGMap0 / $100
call .LoadBGMapAddrIntoHRAM
xor a

80
engine/intro_menu.asm
View File

@ -6,7 +6,7 @@ _MainMenu: ; 5ae8
ld a, e
ld [wMapMusic], a
call PlayMusic
callba MainMenu
farcall MainMenu
jp StartTitleScreen
; 5b04
@ -56,13 +56,13 @@ NewGame_ClearTileMapEtc: ; 5b44
MysteryGift: ; 5b54
call UpdateTime
callba DoMysteryGiftIfDayHasPassed
callba DoMysteryGift
farcall DoMysteryGiftIfDayHasPassed
farcall DoMysteryGift
ret
; 5b64
OptionsMenu: ; 5b64
callba _OptionsMenu
farcall _OptionsMenu
ret
; 5b6b
@ -86,14 +86,14 @@ NewGame: ; 5b6b
; 5b8f
AreYouABoyOrAreYouAGirl: ; 5b8f
callba Mobile_AlwaysReturnNotCarry ; some mobile stuff
farcall Mobile_AlwaysReturnNotCarry ; some mobile stuff
jr c, .ok
callba InitGender
farcall InitGender
ret
.ok
ld c, 0
callba InitMobileProfile ; mobile
farcall InitMobileProfile ; mobile
ret
; 5ba7
@ -220,11 +220,11 @@ ENDC
call InitializeNPCNames
callba InitDecorations
farcall InitDecorations
callba DeletePartyMonMail
farcall DeletePartyMonMail
callba DeleteMobileEventIndex
farcall DeleteMobileEventIndex
call ResetGameTime
ret
@ -316,8 +316,8 @@ InitializeNPCNames: ; 5ce9
InitializeWorld: ; 5d23
call ShrinkPlayer
callba SpawnPlayer
callba _InitializeStartDay
farcall SpawnPlayer
farcall _InitializeStartDay
ret
; 5d33
@ -349,9 +349,9 @@ LoadOrRegenerateLuckyIDNumber: ; 5d33
; 5d65
Continue: ; 5d65
callba TryLoadSaveFile
farcall TryLoadSaveFile
jr c, .FailToLoad
callba _LoadData
farcall _LoadData
call LoadStandardMenuDataHeader
call DisplaySaveInfoOnContinue
ld a, $1
@ -382,9 +382,9 @@ Continue: ; 5d65
call ClearTileMap
ld c, 20
call DelayFrames
callba JumpRoamMons
callba MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
callba Function140ae ; time-related
farcall JumpRoamMons
farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
farcall Function140ae ; time-related
ld a, [wSpawnAfterChampion]
cp SPAWN_LANCE
jr z, .SpawnAfterE4
@ -416,7 +416,7 @@ PostCreditsSpawn: ; 5de7
; 5df0
Continue_MobileAdapterMenu: ; 5df0
callba Mobile_AlwaysReturnNotCarry ; mobile check
farcall Mobile_AlwaysReturnNotCarry ; mobile check
ret nc
; the rest of this stuff is never reached because
@ -433,8 +433,8 @@ Continue_MobileAdapterMenu: ; 5df0
ld c, 20
call DelayFrames
ld c, $1
callba InitMobileProfile ; mobile
callba _SaveData
farcall InitMobileProfile ; mobile
farcall _SaveData
ld a, 8
ld [MusicFade], a
ld a, MUSIC_NONE % $100
@ -466,7 +466,7 @@ Continue_CheckRTC_RestartClock: ; 5e48
call CheckRTCStatus
and %10000000 ; Day count exceeded 16383
jr z, .pass
callba RestartClock
farcall RestartClock
ld a, c
and a
jr z, .pass
@ -488,7 +488,7 @@ FinishContinueFunction: ; 5e5d
res 7, [hl]
ld hl, wEnteredMapFromContinue
set 1, [hl]
callba OverworldLoop
farcall OverworldLoop
ld a, [wSpawnAfterChampion]
cp SPAWN_RED
jr z, .AfterRed
@ -671,7 +671,7 @@ Continue_DisplayGameTime: ; 5f84
OakSpeech: ; 0x5f99
callba InitClock
farcall InitClock
call RotateFourPalettesLeft
call ClearTileMap
@ -735,7 +735,7 @@ OakSpeech: ; 0x5f99
xor a
ld [CurPartySpecies], a
callba DrawIntroPlayerPic
farcall DrawIntroPlayerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
@ -782,20 +782,20 @@ OakText7: ; 0x606f
db "@"
NamePlayer: ; 0x6074
callba MovePlayerPicRight
callba ShowPlayerNamingChoices
farcall MovePlayerPicRight
farcall ShowPlayerNamingChoices
ld a, [wMenuCursorY]
dec a
jr z, .NewName
call StorePlayerName
callba ApplyMonOrTrainerPals
callba MovePlayerPicLeft
farcall ApplyMonOrTrainerPals
farcall MovePlayerPicLeft
ret
.NewName:
ld b, 1
ld de, PlayerName
callba NamingScreen
farcall NamingScreen
call RotateThreePalettesRight
call ClearTileMap
@ -805,7 +805,7 @@ NamePlayer: ; 0x6074
xor a
ld [CurPartySpecies], a
callba DrawIntroPlayerPic
farcall DrawIntroPlayerPic
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
@ -943,7 +943,7 @@ Intro_WipeInFrontpic: ; 6182
Intro_PrepTrainerPic: ; 619c
ld de, VTiles2
callba GetTrainerPic
farcall GetTrainerPic
xor a
ld [hGraphicStartTile], a
hlcoord 6, 4
@ -966,7 +966,7 @@ ShrinkFrame: ; 61b4
Intro_PlacePlayerSprite: ; 61cd
callba GetPlayerIcon
farcall GetPlayerIcon
ld c, $c
ld hl, VTiles0
call Request2bpp
@ -1012,9 +1012,9 @@ Intro_PlacePlayerSprite: ; 61cd
CrystalIntroSequence: ; 620b
callab Copyright_GFPresents
callfar Copyright_GFPresents
jr c, StartTitleScreen
callba CrystalIntro
farcall CrystalIntro
StartTitleScreen: ; 6219
ld a, [rSVBK]
@ -1075,7 +1075,7 @@ StartTitleScreen: ; 6219
.TitleScreen: ; 6274
callba _TitleScreen
farcall _TitleScreen
ret
; 627b
@ -1084,7 +1084,7 @@ RunTitleScreen: ; 627b
bit 7, a
jr nz, .done_title
call TitleScreenScene
callba SuicuneFrameIterator
farcall SuicuneFrameIterator
call DelayFrame
and a
ret
@ -1162,7 +1162,7 @@ TitleScreenEntrance: ; 62bc
dec b
jr nz, .loop
callba AnimateTitleCrystal
farcall AnimateTitleCrystal
ret
.done
@ -1320,12 +1320,12 @@ TitleScreenEnd: ; 6375
; 6389
DeleteSaveData: ; 6389
callba _DeleteSaveData
farcall _DeleteSaveData
jp Init
; 6392
ResetClock: ; 6392
callba _ResetClock
farcall _ResetClock
jp Init
; 639b
@ -1401,7 +1401,7 @@ CopyrightString: ; 63fd
; 642e
GameInit:: ; 642e
callba TryLoadSaveData
farcall TryLoadSaveData
call ClearWindowData
call ClearBGPalettes
call ClearTileMap

88
engine/item_effects.asm
View File

@ -358,7 +358,7 @@ ParkBall: ; e8a2
ld d, a
push de
; BUG: callba overwrites a,
; BUG: farcall overwrites a,
; and GetItemHeldEffect takes b anyway.
; This is probably the reason
@ -369,7 +369,7 @@ ParkBall: ; e8a2
ld a, [BattleMonItem]
; ld b, a
callba GetItemHeldEffect
farcall GetItemHeldEffect
ld a, b
cp HELD_CATCH_CHANCE
@ -478,7 +478,7 @@ ParkBall: ; e8a2
ld [CurPartySpecies], a
ld a, [EnemyMonLevel]
ld [CurPartyLevel], a
callba LoadEnemyMon
farcall LoadEnemyMon
pop af
ld [EnemySubStatus5], a
@ -517,7 +517,7 @@ ParkBall: ; e8a2
cp BATTLETYPE_TUTORIAL
jp z, .FinishTutorial
callba TrainerRankings_WildMonsCaught
farcall TrainerRankings_WildMonsCaught
ld hl, Text_GotchaMonWasCaught
call PrintText
@ -569,7 +569,7 @@ ParkBall: ; e8a2
predef TryAddMonToParty
callba SetCaughtData
farcall SetCaughtData
ld a, [CurItem]
cp FRIEND_BALL
@ -608,7 +608,7 @@ ParkBall: ; e8a2
xor a ; PARTYMON
ld [MonType], a
ld b, 0
callba NamingScreen
farcall NamingScreen
call RotateThreePalettesRight
@ -625,7 +625,7 @@ ParkBall: ; e8a2
predef SentPkmnIntoBox
callba SetBoxMonCaughtData
farcall SetBoxMonCaughtData
ld a, BANK(sBoxCount)
call GetSRAMBank
@ -661,7 +661,7 @@ ParkBall: ; e8a2
ld [MonType], a
ld de, wMonOrItemNameBuffer
ld b, $0
callba NamingScreen
farcall NamingScreen
ld a, BANK(sBoxMonNicknames)
call GetSRAMBank
@ -696,7 +696,7 @@ ParkBall: ; e8a2
jr .return_from_capture
.catch_bug_contest_mon
callba BugContest_SetCaughtContestMon
farcall BugContest_SetCaughtContestMon
jr .return_from_capture
.FinishTutorial:
@ -985,7 +985,7 @@ LoveBallMultiplier:
ld [MonType], a
ld a, [CurBattleMon]
ld [CurPartyMon], a
callba GetGender
farcall GetGender
jr c, .done1 ; no effect on genderless
ld d, 0 ; male
@ -999,7 +999,7 @@ LoveBallMultiplier:
ld [CurPartySpecies], a
ld a, WILDMON
ld [MonType], a
callba GetGender
farcall GetGender
jr c, .done2 ; no effect on genderless
ld d, 0 ; male
@ -1173,17 +1173,17 @@ Text_AskNicknameNewlyCaughtMon: ; 0xedf5
; 0xedfa
ReturnToBattle_UseBall: ; edfa (3:6dfa)
callba _ReturnToBattle_UseBall
farcall _ReturnToBattle_UseBall
ret
TownMap: ; ee01
callba PokegearMap
farcall PokegearMap
ret
; ee08
Bicycle: ; ee08
callba BikeFunction
farcall BikeFunction
ret
; ee0f
@ -1208,7 +1208,7 @@ SunStone: ; ee0f
ld a, $1
ld [wForceEvolution], a
callba EvolvePokemon
farcall EvolvePokemon
ld a, [wMonTriedToEvolve]
and a
@ -1269,7 +1269,7 @@ Calcium: ; ee3d
call PrintText
ld c, HAPPINESS_USEDITEM
callba ChangeHappiness
farcall ChangeHappiness
jp UseDisposableItem
@ -1383,7 +1383,7 @@ RareCandy: ; ef14
ld [CurPartyLevel], a
push de
ld d, a
callba CalcExpAtLevel
farcall CalcExpAtLevel
pop de
ld a, MON_EXP
@ -1421,7 +1421,7 @@ RareCandy: ; ef14
ld a, [hl]
adc b
ld [hl], a
callba LevelUpHappinessMod
farcall LevelUpHappinessMod
ld a, PARTYMENUTEXT_LEVEL_UP
call ItemActionText
@ -1449,7 +1449,7 @@ RareCandy: ; ef14
xor a
ld [wForceEvolution], a
callba EvolvePokemon
farcall EvolvePokemon
jp UseDisposableItem
; efad
@ -1466,7 +1466,7 @@ HealPowder: ; efad
cp $0
jr nz, .asm_efc9
ld c, HAPPINESS_BITTERPOWDER
callba ChangeHappiness
farcall ChangeHappiness
call LooksBitterMessage
@ -1569,7 +1569,7 @@ HealStatus: ; f030 (3:7030)
res SUBSTATUS_CONFUSED, [hl]
.not_full_heal
push bc
callba CalcPlayerStats
farcall CalcPlayerStats
pop bc
ret
@ -1635,7 +1635,7 @@ RevivalHerb: ; f0a9
jr nz, .asm_f0c5
ld c, HAPPINESS_REVIVALHERB
callba ChangeHappiness
farcall ChangeHappiness
call LooksBitterMessage
ld a, 0
@ -1797,7 +1797,7 @@ EnergypowderEnergyRootCommon: ; f192
cp 0
jr nz, .skip_happiness
callba ChangeHappiness
farcall ChangeHappiness
call LooksBitterMessage
ld a, 0
@ -1876,15 +1876,15 @@ UseItem_SelectMon: ; f1f9 (3:71f9)
ret
ChoosePkmnToUseItemOn: ; f21c (3:721c)
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitPartyMenuGFX
callba WritePartyMenuTilemap
callba PrintPartyMenuText
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
farcall InitPartyMenuGFX
farcall WritePartyMenuTilemap
farcall PrintPartyMenuText
call WaitBGMap
call SetPalettes
call DelayFrame
callba PartyMenuSelect
farcall PartyMenuSelect
ret
ItemActionText: ; f24a (3:724a)
@ -1896,8 +1896,8 @@ ItemActionText: ; f24a (3:724a)
push hl
push de
push bc
callba WritePartyMenuTilemap
callba PrintPartyMenuActionText
farcall WritePartyMenuTilemap
farcall PrintPartyMenuActionText
call WaitBGMap
call SetPalettes
call DelayFrame
@ -2234,7 +2234,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
EscapeRope: ; f44f
xor a
ld [wItemEffectSucceeded], a
callba EscapeRopeFunction
farcall EscapeRopeFunction
ld a, [wItemEffectSucceeded]
cp 1
@ -2344,16 +2344,16 @@ XSpecial: ; f4c5
ld [hBattleTurn], a
ld [AttackMissed], a
ld [EffectFailed], a
callba CheckIfStatCanBeRaised
farcall CheckIfStatCanBeRaised
call WaitSFX
callba BattleCommand_StatUpMessage
callba BattleCommand_StatUpFailText
farcall BattleCommand_StatUpMessage
farcall BattleCommand_StatUpFailText
ld a, [CurBattleMon]
ld [CurPartyMon], a
ld c, HAPPINESS_USEDXITEM
callba ChangeHappiness
farcall ChangeHappiness
ret
; f504
@ -2499,13 +2499,13 @@ SuperRod: ; f5ad
; f5b1
UseRod: ; f5b1
callba FishFunction
farcall FishFunction
ret
; f5b8
Itemfinder: ; f5b8
callba ItemFinder
farcall ItemFinder
ret
; f5bf
@ -2547,7 +2547,7 @@ Mysteryberry: ; f5bf
ld [CurMoveNum], a
ld a, $2
ld [wMoveSelectionMenuType], a
callba MoveSelectionScreen
farcall MoveSelectionScreen
pop bc
ld a, b
@ -2782,25 +2782,25 @@ UnknownText_0xf739: ; 0xf739
Squirtbottle: ; f73e
callba _Squirtbottle
farcall _Squirtbottle
ret
; f745
CardKey: ; f745
callba _CardKey
farcall _CardKey
ret
; f74c
BasementKey: ; f74c
callba _BasementKey
farcall _BasementKey
ret
; f753
SacredAsh: ; f753
callba _SacredAsh
farcall _SacredAsh
ld a, [wItemEffectSucceeded]
cp $1
ret nz
@ -2817,7 +2817,7 @@ NormalBox: ; f763
GorgeousBox: ; f767
ld c, DECOFLAG_GOLD_TROPHY_DOLL
OpenBox: ; f769
callba SetSpecificDecorationFlag
farcall SetSpecificDecorationFlag
ld hl, .text
call PrintText

106
engine/link.asm
View File

@ -14,14 +14,14 @@ LinkCommunications: ; 28000
call UpdateSprites
call LoadStandardFont
call LoadFontsBattleExtra
callba LinkComms_LoadPleaseWaitTextboxBorderGFX
farcall LinkComms_LoadPleaseWaitTextboxBorderGFX
call WaitBGMap2
hlcoord 3, 8
ld b, 2
ld c, 12
ld d, h
ld e, l
callba LinkTextbox2
farcall LinkTextbox2
hlcoord 4, 10
ld de, String_PleaseWait
call PlaceString
@ -150,7 +150,7 @@ TimeCapsule: ; 2805d
ld [wd265], a
push hl
push de
callab ConvertMon_1to2
callfar ConvertMon_1to2
pop de
pop hl
ld a, [wd265]
@ -362,19 +362,19 @@ Gen2ToGen2LinkComms: ; 28177
.fix_mail_loop
push bc
push de
callba IsMailEuropean
farcall IsMailEuropean
ld a, c
or a
jr z, .next
sub $3
jr nc, .skip
callba DeutenEnglischenPost
farcall DeutenEnglischenPost
jr .next
.skip
cp $2
jr nc, .next
callba HandleSpanishItalianMail
farcall HandleSpanishItalianMail
.next
pop de
@ -419,7 +419,7 @@ Gen2ToGen2LinkComms: ; 28177
ld a, CAL
ld [OtherTrainerClass], a
call ClearScreen
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld hl, Options
ld a, [hl]
push af
@ -463,7 +463,7 @@ Gen2ToGen2LinkComms: ; 28177
ld [wDisableTextAcceleration], a
pop af
ld [Options], a
callba LoadPokemonData
farcall LoadPokemonData
jp Function28b22
.ready_to_trade
@ -491,7 +491,7 @@ LinkTimeout: ; 283b2
push de
ld d, h
ld e, l
callba LinkTextbox2
farcall LinkTextbox2
pop de
pop hl
bccoord 1, 14
@ -658,7 +658,7 @@ Link_PrepPartyData_Gen1: ; 28499
ld [wd265], a
push hl
push de
callab ConvertMon_2to1
callfar ConvertMon_2to1
pop de
pop hl
ld a, [wd265]
@ -698,7 +698,7 @@ Link_PrepPartyData_Gen1: ; 28499
push bc
ld a, [hl]
ld [wd265], a
callab ConvertMon_2to1
callfar ConvertMon_2to1
pop bc
pop de
ld a, [wd265]
@ -882,20 +882,20 @@ Link_PrepPartyData_Gen2: ; 28595
push hl
push de
push hl
callba IsMailEuropean
farcall IsMailEuropean
pop de
ld a, c
or a
jr z, .next
sub $3
jr nc, .italian_spanish
callba HandleFrenchGermanMail
farcall HandleFrenchGermanMail
jr .next
.italian_spanish
cp $2
jr nc, .next
callba HandleSpanishItalianMail
farcall HandleSpanishItalianMail
.next
pop de
@ -993,7 +993,7 @@ Function2868a: ; 2868a
push bc
push de
ld [wd265], a
callab ConvertMon_1to2
callfar ConvertMon_1to2
pop de
pop bc
ld a, [wd265]
@ -1195,7 +1195,7 @@ Link_FindFirstNonControlCharacter_AllowZero: ; 287d8
InitTradeMenuDisplay: ; 287e3
call ClearScreen
call LoadTradeScreenBorder
callba InitTradeSpeciesList
farcall InitTradeSpeciesList
xor a
ld hl, wOtherPlayerLinkMode
ld [hli], a
@ -1232,7 +1232,7 @@ LinkTrade_OTPartyMenu: ; 28803
ld [w2DMenuFlags2], a
LinkTradeOTPartymonMenuLoop: ; 28835
callba LinkTradeMenu
farcall LinkTradeMenu
ld a, d
and a
jp z, LinkTradePartiesMenuMasterLoop
@ -1240,9 +1240,9 @@ LinkTradeOTPartymonMenuLoop: ; 28835
jr z, .not_a_button
ld a, $1
ld [wInitListType], a
callab InitList
callfar InitList
ld hl, OTPartyMon1Species
callba LinkMonStatsScreen
farcall LinkMonStatsScreen
jp LinkTradePartiesMenuMasterLoop
.not_a_button
@ -1274,7 +1274,7 @@ LinkTradeOTPartymonMenuLoop: ; 28835
; 2888b
LinkTrade_PlayerPartyMenu: ; 2888b
callba InitMG_Mobile_LinkTradePalMap
farcall InitMG_Mobile_LinkTradePalMap
xor a
ld [MonType], a
ld a, A_BUTTON | D_UP | D_DOWN
@ -1298,7 +1298,7 @@ LinkTrade_PlayerPartyMenu: ; 2888b
call WaitBGMap2
LinkTradePartymonMenuLoop: ; 288c5
callba LinkTradeMenu
farcall LinkTradeMenu
ld a, d
and a
jr nz, .check_joypad
@ -1366,7 +1366,7 @@ Function28926: ; 28926
hlcoord 2, 16
ld de, .String_Stats_Trade
call PlaceString
callba Link_WaitBGMap
farcall Link_WaitBGMap
.joy_loop
ld a, " "
@ -1433,8 +1433,8 @@ Function28926: ; 28926
ld [wMenuCursorY], a
ld a, $4
ld [wInitListType], a
callab InitList
callba LinkMonStatsScreen
callfar InitList
farcall LinkMonStatsScreen
call Call_LoadTempTileMapToTileMap
hlcoord 6, 1
lb bc, 6, 1
@ -1453,7 +1453,7 @@ Function28926: ; 28926
dec a
ld [wd002], a
ld [wPlayerLinkAction], a
callba Function16d6ce
farcall Function16d6ce
ld a, [wOtherPlayerLinkMode]
cp $f
jp z, InitTradeMenuDisplay
@ -1461,9 +1461,9 @@ Function28926: ; 28926
call Function28b68
ld c, 100
call DelayFrames
callba ValidateOTTrademon
farcall ValidateOTTrademon
jr c, .abnormal
callba Functionfb5dd
farcall Functionfb5dd
jp nc, LinkTrade
xor a
ld [wcf57], a
@ -1472,7 +1472,7 @@ Function28926: ; 28926
ld b, 4
ld c, 18
call Predef_LinkTextbox
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld hl, .Text_CantTradeLastMon
bccoord 1, 14
call PlaceHLTextAtBC
@ -1494,7 +1494,7 @@ Function28926: ; 28926
ld b, 4
ld c, 18
call Predef_LinkTextbox
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld hl, .Text_Abnormal
bccoord 1, 14
call PlaceHLTextAtBC
@ -1509,7 +1509,7 @@ Function28926: ; 28926
call PlaceString
ld a, $1
ld [wPlayerLinkAction], a
callba Function16d6ce
farcall Function16d6ce
ld c, 100
call DelayFrames
jp InitTradeMenuDisplay
@ -1575,7 +1575,7 @@ Function28ade: ; 28ade
ldcoord_a 9, 17
ld a, $f
ld [wPlayerLinkAction], a
callba Function16d6ce
farcall Function16d6ce
ld a, [wOtherPlayerLinkMode]
cp $f
jr nz, .loop1
@ -1650,7 +1650,7 @@ LinkTrade: ; 28b87
ld b, $4
ld c, $12
call Predef_LinkTextbox
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld a, [wd002]
ld hl, PartySpecies
ld c, a
@ -1700,7 +1700,7 @@ LinkTrade: ; 28b87
ld a, 1
ld [wMenuCursorY], a
ld [wMenuCursorX], a
callba Link_WaitBGMap
farcall Link_WaitBGMap
call ScrollingMenuJoypad
push af
call Call_ExitMenu
@ -1722,13 +1722,13 @@ LinkTrade: ; 28b87
hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled
call PlaceString
callba Function16d6ce
farcall Function16d6ce
jp Function28ea3
.asm_28c54
ld a, $2
ld [wPlayerLinkAction], a
callba Function16d6ce
farcall Function16d6ce
ld a, [wOtherPlayerLinkMode]
dec a
jr nz, .asm_28c7b
@ -1817,7 +1817,7 @@ LinkTrade: ; 28b87
call GetPartyLocation
ld b, h
ld c, l
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wPlayerTrademonCaughtData], a
ld hl, OTPlayerName
@ -1856,7 +1856,7 @@ LinkTrade: ; 28b87
call GetPartyLocation
ld b, h
ld c, l
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
ld a, [wd002]
@ -1869,7 +1869,7 @@ LinkTrade: ; 28b87
ld [wd002], a
xor a
ld [wPokemonWithdrawDepositParameter], a
callab RemoveMonFromPartyOrBox
callfar RemoveMonFromPartyOrBox
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
@ -1918,11 +1918,11 @@ LinkTrade: ; 28b87
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
callab EvolvePokemon
callfar EvolvePokemon
call ClearScreen
call LoadTradeScreenBorder
call SetTradeRoomBGPals
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld b, $1
pop af
ld c, a
@ -1957,9 +1957,9 @@ LinkTrade: ; 28b87
jr nz, .loop
.save
callba SaveAfterLinkTrade
callba TrainerRankings_Trades
callba BackupMobileEventIndex
farcall SaveAfterLinkTrade
farcall TrainerRankings_Trades
farcall BackupMobileEventIndex
ld c, 40
call DelayFrames
hlcoord 0, 12
@ -1969,7 +1969,7 @@ LinkTrade: ; 28b87
hlcoord 1, 14
ld de, String28ebd
call PlaceString
callba Link_WaitBGMap
farcall Link_WaitBGMap
ld c, 50
call DelayFrames
ld a, [wLinkMode]
@ -2005,17 +2005,17 @@ String_TooBadTheTradeWasCanceled: ; 28ece
Predef_LinkTextbox: ; 28eef
ld d, h
ld e, l
callba LinkTextbox
farcall LinkTextbox
ret
; 28ef8
LoadTradeScreenBorder: ; 28ef8
callba _LoadTradeScreenBorder
farcall _LoadTradeScreenBorder
ret
; 28eff
SetTradeRoomBGPals: ; 28eff
callba LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful
farcall LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful
call SetPalettes
ret
; 28f09
@ -2030,7 +2030,7 @@ Function28f09: ; 28f09
ld b, 6
ld c, 18
call Predef_LinkTextbox
callba PlaceTradePartnerNamesAndParty
farcall PlaceTradePartnerNamesAndParty
ret
; 28f24
@ -2064,7 +2064,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb
push hl
push bc
ld d, [hl]
callba ItemIsMail
farcall ItemIsMail
pop bc
pop hl
jr c, .mon_has_mail
@ -2435,7 +2435,7 @@ Link_CheckCommunicationError: ; 29e0c
Special_TryQuickSave: ; 29e66
ld a, [wd265]
push af
callba Link_SaveGame
farcall Link_SaveGame
ld a, $1
jr nc, .return_result
xor a
@ -2479,7 +2479,7 @@ Special_TimeCapsule: ; 29eaf
ld a, LINK_TIMECAPSULE
ld [wLinkMode], a
call DisableSpriteUpdates
callab LinkCommunications
callfar LinkCommunications
call EnableSpriteUpdates
xor a
ld [hVBlank], a
@ -2490,7 +2490,7 @@ Special_TradeCenter: ; 29ec4
ld a, LINK_TRADECENTER
ld [wLinkMode], a
call DisableSpriteUpdates
callab LinkCommunications
callfar LinkCommunications
call EnableSpriteUpdates
xor a
ld [hVBlank], a
@ -2501,7 +2501,7 @@ Special_Colosseum: ; 29ed9
ld a, LINK_COLOSSEUM
ld [wLinkMode], a
call DisableSpriteUpdates
callab LinkCommunications
callfar LinkCommunications
call EnableSpriteUpdates
xor a
ld [hVBlank], a

16
engine/link_trade.asm
View File

@ -23,8 +23,8 @@ Function16d43b: ; 16d43b
call ClearBGPalettes
call ClearTileMap
call ClearSprites
callba __LoadTradeScreenBorder ; useless to farcall
callba Function16d42e ; useless to farcall
farcall __LoadTradeScreenBorder ; useless to farcall
farcall Function16d42e ; useless to farcall
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
@ -119,8 +119,8 @@ _LinkTextbox: ; 16d61d
InitTradeSpeciesList: ; 16d673
call _LoadTradeScreenBorder
call Function16d6ae
callba InitMG_Mobile_LinkTradePalMap
callba PlaceTradePartnerNamesAndParty
farcall InitMG_Mobile_LinkTradePalMap
farcall PlaceTradePartnerNamesAndParty
hlcoord 10, 17
ld de, .CANCEL
call PlaceString
@ -146,7 +146,7 @@ LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
; 16d6a7
LoadTradeRoomBGPals_: ; 16d6a7
callba LoadTradeRoomBGPals
farcall LoadTradeRoomBGPals
ret
; 16d6ae
@ -171,7 +171,7 @@ LinkTextbox: ; 16d6ca
Function16d6ce: ; 16d6ce
call LoadStandardMenuDataHeader
call Function16d6e1
callba WaitLinkTransfer
farcall WaitLinkTransfer
call Call_ExitMenu
call WaitBGMap2
ret
@ -233,7 +233,7 @@ LinkTradeMenu: ; 16d70c
call .UpdateBGMapAndOAM
call .loop2
jr nc, .done
callba _2DMenuInterpretJoypad
farcall _2DMenuInterpretJoypad
jr c, .done
ld a, [w2DMenuFlags1]
bit 7, a
@ -352,7 +352,7 @@ LinkTradeMenu: ; 16d70c
ld a, [w2DMenuFlags1]
bit 6, a
jr z, .skip_anims
callba PlaySpriteAnimationsAndDelayFrame
farcall PlaySpriteAnimationsAndDelayFrame
.skip_anims
call JoyTextDelay
call .GetJoypad

26
engine/mail.asm
View File

@ -2,7 +2,7 @@ SendMailToPC: ; 4456e
ld a, MON_ITEM
call GetPartyParamLocation
ld d, [hl]
callba ItemIsMail
farcall ItemIsMail
jr nc, .full
call GetMailboxCount
cp MAILBOX_CAPACITY
@ -80,7 +80,7 @@ ReadMailMessage: ; 445f4
call AddNTimes
ld d, h
ld e, l
callba ReadAnyMail
farcall ReadAnyMail
ret
MoveMailFromPCToParty: ; 44607
@ -127,7 +127,7 @@ GetMailboxCount: ; 44648
CheckPokeItem:: ; 44654
push bc
push de
callba SelectMonFromParty
farcall SelectMonFromParty
ld a, $2
jr c, .pop_return
@ -136,7 +136,7 @@ CheckPokeItem:: ; 44654
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld d, [hl]
callba ItemIsMail
farcall ItemIsMail
ld a, $3
jr nc, .pop_return
@ -172,12 +172,12 @@ CheckPokeItem:: ; 44654
jr nz, .loop
.done
callba CheckCurPartyMonFainted
farcall CheckCurPartyMonFainted
ld a, $4
jr c, .close_sram_return
xor a
ld [wPokemonWithdrawDepositParameter], a
callba RemoveMonFromPartyOrBox
farcall RemoveMonFromPartyOrBox
ld a, $1
.close_sram_return
@ -296,7 +296,7 @@ IsAnyMonHoldingMail: ; 44781
ld d, [hl]
push hl
push de
callba ItemIsMail
farcall ItemIsMail
pop de
pop hl
ret c
@ -503,15 +503,15 @@ MailboxPC: ; 0x44806
ld [PartyMenuActionText], a
call ClearBGPalettes
.try_again
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitPartyMenuGFX
callba WritePartyMenuTilemap
callba PrintPartyMenuText
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
farcall InitPartyMenuGFX
farcall WritePartyMenuTilemap
farcall PrintPartyMenuText
call WaitBGMap
call SetPalettes
call DelayFrame
callba PartyMenuSelect
farcall PartyMenuSelect
jr c, .exit2
ld a, [CurPartySpecies]
cp EGG

10
engine/main_menu.asm
View File

@ -271,7 +271,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
decoord 4, 16
ld a, [hHours]
ld c, a
callba PrintHour
farcall PrintHour
ld [hl], ":"
inc hl
ld de, hMinutes
@ -341,21 +341,21 @@ Function49ed0: ; 49ed0
MainMenu_NewGame: ; 49ee0
callba NewGame
farcall NewGame
ret
; 49ee7
MainMenu_Options: ; 49ee7
callba OptionsMenu
farcall OptionsMenu
ret
; 49eee
MainMenu_Continue: ; 49eee
callba Continue
farcall Continue
ret
; 49ef5
MainMenu_MysteryGift: ; 49ef5
callba MysteryGift
farcall MysteryGift
ret
; 49efc

4
engine/map_object_action.asm
View File

@ -1,5 +1,5 @@
PersonActionPairPointers: ; 445f
; entries correspond to PERSON_ACTION_* constants
ObjectActionPairPointers: ; 445f
; entries correspond to OBJECT_ACTION_* constants
dw SetFacingStanding, SetFacingStanding
dw SetFacingStandAction, SetFacingCurrent
dw SetFacingStepAction, SetFacingCurrent

86
engine/map_objects.asm
View File

@ -154,7 +154,7 @@ Function437b: ; 437b
jr nz, SetFacingStanding
bit 5, [hl]
jr nz, asm_4448
ld de, PersonActionPairPointers ; use first column
ld de, ObjectActionPairPointers ; use first column
jr _HandleObjectAction
; 4440
@ -164,7 +164,7 @@ Function4440: ; 4440
bit INVISIBLE, [hl]
jr nz, SetFacingStanding
asm_4448
ld de, PersonActionPairPointers + 2 ; use second column
ld de, ObjectActionPairPointers + 2 ; use second column
jr _HandleObjectAction
; 444d
@ -631,7 +631,7 @@ MapObjectMovementPattern: ; 47dd
call EndSpriteMovement
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_05
@ -650,20 +650,20 @@ MapObjectMovementPattern: ; 47dd
jp HandleMovementData
.Movement0a:
jp _GetMovementPerson
jp _GetMovementObject
.Movement0b:
jp _GetMovementPerson
jp _GetMovementObject
.Movement0c:
jp _GetMovementPerson
jp _GetMovementObject
.Movement0d:
ld hl, Function5000
jp HandleMovementData
.Movement0e:
jp _GetMovementPerson
jp _GetMovementObject
.Follow:
ld hl, GetFollowerNextMovementByte
@ -781,7 +781,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ret
.MovementBigStanding:
@ -791,7 +791,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_BIG_SNORLAX
ld [hl], OBJECT_ACTION_BIG_SNORLAX
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_04
@ -804,7 +804,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_BOUNCE
ld [hl], OBJECT_ACTION_BOUNCE
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_04
@ -828,7 +828,7 @@ MapObjectMovementPattern: ; 47dd
.MovementSpinRepeat:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_RANGE
add hl, bc
ld a, [hl]
@ -879,7 +879,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SHADOW
ld [hl], OBJECT_ACTION_SHADOW
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
@ -916,7 +916,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_EMOTE
ld [hl], OBJECT_ACTION_EMOTE
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 0
@ -936,7 +936,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_BOULDER_DUST
ld [hl], OBJECT_ACTION_BOULDER_DUST
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
@ -980,7 +980,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_GRASS_SHAKE
ld [hl], OBJECT_ACTION_GRASS_SHAKE
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
@ -1013,7 +1013,7 @@ MapObjectMovementPattern: ; 47dd
call EndSpriteMovement
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_00
ld [hl], OBJECT_ACTION_00
ld hl, OBJECT_RANGE
add hl, bc
ld a, [hl]
@ -1053,7 +1053,7 @@ MapObjectMovementPattern: ; 47dd
call UpdateTallGrassFlags
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STEP
ld [hl], OBJECT_ACTION_STEP
ld hl, wCenteredObject
ld a, [hMapObjectIndexBuffer]
cp [hl]
@ -1092,7 +1092,7 @@ SetRandomStepDuration: ; 4b2d
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_03
@ -1245,7 +1245,7 @@ TeleportFrom: ; 4c18
.DoSpin:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
@ -1270,7 +1270,7 @@ TeleportFrom: ; 4c18
.DoSpinRise:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
ld hl, OBJECT_31
add hl, bc
inc [hl]
@ -1310,7 +1310,7 @@ TeleportTo: ; 4c89
.InitWait:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_00
ld [hl], OBJECT_ACTION_00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
@ -1341,7 +1341,7 @@ TeleportTo: ; 4c89
.DoDescent:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
ld hl, OBJECT_31
add hl, bc
inc [hl]
@ -1369,7 +1369,7 @@ TeleportTo: ; 4c89
.DoFinalSpin:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
@ -1399,7 +1399,7 @@ Skyfall: ; 4d14
.Init:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_00
ld [hl], OBJECT_ACTION_00
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
@ -1411,7 +1411,7 @@ Skyfall: ; 4d14
ret nz
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STEP
ld [hl], OBJECT_ACTION_STEP
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1496,9 +1496,9 @@ RockSmashStep: ; 4daf
add hl, bc
ld a, [hl]
and %00000001
ld a, PERSON_ACTION_STAND
ld a, OBJECT_ACTION_STAND
jr z, .yes
ld a, PERSON_ACTION_00
ld a, OBJECT_ACTION_00
.yes
ld hl, OBJECT_ACTION
add hl, bc
@ -1511,9 +1511,9 @@ ReturnDigStep: ; 4dc8
add hl, bc
ld a, [hl]
and %00000001
ld a, PERSON_ACTION_SPIN
ld a, OBJECT_ACTION_SPIN
jr z, .yes
ld a, PERSON_ACTION_SPIN_FLICKER
ld a, OBJECT_ACTION_SPIN_FLICKER
.yes
ld hl, OBJECT_ACTION
add hl, bc
@ -1699,7 +1699,7 @@ StepType0f: ; 4ecd
add hl, bc
ld a, [hl]
ld b, a
callba CopyDECoordsToMapObject
farcall CopyDECoordsToMapObject
pop bc
ld hl, OBJECT_FLAGS2
add hl, bc
@ -1819,7 +1819,7 @@ SkyfallTop: ; 4f83
.Init:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SKYFALL
ld [hl], OBJECT_ACTION_SKYFALL
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
@ -1935,13 +1935,13 @@ Function5026: ; 5026
ret
; 5037
_GetMovementPerson: ; 5037
ld hl, GetMovementPerson
_GetMovementObject: ; 5037
ld hl, GetMovementObject
jp HandleMovementData
; 503d
GetMovementPerson: ; 503d
ld a, [wMovementPerson]
GetMovementObject: ; 503d
ld a, [wMovementObject]
ret
; 5041
@ -2177,7 +2177,7 @@ InitTempObject: ; 55ac
ret nc
ld d, h
ld e, l
callba CopyTempObjectToObjectStruct
farcall CopyTempObjectToObjectStruct
ret
; 55b9
@ -2306,7 +2306,7 @@ Function565c: ; 565c
call Function56a3
jr c, SetFacing_Standing
call Function5688
callba Function4440
farcall Function4440
xor a
ret
; 5673
@ -2314,7 +2314,7 @@ Function565c: ; 565c
Function5673: ; 5673
call Function56a3
jr c, SetFacing_Standing
callba Function4440 ; no need to farcall
farcall Function4440 ; no need to farcall
xor a
ret
; 5680
@ -2340,7 +2340,7 @@ Function5688: ; 5688
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld [hl], a
callba UpdateTallGrassFlags ; no need to farcall
farcall UpdateTallGrassFlags ; no need to farcall
ret
; 56a3
@ -2527,7 +2527,7 @@ RefreshPlayerSprite: ; 579d
ld [wPlayerTurningDirection], a
ld [PlayerObjectStepFrame], a
call .TryResetPlayerAction
callba CheckWarpFacingDown
farcall CheckWarpFacingDown
call c, SpawnInFacingDown
call .SpawnInCustomFacing
ret
@ -2540,7 +2540,7 @@ RefreshPlayerSprite: ; 579d
ret
.ok
ld a, PERSON_ACTION_00
ld a, OBJECT_ACTION_00
ld [PlayerAction], a
ret
; 57ca
@ -2596,7 +2596,7 @@ StartFollow:: ; 5803
ret c
ld a, c
call SetFollowerIfVisible
callba QueueFollowerFirstStep
farcall QueueFollowerFirstStep
ret
; 5815
@ -2642,7 +2642,7 @@ ResetFollower: ; 5847
cp -1
ret z
call GetObjectStruct
callba Function58e3 ; no need to bankswitch
farcall Function58e3 ; no need to bankswitch
ld a, -1
ld [wObjectFollow_Follower], a
ret

10
engine/map_setup.asm
View File

@ -308,8 +308,8 @@ SuspendMapAnims: ; 154d3
LoadObjectsRunCallback_02: ; 154d7
ld a, MAPCALLBACK_OBJECTS
call RunMapCallback
callba LoadObjectMasks
callba InitializeVisibleSprites
farcall LoadObjectMasks
farcall InitializeVisibleSprites
ret
; 154ea (5:54ea)
@ -362,10 +362,10 @@ CheckReplaceKrisSprite: ; 154f7
jr z, .surfing
cp PLAYER_SURF_PIKA
jr z, .surfing
call GetMapPermission
call GetMapEnvironment
cp INDOOR
jr z, .checkbiking
cp PERM_5
cp ENVIRONMENT_5
jr z, .checkbiking
cp DUNGEON
jr z, .checkbiking
@ -409,7 +409,7 @@ FadeOldMapMusic: ; 15567
; 1556d
RetainOldPalettes: ; 1556d
callba _UpdateTimePals
farcall _UpdateTimePals
ret
RotatePalettesRightMapAndMusic: ; 15574

24
engine/mart.asm
View File

@ -252,7 +252,7 @@ GetMartItemPrice: ; 15be5
; Return the price of item a in BCD at hl and in tiles at StringBuffer1.
push hl
ld [CurItem], a
callba GetItemPrice
farcall GetItemPrice
pop hl
GetMartPrice: ; 15bf0
@ -344,7 +344,7 @@ INCLUDE "data/items/bargain_shop.asm"
BuyMenu: ; 15c62
call FadeToMenu
callba BlankScreen
farcall BlankScreen
xor a
ld [wMenuScrollPositionBackup], a
ld a, 1
@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3
BuyMenuLoop: ; 15cef
callba PlaceMoneyTopRight
farcall PlaceMoneyTopRight
call UpdateSprites
ld hl, MenuDataHeader_Buy
call CopyMenuDataHeader
@ -519,7 +519,7 @@ StandardMartAskPurchaseQuantity:
ld [wItemQuantityBuffer], a
ld a, MARTTEXT_HOW_MANY
call LoadBuyMenuText
callba SelectQuantityToBuy
farcall SelectQuantityToBuy
call ExitMenu
ret
; 15d97
@ -579,7 +579,7 @@ RooftopSaleAskPurchaseQuantity:
call .GetSalePrice
ld a, 99
ld [wItemQuantityBuffer], a
callba RooftopSale_SelectQuantityToBuy
farcall RooftopSale_SelectQuantityToBuy
call ExitMenu
ret
; 15df9
@ -782,9 +782,9 @@ Text_Pharmacist_ComeAgain: ; 0x15eae
SellMenu: ; 15eb3
call DisableSpriteUpdates
callba DepositSellInitPackBuffers
farcall DepositSellInitPackBuffers
.loop
callba DepositSellPack
farcall DepositSellPack
ld a, [wcf66]
and a
jp z, .quit
@ -812,7 +812,7 @@ SellMenu: ; 15eb3
.TryToSellItem: ; 15ee0
callba CheckItemMenu
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
ld hl, .dw
rst JumpTable
@ -835,7 +835,7 @@ SellMenu: ; 15eb3
.try_sell ; 15efd
callba _CheckTossableItem
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
jr z, .okay_to_sell
@ -847,8 +847,8 @@ SellMenu: ; 15eb3
.okay_to_sell
ld hl, Text_Mart_SellHowMany
call PrintText
callba PlaceMoneyAtTopLeftOfTextbox
callba SelectQuantityToSell
farcall PlaceMoneyAtTopLeftOfTextbox
farcall SelectQuantityToSell
call ExitMenu
jr c, .declined
hlcoord 1, 14
@ -871,7 +871,7 @@ SellMenu: ; 15eb3
ld hl, Text_Mart_SoldForAmount
call PrintTextBoxText
call PlayTransactionSound
callba PlaceMoneyBottomLeft
farcall PlaceMoneyBottomLeft
call JoyWaitAorB
.declined

10
engine/menu.asm
View File

@ -16,7 +16,7 @@ _InterpretBattleMenu:: ; 24022
rst FarCall
call Draw2DMenu
callba MobileTextBorder
farcall MobileTextBorder
call UpdateSprites
call ApplyTilemap
call Get2DMenuSelection
@ -29,7 +29,7 @@ _InterpretMobileMenu:: ; 2403c
rst FarCall
call Draw2DMenu
callba MobileTextBorder
farcall MobileTextBorder
call UpdateSprites
call ApplyTilemap
call Init2DMenuCursorPosition
@ -37,7 +37,7 @@ _InterpretMobileMenu:: ; 2403c
set 7, [hl]
.loop
call DelayFrame
callba Function10032e
farcall Function10032e
ld a, [wcd2b]
and a
jr nz, .quit
@ -322,7 +322,7 @@ Function241d5: ; 241d5
call AdvanceMobileInactivityTimerAndCheckExpired ; BUG: This function is in another bank.
; Pointer in current bank (9) is bogus.
ret c
callba Function100337
farcall Function100337
ret c
ld a, [w2DMenuFlags1]
bit 7, a
@ -382,7 +382,7 @@ Menu_WasButtonPressed: ; 24259
ld a, [w2DMenuFlags1]
bit 6, a
jr z, .skip_to_joypad
callab PlaySpriteAnimationsAndDelayFrame
callfar PlaySpriteAnimationsAndDelayFrame
.skip_to_joypad
call JoyTextDelay

2
engine/menu_2.asm
View File

@ -11,7 +11,7 @@ PlaceMenuItemQuantity: ; 0x24ac3
push de
ld a, [MenuSelection]
ld [CurItem], a
callba _CheckTossableItem
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
pop hl
and a

6
engine/mon_icons.asm
View File

@ -66,7 +66,7 @@ LoadMenuMonIcon: ; 8e83f
push hl
push bc
ld d, a
callab ItemIsMail
callfar ItemIsMail
pop bc
pop hl
jr c, .not_mail
@ -140,7 +140,7 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5)
push hl
push bc
ld d, a
callab ItemIsMail
callfar ItemIsMail
pop bc
pop hl
jr c, .mail
@ -204,7 +204,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
ret
.getspeed ; 8e94c (23:694c)
callba PlacePartymonHPBar
farcall PlacePartymonHPBar
call GetHPPal
ld e, d
ld d, 0

4
engine/mon_menu.asm
View File

@ -39,7 +39,7 @@ MonSubmenu: ; 24d19
xor a
ld [hBGMapMode], a
call GetMonSubmenuItems
callba FreezeMonIcons
farcall FreezeMonIcons
ld hl, .MenuDataHeader
call LoadMenuDataHeader
call .GetTopCoord
@ -202,7 +202,7 @@ GetMonSubmenuItems: ; 24dd4
ld a, MON_ITEM
call GetPartyParamLocation
ld d, [hl]
callba ItemIsMail
farcall ItemIsMail
pop hl
ld a, MONMENU_MAIL
jr c, .ok

2
engine/mon_stats.asm
View File

@ -276,7 +276,7 @@ ListMovePP: ; 50c50
push af
ld [hl], b
push hl
callab GetMaxPPOfMove
callfar GetMaxPPOfMove
pop hl
pop af
ld [hl], a

40
engine/move_mon.asm
View File

@ -136,7 +136,7 @@ endr
push de
ld a, [CurPartyLevel]
ld d, a
callab CalcExpAtLevel
callfar CalcExpAtLevel
pop de
ld a, [hProduct + 1]
ld [de], a
@ -160,7 +160,7 @@ endr
and $f
jr z, .generateDVs
push hl
callba GetTrainerDVs
farcall GetTrainerDVs
pop hl
jr .initializetrainermonstats
@ -312,7 +312,7 @@ endr
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
predef GetUnownLetter
callab UpdateUnownDex
callfar UpdateUnownDex
.done
scf ; When this function returns, the carry flag indicates success vs failure.
@ -423,7 +423,7 @@ AddTempmonToParty: ; da96
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
predef GetUnownLetter
callab UpdateUnownDex
callfar UpdateUnownDex
ld a, [wFirstUnownSeen]
and a
jr nz, .done
@ -598,7 +598,7 @@ SentGetPkmnIntoFromBox: ; db3f
add $2
ld [MonType], a
predef CopyPkmnToTempMon
callab CalcLevel
callfar CalcLevel
ld a, d
ld [CurPartyLevel], a
pop hl
@ -708,7 +708,7 @@ RestorePPofDepositedPokemon: ; dcb6
push bc
push hl
push de
callba GetMaxPPOfMove
farcall GetMaxPPOfMove
pop de
pop hl
ld a, [wd265]
@ -844,10 +844,10 @@ Functiondd64: ; dd64
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
callba HealPartyMon
farcall HealPartyMon
ld a, [CurPartyLevel]
ld d, a
callab CalcExpAtLevel
callfar CalcExpAtLevel
pop bc
ld hl, $8
add hl, bc
@ -961,7 +961,7 @@ SentPkmnIntoBox: ; de6e
push de
ld a, [CurPartyLevel]
ld d, a
callab CalcExpAtLevel
callfar CalcExpAtLevel
pop de
ld a, [hProduct + 1]
ld [de], a
@ -1011,7 +1011,7 @@ SentPkmnIntoBox: ; de6e
jr nz, .not_unown
ld hl, sBoxMon1DVs
predef GetUnownLetter
callab UpdateUnownDex
callfar UpdateUnownDex
.not_unown
ld hl, sBoxMon1Moves
@ -1089,8 +1089,8 @@ ShiftBoxMon: ; df47
GiveEgg:: ; df8c
ld a, [CurPartySpecies]
push af
callab GetPreEvolution
callab GetPreEvolution
callfar GetPreEvolution
callfar GetPreEvolution
ld a, [CurPartySpecies]
dec a
@ -1433,7 +1433,7 @@ CalcPkmnStatC: ; e17b
ld a, [hld]
ld e, a
ld d, [hl]
callba GetSquareRoot
farcall GetSquareRoot
pop de
.no_stat_exp
@ -1625,7 +1625,7 @@ GivePoke:: ; e277
.failed
ld a, [CurPartySpecies]
ld [TempEnemyMonSpecies], a
callab LoadEnemyMon
callfar LoadEnemyMon
call SentPkmnIntoBox
jp nc, .FailedToGiveMon
ld a, BOXMON
@ -1706,7 +1706,7 @@ GivePoke:: ; e277
ld [hli], a
ld [hl], 01001 % $100
pop bc
callba SetGiftPartyMonCaughtData
farcall SetGiftPartyMonCaughtData
jr .skip_nickname
.send_to_box
@ -1730,7 +1730,7 @@ GivePoke:: ; e277
call Random
ld [hl], a
call CloseSRAM
callba SetGiftBoxMonCaughtData
farcall SetGiftBoxMonCaughtData
jr .skip_nickname
.wildmon
@ -1741,13 +1741,13 @@ GivePoke:: ; e277
ld a, b
and a
jr z, .party
callba SetBoxMonCaughtData
farcall SetBoxMonCaughtData
jr .set_caught_data
.party
callba SetCaughtData
farcall SetCaughtData
.set_caught_data
callba GiveANickname_YesNo
farcall GiveANickname_YesNo
pop de
jr c, .skip_nickname
call InitNickname
@ -1791,7 +1791,7 @@ InitNickname: ; e3de
pop de
push de
ld b, $0
callba NamingScreen
farcall NamingScreen
pop hl
ld de, StringBuffer1
call InitName

2
engine/move_mon_wo_mail.asm
View File

@ -34,7 +34,7 @@ InsertPokemonIntoBox: ; 51322
call CopyBytes
ld a, [CurPartyMon]
ld b, a
callba RestorePPofDepositedPokemon
farcall RestorePPofDepositedPokemon
jp CloseSRAM
InsertPokemonIntoParty: ; 5138b

40
engine/movement.asm
View File

@ -60,8 +60,8 @@ MovementPointers: ; 5075
dw Movement_set_sliding ; 39
dw Movement_remove_fixed_facing ; 3a
dw Movement_fix_facing ; 3b
dw Movement_show_person ; 3c
dw Movement_hide_person ; 3d
dw Movement_show_object ; 3c
dw Movement_hide_object ; 3d
dw Movement_step_sleep_1 ; 3e
dw Movement_step_sleep_2 ; 3f
dw Movement_step_sleep_3 ; 40
@ -73,7 +73,7 @@ MovementPointers: ; 5075
dw Movement_step_sleep ; 46
dw Movement_step_end ; 47
dw Movement_48 ; 48
dw Movement_remove_person ; 49
dw Movement_remove_object ; 49
dw Movement_step_loop ; 4a
dw Movement_4b ; 4b
dw Movement_teleport_from ; 4c
@ -130,7 +130,7 @@ Movement_step_dig: ; 5145
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
call JumpMovementPointer
ld hl, OBJECT_STEP_DURATION
add hl, bc
@ -167,7 +167,7 @@ Movement_return_dig: ; 516a
Movement_fish_got_bite: ; 5189
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_FISHING
ld [hl], OBJECT_ACTION_FISHING
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_GOT_BITE
@ -181,7 +181,7 @@ Movement_rock_smash: ; 5196
ld [hl], a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_ROCK_SMASH
@ -191,7 +191,7 @@ Movement_rock_smash: ; 5196
Movement_fish_cast_rod: ; 51ab
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_FISHING
ld [hl], OBJECT_ACTION_FISHING
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_SLEEP
@ -248,7 +248,7 @@ Movement_48: ; 51db
ret
; 51fd
Movement_remove_person: ; 51fd
Movement_remove_object: ; 51fd
call DeleteMapObject
ld hl, wObjectFollow_Leader
ld a, [hMapObjectIndexBuffer]
@ -265,7 +265,7 @@ Movement_remove_person: ; 51fd
Movement_4b: ; 5210
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_STEP_TYPE
add hl, bc
@ -326,7 +326,7 @@ Movement_step_sleep_common: ; 5247
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -346,7 +346,7 @@ Movement_step_bump: ; 525f
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_BUMP
ld [hl], OBJECT_ACTION_BUMP
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -366,7 +366,7 @@ Movement_tree_shake: ; 5279
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_WEIRD_TREE
ld [hl], OBJECT_ACTION_WEIRD_TREE
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -402,14 +402,14 @@ Movement_fix_facing: ; 52ae
jp ContinueReadingMovement
; 52b7
Movement_show_person: ; 52b7
Movement_show_object: ; 52b7
ld hl, OBJECT_FLAGS1
add hl, bc
res INVISIBLE, [hl]
jp ContinueReadingMovement
; 52c0
Movement_hide_person: ; 52c0
Movement_hide_object: ; 52c0
ld hl, OBJECT_FLAGS1
add hl, bc
set INVISIBLE, [hl]
@ -458,7 +458,7 @@ TurnHead: ; 52ee
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -733,7 +733,7 @@ TurnStep: ; 5400
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STEP
ld [hl], OBJECT_ACTION_STEP
ld hl, OBJECT_STEP_TYPE
add hl, bc
@ -746,7 +746,7 @@ NormalStep: ; 5412
call UpdateTallGrassFlags
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STEP
ld [hl], OBJECT_ACTION_STEP
ld hl, OBJECT_NEXT_TILE
add hl, bc
@ -784,7 +784,7 @@ TurningStep: ; 5446
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
ld [hl], OBJECT_ACTION_SPIN
ld hl, wCenteredObject
ld a, [hMapObjectIndexBuffer]
@ -810,7 +810,7 @@ SlideStep: ; 5468
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
ld [hl], OBJECT_ACTION_STAND
ld hl, wCenteredObject
ld a, [hMapObjectIndexBuffer]
@ -842,7 +842,7 @@ JumpStep: ; 548a
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STEP
ld [hl], OBJECT_ACTION_STEP
call SpawnShadow

26
engine/mystery_gift.asm
View File

@ -7,7 +7,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
ld de, .String_PressAToLink_BToCancel
call PlaceString
call WaitBGMap
callba PrepMysteryGiftDataToSend
farcall PrepMysteryGiftDataToSend
call MysteryGift_ClearTrainerData
ld a, $2
ld [wca01], a
@ -62,21 +62,21 @@ DoMysteryGift: ; 1048ba (41:48ba)
cp 4
jr z, .skip_append_save
call .SaveMysteryGiftTrainerName
callba RestoreMobileEventIndex
callba TrainerRankings_MysteryGift
callba BackupMobileEventIndex
farcall RestoreMobileEventIndex
farcall TrainerRankings_MysteryGift
farcall BackupMobileEventIndex
.skip_append_save
ld a, [wMysteryGiftPartnerSentDeco]
and a
jr z, .item
ld a, [wMysteryGiftPartnerWhichDeco]
ld c, a
callba MysteryGiftGetDecoration
farcall MysteryGiftGetDecoration
push bc
call MysteryGift_CheckAndSetDecorationAlreadyReceived
pop bc
jr nz, .item
callab GetDecorationName_c
callfar GetDecorationName_c
ld h, d
ld l, e
ld de, StringBuffer1
@ -89,7 +89,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
call GetMysteryGiftBank
ld a, [wMysteryGiftPartnerWhichItem]
ld c, a
callba MysteryGiftGetItemHeldEffect
farcall MysteryGiftGetItemHeldEffect
ld a, c
ld [sBackupMysteryGiftItem], a
ld [wNamedObjectIndexBuffer], a
@ -237,7 +237,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
Function104a95: ; 104a95 (41:4a95)
di
callba ClearChannels
farcall ClearChannels
call Function104d5e
.loop2
@ -421,7 +421,7 @@ Function104bd0: ; 104bd0 (41:4bd0)
ld a, [wMysteryGiftTrainerData]
cp $3
jr nc, .quit
callba StagePartyDataForMysteryGift
farcall StagePartyDataForMysteryGift
call MysteryGift_ClearTrainerData
ld a, $26
ld [wca02], a
@ -453,7 +453,7 @@ Function104bd0: ; 104bd0 (41:4bd0)
Function104c2d: ; 104c2d (41:4c2d)
di
callba ClearChannels
farcall ClearChannels
call Function104d5e
.asm_104c37
call Function104d96
@ -1148,7 +1148,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
pop bc
jr z, .skip
push bc
callab SetSpecificDecorationFlag
callfar SetSpecificDecorationFlag
pop bc
.skip
inc c
@ -1447,7 +1447,7 @@ Function105688: ; 105688 (41:5688)
ld hl, Text_ReceivedCard
call PrintText
ld de, wMysteryGiftTrainerData
callba Function8ac70
farcall Function8ac70
ld a, c
ld [wd265], a
ld hl, Text_CardNotRegistered
@ -1663,7 +1663,7 @@ Function1057d7: ; 1057d7 (41:57d7)
call EnableLCD
call WaitBGMap
ld b, $2
callba GetMysteryGift_MobileAdapterLayout
farcall GetMysteryGift_MobileAdapterLayout
jp SetPalettes
.Load6Row: ; 1058c6 (41:58c6)

14
engine/namingscreen.asm
View File

@ -103,7 +103,7 @@ NamingScreen: ; 116c1
inc de
hlcoord 5, 4
call PlaceString
callba GetGender
farcall GetGender
jr c, .genderless
ld a, "♂"
jr nz, .place_gender
@ -124,7 +124,7 @@ NamingScreen: ; 116c1
; 1178d
.Player: ; 1178d (4:578d)
callba GetPlayerIcon
farcall GetPlayerIcon
call .LoadSprite
hlcoord 5, 2
ld de, .PlayerNameString
@ -352,14 +352,14 @@ NamingScreenJoypadLoop: ; 11915
bit 7, a
jr nz, .quit
call .RunJumptable
callba PlaySpriteAnimationsAndDelayFrame
farcall PlaySpriteAnimationsAndDelayFrame
call .UpdateStringEntry
call DelayFrame
and a
ret
.quit
callab ClearSpriteAnims
callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a
@ -900,7 +900,7 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
LoadNamingScreenGFX: ; 11c51
call ClearSprites
callab ClearSpriteAnims
callfar ClearSpriteAnims
call LoadStandardFont
call LoadFontsExtra
@ -1096,14 +1096,14 @@ INCBIN "gfx/icon/mail2.2bpp"
bit 7, a
jr nz, .exit_mail
call .DoJumptable
callba PlaySpriteAnimationsAndDelayFrame
farcall PlaySpriteAnimationsAndDelayFrame
call .Update
call DelayFrame
and a
ret
.exit_mail
callab ClearSpriteAnims
callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a

8
engine/new_pokedex_entry.asm
View File

@ -15,11 +15,11 @@ NewPokedexEntry: ; fb877
ld [hSCX], a
xor a
ld [wPokedexStatus], a
callba _NewPokedexEntry
farcall _NewPokedexEntry
call WaitPressAorB_BlinkCursor
ld a, $1
ld [wPokedexStatus], a
callba DisplayDexEntry
farcall DisplayDexEntry
call WaitPressAorB_BlinkCursor
pop af
ld [wPokedexStatus], a
@ -38,9 +38,9 @@ NewPokedexEntry: ; fb877
call ClearTileMap
call LoadFontsExtra
call LoadStandardFont
callba Pokedex_PlaceFrontpicTopLeftCorner
farcall Pokedex_PlaceFrontpicTopLeftCorner
call WaitBGMap2
callba GetEnemyMonDVs
farcall GetEnemyMonDVs
ld a, [hli]
ld [TempMonDVs], a
ld a, [hl]

12
engine/npc_movement.asm
View File

@ -35,7 +35,7 @@ Function6ec1: ; 6ec1
push hl
push bc
call WillPersonBumpIntoSomeoneElse
call WillObjectBumpIntoSomeoneElse
pop bc
pop hl
ret c
@ -44,12 +44,12 @@ Function6ec1: ; 6ec1
bit 5, [hl]
jr nz, .bit_5
push hl
call HasPersonReachedMovementLimit
call HasObjectReachedMovementLimit
pop hl
ret c
push hl
call IsPersonMovingOffEdgeOfScreen
call IsObjectMovingOffEdgeOfScreen
pop hl
ret c
@ -269,7 +269,7 @@ CheckFacingObject:: ; 6fd9
; 7009
WillPersonBumpIntoSomeoneElse: ; 7009
WillObjectBumpIntoSomeoneElse: ; 7009
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld d, [hl]
@ -391,7 +391,7 @@ IsNPCAtCoord: ; 7041
ret
; 70a4
HasPersonReachedMovementLimit: ; 70a4
HasObjectReachedMovementLimit: ; 70a4
ld hl, OBJECT_RADIUS
add hl, bc
ld a, [hl]
@ -451,7 +451,7 @@ HasPersonReachedMovementLimit: ; 70a4
ret
; 70ed
IsPersonMovingOffEdgeOfScreen: ; 70ed
IsObjectMovingOffEdgeOfScreen: ; 70ed
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, [XCoord]

14
engine/npctrade.asm
View File

@ -24,7 +24,7 @@ NPCTrade:: ; fcba8
; Select givemon from party
ld b, PARTYMENUACTION_GIVE_MON
callba SelectTradeOrDayCareMon
farcall SelectTradeOrDayCareMon
ld a, TRADE_CANCEL
jr c, .done
@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23
cp 1
jr z, .check_male
callba GetGender
farcall GetGender
jr nz, .not_matching
jr .matching
.check_male
callba GetGender
farcall GetGender
jr z, .not_matching
.matching
@ -171,7 +171,7 @@ DoNPCTrade: ; fcc63
call Trade_GetAttributeOfCurrentPartymon
ld b, h
ld c, l
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wPlayerTrademonCaughtData], a
@ -195,7 +195,7 @@ DoNPCTrade: ; fcc63
xor a
ld [MonType], a
ld [wPokemonWithdrawDepositParameter], a
callab RemoveMonFromPartyOrBox
callfar RemoveMonFromPartyOrBox
predef TryAddMonToParty
ld e, TRADE_DIALOG
@ -206,7 +206,7 @@ DoNPCTrade: ; fcc63
jr c, .incomplete
ld b, SET_FLAG
.incomplete
callba SetGiftPartyMonCaughtData
farcall SetGiftPartyMonCaughtData
ld e, TRADE_NICK
call GetTradeAttribute
@ -275,7 +275,7 @@ DoNPCTrade: ; fcc63
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
callba ComputeNPCTrademonStats
farcall ComputeNPCTrademonStats
pop af
ld [CurPartyMon], a
pop hl

2
engine/odd_eggs.asm
View File

@ -86,7 +86,7 @@ GiveOddEgg: ; 1fb4b6
ld [wMobileMonNicknamePointerBuffer], a
ld a, wOddEggName / $100
ld [wMobileMonNicknamePointerBuffer + 1], a
callba AddMobileMonToParty
farcall AddMobileMonToParty
ret
; 1fb546

10
engine/overworld.asm
View File

@ -112,7 +112,7 @@ GetPlayerSprite: ; 14183
AddMapSprites: ; 141c9
call GetMapPermission
call GetMapEnvironment
call CheckOutdoorMap
jr z, .outdoor
call AddIndoorSprites
@ -178,14 +178,14 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
ret nz
ld c, EMOTE_SHADOW
callba LoadEmote
call GetMapPermission
farcall LoadEmote
call GetMapEnvironment
call CheckOutdoorMap
ld c, EMOTE_GRASS_RUSTLE
jr z, .outdoor
ld c, EMOTE_BOULDER_DUST
.outdoor
callba LoadEmote
farcall LoadEmote
ret
; 14236
@ -265,7 +265,7 @@ GetMonSprite: ; 14259
and a
jr z, .NoBreedmon
callba LoadOverworldMonIcon
farcall LoadOverworldMonIcon
ld l, 1
ld h, 0

56
engine/pack.asm
View File

@ -118,12 +118,12 @@ Pack: ; 10000
ret
.TMHMPocketMenu: ; 100e8 (4:40e8)
callba TMHMPocket
farcall TMHMPocket
ld b, $5
ld c, $1
call Pack_InterpretJoypad
ret c
callba _CheckTossableItem
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .use_quit
@ -192,15 +192,15 @@ Pack: ; 10000
; 10159
.UseItem: ; 10159
callba AskTeachTMHM
farcall AskTeachTMHM
ret c
callba ChooseMonToLearnTMHM
farcall ChooseMonToLearnTMHM
jr c, .declined
ld hl, Options
ld a, [hl]
push af
res NO_TEXT_SCROLL, [hl]
callba TeachTMHM
farcall TeachTMHM
pop af
ld [Options], a
.declined
@ -240,29 +240,29 @@ Pack: ; 10000
ret
.ItemBallsKey_LoadSubmenu: ; 101c5 (4:41c5)
callba _CheckTossableItem
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .tossable
callba CheckSelectableItem
farcall CheckSelectableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .selectable
callba CheckItemMenu
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .usable
jr .unusable
.selectable
callba CheckItemMenu
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .selectable_usable
jr .selectable_unusable
.tossable
callba CheckSelectableItem
farcall CheckSelectableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .tossable_selectable
@ -455,7 +455,7 @@ Jumptable_GiveTossQuit: ; 1030b
; 10311
UseItem: ; 10311
callba CheckItemMenu
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
ld hl, .dw
rst JumpTable
@ -512,7 +512,7 @@ UseItem: ; 10311
TossMenu: ; 10364
ld hl, Text_ThrowAwayHowMany
call Pack_PrintTextNoScroll
callba SelectQuantityToToss
farcall SelectQuantityToToss
push af
call ExitMenu
pop af
@ -566,7 +566,7 @@ ResetPocketCursorPositions: ; 1039d
; 103c2
RegisterItem: ; 103c2
callba CheckSelectableItem
farcall CheckSelectableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .cant_register
@ -606,16 +606,16 @@ GiveItem: ; 103fd
ld a, PARTYMENUACTION_GIVE_ITEM
ld [PartyMenuActionText], a
call ClearBGPalettes
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitPartyMenuGFX
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
farcall InitPartyMenuGFX
.loop
callba WritePartyMenuTilemap
callba PrintPartyMenuText
farcall WritePartyMenuTilemap
farcall PrintPartyMenuText
call WaitBGMap
call SetPalettes
call DelayFrame
callba PartyMenuSelect
farcall PartyMenuSelect
jr c, .finish
ld a, [CurPartySpecies]
cp EGG
@ -786,7 +786,7 @@ BattlePack: ; 10493
ret
.TMHMPocketMenu: ; 10581 (4:4581)
callba TMHMPocket
farcall TMHMPocket
ld b, $5
ld c, $1
call Pack_InterpretJoypad
@ -824,7 +824,7 @@ BattlePack: ; 10493
ret
ItemSubmenu: ; 105d3 (4:45d3)
callba CheckItemContext
farcall CheckItemContext
ld a, [wItemAttributeParamBuffer]
TMHMSubmenu: ; 105dc (4:45dc)
and a
@ -890,7 +890,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
; 10629
.Use: ; 10629
callba CheckItemContext
farcall CheckItemContext
ld a, [wItemAttributeParamBuffer]
ld hl, .ItemFunctionJumptable
rst JumpTable
@ -1043,7 +1043,7 @@ DepositSellPack: ; 106be
ld a, 3
call InitPocket
call WaitBGMap_DrawPackGFX
callba TMHMPocket
farcall TMHMPocket
ld a, [CurItem]
ld [CurItem], a
ret
@ -1130,7 +1130,7 @@ TutorialPack: ; 107bb
ld a, [InputType]
or a
jr z, .loop
callba _DudeAutoInput_RightA
farcall _DudeAutoInput_RightA
.loop
call .RunJumptable
call DepositSellTutorial_InterpretJoypad
@ -1207,7 +1207,7 @@ TutorialPack: ; 107bb
ld a, 3
call InitPocket
call WaitBGMap_DrawPackGFX
callba TMHMPocket
farcall TMHMPocket
ld a, [CurItem]
ld [CurItem], a
ret
@ -1310,7 +1310,7 @@ DrawPackGFX: ; 1089d
ret
.female
callba DrawKrisPackGFX
farcall DrawKrisPackGFX
ret
; 108cc
@ -1377,7 +1377,7 @@ Pack_InterpretJoypad: ; 108d4 (4:48d4)
ret
.select
callba SwitchItemsInBag
farcall SwitchItemsInBag
ld hl, Text_MoveItemWhere
call Pack_PrintTextNoScroll
scf
@ -1394,7 +1394,7 @@ Pack_InterpretJoypad: ; 108d4 (4:48d4)
ret
.place_insert
callba SwitchItemsInBag
farcall SwitchItemsInBag
ld de, SFX_SWITCH_POKEMON
call WaitPlaySFX
ld de, SFX_SWITCH_POKEMON

6
engine/party_menu.asm
View File

@ -40,8 +40,8 @@ InitPartyMenuLayout: ; 5003f
LoadPartyMenuGFX: ; 5004f
call LoadFontsBattleExtra
callab InitPartyMenuPalettes ; engine/color.asm
callab ClearSpriteAnims2
callfar InitPartyMenuPalettes ; engine/color.asm
callfar ClearSpriteAnims2
ret
; 5005f
@ -662,7 +662,7 @@ InitPartyMenuGFX: ; 503e0
pop bc
dec c
jr nz, .loop
callab PlaySpriteAnimations
callfar PlaySpriteAnimations
ret
; 50405

22
engine/phone/phone.asm
View File

@ -154,7 +154,7 @@ CheckPhoneCall:: ; 90074 (24:4074)
ret
.timecheck ; 900a6 (24:40a6)
callba CheckReceiveCallTimer
farcall CheckReceiveCallTimer
ret
CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
@ -163,7 +163,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
push de
push af
callba CheckTime
farcall CheckTime
pop af
and MORN | DAY | NITE
and c
@ -201,7 +201,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
ret
GetAvailableCallers: ; 900de (24:40de)
callba CheckTime
farcall CheckTime
ld a, c
ld [EngineBuffer1], a
ld hl, EngineBuffer3
@ -308,7 +308,7 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136)
ret
SpecialCallOnlyWhenOutside: ; 90188
ld a, [wPermission]
ld a, [wEnvironment]
cp TOWN
jr z, .outside
cp ROUTE
@ -471,7 +471,7 @@ UnknownScript_0x90261: ; 0x90261
RingTwice_StartCall: ; 9026f
call .Ring
call .Ring
callba TrainerRankings_PhoneCalls
farcall TrainerRankings_PhoneCalls
ret
; 9027c
@ -500,7 +500,7 @@ PhoneCall:: ; 9029a
ld [PhoneCaller + 1], a
call Phone_FirstOfTwoRings
call Phone_FirstOfTwoRings
callba TrainerRankings_PhoneCalls
farcall TrainerRankings_PhoneCalls
ret
; 902b3
@ -599,7 +599,7 @@ Phone_StartRinging: ; 9033f
call PlaySFX
call Phone_CallerTextbox
call UpdateSprites
callba PhoneRing_LoadEDTile
farcall PhoneRing_LoadEDTile
ret
; 90355
@ -609,7 +609,7 @@ HangUp_Wait20Frames: ; 90355
Phone_Wait20Frames
ld c, 20
call DelayFrames
callba PhoneRing_LoadEDTile
farcall PhoneRing_LoadEDTile
ret
; 90363
@ -725,7 +725,7 @@ NonTrainerCallerNames: ; 903d6
Phone_GetTrainerName: ; 90423 (24:4423)
push hl
push bc
callba GetTrainerName
farcall GetTrainerName
pop bc
pop hl
ret
@ -733,7 +733,7 @@ Phone_GetTrainerName: ; 90423 (24:4423)
Phone_GetTrainerClassName: ; 9042e (24:442e)
push hl
push bc
callba GetTrainerClassName
farcall GetTrainerClassName
pop bc
pop hl
ret
@ -754,7 +754,7 @@ GetCallerLocation: ; 90439
push bc
call GetWorldMapLocation
ld e, a
callba GetLandmarkName
farcall GetLandmarkName
pop bc
pop de
ret

2
engine/play_slow_cry.asm
View File

@ -23,7 +23,7 @@ PlaySlowCry: ; fb841
ld [CryLength], a
ld a, h
ld [CryLength + 1], a
callba _PlayCryHeader
farcall _PlayCryHeader
call WaitSFX
.done

2
engine/player_movement.asm
View File

@ -653,7 +653,7 @@ DoPlayerMovement:: ; 80000
ld e, a
; Find an object struct with coordinates equal to d,e
ld bc, ObjectStructs ; redundant
callba IsNPCAtCoord
farcall IsNPCAtCoord
jr nc, .is_npc
call .CheckStrengthBoulder
jr c, .no_bump

10
engine/player_object.asm
View File

@ -29,14 +29,14 @@ SpawnPlayer: ; 8029
call GetMapObject
ld hl, MAPOBJECT_COLOR
add hl, bc
ln e, PAL_NPC_RED, PERSONTYPE_SCRIPT
ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT
ld a, [wPlayerSpriteSetupFlags]
bit 2, a
jr nz, .ok
ld a, [PlayerGender]
bit 0, a
jr z, .ok
ln e, PAL_NPC_BLUE, PERSONTYPE_SCRIPT
ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT
.ok
ld [hl], e
@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071
; A dummy map object used to initialize the player object.
; Shorter than the actual amount copied by two bytes.
; Said bytes seem to be unused.
person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, PERSONTYPE_SCRIPT, 0, 0, -1
object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
CopyDECoordsToMapObject:: ; 807e
push de
@ -82,7 +82,7 @@ PlayerSpawn_ConvertCoords: ; 808f
call CopyDECoordsToMapObject
ret
WritePersonXY:: ; 80a1
WriteObjectXY:: ; 80a1
ld a, b
call CheckObjectVisibility
ret c
@ -616,7 +616,7 @@ FollowNotExact:: ; 839e
call CheckObjectVisibility
ret c
; Person 2 is now in bc, person 1 is now in de
; object 2 is now in bc, object 1 is now in de
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld a, [hl]

2
engine/player_step.asm
View File

@ -77,7 +77,7 @@ HandlePlayerStep: ; d4e5 (3:54e5)
ret
.mobile ; d509 (3:5509)
callba TrainerRankings_StepCount
farcall TrainerRankings_StepCount
ret
.fail2 ; d510 (3:5510)

38
engine/pokecenter_pc.asm
View File

@ -105,7 +105,7 @@ BillsPC: ; 15668
call PC_PlayChoosePCSound
ld hl, PokecenterPCText_AccessedBillsPC
call PC_DisplayText
callba _BillsPC
farcall _BillsPC
and a
ret
; 15679 (5:5679)
@ -124,7 +124,7 @@ OaksPC: ; 15689
call PC_PlayChoosePCSound
ld hl, PokecenterPCText_AccessedOaksPC
call PC_DisplayText
callba ProfOaksPC
farcall ProfOaksPC
and a
ret
; 1569a
@ -132,7 +132,7 @@ OaksPC: ; 15689
HallOfFamePC: ; 1569a
call PC_PlayChoosePCSound
call FadeToMenu
callba _HallOfFamePC
farcall _HallOfFamePC
call CloseSubmenu
and a
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

44
engine/pokedex.asm
View File

@ -98,7 +98,7 @@ InitPokedex: ; 40063
call Pokedex_OrderMonsByMode
call Pokedex_InitCursorPosition
call Pokedex_GetLandmark
callba DrawDexEntryScreenRightEdge
farcall DrawDexEntryScreenRightEdge
call Pokedex_ResetBGMapMode
ret
@ -220,7 +220,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
hlcoord 0, 0, AttrMap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
call ByteFill
callba DrawPokedexListWindow
farcall DrawPokedexListWindow
hlcoord 0, 17
ld de, String_START_SEARCH
call Pokedex_PlaceString
@ -250,7 +250,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
call Pokedex_UpdateCursorOAM
callba DrawPokedexListWindow
farcall DrawPokedexListWindow
hlcoord 0, 17
ld de, String_START_SEARCH
call Pokedex_PlaceString
@ -333,7 +333,7 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
call Pokedex_InitArrowCursor
call Pokedex_GetSelectedMon
ld [wLastDexEntry], a
callba DisplayDexEntry
farcall DisplayDexEntry
call Pokedex_DrawFootprint
call WaitBGMap
ld a, $a7
@ -387,7 +387,7 @@ Pokedex_Page: ; 40292
ld [wPokedexStatus], a
call Pokedex_GetSelectedMon
ld [wLastDexEntry], a
callba DisplayDexEntry
farcall DisplayDexEntry
call WaitBGMap
ret
@ -403,7 +403,7 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
call Pokedex_LoadCurrentFootprint
call Pokedex_GetSelectedMon
ld [wLastDexEntry], a
callba DisplayDexEntry
farcall DisplayDexEntry
call Pokedex_DrawFootprint
call Pokedex_LoadSelectedMonTiles
call WaitBGMap
@ -481,7 +481,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
push af
ld a, [wJumptableIndex]
push af
callba PrintDexEntry
farcall PrintDexEntry
pop af
ld [wJumptableIndex], a
pop af
@ -502,7 +502,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
Pokedex_RedisplayDexEntry: ; 4038d
call Pokedex_DrawDexEntryScreenBG
call Pokedex_GetSelectedMon
callba DisplayDexEntry
farcall DisplayDexEntry
call Pokedex_DrawFootprint
ret
@ -622,7 +622,7 @@ Pokedex_InitSearchScreen: ; 40443 (10:4443)
call Pokedex_PlaceSearchScreenTypeStrings
xor a
ld [wDexSearchSlowpokeFrame], a
callba DoDexSearchSlowpokeFrame
farcall DoDexSearchSlowpokeFrame
call WaitBGMap
ld a, SCGB_POKEDEX_SEARCH_OPTION
call Pokedex_GetSGBLayout
@ -675,7 +675,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
.MenuAction_BeginSearch: ; 404b7
call Pokedex_SearchForMons
callba AnimateDexSearchSlowpoke
farcall AnimateDexSearchSlowpoke
ld a, [wDexSearchResultCount]
and a
jr nz, .show_search_results
@ -722,7 +722,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
call ByteFill
call Pokedex_SetBGMapMode4
call Pokedex_ResetBGMapMode
callba DrawPokedexSearchResultsWindow
farcall DrawPokedexSearchResultsWindow
call Pokedex_PlaceSearchResultsTypeStrings
ld a, 4
ld [wDexListingHeight], a
@ -738,7 +738,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
ld [hWY], a
call WaitBGMap
call Pokedex_ResetBGMapMode
callba DrawPokedexSearchResultsWindow
farcall DrawPokedexSearchResultsWindow
call Pokedex_PlaceSearchResultsTypeStrings
call Pokedex_UpdateSearchResultsCursorOAM
ld a, $ff
@ -801,7 +801,7 @@ Pokedex_InitUnownMode: ; 405bd (10:45bd)
ld [wDexCurrentUnownIndex], a
call Pokedex_LoadUnownFrontpicTiles
call Pokedex_UnownModePlaceCursor
callba PrintUnownWord
farcall PrintUnownWord
call WaitBGMap
ld a, SCGB_POKEDEX_UNOWN_MODE
call Pokedex_GetSGBLayout
@ -823,7 +823,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df)
call DelayFrame
call Pokedex_CheckSGB
jr nz, .decompress
callba LoadSGBPokedexGFX2
farcall LoadSGBPokedexGFX2
jr .done
.decompress
@ -873,7 +873,7 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
call Pokedex_UnownModeEraseCursor
call Pokedex_LoadUnownFrontpicTiles
call Pokedex_UnownModePlaceCursor
callba PrintUnownWord
farcall PrintUnownWord
ld a, $1
ld [hBGMapMode], a
call DelayFrame
@ -2403,13 +2403,13 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2
predef GetFrontpic
predef GetMonFrontpic
ret
.QuestionMark:
ld a, BANK(sScratch)
call GetSRAMBank
callba LoadQuestionMarkPic
farcall LoadQuestionMarkPic
ld hl, VTiles2
ld de, sScratch
ld c, 7 * 7
@ -2477,7 +2477,7 @@ Pokedex_LoadGFX: ; 414b7
call Pokedex_InvertTiles
call Pokedex_CheckSGB
jr nz, .LoadPokedexLZ
callba LoadSGBPokedexGFX
farcall LoadSGBPokedexGFX
jr .LoadPokedexSlowpokeLZ
.LoadPokedexLZ:
@ -2556,7 +2556,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
ld [CurPartySpecies], a
call GetBaseData
ld de, VTiles2 tile $00
predef GetFrontpic
predef GetMonFrontpic
pop af
ld [UnownLetter], a
ret
@ -2564,7 +2564,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
_NewPokedexEntry: ; 41a7f
xor a
ld [hBGMapMode], a
callba DrawDexEntryScreenRightEdge
farcall DrawDexEntryScreenRightEdge
call Pokedex_ResetBGMapMode
call DisableLCD
call LoadStandardFont
@ -2581,12 +2581,12 @@ _NewPokedexEntry: ; 41a7f
ld bc, 19
ld a, " "
call ByteFill
callba DisplayDexEntry
farcall DisplayDexEntry
call EnableLCD
call WaitBGMap
call GetBaseData
ld de, VTiles2
predef GetFrontpic
predef GetMonFrontpic
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, [CurPartySpecies]

60
engine/pokegear.asm
View File

@ -20,7 +20,7 @@ PokeGear: ; 90b8d (24:4b8d)
bit 7, a
jr nz, .done
call PokegearJumptable
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop
@ -55,7 +55,7 @@ PokeGear: ; 90b8d (24:4b8d)
ld a, $7
ld [hWX], a
call Pokegear_LoadGFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
call InitPokegearModeIndicatorArrow
ld a, 8
call SkipMusic
@ -106,7 +106,7 @@ Pokegear_LoadGFX: ; 90c4e
call GetWorldMapLocation
cp FAST_SHIP
jr z, .ssaqua
callba GetPlayerIcon
farcall GetPlayerIcon
push de
ld h, d
ld l, e
@ -239,7 +239,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
.return_from_jumptable
call Pokegear_FinishTilemap
callba TownMapPals
farcall TownMapPals
ld a, [wcf65]
and a
jr nz, .kanto_0
@ -319,7 +319,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
.kanto
ld e, 1
.ok
callba PokegearMap
farcall PokegearMap
ld a, $7
ld bc, $12
hlcoord 1, 2
@ -513,7 +513,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
ld a, [hMinutes]
ld c, a
decoord 6, 8
callba PrintHoursMins
farcall PrintHoursMins
ld hl, .DayText
bccoord 6, 6
call PlaceHLTextAtBC
@ -670,7 +670,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
pop af
ld e, a
push bc
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@ -709,9 +709,9 @@ PokegearMap_UpdateLandmarkName: ; 910b4
pop af
ld e, a
push de
callba GetLandmarkName
farcall GetLandmarkName
pop de
callba TownMap_ConvertLineBreakCharacters
farcall TownMap_ConvertLineBreakCharacters
hlcoord 8, 0
ld [hl], $34
ret
@ -721,7 +721,7 @@ PokegearMap_UpdateLandmarkName: ; 910b4
PokegearMap_UpdateCursorPosition: ; 910d4
push bc
ld e, a
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@ -929,7 +929,7 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
ret
.no_service
callba Phone_NoSignal
farcall Phone_NoSignal
ld hl, .OutOfServiceArea
call PrintText
ld a, $8
@ -958,7 +958,7 @@ PokegearPhone_FinishPhoneCall: ; 91256 (24:5256)
ld a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret z
callba HangUp
farcall HangUp
ld a, $8
ld [wJumptableIndex], a
ld hl, PokegearText_WhomToCall
@ -1121,7 +1121,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
ld d, 0
add hl, de
ld c, [hl]
callba CheckCanDeletePhoneNumber
farcall CheckCanDeletePhoneNumber
ld a, c
and a
jr z, .cant_delete
@ -1849,7 +1849,7 @@ _TownMap: ; 9191c
call ClearSprites
call DisableLCD
call Pokegear_LoadGFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld a, 8
call SkipMusic
ld a, $e3
@ -1919,7 +1919,7 @@ _TownMap: ; 9191c
jr nz, .pressed_down
.loop2
push de
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
pop de
call DelayFrame
jr .loop
@ -1973,7 +1973,7 @@ _TownMap: ; 9191c
.kanto2
ld e, $1
.okay_tilemap
callba PokegearMap
farcall PokegearMap
ld a, $7
ld bc, 6
hlcoord 1, 0
@ -1994,7 +1994,7 @@ _TownMap: ; 9191c
ld [hl], $17
ld a, [wTownMapCursorLandmark]
call PokegearMap_UpdateLandmarkName
callba TownMapPals
farcall TownMapPals
ret
; 91a53
@ -2116,7 +2116,7 @@ _FlyMap: ; 91af3
ld [hl], $1
xor a
ld [hBGMapMode], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
@ -2138,7 +2138,7 @@ _FlyMap: ; 91af3
jr nz, .pressedA
call FlyMapScroll
call GetMapCursorCoordinates
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop
@ -2276,7 +2276,7 @@ TownMapBubble: ; 91bb5
ld de, Flypoints
add hl, de
ld e, [hl]
callba GetLandmarkName
farcall GetLandmarkName
hlcoord 2, 1
ld de, StringBuffer1
call PlaceString
@ -2292,7 +2292,7 @@ GetMapCursorCoordinates: ; 91c17
ld de, Flypoints
add hl, de
ld e, [hl]
callba GetLandmarkCoords
farcall GetLandmarkCoords
ld a, [wTownMapCursorCoordinates]
ld c, a
ld a, [wTownMapCursorCoordinates + 1]
@ -2595,7 +2595,7 @@ _Area: ; 91d11
.GetAndPlaceNest: ; 91e1e
ld [wTownMapCursorLandmark], a
ld e, a
callba FindNest ; load nest landmarks into TileMap[0,0]
farcall FindNest ; load nest landmarks into TileMap[0,0]
decoord 0, 0
ld hl, Sprites
.nestloop
@ -2605,7 +2605,7 @@ _Area: ; 91d11
push de
ld e, a
push hl
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop hl
; load into OAM
ld a, d
@ -2637,7 +2637,7 @@ _Area: ; 91d11
ret c
ld a, [wTownMapPlayerIconLandmark]
ld e, a
callba GetLandmarkCoords
farcall GetLandmarkCoords
ld c, e
ld b, d
ld de, .PlayerOAM
@ -2723,7 +2723,7 @@ _Area: ; 91d11
ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP
jr z, .FastShip
callba GetPlayerIcon
farcall GetPlayerIcon
ret
.FastShip:
@ -2851,7 +2851,7 @@ TownMapMon: ; 91f7b
ld [wd265], a
; Get FlyMon icon
ld e, 8 ; starting tile in VRAM
callba GetSpeciesIcon
farcall GetSpeciesIcon
; Animation/palette
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON
@ -2869,7 +2869,7 @@ TownMapMon: ; 91f7b
TownMapPlayerIcon: ; 91fa6
; Draw the player icon at town map location in a
push af
callba GetPlayerIcon
farcall GetPlayerIcon
; Standing icon
ld hl, VTiles0 tile $10
ld c, 4 ; # tiles
@ -2899,7 +2899,7 @@ TownMapPlayerIcon: ; 91fa6
pop af
ld e, a
push bc
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@ -2945,7 +2945,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
ld [hl], $1
xor a
ld [hBGMapMode], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
@ -2980,7 +2980,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
jr nz, .pressedA
call .HandleDPad
call GetMapCursorCoordinates
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop

2
engine/pokepic.asm
View File

@ -12,7 +12,7 @@ Pokepic:: ; 244e3
ld [CurSpecies], a
call GetBaseData
ld de, VTiles1
predef GetFrontpic
predef GetMonFrontpic
ld a, [wMenuBorderTopCoord]
inc a
ld b, a

10
engine/predef.asm
View File

@ -54,8 +54,8 @@ PredefPointers:: ; 856b
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
add_predef GetMonBackpic ; $18
add_predef GetMonFrontpic
add_predef GetBattleMonBackpic ; $18
add_predef GetEnemyMonFrontpic
add_predef LearnLevelMoves
add_predef FillMoves
add_predef EvolveAfterBattle
@ -90,9 +90,9 @@ PredefPointers:: ; 856b
add_predef Predef39
add_predef Predef3A
add_predef PartyMonItemName
add_predef GetFrontpic
add_predef GetBackpic
add_predef FrontpicPredef
add_predef GetMonFrontpic
add_predef GetMonBackpic
add_predef GetAnimatedFrontpicPredef
add_predef GetTrainerPic
add_predef DecompressPredef ; $40
add_predef CheckTypeMatchup

12
engine/print_party.asm
View File

@ -31,7 +31,7 @@ PrintPage1: ; 1dc1b0
ld a, [wd265]
ld b, a
ld c, 1 ; get page 1
callba GetDexEntryPagePointer
farcall GetDexEntryPagePointer
pop af
ld a, b
hlcoord 1, 11, wPrinterTileMapBuffer
@ -81,7 +81,7 @@ PrintPage2: ; 1dc213
ld a, [wd265]
ld b, a
ld c, 2 ; get page 2
callba GetDexEntryPagePointer
farcall GetDexEntryPagePointer
pop af
hlcoord 1, 1, wPrinterTileMapBuffer
ld a, b
@ -157,7 +157,7 @@ PrintPartyMonPage1: ; 1dc381
xor a
ld [MonType], a
callba CopyPkmnToTempMon
farcall CopyPkmnToTempMon
hlcoord 0, 7
ld b, 9
ld c, 18
@ -241,7 +241,7 @@ PrintPartyMonPage2: ; 1dc47b
call LoadFontsBattleExtra
xor a
ld [MonType], a
callba CopyPkmnToTempMon
farcall CopyPkmnToTempMon
hlcoord 0, 0
ld b, 15
ld c, 18
@ -316,7 +316,7 @@ Function1dc51a: ; 1dc51a
; 1dc52c
Function1dc52c: ; 1dc52c
callba GetGender
farcall GetGender
ld a, " "
jr c, .got_gender
ld a, "♂"
@ -327,7 +327,7 @@ Function1dc52c: ; 1dc52c
hlcoord 17, 2
ld [hl], a
ld bc, TempMonDVs
callba CheckShininess
farcall CheckShininess
ret nc
hlcoord 18, 2
ld [hl], "<SHINY>"

16
engine/printer.asm
View File

@ -68,7 +68,7 @@ PrintDexEntry: ; 8442c
call Printer_StartTransmission
ld a, $10
ld [wcbfa], a
callba PrintPage1
farcall PrintPage1
call ClearTileMap
ld a, %11100100
call DmgToCgbBGPals
@ -94,7 +94,7 @@ PrintDexEntry: ; 8442c
call Printer_StartTransmission
ld a, $3
ld [wcbfa], a
callba PrintPage2
farcall PrintPage2
call Printer_ResetJoypadRegisters
ld a, 4
ld [wPrinterQueueLength], a
@ -235,7 +235,7 @@ PrintUnownStamp: ; 84560
xor a
ld [hBGMapMode], a
call LoadTileMapToTempTileMap
callba PlaceUnownPrinterFrontpic
farcall PlaceUnownPrinterFrontpic
ld a, $0 ; to be loaded to wcbfa
call Printer_PrepareTileMapForPrint
call Call_LoadTempTileMapToTileMap
@ -341,7 +341,7 @@ PrintPartymon: ; 8461a
xor a
ld [hBGMapMode], a
callba PrintPartyMonPage1
farcall PrintPartyMonPage1
ld a, $10 ; to be loaded to wcbfa
call Printer_PrepareTileMapForPrint
@ -362,7 +362,7 @@ PrintPartymon: ; 8461a
xor a
ld [hBGMapMode], a
callba PrintPartyMonPage2
farcall PrintPartyMonPage2
ld a, $3 ; to be loaded to wcbfa
call Printer_PrepareTileMapForPrint
@ -391,7 +391,7 @@ _PrintDiploma: ; 84688
ld a, [wPrinterQueueLength]
push af
callba PlaceDiplomaOnScreen
farcall PlaceDiplomaOnScreen
xor a
ld [hPrinter], a
@ -425,7 +425,7 @@ _PrintDiploma: ; 84688
xor a
ld [hBGMapMode], a
callba PrintDiplomaPage2
farcall PrintDiplomaPage2
ld a, $3 ; to be loaded to wcbfa
call Printer_PrepareTileMapForPrint
@ -861,7 +861,7 @@ Printer_GetMonGender: ; 8498a (21:498a)
ld [CurPartyMon], a
ld a, TEMPMON
ld [MonType], a
callba GetGender
farcall GetGender
ld a, " "
jr c, .got_gender
ld a, "♂"

24
engine/radio.asm
View File

@ -278,7 +278,7 @@ endr
pop bc
call GetWorldMapLocation
ld e, a
callba GetLandmarkName
farcall GetLandmarkName
ld hl, OPT_OakText1
call CopyRadioTextToRAM
ld a, OAKS_POKEMON_TALK_5
@ -592,7 +592,7 @@ OaksPkmnTalk9:
db "@"
OaksPkmnTalk10:
callba RadioMusicRestartPokemonChannel
farcall RadioMusicRestartPokemonChannel
ld hl, OPT_RestartText
call PrintText
call WaitBGMap
@ -653,7 +653,7 @@ OaksPkmnTalk14:
dec [hl]
ret nz
ld de, $1d
callab RadioMusicRestartDE
callfar RadioMusicRestartDE
ld hl, .terminator
call PrintText
ld a, OAKS_POKEMON_TALK_4
@ -923,7 +923,7 @@ StartPokemonMusicChannel:
jr z, .SunTueThurSun
ld de, MUSIC_POKEMON_LULLABY
.SunTueThurSun:
callab RadioMusicRestartDE
callfar RadioMusicRestartDE
ret
BenIntroText1:
@ -978,9 +978,9 @@ BenFernText3B:
LuckyNumberShow1:
call StartRadioStation
callab Special_CheckLuckyNumberShowFlag
callfar Special_CheckLuckyNumberShowFlag
jr nc, .dontreset
callab Special_ResetLuckyNumberShowFlag
callfar Special_ResetLuckyNumberShowFlag
.dontreset
ld hl, LC_Text1
ld a, LUCKY_NUMBER_SHOW_2
@ -1193,12 +1193,12 @@ PeoplePlaces4: ; People
pop bc
jr c, PeoplePlaces4
push bc
callab GetTrainerClassName
callfar GetTrainerClassName
ld de, StringBuffer1
call CopyName1
pop bc
ld b, 1
callab GetTrainerName
callfar GetTrainerName
ld hl, PnP_Text4
ld a, PLACES_AND_PEOPLE_5
jp NextRadioLine
@ -1348,7 +1348,7 @@ PeoplePlaces6: ; Places
ld c, [hl]
call GetWorldMapLocation
ld e, a
callba GetLandmarkName
farcall GetLandmarkName
ld hl, PnP_Text5
ld a, PLACES_AND_PEOPLE_7
jp NextRadioLine
@ -1808,8 +1808,8 @@ BuenasPassword19:
BuenasPassword20:
ld a, [hBGMapMode]
push af
callba NoRadioMusic
callba NoRadioName
farcall NoRadioMusic
farcall NoRadioName
pop af
ld [hBGMapMode], a
ld hl, WeeklyFlags
@ -1955,7 +1955,7 @@ StartRadioStation:
ld e, [hl]
inc hl
ld d, [hl]
callab RadioMusicRestartDE
callfar RadioMusicRestartDE
ret
RadioChannelSongs:

4
engine/rtc.asm
View File

@ -143,8 +143,8 @@ Function140ae: ; 140ae
jr c, .dont_update
.time_overflow
callba ClearDailyTimers
callba Function170923
farcall ClearDailyTimers
farcall Function170923
; mobile
ld a, $5
call GetSRAMBank

46
engine/save.asm
View File

@ -1,9 +1,9 @@
SaveMenu: ; 14a1a
call LoadStandardMenuDataHeader
callba DisplaySaveInfoOnSave
farcall DisplaySaveInfoOnSave
call SpeechTextBox
call UpdateSprites
callba SaveMenu_LoadEDTile
farcall SaveMenu_LoadEDTile
ld hl, Text_WouldYouLikeToSaveTheGame
call SaveTheGame_yesorno
jr nz, .refused
@ -19,20 +19,20 @@ SaveMenu: ; 14a1a
.refused
call ExitMenu
call ret_d90
callba SaveMenu_LoadEDTile
farcall SaveMenu_LoadEDTile
scf
ret
SaveAfterLinkTrade: ; 14a58
call PauseGameLogic
callba StageRTCTimeForSave
callba BackupMysteryGift
farcall StageRTCTimeForSave
farcall BackupMysteryGift
call SavePokemonData
call SaveChecksum
call SaveBackupPokemonData
call SaveBackupChecksum
callba BackupPartyMonMail
callba SaveRTC
farcall BackupPartyMonMail
farcall SaveRTC
call ResumeGameLogic
ret
; 14a83
@ -95,8 +95,8 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5
ld [wCurBox], a
ld a, $1
ld [wSaveFileExists], a
callba StageRTCTimeForSave
callba BackupMysteryGift
farcall StageRTCTimeForSave
farcall BackupMysteryGift
call ValidateSave
call SaveOptions
call SavePlayerData
@ -107,9 +107,9 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5
call SaveBackupPlayerData
call SaveBackupPokemonData
call SaveBackupChecksum
callba BackupPartyMonMail
callba BackupMobileEventIndex
callba SaveRTC
farcall BackupPartyMonMail
farcall BackupMobileEventIndex
farcall SaveRTC
call LoadBox
call ResumeGameLogic
ld de, SFX_SAVE
@ -271,8 +271,8 @@ SavedTheGame: ; 14be6
SaveGameData_: ; 14c10
ld a, 1
ld [wSaveFileExists], a
callba StageRTCTimeForSave
callba BackupMysteryGift
farcall StageRTCTimeForSave
farcall BackupMysteryGift
call ValidateSave
call SaveOptions
call SavePlayerData
@ -285,9 +285,9 @@ SaveGameData_: ; 14c10
call SaveBackupPokemonData
call SaveBackupChecksum
call UpdateStackTop
callba BackupPartyMonMail
callba BackupMobileEventIndex
callba SaveRTC
farcall BackupPartyMonMail
farcall BackupMobileEventIndex
farcall SaveRTC
ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank
ld a, [sBattleTowerChallengeState]
@ -636,9 +636,9 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5)
call LoadPlayerData
call LoadPokemonData
call LoadBox
callba RestorePartyMonMail
callba RestoreMobileEventIndex
callba RestoreMysteryGift
farcall RestorePartyMonMail
farcall RestoreMobileEventIndex
farcall RestoreMysteryGift
call ValidateBackupSave
call SaveBackupOptions
call SaveBackupPlayerData
@ -653,9 +653,9 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5)
call LoadBackupPlayerData
call LoadBackupPokemonData
call LoadBox
callba RestorePartyMonMail
callba RestoreMobileEventIndex
callba RestoreMysteryGift
farcall RestorePartyMonMail
farcall RestoreMobileEventIndex
farcall RestoreMysteryGift
call ValidateSave
call SaveOptions
call SavePlayerData

240
engine/scripting.asm
View File

@ -35,7 +35,7 @@ WaitScript:
dec [hl]
ret nz
callba Function58b9
farcall Function58b9
ld a, SCRIPT_READ
ld [ScriptMode], a
@ -49,7 +49,7 @@ WaitScriptMovement:
bit 7, [hl]
ret nz
callba Function58b9
farcall Function58b9
ld a, SCRIPT_READ
ld [ScriptMode], a
@ -82,10 +82,10 @@ ScriptCommandTable:
dw Script_callasm ; 0e
dw Script_special ; 0f
dw Script_ptcallasm ; 10
dw Script_checkmaptriggers ; 11
dw Script_domaptrigger ; 12
dw Script_checktriggers ; 13
dw Script_dotrigger ; 14
dw Script_checkmapscene ; 11
dw Script_setmapscene ; 12
dw Script_checkscene ; 13
dw Script_setscene ; 14
dw Script_writebyte ; 15
dw Script_addvar ; 16
dw Script_random ; 17
@ -175,14 +175,14 @@ ENDC
dw Script_applymovement ; 69
dw Script_applymovement2 ; 6a
dw Script_faceplayer ; 6b
dw Script_faceperson ; 6c
dw Script_faceobject ; 6c
dw Script_variablesprite ; 6d
dw Script_disappear ; 6e
dw Script_appear ; 6f
dw Script_follow ; 70
dw Script_stopfollow ; 71
dw Script_moveperson ; 72
dw Script_writepersonxy ; 73
dw Script_moveobject ; 72
dw Script_writeobjectxy ; 73
dw Script_loademote ; 74
dw Script_showemote ; 75
dw Script_spriteface ; 76
@ -277,7 +277,7 @@ Script_special:
ld e, a
call GetScriptByte
ld d, a
callba Special
farcall Special
ret
Script_ptcallasm:
@ -475,13 +475,13 @@ Script_pokepic:
ld a, [ScriptVar]
.ok
ld [CurPartySpecies], a
callba Pokepic
farcall Pokepic
ret
Script_closepokepic:
; script command 0x57
callba ClosePokepic
farcall ClosePokepic
ret
Script_verticalmenu:
@ -519,7 +519,7 @@ Script_battletowertext:
call SetUpTextBox
call GetScriptByte
ld c, a
callba BattleTowerText
farcall BattleTowerText
ret
Script_verbosegiveitem:
@ -615,7 +615,7 @@ Script_pocketisfull:
Script_specialsound:
; script command 0x88
callba CheckItemPocket
farcall CheckItemPocket
ld a, [wItemAttributeParamBuffer]
cp TM_HM
ld de, SFX_GET_TM
@ -628,7 +628,7 @@ Script_specialsound:
GetPocketName:
callba CheckItemPocket
farcall CheckItemPocket
ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Pockets
@ -689,7 +689,7 @@ Script_pokemart:
ld d, a
ld a, [ScriptBank]
ld b, a
callba OpenMartDialog
farcall OpenMartDialog
ret
Script_elevator:
@ -705,7 +705,7 @@ Script_elevator:
ld d, a
ld a, [ScriptBank]
ld b, a
callba Elevator
farcall Elevator
ret c
ld a, TRUE
ld [ScriptVar], a
@ -718,7 +718,7 @@ Script_trade:
call GetScriptByte
ld e, a
callba NPCTrade
farcall NPCTrade
ret
Script_phonecall:
@ -732,13 +732,13 @@ Script_phonecall:
ld d, a
ld a, [ScriptBank]
ld b, a
callba PhoneCall
farcall PhoneCall
ret
Script_hangup:
; script command 0x99
callba HangUp
farcall HangUp
ret
Script_askforphonenumber:
@ -750,7 +750,7 @@ Script_askforphonenumber:
jr c, .refused
call GetScriptByte
ld c, a
callba AddPhoneNumber
farcall AddPhoneNumber
jr c, .phonefull
xor a
jr .done
@ -771,7 +771,7 @@ Script_describedecoration:
call GetScriptByte
ld b, a
callba DescribeDecoration
farcall DescribeDecoration
ld h, d
ld l, e
jp ScriptJump
@ -800,7 +800,7 @@ Script_swarm:
ld d, a
call GetScriptByte
ld e, a
callba StoreSwarmMapIndices
farcall StoreSwarmMapIndices
ret
Script_trainertext:
@ -897,7 +897,7 @@ Script_encountermusic:
ld a, [OtherTrainerClass]
ld e, a
callba PlayTrainerEncounterMusic
farcall PlayTrainerEncounterMusic
ret
Script_playmapmusic:
@ -959,7 +959,7 @@ Script_waitsfx:
Script_warpsound:
; script command 0x87
callba GetWarpSFX
farcall GetWarpSFX
call PlaySFX
ret
@ -979,7 +979,7 @@ Script_cry:
call PlayCry
ret
GetScriptPerson:
GetScriptObject:
and a ; PLAYER?
ret z
cp LAST_TALKED
@ -990,27 +990,27 @@ GetScriptPerson:
Script_setlasttalked:
; script command 0x68
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld [hLastTalked], a
ret
Script_applymovement:
; script command 0x69
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
; data (MovementPointerLabelParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld c, a
ApplyMovement:
push bc
ld a, c
callba SetFlagsForMovement_1
farcall SetFlagsForMovement_1
pop bc
push bc
@ -1032,7 +1032,7 @@ ApplyMovement:
ret
SetFlagsForMovement_2:
callba _SetFlagsForMovement_2
farcall _SetFlagsForMovement_2
ret
Script_applymovement2:
@ -1054,38 +1054,38 @@ Script_faceplayer:
ld d, $0
ld a, [hLastTalked]
ld e, a
callba GetRelativeFacing
farcall GetRelativeFacing
ld a, d
add a
add a
ld e, a
ld a, [hLastTalked]
ld d, a
call ApplyPersonFacing
call ApplyObjectFacing
ret
Script_faceperson:
Script_faceobject:
; script command 0x6c
; parameters:
; person1 (SingleByteParam)
; person2 (SingleByteParam)
; object1 (SingleByteParam)
; object2 (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr c, .ok
ld a, [hLastTalked]
.ok
ld e, a
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr nz, .ok2
ld a, [hLastTalked]
.ok2
ld d, a
push de
callba GetRelativeFacing
farcall GetRelativeFacing
pop bc
ret c
ld a, d
@ -1093,17 +1093,17 @@ Script_faceperson:
add a
ld e, a
ld d, c
call ApplyPersonFacing
call ApplyObjectFacing
ret
Script_spriteface:
; script command 0x76
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
; facing (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr nz, .ok
ld a, [hLastTalked]
@ -1113,10 +1113,10 @@ Script_spriteface:
add a
add a
ld e, a
call ApplyPersonFacing
call ApplyObjectFacing
ret
ApplyPersonFacing:
ApplyObjectFacing:
ld a, d
push de
call CheckObjectVisibility
@ -1179,10 +1179,10 @@ Script_variablesprite:
Script_appear:
; script command 0x6f
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
call _CopyObjectStruct
ld a, [hMapObjectIndexBuffer]
ld b, 0 ; clear
@ -1192,10 +1192,10 @@ Script_appear:
Script_disappear:
; script command 0x6e
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr nz, .ok
ld a, [hLastTalked]
@ -1204,7 +1204,7 @@ Script_disappear:
ld a, [hMapObjectIndexBuffer]
ld b, 1 ; set
call ApplyEventActionAppearDisappear
callba _UpdateSprites
farcall _UpdateSprites
ret
ApplyEventActionAppearDisappear:
@ -1230,33 +1230,33 @@ ApplyEventActionAppearDisappear:
Script_follow:
; script command 0x70
; parameters:
; person2 (SingleByteParam)
; person1 (SingleByteParam)
; object2 (SingleByteParam)
; object1 (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld b, a
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld c, a
callba StartFollow
farcall StartFollow
ret
Script_stopfollow:
; script command 0x71
callba StopFollow
farcall StopFollow
ret
Script_moveperson:
Script_moveobject:
; script command 0x72
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
; x (SingleByteParam)
; y (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld b, a
call GetScriptByte
add 4
@ -1264,37 +1264,37 @@ Script_moveperson:
call GetScriptByte
add 4
ld e, a
callba CopyDECoordsToMapObject
farcall CopyDECoordsToMapObject
ret
Script_writepersonxy:
Script_writeobjectxy:
; script command 0x73
; parameters:
; person (SingleByteParam)
; object id (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr nz, .ok
ld a, [hLastTalked]
.ok
ld b, a
callba WritePersonXY
farcall WriteObjectXY
ret
Script_follownotexact:
; script command 0x77
; parameters:
; person2 (SingleByteParam)
; person1 (SingleByteParam)
; object2 (SingleByteParam)
; object1 (SingleByteParam)
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld b, a
call GetScriptByte
call GetScriptPerson
call GetScriptObject
ld c, a
callba FollowNotExact
farcall FollowNotExact
ret
Script_loademote:
@ -1308,20 +1308,20 @@ Script_loademote:
ld a, [ScriptVar]
.not_var_emote
ld c, a
callba LoadEmote
farcall LoadEmote
ret
Script_showemote:
; script command 0x75
; parameters:
; bubble (SingleByteParam)
; person (SingleByteParam)
; object id (SingleByteParam)
; time (DecimalParam)
call GetScriptByte
ld [ScriptVar], a
call GetScriptByte
call GetScriptPerson
call GetScriptObject
cp LAST_TALKED
jr z, .ok
ld [hLastTalked], a
@ -1451,7 +1451,7 @@ Script_catchtutorial:
call GetScriptByte
ld [BattleType], a
call BufferScreen
callba CatchTutorial
farcall CatchTutorial
jp Script_reloadmap
Script_reloadmapafterbattle:
@ -1471,7 +1471,7 @@ Script_reloadmapafterbattle:
.notblackedout
bit 0, d
jr z, .was_wild
callba MomTriesToBuySomething
farcall MomTriesToBuySomething
jr .done
.was_wild
@ -1480,7 +1480,7 @@ Script_reloadmapafterbattle:
jr z, .done
ld b, BANK(Script_SpecialBillCall)
ld de, Script_SpecialBillCall
callba LoadScriptBDE
farcall LoadScriptBDE
.done
jp Script_reloadmap
@ -1751,20 +1751,20 @@ Script_priorityjump:
set 3, [hl]
ret
Script_checktriggers:
Script_checkscene:
; script command 0x13
call CheckTriggers
jr z, .no_triggers
call CheckScenes
jr z, .no_scene
ld [ScriptVar], a
ret
.no_triggers
.no_scene
ld a, $ff
ld [ScriptVar], a
ret
Script_checkmaptriggers:
Script_checkmapscene:
; script command 0x11
; parameters:
; map_group (SingleByteParam)
@ -1774,49 +1774,49 @@ Script_checkmaptriggers:
ld b, a
call GetScriptByte
ld c, a
call GetMapTrigger
call GetMapSceneID
ld a, d
or e
jr z, .no_triggers
jr z, .no_scene
ld a, [de]
ld [ScriptVar], a
ret
.no_triggers
.no_scene
ld a, $ff
ld [ScriptVar], a
ret
Script_dotrigger:
Script_setscene:
; script command 0x14
; parameters:
; trigger_id (SingleByteParam)
; scene_id (SingleByteParam)
ld a, [MapGroup]
ld b, a
ld a, [MapNumber]
ld c, a
jr DoTrigger
jr DoScene
Script_domaptrigger:
Script_setmapscene:
; script command 0x12
; parameters:
; map_group (MapGroupParam)
; map_id (MapIdParam)
; trigger_id (SingleByteParam)
; scene_id (SingleByteParam)
call GetScriptByte
ld b, a
call GetScriptByte
ld c, a
DoTrigger:
call GetMapTrigger
DoScene:
call GetMapSceneID
ld a, d
or e
jr z, .no_trigger
jr z, .no_scene
call GetScriptByte
ld [de], a
.no_trigger
.no_scene
ret
Script_copybytetovar:
@ -1969,7 +1969,7 @@ Script_writecode:
GetVarAction:
ld c, a
callba _GetVarAction
farcall _GetVarAction
ret
Script_checkver:
@ -2040,7 +2040,7 @@ Script_mapnametotext:
ConvertLandmarkToText:
ld e, a
callba GetLandmarkName
farcall GetLandmarkName
ld de, StringBuffer1
jp ConvertMemToText
@ -2064,7 +2064,7 @@ Script_trainertotext:
ld c, a
call GetScriptByte
ld b, a
callba GetTrainerName
farcall GetTrainerName
jr ConvertMemToText
Script_name:
@ -2176,7 +2176,7 @@ Script_givepokeitem:
ld a, [ScriptBank]
call FarCopyBytes
pop bc
callba GivePokeItem
farcall GivePokeItem
ret
Script_checkpokeitem:
@ -2190,7 +2190,7 @@ Script_checkpokeitem:
ld d, a
ld a, [ScriptBank]
ld b, a
callba CheckPokeItem
farcall CheckPokeItem
ret
Script_giveitem:
@ -2263,7 +2263,7 @@ Script_givemoney:
call GetMoneyAccount
call LoadMoneyAmountToMem
callba GiveMoney
farcall GiveMoney
ret
Script_takemoney:
@ -2274,7 +2274,7 @@ Script_takemoney:
call GetMoneyAccount
call LoadMoneyAmountToMem
callba TakeMoney
farcall TakeMoney
ret
Script_checkmoney:
@ -2285,7 +2285,7 @@ Script_checkmoney:
call GetMoneyAccount
call LoadMoneyAmountToMem
callba CompareMoney
farcall CompareMoney
CompareMoneyAction:
jr c, .two
@ -2329,7 +2329,7 @@ Script_givecoins:
; coins (CoinByteParam)
call LoadCoinAmountToMem
callba GiveCoins
farcall GiveCoins
ret
Script_takecoins:
@ -2338,7 +2338,7 @@ Script_takecoins:
; coins (CoinByteParam)
call LoadCoinAmountToMem
callba TakeCoins
farcall TakeCoins
ret
Script_checkcoins:
@ -2347,7 +2347,7 @@ Script_checkcoins:
; coins (CoinByteParam)
call LoadCoinAmountToMem
callba CheckCoins
farcall CheckCoins
jr CompareMoneyAction
LoadCoinAmountToMem:
@ -2365,7 +2365,7 @@ Script_checktime:
xor a
ld [ScriptVar], a
callba CheckTime
farcall CheckTime
call GetScriptByte
and c
ret z
@ -2398,7 +2398,7 @@ Script_addcellnum:
ld [ScriptVar], a
call GetScriptByte
ld c, a
callba AddPhoneNumber
farcall AddPhoneNumber
ret nc
ld a, TRUE
ld [ScriptVar], a
@ -2413,7 +2413,7 @@ Script_delcellnum:
ld [ScriptVar], a
call GetScriptByte
ld c, a
callba DelCellNum
farcall DelCellNum
ret nc
ld a, TRUE
ld [ScriptVar], a
@ -2429,7 +2429,7 @@ Script_checkcellnum:
ld [ScriptVar], a
call GetScriptByte
ld c, a
callba CheckCellNum
farcall CheckCellNum
ret nc
ld a, TRUE
ld [ScriptVar], a
@ -2487,7 +2487,7 @@ Script_givepoke:
call GetScriptByte
call GetScriptByte
.ok
callba GivePoke
farcall GivePoke
ld a, b
ld [ScriptVar], a
ret
@ -2506,7 +2506,7 @@ Script_giveegg:
ld [CurPartySpecies], a
call GetScriptByte
ld [CurPartyLevel], a
callba GiveEgg
farcall GiveEgg
ret nc
ld a, 2
ld [ScriptVar], a
@ -2603,7 +2603,7 @@ Script_checkflag:
ret
_EngineFlagAction:
callba EngineFlagAction
farcall EngineFlagAction
ret
Script_wildoff:
@ -2735,7 +2735,7 @@ Script_writecmdqueue:
ld d, a
ld a, [ScriptBank]
ld b, a
callba WriteCmdQueue ; no need to farcall
farcall WriteCmdQueue ; no need to farcall
ret
Script_delcmdqueue:
@ -2747,7 +2747,7 @@ Script_delcmdqueue:
ld [ScriptVar], a
call GetScriptByte
ld b, a
callba DelCmdQueue ; no need to farcall
farcall DelCmdQueue ; no need to farcall
ret c
ld a, 1
ld [ScriptVar], a
@ -2794,7 +2794,7 @@ Script_reloadmappart::
ld [hBGMapMode], a
call OverworldTextModeSwitch
call GetMovementPermissions
callba ReloadMapPart
farcall ReloadMapPart
call UpdateSprites
ret
@ -2803,11 +2803,11 @@ Script_warpcheck:
call WarpCheck
ret nc
callba EnableEvents
farcall EnableEvents
ret
Script_enableevents: ; unreferenced
callba EnableEvents
farcall EnableEvents
ret
Script_newloadmap:
@ -2993,9 +2993,9 @@ Script_halloffame:
ld hl, GameTimerPause
res 0, [hl]
callba TrainerRankings_HallOfFame
callba TrainerRankings_HallOfFame2
callba HallOfFame
farcall TrainerRankings_HallOfFame
farcall TrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, GameTimerPause
set 0, [hl]
jr ReturnFromCredits
@ -3003,7 +3003,7 @@ Script_halloffame:
Script_credits:
; script command 0xa2
callba RedCredits
farcall RedCredits
ReturnFromCredits:
call Script_end_all
ld a, $3
@ -3031,7 +3031,7 @@ Script_wait:
Script_check_save:
; script command 0xa9
callba CheckSave
farcall CheckSave
ld a, c
ld [ScriptVar], a
ret

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