pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent predef function names

Browse Source
This commit is contained in:
xCrystal 2018-01-02 18:49:25 +01:00
parent b4a49351c1
commit d7970f749a
102 changed files with 549 additions and 548 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/items/descriptions.asm
View File

@ -11,7 +11,7 @@ PrintItemDescription: ; 0x1c8955
pop hl pop hl
ld a, [wd265] ld a, [wd265]
ld [CurSpecies], a ld [CurSpecies], a
predef PrintMoveDesc predef Predef_PrintMoveDesc
ret ret
.not_a_tm .not_a_tm

4
engine/battle/ai/items.asm
View File

@ -545,7 +545,7 @@ AI_Items: ; 39196
AIUpdateHUD: ; 38387 AIUpdateHUD: ; 38387
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
farcall UpdateEnemyHUD farcall Predef_UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, wEnemyItemState ld hl, wEnemyItemState
@ -664,7 +664,7 @@ EnemyPotionFinish: ; 38436
xor a xor a
ld [wWhichHPBar], a ld [wWhichHPBar], a
call AIUsedItemSound call AIUsedItemSound
predef AnimateHPBar predef Predef_AnimateHPBar
jp AIUpdateHUD jp AIUpdateHUD

2
engine/battle/ai/move.asm
View File

@ -92,7 +92,7 @@ AIChooseMove: ; 440ce
push bc push bc
ld d, BANK(TrainerClassAttributes) ld d, BANK(TrainerClassAttributes)
predef FlagPredef predef Predef_Flag
ld d, c ld d, c
pop bc pop bc

2
engine/battle/ai/scoring.asm
View File

@ -1488,7 +1488,7 @@ AI_Smart_Encore: ; 38c3b
push hl push hl
ld a, [wEnemyMoveStruct + MOVE_TYPE] ld a, [wEnemyMoveStruct + MOVE_TYPE]
ld hl, EnemyMonType1 ld hl, EnemyMonType1
predef CheckTypeMatchup predef Predef_CheckTypeMatchup
pop hl pop hl
ld a, [wd265] ld a, [wd265]

16
engine/battle/ai/switch.asm
View File

@ -28,7 +28,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, EnemyMonType ld hl, EnemyMonType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr nc, .super_effective jr nc, .super_effective
@ -73,7 +73,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
ld a, [BattleMonType1] ld a, [BattleMonType1]
ld b, a ld b, a
ld hl, EnemyMonType1 ld hl, EnemyMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr c, .ok jr c, .ok
@ -82,7 +82,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
ld a, [BattleMonType2] ld a, [BattleMonType2]
cp b cp b
jr z, .ok2 jr z, .ok2
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr c, .ok2 jr c, .ok2
@ -123,7 +123,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, BattleMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
; immune ; immune
@ -390,7 +390,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
and a and a
jr nz, .next jr nz, .next
@ -481,7 +481,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, BattleMonType1
call CheckTypeMatchup call Predef_CheckTypeMatchup
; if immune or not very effective: continue ; if immune or not very effective: continue
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
@ -585,7 +585,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
.skip_move .skip_move
ld a, [BattleMonType1] ld a, [BattleMonType1]
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon
@ -593,7 +593,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20
.check_type .check_type
ld hl, BaseType ld hl, BaseType
call CheckTypeMatchup call Predef_CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon

10
engine/battle/anim_hp_bar.asm
View File

@ -67,7 +67,7 @@ _AnimateHPBar: ; d627
ld a, [hli] ld a, [hli]
ld b, a ld b, a
pop hl pop hl
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld a, e ld a, e
ld [wCurHPBarPixels], a ld [wCurHPBarPixels], a
@ -79,7 +79,7 @@ _AnimateHPBar: ; d627
ld e, a ld e, a
ld a, [wCurHPAnimMaxHP + 1] ld a, [wCurHPAnimMaxHP + 1]
ld d, a ld d, a
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld a, e ld a, e
ld [wNewHPBarPixels], a ld [wNewHPBarPixels], a
@ -183,11 +183,11 @@ LongAnim_UpdateVariables: ; d6f5
ld c, a ld c, a
ld a, [hli] ld a, [hli]
ld b, a ld b, a
; This routine is buggy. The result from ComputeHPBarPixels is stored ; This routine is buggy. The result from Predef_ComputeHPBarPixels is stored
; in e. However, the pop de opcode deletes this result before it is even ; in e. However, the pop de opcode deletes this result before it is even
; used. The game then proceeds as though it never deleted that output. ; used. The game then proceeds as though it never deleted that output.
; To fix, uncomment the line below. ; To fix, uncomment the line below.
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
; ld a, e ; ld a, e
pop bc pop bc
pop de pop de
@ -227,7 +227,7 @@ LongHPBarAnim_UpdateTiles: ; d749
ld e, a ld e, a
ld a, [wCurHPAnimMaxHP + 1] ld a, [wCurHPAnimMaxHP + 1]
ld d, a ld d, a
call ComputeHPBarPixels call Predef_ComputeHPBarPixels
ld c, e ld c, e
ld d, HP_BAR_LENGTH ld d, HP_BAR_LENGTH
ld a, [wWhichHPBar] ld a, [wWhichHPBar]

2
engine/battle/battle_transition.asm
View File

@ -1,4 +1,4 @@
DoBattleTransition: ; 8c20f Predef_DoBattleTransition: ; 8c20f
call .InitGFX call .InitGFX
ld a, [rBGP] ld a, [rBGP]
ld [wBGP], a ld [wBGP], a

146
engine/battle/core.asm
View File

@ -47,7 +47,7 @@ DoBattle: ; 3c000
.player_2 .player_2
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call CheckPlayerPartyForFitPkmn call Predef_CheckPlayerPartyForFitPkmn
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -1285,7 +1285,7 @@ HandleWrap: ; 3c874
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld [FXAnimID + 1], a ld [FXAnimID + 1], a
predef PlayBattleAnim predef Predef_PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
.skip_anim .skip_anim
@ -2047,7 +2047,7 @@ UpdateHPBar: ; 3cd3c
.ok .ok
push bc push bc
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
pop bc pop bc
ret ret
; 3cd55 ; 3cd55
@ -2061,7 +2061,7 @@ HandleEnemyMonFaint: ; 3cd55
xor a xor a
ld [wWhichMonFaintedFirst], a ld [wWhichMonFaintedFirst], a
call UpdateBattleStateAndExperienceAfterEnemyFaint call UpdateBattleStateAndExperienceAfterEnemyFaint
call CheckPlayerPartyForFitPkmn call Predef_CheckPlayerPartyForFitPkmn
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -2069,7 +2069,7 @@ HandleEnemyMonFaint: ; 3cd55
ld hl, BattleMonHP ld hl, BattleMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
call nz, UpdatePlayerHUD call nz, Predef_UpdatePlayerHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -2193,7 +2193,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
.player_mon_did_not_faint .player_mon_did_not_faint
call CheckPlayerPartyForFitPkmn call Predef_CheckPlayerPartyForFitPkmn
ld a, d ld a, d
and a and a
ret z ret z
@ -2713,7 +2713,7 @@ HandlePlayerMonFaint: ; 3d14e
ld a, $1 ld a, $1
ld [wWhichMonFaintedFirst], a ld [wWhichMonFaintedFirst], a
call PlayerMonFaintHappinessMod call PlayerMonFaintHappinessMod
call CheckPlayerPartyForFitPkmn call Predef_CheckPlayerPartyForFitPkmn
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
@ -2759,7 +2759,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG ld b, RESET_FLAG
predef FlagPredef predef Predef_Flag
ld hl, EnemySubStatus3 ld hl, EnemySubStatus3
res SUBSTATUS_IN_LOOP, [hl] res SUBSTATUS_IN_LOOP, [hl]
xor a xor a
@ -3356,10 +3356,10 @@ AddBattleParticipant: ; 3d581
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG ld b, SET_FLAG
push bc push bc
predef FlagPredef predef Predef_Flag
pop bc pop bc
ld hl, wBattleParticipantsIncludingFainted ld hl, wBattleParticipantsIncludingFainted
predef_jump FlagPredef predef_jump Predef_Flag
; 3d599 ; 3d599
FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
@ -3577,7 +3577,7 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca
and a and a
jr nz, .skip_unown jr nz, .skip_unown
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld a, [UnownLetter] ld a, [UnownLetter]
ld [wFirstUnownSeen], a ld [wFirstUnownSeen], a
.skip_unown .skip_unown
@ -3687,8 +3687,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
call GetBaseData call GetBaseData
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
call GetEnemyMonFrontpic call Predef_GetEnemyMonFrontpic
xor a xor a
ld [wNumHits], a ld [wNumHits], a
@ -3713,7 +3713,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
hlcoord 12, 0 hlcoord 12, 0
ld d, $0 ld d, $0
ld e, ANIM_MON_SLOW ld e, ANIM_MON_SLOW
predef AnimateFrontpic predef Predef_AnimateFrontpic
jr .skip_cry jr .skip_cry
.cry_no_anim .cry_no_anim
@ -3723,7 +3723,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
call PlayStereoCry call PlayStereoCry
.skip_cry .skip_cry
call UpdateEnemyHUD call Predef_UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
@ -3764,7 +3764,7 @@ ResetEnemyStatLevels: ; 3d867
ret ret
; 3d873 ; 3d873
CheckPlayerPartyForFitPkmn: ; 3d873 Predef_CheckPlayerPartyForFitPkmn: ; 3d873
; Has the player any Pkmn in his Party that can fight? ; Has the player any Pkmn in his Party that can fight?
ld a, [PartyCount] ld a, [PartyCount]
ld e, a ld e, a
@ -4167,7 +4167,7 @@ SwitchPlayerMon: ; 3db32
SendOutPlayerMon: ; 3db5f SendOutPlayerMon: ; 3db5f
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
hlcoord 1, 5 hlcoord 1, 5
ld b, 7 ld b, 7
ld c, 8 ld c, 8
@ -4175,7 +4175,7 @@ SendOutPlayerMon: ; 3db5f
call WaitBGMap call WaitBGMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call GetBattleMonBackpic call Predef_GetBattleMonBackpic
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
ld [wBattleMenuCursorBuffer], a ld [wBattleMenuCursorBuffer], a
@ -4215,7 +4215,7 @@ SendOutPlayerMon: ; 3db5f
call PlayStereoCry call PlayStereoCry
.statused .statused
call UpdatePlayerHUD call Predef_UpdatePlayerHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
@ -4261,13 +4261,13 @@ BreakAttraction: ; 3dc18
SpikesDamage: ; 3dc23 SpikesDamage: ; 3dc23
ld hl, PlayerScreens ld hl, PlayerScreens
ld de, BattleMonType ld de, BattleMonType
ld bc, UpdatePlayerHUD ld bc, Predef_UpdatePlayerHUD
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld hl, EnemyScreens ld hl, EnemyScreens
ld de, EnemyMonType ld de, EnemyMonType
ld bc, UpdateEnemyHUD ld bc, Predef_UpdateEnemyHUD
.ok .ok
bit SCREENS_SPIKES, [hl] bit SCREENS_SPIKES, [hl]
@ -4349,7 +4349,7 @@ PursuitSwitch: ; 3dc5b
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG ld b, RESET_FLAG
predef FlagPredef predef Predef_Flag
call PlayerMonFaintedAnimation call PlayerMonFaintedAnimation
ld hl, BattleText_PkmnFainted ld hl, BattleText_PkmnFainted
jr .done_fainted jr .done_fainted
@ -4498,7 +4498,7 @@ HandleHPHealingItem: ; 3dd2f
.got_hp_bar_coords .got_hp_bar_coords
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
UseOpponentItem: UseOpponentItem:
call RefreshBattleHuds call RefreshBattleHuds
callfar GetOpponentItem callfar GetOpponentItem
@ -4521,7 +4521,7 @@ ItemRecoveryAnim: ; 3ddc8
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld [FXAnimID + 1], a ld [FXAnimID + 1], a
predef PlayBattleAnim predef Predef_PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
pop bc pop bc
pop de pop de
@ -4751,7 +4751,7 @@ UpdateBattleHUDs: ; 3df2c
ret ret
; 3df48 ; 3df48
UpdatePlayerHUD:: ; 3df48 Predef_UpdatePlayerHUD:: ; 3df48
push hl push hl
push de push de
push bc push bc
@ -4784,7 +4784,7 @@ DrawPlayerHUD: ; 3df58
ld b, 1 ld b, 1
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
predef DrawPlayerHP predef Predef_DrawPlayerHP
; Exp bar ; Exp bar
push de push de
@ -4797,7 +4797,7 @@ DrawPlayerHUD: ; 3df58
hlcoord 10, 11 hlcoord 10, 11
ld a, [TempMonLevel] ld a, [TempMonLevel]
ld b, a ld b, a
call FillInExpBar call Predef_FillInExpBar
pop de pop de
ret ret
; 3df98 ; 3df98
@ -4866,7 +4866,7 @@ PrintPlayerHUD: ; 3dfbf
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
callfar GetGender callfar Predef_GetGender
ld a, " " ld a, " "
jr c, .got_gender_char jr c, .got_gender_char
ld a, "♂" ld a, "♂"
@ -4880,7 +4880,7 @@ PrintPlayerHUD: ; 3dfbf
push af ; back up gender push af ; back up gender
push hl push hl
ld de, BattleMonStatus ld de, BattleMonStatus
predef PlaceNonFaintStatus predef Predef_PlaceNonFaintStatus
pop hl pop hl
pop bc pop bc
ret nz ret nz
@ -4895,7 +4895,7 @@ PrintPlayerHUD: ; 3dfbf
jp PrintLevel jp PrintLevel
; 3e036 ; 3e036
UpdateEnemyHUD:: ; 3e036 Predef_UpdateEnemyHUD:: ; 3e036
push hl push hl
push de push de
push bc push bc
@ -4944,7 +4944,7 @@ DrawEnemyHUD: ; 3e043
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
callfar GetGender callfar Predef_GetGender
ld a, " " ld a, " "
jr c, .got_gender jr c, .got_gender
ld a, "♂" ld a, "♂"
@ -4959,7 +4959,7 @@ DrawEnemyHUD: ; 3e043
push af push af
push hl push hl
ld de, EnemyMonStatus ld de, EnemyMonStatus
predef PlaceNonFaintStatus predef Predef_PlaceNonFaintStatus
pop hl pop hl
pop bc pop bc
jr nz, .skip_level jr nz, .skip_level
@ -5184,8 +5184,8 @@ BattleMenu_Pack: ; 3e1c7
call ClearPalettes call ClearPalettes
call DelayFrame call DelayFrame
call _LoadBattleFontsHPBar call _LoadBattleFontsHPBar
call GetBattleMonBackpic call Predef_GetBattleMonBackpic
call GetEnemyMonFrontpic call Predef_GetEnemyMonFrontpic
call ExitMenu call ExitMenu
call WaitBGMap call WaitBGMap
call FinishBattleAnim call FinishBattleAnim
@ -5217,10 +5217,10 @@ BattleMenu_Pack: ; 3e1c7
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .tutorial2 jr z, .tutorial2
call GetBattleMonBackpic call Predef_GetBattleMonBackpic
.tutorial2 .tutorial2
call GetEnemyMonFrontpic call Predef_GetEnemyMonFrontpic
ld a, $1 ld a, $1
ld [wMenuCursorY], a ld [wMenuCursorY], a
call ExitMenu call ExitMenu
@ -5574,7 +5574,7 @@ MoveSelectionScreen: ; 3e4bc
.got_start_coord .got_start_coord
ld a, SCREEN_WIDTH ld a, SCREEN_WIDTH
ld [Buffer1], a ld [Buffer1], a
predef ListMoves predef Predef_ListMoves
ld b, 5 ld b, 5
ld a, [wMoveSelectionMenuType] ld a, [wMoveSelectionMenuType]
@ -5907,7 +5907,7 @@ MoveInfoBox: ; 3e6c8
ld a, [wPlayerMoveStruct + MOVE_ANIM] ld a, [wPlayerMoveStruct + MOVE_ANIM]
ld b, a ld b, a
hlcoord 2, 10 hlcoord 2, 10
predef PrintMoveType predef Predef_PrintMoveType
.done .done
ret ret
@ -6363,7 +6363,7 @@ LoadEnemyMon: ; 3e8eb
; Get letter based on DVs ; Get letter based on DVs
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
; Can't use any letters that haven't been unlocked ; Can't use any letters that haven't been unlocked
; If combined with forced shiny battletype, causes an infinite loop ; If combined with forced shiny battletype, causes an infinite loop
call CheckUnownLetter call CheckUnownLetter
@ -6451,7 +6451,7 @@ LoadEnemyMon: ; 3e8eb
ld de, EnemyMonMaxHP ld de, EnemyMonMaxHP
ld b, FALSE ld b, FALSE
ld hl, EnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; LinkBattleRNs + 7 ; ? ld hl, EnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; LinkBattleRNs + 7 ; ?
predef CalcPkmnStats predef Predef_CalcPkmnStats
; If we're in a trainer battle, ; If we're in a trainer battle,
; get the rest of the parameters from the party struct ; get the rest of the parameters from the party struct
@ -6566,7 +6566,7 @@ LoadEnemyMon: ; 3e8eb
; Make sure the predef knows this isn't a partymon ; Make sure the predef knows this isn't a partymon
ld [wEvolutionOldSpecies], a ld [wEvolutionOldSpecies], a
; Fill moves based on level ; Fill moves based on level
predef FillMoves predef Predef_FillMoves
.PP: .PP:
; Trainer battle? ; Trainer battle?
@ -6577,7 +6577,7 @@ LoadEnemyMon: ; 3e8eb
; Fill wild PP ; Fill wild PP
ld hl, EnemyMonMoves ld hl, EnemyMonMoves
ld de, EnemyMonPP ld de, EnemyMonPP
predef FillPP predef Predef_FillPP
jr .Finish jr .Finish
.TrainerPP: .TrainerPP:
@ -6630,7 +6630,7 @@ LoadEnemyMon: ; 3e8eb
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
ld hl, PokedexSeen ld hl, PokedexSeen
predef FlagPredef predef Predef_Flag
ld hl, EnemyMonStats ld hl, EnemyMonStats
ld de, EnemyStats ld de, EnemyStats
@ -6787,7 +6787,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
ld a, [OtherTrainerClass] ld a, [OtherTrainerClass]
ld [TrainerClass], a ld [TrainerClass], a
ld de, vTiles2 ld de, vTiles2
callfar GetTrainerPic callfar Predef_GetTrainerPic
hlcoord 19, 0 hlcoord 19, 0
ld c, 0 ld c, 0
@ -7264,7 +7264,7 @@ Call_PlayBattleAnim: ; 3ee17
ld a, d ld a, d
ld [FXAnimID + 1], a ld [FXAnimID + 1], a
call WaitBGMap call WaitBGMap
predef_jump PlayBattleAnim predef_jump Predef_PlayBattleAnim
; 3ee27 ; 3ee27
FinishBattleAnim: ; 3ee27 FinishBattleAnim: ; 3ee27
@ -7312,7 +7312,7 @@ GiveExperiencePoints: ; 3ee3b
ld c, a ld c, a
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld d, $0 ld d, $0
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
and a and a
pop bc pop bc
@ -7490,7 +7490,7 @@ GiveExperiencePoints: ; 3ee3b
.not_max_exp .not_max_exp
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
callfar CalcLevel callfar CalcLevel
pop bc pop bc
ld hl, MON_LEVEL ld hl, MON_LEVEL
@ -7527,7 +7527,7 @@ GiveExperiencePoints: ; 3ee3b
add hl, bc add hl, bc
push bc push bc
ld b, TRUE ld b, TRUE
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop bc pop bc
pop de pop de
ld hl, MON_MAXHP + 1 ld hl, MON_MAXHP + 1
@ -7580,7 +7580,7 @@ GiveExperiencePoints: ; 3ee3b
call ApplyStatLevelMultiplierOnAllStats call ApplyStatLevelMultiplierOnAllStats
callfar ApplyStatusEffectOnPlayerStats callfar ApplyStatusEffectOnPlayerStats
callfar BadgeStatBoosts callfar BadgeStatBoosts
callfar UpdatePlayerHUD callfar Predef_UpdatePlayerHUD
call EmptyBattleTextBox call EmptyBattleTextBox
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld a, $1 ld a, $1
@ -7603,14 +7603,14 @@ GiveExperiencePoints: ; 3ee3b
.skip_animation2 .skip_animation2
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
hlcoord 9, 0 hlcoord 9, 0
ld b, $a ld b, $a
ld c, $9 ld c, $9
call TextBox call TextBox
hlcoord 11, 1 hlcoord 11, 1
ld bc, 4 ld bc, 4
predef PrintTempMonStats predef Predef_PrintTempMonStats
ld c, $1e ld c, $1e
call DelayFrames call DelayFrames
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
@ -7630,7 +7630,7 @@ GiveExperiencePoints: ; 3ee3b
ld a, b ld a, b
ld [CurPartyLevel], a ld [CurPartyLevel], a
push bc push bc
predef LearnLevelMoves predef Predef_LearnLevelMoves
pop bc pop bc
ld a, b ld a, b
cp c cp c
@ -7641,7 +7641,7 @@ GiveExperiencePoints: ; 3ee3b
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
predef FlagPredef predef Predef_Flag
pop af pop af
ld [CurPartyLevel], a ld [CurPartyLevel], a
@ -7763,7 +7763,7 @@ AnimateExpBar: ; 3f136
ld [wd002], a ld [wd002], a
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
ld a, [TempMonLevel] ld a, [TempMonLevel]
ld b, a ld b, a
ld e, a ld e, a
@ -8134,7 +8134,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
jp StdBattleTextBox jp StdBattleTextBox
; 3f390 ; 3f390
FillInExpBar: ; 3f390 Predef_FillInExpBar: ; 3f390
push hl push hl
call CalcExpBar call CalcExpBar
pop hl pop hl
@ -8276,7 +8276,7 @@ PlaceExpBar: ; 3f41c
ret ret
; 3f43d ; 3f43d
GetBattleMonBackpic: ; 3f43d Predef_GetBattleMonBackpic: ; 3f43d
ld a, [PlayerSubStatus4] ld a, [PlayerSubStatus4]
bit SUBSTATUS_SUBSTITUTE, a bit SUBSTATUS_SUBSTITUTE, a
ld hl, BattleAnimCmd_RaiseSub ld hl, BattleAnimCmd_RaiseSub
@ -8292,9 +8292,9 @@ DropPlayerSub: ; 3f447
ld a, [BattleMonSpecies] ld a, [BattleMonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
predef GetMonBackpic predef Predef_GetMonBackpic
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ret ret
@ -8312,7 +8312,7 @@ GetBattleMonBackpic_DoAnim: ; 3f46f
ret ret
; 3f47c ; 3f47c
GetEnemyMonFrontpic: ; 3f47c Predef_GetEnemyMonFrontpic: ; 3f47c
ld a, [EnemySubStatus4] ld a, [EnemySubStatus4]
bit SUBSTATUS_SUBSTITUTE, a bit SUBSTATUS_SUBSTITUTE, a
ld hl, BattleAnimCmd_RaiseSub ld hl, BattleAnimCmd_RaiseSub
@ -8331,9 +8331,9 @@ DropEnemySub: ; 3f486
ld [CurPartySpecies], a ld [CurPartySpecies], a
call GetBaseData call GetBaseData
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 ld de, vTiles2
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ret ret
@ -8350,7 +8350,7 @@ GetEnemyMonFrontpic_DoAnim: ; 3f4b4
ret ret
; 3f4c1 ; 3f4c1
StartBattle: ; 3f4c1 Predef_StartBattle: ; 3f4c1
; This check prevents you from entering a battle without any Pokemon. ; This check prevents you from entering a battle without any Pokemon.
; Those using walk-through-walls to bypass getting a Pokemon experience ; Those using walk-through-walls to bypass getting a Pokemon experience
; the effects of this check. ; the effects of this check.
@ -8409,7 +8409,7 @@ BattleIntro: ; 3f4dd
call ClearSprites call ClearSprites
ld a, [wBattleMode] ld a, [wBattleMode]
cp WILD_BATTLE cp WILD_BATTLE
call z, UpdateEnemyHUD call z, Predef_UpdateEnemyHUD
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
@ -8474,14 +8474,14 @@ InitEnemyTrainer: ; 3f594
.ok .ok
ld de, vTiles2 ld de, vTiles2
callfar GetTrainerPic callfar Predef_GetTrainerPic
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
dec a dec a
ld [wEnemyItemState], a ld [wEnemyItemState], a
hlcoord 12, 0 hlcoord 12, 0
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ld a, -1 ld a, -1
ld [CurOTMon], a ld [CurOTMon], a
ld a, TRAINER_BATTLE ld a, TRAINER_BATTLE
@ -8527,7 +8527,7 @@ InitEnemyWildmon: ; 3f607
ld bc, NUM_MOVES ld bc, NUM_MOVES
call CopyBytes call CopyBytes
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
cp UNOWN cp UNOWN
jr nz, .skip_unown jr nz, .skip_unown
@ -8538,13 +8538,13 @@ InitEnemyWildmon: ; 3f607
ld [wFirstUnownSeen], a ld [wFirstUnownSeen], a
.skip_unown .skip_unown
ld de, vTiles2 ld de, vTiles2
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
xor a xor a
ld [TrainerClass], a ld [TrainerClass], a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 12, 0 hlcoord 12, 0
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 3f662 ; 3f662
@ -8623,7 +8623,7 @@ ExitBattle: ; 3f69e
call CheckPayDay call CheckPayDay
xor a xor a
ld [wForceEvolution], a ld [wForceEvolution], a
predef EvolveAfterBattle predef Predef_EvolveAfterBattle
farcall GivePokerusAndConvertBerries farcall GivePokerusAndConvertBerries
ret ret
; 3f6d0 ; 3f6d0
@ -9297,7 +9297,7 @@ InitBattleDisplay: ; 3fb6c
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 2, 6 hlcoord 2, 6
lb bc, 6, 6 lb bc, 6, 6
predef PlaceGraphic predef Predef_PlaceGraphic
xor a xor a
ld [hWY], a ld [hWY], a
ld [rWY], a ld [rWY], a
@ -9370,7 +9370,7 @@ GetTrainerBackpic: ; 3fbff
.Decompress: .Decompress:
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
ld c, $31 ld c, $31
predef DecompressPredef predef Predef_Decompress
ret ret
; 3fc30 ; 3fc30
@ -9392,7 +9392,7 @@ CopyBackpic: ; 3fc30
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 2, 6 hlcoord 2, 6
lb bc, 6, 6 lb bc, 6, 6
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 3fc5b ; 3fc5b
@ -9472,7 +9472,7 @@ BattleStartMessage: ; 3fc8b
hlcoord 12, 0 hlcoord 12, 0
ld d, $0 ld d, $0
ld e, ANIM_MON_NORMAL ld e, ANIM_MON_NORMAL
predef AnimateFrontpic predef Predef_AnimateFrontpic
jr .skip_cry ; cry is played during the animation jr .skip_cry ; cry is played during the animation
.cry_no_anim .cry_no_anim

42
engine/battle/effect_commands.asm
View File

@ -182,7 +182,7 @@ CheckPlayerTurn:
call StdBattleTextBox call StdBattleTextBox
call CantMove call CantMove
call UpdateBattleMonInParty call UpdateBattleMonInParty
ld hl, UpdatePlayerHUD ld hl, Predef_UpdatePlayerHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -433,7 +433,7 @@ CheckEnemyTurn: ; 3421f
call StdBattleTextBox call StdBattleTextBox
call CantMove call CantMove
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
ld hl, UpdateEnemyHUD ld hl, Predef_UpdateEnemyHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -670,7 +670,7 @@ HitConfusion: ; 343a5
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, PlayFXAnimID call z, PlayFXAnimID
ld hl, UpdatePlayerHUD ld hl, Predef_UpdatePlayerHUD
call CallBattleCore call CallBattleCore
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -1539,12 +1539,12 @@ BattleCheckTypeMatchup: ; 347c8
ld hl, EnemyMonType1 ld hl, EnemyMonType1
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, CheckTypeMatchup jr z, Predef_CheckTypeMatchup
ld hl, BattleMonType1 ld hl, BattleMonType1
CheckTypeMatchup: ; 347d3 Predef_CheckTypeMatchup: ; 347d3
; There is an incorrect assumption about this function made in the AI related code: when ; There is an incorrect assumption about this function made in the AI related code: when
; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the ; the AI calls Predef_CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing
; offensive type in a will make this function do the right thing. Since a is overwritten, ; the offensive type in a will make this function do the right thing. Since a is overwritten,
; this assumption is incorrect. A simple fix would be to load the move type for the ; this assumption is incorrect. A simple fix would be to load the move type for the
; current move into a in BattleCheckTypeMatchup, before falling through, which is ; current move into a in BattleCheckTypeMatchup, before falling through, which is
; consistent with how the rest of the code assumes this code works like. ; consistent with how the rest of the code assumes this code works like.
@ -2636,7 +2636,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
ld [Buffer6], a ld [Buffer6], a
ld h, b ld h, b
ld l, c ld l, c
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
@ -4049,7 +4049,7 @@ BattleCommand_PainSplit: ; 35926
ld a, $1 ld a, $1
ld [wWhichHPBar], a ld [wWhichHPBar], a
hlcoord 10, 9 hlcoord 10, 9
predef AnimateHPBar predef Predef_AnimateHPBar
ld hl, EnemyMonHP ld hl, EnemyMonHP
ld a, [hli] ld a, [hli]
ld [Buffer4], a ld [Buffer4], a
@ -4064,7 +4064,7 @@ BattleCommand_PainSplit: ; 35926
ld [wWhichHPBar], a ld [wWhichHPBar], a
call ResetDamage call ResetDamage
hlcoord 2, 2 hlcoord 2, 2
predef AnimateHPBar predef Predef_AnimateHPBar
farcall _UpdateBattleHUDs farcall _UpdateBattleHUDs
ld hl, SharedPainText ld hl, SharedPainText
@ -4206,7 +4206,7 @@ BattleCommand_Conversion2: ; 359e6
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
predef GetTypeName predef Predef_GetTypeName
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -4744,7 +4744,7 @@ PlayFXAnimID: ; 35d08
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
ret ret
@ -4806,7 +4806,7 @@ EnemyHurtItself: ; 35d1c
hlcoord 2, 2 hlcoord 2, 2
xor a xor a
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
.did_no_damage .did_no_damage
jp RefreshBattleHuds jp RefreshBattleHuds
@ -4866,7 +4866,7 @@ PlayerHurtItself: ; 35d7e
hlcoord 10, 9 hlcoord 10, 9
ld a, $1 ld a, $1
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
.did_no_damage .did_no_damage
jp RefreshBattleHuds jp RefreshBattleHuds
@ -5334,7 +5334,7 @@ SapHealth: ; 36011
xor a xor a
.hp_bar .hp_bar
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
jp UpdateBattleMonInParty jp UpdateBattleMonInParty
@ -6296,11 +6296,11 @@ BattleCommand_Curl: ; 365a7
BattleCommand_RaiseSubNoAnim: ; 365af BattleCommand_RaiseSubNoAnim: ; 365af
ld hl, GetBattleMonBackpic ld hl, Predef_GetBattleMonBackpic
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .PlayerTurn jr z, .PlayerTurn
ld hl, GetEnemyMonFrontpic ld hl, Predef_GetEnemyMonFrontpic
.PlayerTurn: .PlayerTurn:
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -7581,7 +7581,7 @@ BattleCommand_Recoil: ; 36cb2
xor a xor a
.animate_hp_bar .animate_hp_bar
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef AnimateHPBar predef Predef_AnimateHPBar
call RefreshBattleHuds call RefreshBattleHuds
ld hl, RecoilText ld hl, RecoilText
jp StdBattleTextBox jp StdBattleTextBox
@ -8282,7 +8282,7 @@ BattleCommand_Conversion: ; 3707f
inc de inc de
ld [de], a ld [de], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
farcall GetTypeName farcall Predef_GetTypeName
call AnimateCurrentMove call AnimateCurrentMove
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -9911,7 +9911,7 @@ PlayUserBattleAnim: ; 37e47
push hl push hl
push de push de
push bc push bc
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
pop bc pop bc
pop de pop de
pop hl pop hl
@ -9933,7 +9933,7 @@ PlayOpponentBattleAnim: ; 37e54
push bc push bc
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
callfar PlayBattleAnim callfar Predef_PlayBattleAnim
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
pop bc pop bc

4
engine/battle/effect_commands/attract.asm
View File

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

2
engine/battle/misc.asm
View File

@ -33,7 +33,7 @@ AppearUser: ; fbd77 (3e:7d77)
ld a, $31 ld a, $31
.okay .okay
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
predef PlaceGraphic predef Predef_PlaceGraphic
FinishAppearDisappearUser: ; fbd91 (3e:7d91) FinishAppearDisappearUser: ; fbd91 (3e:7d91)
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a

8
engine/battle/read_trainer_party.asm
View File

@ -103,7 +103,7 @@ TrainerType1: ; 397eb
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
pop hl pop hl
jr .loop jr .loop
; 39806 ; 39806
@ -124,7 +124,7 @@ TrainerType2: ; 39806
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Moves ld hl, OTPartyMon1Moves
@ -200,7 +200,7 @@ TrainerType3: ; 39871
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item
@ -231,7 +231,7 @@ TrainerType4: ; 3989d
ld [MonType], a ld [MonType], a
push hl push hl
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item

4
engine/battle/returntobattle_useball.asm
View File

@ -4,13 +4,13 @@ _ReturnToBattle_UseBall: ; 2715c
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic jr z, .gettutorialbackpic
farcall GetBattleMonBackpic farcall Predef_GetBattleMonBackpic
jr .continue jr .continue
.gettutorialbackpic .gettutorialbackpic
farcall GetTrainerBackpic farcall GetTrainerBackpic
.continue .continue
farcall GetEnemyMonFrontpic farcall Predef_GetEnemyMonFrontpic
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
call GetMemSGBLayout call GetMemSGBLayout
call CloseWindow call CloseWindow

2
engine/battle/start_battle.asm
View File

@ -33,7 +33,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [BattleMonLevel], a ld [BattleMonLevel], a
predef DoBattleTransition predef Predef_DoBattleTransition
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a

20
engine/battle_anims/anim_commands.asm
View File

@ -1,6 +1,6 @@
; Battle animation command interpreter. ; Battle animation command interpreter.
PlayBattleAnim: ; cc0d6 Predef_PlayBattleAnim: ; cc0d6
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@ -167,7 +167,7 @@ BattleAnimRestoreHuds: ; cc1bb
ld [rSVBK], a ld [rSVBK], a
ld hl, UpdateBattleHuds ld hl, UpdateBattleHuds
ld a, BANK(UpdatePlayerHUD) ld a, BANK(Predef_UpdatePlayerHUD)
rst FarCall ; Why not "call UpdateBattleHuds"? rst FarCall ; Why not "call UpdateBattleHuds"?
pop af pop af
@ -929,18 +929,18 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies ld a, [TempBattleMonSpecies] ; TempBattleMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies ld [CurPartySpecies], a ; CurPartySpecies
ld hl, BattleMonDVs ; BattleMonDVs ld hl, BattleMonDVs ; BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
jr .done jr .done
.player .player
ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies ld a, [TempEnemyMonSpecies] ; TempEnemyMonSpecies
ld [CurPartySpecies], a ; CurPartySpecies ld [CurPartySpecies], a ; CurPartySpecies
ld hl, EnemyMonDVs ; EnemyMonDVs ld hl, EnemyMonDVs ; EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles0 tile $00 ld de, vTiles0 tile $00
predef GetMonBackpic predef Predef_GetMonBackpic
.done .done
pop af pop af
@ -1156,16 +1156,16 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
jr z, .player jr z, .player
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
jr .done jr .done
.player .player
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
predef GetMonBackpic predef Predef_GetMonBackpic
.done .done
pop af pop af

14
engine/billspc.asm
View File

@ -1099,10 +1099,10 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
call GetBaseData call GetBaseData
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
xor a xor a
ld [wBillsPC_MonHasMail], a ld [wBillsPC_MonHasMail], a
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
@ -1119,7 +1119,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
jr c, .skip_gender jr c, .skip_gender
ld a, "♂" ld a, "♂"
jr nz, .printgender jr nz, .printgender
@ -1702,7 +1702,7 @@ BillsPC_StatsScreen: ; e2f7e (38:6f7e)
call BillsPC_CopyMon call BillsPC_CopyMon
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
predef StatsScreenInit predef Predef_StatsScreenInit
call BillsPC_InitGFX call BillsPC_InitGFX
call MaxVolume call MaxVolume
ret ret
@ -1730,7 +1730,7 @@ StatsScreenDPad: ; e2f95 (38:6f95)
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
call GetBaseData call GetBaseData
call BillsPC_CopyMon call BillsPC_CopyMon
.pressed_a_b_right_left .pressed_a_b_right_left
@ -1823,7 +1823,7 @@ DepositPokemon: ; e307c (38:707c)
call GetNick call GetNick
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SentGetPkmnIntoFromBox predef Predef_SendGetPkmnIntoFromBox
jr c, .asm_boxisfull jr c, .asm_boxisfull
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -1878,7 +1878,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
call CloseSRAM call CloseSRAM
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SentGetPkmnIntoFromBox predef Predef_SendGetPkmnIntoFromBox
jr c, .PartyFull jr c, .PartyFull
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a

26
engine/breeding.asm
View File

@ -10,7 +10,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .genderless jr c, .genderless
ld b, $1 ld b, $1
jr nz, .breedmon2 jr nz, .breedmon2
@ -26,7 +26,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, $3 ld a, $3
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
pop bc pop bc
jr c, .genderless jr c, .genderless
ld a, $1 ld a, $1
@ -289,7 +289,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld bc, MON_STAT_EXP - 1 ld bc, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $0 ld b, $0
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop bc pop bc
ld hl, MON_MAXHP ld hl, MON_MAXHP
add hl, bc add hl, bc
@ -514,7 +514,7 @@ GLOBAL EggMoves
cp b cp b
jr nz, .loop5 jr nz, .loop5
ld [wPutativeTMHMMove], a ld [wPutativeTMHMMove], a
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
ld a, c ld a, c
and a and a
jr z, .done jr z, .done
@ -559,7 +559,7 @@ LoadEggMove: ; 17169
ld [hl], b ld [hl], b
ld hl, wEggMonMoves ld hl, wEggMonMoves
ld de, wEggMonPP ld de, wEggMonPP
predef FillPP predef Predef_FillPP
pop bc pop bc
pop de pop de
ret ret
@ -590,7 +590,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .inherit_mon2_moves jr c, .inherit_mon2_moves
jr nz, .inherit_mon2_moves jr nz, .inherit_mon2_moves
jr .inherit_mon1_moves jr .inherit_mon1_moves
@ -606,7 +606,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
predef GetGender predef Predef_GetGender
jr c, .inherit_mon1_moves jr c, .inherit_mon1_moves
jr nz, .inherit_mon1_moves jr nz, .inherit_mon1_moves
@ -647,9 +647,9 @@ GetEggFrontpic: ; 17224 (5:7224)
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
pop de pop de
predef_jump GetMonFrontpic predef_jump Predef_GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c) GetHatchlingFrontpic: ; 1723c (5:723c)
push de push de
@ -657,9 +657,9 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
pop de pop de
predef_jump GetAnimatedFrontpicPredef predef_jump Predef_GetAnimatedFrontpic
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254) Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af push af
@ -677,7 +677,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
ld a, c ld a, c
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
pop af pop af
call Hatch_LoadFrontpicPal call Hatch_LoadFrontpicPal
call SetPalettes call SetPalettes
@ -779,7 +779,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
hlcoord 6, 3 hlcoord 6, 3
ld d, $0 ld d, $0
ld e, ANIM_MON_HATCH ld e, ANIM_MON_HATCH
predef AnimateFrontpic predef Predef_AnimateFrontpic
pop af pop af
ld [CurSpecies], a ld [CurSpecies], a
ret ret

2
engine/color.asm
View File

@ -854,7 +854,7 @@ PushSGBPals:
jr nz, .loop jr nz, .loop
ret ret
InitSGBBorder: Predef_InitSGBBorder:
call CheckCGB call CheckCGB
ret nz ret nz
; SGB/DMG only ; SGB/DMG only

12
engine/debug.asm
View File

@ -315,12 +315,12 @@ Function81adb: ; 81adb
hlcoord 12, 3 hlcoord 12, 3
call _PrepMonFrontpic call _PrepMonFrontpic
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
predef GetMonBackpic predef Predef_GetMonBackpic
ld a, $31 ld a, $31
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 2, 4 hlcoord 2, 4
lb bc, 6, 6 lb bc, 6, 6
predef PlaceGraphic predef Predef_PlaceGraphic
ld a, [wd003] ld a, [wd003]
and a and a
jr z, .asm_81b66 jr z, .asm_81b66
@ -346,13 +346,13 @@ Function81adb: ; 81adb
hlcoord 4, 1 hlcoord 4, 1
call PlaceString call PlaceString
ld de, vTiles2 ld de, vTiles2
callfar GetTrainerPic callfar Predef_GetTrainerPic
xor a xor a
ld [TempEnemyMonSpecies], a ld [TempEnemyMonSpecies], a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 2, 3 hlcoord 2, 3
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
.asm_81ba9 .asm_81ba9
ld a, $1 ld a, $1
@ -739,7 +739,7 @@ Function81df4: ; 81df4
ld a, [wd004] ld a, [wd004]
inc a inc a
ld [wd265], a ld [wd265], a
predef GetTMHMMove predef Predef_GetTMHMMove
ld a, [wd265] ld a, [wd265]
ld [wPutativeTMHMMove], a ld [wPutativeTMHMMove], a
call GetMoveName call GetMoveName
@ -748,7 +748,7 @@ Function81df4: ; 81df4
ld a, [wd004] ld a, [wd004]
call Function81e55 call Function81e55
ld [CurItem], a ld [CurItem], a
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
ld a, c ld a, c
and a and a
ld de, String_81e46 ld de, String_81e46

2
engine/events/catch_tutorial.asm
View File

@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554
ld hl, .AutoInput ld hl, .AutoInput
ld a, BANK(.AutoInput) ld a, BANK(.AutoInput)
call StartAutoInput call StartAutoInput
callfar StartBattle callfar Predef_StartBattle
call StopAutoInput call StopAutoInput
pop af pop af

10
engine/events/daycare.asm
View File

@ -565,7 +565,7 @@ DayCare_GiveEgg: ; 169ac
pop hl pop hl
push bc push bc
ld b, $0 ld b, $0
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop bc pop bc
ld hl, MON_HP ld hl, MON_HP
add hl, bc add hl, bc
@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b
cp DITTO cp DITTO
ld a, $0 ld a, $0
jr z, .LoadWhichBreedmonIsTheMother jr z, .LoadWhichBreedmonIsTheMother
farcall GetGender farcall Predef_GetGender
ld a, $0 ld a, $0
jr z, .LoadWhichBreedmonIsTheMother jr z, .LoadWhichBreedmonIsTheMother
inc a inc a
@ -684,7 +684,7 @@ DayCare_InitBreeding: ; 16a3b
ld de, wEggMonMoves ld de, wEggMonMoves
xor a xor a
ld [Buffer1], a ld [Buffer1], a
predef FillMoves predef Predef_FillMoves
farcall InitEggMoves farcall InitEggMoves
ld hl, wEggMonID ld hl, wEggMonID
ld a, [PlayerID] ld a, [PlayerID]
@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
push hl push hl
farcall GetGender farcall Predef_GetGender
pop hl pop hl
ld de, wBreedMon1DVs ld de, wBreedMon1DVs
ld bc, wBreedMon2DVs ld bc, wBreedMon2DVs
@ -770,7 +770,7 @@ DayCare_InitBreeding: ; 16a3b
call CopyBytes call CopyBytes
ld hl, wEggMonMoves ld hl, wEggMonMoves
ld de, wEggMonPP ld de, wEggMonPP
predef FillPP predef Predef_FillPP
ld hl, wMonOrItemNameBuffer ld hl, wMonOrItemNameBuffer
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, NAME_LENGTH ld bc, NAME_LENGTH

18
engine/events/halloffame.asm
View File

@ -130,7 +130,7 @@ AnimateHallOfFame: ; 864c3
call WaitBGMap call WaitBGMap
decoord 6, 5 decoord 6, 5
ld c, $6 ld c, $6
predef HOF_AnimateFrontpic predef HOF_Predef_AnimateFrontpic
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
and a and a
@ -244,18 +244,18 @@ AnimateHOFMonEntrance: ; 865b5
ld a, [hli] ld a, [hli]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " " ld a, " "
call ByteFill call ByteFill
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
predef GetMonBackpic predef Predef_GetMonBackpic
ld a, $31 ld a, $31
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 6, 6 hlcoord 6, 6
lb bc, 6, 6 lb bc, 6, 6
predef PlaceGraphic predef Predef_PlaceGraphic
ld a, $d0 ld a, $d0
ld [hSCY], a ld [hSCY], a
ld a, $90 ld a, $90
@ -403,7 +403,7 @@ _HallOfFamePC: ; 86650
call SetPalettes call SetPalettes
decoord 6, 5 decoord 6, 5
ld c, $6 ld c, $6
predef HOF_AnimateFrontpic predef HOF_Predef_AnimateFrontpic
and a and a
ret ret
@ -478,7 +478,7 @@ DisplayHOFMon: ; 86748
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [wd265], a ld [wd265], a
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
xor a xor a
ld [wBoxAlignment], a ld [wBoxAlignment], a
hlcoord 6, 5 hlcoord 6, 5
@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748
call PlaceString call PlaceString
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
ld a, " " ld a, " "
jr c, .got_gender jr c, .got_gender
ld a, "♂" ld a, "♂"
@ -546,7 +546,7 @@ HOF_AnimatePlayerPic: ; 86810
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 6, 6 hlcoord 6, 6
lb bc, 6, 6 lb bc, 6, 6
predef PlaceGraphic predef Predef_PlaceGraphic
ld a, $d0 ld a, $d0
ld [hSCY], a ld [hSCY], a
ld a, $90 ld a, $90
@ -570,7 +570,7 @@ HOF_AnimatePlayerPic: ; 86810
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 12, 5 hlcoord 12, 5
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ld a, $c0 ld a, $c0
ld [hSCX], a ld [hSCX], a
call WaitBGMap call WaitBGMap

4
engine/events/itemfinder.asm
View File

@ -30,7 +30,7 @@ ItemFinder: ; 12580
.Script_FoundSomething: ; 0x125ad .Script_FoundSomething: ; 0x125ad
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
callasm .ItemfinderSound callasm .ItemfinderSound
writetext .Text_FoundSomething writetext .Text_FoundSomething
closetext closetext
@ -39,7 +39,7 @@ ItemFinder: ; 12580
.Script_FoundNothing: ; 0x125ba .Script_FoundNothing: ; 0x125ba
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writetext .Text_FoundNothing writetext .Text_FoundNothing
closetext closetext
end end

2
engine/events/magnet_train.asm
View File

@ -442,7 +442,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
ld [wEnvironment], a ld [wEnvironment], a
ld b, SCGB_MAPPALS ld b, SCGB_MAPPALS
call GetSGBLayout call GetSGBLayout
call Special_UpdateTimePals call UpdateTimePals
ld a, [rBGP] ld a, [rBGP]
ld [wBGP], a ld [wBGP], a
ld a, [rOBP0] ld a, [rOBP0]

4
engine/events/move_tutor.asm
View File

@ -54,7 +54,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
push bc push bc
ld a, [CurPartyMon] ld a, [CurPartyMon]
@ -78,7 +78,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
callfar KnowsMove callfar KnowsMove
jr c, .didnt_learn jr c, .didnt_learn
predef LearnMove predef Predef_LearnMove
ld a, b ld a, b
and a and a
jr z, .didnt_learn jr z, .didnt_learn

30
engine/events/overworld.asm
View File

@ -208,7 +208,7 @@ CheckMapForSomethingToCut: ; c7ce
Script_CutFromMenu: ; c7fe Script_CutFromMenu: ; c7fe
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
Script_Cut: ; 0xc802 Script_Cut: ; 0xc802
callasm GetPartyNick callasm GetPartyNick
@ -318,7 +318,7 @@ UseFlash: ; c8e0
Script_UseFlash: ; 0xc8e6 Script_UseFlash: ; 0xc8e6
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writetext UnknownText_0xc8f3 writetext UnknownText_0xc8f3
callasm BlindingFlash callasm BlindingFlash
closetext closetext
@ -407,7 +407,7 @@ SurfFunction: ; c909
ret ret
SurfFromMenuScript: ; c983 SurfFromMenuScript: ; c983
special Special_UpdateTimePals special UpdateTimePals
UsedSurfScript: ; c986 UsedSurfScript: ; c986
writetext UsedSurfText ; "used SURF!" writetext UsedSurfText ; "used SURF!"
@ -620,7 +620,7 @@ FlyFunction: ; ca3b
.FlyScript: ; 0xcaa3 .FlyScript: ; 0xcaa3
reloadmappart reloadmappart
callasm HideSprites callasm HideSprites
special Special_UpdateTimePals special UpdateTimePals
callasm FlyFromAnim callasm FlyFromAnim
farscall Script_AbortBugContest farscall Script_AbortBugContest
special Special_WarpToSpawnPoint special Special_WarpToSpawnPoint
@ -680,7 +680,7 @@ CheckMapCanWaterfall: ; cb07
Script_WaterfallFromMenu: ; 0xcb1c Script_WaterfallFromMenu: ; 0xcb1c
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
Script_UsedWaterfall: ; 0xcb20 Script_UsedWaterfall: ; 0xcb20
callasm GetPartyNick callasm GetPartyNick
@ -856,13 +856,13 @@ dig_incave
.UsedEscapeRopeScript: ; 0xcc2b .UsedEscapeRopeScript: ; 0xcc2b
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writetext .Text_UsedEscapeRope writetext .Text_UsedEscapeRope
jump .UsedDigOrEscapeRopeScript jump .UsedDigOrEscapeRopeScript
.UsedDigScript: ; 0xcc35 .UsedDigScript: ; 0xcc35
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writetext .Text_UsedDig writetext .Text_UsedDig
.UsedDigOrEscapeRopeScript: ; 0xcc3c .UsedDigOrEscapeRopeScript: ; 0xcc3c
@ -950,7 +950,7 @@ TeleportFunction: ; cc61
.TeleportScript: ; 0xccbb .TeleportScript: ; 0xccbb
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writetext .Text_ReturnToLastMonCenter writetext .Text_ReturnToLastMonCenter
pause 60 pause 60
reloadmappart reloadmappart
@ -1021,7 +1021,7 @@ SetStrengthFlag: ; cd12
Script_StrengthFromMenu: ; 0xcd29 Script_StrengthFromMenu: ; 0xcd29
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
Script_UsedStrength: ; 0xcd2d Script_UsedStrength: ; 0xcd2d
callasm SetStrengthFlag callasm SetStrengthFlag
@ -1183,7 +1183,7 @@ TryWhirlpoolMenu: ; cdde
Script_WhirlpoolFromMenu: ; 0xce0b Script_WhirlpoolFromMenu: ; 0xce0b
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
Script_UsedWhirlpool: ; 0xce0f Script_UsedWhirlpool: ; 0xce0f
callasm GetPartyNick callasm GetPartyNick
@ -1284,7 +1284,7 @@ UnknownText_0xcea2: ; 0xcea2
HeadbuttFromMenuScript: ; 0xcea7 HeadbuttFromMenuScript: ; 0xcea7
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
HeadbuttScript: ; 0xceab HeadbuttScript: ; 0xceab
callasm GetPartyNick callasm GetPartyNick
@ -1382,7 +1382,7 @@ GetFacingObject: ; cf0d
RockSmashFromMenuScript: ; 0xcf2e RockSmashFromMenuScript: ; 0xcf2e
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
RockSmashScript: ; cf32 RockSmashScript: ; cf32
callasm GetPartyNick callasm GetPartyNick
@ -1611,7 +1611,7 @@ Fishing_CheckFacingUp: ; d06c
Script_FishCastRod: ; 0xd07c Script_FishCastRod: ; 0xd07c
reloadmappart reloadmappart
loadvar hBGMapMode, $0 loadvar hBGMapMode, $0
special Special_UpdateTimePals special UpdateTimePals
loademote EMOTE_ROD loademote EMOTE_ROD
callasm LoadFishingGFX callasm LoadFishingGFX
loademote EMOTE_SHOCK loademote EMOTE_SHOCK
@ -1735,7 +1735,7 @@ BikeFunction: ; d0b3
Script_GetOnBike: ; 0xd13e Script_GetOnBike: ; 0xd13e
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_BIKE writecode VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnTheBikeText writetext GotOnTheBikeText
waitbutton waitbutton
@ -1755,7 +1755,7 @@ Script_GetOnBike_Register: ; 0xd14e
Script_GetOffBike: ; 0xd158 Script_GetOffBike: ; 0xd158
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_NORMAL writecode VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffTheBikeText writetext GotOffTheBikeText
waitbutton waitbutton

4
engine/events/poisonstep.asm
View File

@ -104,7 +104,7 @@ DoPoisonStep:: ; 505da
ld de, SFX_POISON ld de, SFX_POISON
call PlaySFX call PlaySFX
ld b, $2 ld b, $2
predef LoadPoisonBGPals predef Predef_LoadPoisonBGPals
call DelayFrame call DelayFrame
ret ret
; 50669 ; 50669
@ -145,7 +145,7 @@ DoPoisonStep:: ; 505da
ld a, [PartyCount] ld a, [PartyCount]
cp [hl] cp [hl]
jr nz, .party_loop jr nz, .party_loop
predef CheckPlayerPartyForFitPkmn predef Predef_CheckPlayerPartyForFitPkmn
ld a, d ld a, d
ld [ScriptVar], a ld [ScriptVar], a
ret ret

6
engine/events/poisonstep_pals.asm
View File

@ -1,4 +1,4 @@
LoadPoisonBGPals: ; cbcdd Predef_LoadPoisonBGPals: ; cbcdd
call .LoadPals call .LoadPals
ld a, [hCGB] ld a, [hCGB]
and a and a
@ -20,7 +20,7 @@ LoadPoisonBGPals: ; cbcdd
call DmgToCgbBGPals call DmgToCgbBGPals
ld c, 4 ld c, 4
call DelayFrames call DelayFrames
farcall _Special_UpdateTimePals farcall _UpdateTimePals
ret ret
.cgb .cgb
@ -44,5 +44,5 @@ LoadPoisonBGPals: ; cbcdd
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a
ld c, 4 ld c, 4
call DelayFrames call DelayFrames
farcall _Special_UpdateTimePals farcall _UpdateTimePals
ret ret

6
engine/events/pokecenter_pc.asm
View File

@ -216,7 +216,7 @@ Function15715: ; 15715
ld hl, KrissPCMenuData ld hl, KrissPCMenuData
call LoadMenuDataHeader call LoadMenuDataHeader
.asm_15722 .asm_15722
call Special_UpdateTimePals call UpdateTimePals
call DoNthMenu call DoNthMenu
jr c, .asm_15731 jr c, .asm_15731
call MenuJumptable call MenuJumptable
@ -354,7 +354,7 @@ KrisWithdrawItemMenu: ; 0x157d1
ld [CurItemQuantity], a ld [CurItemQuantity], a
ld hl, PCItems ld hl, PCItems
call TossItem call TossItem
predef PartyMonItemName predef Predef_PartyMonItemName
ld hl, .WithdrewText ld hl, .WithdrewText
call MenuTextBox call MenuTextBox
xor a xor a
@ -518,7 +518,7 @@ KrisDepositItemMenu: ; 0x1588b
ld [CurItemQuantity], a ld [CurItemQuantity], a
ld hl, NumItems ld hl, NumItems
call TossItem call TossItem
predef PartyMonItemName predef Predef_PartyMonItemName
ld hl, .DepositText ld hl, .DepositText
call PrintText call PrintText
ret ret

4
engine/events/pokepic.asm
View File

@ -12,7 +12,7 @@ Pokepic:: ; 244e3
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld de, vTiles1 ld de, vTiles1
predef GetMonFrontpic predef Predef_GetMonFrontpic
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]
inc a inc a
ld b, a ld b, a
@ -23,7 +23,7 @@ Pokepic:: ; 244e3
ld a, $80 ld a, $80
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
call WaitBGMap call WaitBGMap
ret ret

6
engine/events/print_unown.asm
View File

@ -140,13 +140,13 @@ UnownPrinter: ; 16be4
xor a xor a
ld [wBoxAlignment], a ld [wBoxAlignment], a
ld de, vTiles2 ld de, vTiles2
predef GetMonFrontpic predef Predef_GetMonFrontpic
call .Load2bppToSRAM call .Load2bppToSRAM
hlcoord 1, 6 hlcoord 1, 6
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
farcall RotateUnownFrontpic farcall RotateUnownFrontpic
ret ret
@ -228,6 +228,6 @@ PlaceUnownPrinterFrontpic: ; 16dac
ld a, $31 ld a, $31
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 16dc7 ; 16dc7

2
engine/events/special.asm
View File

@ -10,7 +10,7 @@ Special_GiveShuckle: ; 7305
ld a, 15 ld a, 15
ld [CurPartyLevel], a ld [CurPartyLevel], a
predef TryAddMonToParty predef Predef_TryAddMonToParty
jr nc, .NotGiven jr nc, .NotGiven
; Caught data. ; Caught data.

2
engine/events/squirtbottle.asm
View File

@ -7,7 +7,7 @@ _Squirtbottle: ; 50730
.SquirtbottleScript: .SquirtbottleScript:
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
callasm .CheckCanUseSquirtbottle callasm .CheckCanUseSquirtbottle
iffalse .NothingHappenedScript iffalse .NothingHappenedScript
farjump WateredWeirdTreeScript farjump WateredWeirdTreeScript

2
engine/events/sweet_scent.asm
View File

@ -8,7 +8,7 @@ SweetScentFromMenu: ; 506bc
.SweetScent: ; 0x506c8 .SweetScent: ; 0x506c8
reloadmappart reloadmappart
special Special_UpdateTimePals special UpdateTimePals
callasm GetPartyNick callasm GetPartyNick
writetext UnknownText_0x50726 writetext UnknownText_0x50726
waitbutton waitbutton

4
engine/evolution_animation.asm
View File

@ -122,7 +122,7 @@ EvolutionAnimation: ; 4e5e1
hlcoord 7, 2 hlcoord 7, 2
ld d, $0 ld d, $0
ld e, ANIM_MON_EVOLVE ld e, ANIM_MON_EVOLVE
predef AnimateFrontpic predef Predef_AnimateFrontpic
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
@ -168,7 +168,7 @@ EvolutionAnimation: ; 4e5e1
ld a, $1 ld a, $1
ld [wBoxAlignment], a ld [wBoxAlignment], a
ld de, vTiles2 ld de, vTiles2
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
xor a xor a
ld [wBoxAlignment], a ld [wBoxAlignment], a
ret ret

18
engine/evolve.asm
View File

@ -6,7 +6,7 @@ EvolvePokemon: ; 421d8
ld c, a ld c, a
ld b, SET_FLAG ld b, SET_FLAG
call EvoFlagAction call EvoFlagAction
EvolveAfterBattle: ; 421e6 Predef_EvolveAfterBattle: ; 421e6
xor a xor a
ld [wMonTriedToEvolve], a ld [wMonTriedToEvolve], a
dec a dec a
@ -55,7 +55,7 @@ EvolveAfterBattle_MasterLoop
push hl push hl
xor a xor a
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
pop hl pop hl
.loop .loop
@ -265,7 +265,7 @@ EvolveAfterBattle_MasterLoop
ld hl, TempMonExp + 2 ld hl, TempMonExp + 2
ld de, TempMonMaxHP ld de, TempMonMaxHP
ld b, $1 ld b, $1
predef CalcPkmnStats predef Predef_CalcPkmnStats
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMons ld hl, PartyMons
@ -301,7 +301,7 @@ EvolveAfterBattle_MasterLoop
ld [wd265], a ld [wd265], a
xor a xor a
ld [MonType], a ld [MonType], a
call LearnLevelMoves call Predef_LearnLevelMoves
ld a, [wd265] ld a, [wd265]
dec a dec a
call SetSeenAndCaughtMon call SetSeenAndCaughtMon
@ -311,7 +311,7 @@ EvolveAfterBattle_MasterLoop
jr nz, .skip_unown jr nz, .skip_unown
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
callfar UpdateUnownDex callfar UpdateUnownDex
.skip_unown .skip_unown
@ -429,7 +429,7 @@ Text_WhatEvolving: ; 0x42482
; 0x42487 ; 0x42487
LearnLevelMoves: ; 42487 Predef_LearnLevelMoves: ; 42487
ld a, [wd265] ld a, [wd265]
ld [CurPartySpecies], a ld [CurPartySpecies], a
dec a dec a
@ -484,7 +484,7 @@ LearnLevelMoves: ; 42487
ld [wd265], a ld [wd265], a
call GetMoveName call GetMoveName
call CopyName1 call CopyName1
predef LearnMove predef Predef_LearnMove
pop hl pop hl
jr .find_move jr .find_move
@ -495,7 +495,7 @@ LearnLevelMoves: ; 42487
; 424e1 ; 424e1
FillMoves: ; 424e1 Predef_FillMoves: ; 424e1
; Fill in moves at de for CurPartySpecies at CurPartyLevel ; Fill in moves at de for CurPartySpecies at CurPartyLevel
push hl push hl
@ -621,7 +621,7 @@ ShiftMoves: ; 4256e
EvoFlagAction: ; 42577 EvoFlagAction: ; 42577
push de push de
ld d, $0 ld d, $0
predef FlagPredef predef Predef_Flag
pop de pop de
ret ret
; 42581 ; 42581

4
engine/health.asm
View File

@ -52,7 +52,7 @@ HealPartyMon: ; c677
farcall RestoreAllPP farcall RestoreAllPP
ret ret
ComputeHPBarPixels: ; c699 Predef_ComputeHPBarPixels: ; c699
; e = bc * (6 * 8) / de ; e = bc * (6 * 8) / de
ld a, b ld a, b
or c or c
@ -103,7 +103,7 @@ ComputeHPBarPixels: ; c699
ld e, 0 ld e, 0
ret ret
AnimateHPBar: ; c6e0 Predef_AnimateHPBar: ; c6e0
call WaitBGMap call WaitBGMap
call _AnimateHPBar call _AnimateHPBar
call WaitBGMap call WaitBGMap

10
engine/intro_menu.asm
View File

@ -943,24 +943,24 @@ Intro_WipeInFrontpic: ; 6182
Intro_PrepTrainerPic: ; 619c Intro_PrepTrainerPic: ; 619c
ld de, vTiles2 ld de, vTiles2
farcall GetTrainerPic farcall Predef_GetTrainerPic
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 6, 4 hlcoord 6, 4
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 61b4 ; 61b4
ShrinkFrame: ; 61b4 ShrinkFrame: ; 61b4
ld de, vTiles2 ld de, vTiles2
ld c, $31 ld c, $31
predef DecompressPredef predef Predef_Decompress
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 6, 4 hlcoord 6, 4
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 61cd ; 61cd
@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219
ld [hWY], a ld [hWY], a
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call Special_UpdateTimePals call UpdateTimePals
ld a, [wIntroSceneFrameCounter] ld a, [wIntroSceneFrameCounter]
cp $5 cp $5
jr c, .ok jr c, .ok

30
engine/item_effects.asm
View File

@ -415,7 +415,7 @@ ParkBall: ; e8a2
ld [hBattleTurn], a ld [hBattleTurn], a
ld [Buffer2], a ld [Buffer2], a
ld [wNumHits], a ld [wNumHits], a
predef PlayBattleAnim predef Predef_PlayBattleAnim
ld a, [wWildMon] ld a, [wWildMon]
and a and a
@ -547,7 +547,7 @@ ParkBall: ; e8a2
ld a, [EnemyMonSpecies] ld a, [EnemyMonSpecies]
ld [wd265], a ld [wd265], a
predef NewPokedexEntry predef Predef_NewPokedexEntry
.skip_pokedex .skip_pokedex
ld a, [BattleType] ld a, [BattleType]
@ -567,7 +567,7 @@ ParkBall: ; e8a2
ld [MonType], a ld [MonType], a
call ClearSprites call ClearSprites
predef TryAddMonToParty predef Predef_TryAddMonToParty
farcall SetCaughtData farcall SetCaughtData
@ -623,7 +623,7 @@ ParkBall: ; e8a2
.SendToPC: .SendToPC:
call ClearSprites call ClearSprites
predef SentPkmnIntoBox predef Predef_SendPkmnIntoBox
farcall SetBoxMonCaughtData farcall SetBoxMonCaughtData
@ -985,7 +985,7 @@ LoveBallMultiplier:
ld [MonType], a ld [MonType], a
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld [CurPartyMon], a ld [CurPartyMon], a
farcall GetGender farcall Predef_GetGender
jr c, .done1 ; no effect on genderless jr c, .done1 ; no effect on genderless
ld d, 0 ; male ld d, 0 ; male
@ -999,7 +999,7 @@ LoveBallMultiplier:
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, WILDMON ld a, WILDMON
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
jr c, .done2 ; no effect on genderless jr c, .done2 ; no effect on genderless
ld d, 0 ; male ld d, 0 ; male
@ -1289,7 +1289,7 @@ UpdateStatsAfterItem: ; ee8c
ld a, MON_STAT_EXP - 1 ld a, MON_STAT_EXP - 1
call GetPartyParamLocation call GetPartyParamLocation
ld b, $1 ld b, $1
predef_jump CalcPkmnStats predef_jump Predef_CalcPkmnStats
; ee9f ; ee9f
RareCandy_StatBooster_ExitMenu: ; ee9f RareCandy_StatBooster_ExitMenu: ; ee9f
@ -1428,7 +1428,7 @@ RareCandy: ; ef14
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
hlcoord 9, 0 hlcoord 9, 0
ld b, 10 ld b, 10
@ -1437,7 +1437,7 @@ RareCandy: ; ef14
hlcoord 11, 1 hlcoord 11, 1
ld bc, $0004 ld bc, $0004
predef PrintTempMonStats predef Predef_PrintTempMonStats
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
@ -1445,7 +1445,7 @@ RareCandy: ; ef14
ld [MonType], a ld [MonType], a
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [wd265], a ld [wd265], a
predef LearnLevelMoves predef Predef_LearnLevelMoves
xor a xor a
ld [wForceEvolution], a ld [wForceEvolution], a
@ -1668,7 +1668,7 @@ RevivePokemon: ; f0d6
ld d, 0 ld d, 0
ld hl, wBattleParticipantsIncludingFainted ld hl, wBattleParticipantsIncludingFainted
ld b, CHECK_FLAG ld b, CHECK_FLAG
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
and a and a
jr z, .skip_to_revive jr z, .skip_to_revive
@ -1677,7 +1677,7 @@ RevivePokemon: ; f0d6
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG ld b, SET_FLAG
predef FlagPredef predef Predef_Flag
.skip_to_revive .skip_to_revive
xor a xor a
@ -1844,7 +1844,7 @@ HealHP_SFX_GFX: ; f1db (3:71db)
call AddNTimes call AddNTimes
ld a, $2 ld a, $2
ld [wWhichHPBar], a ld [wWhichHPBar], a
predef_jump AnimateHPBar predef_jump Predef_AnimateHPBar
UseItem_SelectMon: ; f1f9 (3:71f9) UseItem_SelectMon: ; f1f9 (3:71f9)
call .SelectMon call .SelectMon
@ -2957,7 +2957,7 @@ UseBallInTrainerBattle: ; f7a0
ld [wBattleAnimParam], a ld [wBattleAnimParam], a
ld [hBattleTurn], a ld [hBattleTurn], a
ld [wNumHits], a ld [wNumHits], a
predef PlayBattleAnim predef Predef_PlayBattleAnim
ld hl, BlockedTheBallText ld hl, BlockedTheBallText
call PrintText call PrintText
ld hl, DontBeAThiefText ld hl, DontBeAThiefText
@ -3104,7 +3104,7 @@ ApplyPPUp: ; f84c
call GetPartyParamLocation call GetPartyParamLocation
push hl push hl
ld de, Buffer1 ld de, Buffer1
predef FillPP predef Predef_FillPP
pop hl pop hl
ld bc, MON_PP - MON_MOVES ld bc, MON_PP - MON_MOVES
add hl, bc add hl, bc

4
engine/learn.asm
View File

@ -1,4 +1,4 @@
LearnMove: ; 6508 Predef_LearnMove: ; 6508
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
@ -144,7 +144,7 @@ ForgetMove: ; 65d3
hlcoord 5 + 2, 2 + 2 hlcoord 5 + 2, 2 + 2
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [Buffer1], a ld [Buffer1], a
predef ListMoves predef Predef_ListMoves
; wMenuData3 ; wMenuData3
ld a, $4 ld a, $4
ld [w2DMenuCursorInitY], a ld [w2DMenuCursorInitY], a

44
engine/link.asm
View File

@ -150,7 +150,7 @@ TimeCapsule: ; 2805d
ld [wd265], a ld [wd265], a
push hl push hl
push de push de
callfar ConvertMon_1to2 callfar Predef_ConvertMon_1to2
pop de pop de
pop hl pop hl
ld a, [wd265] ld a, [wd265]
@ -449,7 +449,7 @@ Gen2ToGen2LinkComms: ; 28177
pop af pop af
ld [rIF], a ld [rIF], a
predef StartBattle predef Predef_StartBattle
ld a, [rIF] ld a, [rIF]
ld h, a ld h, a
@ -786,7 +786,7 @@ Link_PrepPartyData_Gen1: ; 28499
add hl, bc add hl, bc
ld c, STAT_SATK ld c, STAT_SATK
ld b, TRUE ld b, TRUE
predef CalcPkmnStatC predef Predef_CalcPkmnStatC
pop bc pop bc
pop de pop de
@ -993,7 +993,7 @@ Function2868a: ; 2868a
push bc push bc
push de push de
ld [wd265], a ld [wd265], a
callfar ConvertMon_1to2 callfar Predef_ConvertMon_1to2
pop de pop de
pop bc pop bc
ld a, [wd265] ld a, [wd265]
@ -1072,7 +1072,7 @@ Function2868a: ; 2868a
add hl, bc add hl, bc
ld c, STAT_SATK ld c, STAT_SATK
ld b, TRUE ld b, TRUE
predef CalcPkmnStatC predef Predef_CalcPkmnStatC
pop bc pop bc
pop hl pop hl
ld a, [hQuotient + 1] ld a, [hQuotient + 1]
@ -1085,7 +1085,7 @@ Function2868a: ; 2868a
add hl, bc add hl, bc
ld c, STAT_SDEF ld c, STAT_SDEF
ld b, TRUE ld b, TRUE
predef CalcPkmnStatC predef Predef_CalcPkmnStatC
pop bc pop bc
pop hl pop hl
ld a, [hQuotient + 1] ld a, [hQuotient + 1]
@ -1362,7 +1362,7 @@ Function28926: ; 28926
hlcoord 0, 15 hlcoord 0, 15
ld b, 1 ld b, 1
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 2, 16 hlcoord 2, 16
ld de, .String_Stats_Trade ld de, .String_Stats_Trade
call PlaceString call PlaceString
@ -1471,7 +1471,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .Text_CantTradeLastMon ld hl, .Text_CantTradeLastMon
bccoord 1, 14 bccoord 1, 14
@ -1493,7 +1493,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .Text_Abnormal ld hl, .Text_Abnormal
bccoord 1, 14 bccoord 1, 14
@ -1503,7 +1503,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1648,7 +1648,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call LinkTextboxPredef call Predef_LinkTextbox
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld a, [wd002] ld a, [wd002]
ld hl, PartySpecies ld hl, PartySpecies
@ -1677,7 +1677,7 @@ LinkTrade: ; 28b87
hlcoord 10, 7 hlcoord 10, 7
ld b, 3 ld b, 3
ld c, 7 ld c, 7
call LinkTextboxPredef call Predef_LinkTextbox
ld de, String28eab ld de, String28eab
hlcoord 12, 8 hlcoord 12, 8
call PlaceString call PlaceString
@ -1717,7 +1717,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1734,7 +1734,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1891,11 +1891,11 @@ LinkTrade: ; 28b87
ld a, [hLinkPlayerNumber] ld a, [hLinkPlayerNumber]
cp $1 cp $1
jr z, .player_2 jr z, .player_2
predef TradeAnimation predef Predef_TradeAnimation
jr .done_animation jr .done_animation
.player_2 .player_2
predef TradeAnimationPlayer2 predef Predef_TradeAnimationPlayer2
.done_animation .done_animation
pop af pop af
@ -1913,7 +1913,7 @@ LinkTrade: ; 28b87
ld de, TempMonSpecies ld de, TempMonSpecies
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
predef AddTempmonToParty predef Predef_AddTempmonToParty
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a
@ -1964,7 +1964,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ebd ld de, String28ebd
call PlaceString call PlaceString
@ -2001,7 +2001,7 @@ String_TooBadTheTradeWasCanceled: ; 28ece
next "was canceled!@" next "was canceled!@"
LinkTextboxPredef: ; 28eef Predef_LinkTextbox: ; 28eef
ld d, h ld d, h
ld e, l ld e, l
farcall LinkTextbox farcall LinkTextbox
@ -2023,11 +2023,11 @@ Unreferenced_Function28f09: ; 28f09
hlcoord 0, 0 hlcoord 0, 0
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
hlcoord 0, 8 hlcoord 0, 8
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call LinkTextboxPredef call Predef_LinkTextbox
farcall PlaceTradePartnerNamesAndParty farcall PlaceTradePartnerNamesAndParty
ret ret
; 28f24 ; 28f24
@ -2584,7 +2584,7 @@ Unreferenced_Function29fe4:
call GetSRAMBank call GetSRAMBank
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
predef FlagPredef predef Predef_Flag
call CloseSRAM call CloseSRAM
ld a, c ld a, c
and a and a

2
engine/link_2.asm
View File

@ -3,7 +3,7 @@ LinkMonStatsScreen: ; 4d319
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a
call LowVolume call LowVolume
predef StatsScreenInit predef Predef_StatsScreenInit
ld a, [CurPartyMon] ld a, [CurPartyMon]
inc a inc a
ld [wMenuCursorY], a ld [wMenuCursorY], a

2
engine/link_trade.asm
View File

@ -181,7 +181,7 @@ Function16d6e1: ; 16d6e1
hlcoord 4, 10 hlcoord 4, 10
ld b, 1 ld b, 1
ld c, 10 ld c, 10
predef LinkTextboxPredef predef Predef_LinkTextbox
hlcoord 5, 11 hlcoord 5, 11
ld de, .Waiting ld de, .Waiting
call PlaceString call PlaceString

2
engine/map_setup.asm
View File

@ -233,7 +233,7 @@ FadeOldMapMusic: ; 15567
; 1556d ; 1556d
RetainOldPalettes: ; 1556d RetainOldPalettes: ; 1556d
farcall _Special_UpdateTimePals farcall _UpdateTimePals
ret ret
RotatePalettesRightMapAndMusic: ; 15574 RotatePalettesRightMapAndMusic: ; 15574

4
engine/mart.asm
View File

@ -525,7 +525,7 @@ StandardMartAskPurchaseQuantity:
; 15d97 ; 15d97
MartConfirmPurchase: ; 15d97 MartConfirmPurchase: ; 15d97
predef PartyMonItemName predef Predef_PartyMonItemName
ld a, MARTTEXT_COSTS_THIS_MUCH ld a, MARTTEXT_COSTS_THIS_MUCH
call LoadBuyMenuText call LoadBuyMenuText
call YesNoBox call YesNoBox
@ -864,7 +864,7 @@ SellMenu: ; 15eb3
ld a, [wMartItemID] ld a, [wMartItemID]
ld hl, NumItems ld hl, NumItems
call TossItem call TossItem
predef PartyMonItemName predef Predef_PartyMonItemName
hlcoord 1, 14 hlcoord 1, 14
lb bc, 3, 18 lb bc, 3, 18
call ClearBox call ClearBox

24
engine/mon_stats.asm
View File

@ -1,8 +1,8 @@
DrawPlayerHP: ; 50b0a Predef_DrawPlayerHP: ; 50b0a
ld a, $1 ld a, $1
jr DrawHP jr DrawHP
DrawEnemyHP: ; 50b0e Predef_DrawEnemyHP: ; 50b0e
ld a, $2 ld a, $2
DrawHP: ; 50b10 DrawHP: ; 50b10
@ -43,7 +43,7 @@ DrawHP: ; 50b10
ld c, e ld c, e
.not_boxmon .not_boxmon
predef ComputeHPBarPixels predef Predef_ComputeHPBarPixels
ld a, 6 ld a, 6
ld d, a ld d, a
ld c, a ld c, a
@ -82,7 +82,7 @@ DrawHP: ; 50b10
pop de pop de
ret ret
PrintTempMonStats: ; 50b7b Predef_PrintTempMonStats: ; 50b7b
; Print TempMon's stats at hl, with spacing bc. ; Print TempMon's stats at hl, with spacing bc.
push bc push bc
push hl push hl
@ -121,7 +121,7 @@ PrintTempMonStats: ; 50b7b
next "SPEED" next "SPEED"
next "@" next "@"
GetGender: ; 50bdd Predef_GetGender: ; 50bdd
; Return the gender of a given monster (CurPartyMon/CurOTMon/CurWildMon). ; Return the gender of a given monster (CurPartyMon/CurOTMon/CurWildMon).
; When calling this function, a should be set to an appropriate MonType value. ; When calling this function, a should be set to an appropriate MonType value.
@ -235,7 +235,7 @@ GetGender: ; 50bdd
scf scf
ret ret
ListMovePP: ; 50c50 Predef_ListMovePP: ; 50c50
ld a, [wNumMoves] ld a, [wNumMoves]
inc a inc a
ld c, a ld c, a
@ -343,7 +343,7 @@ UnusedPredef22:
call GetNick call GetNick
pop hl pop hl
call PlaceString call PlaceString
call CopyPkmnToTempMon call Predef_CopyPkmnToTempMon
pop hl pop hl
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
cp EGG cp EGG
@ -352,7 +352,7 @@ UnusedPredef22:
ld bc, -12 ld bc, -12
add hl, bc add hl, bc
ld b, $0 ld b, $0
call DrawEnemyHP call Predef_DrawEnemyHP
pop hl pop hl
ld bc, 5 ld bc, 5
add hl, bc add hl, bc
@ -363,7 +363,7 @@ UnusedPredef22:
.egg .egg
ret ret
PlaceStatusString: ; 50d0a Predef_PlaceStatusString: ; 50d0a
push de push de
inc de inc de
inc de inc de
@ -373,7 +373,7 @@ PlaceStatusString: ; 50d0a
ld a, [de] ld a, [de]
or b or b
pop de pop de
jr nz, PlaceNonFaintStatus jr nz, Predef_PlaceNonFaintStatus
push de push de
ld de, FntString ld de, FntString
call CopyStatusString call CopyStatusString
@ -396,7 +396,7 @@ CopyStatusString: ; 50d25
ld [hl], a ld [hl], a
ret ret
PlaceNonFaintStatus: ; 50d2e Predef_PlaceNonFaintStatus: ; 50d2e
push de push de
ld a, [de] ld a, [de]
ld de, PsnString ld de, PsnString
@ -430,7 +430,7 @@ BrnString: db "BRN@"
FrzString: db "FRZ@" FrzString: db "FRZ@"
ParString: db "PAR@" ParString: db "PAR@"
ListMoves: ; 50d6f Predef_ListMoves: ; 50d6f
; List moves at hl, spaced every [Buffer1] tiles. ; List moves at hl, spaced every [Buffer1] tiles.
ld de, wListMoves_MoveIndicesBuffer ld de, wListMoves_MoveIndicesBuffer
ld b, $0 ld b, $0

60
engine/move_mon.asm
View File

@ -1,4 +1,4 @@
TryAddMonToParty: ; d88c Predef_TryAddMonToParty: ; d88c
; Check if to copy wild Pkmn or generate new Pkmn ; Check if to copy wild Pkmn or generate new Pkmn
; Whose is it? ; Whose is it?
ld de, PartyCount ld de, PartyCount
@ -120,7 +120,7 @@ GeneratePartyMonStats: ; d906
endr endr
ld [hl], a ld [hl], a
ld [Buffer1], a ld [Buffer1], a
predef FillMoves predef Predef_FillMoves
.next .next
pop de pop de
@ -195,7 +195,7 @@ endr
push de push de
inc hl inc hl
inc hl inc hl
call FillPP call Predef_FillPP
pop de pop de
pop hl pop hl
rept 4 rept 4
@ -224,7 +224,7 @@ endr
ld a, $1 ld a, $1
ld c, a ld c, a
ld b, FALSE ld b, FALSE
call CalcPkmnStatC call Predef_CalcPkmnStatC
ld a, [hProduct + 2] ld a, [hProduct + 2]
ld [de], a ld [de], a
inc de inc de
@ -297,7 +297,7 @@ endr
ld bc, MON_STAT_EXP - 1 ld bc, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $0 ; if b = 1, then stat calculation takes stat exp into account. ld b, $0 ; if b = 1, then stat calculation takes stat exp into account.
call CalcPkmnStats call Predef_CalcPkmnStats
.next3 .next3
ld a, [MonType] ld a, [MonType]
@ -311,7 +311,7 @@ endr
dec a dec a
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
predef GetUnownLetter predef Predef_GetUnownLetter
callfar UpdateUnownDex callfar UpdateUnownDex
.done .done
@ -319,7 +319,7 @@ endr
ret ret
; da6d ; da6d
FillPP: ; da6d Predef_FillPP: ; da6d
push bc push bc
ld b, NUM_MOVES ld b, NUM_MOVES
.loop .loop
@ -350,7 +350,7 @@ FillPP: ; da6d
ret ret
; da96 ; da96
AddTempmonToParty: ; da96 Predef_AddTempmonToParty: ; da96
ld hl, PartyCount ld hl, PartyCount
ld a, [hl] ld a, [hl]
cp PARTY_LENGTH cp PARTY_LENGTH
@ -422,7 +422,7 @@ AddTempmonToParty: ; da96
dec a dec a
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
predef GetUnownLetter predef Predef_GetUnownLetter
callfar UpdateUnownDex callfar UpdateUnownDex
ld a, [wFirstUnownSeen] ld a, [wFirstUnownSeen]
and a and a
@ -434,7 +434,7 @@ AddTempmonToParty: ; da96
and a and a
ret ret
SentGetPkmnIntoFromBox: ; db3f Predef_SendGetPkmnIntoFromBox: ; db3f
; Sents/Gets Pkmn into/from Box depending on Parameter ; Sents/Gets Pkmn into/from Box depending on Parameter
; wPokemonWithdrawDepositParameter == 0: get Pkmn into Party ; wPokemonWithdrawDepositParameter == 0: get Pkmn into Party
; wPokemonWithdrawDepositParameter == 1: sent Pkmn into Box ; wPokemonWithdrawDepositParameter == 1: sent Pkmn into Box
@ -597,7 +597,7 @@ SentGetPkmnIntoFromBox: ; db3f
srl a srl a
add $2 add $2
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
callfar CalcLevel callfar CalcLevel
ld a, d ld a, d
ld [CurPartyLevel], a ld [CurPartyLevel], a
@ -617,7 +617,7 @@ SentGetPkmnIntoFromBox: ; db3f
push bc push bc
ld b, $1 ld b, $1
call CalcPkmnStats call Predef_CalcPkmnStats
pop bc pop bc
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
@ -830,7 +830,7 @@ Functiondd64: ; dd64
add hl, bc add hl, bc
push bc push bc
ld b, $1 ld b, $1
call CalcPkmnStats call Predef_CalcPkmnStats
ld hl, PartyMon1Moves ld hl, PartyMon1Moves
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
@ -840,7 +840,7 @@ Functiondd64: ; dd64
ld e, l ld e, l
ld a, $1 ld a, $1
ld [Buffer1], a ld [Buffer1], a
predef FillMoves predef Predef_FillMoves
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a
@ -904,8 +904,8 @@ DepositBreedmon: ; de44
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
jp CopyBytes jp CopyBytes
SentPkmnIntoBox: ; de6e Predef_SendPkmnIntoBox: ; de6e
; Sents the Pkmn into one of Bills Boxes ; Sends the Pkmn into one of Bills Boxes
; the data comes mainly from 'EnemyMon:' ; the data comes mainly from 'EnemyMon:'
ld a, BANK(sBoxCount) ld a, BANK(sBoxCount)
call GetSRAMBank call GetSRAMBank
@ -1010,7 +1010,7 @@ SentPkmnIntoBox: ; de6e
cp UNOWN cp UNOWN
jr nz, .not_unown jr nz, .not_unown
ld hl, sBoxMon1DVs ld hl, sBoxMon1DVs
predef GetUnownLetter predef Predef_GetUnownLetter
callfar UpdateUnownDex callfar UpdateUnownDex
.not_unown .not_unown
@ -1086,7 +1086,7 @@ ShiftBoxMon: ; df47
ret ret
; df8c ; df8c
GiveEgg:: ; df8c Predef_GiveEgg:: ; df8c
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
push af push af
callfar GetPreEvolution callfar GetPreEvolution
@ -1094,7 +1094,7 @@ GiveEgg:: ; df8c
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
dec a dec a
; TryAddMonToParty sets Seen and Caught flags ; Predef_TryAddMonToParty sets Seen and Caught flags
; when it is successful. This routine will make ; when it is successful. This routine will make
; sure that we aren't newly setting flags. ; sure that we aren't newly setting flags.
push af push af
@ -1104,11 +1104,11 @@ GiveEgg:: ; df8c
call CheckSeenMon call CheckSeenMon
push bc push bc
call TryAddMonToParty call Predef_TryAddMonToParty
; If we haven't caught this Pokemon before receiving ; If we haven't caught this Pokemon before receiving
; the Egg, reset the flag that was just set by ; the Egg, reset the flag that was just set by
; TryAddMonToParty. ; Predef_TryAddMonToParty.
pop bc pop bc
ld a, c ld a, c
and a and a
@ -1119,12 +1119,12 @@ GiveEgg:: ; df8c
ld d, $0 ld d, $0
ld hl, PokedexCaught ld hl, PokedexCaught
ld b, RESET_FLAG ld b, RESET_FLAG
predef FlagPredef predef Predef_Flag
.skip_caught_flag .skip_caught_flag
; If we haven't seen this Pokemon before receiving ; If we haven't seen this Pokemon before receiving
; the Egg, reset the flag that was just set by ; the Egg, reset the flag that was just set by
; TryAddMonToParty. ; Predef_TryAddMonToParty.
pop bc pop bc
ld a, c ld a, c
and a and a
@ -1135,7 +1135,7 @@ GiveEgg:: ; df8c
ld d, $0 ld d, $0
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, RESET_FLAG ld b, RESET_FLAG
predef FlagPredef predef Predef_Flag
.skip_seen_flag .skip_seen_flag
pop af pop af
@ -1360,7 +1360,7 @@ ComputeNPCTrademonStats: ; e134
ld a, MON_STAT_EXP - 1 ld a, MON_STAT_EXP - 1
call GetPartyParamLocation call GetPartyParamLocation
ld b, $1 ld b, $1
call CalcPkmnStats call Predef_CalcPkmnStats
pop de pop de
ld a, MON_HP ld a, MON_HP
call GetPartyParamLocation call GetPartyParamLocation
@ -1372,7 +1372,7 @@ ComputeNPCTrademonStats: ; e134
ret ret
; e167 ; e167
CalcPkmnStats: ; e167 Predef_CalcPkmnStats: ; e167
; Calculates all 6 Stats of a Pkmn ; Calculates all 6 Stats of a Pkmn
; b: Take into account stat EXP if TRUE ; b: Take into account stat EXP if TRUE
; 'c' counts from 1-6 and points with 'BaseStats' to the base value ; 'c' counts from 1-6 and points with 'BaseStats' to the base value
@ -1382,7 +1382,7 @@ CalcPkmnStats: ; e167
ld c, $0 ld c, $0
.loop .loop
inc c inc c
call CalcPkmnStatC call Predef_CalcPkmnStatC
ld a, [hMultiplicand + 1] ld a, [hMultiplicand + 1]
ld [de], a ld [de], a
inc de inc de
@ -1395,7 +1395,7 @@ CalcPkmnStats: ; e167
ret ret
; e17b ; e17b
CalcPkmnStatC: ; e17b Predef_CalcPkmnStatC: ; e17b
; 'c' is 1-6 and points to the BaseStat ; 'c' is 1-6 and points to the BaseStat
; 1: HP ; 1: HP
; 2: Attack ; 2: Attack
@ -1596,7 +1596,7 @@ GivePoke:: ; e277
push bc push bc
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
call TryAddMonToParty call Predef_TryAddMonToParty
jr nc, .failed jr nc, .failed
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld a, [PartyCount] ld a, [PartyCount]
@ -1626,7 +1626,7 @@ GivePoke:: ; e277
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [TempEnemyMonSpecies], a ld [TempEnemyMonSpecies], a
callfar LoadEnemyMon callfar LoadEnemyMon
call SentPkmnIntoBox call Predef_SendPkmnIntoBox
jp nc, .FailedToGiveMon jp nc, .FailedToGiveMon
ld a, BOXMON ld a, BOXMON
ld [MonType], a ld [MonType], a

6
engine/mystery_gift.asm
View File

@ -1117,7 +1117,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld hl, sMysteryGiftDecorationsReceived ld hl, sMysteryGiftDecorationsReceived
predef_id FlagPredef predef_id Predef_Flag
push hl push hl
push bc push bc
call Predef call Predef
@ -1129,7 +1129,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
ret nz ret nz
call GetMysteryGiftBank call GetMysteryGiftBank
ld b, SET_FLAG ld b, SET_FLAG
predef FlagPredef predef Predef_Flag
call CloseSRAM call CloseSRAM
xor a xor a
ret ret
@ -1142,7 +1142,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
ld d, $0 ld d, $0
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld hl, sMysteryGiftDecorationsReceived ld hl, sMysteryGiftDecorationsReceived
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
and a and a
pop bc pop bc

2
engine/namingscreen.asm
View File

@ -103,7 +103,7 @@ NamingScreen: ; 116c1
inc de inc de
hlcoord 5, 4 hlcoord 5, 4
call PlaceString call PlaceString
farcall GetGender farcall Predef_GetGender
jr c, .genderless jr c, .genderless
ld a, "♂" ld a, "♂"
jr nz, .place_gender jr nz, .place_gender

10
engine/npctrade.asm
View File

@ -67,7 +67,7 @@ NPCTrade:: ; fcba8
push af push af
ld a, [wcf64] ld a, [wcf64]
push af push af
predef TradeAnimation predef Predef_TradeAnimation
pop af pop af
ld [wcf64], a ld [wcf64], a
pop af pop af
@ -88,12 +88,12 @@ CheckTradeGender: ; fcc23
cp 1 cp 1
jr z, .check_male jr z, .check_male
farcall GetGender farcall Predef_GetGender
jr nz, .not_matching jr nz, .not_matching
jr .matching jr .matching
.check_male .check_male
farcall GetGender farcall Predef_GetGender
jr z, .not_matching jr z, .not_matching
.matching .matching
@ -109,7 +109,7 @@ TradeFlagAction: ; fcc4a
ld hl, wTradeFlags ld hl, wTradeFlags
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld c, a ld c, a
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
and a and a
ret ret
@ -196,7 +196,7 @@ DoNPCTrade: ; fcc63
ld [MonType], a ld [MonType], a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callfar RemoveMonFromPartyOrBox callfar RemoveMonFromPartyOrBox
predef TryAddMonToParty predef Predef_TryAddMonToParty
ld e, TRADE_DIALOG ld e, TRADE_DIALOG
call GetTradeAttribute call GetTradeAttribute

8
engine/party_menu.asm
View File

@ -188,7 +188,7 @@ PlacePartymonHPBar: ; 50117
ld d, a ld d, a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
predef ComputeHPBarPixels predef Predef_ComputeHPBarPixels
ret ret
; 50138 ; 50138
@ -297,7 +297,7 @@ PlacePartyMonStatus: ; 501b2
ld e, l ld e, l
ld d, h ld d, h
pop hl pop hl
call PlaceStatusString call Predef_PlaceStatusString
.next .next
pop hl pop hl
@ -329,7 +329,7 @@ PlacePartyMonTMHMCompatibility: ; 501e0
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [CurPartySpecies], a ld [CurPartySpecies], a
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
pop hl pop hl
call .PlaceAbleNotAble call .PlaceAbleNotAble
call PlaceString call PlaceString
@ -468,7 +468,7 @@ PlacePartyMonGender: ; 502b1
ld [CurPartyMon], a ld [CurPartyMon], a
xor a xor a
ld [MonType], a ld [MonType], a
call GetGender call Predef_GetGender
ld de, .unknown ld de, .unknown
jr c, .got_gender jr c, .got_gender
ld de, .male ld de, .male

28
engine/pic_animation.asm
View File

@ -1,54 +1,54 @@
; Pic animation arrangement. ; Pic animation arrangement.
AnimateMon_Slow_Normal: ; d0000 UnusedPredef_AnimateMon_Slow_Normal: ; d0000
hlcoord 12, 0 hlcoord 12, 0
ld a, [wBattleMode] ld a, [wBattleMode]
cp WILD_BATTLE cp WILD_BATTLE
jr z, .wild jr z, .wild
ld e, ANIM_MON_SLOW ld e, ANIM_MON_SLOW
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
.wild .wild
ld e, ANIM_MON_NORMAL ld e, ANIM_MON_NORMAL
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d001a ; d001a
AnimateMon_Menu: ; d001a AnimateMon_Menu: ; d001a
ld e, ANIM_MON_MENU ld e, ANIM_MON_MENU
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d0022 ; d0022
AnimateMon_Trade: ; d0022 AnimateMon_Trade: ; d0022
ld e, ANIM_MON_TRADE ld e, ANIM_MON_TRADE
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d002a ; d002a
AnimateMon_Evolve: ; d002a AnimateMon_Evolve: ; d002a
ld e, ANIM_MON_EVOLVE ld e, ANIM_MON_EVOLVE
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d0032 ; d0032
AnimateMon_Hatch: ; d0032 AnimateMon_Hatch: ; d0032
ld e, ANIM_MON_HATCH ld e, ANIM_MON_HATCH
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d003a ; d003a
AnimateMon_Unused: ; d003a AnimateMon_Unused: ; d003a
ld e, ANIM_MON_UNUSED ld e, ANIM_MON_UNUSED
ld d, $0 ld d, $0
call AnimateFrontpic call Predef_AnimateFrontpic
ret ret
; d0042 ; d0042
@ -86,10 +86,10 @@ PokeAnims: ; d0042
.Egg2: pokeanim Idle, Play .Egg2: pokeanim Idle, Play
AnimateFrontpic: ; d008e Predef_AnimateFrontpic: ; d008e
call AnimateMon_CheckIfPokemon call AnimateMon_CheckIfPokemon
ret c ret c
call LoadMonAnimation call Predef_LoadMonAnimation
.loop .loop
call SetUpPokeAnim call SetUpPokeAnim
push af push af
@ -99,7 +99,7 @@ AnimateFrontpic: ; d008e
ret ret
; d00a3 ; d00a3
LoadMonAnimation: ; d00a3 Predef_LoadMonAnimation: ; d00a3
push hl push hl
ld c, e ld c, e
ld b, 0 ld b, 0
@ -1114,7 +1114,7 @@ UnusedPredef48: ; d0669 Predef 48
ld a, $1 ld a, $1
ld [wBoxAlignment], a ld [wBoxAlignment], a
HOF_AnimateFrontpic: ; d066e Predef 49 HOF_Predef_AnimateFrontpic: ; d066e Predef 49
call AnimateMon_CheckIfPokemon call AnimateMon_CheckIfPokemon
jr c, .fail jr c, .fail
ld h, d ld h, d
@ -1122,12 +1122,12 @@ HOF_AnimateFrontpic: ; d066e Predef 49
push bc push bc
push hl push hl
ld de, vTiles2 ld de, vTiles2
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
pop hl pop hl
pop bc pop bc
ld d, 0 ld d, 0
ld e, c ld e, c
call AnimateFrontpic call Predef_AnimateFrontpic
xor a xor a
ld [wBoxAlignment], a ld [wBoxAlignment], a
ret ret

6
engine/player_gfx.asm
View File

@ -30,7 +30,7 @@ MovePlayerPic: ; 88266
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
xor a xor a
ld [hBGMapThird], a ld [hBGMapThird], a
call WaitBGMap call WaitBGMap
@ -141,7 +141,7 @@ GetChrisBackpic: ; 88830
ld b, BANK(ChrisBackpic) ld b, BANK(ChrisBackpic)
ld de, vTiles2 tile $31 ld de, vTiles2 tile $31
ld c, 7 * 7 ld c, 7 * 7
predef DecompressPredef predef Predef_Decompress
ret ret
HOF_LoadTrainerFrontpic: ; 88840 HOF_LoadTrainerFrontpic: ; 88840
@ -203,7 +203,7 @@ DrawIntroPlayerPic: ; 88874
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 6, 4 hlcoord 6, 4
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
ChrisPic: ; 888a9 ChrisPic: ; 888a9

8
engine/pokedex.asm
View File

@ -441,7 +441,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call Pokedex_GetSelectedMon call Pokedex_GetSelectedMon
ld a, [wDexCurrentLocation] ld a, [wDexCurrentLocation]
ld e, a ld e, a
predef Pokedex_GetArea predef Predef_Pokedex_GetArea
call Pokedex_BlackOutBG call Pokedex_BlackOutBG
call DelayFrame call DelayFrame
xor a xor a
@ -2399,7 +2399,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
ld [CurPartySpecies], a ld [CurPartySpecies], a
call GetBaseData call GetBaseData
ld de, vTiles2 ld de, vTiles2
predef GetMonFrontpic predef Predef_GetMonFrontpic
ret ret
.QuestionMark: .QuestionMark:
@ -2552,7 +2552,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
ld [CurPartySpecies], a ld [CurPartySpecies], a
call GetBaseData call GetBaseData
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetMonFrontpic predef Predef_GetMonFrontpic
pop af pop af
ld [UnownLetter], a ld [UnownLetter], a
ret ret
@ -2582,7 +2582,7 @@ _NewPokedexEntry: ; 41a7f
call WaitBGMap call WaitBGMap
call GetBaseData call GetBaseData
ld de, vTiles2 ld de, vTiles2
predef GetMonFrontpic predef Predef_GetMonFrontpic
ld a, SCGB_POKEDEX ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout call Pokedex_GetSGBLayout
ld a, [CurPartySpecies] ld a, [CurPartySpecies]

4
engine/pokegear.asm
View File

@ -2331,7 +2331,7 @@ HasVisitedSpawn: ; 91c50
ld hl, wVisitedSpawns ld hl, wVisitedSpawns
ld b, CHECK_FLAG ld b, CHECK_FLAG
ld d, 0 ld d, 0
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
ret ret
@ -2440,7 +2440,7 @@ FlyMap: ; 91c90
; 91d11 ; 91d11
Pokedex_GetArea: ; 91d11 Predef_Pokedex_GetArea: ; 91d11
; e: Current landmark ; e: Current landmark
ld a, [wTownMapPlayerIconLandmark] ld a, [wTownMapPlayerIconLandmark]
push af push af

128
engine/predef.asm
View File

@ -30,79 +30,79 @@ PredefPointers:: ; 856b
; $4b Predef pointers ; $4b Predef pointers
; address, bank ; address, bank
add_predef LearnMove ; $0 add_predef Predef_LearnMove ; $0
add_predef DummyPredef1 add_predef DummyPredef1
add_predef HealParty add_predef HealParty ; this is both a special and a predef
add_predef FlagPredef add_predef Predef_Flag
add_predef ComputeHPBarPixels add_predef Predef_ComputeHPBarPixels
add_predef FillPP add_predef Predef_FillPP
add_predef TryAddMonToParty add_predef Predef_TryAddMonToParty
add_predef AddTempmonToParty add_predef Predef_AddTempmonToParty
add_predef SentGetPkmnIntoFromBox add_predef Predef_SendGetPkmnIntoFromBox
add_predef SentPkmnIntoBox add_predef Predef_SendPkmnIntoBox
add_predef GiveEgg add_predef Predef_GiveEgg
add_predef AnimateHPBar add_predef Predef_AnimateHPBar
add_predef CalcPkmnStats add_predef Predef_CalcPkmnStats
add_predef CalcPkmnStatC add_predef Predef_CalcPkmnStatC
add_predef CanLearnTMHMMove add_predef Predef_CanLearnTMHMMove
add_predef GetTMHMMove add_predef Predef_GetTMHMMove
add_predef LinkTextboxPredef ; $ 10 add_predef Predef_LinkTextbox ; $ 10
add_predef PrintMoveDesc add_predef Predef_PrintMoveDesc
add_predef UpdatePlayerHUD add_predef Predef_UpdatePlayerHUD
add_predef PlaceGraphic add_predef Predef_PlaceGraphic
add_predef CheckPlayerPartyForFitPkmn add_predef Predef_CheckPlayerPartyForFitPkmn
add_predef UpdateEnemyHUD add_predef Predef_UpdateEnemyHUD
add_predef StartBattle add_predef Predef_StartBattle
add_predef FillInExpBar add_predef Predef_FillInExpBar
add_predef GetBattleMonBackpic ; $18 add_predef Predef_GetBattleMonBackpic ; $18
add_predef GetEnemyMonFrontpic add_predef Predef_GetEnemyMonFrontpic
add_predef LearnLevelMoves add_predef Predef_LearnLevelMoves
add_predef FillMoves add_predef Predef_FillMoves
add_predef EvolveAfterBattle add_predef Predef_EvolveAfterBattle
add_predef TradeAnimationPlayer2 add_predef Predef_TradeAnimationPlayer2
add_predef TradeAnimation add_predef Predef_TradeAnimation
add_predef CopyPkmnToTempMon add_predef Predef_CopyPkmnToTempMon
add_predef ListMoves ; $20 add_predef Predef_ListMoves ; $20
add_predef PlaceNonFaintStatus add_predef Predef_PlaceNonFaintStatus
add_predef UnusedPredef22 add_predef UnusedPredef22
add_predef ListMovePP add_predef Predef_ListMovePP
add_predef GetGender add_predef Predef_GetGender
add_predef StatsScreenInit add_predef Predef_StatsScreenInit
add_predef DrawPlayerHP add_predef Predef_DrawPlayerHP
add_predef DrawEnemyHP add_predef Predef_DrawEnemyHP
add_predef PrintTempMonStats ; $28 add_predef Predef_PrintTempMonStats ; $28
add_predef GetTypeName add_predef Predef_GetTypeName
add_predef PrintMoveType add_predef Predef_PrintMoveType
add_predef PrintType add_predef Predef_PrintType
add_predef PrintMonTypes add_predef Predef_PrintMonTypes
add_predef GetUnownLetter add_predef Predef_GetUnownLetter
add_predef LoadPoisonBGPals add_predef Predef_LoadPoisonBGPals
add_predef DummyPredef2F add_predef DummyPredef2F
add_predef InitSGBBorder ; $30 add_predef Predef_InitSGBBorder ; $30
add_predef LoadSGBLayout add_predef Predef_LoadSGBLayout
add_predef Pokedex_GetArea add_predef Predef_Pokedex_GetArea
add_predef UnusedPredef_CheckContestMon add_predef UnusedPredef_CheckContestMon
add_predef DoBattleTransition add_predef Predef_DoBattleTransition
add_predef DummyPredef35 add_predef DummyPredef35
add_predef DummyPredef36 add_predef DummyPredef36
add_predef PlayBattleAnim add_predef Predef_PlayBattleAnim
add_predef DummyPredef38 ; $38 add_predef DummyPredef38 ; $38
add_predef DummyPredef39 add_predef DummyPredef39
add_predef DummyPredef3A add_predef DummyPredef3A
add_predef PartyMonItemName add_predef Predef_PartyMonItemName
add_predef GetMonFrontpic add_predef Predef_GetMonFrontpic
add_predef GetMonBackpic add_predef Predef_GetMonBackpic
add_predef GetAnimatedFrontpicPredef add_predef Predef_GetAnimatedFrontpic
add_predef GetTrainerPic add_predef Predef_GetTrainerPic
add_predef DecompressPredef ; $40 add_predef Predef_Decompress ; $40
add_predef CheckTypeMatchup add_predef Predef_CheckTypeMatchup
add_predef ConvertMon_1to2 add_predef Predef_ConvertMon_1to2
add_predef NewPokedexEntry add_predef Predef_NewPokedexEntry
add_predef AnimateMon_Slow_Normal add_predef UnusedPredef_AnimateMon_Slow_Normal
add_predef PlaceStatusString add_predef Predef_PlaceStatusString
add_predef LoadMonAnimation add_predef Predef_LoadMonAnimation
add_predef AnimateFrontpic add_predef Predef_AnimateFrontpic
add_predef UnusedPredef48 ; $48 add_predef UnusedPredef48 ; $48
add_predef HOF_AnimateFrontpic add_predef HOF_Predef_AnimateFrontpic
dbw $ff, InexplicablyEmptyFunction ; ??? dbw $ff, InexplicablyEmptyFunction ; ???
; 864c ; 864c

8
engine/print_party.asm
View File

@ -157,7 +157,7 @@ PrintPartyMonPage1: ; 1dc381
xor a xor a
ld [MonType], a ld [MonType], a
farcall CopyPkmnToTempMon farcall Predef_CopyPkmnToTempMon
hlcoord 0, 7 hlcoord 0, 7
ld b, 9 ld b, 9
ld c, 18 ld c, 18
@ -213,7 +213,7 @@ PrintPartyMonPage1: ; 1dc381
call Function1dc51a call Function1dc51a
call Function1dc52c call Function1dc52c
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
ld hl, wBoxAlignment ld hl, wBoxAlignment
xor a xor a
ld [hl], a ld [hl], a
@ -241,7 +241,7 @@ PrintPartyMonPage2: ; 1dc47b
call LoadFontsBattleExtra call LoadFontsBattleExtra
xor a xor a
ld [MonType], a ld [MonType], a
farcall CopyPkmnToTempMon farcall Predef_CopyPkmnToTempMon
hlcoord 0, 0 hlcoord 0, 0
ld b, 15 ld b, 15
ld c, 18 ld c, 18
@ -316,7 +316,7 @@ Function1dc51a: ; 1dc51a
; 1dc52c ; 1dc52c
Function1dc52c: ; 1dc52c Function1dc52c: ; 1dc52c
farcall GetGender farcall Predef_GetGender
ld a, " " ld a, " "
jr c, .got_gender jr c, .got_gender
ld a, "♂" ld a, "♂"

2
engine/printer.asm
View File

@ -860,7 +860,7 @@ Printer_GetMonGender: ; 8498a (21:498a)
ld [CurPartyMon], a ld [CurPartyMon], a
ld a, TEMPMON ld a, TEMPMON
ld [MonType], a ld [MonType], a
farcall GetGender farcall Predef_GetGender
ld a, " " ld a, " "
jr c, .got_gender jr c, .got_gender
ld a, "♂" ld a, "♂"

2
engine/routines/correcterrorsinplayerparty.asm
View File

@ -90,7 +90,7 @@ Unreferenced_CorrectErrorsInPlayerParty:
ld hl, MON_STAT_EXP - 1 ld hl, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $1 ld b, $1
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop hl pop hl
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc add hl, bc

2
engine/routines/flagpredef.asm
View File

@ -1,4 +1,4 @@
FlagPredef: ; 4d7c1 Predef_Flag: ; 4d7c1
; Perform action b on flag c in flag array hl. ; Perform action b on flag c in flag array hl.
; If checking a flag, check flag array d:hl unless d is 0. ; If checking a flag, check flag array d:hl unless d is 0.

2
engine/routines/newpokedexentry.asm
View File

@ -1,4 +1,4 @@
NewPokedexEntry: ; fb877 Predef_NewPokedexEntry: ; fb877
ld a, [hMapAnims] ld a, [hMapAnims]
push af push af
xor a xor a

2
engine/routines/placegraphic.asm
View File

@ -1,4 +1,4 @@
PlaceGraphic: ; 2ef6e Predef_PlaceGraphic: ; 2ef6e
; Fill wBoxAlignment-aligned box width b height c ; Fill wBoxAlignment-aligned box width b height c
; with iterating tile starting from hGraphicStartTile at hl. ; with iterating tile starting from hGraphicStartTile at hl.
; Predef $13 ; Predef $13

2
engine/routines/placewaitingtext.asm
View File

@ -11,7 +11,7 @@ PlaceWaitingText:: ; 4000
jr .proceed jr .proceed
.notinbattle .notinbattle
predef LinkTextboxPredef predef Predef_LinkTextbox
.proceed .proceed
hlcoord 4, 11 hlcoord 4, 11

6
engine/routines/trademonfrontpic.asm
View File

@ -4,13 +4,13 @@ GetTrademonFrontpic: ; 4d7fd
ld de, vTiles2 ld de, vTiles2
push de push de
push af push af
predef GetUnownLetter predef Predef_GetUnownLetter
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
pop de pop de
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
ret ret
AnimateTrademonFrontpic: ; 4d81e AnimateTrademonFrontpic: ; 4d81e
@ -34,5 +34,5 @@ AnimateTrademonFrontpic: ; 4d81e
hlcoord 7, 2 hlcoord 7, 2
ld d, $0 ld d, $0
ld e, ANIM_MON_TRADE ld e, ANIM_MON_TRADE
predef AnimateFrontpic predef Predef_AnimateFrontpic
ret ret

4
engine/scripting.asm
View File

@ -1437,7 +1437,7 @@ Script_startbattle:
; script command 0x5f ; script command 0x5f
call BufferScreen call BufferScreen
predef StartBattle predef Predef_StartBattle
ld a, [wBattleResult] ld a, [wBattleResult]
and $3f and $3f
ld [ScriptVar], a ld [ScriptVar], a
@ -2506,7 +2506,7 @@ Script_giveegg:
ld [CurPartySpecies], a ld [CurPartySpecies], a
call GetScriptByte call GetScriptByte
ld [CurPartyLevel], a ld [CurPartyLevel], a
farcall GiveEgg farcall Predef_GiveEgg
ret nc ret nc
ld a, 2 ld a, 2
ld [ScriptVar], a ld [ScriptVar], a

2
engine/sgb_layouts.asm
View File

@ -1,4 +1,4 @@
LoadSGBLayout: ; 864c Predef_LoadSGBLayout: ; 864c
call CheckCGB call CheckCGB
jp nz, LoadSGBLayoutCGB jp nz, LoadSGBLayoutCGB

6
engine/specials.asm
View File

@ -70,9 +70,9 @@ SpecialsPointers:: ; c029
add_special Special_FadeBlackQuickly add_special Special_FadeBlackQuickly
add_special Special_FadeInPalettes add_special Special_FadeInPalettes
add_special Special_FadeInQuickly add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes add_special ReloadSpritesNoPalettes ; bank 0
add_special ClearBGPalettes ; bank 0 add_special ClearBGPalettes ; bank 0
add_special Special_UpdateTimePals add_special UpdateTimePals ; bank 0
add_special ClearTileMap ; bank 0 add_special ClearTileMap ; bank 0
add_special UpdateSprites ; bank 0 add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; bank 0 add_special ReplaceKrisSprite ; bank 0
@ -214,7 +214,7 @@ Special_GameCornerPrizeMonCheckDex: ; c230
call FadeToMenu call FadeToMenu
ld a, [ScriptVar] ld a, [ScriptVar]
ld [wd265], a ld [wd265], a
farcall NewPokedexEntry farcall Predef_NewPokedexEntry
call ExitAllMenus call ExitAllMenus
ret ret
; c252 ; c252

28
engine/start_menu.asm
View File

@ -25,12 +25,12 @@ StartMenu:: ; 125cd
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall LoadFonts_NoOAMUpdate farcall LoadFonts_NoOAMUpdate
call .DrawBugContestStatus call .DrawBugContestStatus
call Special_UpdateTimePals call UpdateTimePals
jr .Select jr .Select
.Reopen: .Reopen:
call UpdateSprites call UpdateSprites
call Special_UpdateTimePals call UpdateTimePals
call .SetUpMenuItems call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer] ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
@ -78,7 +78,7 @@ StartMenu:: ; 125cd
call ExitMenu call ExitMenu
.ReturnEnd2: .ReturnEnd2:
call CloseText call CloseText
call Special_UpdateTimePals call UpdateTimePals
ret ret
.GetInput: .GetInput:
@ -593,7 +593,7 @@ HasNoItems: ; 129d5
TossItemFromPC: ; 129f4 TossItemFromPC: ; 129f4
push de push de
call PartyMonItemName call Predef_PartyMonItemName
farcall _CheckTossableItem farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
@ -616,7 +616,7 @@ TossItemFromPC: ; 129f4
pop hl pop hl
ld a, [CurItemQuantity] ld a, [CurItemQuantity]
call TossItem call TossItem
call PartyMonItemName call Predef_PartyMonItemName
ld hl, .TossedThisMany ld hl, .TossedThisMany
call MenuTextBox call MenuTextBox
call ExitMenu call ExitMenu
@ -668,7 +668,7 @@ CantUseItemText: ; 12a67
; 12a6c ; 12a6c
PartyMonItemName: ; 12a6c Predef_PartyMonItemName: ; 12a6c
ld a, [CurItem] ld a, [CurItem]
ld [wd265], a ld [wd265], a
call GetItemName call GetItemName
@ -862,7 +862,7 @@ GiveTakePartyMonItem: ; 12b60
TryGiveItemToPartymon: ; 12bd9 TryGiveItemToPartymon: ; 12bd9
call SpeechTextBox call SpeechTextBox
call PartyMonItemName call Predef_PartyMonItemName
call GetPartyItemLocation call GetPartyItemLocation
ld a, [hl] ld a, [hl]
and a and a
@ -1225,7 +1225,7 @@ OpenPartyStats: ; 12e00
xor a xor a
ld [MonType], a ld [MonType], a
call LowVolume call LowVolume
predef StatsScreenInit predef Predef_StatsScreenInit
call MaxVolume call MaxVolume
call Call_ExitMenu call Call_ExitMenu
ld a, 0 ld a, 0
@ -1792,7 +1792,7 @@ SetUpMoveScreenBG: ; 13172
hlcoord 5, 1 hlcoord 5, 1
call PlaceString call PlaceString
push bc push bc
farcall CopyPkmnToTempMon farcall Predef_CopyPkmnToTempMon
pop hl pop hl
call PrintLevel call PrintLevel
ld hl, PlayerHPPal ld hl, PlayerHPPal
@ -1809,7 +1809,7 @@ SetUpMoveList: ; 131ef
ld [hBGMapMode], a ld [hBGMapMode], a
ld [wMoveSwapBuffer], a ld [wMoveSwapBuffer], a
ld [MonType], a ld [MonType], a
predef CopyPkmnToTempMon predef Predef_CopyPkmnToTempMon
ld hl, TempMonMoves ld hl, TempMonMoves
ld de, wListMoves_MoveIndicesBuffer ld de, wListMoves_MoveIndicesBuffer
ld bc, NUM_MOVES ld bc, NUM_MOVES
@ -1817,9 +1817,9 @@ SetUpMoveList: ; 131ef
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [Buffer1], a ld [Buffer1], a
hlcoord 2, 3 hlcoord 2, 3
predef ListMoves predef Predef_ListMoves
hlcoord 10, 4 hlcoord 10, 4
predef ListMovePP predef Predef_ListMovePP
call WaitBGMap call WaitBGMap
call SetPalettes call SetPalettes
ld a, [wNumMoves] ld a, [wNumMoves]
@ -1863,7 +1863,7 @@ PlaceMoveData: ; 13256
ld a, [CurMove] ld a, [CurMove]
ld b, a ld b, a
hlcoord 2, 12 hlcoord 2, 12
predef PrintMoveType predef Predef_PrintMoveType
ld a, [CurMove] ld a, [CurMove]
dec a dec a
ld hl, Moves + MOVE_POWER ld hl, Moves + MOVE_POWER
@ -1886,7 +1886,7 @@ PlaceMoveData: ; 13256
.description .description
hlcoord 1, 14 hlcoord 1, 14
predef PrintMoveDesc predef Predef_PrintMoveDesc
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret

36
engine/stats_screen.asm
View File

@ -1,14 +1,14 @@
BattleStatsScreenInit: ; 4dc7b (13:5c7b) BattleStatsScreenInit: ; 4dc7b (13:5c7b)
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
jr nz, StatsScreenInit jr nz, Predef_StatsScreenInit
ld a, [wBattleMode] ld a, [wBattleMode]
and a and a
jr z, StatsScreenInit jr z, Predef_StatsScreenInit
jr _MobileStatsScreenInit jr _MobileStatsScreenInit
StatsScreenInit: ; 4dc8a Predef_StatsScreenInit: ; 4dc8a
ld hl, StatsScreenMain ld hl, StatsScreenMain
jr StatsScreenInit_gotaddress jr StatsScreenInit_gotaddress
@ -234,7 +234,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
jr .done jr .done
.breedmon .breedmon
farcall CopyPkmnToTempMon farcall Predef_CopyPkmnToTempMon
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
cp EGG cp EGG
jr z, .done jr z, .done
@ -419,7 +419,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
ld a, [hli] ld a, [hli]
ld d, a ld d, a
ld e, [hl] ld e, [hl]
farcall ComputeHPBarPixels farcall Predef_ComputeHPBarPixels
ld hl, wCurHPPal ld hl, wCurHPPal
call SetHPPal call SetHPPal
ld b, SCGB_STATS_SCREEN_HP_PALS ld b, SCGB_STATS_SCREEN_HP_PALS
@ -429,7 +429,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
.PlaceGenderChar: ; 4df66 (13:5f66) .PlaceGenderChar: ; 4df66 (13:5f66)
push hl push hl
farcall GetGender farcall Predef_GetGender
pop hl pop hl
ret c ret c
ld a, "♂" ld a, "♂"
@ -540,7 +540,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
.PinkPage: ; 4e013 (13:6013) .PinkPage: ; 4e013 (13:6013)
hlcoord 0, 9 hlcoord 0, 9
ld b, $0 ld b, $0
predef DrawPlayerHP predef Predef_DrawPlayerHP
hlcoord 8, 9 hlcoord 8, 9
ld [hl], $41 ld [hl], $41
ld de, .Status_Type ld de, .Status_Type
@ -562,7 +562,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
hlcoord 6, 13 hlcoord 6, 13
push hl push hl
ld de, TempMonStatus ld de, TempMonStatus
predef PlaceStatusString predef Predef_PlaceStatusString
pop hl pop hl
jr nz, .done_status jr nz, .done_status
jr .StatusOK jr .StatusOK
@ -576,7 +576,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
call PlaceString call PlaceString
.done_status .done_status
hlcoord 1, 15 hlcoord 1, 15
predef PrintMonTypes predef Predef_PrintMonTypes
hlcoord 9, 8 hlcoord 9, 8
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
ld b, 10 ld b, 10
@ -610,7 +610,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
ld a, [TempMonLevel] ld a, [TempMonLevel]
ld b, a ld b, a
ld de, TempMonExp + 2 ld de, TempMonExp + 2
predef FillInExpBar predef Predef_FillInExpBar
hlcoord 10, 16 hlcoord 10, 16
ld [hl], $40 ld [hl], $40
hlcoord 19, 16 hlcoord 19, 16
@ -703,11 +703,11 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
hlcoord 8, 10 hlcoord 8, 10
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [Buffer1], a ld [Buffer1], a
predef ListMoves predef Predef_ListMoves
hlcoord 12, 11 hlcoord 12, 11
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [Buffer1], a ld [Buffer1], a
predef ListMovePP predef Predef_ListMovePP
ret ret
.GetItemName: ; 4e189 (13:6189) .GetItemName: ; 4e189 (13:6189)
@ -748,7 +748,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
jr nz, .BluePageVerticalDivider jr nz, .BluePageVerticalDivider
hlcoord 11, 8 hlcoord 11, 8
ld bc, 6 ld bc, 6
predef PrintTempMonStats predef Predef_PrintTempMonStats
ret ret
.PlaceOTInfo: ; 4e1cc (13:61cc) .PlaceOTInfo: ; 4e1cc (13:61cc)
@ -801,7 +801,7 @@ OTString: ; 4e222
StatsScreen_PlaceFrontpic: ; 4e226 (13:6226) StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
ld hl, TempMonDVs ld hl, TempMonDVs
predef GetUnownLetter predef Predef_GetUnownLetter
call StatsScreen_GetAnimationParam call StatsScreen_GetAnimationParam
jr c, .egg jr c, .egg
and a and a
@ -863,11 +863,11 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
ret c ret c
call StatsScreen_LoadTextBoxSpaceGFX call StatsScreen_LoadTextBoxSpaceGFX
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
hlcoord 0, 0 hlcoord 0, 0
ld d, $0 ld d, $0
ld e, ANIM_MON_MENU ld e, ANIM_MON_MENU
predef LoadMonAnimation predef Predef_LoadMonAnimation
ld hl, wcf64 ld hl, wcf64
set 6, [hl] set 6, [hl]
ret ret
@ -1067,11 +1067,11 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)
ld [wBoxAlignment], a ld [wBoxAlignment], a
call StatsScreen_LoadTextBoxSpaceGFX call StatsScreen_LoadTextBoxSpaceGFX
ld de, vTiles2 tile $00 ld de, vTiles2 tile $00
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
pop de pop de
hlcoord 0, 0 hlcoord 0, 0
ld d, $0 ld d, $0
predef LoadMonAnimation predef Predef_LoadMonAnimation
ld hl, wcf64 ld hl, wcf64
set 6, [hl] set 6, [hl]
ret ret

4
engine/tempmon.asm
View File

@ -1,4 +1,4 @@
CopyPkmnToTempMon: ; 5084a Predef_CopyPkmnToTempMon: ; 5084a
; gets the BaseData of a Pkmn ; gets the BaseData of a Pkmn
; and copys the PkmnStructure to TempMon ; and copys the PkmnStructure to TempMon
@ -51,7 +51,7 @@ _TempMonStatsCalculation: ; 50893
add hl, bc add hl, bc
push bc push bc
ld b, $1 ld b, $1
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop bc pop bc
ld hl, MON_HP ld hl, MON_HP
add hl, bc add hl, bc

2
engine/time_capsule_2.asm
View File

@ -18,7 +18,7 @@ ConvertMon_2to1: ; fb8f1
ret ret
; fb908 ; fb908
ConvertMon_1to2: ; fb908 Predef_ConvertMon_1to2: ; fb908
; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. ; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265.
push bc push bc
push hl push hl

4
engine/timeofdaypals.asm
View File

@ -98,7 +98,7 @@ _TimeOfDayPals:: ; 8c011
ld [rSVBK], a ld [rSVBK], a
; update palettes ; update palettes
call _Special_UpdateTimePals call _UpdateTimePals
call DelayFrame call DelayFrame
; successful change ; successful change
@ -112,7 +112,7 @@ _TimeOfDayPals:: ; 8c011
; 8c070 ; 8c070
_Special_UpdateTimePals:: ; 8c070 _UpdateTimePals:: ; 8c070
ld c, $9 ; normal ld c, $9 ; normal
call GetTimePalFade call GetTimePalFade
call DmgToCgbTimePals call DmgToCgbTimePals

6
engine/tmhm.asm
View File

@ -1,4 +1,4 @@
CanLearnTMHMMove: ; 11639 Predef_CanLearnTMHMMove: ; 11639
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
@ -23,7 +23,7 @@ CanLearnTMHMMove: ; 11639
ld b, CHECK_FLAG ld b, CHECK_FLAG
push de push de
ld d, 0 ld d, 0
predef FlagPredef predef Predef_Flag
pop de pop de
ret ret
@ -33,7 +33,7 @@ CanLearnTMHMMove: ; 11639
ret ret
; 1166a ; 1166a
GetTMHMMove: ; 1166a Predef_GetTMHMMove: ; 1166a
ld a, [wd265] ld a, [wd265]
dec a dec a
ld hl, TMHMMoves ld hl, TMHMMoves

16
engine/tmhm2.asm
View File

@ -38,7 +38,7 @@ ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7)
GetTMHMItemMove: ; 2c7b6 (b:47b6) GetTMHMItemMove: ; 2c7b6 (b:47b6)
call ConvertCurItemIntoCurTMHM call ConvertCurItemIntoCurTMHM
predef GetTMHMMove predef Predef_GetTMHMMove
ret ret
AskTeachTMHM: ; 2c7bf (b:47bf) AskTeachTMHM: ; 2c7bf (b:47bf)
@ -118,7 +118,7 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a
; 2c867 ; 2c867
TeachTMHM: ; 2c867 TeachTMHM: ; 2c867
predef CanLearnTMHMMove predef Predef_CanLearnTMHMMove
push bc push bc
ld a, [CurPartyMon] ld a, [CurPartyMon]
@ -141,7 +141,7 @@ TeachTMHM: ; 2c867
callfar KnowsMove callfar KnowsMove
jr c, .nope jr c, .nope
predef LearnMove predef Predef_LearnMove
ld a, b ld a, b
and a and a
jr z, .nope jr z, .nope
@ -258,11 +258,11 @@ TMHM_ShowTMMoveDescription: ; 2c946 (b:4946)
cp NUM_TMS + NUM_HMS + 1 cp NUM_TMS + NUM_HMS + 1
jr nc, TMHM_JoypadLoop jr nc, TMHM_JoypadLoop
ld [wd265], a ld [wd265], a
predef GetTMHMMove predef Predef_GetTMHMMove
ld a, [wd265] ld a, [wd265]
ld [CurSpecies], a ld [CurSpecies], a
hlcoord 1, 14 hlcoord 1, 14
call PrintMoveDesc call Predef_PrintMoveDesc
jp TMHM_JoypadLoop jp TMHM_JoypadLoop
TMHM_ChooseTMorHM: ; 2c974 (b:4974) TMHM_ChooseTMorHM: ; 2c974 (b:4974)
@ -386,7 +386,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2)
pop af pop af
ld [wd265], a ld [wd265], a
.okay .okay
predef GetTMHMMove predef Predef_GetTMHMMove
ld a, [wd265] ld a, [wd265]
ld [wPutativeTMHMMove], a ld [wPutativeTMHMMove], a
call GetMoveName call GetMoveName
@ -451,7 +451,7 @@ Unreferenced_Function2ca95: ; 2ca95
pop hl pop hl
ld bc, 3 ld bc, 3
add hl, bc add hl, bc
predef GetTMHMMove predef Predef_GetTMHMMove
ld a, [wd265] ld a, [wd265]
ld [wPutativeTMHMMove], a ld [wPutativeTMHMMove], a
call GetMoveName call GetMoveName
@ -572,7 +572,7 @@ CountTMsHMs: ; 2cb2a (b:4b2a)
ld [wd265], a ld [wd265], a
ret ret
PrintMoveDesc: ; 2cb3e Predef_PrintMoveDesc: ; 2cb3e
push hl push hl
ld hl, MoveDescriptions ld hl, MoveDescriptions
ld a, [CurSpecies] ld a, [CurSpecies]

10
engine/trade_animation.asm
View File

@ -1,4 +1,4 @@
TradeAnimation: ; 28f24 Predef_TradeAnimation: ; 28f24
xor a xor a
ld [wcf66], a ld [wcf66], a
ld hl, wPlayerTrademonSenderName ld hl, wPlayerTrademonSenderName
@ -49,7 +49,7 @@ TradeAnimation: ; 28f24
tradeanim_scroll_out_right tradeanim_scroll_out_right
tradeanim_end tradeanim_end
TradeAnimationPlayer2: ; 28f63 Predef_TradeAnimationPlayer2: ; 28f63
xor a xor a
ld [wcf66], a ld [wcf66], a
ld hl, wOTTrademonSenderName ld hl, wOTTrademonSenderName
@ -871,13 +871,13 @@ TradeAnim_AnimateFrontpic: ; 29487
TradeAnim_GetFrontpic: ; 29491 TradeAnim_GetFrontpic: ; 29491
push de push de
push af push af
predef GetUnownLetter predef Predef_GetUnownLetter
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
pop de pop de
predef GetMonFrontpic predef Predef_GetMonFrontpic
ret ret
; 294a9 ; 294a9
@ -911,7 +911,7 @@ TradeAnim_ShowFrontpic: ; 294c3
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
call WaitBGMap call WaitBGMap
ret ret

2
engine/trainer_card.asm
View File

@ -243,7 +243,7 @@ TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
lb bc, 5, 7 lb bc, 5, 7
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
predef PlaceGraphic predef Predef_PlaceGraphic
ret ret
; 252ec (9:52ec) ; 252ec (9:52ec)

10
engine/types.asm
View File

@ -1,4 +1,4 @@
PrintMonTypes: ; 5090d Predef_PrintMonTypes: ; 5090d
; Print one or both types of [CurSpecies] ; Print one or both types of [CurSpecies]
; on the stats screen at hl. ; on the stats screen at hl.
@ -24,7 +24,7 @@ PrintMonTypes: ; 5090d
.Print: .Print:
ld b, a ld b, a
jr PrintType jr Predef_PrintType
.hide_type_2 .hide_type_2
; Erase any type name that was here before. ; Erase any type name that was here before.
@ -40,7 +40,7 @@ PrintMonTypes: ; 5090d
; 5093a ; 5093a
PrintMoveType: ; 5093a Predef_PrintMoveType: ; 5093a
; Print the type of move b at hl. ; Print the type of move b at hl.
push hl push hl
@ -58,7 +58,7 @@ PrintMoveType: ; 5093a
ld b, a ld b, a
PrintType: ; 50953 Predef_PrintType: ; 50953
; Print type b at hl. ; Print type b at hl.
ld a, b ld a, b
@ -78,7 +78,7 @@ PrintType: ; 50953
; 50964 ; 50964
GetTypeName: ; 50964 Predef_GetTypeName: ; 50964
; Copy the name of type [wd265] to StringBuffer1. ; Copy the name of type [wd265] to StringBuffer1.
ld a, [wd265] ld a, [wd265]

12
gfx/load_pics.asm
View File

@ -1,4 +1,4 @@
GetUnownLetter: ; 51040 Predef_GetUnownLetter: ; 51040
; Return Unown letter in UnownLetter based on DVs at hl ; Return Unown letter in UnownLetter based on DVs at hl
; Take the middle 2 bits of each DV and place them in order: ; Take the middle 2 bits of each DV and place them in order:
@ -48,7 +48,7 @@ GetUnownLetter: ; 51040
ld [UnownLetter], a ld [UnownLetter], a
ret ret
GetMonFrontpic: ; 51077 Predef_GetMonFrontpic: ; 51077
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [CurSpecies], a ld [CurSpecies], a
call IsAPokemon call IsAPokemon
@ -60,7 +60,7 @@ GetMonFrontpic: ; 51077
ld [rSVBK], a ld [rSVBK], a
ret ret
GetAnimatedFrontpicPredef: ; 5108b Predef_GetAnimatedFrontpic: ; 5108b
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [CurSpecies], a ld [CurSpecies], a
call IsAPokemon call IsAPokemon
@ -195,7 +195,7 @@ LoadFrontpicTiles: ; 5114f
jr nz, .loop jr nz, .loop
ret ret
GetMonBackpic: ; 5116c Predef_GetMonBackpic: ; 5116c
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call IsAPokemon call IsAPokemon
ret c ret c
@ -311,7 +311,7 @@ Function511ec: ; 511ec
call FarDecompress call FarDecompress
ret ret
GetTrainerPic: ; 5120d Predef_GetTrainerPic: ; 5120d
ld a, [TrainerClass] ld a, [TrainerClass]
and a and a
ret z ret z
@ -353,7 +353,7 @@ GetTrainerPic: ; 5120d
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
DecompressPredef: ; 5125d Predef_Decompress: ; 5125d
; Decompress lz data from b:hl to scratch space at 6:d000, then copy it to address de. ; Decompress lz data from b:hl to scratch space at 6:d000, then copy it to address de.
ld a, [rSVBK] ld a, [rSVBK]

9
home.asm
View File

@ -44,6 +44,7 @@ INCLUDE "home/game_time.asm"
INCLUDE "home/map.asm" INCLUDE "home/map.asm"
InexplicablyEmptyFunction:: ; 2d43 InexplicablyEmptyFunction:: ; 2d43
; unused
; Inexplicably empty. ; Inexplicably empty.
; Seen in PredefPointers. ; Seen in PredefPointers.
rept 16 rept 16
@ -710,7 +711,7 @@ GetSGBLayout:: ; 3340
ret z ret z
.sgb .sgb
predef_jump LoadSGBLayout predef_jump Predef_LoadSGBLayout
; 334e ; 334e
SetHPPal:: ; 334e SetHPPal:: ; 334e
@ -793,7 +794,7 @@ ScrollingMenu:: ; 350c
.UpdatePalettes: ; 3524 .UpdatePalettes: ; 3524
ld hl, VramState ld hl, VramState
bit 0, [hl] bit 0, [hl]
jp nz, Special_UpdateTimePals jp nz, UpdateTimePals
jp SetPalettes jp SetPalettes
; 352f ; 352f
@ -1073,12 +1074,12 @@ _PrepMonFrontpic:: ; 378b
push hl push hl
ld de, vTiles2 ld de, vTiles2
predef GetMonFrontpic predef Predef_GetMonFrontpic
pop hl pop hl
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
xor a xor a
ld [wBoxAlignment], a ld [wBoxAlignment], a
ret ret

4
home/battle.asm
View File

@ -130,8 +130,8 @@ RefreshBattleHuds:: ; 39c9
; 39d4 ; 39d4
UpdateBattleHuds:: ; 39d4 UpdateBattleHuds:: ; 39d4
farcall UpdatePlayerHUD farcall Predef_UpdatePlayerHUD
farcall UpdateEnemyHUD farcall Predef_UpdateEnemyHUD
ret ret
; 39e1 ; 39e1

2
home/init.asm
View File

@ -166,7 +166,7 @@ Init:: ; 17d
call DelayFrame call DelayFrame
predef InitSGBBorder ; SGB init predef Predef_InitSGBBorder ; SGB init
call MapSetup_Sound_Off call MapSetup_Sound_Off
xor a xor a

2
home/map.asm
View File

@ -2031,7 +2031,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
ld b, SCGB_MAPPALS ld b, SCGB_MAPPALS
call GetSGBLayout call GetSGBLayout
farcall LoadOW_BGPal7 farcall LoadOW_BGPal7
call Special_UpdateTimePals call UpdateTimePals
call DelayFrame call DelayFrame
ld a, $1 ld a, $1
ld [hMapAnims], a ld [hMapAnims], a

2
home/palettes.asm
View File

@ -319,7 +319,7 @@ ret_d90:: ; d90
; d91 ; d91
Special_ReloadSpritesNoPalettes:: ; d91 ReloadSpritesNoPalettes:: ; d91
ld a, [hCGB] ld a, [hCGB]
and a and a
ret z ret z

2
home/pokedex_flags.asm
View File

@ -31,7 +31,7 @@ CheckSeenMon:: ; 339b
PokedexFlagAction:: ; 33a1 PokedexFlagAction:: ; 33a1
ld d, 0 ld d, 0
predef FlagPredef predef Predef_Flag
ld a, c ld a, c
and a and a
ret ret

4
home/rtc.asm
View File

@ -18,7 +18,7 @@ TimeOfDayPals:: ; 47e
ret ret
; 485 ; 485
Special_UpdateTimePals:: ; 485 UpdateTimePals:: ; 485
callfar _Special_UpdateTimePals callfar _UpdateTimePals
ret ret
; 48c ; 48c

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -49,7 +49,7 @@ SSAquaGranddaughterBefore:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
applymovement PLAYER, MovementData_0x76004 applymovement PLAYER, MovementData_0x76004
moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -70,7 +70,7 @@ FastShipBed:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
special Special_TrainerRankings_Healings special Special_TrainerRankings_Healings
special HealParty special HealParty
playmusic MUSIC_HEAL playmusic MUSIC_HEAL

2
maps/MrPokemonsHouse.asm
View File

@ -111,7 +111,7 @@ MrPokemonsHouse_OakScript:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special Special_TrainerRankings_Healings special Special_TrainerRankings_Healings
special HealParty special HealParty

2
maps/RadioTower5F.asm
View File

@ -96,7 +96,7 @@ RadioTower5FRocketBossScene:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET
disappear RADIOTOWER5F_ROCKET_GIRL disappear RADIOTOWER5F_ROCKET_GIRL
pause 15 pause 15

2
maps/Route24.asm
View File

@ -29,7 +29,7 @@ RocketScript_0x1adbfa:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear ROUTE24_ROCKET disappear ROUTE24_ROCKET
pause 25 pause 25
special Special_FadeInQuickly special Special_FadeInQuickly

2
maps/Route26HealSpeechHouse.asm
View File

@ -15,7 +15,7 @@ TeacherScript_0x7b125:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
special Special_TrainerRankings_Healings special Special_TrainerRankings_Healings
playmusic MUSIC_HEAL playmusic MUSIC_HEAL
special HealParty special HealParty

2
maps/Route36NationalParkGate.asm
View File

@ -76,7 +76,7 @@ Route36NationalParkGate_MapScriptHeader:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
scall .CopyContestants scall .CopyContestants
disappear ROUTE36NATIONALPARKGATE_OFFICER1 disappear ROUTE36NATIONALPARKGATE_OFFICER1
appear ROUTE36NATIONALPARKGATE_OFFICER2 appear ROUTE36NATIONALPARKGATE_OFFICER2

2
maps/SilverCaveRoom3.asm
View File

@ -26,7 +26,7 @@ Red:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear SILVERCAVEROOM3_RED disappear SILVERCAVEROOM3_RED
pause 15 pause 15
special Special_FadeInQuickly special Special_FadeInQuickly

2
maps/SlowpokeWellB1F.asm
View File

@ -39,7 +39,7 @@ TrainerGruntM1:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET1
disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET2
disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET3

2
maps/SproutTower3F.asm
View File

@ -55,7 +55,7 @@ UnknownScript_0x184947:
closetext closetext
playsound SFX_WARP_TO playsound SFX_WARP_TO
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear SPROUTTOWER3F_SILVER disappear SPROUTTOWER3F_SILVER
waitsfx waitsfx
special Special_FadeInQuickly special Special_FadeInQuickly

2
maps/TeamRocketBaseB2F.asm
View File

@ -110,7 +110,7 @@ UnknownScript_0x6cfac:
waitbutton waitbutton
closetext closetext
special Special_FadeBlackQuickly special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes special ReloadSpritesNoPalettes
disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET1
disappear TEAMROCKETBASEB2F_ROCKET_GIRL disappear TEAMROCKETBASEB2F_ROCKET_GIRL
disappear TEAMROCKETBASEB2F_ROCKET2 disappear TEAMROCKETBASEB2F_ROCKET2

4
mobile/battle_tower_5c.asm
View File

@ -248,7 +248,7 @@ RunBattleTowerTrainer: ; 17024d
call ReadBTTrainerParty call ReadBTTrainerParty
call Clears5_a89a call Clears5_a89a
predef StartBattle predef Predef_StartBattle
farcall LoadPokemonData farcall LoadPokemonData
farcall HealParty farcall HealParty
@ -484,7 +484,7 @@ endr
ld hl, MON_STAT_EXP - 1 ld hl, MON_STAT_EXP - 1
add hl, bc add hl, bc
ld b, $1 ld b, $1
predef CalcPkmnStats predef Predef_CalcPkmnStats
pop de pop de
pop hl pop hl
dec de dec de

4
mobile/mobile_22.asm
View File

@ -1228,7 +1228,7 @@ Function897af: ; 897af
xor a xor a
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld de, vTiles2 tile $37 ld de, vTiles2 tile $37
farcall GetTrainerPic farcall Predef_GetTrainerPic
pop bc pop bc
ret ret
; 897d5 ; 897d5
@ -1260,7 +1260,7 @@ Function897d5: ; 897d5
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
hlcoord 12, 3 hlcoord 12, 3
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
call Function8963d call Function8963d
pop bc pop bc
ret ret

4
mobile/mobile_40.asm
View File

@ -1985,7 +1985,7 @@ Function100c74: ; 100c74
ld a, SCREEN_WIDTH * 2 ld a, SCREEN_WIDTH * 2
ld [Buffer1], a ld [Buffer1], a
hlcoord 2, 10 hlcoord 2, 10
predef ListMoves predef Predef_ListMoves
ret ret
; 100c98 ; 100c98
@ -6796,7 +6796,7 @@ Function102d48: ; 102d48
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
ld hl, PartyMon1DVs ld hl, PartyMon1DVs
call AddNTimes call AddNTimes
predef GetUnownLetter predef Predef_GetUnownLetter
farcall UpdateUnownDex farcall UpdateUnownDex
ld a, [wFirstUnownSeen] ld a, [wFirstUnownSeen]
and a and a

16
mobile/mobile_42.asm
View File

@ -290,26 +290,26 @@ MobileTradeAnim_ClearBGMap: ; 1081ca
MobileTradeAnim_GetFrontpic: ; 1081e9 MobileTradeAnim_GetFrontpic: ; 1081e9
push de push de
push af push af
predef GetUnownLetter predef Predef_GetUnownLetter
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
pop de pop de
predef GetMonFrontpic predef Predef_GetMonFrontpic
ret ret
; 108201 ; 108201
Function108201: ; 108201 Function108201: ; 108201
push de push de
push af push af
predef GetUnownLetter predef Predef_GetUnownLetter
pop af pop af
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
pop de pop de
predef GetAnimatedFrontpicPredef predef Predef_GetAnimatedFrontpic
ret ret
; 108219 ; 108219
@ -318,7 +318,7 @@ Function108219: ; 108219
hlcoord 7, 2 hlcoord 7, 2
ld d, $0 ld d, $0
ld e, ANIM_MON_TRADE ld e, ANIM_MON_TRADE
predef AnimateFrontpic predef Predef_AnimateFrontpic
ret ret
; 108229 ; 108229
@ -327,7 +327,7 @@ Function108229: ; 108229
hlcoord 7, 2 hlcoord 7, 2
ld d, $0 ld d, $0
ld e, ANIM_MON_TRADE ld e, ANIM_MON_TRADE
predef LoadMonAnimation predef Predef_LoadMonAnimation
ret ret
; 108239 ; 108239
@ -1238,7 +1238,7 @@ asm_108966
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
call WaitBGMap call WaitBGMap
ret ret
; 10898a ; 10898a
@ -1252,7 +1252,7 @@ Function10898a: ; 10898a
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef Predef_PlaceGraphic
call WaitBGMap call WaitBGMap
ret ret
; 1089a8 ; 1089a8

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