diff options
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 249 |
1 files changed, 126 insertions, 123 deletions
diff --git a/battle/core.asm b/battle/core.asm index 7e6eea9c6..eb73f77a2 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -7,7 +7,7 @@ DoBattle: ; 3c000 ld [wPlayerAction], a ld [BattleEnded], a inc a - ld [wd264], a + ld [wAISwitch], a ld hl, OTPartyMon1HP ld bc, PARTYMON_STRUCT_LENGTH - 1 ld d, BATTLEACTION_SWITCH1 - 1 @@ -60,7 +60,7 @@ DoBattle: ; 3c000 xor a ld [CurPartyMon], a .loop2 - call CheckIfPartyHasPkmnToBattleWith + call CheckIfCurPartyMonIsFitToFight jr nz, .alive2 ld hl, CurPartyMon inc [hl] @@ -170,7 +170,7 @@ BattleTurn: ; 3c12f xor a ld [wPlayerIsSwitching], a ld [wEnemyIsSwitching], a - ld [wd264], a + ld [wAISwitch], a ld [wPlayerJustGotFrozen], a ld [wEnemyJustGotFrozen], a ld [CurDamage], a @@ -273,7 +273,7 @@ HandleBetweenTurnEffects: ; 3c1d6 ret c jr .NoMoreFaintingConditions -.CheckEnemyFirst +.CheckEnemyFirst: call CheckFaint_EnemyThenPlayer ret c call HandleFutureSight @@ -289,7 +289,7 @@ HandleBetweenTurnEffects: ; 3c1d6 call CheckFaint_EnemyThenPlayer ret c -.NoMoreFaintingConditions +.NoMoreFaintingConditions: call HandleLeftovers call HandleMysteryberry call HanleDefrost @@ -310,7 +310,7 @@ CheckFaint_PlayerThenEnemy: ; 3c23c and a jr nz, .BattleIsOver -.PlayerNotFainted +.PlayerNotFainted: call HasEnemyFainted jr nz, .BattleContinues call HandleEnemyMonFaint @@ -318,11 +318,11 @@ CheckFaint_PlayerThenEnemy: ; 3c23c and a jr nz, .BattleIsOver -.BattleContinues +.BattleContinues: and a ret -.BattleIsOver +.BattleIsOver: scf ret ; 3c25c @@ -335,7 +335,7 @@ CheckFaint_EnemyThenPlayer: ; 3c25c and a jr nz, .BattleIsOver -.EnemyNotFainted +.EnemyNotFainted: call HasPlayerFainted jr nz, .BattleContinues call HandlePlayerMonFaint @@ -343,11 +343,11 @@ CheckFaint_EnemyThenPlayer: ; 3c25c and a jr nz, .BattleIsOver -.BattleContinues +.BattleContinues: and a ret -.BattleIsOver +.BattleIsOver: scf ret ; 3c27c @@ -565,7 +565,7 @@ DetermineMoveOrder: ; 3c314 ret ; 3c3f3 -.enemy_first: ; 3c3f3 +.enemy_first ; 3c3f3 and a ret ; 3c3f5 @@ -816,11 +816,11 @@ TryEnemyFlee: ; 3c543 call IsInArray jr c, .Flee -.Stay +.Stay: and a ret -.Flee +.Flee: scf ret ; 3c59a @@ -1218,7 +1218,7 @@ HandlePerishSong: ; 3c801 call SetEnemyTurn jp .do_it -.EnemyFirst +.EnemyFirst: call SetEnemyTurn call .do_it call SetPlayerTurn @@ -1287,7 +1287,7 @@ HandleWrap: ; 3c874 call SetEnemyTurn jp .do_it -.EnemyFirst +.EnemyFirst: call SetEnemyTurn call .do_it call SetPlayerTurn @@ -1359,7 +1359,7 @@ HandleLeftovers: ; 3c8eb call SetEnemyTurn jp .do_it -.DoEnemyFirst +.DoEnemyFirst: call SetEnemyTurn call .do_it call SetPlayerTurn @@ -1409,7 +1409,7 @@ HandleMysteryberry: ; 3c93c call SetEnemyTurn jp .do_it -.DoEnemyFirst +.DoEnemyFirst: call SetEnemyTurn call .do_it call SetPlayerTurn @@ -1667,7 +1667,7 @@ HandleSafeguard: ; 3cafb .player1 call .CheckEnemy -.CheckPlayer +.CheckPlayer: ld a, [PlayerScreens] bit SCREENS_SAFEGUARD, a ret z @@ -1679,7 +1679,7 @@ HandleSafeguard: ; 3cafb xor a jr .print -.CheckEnemy +.CheckEnemy: ld a, [EnemyScreens] bit SCREENS_SAFEGUARD, a ret z @@ -1703,10 +1703,10 @@ HandleScreens: ; 3cb36 call .CheckPlayer jr .CheckEnemy -.Both +.Both: call .CheckEnemy -.CheckPlayer +.CheckPlayer: call SetPlayerTurn ld de, .Your call .Copy @@ -1714,28 +1714,28 @@ HandleScreens: ; 3cb36 ld de, PlayerLightScreenCount jr .TickScreens -.CheckEnemy +.CheckEnemy: call SetEnemyTurn ld de, .Enemy call .Copy ld hl, EnemyScreens ld de, EnemyLightScreenCount -.TickScreens +.TickScreens: bit SCREENS_LIGHT_SCREEN, [hl] call nz, .LightScreenTick bit SCREENS_REFLECT, [hl] call nz, .ReflectTick ret -.Copy +.Copy: ld hl, StringBuffer1 jp CopyName2 ; 3cb75 -.Your +.Your: db "Your@" -.Enemy +.Enemy: db "Enemy@" ; 3cb80 @@ -1797,7 +1797,7 @@ HandleWeather: ; 3cb9e call .SandstormDamage call SetPlayerTurn -.SandstormDamage +.SandstormDamage: ld a, BATTLE_VARS_SUBSTATUS3 call GetBattleVar bit SUBSTATUS_UNDERGROUND, a @@ -1844,7 +1844,7 @@ HandleWeather: ; 3cb9e ld [Weather], a ret -.PrintWeatherMessage +.PrintWeatherMessage: ld a, [Weather] dec a ld c, a @@ -1857,11 +1857,11 @@ HandleWeather: ; 3cb9e jp StdBattleTextBox ; 3cc2d -.WeatherMessages +.WeatherMessages: dw BattleText_RainContinuesToFall dw BattleText_TheSunlightIsStrong dw BattleText_TheSandstormRages -.WeatherEndedMessages +.WeatherEndedMessages: dw BattleText_TheRainStopped dw BattleText_TheSunlightFaded dw BattleText_TheSandstormSubsided @@ -2497,7 +2497,7 @@ WinTrainerBattle: ; 3cfa4 call PrintWinLossText .skip_win_loss_text - jp HandleBattleReward + jp .GiveMoney .mobile call BattleWinSlideInEnemyTrainerFrontpic @@ -2524,9 +2524,8 @@ WinTrainerBattle: ; 3cfa4 call ClearTileMap call ClearBGPalettes ret -; 3d02b -HandleBattleReward: ; 3d02b +.GiveMoney: ld a, [wAmuletCoin] and a call nz, .DoubleReward @@ -2579,7 +2578,7 @@ HandleBattleReward: ; 3d02b ld l, a jp StdBattleTextBox -.KeepItAll +.KeepItAll: ld hl, GotMoneyForWinningText jp StdBattleTextBox ; 3d081 @@ -3024,7 +3023,7 @@ PickPartyMonInBattle: ; 3d33c call JumpToPartyMenuAndPrintText call SelectBattleMon ret c - call CheckIfPartyHasPkmnToBattleWith + call CheckIfCurPartyMonIsFitToFight jr z, .loop xor a ret @@ -3144,7 +3143,7 @@ LostBattle: ; 3d38e call SetPalettes jr .end -.LostLinkBattle +.LostLinkBattle: call UpdateEnemyMonInParty call CheckEnemyTrainerDefeated jr nz, .not_tied @@ -3203,13 +3202,13 @@ MonFaintedAnimation: ; 3d444 ld [wcfbe], a ld b, 7 -.OuterLoop +.OuterLoop: push bc push de push hl ld b, 6 -.InnerLoop +.InnerLoop: push bc push hl push de @@ -3247,7 +3246,7 @@ MonFaintedAnimation: ; 3d444 ret ; 3d488 -.Spaces +.Spaces: db " @" ; 3d490 @@ -3373,14 +3372,14 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533 .not_linked ld a, [wEnemySwitchMonIndex] and a - jr z, .check_wd264 + jr z, .check_wAISwitch dec a ld b, a jr .return_carry -.check_wd264 - ld a, [wd264] +.check_wAISwitch + ld a, [wAISwitch] and a ld b, $0 jr nz, .return_carry @@ -3656,7 +3655,7 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca ; 3d714 CheckWhetherToAskSwitch: ; 3d714 - ld a, [wd264] + ld a, [wAISwitch] dec a jp z, .return_nc ld a, [PartyCount] @@ -3836,19 +3835,19 @@ CheckPlayerPartyForFitPkmn: ; 3d873 xor a ld hl, PartyMon1HP ld bc, PartyMon2 - (PartyMon1 + 1) -.asm_3d87e +.loop or [hl] inc hl or [hl] add hl, bc dec e - jr nz, .asm_3d87e + jr nz, .loop ld d, a ret ; 3d887 -CheckIfPartyHasPkmnToBattleWith: ; 3d887 +CheckIfCurPartyMonIsFitToFight: ; 3d887 ld a, [CurPartyMon] ld hl, PartyMon1HP call GetPartyLocation @@ -3856,9 +3855,9 @@ CheckIfPartyHasPkmnToBattleWith: ; 3d887 or [hl] ret nz - ld a, [wd264] + ld a, [wAISwitch] and a - jr nz, .asm_3d8b1 + jr nz, .finish_fail ld hl, PartySpecies ld a, [CurPartyMon] ld c, a @@ -3867,14 +3866,14 @@ CheckIfPartyHasPkmnToBattleWith: ; 3d887 ld a, [hl] cp EGG ld hl, BattleText_AnEGGCantBattle - jr z, .asm_3d8ae + jr z, .print_textbox ld hl, BattleText_TheresNoWillToBattle -.asm_3d8ae +.print_textbox call StdBattleTextBox -.asm_3d8b1 +.finish_fail xor a ret ; 3d8b3 @@ -4501,6 +4500,8 @@ HandleHPHealingItem: ; 3dd2f ld hl, BattleMonMaxHP .go +; If, and only if, Pokemon's HP is less than half max, use the item. +; Store current HP in Buffer 3/4 push bc ld a, [de] ld [Buffer3], a @@ -4528,6 +4529,7 @@ HandleHPHealingItem: ; 3dd2f .less call ItemRecoveryAnim + ; store max HP in Buffer1/2 ld a, [hli] ld [Buffer2], a ld a, [hl] @@ -4653,7 +4655,7 @@ UseHeldStatusHealingItem: ; 3dde9 ret ; 3de44 -.Statuses ; 3de44 +.Statuses: ; 3de44 db HELD_HEAL_POISON, 1 << PSN db HELD_HEAL_FREEZE, 1 << FRZ db HELD_HEAL_BURN, 1 << BRN @@ -4777,7 +4779,7 @@ HandleStatBoostingHeldItems: ; 3de97 ret ; 3defc -.StatUpItems +.StatUpItems: dbw HELD_ATTACK_UP, BattleCommand_AttackUp dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp dbw HELD_SPEED_UP, BattleCommand_SpeedUp @@ -5345,18 +5347,18 @@ BattleMenuPKMN_Loop: jr z, .Cancel jr .loop -.PressedB +.PressedB: call CheckMobileBattleError jr c, .Cancel jr BattleMenuPKMN_Loop -.Stats +.Stats: call Battle_StatsScreen call CheckMobileBattleError jr c, .Cancel jp BattleMenuPKMN_ReturnFromStats -.Cancel +.Cancel: call ClearSprites call ClearPalettes call DelayFrame @@ -5434,7 +5436,7 @@ TryPlayerSwitch: ; 3e358 jp BattleMenuPKMN_Loop .try_switch - call CheckIfPartyHasPkmnToBattleWith + call CheckIfCurPartyMonIsFitToFight jp z, BattleMenuPKMN_Loop ld a, [CurBattleMon] ld [LastPlayerMon], a @@ -5675,15 +5677,15 @@ MoveSelectionScreen: ; 3e4bc ld c, $2c ld a, [wMoveSelectionMenuType] dec a - ld b, $c1 + ld b, D_DOWN | D_UP | A_BUTTON jr z, .okay dec a - ld b, $c3 + ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON jr z, .okay ld a, [wLinkMode] and a jr nz, .okay - ld b, $c7 + ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON | SELECT .okay ld a, b @@ -5727,6 +5729,7 @@ MoveSelectionScreen: ; 3e4bc bit SELECT_F, a jp nz, .pressed_select bit B_BUTTON_F, a + ; A button push af xor a @@ -5981,9 +5984,9 @@ MoveInfoBox: ; 3e6c8 ret ; 3e74f -.Disabled +.Disabled: db "Disabled!@" -.Type +.Type: db "TYPE/@" ; 3e75f @@ -6106,7 +6109,7 @@ ParseEnemyAction: ; 3e7c1 jp .finish .skip_encore - call CheckSubstatus_RechargeChargedRampageBideRollout + call CheckEnemyLockedIn jp nz, ResetVarsForSubstatusRage jr .continue @@ -6173,7 +6176,7 @@ ParseEnemyAction: ; 3e7c1 .skip_load call SetEnemyTurn callab UpdateMoveData - call CheckSubstatus_RechargeChargedRampageBideRollout + call CheckEnemyLockedIn jr nz, .raging xor a ld [wEnemyCharging], a @@ -6219,7 +6222,7 @@ ResetVarsForSubstatusRage: ; 3e8c1 ret ; 3e8d1 -CheckSubstatus_RechargeChargedRampageBideRollout: ; 3e8d1 +CheckEnemyLockedIn: ; 3e8d1 ld a, [EnemySubStatus4] and 1 << SUBSTATUS_RECHARGE ret nz @@ -6288,7 +6291,7 @@ LoadEnemyMon: ; 3e8eb jr .UpdateItem -.WildItem +.WildItem: ; In a wild battle, we pull from the item slots in BaseData ; Force Item1 @@ -6318,7 +6321,7 @@ LoadEnemyMon: ; 3e8eb ld a, [BaseItems+1] -.UpdateItem +.UpdateItem: ld [EnemyMonItem], a @@ -6344,7 +6347,7 @@ LoadEnemyMon: ; 3e8eb jp .Happiness -.InitDVs +.InitDVs: ; Trainer DVs @@ -6400,7 +6403,7 @@ LoadEnemyMon: ; 3e8eb jr .UpdateDVs -.NotRoaming +.NotRoaming: ; Register a contains BattleType ; Forced shiny battle type @@ -6412,14 +6415,14 @@ LoadEnemyMon: ; 3e8eb ld c, SPDSPCDV_SHINY ; $aa jr .UpdateDVs -.GenerateDVs +.GenerateDVs: ; Generate new random DVs call BattleRandom ld b, a call BattleRandom ld c, a -.UpdateDVs +.UpdateDVs: ; Input DVs in register bc ld hl, EnemyMonDVs ld a, b @@ -6450,7 +6453,7 @@ LoadEnemyMon: ; 3e8eb jr c, .GenerateDVs ; try again -.Magikarp +.Magikarp: ; Skimming this part recommended ld a, [TempEnemyMonSpecies] @@ -6485,7 +6488,7 @@ LoadEnemyMon: ; 3e8eb cp a, $40 jr nc, .GenerateDVs -.CheckMagikarpArea +.CheckMagikarpArea: ; The z checks are supposed to be nz ; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area) ; and routes 20 and 44 are treated as Lake of Rage @@ -6513,7 +6516,7 @@ LoadEnemyMon: ; 3e8eb ; Finally done with DVs -.Happiness +.Happiness: ; Set happiness ld a, BASE_HAPPINESS ld [EnemyMonHappiness], a @@ -6540,7 +6543,7 @@ LoadEnemyMon: ; 3e8eb bit SUBSTATUS_TRANSFORMED, a jp nz, .Moves -.TreeMon +.TreeMon: ; If we're headbutting trees, some monsters enter battle asleep call CheckSleepingTreeMon ld a, SLP ; Asleep for 7 turns @@ -6548,7 +6551,7 @@ LoadEnemyMon: ; 3e8eb ; Otherwise, no status xor a -.UpdateStatus +.UpdateStatus: ld hl, EnemyMonStatus ld [hli], a @@ -6578,7 +6581,7 @@ LoadEnemyMon: ; 3e8eb ld [EnemyMonHP + 1], a jr .Moves -.InitRoamHP +.InitRoamHP: ; HP only uses the lo byte in the RoamMon struct since ; Raikou/Entei/Suicune will have < 256 hp at level 40 ld a, [EnemyMonHP + 1] @@ -6586,7 +6589,7 @@ LoadEnemyMon: ; 3e8eb jr .Moves -.OpponentParty +.OpponentParty: ; Get HP from the party struct ld hl, (OTPartyMon1HP + 1) ld a, [CurPartyMon] @@ -6606,7 +6609,7 @@ LoadEnemyMon: ; 3e8eb ld [EnemyMonStatus], a -.Moves +.Moves: ld hl, BaseType1 ld de, EnemyMonType1 ld a, [hli] @@ -6629,7 +6632,7 @@ LoadEnemyMon: ; 3e8eb call CopyBytes jr .PP -.WildMoves +.WildMoves: ; Clear EnemyMonMoves xor a ld h, d @@ -6643,7 +6646,7 @@ endr ; Fill moves based on level predef FillMoves -.PP +.PP: ; Trainer battle? ld a, [wBattleMode] cp a, TRAINER_BATTLE @@ -6655,7 +6658,7 @@ endr predef FillPP jr .Finish -.TrainerPP +.TrainerPP: ; Copy PP from the party struct ld hl, OTPartyMon1PP ld a, [CurPartyMon] @@ -6664,7 +6667,7 @@ endr ld bc, NUM_MOVES call CopyBytes -.Finish +.Finish: ; Only the first five base stats are copied.. ld hl, BaseStats ld de, EnemyMonBaseStats @@ -6734,18 +6737,18 @@ CheckSleepingTreeMon: ; 3eb38 jr z, .Check ld hl, .Nite -.Check +.Check: ld a, [TempEnemyMonSpecies] ld de, 1 ; length of species id call IsInArray ; If it's a match, the opponent is asleep ret c -.NotSleeping +.NotSleeping: and a ret -.Nite +.Nite: db CATERPIE db METAPOD db BUTTERFREE @@ -6759,7 +6762,7 @@ CheckSleepingTreeMon: ; 3eb38 db AIPOM db -1 ; end -.Day +.Day: db VENONAT db HOOTHOOT db NOCTOWL @@ -6767,7 +6770,7 @@ CheckSleepingTreeMon: ; 3eb38 db HERACROSS db -1 ; end -.Morn +.Morn: db VENONAT db HOOTHOOT db NOCTOWL @@ -6824,22 +6827,22 @@ CheckUnownLetter: ; 3eb75 and a ret -.LetterSets +.LetterSets: dw .Set1 dw .Set2 dw .Set3 dw .Set4 -.Set1 +.Set1: ; A B C D E F G H I J K db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff -.Set2 +.Set2: ; L M N O P Q R db 12, 13, 14, 15, 16, 17, 18, $ff -.Set3 +.Set3: ; S T U V W db 19, 20, 21, 22, 23, $ff -.Set4 +.Set4: ; X Y Z db 24, 25, 26, $ff @@ -7121,7 +7124,7 @@ ApplyStatLevelMultiplier: ; 3ecb7 ret ; 3ed2b -.StatLevelMultipliers +.StatLevelMultipliers: ; / db 25, 100 ; 25% db 28, 100 ; 28% @@ -7183,7 +7186,7 @@ BadgeStatBoosts: ; 3ed45 ld hl, BattleMonAttack ld c, 4 -.CheckBadge +.CheckBadge: ld a, b srl b call c, BoostStat @@ -7751,7 +7754,7 @@ GiveExperiencePoints: ; 3ee3b jp ResetBattleParticipants ; 3f0d4 -.EvenlyDivideExpAmongParticipants +.EvenlyDivideExpAmongParticipants: ; count number of battle participants ld a, [wBattleParticipantsNotFainted] ld b, a @@ -7875,7 +7878,7 @@ AnimateExpBar: ; 3f136 ld [hli], a ld [hl], a -.NoOverflow +.NoOverflow: ld d, MAX_LEVEL callab CalcExpAtLevel ld a, [hProduct + 1] @@ -7899,7 +7902,7 @@ AnimateExpBar: ; 3f136 ld a, d ld [hld], a -.AlreadyAtMaxExp +.AlreadyAtMaxExp: callab CalcLevel ld a, d pop bc @@ -7910,7 +7913,7 @@ AnimateExpBar: ; 3f136 ld a, e ld d, a -.LoopLevels +.LoopLevels: ld a, e cp MAX_LEVEL jr nc, .FinishExpBar @@ -7941,7 +7944,7 @@ AnimateExpBar: ; 3f136 ld b, $0 jr .LoopLevels -.FinishExpBar +.FinishExpBar: push bc ld b, d ld de, TempMonExp + 2 @@ -7961,7 +7964,7 @@ AnimateExpBar: ; 3f136 pop bc ret -.PlayExpBarSound +.PlayExpBarSound: push bc call WaitSFX ld de, SFX_EXP_BAR @@ -7971,7 +7974,7 @@ AnimateExpBar: ; 3f136 pop bc ret -.LoopBarAnimation +.LoopBarAnimation: ld d, 3 dec b .anim_loop @@ -8025,7 +8028,7 @@ SendOutPkmnText: ; 3f26d ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>" - ld a, [wd264] ; unless this (unidentified) variable is set + ld a, [wAISwitch] ; unless this (unidentified) variable is set and a jr nz, .skip_to_textbox @@ -8116,7 +8119,7 @@ WithdrawPkmnText: ; 3f2f4 ld hl, .WithdrawPkmnText jp BattleTextBox -.WithdrawPkmnText +.WithdrawPkmnText: text_jump Text_BattleMonNickComma start_asm ; Print text to withdraw Pkmn @@ -8482,7 +8485,7 @@ BattleIntro: ; 3f4dd ld [hMapAnims], a callba PlayBattleMusic callba ShowLinkBattleParticipants - callba FindFirstAliveMon + callba FindFirstAliveMonAndStartBattle call DisableSpriteUpdates callba ClearBattleRAM call InitEnemy @@ -8520,7 +8523,7 @@ LoadTrainerOrWildMonPic: ; 3f54e ld a, [TempWildMonSpecies] ld [CurPartySpecies], a -.Trainer +.Trainer: ld [TempEnemyMonSpecies], a ret ; 3f55e @@ -8870,11 +8873,11 @@ DetermineMobileBattleResult: ; 3f77c ret ; 3f7f7 -.Win +.Win: db "YOU WIN@" -.Lose +.Lose: db "YOU LOSE@" -.Draw +.Draw: db " DRAW@" ; 3f80f @@ -8889,7 +8892,7 @@ DetermineMobileBattleResult: ; 3f77c ret ; 3f821 -.Invalid +.Invalid: db "INVALID BATTLE@" ; 3f830 @@ -8977,7 +8980,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f call PrintNum jr .next -.PrintFormatString +.PrintFormatString: ld de, .Format call PlaceString .next @@ -8994,7 +8997,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f jr nz, .loop ret -.PrintBattleRecord +.PrintBattleRecord: hlcoord 1, 0 ld de, .Record call PlaceString @@ -9032,7 +9035,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f .quit ret -.PrintZerosIfNoSaveFileExists +.PrintZerosIfNoSaveFileExists: ld a, [wSavedAtLeastOnce] and a ret nz @@ -9042,18 +9045,18 @@ ReadAndPrintLinkBattleRecord: ; 3f85f ret ; 3f938 -.Scores +.Scores: db " 0 0 0@" ; 3f947 -.Format ; 3f947 +.Format: ; 3f947 db " --- <LNBRK>" db " - - -@" -.Record ; 3f964 +.Record: ; 3f964 db "<PLAYER>'s RECORD@" -.Result ; 3f96e +.Result: ; 3f96e db "RESULT WIN LOSE DRAW@" -.Total ; 3f983 +.Total: ; 3f983 db "TOTAL WIN LOSE DRAW@" ; 3f998 @@ -9469,12 +9472,12 @@ GetTrainerBackpic: ; 3fbff callba GetKrisBackpic ret -.Chris +.Chris: ; It's a boy. ld b, BANK(ChrisBackpic) ld hl, ChrisBackpic -.Decompress +.Decompress: ld de, VTiles2 tile $31 ld c, $31 predef DecompressPredef @@ -9600,7 +9603,7 @@ BattleStartMessage: ; 3fc8b ld hl, HookedPokemonAttackedText jr .PlaceBattleStartText -.NotFishing +.NotFishing: ld hl, PokemonFellFromTreeText cp BATTLETYPE_TREE jr z, .PlaceBattleStartText @@ -9609,7 +9612,7 @@ BattleStartMessage: ; 3fc8b jr z, .PlaceBattleStartText ld hl, WildPokemonAppearedText -.PlaceBattleStartText +.PlaceBattleStartText: push hl callba BattleStart_TrainerHuds pop hl |