mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Merge pull request #319 from JimB16/master
Added comments and changed labels (mainly for AI- and Battle-Functions)
This commit is contained in:
yenatch
commit
006d14640c
@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
|
||||
and a
|
||||
ret nz
|
||||
|
||||
callba Function3e8d1
|
||||
callba CheckSubstatus_RechargeChargedRampageBideRollout
|
||||
ret nz
|
||||
|
||||
ld a, [PlayerSubStatus5]
|
||||
@ -24,6 +24,7 @@ AI_SwitchOrTryItem: ; 38000
|
||||
ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers
|
||||
and a
|
||||
jr nz, .ok
|
||||
|
||||
ld a, [TrainerClass]
|
||||
dec a
|
||||
ld bc, 7
|
||||
|
||||
@ -176,7 +176,7 @@ AI_Types: ; 38635
|
||||
push de
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
pop de
|
||||
pop bc
|
||||
pop hl
|
||||
@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
|
||||
push hl
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
pop hl
|
||||
|
||||
; 60% chance to discourage this move if not very effective.
|
||||
@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d
|
||||
|
||||
push hl
|
||||
push bc
|
||||
callba Function347c8
|
||||
callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
pop bc
|
||||
@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8
|
||||
|
||||
ld a, $1
|
||||
ld [hBattleTurn], a
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a
|
||||
ld [hBattleTurn], a
|
||||
push hl
|
||||
callab EnemyAttackDamage
|
||||
callab BattleCommand62
|
||||
callab BattleCommand07
|
||||
callab BattleCommand_DamageCalcWithStats
|
||||
callab BattleCommand_CalcDamageTypeMultiplier
|
||||
pop hl
|
||||
ld a, [CurDamage + 1]
|
||||
ld c, a
|
||||
@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98
|
||||
xor a
|
||||
ld [hBattleTurn], a
|
||||
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e
|
||||
|
||||
; Calculate Hidden Power's type and base power based on enemy's DVs.
|
||||
callab HiddenPowerDamage
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
pop hl
|
||||
|
||||
; Discourage Hidden Power if not very effective.
|
||||
@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7
|
||||
|
||||
.asm_39400
|
||||
callab EnemyAttackDamage
|
||||
callab BattleCommand62
|
||||
callab BattleCommand07
|
||||
callab BattleCommand_DamageCalcWithStats
|
||||
callab BattleCommand_CalcDamageTypeMultiplier
|
||||
ret
|
||||
|
||||
.ConstantDamageEffects
|
||||
@ -3498,7 +3498,7 @@ AI_Status: ; 39453
|
||||
push de
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab Function347c8
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
pop de
|
||||
pop bc
|
||||
pop hl
|
||||
|
||||
392
battle/core.asm
392
battle/core.asm
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommand04 ; 34555
|
||||
dw BattleCommand05 ; 34631
|
||||
dw BattleCommand06 ; 352dc
|
||||
dw BattleCommand07 ; 346d2
|
||||
dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
|
||||
dw BattleCommand08 ; 34cfd
|
||||
dw BattleCommand09 ; 34d32
|
||||
dw BattleCommand0a ; 34eee
|
||||
@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommand5f ; 377ce
|
||||
dw BattleCommand60 ; 3784b
|
||||
dw BattleCommand61 ; 37874
|
||||
dw BattleCommand62 ; 35612
|
||||
dw BattleCommand_DamageCalcWithStats ; 35612 - 62
|
||||
dw BattleCommand63 ; 3790e
|
||||
dw BattleCommand64 ; 37939
|
||||
dw BattleCommand65 ; 37972
|
||||
@ -148,7 +148,7 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommand90 ; 34ecc
|
||||
dw BattleCommand91 ; 34fdb
|
||||
dw BattleCommand92 ; 34fd1
|
||||
dw BattleCommand93 ; 34ffd
|
||||
dw BattleCommand_SwitchTurn ; 34ffd - 93
|
||||
dw BattleCommand94 ; 36a82
|
||||
dw BattleCommand95 ; 37c1a
|
||||
dw BattleCommand96 ; 37c55
|
||||
@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommanda6 ; 365af
|
||||
dw BattleCommanda7 ; 365c3
|
||||
dw BattleCommanda8 ; 355b5
|
||||
dw BattleCommanda9 ; 355d5
|
||||
dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
|
||||
dw BattleCommandaa ; 37e80
|
||||
dw BattleCommandab ; 34f57
|
||||
dw BattleCommandac ; 3658f
|
||||
|
||||
@ -385,9 +385,9 @@ CantMove: ; 341f0
|
||||
|
||||
|
||||
Function34216: ; 34216
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call CantMove
|
||||
jp SwitchTurn
|
||||
jp BattleCommand_SwitchTurn
|
||||
; 3421f
|
||||
|
||||
|
||||
@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f
|
||||
ld hl, HurtItselfText
|
||||
call StdBattleTextBox
|
||||
call Function355dd
|
||||
call BattleCommand62
|
||||
call BattleCommand_DamageCalcWithStats
|
||||
call BattleCommand0a
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
@ -652,7 +652,7 @@ HitConfusion: ; 343a5
|
||||
ld [CriticalHit], a
|
||||
|
||||
call Function355dd
|
||||
call BattleCommand62
|
||||
call BattleCommand_DamageCalcWithStats
|
||||
call BattleCommand0a
|
||||
|
||||
xor a
|
||||
@ -1336,8 +1336,8 @@ BattleCommand4f: ; 346cd
|
||||
; 346d2
|
||||
|
||||
|
||||
BattleCommand07: ; 346d2
|
||||
; stab
|
||||
BattleCommand_CalcDamageTypeMultiplier: ; 346d2
|
||||
; STAB = Same Type Attack Bonus
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
call GetBattleVar
|
||||
cp STRUGGLE
|
||||
@ -1354,7 +1354,7 @@ BattleCommand07: ; 346d2
|
||||
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .go
|
||||
jr z, .go ; Who Attacks and who Defends
|
||||
|
||||
ld hl, EnemyMonType1
|
||||
ld a, [hli]
|
||||
@ -1512,7 +1512,7 @@ endr
|
||||
jr .TypesLoop
|
||||
|
||||
.end
|
||||
call Function347c8
|
||||
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
ld a, [wd265]
|
||||
ld b, a
|
||||
ld a, [TypeModifier]
|
||||
@ -1523,7 +1523,7 @@ endr
|
||||
; 347c8
|
||||
|
||||
|
||||
Function347c8: ; 347c8
|
||||
HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn: ; 347c8
|
||||
ld hl, EnemyMonType1
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
@ -1601,7 +1601,7 @@ Function347d3: ; 347d3
|
||||
|
||||
|
||||
BattleCommanda3: ; 34833
|
||||
call Function347c8
|
||||
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
ld a, [wd265]
|
||||
and a
|
||||
ld a, 10 ; 1.0
|
||||
@ -2874,8 +2874,7 @@ BattleCommand91_92: ; 34feb
|
||||
; 34ffd
|
||||
|
||||
|
||||
SwitchTurn: ; 34ffd
|
||||
BattleCommand93: ; 34ffd
|
||||
BattleCommand_SwitchTurn: ; 34ffd
|
||||
; switchturn
|
||||
|
||||
ld a, [hBattleTurn]
|
||||
@ -3248,7 +3247,7 @@ BattleCommand11: ; 351c0
|
||||
predef Functionc6e0
|
||||
call RefreshBattleHuds
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [FXAnimIDHi], a
|
||||
@ -3256,7 +3255,7 @@ BattleCommand11: ; 351c0
|
||||
ld [wc689], a
|
||||
ld a, $c2
|
||||
call Function37e44
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
jr .asm_3524d ; 3522f $1c
|
||||
|
||||
@ -3307,10 +3306,10 @@ BattleCommand12: ; 35250
|
||||
ret z
|
||||
ld [de], a
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
ld hl, RageBuildingText
|
||||
call StdBattleTextBox
|
||||
jp SwitchTurn
|
||||
jp BattleCommand_SwitchTurn
|
||||
; 3527b
|
||||
|
||||
|
||||
@ -3934,6 +3933,7 @@ BattleCommanda8: ; 355b5
|
||||
ld a, [wc72d]
|
||||
and a
|
||||
ret nz
|
||||
|
||||
jp PrintButItFailed
|
||||
; 355bd
|
||||
|
||||
@ -3954,14 +3954,14 @@ Function355bd: ; 355bd
|
||||
call GetPartyLocation
|
||||
pop bc
|
||||
ret
|
||||
; 355d5
|
||||
|
||||
|
||||
BattleCommanda9: ; 355d5
|
||||
BattleCommand_IfAttackMissedResetDamage: ; 355d5
|
||||
; clearmissdamage
|
||||
ld a, [AttackMissed]
|
||||
and a
|
||||
ret z
|
||||
|
||||
jp ResetDamage
|
||||
; 355dd
|
||||
|
||||
@ -4004,7 +4004,7 @@ endr
|
||||
; 35612
|
||||
|
||||
|
||||
BattleCommand62: ; 35612
|
||||
BattleCommand_DamageCalcWithStats: ; 35612
|
||||
; damagecalc
|
||||
|
||||
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
|
||||
@ -4138,12 +4138,12 @@ endr
|
||||
; Update CurDamage (capped at 997).
|
||||
ld hl, CurDamage
|
||||
ld b, [hl]
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
add b
|
||||
ld [$ffb6], a
|
||||
jr nc, .asm_356a5
|
||||
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
inc a
|
||||
ld [$ffb5], a
|
||||
and a
|
||||
@ -4397,22 +4397,22 @@ BattleCommand3f: ; 35726
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
ld a, [hl]
|
||||
jr nz, .asm_357f8
|
||||
jr nz, .notPlayersTurn
|
||||
|
||||
ld hl, wPlayerMoveStruct + MOVE_POWER
|
||||
ld [hl], a
|
||||
push hl
|
||||
call PlayerAttackDamage
|
||||
jr .asm_35800
|
||||
jr .notEnemysTurn
|
||||
|
||||
.asm_357f8
|
||||
.notPlayersTurn
|
||||
ld hl, wEnemyMoveStruct + MOVE_POWER
|
||||
ld [hl], a
|
||||
push hl
|
||||
call EnemyAttackDamage
|
||||
|
||||
.asm_35800
|
||||
call BattleCommand62
|
||||
.notEnemysTurn
|
||||
call BattleCommand_DamageCalcWithStats
|
||||
pop hl
|
||||
ld [hl], 1
|
||||
ret
|
||||
@ -4754,7 +4754,7 @@ BattleCommand44: ; 359e6
|
||||
cp CURSE_T
|
||||
jr z, .asm_35a50
|
||||
call AnimateCurrentMove
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
.asm_35a13
|
||||
call BattleRandom
|
||||
@ -4775,7 +4775,7 @@ BattleCommand44: ; 359e6
|
||||
push hl
|
||||
ld a, d
|
||||
ld [hl], a
|
||||
call Function347c8
|
||||
call HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
pop hl
|
||||
pop af
|
||||
ld [hl], a
|
||||
@ -4783,7 +4783,7 @@ BattleCommand44: ; 359e6
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
jr nc, .asm_35a13
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
ld a, [hl]
|
||||
ld [wd265], a
|
||||
@ -5457,13 +5457,13 @@ Function35de0: ; 35de0
|
||||
ld hl, SubFadedText
|
||||
call StdBattleTextBox
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call BattleCommanda7
|
||||
ld a, BATTLE_VARS_SUBSTATUS3
|
||||
call GetBattleVar
|
||||
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
|
||||
call z, Function37ec7
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
ld a, BATTLE_VARS_MOVE_EFFECT
|
||||
call GetBattleVarAddr
|
||||
@ -6539,15 +6539,15 @@ Function3641a: ; 3641a
|
||||
and a
|
||||
jr z, .Player
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call Function365d7
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
jr .end
|
||||
|
||||
.Player
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call Function365fd
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
.end
|
||||
ld a, 1
|
||||
and a
|
||||
@ -6828,7 +6828,7 @@ Function365d7: ; 365d7
|
||||
ld hl, BadgeStatBoosts
|
||||
call CallBattleCore
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
ld hl, Function3ec39
|
||||
call CallBattleCore
|
||||
@ -6836,7 +6836,7 @@ Function365d7: ; 365d7
|
||||
ld hl, Function3ec76
|
||||
call CallBattleCore
|
||||
|
||||
jp SwitchTurn
|
||||
jp BattleCommand_SwitchTurn
|
||||
; 365fd
|
||||
|
||||
|
||||
@ -6848,7 +6848,7 @@ Function365fd: ; 365fd
|
||||
ld a, $5
|
||||
call Function3661d
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
ld hl, Function3ec39
|
||||
call CallBattleCore
|
||||
@ -6856,7 +6856,7 @@ Function365fd: ; 365fd
|
||||
ld hl, Function3ec76
|
||||
call CallBattleCore
|
||||
|
||||
jp SwitchTurn
|
||||
jp BattleCommand_SwitchTurn
|
||||
; 3661d
|
||||
|
||||
|
||||
@ -7056,10 +7056,10 @@ BattleCommand3e: ; 3671a
|
||||
ld [de], a
|
||||
jr nz, .asm_3674c ; 36730 $1a
|
||||
res 1, [hl]
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call Function37962
|
||||
push af
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
pop af
|
||||
jr nz, .asm_3674c ; 3673f $b
|
||||
set 7, [hl]
|
||||
@ -7202,7 +7202,7 @@ BattleCommand23: ; 3680f
|
||||
ld a, [BattleType]
|
||||
cp BATTLETYPE_SHINY
|
||||
jp z, .asm_36969
|
||||
cp $9
|
||||
cp BATTLETYPE_TRAP
|
||||
jp z, .asm_36969
|
||||
cp BATTLETYPE_CELEBI
|
||||
jp z, .asm_36969
|
||||
@ -8823,10 +8823,10 @@ BattleCommand2c: ; 3713e
|
||||
call CallBattleCore
|
||||
.asm_371a9
|
||||
call AnimateCurrentMove
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
ld hl, Function3ccef
|
||||
call CallBattleCore
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call UpdateUserInParty
|
||||
call RefreshBattleHuds
|
||||
ld hl, RegainedHealthText
|
||||
@ -9500,7 +9500,7 @@ BattleCommand61: ; 37874
|
||||
push de
|
||||
.asm_3787d
|
||||
|
||||
call BattleCommand07
|
||||
call BattleCommand_CalcDamageTypeMultiplier
|
||||
|
||||
ld a, [wLinkMode]
|
||||
cp $3
|
||||
@ -9544,7 +9544,7 @@ BattleCommand61: ; 37874
|
||||
ld a, $3
|
||||
ld [wc689], a
|
||||
call AnimateCurrentMove
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
ld hl, AICheckPlayerMaxHP
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
@ -9557,18 +9557,18 @@ BattleCommand61: ; 37874
|
||||
|
||||
ld hl, GetQuarterMaxHP
|
||||
call CallBattleCore
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
ld hl, Function3ccef
|
||||
call CallBattleCore
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
ld hl, RegainedHealthText
|
||||
call StdBattleTextBox
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call UpdateOpponentInParty
|
||||
jr .asm_37904 ; 378f1 $11
|
||||
|
||||
.asm_378f3
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call Function37ed5
|
||||
jr nc, .asm_37904 ; 378f9 $9
|
||||
call AnimateFailedMove
|
||||
@ -9733,7 +9733,7 @@ BattleCommand67: ; 379c9
|
||||
call DelayFrames
|
||||
|
||||
; Transition into switchmon menu
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba Function3d2f7
|
||||
|
||||
callba ForcePickSwitchMonInBattle
|
||||
@ -9748,7 +9748,7 @@ BattleCommand67: ; 379c9
|
||||
call ClearBox
|
||||
ld b, 1
|
||||
call GetSGBLayout
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call BatonPass_LinkPlayerSwitch
|
||||
|
||||
; Mobile link battles handle entrances differently
|
||||
@ -9789,7 +9789,7 @@ BattleCommand67: ; 379c9
|
||||
call CallBattleCore
|
||||
ld a, 1
|
||||
ld [wd265], a
|
||||
ld hl, Function3ecab
|
||||
ld hl, ApplyStatLevelMultiplierOnAllStats
|
||||
call CallBattleCore
|
||||
|
||||
ld hl, SpikesDamage
|
||||
@ -9807,7 +9807,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
|
||||
ld a, 1
|
||||
ld [wd0ec], a
|
||||
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld hl, Function3e8e4
|
||||
call CallBattleCore
|
||||
call WriteBackup
|
||||
@ -9823,7 +9823,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
|
||||
and a
|
||||
ret z
|
||||
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld hl, Function3e8e4
|
||||
call CallBattleCore
|
||||
|
||||
@ -10094,11 +10094,11 @@ endr
|
||||
rst FarCall
|
||||
|
||||
call AnimateCurrentMove
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
callab Function3ccef
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call UpdateUserInParty
|
||||
|
||||
; 'regained health!'
|
||||
@ -10596,11 +10596,11 @@ Function37e54: ; 37e54
|
||||
push hl
|
||||
push de
|
||||
push bc
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
|
||||
callab PlayBattleAnim
|
||||
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
pop bc
|
||||
pop de
|
||||
pop hl
|
||||
|
||||
@ -44,10 +44,10 @@ BattleCommand54: ; 37588
|
||||
call AnimateCurrentMove
|
||||
ld a, $2
|
||||
call Function36532
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call BattleCommand8d
|
||||
call ResetMiss
|
||||
call SwitchTurn
|
||||
call BattleCommand_SwitchTurn
|
||||
call BattleCommand70
|
||||
call BattleCommand8c
|
||||
call ResetMiss
|
||||
|
||||
@ -187,7 +187,7 @@ Function109847:: ; 109847
|
||||
ld [hLCDStatCustom], a
|
||||
|
||||
call GetCreditsPalette
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [hVBlank]
|
||||
push af
|
||||
ld a, $5
|
||||
@ -447,7 +447,7 @@ endr
|
||||
xor a
|
||||
ld [wcf64], a ; frame
|
||||
call GetCreditsPalette
|
||||
call Function32f9 ; update hw pal registers
|
||||
call SetPalettes ; update hw pal registers
|
||||
jr .loop
|
||||
|
||||
.clear
|
||||
|
||||
@ -33,7 +33,7 @@ Function1dd709: ; 1dd709
|
||||
call WaitBGMap
|
||||
ld b, $8
|
||||
call GetSGBLayout
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
ret
|
||||
; 1dd760
|
||||
|
||||
@ -1034,9 +1034,11 @@ DoRepelStep: ; 96bd7
|
||||
ld a, [wRepelEffect]
|
||||
and a
|
||||
ret z
|
||||
|
||||
dec a
|
||||
ld [wRepelEffect], a
|
||||
ret nz
|
||||
|
||||
ld a, BANK(RepelWoreOffScript)
|
||||
ld hl, RepelWoreOffScript
|
||||
call CallScript
|
||||
|
||||
@ -164,7 +164,7 @@ MenuData2_0x1012c: ; 0x1012c
|
||||
|
||||
Jumptable_10137: ; 10137
|
||||
dw Function10159
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 1013b
|
||||
|
||||
MenuDataHeader_0x1013b: ; 0x1013b
|
||||
@ -186,7 +186,7 @@ MenuData2_0x10143: ; 0x10143
|
||||
Jumptable_10153: ; 10153
|
||||
dw Function10159
|
||||
dw Function103fd
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 10159
|
||||
|
||||
Function10159: ; 10159
|
||||
@ -330,7 +330,7 @@ Jumptable_1026a: ; 1026a
|
||||
dw Function103fd
|
||||
dw Function10364
|
||||
dw Function103c2
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 10274
|
||||
|
||||
MenuDataHeader_0x10274: ; 0x10274
|
||||
@ -354,7 +354,7 @@ Jumptable_10291: ; 10291
|
||||
dw Function10311
|
||||
dw Function103fd
|
||||
dw Function10364
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 10299
|
||||
|
||||
MenuDataHeader_0x10299: ; 0x10299
|
||||
@ -374,7 +374,7 @@ MenuData2_0x102a1: ; 0x102a1
|
||||
|
||||
Jumptable_102ac: ; 102ac
|
||||
dw Function10311
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 102b0
|
||||
|
||||
MenuDataHeader_0x102b0: ; 0x102b0
|
||||
@ -396,7 +396,7 @@ MenuData2_0x102b8: ; 0x102b8
|
||||
Jumptable_102c7: ; 102c7
|
||||
dw Function10311
|
||||
dw Function103c2
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 102cd
|
||||
|
||||
MenuDataHeader_0x102cd: ; 0x102cd
|
||||
@ -420,7 +420,7 @@ Jumptable_102ea: ; 102ea
|
||||
dw Function103fd
|
||||
dw Function10364
|
||||
dw Function103c2
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 102f2
|
||||
|
||||
MenuDataHeader_0x102f2: ; 0x102f2
|
||||
@ -442,7 +442,7 @@ MenuData2_0x102fa: ; 0x102fa
|
||||
Jumptable_1030b: ; 1030b
|
||||
dw Function103fd
|
||||
dw Function10364
|
||||
dw Function10492
|
||||
dw Function10492_ret
|
||||
; 10311
|
||||
|
||||
Function10311: ; 10311
|
||||
@ -484,7 +484,7 @@ Function10311: ; 10311
|
||||
call Function10a40
|
||||
ret
|
||||
.NoPokemon
|
||||
ld hl, UnknownText_0x10af8
|
||||
ld hl, TextJump_YouDontHaveAPkmn
|
||||
call Function10889
|
||||
ret
|
||||
|
||||
@ -602,16 +602,19 @@ Function103fd: ; 103fd
|
||||
callba WritePartyMenuTilemap
|
||||
callba PrintPartyMenuText
|
||||
call WaitBGMap
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
callba PartyMenuSelect
|
||||
jr c, .asm_10475
|
||||
|
||||
ld a, [CurPartySpecies]
|
||||
cp EGG
|
||||
jr nz, .asm_10453
|
||||
ld hl, UnknownText_0x1048d
|
||||
|
||||
ld hl, TextJump_AnEGGCantHoldAnItem
|
||||
call PrintText
|
||||
jr .asm_10427
|
||||
|
||||
.asm_10453
|
||||
ld a, [wJumptableIndex]
|
||||
push af
|
||||
@ -638,18 +641,18 @@ Function103fd: ; 103fd
|
||||
ret
|
||||
|
||||
Function10486: ; 10486 (4:4486)
|
||||
ld hl, UnknownText_0x10af8
|
||||
ld hl, TextJump_YouDontHaveAPkmn
|
||||
call Function10889
|
||||
ret
|
||||
; 1048d (4:448d)
|
||||
|
||||
UnknownText_0x1048d: ; 0x1048d
|
||||
TextJump_AnEGGCantHoldAnItem: ; 0x1048d
|
||||
; An EGG can't hold an item.
|
||||
text_jump UnknownText_0x1c0b7f
|
||||
text_jump Text_AnEGGCantHoldAnItem
|
||||
db "@"
|
||||
; 0x10492
|
||||
|
||||
Function10492: ; 10492
|
||||
Function10492_ret: ; 10492
|
||||
ret
|
||||
; 10493
|
||||
|
||||
@ -1517,7 +1520,7 @@ Function10a40: ; 10a40
|
||||
call WaitBGMap
|
||||
ld b, SCREEN_WIDTH
|
||||
call GetSGBLayout
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
ret
|
||||
; 10a4f
|
||||
@ -1660,9 +1663,9 @@ UnknownText_0x10af3: ; 0x10af3
|
||||
db "@"
|
||||
; 0x10af8
|
||||
|
||||
UnknownText_0x10af8: ; 0x10af8
|
||||
TextJump_YouDontHaveAPkmn: ; 0x10af8
|
||||
; You don't have a #MON!
|
||||
text_jump UnknownText_0x1c0c17
|
||||
text_jump Text_YouDontHaveAPkmn
|
||||
db "@"
|
||||
; 0x10afd
|
||||
|
||||
@ -1690,9 +1693,10 @@ UnknownText_0x10b0c: ; 0x10b0c
|
||||
db "@"
|
||||
; 0x10b11
|
||||
|
||||
UnknownText_0x10b11: ; 0x10b11
|
||||
; You can't use it in a battle.
|
||||
text_jump UnknownText_0x1c0c85
|
||||
TextJump_YouCantUseItInABattle: ; 0x10b11
|
||||
; Doesn't seem to be used anywhere
|
||||
; "You can't use it in a battle."
|
||||
text_jump Text_YouCantUseItInABattle
|
||||
db "@"
|
||||
; 0x10b16
|
||||
|
||||
|
||||
@ -38,11 +38,11 @@ PredefPointers:: ; 856b
|
||||
add_predef FillPP
|
||||
add_predef TryAddMonToParty
|
||||
add_predef Functionda96
|
||||
add_predef Functiondb3f ; $8
|
||||
add_predef SentGetPkmnIntoFromBox
|
||||
add_predef SentPkmnIntoBox
|
||||
add_predef GiveEgg
|
||||
add_predef Functionc6e0
|
||||
add_predef Functione167
|
||||
add_predef CalcPkmnStats
|
||||
add_predef Functione17b
|
||||
add_predef CanLearnTMHMMove
|
||||
add_predef GetTMHMMove
|
||||
@ -50,7 +50,7 @@ PredefPointers:: ; 856b
|
||||
add_predef PrintMoveDesc
|
||||
add_predef UpdatePlayerHUD
|
||||
add_predef FillBox
|
||||
add_predef Function3d873
|
||||
add_predef CheckPlayerPartyForFitPkmn
|
||||
add_predef UpdateEnemyHUD
|
||||
add_predef StartBattle
|
||||
add_predef FillInExpBar
|
||||
@ -61,7 +61,7 @@ PredefPointers:: ; 856b
|
||||
add_predef Function421e6
|
||||
add_predef Function28f63
|
||||
add_predef Function28f24
|
||||
add_predef Function5084a
|
||||
add_predef CopyPkmnToTempMon
|
||||
add_predef ListMoves ; $20
|
||||
add_predef Function50d2e
|
||||
add_predef Function50cdb
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Function14a1a: ; 14a1a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba Function5e9a
|
||||
call SpeechTextBox
|
||||
call UpdateSprites
|
||||
|
||||
@ -23,7 +23,7 @@ UnknownText_0x88013: ; 0x88013
|
||||
; 0x88018
|
||||
|
||||
Special_SelectApricornForKurt: ; 88018
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld c, $1
|
||||
xor a
|
||||
ld [wd0e4], a
|
||||
@ -52,7 +52,7 @@ Special_SelectApricornForKurt: ; 88018
|
||||
call Kurt_GiveUpSelectedQuantityOfSelectedApricorn
|
||||
|
||||
.done
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
ret
|
||||
; 88055
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ endr
|
||||
.AccessBankOfMom: ; 162a8
|
||||
ld hl, UnknownText_0x1665d
|
||||
call PrintText
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld hl, MenuDataHeader_0x166b5
|
||||
call CopyMenuDataHeader
|
||||
call InterpretMenu2
|
||||
@ -148,7 +148,7 @@ endr
|
||||
ld [hl], a
|
||||
ld a, $5
|
||||
ld [wcf64], a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function16517
|
||||
call Function1656b
|
||||
call Function16571
|
||||
@ -216,7 +216,7 @@ endr
|
||||
ld [hl], a
|
||||
ld a, $5
|
||||
ld [wcf64], a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function16512
|
||||
call Function1656b
|
||||
call Function16571
|
||||
|
||||
@ -19,7 +19,7 @@ MoveDeletion:
|
||||
jr z, .asm_2c5ca
|
||||
ld hl, UnknownText_0x2c5ea
|
||||
call PrintText
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba Function12f5b
|
||||
push af
|
||||
call Function2b74
|
||||
|
||||
28
home.asm
28
home.asm
@ -70,6 +70,7 @@ Function2ebb:: ; 2ebb
|
||||
ld a, [wc2cc]
|
||||
bit 1, a
|
||||
ret z
|
||||
|
||||
ld a, [hJoyDown]
|
||||
bit 1, a ; B_BUTTON
|
||||
ret
|
||||
@ -212,7 +213,8 @@ HideSprites:: ; 3016
|
||||
INCLUDE "home/copy2.asm"
|
||||
|
||||
|
||||
Function309d:: ; 309d
|
||||
LoadTileMapToTempTileMap:: ; 309d
|
||||
; Load TileMap into TempTileMap
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(w2_d000)
|
||||
@ -226,16 +228,17 @@ Function309d:: ; 309d
|
||||
ret
|
||||
; 30b4
|
||||
|
||||
Function30b4:: ; 30b4
|
||||
Call_LoadTempTileMapToTileMap:: ; 30b4
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
call Function30bf
|
||||
call LoadTempTileMapToTileMap
|
||||
ld a, 1
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
; 30bf
|
||||
|
||||
Function30bf:: ; 30bf
|
||||
LoadTempTileMapToTileMap:: ; 30bf
|
||||
; Load TempTileMap into TileMap
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(w2_d000)
|
||||
@ -682,11 +685,12 @@ endr
|
||||
; 32f9
|
||||
|
||||
|
||||
|
||||
Function32f9:: ; 32f9
|
||||
SetPalettes:: ; 32f9
|
||||
; Inits the Palettes
|
||||
; depending on the system the monochromes palettes or color palettes
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
jr nz, .asm_3309
|
||||
jr nz, .SetPalettesForGameBoyColor
|
||||
ld a, $e4
|
||||
ld [rBGP], a
|
||||
ld a, $d0
|
||||
@ -694,7 +698,7 @@ Function32f9:: ; 32f9
|
||||
ld [rOBP1], a
|
||||
ret
|
||||
|
||||
.asm_3309
|
||||
.SetPalettesForGameBoyColor
|
||||
push de
|
||||
ld a, $e4
|
||||
call DmgToCgbBGPals
|
||||
@ -965,10 +969,10 @@ GetPokemonName:: ; 343b
|
||||
ld h, 0
|
||||
ld l, a
|
||||
rept 2
|
||||
add hl, hl
|
||||
add hl, hl ; hl = hl * 4
|
||||
endr
|
||||
add hl, de
|
||||
add hl, hl
|
||||
add hl, de ; hl = (hl*4) + de
|
||||
add hl, hl ; hl = (5*hl) + (5*hl)
|
||||
ld de, PokemonNames
|
||||
add hl, de
|
||||
|
||||
@ -1165,7 +1169,7 @@ Function3524:: ; 3524
|
||||
ld hl, VramState
|
||||
bit 0, [hl]
|
||||
jp nz, UpdateTimePals
|
||||
jp Function32f9
|
||||
jp SetPalettes
|
||||
; 352f
|
||||
|
||||
Function352f:: ; 352f
|
||||
|
||||
@ -1957,7 +1957,7 @@ CheckStandingOnXYTrigger:: ; 2ae7
|
||||
FadeToMenu:: ; 2b29
|
||||
xor a
|
||||
ld [hBGMapMode], a
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba FadeBlackBGMap
|
||||
call ClearSprites
|
||||
call DisableSpriteUpdates
|
||||
@ -1969,14 +1969,14 @@ Function2b3c:: ; 2b3c
|
||||
call WhiteBGMap
|
||||
call Function2bae
|
||||
call UpdateSprites
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Functiond90
|
||||
jr Function2b5c
|
||||
; 2b4d
|
||||
|
||||
Function2b4d:: ; 2b4d
|
||||
call WhiteBGMap
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Function2bae
|
||||
call UpdateSprites
|
||||
call Functiond90
|
||||
|
||||
@ -52,7 +52,7 @@ MenuTextBoxBackup:: ; 1d67
|
||||
ret
|
||||
; 1d6e
|
||||
|
||||
Function1d6e:: ; 1d6e
|
||||
LoadMenuDataHeader_0x1d75:: ; 1d6e
|
||||
ld hl, MenuDataHeader_0x1d75
|
||||
call LoadMenuDataHeader
|
||||
ret
|
||||
@ -66,7 +66,7 @@ MenuDataHeader_0x1d75:: ; 1d75
|
||||
db 1 ; default option
|
||||
; 1d7d
|
||||
|
||||
Function1d7d:: ; 1d7d
|
||||
Call_ExitMenu:: ; 1d7d
|
||||
call ExitMenu
|
||||
ret
|
||||
; 1d81
|
||||
|
||||
@ -273,15 +273,15 @@ Function83b:: ; 83b
|
||||
; 862
|
||||
|
||||
Function862:: ; 862
|
||||
call Function309d
|
||||
call LoadTileMapToTempTileMap
|
||||
callab Function4000
|
||||
call Function87d
|
||||
jp Function30b4
|
||||
jp Call_LoadTempTileMapToTileMap
|
||||
; 871
|
||||
|
||||
|
||||
Function871:: ; 871
|
||||
call Function309d
|
||||
call LoadTileMapToTempTileMap
|
||||
callab Function4000
|
||||
jp Function87d
|
||||
; 87d
|
||||
|
||||
2
hram.asm
2
hram.asm
@ -87,7 +87,7 @@ hRandom EQU $ffe1
|
||||
hRandomAdd EQU $ffe1
|
||||
hRandomSub EQU $ffe2
|
||||
hSecondsBackup EQU $ffe3
|
||||
hBattleTurn EQU $ffe4
|
||||
hBattleTurn EQU $ffe4 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer
|
||||
hCGBPalUpdate EQU $ffe5
|
||||
hCGB EQU $ffe6
|
||||
hSGB EQU $ffe7
|
||||
|
||||
@ -705,7 +705,7 @@ endr
|
||||
ld a, [BattleType]
|
||||
cp BATTLETYPE_TUTORIAL
|
||||
ret z
|
||||
cp 2
|
||||
cp BATTLETYPE_DEBUG
|
||||
ret z
|
||||
cp BATTLETYPE_CONTEST
|
||||
jr z, .used_park_ball
|
||||
@ -1143,13 +1143,13 @@ Functionedce: ; edce
|
||||
ld de, MUSIC_CAPTURE
|
||||
call PlayMusic
|
||||
pop bc
|
||||
ld hl, UnknownText_0xede6
|
||||
ld hl, TextJump_Waitbutton
|
||||
ret
|
||||
; ede6
|
||||
|
||||
UnknownText_0xede6: ; 0xede6
|
||||
TextJump_Waitbutton: ; 0xede6
|
||||
; @
|
||||
text_jump UnknownText_0x1c5b35
|
||||
text_jump Text_Waitbutton_2
|
||||
db "@"
|
||||
; 0xedeb
|
||||
|
||||
@ -1262,7 +1262,7 @@ Calcium: ; ee3d
|
||||
ld bc, ITEM_NAME_LENGTH
|
||||
call CopyBytes
|
||||
|
||||
call Functionf780
|
||||
call Play_SFX_FULL_HEAL
|
||||
|
||||
ld hl, UnknownText_0xeea6
|
||||
call PrintText
|
||||
@ -1288,7 +1288,7 @@ Functionee8c: ; ee8c
|
||||
ld a, PartyMon1HPExp - 1 - PartyMon1
|
||||
call GetPartyParamLocation
|
||||
ld b, $1
|
||||
predef_jump Functione167
|
||||
predef_jump CalcPkmnStats
|
||||
; ee9f
|
||||
|
||||
Functionee9f: ; ee9f
|
||||
@ -1427,7 +1427,7 @@ RareCandy: ; ef14
|
||||
|
||||
xor a ; PARTYMON
|
||||
ld [MonType], a
|
||||
predef Function5084a
|
||||
predef CopyPkmnToTempMon
|
||||
|
||||
hlcoord 9, 0
|
||||
ld b, 10
|
||||
@ -1518,7 +1518,7 @@ Functionefda: ; efda (3:6fda)
|
||||
ld a, b
|
||||
ld [PartyMenuActionText], a
|
||||
call Functionf030
|
||||
call Functionf780
|
||||
call Play_SFX_FULL_HEAL
|
||||
call Functionf279
|
||||
call Functionf795
|
||||
ld a, $0
|
||||
@ -1880,7 +1880,7 @@ Functionf21c: ; f21c (3:721c)
|
||||
callba WritePartyMenuTilemap
|
||||
callba PrintPartyMenuText
|
||||
call WaitBGMap
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
callba PartyMenuSelect
|
||||
ret
|
||||
@ -1897,7 +1897,7 @@ Functionf24a: ; f24a (3:724a)
|
||||
callba WritePartyMenuTilemap
|
||||
callba Function50566
|
||||
call WaitBGMap
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
pop bc
|
||||
pop de
|
||||
@ -2256,16 +2256,17 @@ Repel: ; f46a
|
||||
Function_0xf46c: ; f46c
|
||||
ld a, [wRepelEffect]
|
||||
and a
|
||||
ld hl, UnknownText_0xf47d
|
||||
ld hl, TextJump_RepelUsedEarlierIsStillInEffect
|
||||
jp nz, PrintText
|
||||
|
||||
ld a, b
|
||||
ld [wRepelEffect], a
|
||||
jp Functionf789
|
||||
; f47d
|
||||
|
||||
UnknownText_0xf47d: ; 0xf47d
|
||||
|
||||
TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
|
||||
; The REPEL used earlier is still in effect.
|
||||
text_jump UnknownText_0x1c5bcd
|
||||
text_jump Text_RepelUsedEarlierIsStillInEffect
|
||||
db "@"
|
||||
; 0xf482
|
||||
|
||||
@ -2520,6 +2521,7 @@ Mysteryberry: ; f5bf
|
||||
ld [MiscBuffer2], a
|
||||
|
||||
.loop
|
||||
; Party Screen opens to choose on which Pkmn to use the Item
|
||||
ld b, $1
|
||||
call Functionf1f9
|
||||
jp c, Functionf6e0
|
||||
@ -2531,11 +2533,11 @@ Mysteryberry: ; f5bf
|
||||
cp ELIXER
|
||||
jp z, Elixer_RestorePPofAllMoves
|
||||
|
||||
ld hl, UnknownText_0xf725
|
||||
ld hl, TextJump_RaiseThePPOfWhichMove
|
||||
ld a, [MiscBuffer2]
|
||||
cp PP_UP
|
||||
jr z, .ppup
|
||||
ld hl, UnknownText_0xf72a
|
||||
ld hl, TextJump_RestoreThePPOfWhichMove
|
||||
|
||||
.ppup
|
||||
call PrintText
|
||||
@ -2546,9 +2548,9 @@ Mysteryberry: ; f5bf
|
||||
ld [CurMoveNum], a
|
||||
ld a, $2
|
||||
ld [wd235], a
|
||||
callba Function3e4bc
|
||||
|
||||
callba MoveSelectionScreen
|
||||
pop bc
|
||||
|
||||
ld a, b
|
||||
ld [CurMoveNum], a
|
||||
jr nz, .loop
|
||||
@ -2561,8 +2563,8 @@ Mysteryberry: ; f5bf
|
||||
ld [wd265], a
|
||||
call GetMoveName
|
||||
call CopyName1
|
||||
|
||||
pop hl
|
||||
|
||||
ld a, [MiscBuffer2]
|
||||
cp PP_UP
|
||||
jp nz, Functionf6a7
|
||||
@ -2574,24 +2576,25 @@ Mysteryberry: ; f5bf
|
||||
ld bc, $0015
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
cp 3 << 6
|
||||
cp 3 << 6 ; have 3 PP Ups already been used?
|
||||
jr c, .do_ppup
|
||||
|
||||
.CantUsePPUpOnSketch
|
||||
ld hl, UnknownText_0xf72f
|
||||
.pp_is_maxed_out
|
||||
ld hl, TextJump_PPIsMaxedOut
|
||||
call PrintText
|
||||
jr .loop2
|
||||
|
||||
.do_ppup
|
||||
ld a, [hl]
|
||||
add 1 << 6
|
||||
add 1 << 6 ; increase PP Up count by 1
|
||||
ld [hl], a
|
||||
ld a, $1
|
||||
ld [wd265], a
|
||||
call Functionf84c
|
||||
call Functionf780
|
||||
call Play_SFX_FULL_HEAL
|
||||
|
||||
ld hl, UnknownText_0xf734
|
||||
ld hl, TextJump_PPsIncreased
|
||||
call PrintText
|
||||
|
||||
Functionf64c: ; f64c
|
||||
@ -2614,7 +2617,7 @@ Functionf652: ; f652
|
||||
call .asm_f677
|
||||
|
||||
.asm_f66c
|
||||
call Functionf780
|
||||
call Play_SFX_FULL_HEAL
|
||||
ld hl, UnknownText_0xf739
|
||||
call PrintText
|
||||
jr Functionf64c
|
||||
@ -2748,27 +2751,27 @@ RestorePP: ; f6e8
|
||||
ret
|
||||
; f725
|
||||
|
||||
UnknownText_0xf725: ; 0xf725
|
||||
TextJump_RaiseThePPOfWhichMove: ; 0xf725
|
||||
; Raise the PP of which move?
|
||||
text_jump UnknownText_0x1c5c8a
|
||||
text_jump Text_RaiseThePPOfWhichMove
|
||||
db "@"
|
||||
; 0xf72a
|
||||
|
||||
UnknownText_0xf72a: ; 0xf72a
|
||||
TextJump_RestoreThePPOfWhichMove: ; 0xf72a
|
||||
; Restore the PP of which move?
|
||||
text_jump UnknownText_0x1c5ca7
|
||||
text_jump Text_RestoreThePPOfWhichMove
|
||||
db "@"
|
||||
; 0xf72f
|
||||
|
||||
UnknownText_0xf72f: ; 0xf72f
|
||||
TextJump_PPIsMaxedOut: ; 0xf72f
|
||||
; 's PP is maxed out.
|
||||
text_jump UnknownText_0x1c5cc6
|
||||
text_jump Text_PPIsMaxedOut
|
||||
db "@"
|
||||
; 0xf734
|
||||
|
||||
UnknownText_0xf734: ; 0xf734
|
||||
TextJump_PPsIncreased: ; 0xf734
|
||||
; 's PP increased.
|
||||
text_jump UnknownText_0x1c5cdd
|
||||
text_jump Text_PPsIncreased
|
||||
db "@"
|
||||
; 0xf739
|
||||
|
||||
@ -2925,7 +2928,7 @@ ItemB3: ; f77d
|
||||
; f780
|
||||
|
||||
|
||||
Functionf780: ; f780
|
||||
Play_SFX_FULL_HEAL: ; f780
|
||||
push de
|
||||
ld de, SFX_FULL_HEAL
|
||||
call WaitPlaySFX
|
||||
@ -2936,7 +2939,7 @@ Functionf780: ; f780
|
||||
Functionf789: ; f789
|
||||
ld hl, UsedItemText
|
||||
call PrintText
|
||||
call Functionf780
|
||||
call Play_SFX_FULL_HEAL
|
||||
call Functiona80
|
||||
; fallthrough
|
||||
; f795
|
||||
|
||||
@ -51,7 +51,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
|
||||
call Function17abcf
|
||||
callba Function49409
|
||||
callba Function49420
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
ret
|
||||
|
||||
@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e)
|
||||
ret
|
||||
|
||||
.asm_17a92c
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function17a99e
|
||||
ld hl, $d088
|
||||
set 7, [hl]
|
||||
|
||||
@ -655,7 +655,7 @@ Function894ca: ; 894ca (22:54ca)
|
||||
call Function895c7
|
||||
call Function8949c
|
||||
call Function8a60d
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop bc
|
||||
ret
|
||||
|
||||
@ -1307,7 +1307,7 @@ Function89844: ; 89844
|
||||
call Function897af
|
||||
push bc
|
||||
call Function3200
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop bc
|
||||
ret
|
||||
; 89856
|
||||
@ -1816,9 +1816,9 @@ Function89b28: ; 89b28 (22:5b28)
|
||||
call Function891de
|
||||
call WhiteBGMap
|
||||
call Function893e2
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ret
|
||||
|
||||
Function89b3b: ; 89b3b (22:5b3b)
|
||||
@ -2167,7 +2167,7 @@ Function89d0d: ; 89d0d (22:5d0d)
|
||||
call CopyBytes
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
callba Function845db
|
||||
call Function89240
|
||||
ld c, $18
|
||||
@ -2373,7 +2373,7 @@ Function89e6f: ; 89e6f (22:5e6f)
|
||||
hlcoord 10, 4, AttrMap
|
||||
call Function8a5a3
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
jp Function89e36
|
||||
|
||||
Function89e9a: ; 89e9a (22:5e9a)
|
||||
@ -2410,7 +2410,7 @@ Function89eb9: ; 89eb9 (22:5eb9)
|
||||
hlcoord 10, 4, AttrMap
|
||||
call Function8a5a3
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
jp Function89e36
|
||||
|
||||
Function89ee1: ; 89ee1 (22:5ee1)
|
||||
@ -2591,7 +2591,7 @@ Function89fce: ; 89fce (22:5fce)
|
||||
hlcoord 10, 4, AttrMap
|
||||
call Function8a5a3
|
||||
call Function89448
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call Function891ab
|
||||
jp Function89e36
|
||||
|
||||
@ -2927,7 +2927,7 @@ UnknownText_0x8a23c: ; 0x8a23c
|
||||
; 0x8a241
|
||||
|
||||
Function8a241: ; 8a241 (22:6241)
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function891fe
|
||||
call Function8a262
|
||||
jr nc, .asm_8a254
|
||||
@ -2938,7 +2938,7 @@ Function8a241: ; 8a241 (22:6241)
|
||||
.asm_8a254
|
||||
call Function891de
|
||||
call WhiteBGMap
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Function891de
|
||||
and a
|
||||
ret
|
||||
@ -2965,7 +2965,7 @@ Function8a262: ; 8a262 (22:6262)
|
||||
call Function8b36c
|
||||
call Function8b493
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call Function8b5e7
|
||||
ret
|
||||
|
||||
@ -3063,7 +3063,7 @@ Function8a31c: ; 8a31c (22:631c)
|
||||
call Function8a4d3
|
||||
call Function8a4fc
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call Function8a383
|
||||
jr c, .asm_8a370
|
||||
jr z, .asm_8a34e
|
||||
@ -3455,7 +3455,7 @@ Palette_8a624: ; 8a624
|
||||
; 8a62c
|
||||
|
||||
Function8a62c: ; 8a62c (22:662c)
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function891fe
|
||||
xor a
|
||||
call Function8b94a
|
||||
@ -3885,7 +3885,7 @@ Function8a999: ; 8a999 (22:6999)
|
||||
jr c, .asm_8a9bb
|
||||
push bc
|
||||
push de
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
pop de
|
||||
dec e
|
||||
ld a, e
|
||||
@ -4141,7 +4141,7 @@ Function8ab77: ; 8ab77 (22:6b77)
|
||||
|
||||
Function8ab93: ; 8ab93 (22:6b93)
|
||||
call WhiteBGMap
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
callba Function105688
|
||||
call ClearSprites
|
||||
call Function891fe
|
||||
|
||||
@ -581,7 +581,7 @@ Function8b677: ; 8b677
|
||||
call Function8b6ed
|
||||
call EnableLCD
|
||||
call Function891ab
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ret
|
||||
; 8b690
|
||||
|
||||
|
||||
@ -1615,6 +1615,7 @@ Function100a09: ; 100a09
|
||||
ld a, [wLinkMode]
|
||||
cp $4
|
||||
jr nz, .asm_100a2a
|
||||
|
||||
call Function100a87
|
||||
call Function100da5
|
||||
callba Function3ee27
|
||||
@ -1941,15 +1942,15 @@ endr
|
||||
ret
|
||||
|
||||
.asm_100c63
|
||||
ld hl, BattleText_0x80c5b
|
||||
ld hl, BattleText_TheMoveIsDisabled
|
||||
jr .asm_100c6b
|
||||
|
||||
.asm_100c68
|
||||
ld hl, BattleText_0x80c39
|
||||
ld hl, BattleText_TheresNoPPLeftForThisMove
|
||||
|
||||
.asm_100c6b
|
||||
call StdBattleTextBox
|
||||
call Function30b4
|
||||
call Call_LoadTempTileMapToTileMap
|
||||
jp Function100bc2
|
||||
; 100c74
|
||||
|
||||
@ -3015,7 +3016,7 @@ Function10138b: ; 10138b
|
||||
|
||||
Function1013aa: ; 1013aa
|
||||
call WhiteBGMap
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Function2bae
|
||||
callba Function106464
|
||||
call UpdateSprites
|
||||
@ -4482,7 +4483,7 @@ Unknown_101d8d: ; 101d8d
|
||||
|
||||
Function101d95: ; 101d95
|
||||
call Function101ee2
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
ld e, $e
|
||||
call Function101ee4
|
||||
ld hl, wcd29
|
||||
@ -6255,7 +6256,7 @@ Jumptable_1029cb: ; 1029cb
|
||||
; 1029cf
|
||||
|
||||
Function1029cf: ; 1029cf
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
hlcoord 10, 7
|
||||
ld b, $3
|
||||
ld c, $8
|
||||
@ -6793,7 +6794,7 @@ Function102dec: ; 102dec
|
||||
ld a, $5
|
||||
call FarCopyWRAM
|
||||
callba Function49742
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
ret
|
||||
; 102e07
|
||||
|
||||
@ -5789,7 +5789,7 @@ Function116294: ; 116294
|
||||
ld de, Unkn1Pals + 8 * 7
|
||||
ld bc, $0008
|
||||
call CopyBytes
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
ld a, $30
|
||||
@ -5810,7 +5810,7 @@ Function1162cb: ; 1162cb
|
||||
ld de, wd050
|
||||
ld bc, $0030
|
||||
call CopyBytes
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
ret
|
||||
@ -5917,7 +5917,7 @@ Function11636e: ; 11636e
|
||||
call CopyBytes
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $1
|
||||
@ -5967,7 +5967,7 @@ Function1163c0: ; 1163c0
|
||||
call CopyBytes
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
ld a, $90
|
||||
ld [hWY], a
|
||||
@ -14155,7 +14155,7 @@ Function11a9c0: ; 11a9c0
|
||||
Function11a9ce: ; 11a9ce
|
||||
call WhiteBGMap
|
||||
call Function2bae
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
callba Function106462
|
||||
callba Function106464
|
||||
call Functiond90
|
||||
@ -14937,7 +14937,7 @@ Function11b082: ; 11b082
|
||||
call Function11b099
|
||||
call Function11b295
|
||||
call Function11b275
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
jp Function11ad8a
|
||||
; 11b099
|
||||
|
||||
@ -15686,7 +15686,7 @@ Function11b483: ; 11b483
|
||||
pop de
|
||||
push de
|
||||
ld b, $1
|
||||
predef Functione167
|
||||
predef CalcPkmnStats
|
||||
pop de
|
||||
ld h, d
|
||||
ld l, e
|
||||
@ -16102,7 +16102,7 @@ Function11b6b4: ; 11b6b4
|
||||
ld hl, $c616 + 1
|
||||
ld de, $c62c + 5
|
||||
ld b, $1
|
||||
predef Functione167
|
||||
predef CalcPkmnStats
|
||||
ld de, $c62c + 5
|
||||
ld hl, $c62c + 3
|
||||
ld a, [de]
|
||||
@ -16875,7 +16875,7 @@ Function11c1ca: ; 11c1ca
|
||||
call ClearSprites
|
||||
call ClearScreen
|
||||
call Function11d323
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call DisableLCD
|
||||
ld hl, GFX_11d67e
|
||||
ld de, VTiles2
|
||||
@ -21659,7 +21659,7 @@ endr
|
||||
cp $8
|
||||
jr nz, .asm_16c969
|
||||
callba Function96a4
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $1
|
||||
@ -21762,7 +21762,7 @@ endr
|
||||
cp $8
|
||||
jr nz, .asm_16ca28
|
||||
callba Function96a4
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $1
|
||||
@ -22177,7 +22177,7 @@ Function16d42e: ; 16d42e
|
||||
; 16d43b
|
||||
|
||||
Function16d43b: ; 16d43b
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call WhiteBGMap
|
||||
call ClearTileMap
|
||||
call ClearSprites
|
||||
@ -22185,10 +22185,10 @@ Function16d43b: ; 16d43b
|
||||
callba Function16d42e
|
||||
ld b, $8
|
||||
call GetSGBLayout
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call WaitBGMap
|
||||
call JoyWaitAorB
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
ret
|
||||
; 16d465
|
||||
|
||||
@ -22327,10 +22327,10 @@ Function16d6ca: ; 16d6ca
|
||||
; 16d6ce
|
||||
|
||||
Function16d6ce: ; 16d6ce
|
||||
call Function1d6e
|
||||
call LoadMenuDataHeader_0x1d75
|
||||
call Function16d6e1
|
||||
callba Function87d
|
||||
call Function1d7d
|
||||
call Call_ExitMenu
|
||||
call Function3200
|
||||
ret
|
||||
; 16d6e1
|
||||
@ -23076,7 +23076,7 @@ endr
|
||||
ld hl, $000a
|
||||
add hl, bc
|
||||
ld b, $1
|
||||
predef Functione167
|
||||
predef CalcPkmnStats
|
||||
pop de
|
||||
pop hl
|
||||
rept 2
|
||||
@ -23293,7 +23293,7 @@ Function170525: ; 170525
|
||||
|
||||
|
||||
Function170571:
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call Function1705b2
|
||||
|
||||
|
||||
@ -24906,7 +24906,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
|
||||
ld [hli], a
|
||||
ld a, $7f
|
||||
ld [hl], a
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ret
|
||||
@ -25068,7 +25068,7 @@ Function172eb9:
|
||||
ld de, BGPals
|
||||
ld bc, $40
|
||||
call CopyBytes
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ret
|
||||
|
||||
@ -706,7 +706,7 @@ Function17d405:
|
||||
ld de, Unkn1Pals
|
||||
ld bc, $0040
|
||||
call CopyBytes
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
ret
|
||||
@ -938,7 +938,7 @@ endr
|
||||
; 17d5be
|
||||
|
||||
Function17d5be: ; 17d5be
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
call Function17e438
|
||||
|
||||
Function17d5c4:
|
||||
@ -1508,7 +1508,7 @@ Function17d93a: ; 17d93a
|
||||
ld a, [wc70c]
|
||||
ld e, a
|
||||
callba Function8bc6
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [wc708]
|
||||
ld l, a
|
||||
ld a, [wc709]
|
||||
@ -1544,7 +1544,7 @@ Function17d98b: ; 17d98b
|
||||
ld a, [wc70b]
|
||||
ld e, a
|
||||
callba Function8bbd
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, [wc708]
|
||||
ld e, a
|
||||
ld a, [wc709]
|
||||
@ -2465,7 +2465,7 @@ endr
|
||||
ld e, l
|
||||
push hl
|
||||
ld b, $0
|
||||
callba Functione167
|
||||
callba CalcPkmnStats
|
||||
ld a, [PartyCount]
|
||||
dec a
|
||||
ld hl, PartyMon1HP
|
||||
@ -4764,7 +4764,7 @@ Function17f5c3: ; 17f5c3
|
||||
Function17f5d2: ; 17f5d2
|
||||
call Function17f5e4
|
||||
callba Function104000
|
||||
call Function32f9
|
||||
call SetPalettes
|
||||
ld a, $1
|
||||
ld [wc303], a
|
||||
ret
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
BattleText_0x80730: ; 0x80730
|
||||
BattleText_PlayerPickuedUpPayDayMoney: ; 0x80730
|
||||
text "<PLAYER> picked up"
|
||||
line "¥@"
|
||||
deciram wPayDayMoney, $36
|
||||
@ -307,7 +307,7 @@ BattleText_GotAwaySafely: ; 0x80b77
|
||||
text "Got away safely!"
|
||||
prompt
|
||||
|
||||
BattleText_0x80b89: ; 0x80b89
|
||||
BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
|
||||
text "<USER>"
|
||||
line "fled using a"
|
||||
cont "@"
|
||||
@ -321,7 +321,7 @@ BattleText_CantEscape: ; 0x80ba0
|
||||
prompt
|
||||
; 0x80bae
|
||||
|
||||
BattleText_0x80bae: ; 0x80bae
|
||||
BattleText_UserHurtBySpikes: ; 0x80bae
|
||||
text "<USER>'s"
|
||||
line "hurt by SPIKES!"
|
||||
prompt
|
||||
@ -336,7 +336,7 @@ RecoveredUsingText: ; 0x80bc2
|
||||
prompt
|
||||
; 0x80bde
|
||||
|
||||
BattleText_0x80bde: ; 0x80bde
|
||||
BattleText_UsersStringBuffer1Activated: ; 0x80bde
|
||||
text "<USER>'s"
|
||||
line "@"
|
||||
text_from_ram StringBuffer1
|
||||
@ -345,52 +345,52 @@ BattleText_0x80bde: ; 0x80bde
|
||||
prompt
|
||||
; 0x80bf3
|
||||
|
||||
BattleText_0x80bf3: ; 0x80bf3
|
||||
BattleText_ItemsCantBeUsedHere: ; 0x80bf3
|
||||
text "Items can't be"
|
||||
line "used here."
|
||||
prompt
|
||||
; 0x80c0d
|
||||
|
||||
BattleText_0x80c0d: ; 0x80c0d
|
||||
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
|
||||
text_from_ram BattleMonNick
|
||||
text ""
|
||||
line "is already out."
|
||||
prompt
|
||||
; 0x80c22
|
||||
|
||||
BattleText_0x80c22: ; 0x80c22
|
||||
BattleText_PkmnCantBeRecalled: ; 0x80c22
|
||||
text_from_ram BattleMonNick
|
||||
text ""
|
||||
line "can't be recalled!"
|
||||
prompt
|
||||
; 0x80c39
|
||||
|
||||
BattleText_0x80c39: ; 0x80c39
|
||||
BattleText_TheresNoPPLeftForThisMove: ; 0x80c39
|
||||
text "There's no PP left"
|
||||
line "for this move!"
|
||||
prompt
|
||||
; 0x80c5b
|
||||
|
||||
BattleText_0x80c5b: ; 0x80c5b
|
||||
BattleText_TheMoveIsDisabled: ; 0x80c5b
|
||||
text "The move is"
|
||||
line "DISABLED!"
|
||||
prompt
|
||||
; 0x80c72
|
||||
|
||||
BattleText_0x80c72: ; 0x80c72
|
||||
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
|
||||
text_from_ram BattleMonNick
|
||||
text ""
|
||||
line "has no moves left!"
|
||||
done
|
||||
; 0x80c8a
|
||||
|
||||
BattleText_0x80c8a: ; 0x80c8a
|
||||
BattleText_TargetsEncoreEnded: ; 0x80c8a
|
||||
text "<TARGET>'s"
|
||||
line "ENCORE ended!"
|
||||
prompt
|
||||
; 0x80c9c
|
||||
|
||||
BattleText_0x80c9c: ; 0x80c9c
|
||||
BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
|
||||
text_from_ram StringBuffer1
|
||||
text " grew to"
|
||||
line "level @"
|
||||
@ -404,7 +404,7 @@ BattleText_0x80cb9: ; 0x80cb9
|
||||
db "@"
|
||||
; 0x80cba
|
||||
|
||||
BattleText_0x80cba: ; 0x80cba
|
||||
BattleText_WildPkmnIsEating: ; 0x80cba
|
||||
text "Wild @"
|
||||
text_from_ram EnemyMonNick
|
||||
text ""
|
||||
@ -412,7 +412,7 @@ BattleText_0x80cba: ; 0x80cba
|
||||
prompt
|
||||
; 0x80cd1
|
||||
|
||||
BattleText_0x80cd1: ; 0x80cd1
|
||||
BattleText_WildPkmnIsAngry: ; 0x80cd1
|
||||
text "Wild @"
|
||||
text_from_ram EnemyMonNick
|
||||
text ""
|
||||
@ -495,7 +495,7 @@ AlreadyConfusedText: ; 0x80dcc
|
||||
prompt
|
||||
; 0x80de2
|
||||
|
||||
BattleText_0x80de2: ; 0x80de2
|
||||
BattleText_UsersHurtByStringBuffer1: ; 0x80de2
|
||||
text "<USER>'s"
|
||||
line "hurt by"
|
||||
cont "@"
|
||||
@ -504,7 +504,7 @@ BattleText_0x80de2: ; 0x80de2
|
||||
prompt
|
||||
; 0x80df5
|
||||
|
||||
BattleText_0x80df5: ; 0x80df5
|
||||
BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
|
||||
text "<USER>"
|
||||
line "was released from"
|
||||
cont "@"
|
||||
|
||||
@ -106,13 +106,13 @@ UnknownText_0x1c0272: ; 1c0272
|
||||
prompt
|
||||
; 1c029c
|
||||
|
||||
UnknownText_0x1c029c: ; 1c029c
|
||||
Text_Gained: ; 1c029c
|
||||
text_from_ram StringBuffer1
|
||||
text " gained@"
|
||||
db "@"
|
||||
; 1c02a9
|
||||
|
||||
UnknownText_0x1c02a9: ; 1c02a9
|
||||
Text_ABoostedStringBuffer2ExpPoints: ; 1c02a9
|
||||
text ""
|
||||
line "a boosted"
|
||||
cont "@"
|
||||
@ -121,7 +121,7 @@ UnknownText_0x1c02a9: ; 1c02a9
|
||||
prompt
|
||||
; 1c02c9
|
||||
|
||||
UnknownText_0x1c02c9: ; 1c02c9
|
||||
Text_StringBuffer2ExpPoints: ; 1c02c9
|
||||
text ""
|
||||
line "@"
|
||||
deciram StringBuffer2, $24
|
||||
@ -157,31 +157,31 @@ Text_BattleMonNick01: ; 1c0317
|
||||
done
|
||||
; 1c031d
|
||||
|
||||
UnknownText_0x1c031d: ; 1c031d
|
||||
Text_BattleMonNickComma: ; 1c031d
|
||||
text_from_ram BattleMonNick
|
||||
text ",@"
|
||||
db "@"
|
||||
; 1c0324
|
||||
|
||||
UnknownText_0x1c0324: ; 1c0324
|
||||
Text_ThatsEnoughComeBack: ; 1c0324
|
||||
text " that's"
|
||||
line "enough! Come back!@"
|
||||
db "@"
|
||||
; 1c0340
|
||||
|
||||
UnknownText_0x1c0340: ; 1c0340
|
||||
Text_OKComeBack: ; 1c0340
|
||||
text " OK!"
|
||||
line "Come back!@"
|
||||
db "@"
|
||||
; 1c0352
|
||||
|
||||
UnknownText_0x1c0352: ; 1c0352
|
||||
Text_GoodComeBack: ; 1c0352
|
||||
text " good!"
|
||||
line "Come back!@"
|
||||
db "@"
|
||||
; 1c0366
|
||||
|
||||
UnknownText_0x1c0366: ; 1c0366
|
||||
Text_ComeBack: ; 1c0366
|
||||
text " come"
|
||||
line "back!"
|
||||
done
|
||||
@ -689,7 +689,7 @@ UnknownText_0x1c0b65: ; 1c0b65
|
||||
done
|
||||
; 1c0b7f
|
||||
|
||||
UnknownText_0x1c0b7f: ; 1c0b7f
|
||||
Text_AnEGGCantHoldAnItem: ; 1c0b7f
|
||||
text "An EGG can't hold"
|
||||
line "an item."
|
||||
prompt
|
||||
@ -731,7 +731,7 @@ UnknownText_0x1c0bee: ; 1c0bee
|
||||
prompt
|
||||
; 1c0c17
|
||||
|
||||
UnknownText_0x1c0c17: ; 1c0c17
|
||||
Text_YouDontHaveAPkmn: ; 1c0c17
|
||||
text "You don't have a"
|
||||
line "#MON!"
|
||||
prompt
|
||||
@ -762,13 +762,13 @@ UnknownText_0x1c0c83: ; 1c0c83
|
||||
done
|
||||
; 1c0c85
|
||||
|
||||
UnknownText_0x1c0c85: ; 1c0c85
|
||||
Text_YouCantUseItInABattle: ; 1c0c85
|
||||
text "You can't use it"
|
||||
line "in a battle."
|
||||
prompt
|
||||
; 1c0ca3
|
||||
|
||||
UnknownText_0x1c0ca3: ; 1c0ca3
|
||||
Text_AreYouABoyOrAreYouAGirl: ; 1c0ca3
|
||||
text "Are you a boy?"
|
||||
line "Or are you a girl?"
|
||||
done
|
||||
|
||||
@ -1375,7 +1375,7 @@ UnknownText_0x1c5b34: ; 0x1c5b34
|
||||
db "@"
|
||||
; 0x1c5b35
|
||||
|
||||
UnknownText_0x1c5b35: ; 0x1c5b35
|
||||
Text_Waitbutton_2: ; 0x1c5b35
|
||||
text_waitbutton
|
||||
db "@"
|
||||
; 0x1c5b37
|
||||
@ -1428,7 +1428,7 @@ UnknownText_0x1c5bac: ; 0x1c5bac
|
||||
prompt
|
||||
; 0x1c5bcd
|
||||
|
||||
UnknownText_0x1c5bcd: ; 0x1c5bcd
|
||||
Text_RepelUsedEarlierIsStillInEffect: ; 0x1c5bcd
|
||||
text "The REPEL used"
|
||||
line "earlier is still"
|
||||
cont "in effect."
|
||||
@ -1480,26 +1480,26 @@ UnknownText_0x1c5c89: ; 0x1c5c89
|
||||
db "@"
|
||||
; 0x1c5c8a
|
||||
|
||||
UnknownText_0x1c5c8a: ; 0x1c5c8a
|
||||
Text_RaiseThePPOfWhichMove: ; 0x1c5c8a
|
||||
text "Raise the PP of"
|
||||
line "which move?"
|
||||
done
|
||||
; 0x1c5ca7
|
||||
|
||||
UnknownText_0x1c5ca7: ; 0x1c5ca7
|
||||
Text_RestoreThePPOfWhichMove: ; 0x1c5ca7
|
||||
text "Restore the PP of"
|
||||
line "which move?"
|
||||
done
|
||||
; 0x1c5cc6
|
||||
|
||||
UnknownText_0x1c5cc6: ; 0x1c5cc6
|
||||
Text_PPIsMaxedOut: ; 0x1c5cc6
|
||||
text_from_ram StringBuffer2
|
||||
text "'s PP"
|
||||
line "is maxed out."
|
||||
prompt
|
||||
; 0x1c5cdd
|
||||
|
||||
UnknownText_0x1c5cdd: ; 0x1c5cdd
|
||||
Text_PPsIncreased: ; 0x1c5cdd
|
||||
text_from_ram StringBuffer2
|
||||
text "'s PP"
|
||||
line "increased."
|
||||
@ -1674,7 +1674,7 @@ UnknownText_0x1c5fd1: ; 0x1c5fd1
|
||||
prompt
|
||||
; 0x1c5fde
|
||||
|
||||
UnknownText_0x1c5fde: ; 0x1c5fde
|
||||
Text_DSTIsThatOK: ; 0x1c5fde
|
||||
text " DST,"
|
||||
line "is that OK?"
|
||||
done
|
||||
|
||||
26
wram.asm
26
wram.asm
@ -813,13 +813,13 @@ LastEnemyMove:: ; c71c
|
||||
wc71d:: ds 1
|
||||
wc71e:: ds 1
|
||||
wc71f:: ds 1
|
||||
wc720:: ds 4
|
||||
wc720:: ds 4 ; copy from/to EnemyMonBaseStats, length=7
|
||||
wc724:: ds 3
|
||||
wc727:: ds 2
|
||||
wc729:: ds 2
|
||||
wc72b:: ds 1
|
||||
wc72c:: ds 1
|
||||
wc72d:: ds 1
|
||||
wc72d:: ds 1 ; if 0 then PrintButItFailed
|
||||
wc72e:: ds 1
|
||||
wc72f:: ds 1
|
||||
wc730:: ds 1
|
||||
@ -1791,17 +1791,17 @@ OtherTrainerClass:: ; d22f
|
||||
|
||||
BattleType:: ; d230
|
||||
; $00 normal
|
||||
; $01
|
||||
; $02
|
||||
; $03 dude
|
||||
; $01 can lose
|
||||
; $02 debug
|
||||
; $03 dude/tutorial
|
||||
; $04 fishing
|
||||
; $05 roaming
|
||||
; $06
|
||||
; $06 contest
|
||||
; $07 shiny
|
||||
; $08 headbutt/rock smash
|
||||
; $09
|
||||
; $09 trap
|
||||
; $0a force Item1
|
||||
; $0b
|
||||
; $0b celebi
|
||||
; $0c suicune
|
||||
ds 1
|
||||
|
||||
@ -2456,9 +2456,9 @@ wdc79:: ds 1
|
||||
wdc7a:: ds 2
|
||||
wPhoneList:: ds CONTACT_LIST_SIZE
|
||||
ds 23
|
||||
wLuckyNumberShowFlag:: ds 2
|
||||
wLuckyIDNumber:: ds 2
|
||||
wRepelEffect:: ds 1
|
||||
wLuckyNumberShowFlag:: ds 2 ; dc9d
|
||||
wLuckyIDNumber:: ds 2 ; dc9f
|
||||
wRepelEffect:: ds 1 ; If a Repel is in use, it contains the nr of steps it's still active
|
||||
wBikeStep:: ds 2
|
||||
wKurtApricornQuantity:: ds 1
|
||||
|
||||
@ -2619,7 +2619,9 @@ wGameDataEnd::
|
||||
|
||||
SECTION "Pic Animations", WRAMX, BANK [2]
|
||||
|
||||
w2_d000:: ds $168
|
||||
w2_d000::
|
||||
; 20x18 grid of 8x8 tiles
|
||||
ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360
|
||||
|
||||
w2_d168:: ds 1
|
||||
w2_d169:: ds 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user