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