Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some mystery gift functions

Browse Source
This commit is contained in:
pikalaxalt
2016-06-07 08:08:51 -04:00
parent d7a01e92e9
commit b0e7d04ccf
4 changed files with 115 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
battle/core.asm
View File

@@ -116,8 +116,6 @@ DoBattle: ; 3c000
jp BattleMenu jp BattleMenu
; 3c0e5 ; 3c0e5
WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5 WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
ld a, [wBattleResult] ld a, [wBattleResult]
@@ -160,7 +158,6 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
ret ret
; 3c12f ; 3c12f
BattleTurn: ; 3c12f BattleTurn: ; 3c12f
.loop .loop
call MobileFn_3c1bf call MobileFn_3c1bf
@@ -252,7 +249,6 @@ MobileFn_3c1bf: mobile
ret ret
; 3c1d6 ; 3c1d6
HandleBetweenTurnEffects: ; 3c1d6 HandleBetweenTurnEffects: ; 3c1d6
ld a, [hLinkPlayerNumber] ld a, [hLinkPlayerNumber]
cp $1 cp $1
@@ -769,7 +765,6 @@ HandleEncore: ; 3c4df
jp StdBattleTextBox jp StdBattleTextBox
; 3c543 ; 3c543
TryEnemyFlee: ; 3c543 TryEnemyFlee: ; 3c543
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
@@ -861,7 +856,6 @@ AlwaysFleeMons: ; 3c5b1
db -1 db -1
; 3c5b4 ; 3c5b4
CompareMovePriority: ; 3c5b4 CompareMovePriority: ; 3c5b4
; Compare the priority of the player and enemy's moves. ; Compare the priority of the player and enemy's moves.
; Return carry if the player goes first, or z if they match. ; Return carry if the player goes first, or z if they match.
@@ -915,7 +909,6 @@ MoveEffectPriorities: ; 3c5df
db -1 db -1
; 3c5ec ; 3c5ec
GetMoveEffect: ; 3c5ec GetMoveEffect: ; 3c5ec
ld a, b ld a, b
dec a dec a
@@ -928,7 +921,6 @@ GetMoveEffect: ; 3c5ec
ret ret
; 3c5fe ; 3c5fe
Battle_EnemyFirst: ; 3c5fe Battle_EnemyFirst: ; 3c5fe
call LoadTileMapToTempTileMap call LoadTileMapToTempTileMap
call TryEnemyFlee call TryEnemyFlee
@@ -1695,7 +1687,6 @@ HandleSafeguard: ; 3cafb
ld hl, BattleText_SafeguardFaded ld hl, BattleText_SafeguardFaded
jp StdBattleTextBox jp StdBattleTextBox
HandleScreens: ; 3cb36 HandleScreens: ; 3cb36
ld a, [hLinkPlayerNumber] ld a, [hLinkPlayerNumber]
cp 1 cp 1
@@ -1739,7 +1730,6 @@ HandleScreens: ; 3cb36
db "Enemy@" db "Enemy@"
; 3cb80 ; 3cb80
.LightScreenTick: ; 3cb80 .LightScreenTick: ; 3cb80
ld a, [de] ld a, [de]
dec a dec a
@@ -1878,7 +1868,6 @@ SubtractHPFromUser: ; 3cc3f
jp UpdateHPBarBattleHuds jp UpdateHPBarBattleHuds
; 3cc45 ; 3cc45
SubtractHP: ; 3cc45 SubtractHP: ; 3cc45
ld hl, BattleMonHP ld hl, BattleMonHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
@@ -1925,7 +1914,6 @@ GetSixteenthMaxHP: ; 3cc76
ret ret
; 3cc83 ; 3cc83
GetEighthMaxHP: ; 3cc83 GetEighthMaxHP: ; 3cc83
; output: bc ; output: bc
call GetQuarterMaxHP call GetQuarterMaxHP
@@ -1941,7 +1929,6 @@ GetEighthMaxHP: ; 3cc83
ret ret
; 3cc8e ; 3cc8e
GetQuarterMaxHP: ; 3cc8e GetQuarterMaxHP: ; 3cc8e
; output: bc ; output: bc
call GetMaxHP call GetMaxHP
@@ -1962,7 +1949,6 @@ GetQuarterMaxHP: ; 3cc8e
ret ret
; 3cc9f ; 3cc9f
GetHalfMaxHP: ; 3cc9f GetHalfMaxHP: ; 3cc9f
; output: bc ; output: bc
call GetMaxHP call GetMaxHP
@@ -1980,7 +1966,6 @@ GetHalfMaxHP: ; 3cc9f
ret ret
; 3ccac ; 3ccac
GetMaxHP: ; 3ccac GetMaxHP: ; 3ccac
; output: bc, Buffer1-2 ; output: bc, Buffer1-2
@@ -2036,7 +2021,6 @@ CheckUserHasEnoughHP: ; 3ccde
ret ret
; 3ccef ; 3ccef
RestoreHP ; 3ccef RestoreHP ; 3ccef
ld hl, EnemyMonMaxHP ld hl, EnemyMonMaxHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
@@ -2349,8 +2333,6 @@ IsAnyMonHoldingExpShare: ; 3ceaa
ret ret
; 3ceec ; 3ceec
StopDangerSound: ; 3ceec StopDangerSound: ; 3ceec
xor a xor a
ld [Danger], a ld [Danger], a
@@ -2622,7 +2604,6 @@ WinTrainerBattle: ; 3cfa4
dw SentAllToMomText dw SentAllToMomText
; 3d0b1 ; 3d0b1
.CheckMaxedOutMomMoney: ; 3d0b1 .CheckMaxedOutMomMoney: ; 3d0b1
ld hl, wMomsMoney + 2 ld hl, wMomsMoney + 2
ld a, [hld] ld a, [hld]
@@ -2705,8 +2686,6 @@ PlayVictoryMusic: ; 3d0ea
ret ret
; 3d123 ; 3d123
; These functions check if the current opponent is a gym leader or one of a ; These functions check if the current opponent is a gym leader or one of a
; few other special trainers. ; few other special trainers.
@@ -2760,7 +2739,6 @@ KantoGymLeaders:
db BLUE db BLUE
db -1 db -1
HandlePlayerMonFaint: ; 3d14e HandlePlayerMonFaint: ; 3d14e
call FaintYourPokemon call FaintYourPokemon
ld hl, EnemyMonHP ld hl, EnemyMonHP
@@ -2961,7 +2939,6 @@ PlayerPartyMonEntrance: ; 3d2b3
jp SpikesDamage jp SpikesDamage
; 3d2e0 ; 3d2e0
CheckMobileBattleError: ; 3d2e0 CheckMobileBattleError: ; 3d2e0
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
@@ -3060,7 +3037,6 @@ ForcePickPartyMonInBattle: ; 3d362
jr .pick jr .pick
; 3d375 ; 3d375
PickSwitchMonInBattle: ; 3d375 PickSwitchMonInBattle: ; 3d375
.pick .pick
call PickPartyMonInBattle call PickPartyMonInBattle
@@ -3085,7 +3061,6 @@ ForcePickSwitchMonInBattle: ; 3d380
ret ret
; 3d38e ; 3d38e
LostBattle: ; 3d38e LostBattle: ; 3d38e
ld a, 1 ld a, 1
ld [BattleEnded], a ld [BattleEnded], a
@@ -3182,7 +3157,6 @@ LostBattle: ; 3d38e
ret ret
; 3d432 ; 3d432
EnemyMonFaintedAnimation: ; 3d432 EnemyMonFaintedAnimation: ; 3d432
hlcoord 12, 5 hlcoord 12, 5
decoord 12, 6 decoord 12, 6
@@ -3250,7 +3224,6 @@ MonFaintedAnimation: ; 3d444
db " @" db " @"
; 3d490 ; 3d490
SlideBattlePicOut: ; 3d490 SlideBattlePicOut: ; 3d490
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ld c, a ld c, a
@@ -3297,7 +3270,6 @@ SlideBattlePicOut: ; 3d490
ret ret
; 3d4c3 ; 3d4c3
ForceEnemySwitch: ; 3d4c3 ForceEnemySwitch: ; 3d4c3
call ResetEnemyBattleVars call ResetEnemyBattleVars
ld a, [wEnemySwitchMonIndex] ld a, [wEnemySwitchMonIndex]
@@ -3313,7 +3285,6 @@ ForceEnemySwitch: ; 3d4c3
ret ret
; 3d4e1 ; 3d4e1
EnemySwitch: ; 3d4e1 EnemySwitch: ; 3d4e1
call CheckWhetherToAskSwitch call CheckWhetherToAskSwitch
jr nc, EnemySwitch_SetMode jr nc, EnemySwitch_SetMode
@@ -3846,7 +3817,6 @@ CheckPlayerPartyForFitPkmn: ; 3d873
ret ret
; 3d887 ; 3d887
CheckIfCurPartyMonIsFitToFight: ; 3d887 CheckIfCurPartyMonIsFitToFight: ; 3d887
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMon1HP ld hl, PartyMon1HP
@@ -3878,7 +3848,6 @@ CheckIfCurPartyMonIsFitToFight: ; 3d887
ret ret
; 3d8b3 ; 3d8b3
TryToRunAwayFromBattle: ; 3d8b3 TryToRunAwayFromBattle: ; 3d8b3
; Run away from battle, with or without item ; Run away from battle, with or without item
ld a, [BattleType] ld a, [BattleType]
@@ -4068,7 +4037,6 @@ TryToRunAwayFromBattle: ; 3d8b3
ret ret
; 3da0d ; 3da0d
InitBattleMon: ; 3da0d InitBattleMon: ; 3da0d
ld a, MON_SPECIES ld a, MON_SPECIES
call GetPartyParamLocation call GetPartyParamLocation
@@ -4159,7 +4127,6 @@ ResetPlayerStatLevels: ; 3dab1
ret ret
; 3dabd ; 3dabd
InitEnemyMon: ; 3dabd InitEnemyMon: ; 3dabd
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, OTPartyMon1Species ld hl, OTPartyMon1Species
@@ -4213,7 +4180,6 @@ InitEnemyMon: ; 3dabd
ret ret
; 3db32 ; 3db32
SwitchPlayerMon: ; 3db32 SwitchPlayerMon: ; 3db32
call ClearSprites call ClearSprites
ld a, [CurBattleMon] ld a, [CurBattleMon]
@@ -4234,7 +4200,6 @@ SwitchPlayerMon: ; 3db32
ret ret
; 3db5f ; 3db5f
SendOutPlayerMon: ; 3db5f SendOutPlayerMon: ; 3db5f
ld hl, BattleMonDVs ld hl, BattleMonDVs
predef GetUnownLetter predef GetUnownLetter
@@ -4580,7 +4545,6 @@ UseOpponentItem:
jp StdBattleTextBox jp StdBattleTextBox
; 3ddc8 ; 3ddc8
ItemRecoveryAnim: ; 3ddc8 ItemRecoveryAnim: ; 3ddc8
push hl push hl
push de push de
@@ -4665,7 +4629,6 @@ UseHeldStatusHealingItem: ; 3dde9
db $ff db $ff
; 3de51 ; 3de51
UseConfusionHealingItem: ; 3de51 UseConfusionHealingItem: ; 3de51
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar call GetBattleVar
@@ -4790,7 +4753,6 @@ HandleStatBoostingHeldItems: ; 3de97
db $ff db $ff
; 3df12 ; 3df12
GetPartymonItem: ; 3df12 GetPartymonItem: ; 3df12
ld hl, PartyMon1Item ld hl, PartyMon1Item
ld a, [CurBattleMon] ld a, [CurBattleMon]
@@ -4824,8 +4786,6 @@ UpdateBattleHUDs: ; 3df2c
ret ret
; 3df48 ; 3df48
UpdatePlayerHUD:: ; 3df48 UpdatePlayerHUD:: ; 3df48
push hl push hl
push de push de
@@ -5383,35 +5343,42 @@ BattleMenuPKMN_Loop:
Battle_StatsScreen: ; 3e308 Battle_StatsScreen: ; 3e308
call DisableLCD call DisableLCD
ld hl, VTiles2 tile $31 ld hl, VTiles2 tile $31
ld de, VTiles0 ld de, VTiles0
ld bc, $0110 ld bc, $11 tiles
call CopyBytes call CopyBytes
ld hl, VTiles2 ld hl, VTiles2
ld de, VTiles0 tile $11 ld de, VTiles0 tile $11
ld bc, $31 tiles ld bc, $31 tiles
call CopyBytes call CopyBytes
call EnableLCD call EnableLCD
call ClearSprites call ClearSprites
call LowVolume call LowVolume
xor a ; PARTYMON xor a ; PARTYMON
ld [MonType], a ld [MonType], a
callba BattleStatsScreenInit callba BattleStatsScreenInit
call MaxVolume call MaxVolume
call DisableLCD call DisableLCD
ld hl, VTiles0 ld hl, VTiles0
ld de, VTiles2 tile $31 ld de, VTiles2 tile $31
ld bc, $11 tiles ld bc, $11 tiles
call CopyBytes call CopyBytes
ld hl, VTiles0 tile $11 ld hl, VTiles0 tile $11
ld de, VTiles2 ld de, VTiles2
ld bc, $31 tiles ld bc, $31 tiles
call CopyBytes call CopyBytes
call EnableLCD call EnableLCD
ret ret
; 3e358 ; 3e358
TryPlayerSwitch: ; 3e358 TryPlayerSwitch: ; 3e358
ld a, [CurBattleMon] ld a, [CurBattleMon]
ld d, a ld d, a
@@ -5566,7 +5533,6 @@ PassedBattleMonEntrance: ; 3e459
jp SpikesDamage jp SpikesDamage
; 3e489 ; 3e489
BattleMenu_Run: ; 3e489 BattleMenu_Run: ; 3e489
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
ld a, $3 ld a, $3
@@ -5583,7 +5549,6 @@ BattleMenu_Run: ; 3e489
jp BattleMenu jp BattleMenu
; 3e4a8 ; 3e4a8
CheckAmuletCoin: ; 3e4a8 CheckAmuletCoin: ; 3e4a8
ld a, [BattleMonItem] ld a, [BattleMonItem]
ld b, a ld b, a
@@ -5990,7 +5955,6 @@ MoveInfoBox: ; 3e6c8
db "TYPE/@" db "TYPE/@"
; 3e75f ; 3e75f
.PrintPP: ; 3e75f .PrintPP: ; 3e75f
hlcoord 5, 11 hlcoord 5, 11
ld a, [wLinkMode] ; What's the point of this check? ld a, [wLinkMode] ; What's the point of this check?
@@ -6060,8 +6024,6 @@ CheckPlayerHasUsableMoves: ; 3e786
ret ret
; 3e7c1 ; 3e7c1
ParseEnemyAction: ; 3e7c1 ParseEnemyAction: ; 3e7c1
ld a, [wEnemyIsSwitching] ld a, [wEnemyIsSwitching]
and a and a
@@ -6242,7 +6204,6 @@ LinkBattleSendReceiveAction: ; 3e8e4
ret ret
; 3e8eb ; 3e8eb
LoadEnemyMon: ; 3e8eb LoadEnemyMon: ; 3e8eb
; Initialize enemy monster parameters ; Initialize enemy monster parameters
; To do this we pull the species from TempEnemyMonSpecies ; To do this we pull the species from TempEnemyMonSpecies
@@ -6275,7 +6236,6 @@ LoadEnemyMon: ; 3e8eb
; Grab the BaseData for this species ; Grab the BaseData for this species
call GetBaseData call GetBaseData
; Let's get the item: ; Let's get the item:
; Is the item predetermined? ; Is the item predetermined?
@@ -6290,7 +6250,6 @@ LoadEnemyMon: ; 3e8eb
ld a, [hl] ld a, [hl]
jr .UpdateItem jr .UpdateItem
.WildItem: .WildItem:
; In a wild battle, we pull from the item slots in BaseData ; In a wild battle, we pull from the item slots in BaseData
@@ -6320,11 +6279,9 @@ LoadEnemyMon: ; 3e8eb
jr nc, .UpdateItem jr nc, .UpdateItem
ld a, [BaseItems+1] ld a, [BaseItems+1]
.UpdateItem: .UpdateItem:
ld [EnemyMonItem], a ld [EnemyMonItem], a
; Initialize DVs ; Initialize DVs
; If we're in a trainer battle, DVs are predetermined ; If we're in a trainer battle, DVs are predetermined
@@ -6346,7 +6303,6 @@ LoadEnemyMon: ; 3e8eb
ld [de], a ld [de], a
jp .Happiness jp .Happiness
.InitDVs: .InitDVs:
; Trainer DVs ; Trainer DVs
@@ -6359,7 +6315,6 @@ LoadEnemyMon: ; 3e8eb
dec a dec a
jr nz, .UpdateDVs jr nz, .UpdateDVs
; Wild DVs ; Wild DVs
; Here's where the fun starts ; Here's where the fun starts
@@ -6402,7 +6357,6 @@ LoadEnemyMon: ; 3e8eb
; We're done with DVs ; We're done with DVs
jr .UpdateDVs jr .UpdateDVs
.NotRoaming: .NotRoaming:
; Register a contains BattleType ; Register a contains BattleType
@@ -6429,16 +6383,13 @@ LoadEnemyMon: ; 3e8eb
ld [hli], a ld [hli], a
ld [hl], c ld [hl], c
; We've still got more to do if we're dealing with a wild monster ; We've still got more to do if we're dealing with a wild monster
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
jr nz, .Happiness jr nz, .Happiness
; Species-specfic: ; Species-specfic:
; Unown ; Unown
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
cp a, UNOWN cp a, UNOWN
@@ -6452,7 +6403,6 @@ LoadEnemyMon: ; 3e8eb
call CheckUnownLetter call CheckUnownLetter
jr c, .GenerateDVs ; try again jr c, .GenerateDVs ; try again
.Magikarp: .Magikarp:
; Skimming this part recommended ; Skimming this part recommended
@@ -6513,7 +6463,6 @@ LoadEnemyMon: ; 3e8eb
cp a, 1024 >> 8 cp a, 1024 >> 8
jr c, .GenerateDVs ; try again jr c, .GenerateDVs ; try again
; Finally done with DVs ; Finally done with DVs
.Happiness: .Happiness:
@@ -6588,7 +6537,6 @@ LoadEnemyMon: ; 3e8eb
ld [hl], a ld [hl], a
jr .Moves jr .Moves
.OpponentParty: .OpponentParty:
; Get HP from the party struct ; Get HP from the party struct
ld hl, (OTPartyMon1HP + 1) ld hl, (OTPartyMon1HP + 1)
@@ -6608,7 +6556,6 @@ LoadEnemyMon: ; 3e8eb
ld a, [hl] ; OTPartyMonStatus ld a, [hl] ; OTPartyMonStatus
ld [EnemyMonStatus], a ld [EnemyMonStatus], a
.Moves: .Moves:
ld hl, BaseType1 ld hl, BaseType1
ld de, EnemyMonType1 ld de, EnemyMonType1
@@ -6718,7 +6665,6 @@ LoadEnemyMon: ; 3e8eb
ret ret
; 3eb38 ; 3eb38
CheckSleepingTreeMon: ; 3eb38 CheckSleepingTreeMon: ; 3eb38
; Return carry if species is in the list ; Return carry if species is in the list
; for the current time of day ; for the current time of day
@@ -6779,7 +6725,6 @@ CheckSleepingTreeMon: ; 3eb38
db -1 ; end db -1 ; end
; 3eb75 ; 3eb75
CheckUnownLetter: ; 3eb75 CheckUnownLetter: ; 3eb75
; Return carry if the Unown letter hasn't been unlocked yet ; Return carry if the Unown letter hasn't been unlocked yet
@@ -6848,7 +6793,6 @@ CheckUnownLetter: ; 3eb75
; 3ebc7 ; 3ebc7
SwapBattlerLevels: ; 3ebc7 SwapBattlerLevels: ; 3ebc7
; unreferenced ; unreferenced
push bc push bc
@@ -6924,7 +6868,6 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
ret ret
; 3ec2c ; 3ec2c
ApplyStatusEffectOnPlayerStats: ; 3ec2c ApplyStatusEffectOnPlayerStats: ; 3ec2c
ld a, 1 ld a, 1
jr ApplyStatusEffectOnStats jr ApplyStatusEffectOnStats
@@ -7143,7 +7086,6 @@ ApplyStatLevelMultiplier: ; 3ecb7
db 4, 1 ; 400% db 4, 1 ; 400%
; 3ed45 ; 3ed45
BadgeStatBoosts: ; 3ed45 BadgeStatBoosts: ; 3ed45
; Raise BattleMon stats depending on which badges have been obtained. ; Raise BattleMon stats depending on which badges have been obtained.
@@ -7202,7 +7144,6 @@ BadgeStatBoosts: ; 3ed45
ret ret
; 3ed7c ; 3ed7c
BoostStat: ; 3ed7c BoostStat: ; 3ed7c
; Raise stat at hl by 1/8. ; Raise stat at hl by 1/8.
@@ -7235,7 +7176,6 @@ BoostStat: ; 3ed7c
ret ret
; 3ed9f ; 3ed9f
_LoadBattleFontsHPBar: ; 3ed9f _LoadBattleFontsHPBar: ; 3ed9f
callab LoadBattleFontsHPBar callab LoadBattleFontsHPBar
ret ret
@@ -7246,7 +7186,6 @@ _LoadHPBar: ; 3eda6
ret ret
; 3edad ; 3edad
LoadHPExpBarGFX: ; unreferenced LoadHPExpBarGFX: ; unreferenced
ld de, EnemyHPBarBorderGFX ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c ld hl, VTiles2 tile $6c
@@ -7262,7 +7201,6 @@ LoadHPExpBarGFX: ; unreferenced
jp Get2bpp jp Get2bpp
; 3edd1 ; 3edd1
EmptyBattleTextBox: ; 3edd1 EmptyBattleTextBox: ; 3edd1
ld hl, .empty ld hl, .empty
jp BattleTextBox jp BattleTextBox
@@ -7270,7 +7208,6 @@ EmptyBattleTextBox: ; 3edd1
db "@" db "@"
; 3edd8 ; 3edd8
_BattleRandom:: ; 3edd8 _BattleRandom:: ; 3edd8
; If the normal RNG is used in a link battle it'll desync. ; If the normal RNG is used in a link battle it'll desync.
; To circumvent this a shared PRNG is used instead. ; To circumvent this a shared PRNG is used instead.
@@ -7340,7 +7277,6 @@ _BattleRandom:: ; 3edd8
ret ret
; 3ee0f ; 3ee0f
Call_PlayBattleAnim_OnlyIfVisible: ; 3ee0f Call_PlayBattleAnim_OnlyIfVisible: ; 3ee0f
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar call GetBattleVar
@@ -7373,7 +7309,6 @@ FinishBattleAnim: ; 3ee27
ret ret
; 3ee3b ; 3ee3b
GiveExperiencePoints: ; 3ee3b GiveExperiencePoints: ; 3ee3b
; Give experience. ; Give experience.
; Don't give experience if linked or in the Battle Tower. ; Don't give experience if linked or in the Battle Tower.
@@ -7832,7 +7767,6 @@ TextJump_StringBuffer2ExpPoints: ; 3f131
db "@" db "@"
; 3f136 ; 3f136
AnimateExpBar: ; 3f136 AnimateExpBar: ; 3f136
push bc push bc
@@ -8019,8 +7953,6 @@ AnimateExpBar: ; 3f136
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
SendOutPkmnText: ; 3f26d SendOutPkmnText: ; 3f26d
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@@ -8083,7 +8015,6 @@ SendOutPkmnText: ; 3f26d
jp BattleTextBox jp BattleTextBox
; 3f2d1 ; 3f2d1
JumpText_GoPkmn: ; 3f2d1 JumpText_GoPkmn: ; 3f2d1
text_jump Text_GoPkmn text_jump Text_GoPkmn
start_asm start_asm
@@ -8197,7 +8128,6 @@ TextJump_ComeBack: ; 3f35b
db "@" db "@"
; 3f360 ; 3f360
HandleSafariAngerEatingStatus: ; unreferenced HandleSafariAngerEatingStatus: ; unreferenced
ld hl, wSafariMonEating ld hl, wSafariMonEating
ld a, [hl] ld a, [hl]
@@ -8230,7 +8160,6 @@ HandleSafariAngerEatingStatus: ; unreferenced
jp StdBattleTextBox jp StdBattleTextBox
; 3f390 ; 3f390
FillInExpBar: ; 3f390 FillInExpBar: ; 3f390
push hl push hl
call CalcExpBar call CalcExpBar
@@ -8447,7 +8376,6 @@ GetFrontpic_DoAnim: ; 3f4b4
ret ret
; 3f4c1 ; 3f4c1
StartBattle: ; 3f4c1 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
@@ -8467,14 +8395,12 @@ StartBattle: ; 3f4c1
ret ret
; 3f4d9 ; 3f4d9
_DoBattle: ; 3f4d9 _DoBattle: ; 3f4d9
; unreferenced ; unreferenced
call DoBattle call DoBattle
ret ret
; 3f4dd ; 3f4dd
BattleIntro: ; 3f4dd BattleIntro: ; 3f4dd
callba MobileFn_106050 ; mobile callba MobileFn_106050 ; mobile
call LoadTrainerOrWildMonPic call LoadTrainerOrWildMonPic
@@ -8702,7 +8628,6 @@ Function3f662: ; 3f662
ret ret
; 3f69e ; 3f69e
ExitBattle: ; 3f69e ExitBattle: ; 3f69e
call .HandleEndOfBattle call .HandleEndOfBattle
call CleanUpBattleRAM call CleanUpBattleRAM
@@ -8881,7 +8806,6 @@ DetermineMobileBattleResult: ; 3f77c
db " DRAW@" db " DRAW@"
; 3f80f ; 3f80f
.Mobile_InvalidBattle: ; 3f80f .Mobile_InvalidBattle: ; 3f80f
hlcoord 6, 8 hlcoord 6, 8
ld de, .Invalid ld de, .Invalid
@@ -8896,14 +8820,12 @@ DetermineMobileBattleResult: ; 3f77c
db "INVALID BATTLE@" db "INVALID BATTLE@"
; 3f830 ; 3f830
IsMobileBattle2: ; 3f830 IsMobileBattle2: ; 3f830
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
ret ret
; 3f836 ; 3f836
DisplayLinkRecord: ; 3f836 DisplayLinkRecord: ; 3f836
ld a, BANK(sLinkBattleStats) ld a, BANK(sLinkBattleStats)
call GetSRAMBank call GetSRAMBank
@@ -8925,7 +8847,6 @@ DisplayLinkRecord: ; 3f836
ret ret
; 3f85f ; 3f85f
ReadAndPrintLinkBattleRecord: ; 3f85f ReadAndPrintLinkBattleRecord: ; 3f85f
call ClearTileMap call ClearTileMap
call ClearSprites call ClearSprites
@@ -9060,7 +8981,6 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
db "TOTAL WIN LOSE DRAW@" db "TOTAL WIN LOSE DRAW@"
; 3f998 ; 3f998
BattleEnd_HandleRoamMons: ; 3f998 BattleEnd_HandleRoamMons: ; 3f998
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_ROAMING cp BATTLETYPE_ROAMING
@@ -9168,7 +9088,6 @@ GetRoamMonSpecies: ; 3fa31
ret ret
; 3fa42 ; 3fa42
AddLastMobileBattleToLinkRecord: ; 3fa42 AddLastMobileBattleToLinkRecord: ; 3fa42
ld hl, OTPlayerID ld hl, OTPlayerID
ld de, StringBuffer1 ld de, StringBuffer1
@@ -9449,7 +9368,6 @@ InitBattleDisplay: ; 3fb6c
ret ret
; 3fbff ; 3fbff
GetTrainerBackpic: ; 3fbff GetTrainerBackpic: ; 3fbff
; Load the player character's backpic (6x6) into VRAM starting from VTiles2 tile $31. ; Load the player character's backpic (6x6) into VRAM starting from VTiles2 tile $31.
@@ -9484,7 +9402,6 @@ GetTrainerBackpic: ; 3fbff
ret ret
; 3fc30 ; 3fc30
CopyBackpic: ; 3fc30 CopyBackpic: ; 3fc30
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@@ -9543,7 +9460,6 @@ CopyBackpic: ; 3fc30
ret ret
; 3fc8b ; 3fc8b
BattleStartMessage: ; 3fc8b BattleStartMessage: ; 3fc8b
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a

170
engine/mysterygift.asm
View File

@@ -2,13 +2,13 @@ DoMysteryGift: ; 1048ba (41:48ba)
call ClearTileMap call ClearTileMap
call ClearSprites call ClearSprites
call WaitBGMap call WaitBGMap
call Function105153 call InitMysteryGiftLayout
hlcoord 3, 8 hlcoord 3, 8
ld de, .String_PressAToLink_BToCancel ld de, .String_PressAToLink_BToCancel
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
callba Function2c642 callba PrepMysteryGiftDataToSend
call Function1050fb call MysteryGift_ClearTrainerData
ld a, $2 ld a, $2
ld [wca01], a ld [wca01], a
ld a, $14 ld a, $14
@@ -239,14 +239,16 @@ Function104a95: ; 104a95 (41:4a95)
di di
callba ClearChannels callba ClearChannels
call Function104d5e call Function104d5e
.loop2 .loop2
call Function104d96 call Function104d96
call Function104ddd call Function104ddd
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $10 cp $10
jp z, Function104bd0 jp z, Function104bd0
cp $6c cp $6c
jr nz, .loop2 jr nz, .loop2
ld a, [hPrintNum9] ld a, [hPrintNum9]
cp $2 cp $2
jr z, Function104b22 jr z, Function104b22
@@ -256,7 +258,8 @@ Function104a95: ; 104a95 (41:4a95)
jr nz, .ly_loop jr nz, .ly_loop
call Function104b49 call Function104b49
jp nz, Function104bd0 jp nz, Function104bd0
jr asm_104b0a jr Function104b0a
; Delay frame
.ly_loop .ly_loop
ld a, [rLY] ld a, [rLY]
cp $90 cp $90
@@ -264,12 +267,15 @@ Function104a95: ; 104a95 (41:4a95)
ld c, rRP % $100 ld c, rRP % $100
ld a, $c0 ld a, $c0
ld [$ff00+c], a ld [$ff00+c], a
ld b, $f0 ld b, 240 ; This might have been intended as a 4-second timeout buffer.
; However, it is reset with each frame.
.loop3 .loop3
push bc push bc
call Function105038 call MysteryGift_ReadJoypad
ld b, $2 ld b, $2
ld c, rRP % $100 ld c, rRP % $100
; Delay frame
.ly_loop2 .ly_loop2
ld a, [$ff00+c] ld a, [$ff00+c]
and b and b
@@ -284,24 +290,25 @@ Function104a95: ; 104a95 (41:4a95)
ld a, [rLY] ld a, [rLY]
cp $90 cp $90
jr c, .ly_loop3 jr c, .ly_loop3
ld a, b ld a, b
pop bc pop bc
dec b dec b
jr z, .loop2 jr z, .loop2 ; we never jump here
or a or a
jr nz, .loop2 jr nz, .loop2
ld a, [hMoneyTemp + 1] ; Check if we've pressed the B button
bit 1, a ld a, [hMGJoypadReleased]
bit B_BUTTON_F, a
jr z, .loop3 jr z, .loop3
ld a, $10 ld a, $10
ld [hPrintNum10], a ld [hMGStatusFlags], a
jp Function104bd0 jp Function104bd0
Function104b04: ; 104b04 (41:4b04) Function104b04: ; 104b04 (41:4b04)
call Function104b40 call Function104b40
jp nz, Function104bd0 jp nz, Function104bd0
Function104b0a: ; 104b0a (41:4b0a)
asm_104b0a: ; 104b0a (41:4b0a)
call Function104d38 call Function104d38
jp nz, Function104bd0 jp nz, Function104bd0
call Function104b88 call Function104b88
@@ -331,7 +338,7 @@ Function104b40: ; 104b40 (41:4b40)
Function104b49: ; 104b49 (41:4b49) Function104b49: ; 104b49 (41:4b49)
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
ld a, [hPrintNum1] ld a, [hPrintNum1]
@@ -346,7 +353,7 @@ Function104b49: ; 104b49 (41:4b49)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
call Function104d43 call Function104d43
@@ -357,7 +364,7 @@ Function104b49: ; 104b49 (41:4b49)
call Function104d56 call Function104d56
ret nz ret nz
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
@@ -369,7 +376,7 @@ Function104b88: ; 104b88 (41:4b88)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
call Function104d43 call Function104d43
@@ -379,7 +386,7 @@ Function104b88: ; 104b88 (41:4b88)
call Function104d56 call Function104d56
ret nz ret nz
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
ld a, [hPrintNum1] ld a, [hPrintNum1]
@@ -393,29 +400,29 @@ Function104b88: ; 104b88 (41:4b88)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
Function104bd0: ; 104bd0 (41:4bd0) Function104bd0: ; 104bd0 (41:4bd0)
nop nop
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $10 cp $10
jr z, .asm_104c18 jr z, .quit
cp $6c cp $6c
jr nz, .asm_104c18 jr nz, .quit
ld hl, wca01 ld hl, wca01
dec [hl] dec [hl]
jr z, .asm_104c18 jr z, .quit
ld hl, wMysteryGiftTrainerData ld hl, wMysteryGiftTrainerData
ld de, wMysteryGiftPartnerData ld de, wMysteryGiftPartnerData
ld bc, wMysteryGiftPartnerDataEnd - wMysteryGiftPartnerData ld bc, wMysteryGiftPartnerDataEnd - wMysteryGiftPartnerData
call CopyBytes call CopyBytes
ld a, [wMysteryGiftTrainerData] ld a, [wMysteryGiftTrainerData]
cp $3 cp $3
jr nc, .asm_104c18 jr nc, .quit
callba StagePartyDataForMysteryGift callba StagePartyDataForMysteryGift
call Function1050fb call MysteryGift_ClearTrainerData
ld a, $26 ld a, $26
ld [wca02], a ld [wca02], a
ld a, [hPrintNum9] ld a, [hPrintNum9]
@@ -424,12 +431,14 @@ Function104bd0: ; 104bd0 (41:4bd0)
call Function104d43 call Function104d43
jr nz, Function104bd0 jr nz, Function104bd0
jp Function104b04 jp Function104b04
.asm_104c10 .asm_104c10
call Function104d38 call Function104d38
jr nz, Function104bd0 jr nz, Function104bd0
jp Function104b22 jp Function104b22
.asm_104c18
ld a, [hPrintNum10] .quit
ld a, [hMGStatusFlags]
push af push af
call Function104da0 call Function104da0
xor a xor a
@@ -449,7 +458,7 @@ Function104c2d: ; 104c2d (41:4c2d)
.asm_104c37 .asm_104c37
call Function104d96 call Function104d96
call Function104ddd call Function104ddd
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $10 cp $10
jp z, Function104d1c jp z, Function104d1c
cp $6c cp $6c
@@ -485,7 +494,7 @@ Function104c8a: ; 104c8a (41:4c8a)
call Function104d56 call Function104d56
ret nz ret nz
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
ld a, [hPrintNum1] ld a, [hPrintNum1]
@@ -500,7 +509,7 @@ Function104c8a: ; 104c8a (41:4c8a)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
call Function104d43 call Function104d43
@@ -511,7 +520,7 @@ Function104c8a: ; 104c8a (41:4c8a)
call Function104d56 call Function104d56
ret nz ret nz
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
@@ -523,7 +532,7 @@ Function104cd2: ; 104cd2 (41:4cd2)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
call Function104d43 call Function104d43
@@ -533,7 +542,7 @@ Function104cd2: ; 104cd2 (41:4cd2)
call Function104d56 call Function104d56
ret nz ret nz
call Function105033 call Function105033
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret nz ret nz
ld a, [hPrintNum1] ld a, [hPrintNum1]
@@ -548,13 +557,13 @@ Function104cd2: ; 104cd2 (41:4cd2)
call Function104d4e call Function104d4e
ret nz ret nz
call Function10502e call Function10502e
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
Function104d1c: ; 104d1c (41:4d1c) Function104d1c: ; 104d1c (41:4d1c)
nop nop
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
push af push af
call Function104da0 call Function104da0
xor a xor a
@@ -569,33 +578,33 @@ Function104d1c: ; 104d1c (41:4d1c)
Function104d32: ; 104d32 (41:4d32) Function104d32: ; 104d32 (41:4d32)
ld a, $80 ld a, $80
ld [hPrintNum10], a ld [hMGStatusFlags], a
and a and a
ret ret
Function104d38: ; 104d38 (41:4d38) Function104d38: ; 104d38 (41:4d38)
call Function104d96 call Function104d96
call Function104e46 call Function104e46
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
Function104d43: ; 104d43 (41:4d43) Function104d43: ; 104d43 (41:4d43)
call Function104d96 call Function104d96
call Function104dfe call Function104dfe
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
Function104d4e: ; 104d4e (41:4d4e) Function104d4e: ; 104d4e (41:4d4e)
call Function104e93 call Function104e93
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
Function104d56: ; 104d56 (41:4d56) Function104d56: ; 104d56 (41:4d56)
call Function104f57 call Function104f57
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
cp $6c cp $6c
ret ret
@@ -704,19 +713,19 @@ Function104ddd: ; 104ddd (41:4ddd)
ld a, $1 ld a, $1
ld [hPrintNum9], a ld [hPrintNum9], a
.loop .loop
call Function105038 call MysteryGift_ReadJoypad
ld b, $2 ld b, $2
ld c, rRP % $100 ld c, rRP % $100
ld a, [hMoneyTemp + 1] ld a, [hMGJoypadReleased]
bit 1, a bit B_BUTTON_F, a
jr z, .next jr z, .next
ld a, $10 ld a, $10
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
.next .next
bit 0, a bit 0, a
jr nz, asm_104e3a jr nz, Function104e3a
ld a, [$ff00+c] ld a, [$ff00+c]
and b and b
jr nz, .loop jr nz, .loop
@@ -735,7 +744,7 @@ Function104dfe: ; 104dfe (41:4dfe)
call Function104da9 call Function104da9
jp z, Function104f42 jp z, Function104f42
ld a, $6c ld a, $6c
ld [hPrintNum10], a ld [hMGStatusFlags], a
ld d, $3d ld d, $3d
call Function104dd1 call Function104dd1
ld d, $5 ld d, $5
@@ -748,17 +757,17 @@ Function104dfe: ; 104dfe (41:4dfe)
call Function104dd1 call Function104dd1
ret ret
asm_104e3a: ; 104e3a (41:4e3a) Function104e3a: ; 104e3a (41:4e3a)
; Wait a random amount of time
call Random call Random
ld e, a ld e, a
and $f and $f
ld d, a ld d, a
.asm_104e41 .loop
dec de dec de
ld a, d ld a, d
or e or e
jr nz, .asm_104e41 jr nz, .loop
Function104e46: ; 104e46 (41:4e46) Function104e46: ; 104e46 (41:4e46)
ld a, $2 ld a, $2
ld [hPrintNum9], a ld [hPrintNum9], a
@@ -788,13 +797,13 @@ Function104e46: ; 104e46 (41:4e46)
ld d, $3d ld d, $3d
call Function104dd1 call Function104dd1
ld a, $6c ld a, $6c
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
Function104e8c: ; 104e8c (41:4e8c) Function104e8c: ; 104e8c (41:4e8c)
ld [rRP], a ld [rRP], a
ld a, $ff ld a, $ff
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
Function104e93: ; 104e93 (41:4e93) Function104e93: ; 104e93 (41:4e93)
@@ -824,7 +833,7 @@ Function104e93: ; 104e93 (41:4e93)
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand) ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
ld b, $2 ld b, $2
call Function104ed6 call Function104ed6
ld hl, hPrintNum10 ld hl, hMGStatusFlags
ld b, $1 ld b, $1
call Function104faf call Function104faf
ld a, [hPrintNum2] ld a, [hPrintNum2]
@@ -902,21 +911,21 @@ Function104ed6: ; 104ed6 (41:4ed6)
ret ret
Function104f42: ; 104f42 (41:4f42) Function104f42: ; 104f42 (41:4f42)
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
or $2 or $2
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
Function104f49: ; 104f49 (41:4f49) Function104f49: ; 104f49 (41:4f49)
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
or $1 or $1
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
Function104f50: ; 104f50 (41:4f50) Function104f50: ; 104f50 (41:4f50)
ld a, [hPrintNum10] ld a, [hMGStatusFlags]
or $80 or $80
ld [hPrintNum10], a ld [hMGStatusFlags], a
ret ret
Function104f57: ; 104f57 (41:4f57) Function104f57: ; 104f57 (41:4f57)
@@ -960,7 +969,7 @@ Function104f57: ; 104f57 (41:4f57)
push de push de
ld d, $3d ld d, $3d
call Function104dd1 call Function104dd1
ld hl, hPrintNum10 ld hl, hMGStatusFlags
ld b, $1 ld b, $1
call Function104ed6 call Function104ed6
pop de pop de
@@ -986,7 +995,7 @@ Function104faf: ; 104faf (41:4faf)
cpl cpl
ld b, a ld b, a
xor a xor a
ld [hMoneyTemp + 2], a ld [hMGJoypadPressed + 2], a
call Function104d86 call Function104d86
.asm_104fd2 .asm_104fd2
inc b inc b
@@ -1009,10 +1018,10 @@ Function104faf: ; 104faf (41:4faf)
bit 1, a bit 1, a
jr nz, .asm_104fe5 jr nz, .asm_104fe5
.asm_104fed .asm_104fed
ld a, [hMoneyTemp + 2] ld a, [hMGJoypadPressed + 2]
ld d, a ld d, a
ld a, [rTIMA] ld a, [rTIMA]
ld [hMoneyTemp + 2], a ld [hMGJoypadPressed + 2], a
sub d sub d
cp $12 cp $12
jr c, .asm_104ffd jr c, .asm_104ffd
@@ -1058,31 +1067,48 @@ Function105033: ; 105033 (41:5033)
ld b, $0 ld b, $0
jp Function104f57 jp Function104f57
Function105038: ; 105038 (41:5038) MysteryGift_ReadJoypad: ; 105038 (41:5038)
ld a, $20 ; We can only get four inputs at a time.
; We take d-pad first for no particular reason.
ld a, R_DPAD
ld [rJOYP], a ld [rJOYP], a
; Read twice to give the request time to take.
ld a, [rJOYP] ld a, [rJOYP]
ld a, [rJOYP] ld a, [rJOYP]
; The Joypad register output is in the lo nybble (inversed).
; We make the hi nybble of our new container d-pad input.
cpl cpl
and $f and $f
swap a swap a
; We'll keep this in b for now.
ld b, a ld b, a
ld a, $10
; Buttons make 8 total inputs (A, B, Select, Start).
; We can fit this into one byte.
ld a, R_BUTTONS
ld [rJOYP], a ld [rJOYP], a
; Wait for input to stabilize.
rept 6 rept 6
ld a, [rJOYP] ld a, [rJOYP]
endr endr
; Buttons take the lo nybble.
cpl cpl
and $f and $f
or b or b
ld c, a ld c, a
ld a, [hMoneyTemp] ; To get the delta we xor the last frame's input with the new one.
ld a, [hMGJoypadPressed]
xor c xor c
; Released this frame:
and c and c
ld [hMoneyTemp + 1], a ld [hMGJoypadReleased], a
; Pressed this frame:
ld a, c ld a, c
ld [hMoneyTemp], a ld [hMGJoypadPressed], a
ld a, $30 ld a, $30
; Reset the joypad register since we're done with it.
ld [rJOYP], a ld [rJOYP], a
ret ret
@@ -1179,7 +1205,7 @@ RestoreMysteryGift: ; 1050ea (41:50ea)
ld [de], a ld [de], a
jp CloseSRAM jp CloseSRAM
Function1050fb: ; 1050fb (41:50fb) MysteryGift_ClearTrainerData: ; 1050fb (41:50fb)
ld hl, wMysteryGiftTrainerData ld hl, wMysteryGiftTrainerData
xor a xor a
ld b, wMysteryGiftTrainerDataEnd - wMysteryGiftTrainerData ld b, wMysteryGiftTrainerDataEnd - wMysteryGiftTrainerData
@@ -1247,7 +1273,7 @@ StagePartyDataForMysteryGift: ; 10510b (41:510b)
ld [wca00], a ld [wca00], a
jp CloseSRAM jp CloseSRAM
Function105153: ; 105153 (41:5153) InitMysteryGiftLayout: ; 105153 (41:5153)
call ClearBGPalettes call ClearBGPalettes
call DisableLCD call DisableLCD
ld hl, MysteryGiftGFX ld hl, MysteryGiftGFX
@@ -1398,7 +1424,7 @@ Function105688: ; 105688 (41:5688)
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
call Function10578c call Function10578c
call Function1050fb call MysteryGift_ClearTrainerData
ld a, $24 ld a, $24
ld [wca02], a ld [wca02], a
ld a, [rIE] ld a, [rIE]

2
engine/mysterygift2.asm
View File

@@ -1,4 +1,4 @@
Function2c642: ; 2c642 (b:4642) PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
ld de, wMysteryGiftStaging ld de, wMysteryGiftStaging
ld a, $1 ld a, $1
ld [de], a ld [de], a

9
hram.asm
View File

@@ -69,6 +69,8 @@ hPrintNum8 EQU $ffba
hPrintNum9 EQU $ffbb hPrintNum9 EQU $ffbb
hPrintNum10 EQU $ffbc hPrintNum10 EQU $ffbc
hMGStatusFlags EQU $ffbc
hUsedSpriteIndex EQU $ffbd hUsedSpriteIndex EQU $ffbd
hUsedSpriteTile EQU $ffbe hUsedSpriteTile EQU $ffbe
hFFBF EQU $ffbf hFFBF EQU $ffbf
@@ -77,9 +79,12 @@ hFFC1 EQU $ffc1
hFFC2 EQU $ffc2 hFFC2 EQU $ffc2
hMoneyTemp EQU $ffc3 hMoneyTemp EQU $ffc3
hMGJoypadPressed EQU $ffc3
hMGJoypadReleased EQU $ffc4
hFFC6 EQU $ffc6 hFFC6 EQU $ffc6
hLYOverrideStart EQU $ffc7 hLYOverrideStart EQU $ffc7
hLYOverrideEnd EQU $ffc8 hLYOverrideEnd EQU $ffc8
hMobileReceive EQU $ffc9 hMobileReceive EQU $ffc9
hFFCA EQU $ffca hFFCA EQU $ffca
hLinkPlayerNumber EQU $ffcb hLinkPlayerNumber EQU $ffcb