ref: 4b722eb53056e3d6e12e21ef41d5545af37a3025
parent: 6730600d9b960f6f5583f4430a827f318c043df9
author: JimB16 <f1@jimb.de>
date: Sat Oct 10 09:45:39 EDT 2015
changed name of some labels
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -1783,8 +1783,8 @@
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
- callab BattleCommand62_DamageCalcWithStats
- callab BattleCommand07_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalcWithStats
+ callab BattleCommand_CalcDamageTypeMultiplier
pop hl
ld a, [CurDamage + 1]
ld c, a
@@ -3380,8 +3380,8 @@
.asm_39400
callab EnemyAttackDamage
- callab BattleCommand62_DamageCalcWithStats
- callab BattleCommand07_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalcWithStats
+ callab BattleCommand_CalcDamageTypeMultiplier
ret
.ConstantDamageEffects
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -645,7 +645,7 @@
ld [wd235], a
inc a ; POUND
ld [FXAnimIDLo], a
- call Function3e4bc
+ call MoveSelectionScreen
push af
call Call_LoadTempTileMapToTileMap
call UpdateBattleHuds
@@ -5584,7 +5584,7 @@
ret
; 3e4bc
-Function3e4bc: ; 3e4bc
+MoveSelectionScreen: ; 3e4bc
call IsMobileBattle
jr nz, .asm_3e4c8
callba Function100b9f
@@ -5784,7 +5784,7 @@
.asm_3e613
call StdBattleTextBox
call Call_LoadTempTileMapToTileMap
- jp Function3e4bc
+ jp MoveSelectionScreen
; 3e61c
.string_3e61c ; 3e61c
@@ -5869,7 +5869,7 @@
.asm_3e69e
xor a
ld [wd0e3], a
- jp Function3e4bc
+ jp MoveSelectionScreen
.asm_3e6a5
push hl
@@ -5896,7 +5896,7 @@
.asm_3e6bf
ld a, [wcfa9]
ld [wd0e3], a
- jp Function3e4bc
+ jp MoveSelectionScreen
; 3e6c8
MoveInfoBox: ; 3e6c8
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -8,7 +8,7 @@
dw BattleCommand04 ; 34555
dw BattleCommand05 ; 34631
dw BattleCommand06 ; 352dc
- dw BattleCommand07_CalcDamageTypeMultiplier ; 346d2
+ dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
dw BattleCommand08 ; 34cfd
dw BattleCommand09 ; 34d32
dw BattleCommand0a ; 34eee
@@ -99,7 +99,7 @@
dw BattleCommand5f ; 377ce
dw BattleCommand60 ; 3784b
dw BattleCommand61 ; 37874
- dw BattleCommand62_DamageCalcWithStats ; 35612
+ dw BattleCommand_DamageCalcWithStats ; 35612 - 62
dw BattleCommand63 ; 3790e
dw BattleCommand64 ; 37939
dw BattleCommand65 ; 37972
@@ -148,7 +148,7 @@
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 @@
dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5
- dw BattleCommanda9_IfAttackMissedResetDamage ; 355d5
+ dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
dw BattleCommandaa ; 37e80
dw BattleCommandab ; 34f57
dw BattleCommandac ; 3658f
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -385,9 +385,9 @@
Function34216: ; 34216
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call CantMove
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3421f
@@ -539,7 +539,7 @@
ld hl, HurtItselfText
call StdBattleTextBox
call Function355dd
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
ld [wcfca], a
@@ -652,7 +652,7 @@
ld [CriticalHit], a
call Function355dd
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
@@ -1336,7 +1336,7 @@
; 346d2
-BattleCommand07_CalcDamageTypeMultiplier: ; 346d2
+BattleCommand_CalcDamageTypeMultiplier: ; 346d2
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -2872,8 +2872,7 @@
; 34ffd
-SwitchTurn: ; 34ffd
-BattleCommand93: ; 34ffd
+BattleCommand_SwitchTurn: ; 34ffd
; switchturn
ld a, [hBattleTurn]
@@ -3246,7 +3245,7 @@
predef Functionc6e0
call RefreshBattleHuds
- call SwitchTurn
+ call BattleCommand_SwitchTurn
xor a
ld [wcfca], a
ld [FXAnimIDHi], a
@@ -3254,7 +3253,7 @@
ld [wc689], a
ld a, $c2
call Function37e44
- call SwitchTurn
+ call BattleCommand_SwitchTurn
jr .asm_3524d ; 3522f $1c
@@ -3305,10 +3304,10 @@
ret z
ld [de], a
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, RageBuildingText
call StdBattleTextBox
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3527b
@@ -3953,10 +3952,9 @@
call GetPartyLocation
pop bc
ret
-; 355d5
-BattleCommanda9_IfAttackMissedResetDamage: ; 355d5
+BattleCommand_IfAttackMissedResetDamage: ; 355d5
; clearmissdamage
ld a, [AttackMissed]
and a
@@ -4004,7 +4002,7 @@
; 35612
-BattleCommand62_DamageCalcWithStats: ; 35612
+BattleCommand_DamageCalcWithStats: ; 35612
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@@ -4412,7 +4410,7 @@
call EnemyAttackDamage
.notEnemysTurn
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
pop hl
ld [hl], 1
ret
@@ -4754,7 +4752,7 @@
cp CURSE_T
jr z, .asm_35a50
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
.asm_35a13
call BattleRandom
@@ -4783,7 +4781,7 @@
ld a, [wd265]
cp $a
jr nc, .asm_35a13
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld a, [hl]
ld [wd265], a
@@ -5457,13 +5455,13 @@
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 +6537,15 @@
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 +6826,7 @@
ld hl, BadgeStatBoosts
call CallBattleCore
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6836,7 +6834,7 @@
ld hl, Function3ec76
call CallBattleCore
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 365fd
@@ -6848,7 +6846,7 @@
ld a, $5
call Function3661d
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6856,7 +6854,7 @@
ld hl, Function3ec76
call CallBattleCore
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3661d
@@ -7056,10 +7054,10 @@
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]
@@ -8823,10 +8821,10 @@
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 +9498,7 @@
push de
.asm_3787d
- call BattleCommand07_CalcDamageTypeMultiplier
+ call BattleCommand_CalcDamageTypeMultiplier
ld a, [InLinkBattle]
cp $3
@@ -9544,7 +9542,7 @@
ld a, $3
ld [wc689], a
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn]
and a
@@ -9557,18 +9555,18 @@
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
@@ -10094,11 +10092,11 @@
rst FarCall
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
callab Function3ccef
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call UpdateUserInParty
; 'regained health!'
@@ -10596,11 +10594,11 @@
push hl
push de
push bc
- call SwitchTurn
+ call BattleCommand_SwitchTurn
callab PlayBattleAnim
- call SwitchTurn
+ call BattleCommand_SwitchTurn
pop bc
pop de
pop hl
--- a/battle/effects/curse.asm
+++ b/battle/effects/curse.asm
@@ -44,10 +44,10 @@
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
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -36,7 +36,7 @@
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
- add_predef Functiond88c
+ add_predef AddPkmnToParty
add_predef Functionda96
add_predef SentGetPkmnIntoFromBox
add_predef SentPkmnIntoBox
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -562,7 +562,7 @@
ld [MonType], a
call ClearSprites
- predef Functiond88c
+ predef AddPkmnToParty
callba Function4db49
@@ -1143,13 +1143,13 @@
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 @@
ld bc, $000d
call CopyBytes
- call Functionf780
+ call Play_SFX_FULL_HEAL
ld hl, UnknownText_0xeea6
call PrintText
@@ -1518,7 +1518,7 @@
ld a, b
ld [PartyMenuActionText], a
call Functionf030
- call Functionf780
+ call Play_SFX_FULL_HEAL
call Functionf279
call Functionf795
ld a, $0
@@ -2525,7 +2525,7 @@
call Functionf1f9
jp c, Functionf6e0
-.asm_f5cd
+.restart_func
ld a, [wd002]
cp MAX_ELIXER
jp z, Functionf6af
@@ -2532,11 +2532,11 @@
cp ELIXER
jp z, Functionf6af
- ld hl, UnknownText_0xf725
+ ld hl, TextJump_RaiseThePPOfWhichMove
ld a, [wd002]
cp PP_UP
jr z, .asm_f5e7
- ld hl, UnknownText_0xf72a
+ ld hl, TextJump_RestoreThePPOfWhichMove
.asm_f5e7
call PrintText
@@ -2547,7 +2547,7 @@
ld [CurMoveNum], a
ld a, $2
ld [wd235], a
- callba Function3e4bc
+ callba MoveSelectionScreen
pop bc
ld a, b
@@ -2555,7 +2555,7 @@
jr nz, .asm_f5c5
ld hl, PartyMon1Moves
ld bc, PartyMon2 - PartyMon1
- call Functionf963
+ call Add_CurPartyMon_Times
push hl
ld a, [hl]
@@ -2570,20 +2570,20 @@
ld a, [hl]
cp $a6
- jr z, .asm_f62f
+ jr z, .pp_is_maxed_out
ld bc, $0015
add hl, bc
ld a, [hl]
cp $c0
- jr c, .asm_f637
+ jr c, .increase_pp
-.asm_f62f
- ld hl, UnknownText_0xf72f
+.pp_is_maxed_out
+ ld hl, TextJump_PPIsMaxedOut
call PrintText
- jr .asm_f5cd
+ jr .restart_func
-.asm_f637
+.increase_pp
ld a, [hl]
add $40
ld [hl], a
@@ -2590,9 +2590,9 @@
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
@@ -2615,7 +2615,7 @@
call .asm_f677
.asm_f66c
- call Functionf780
+ call Play_SFX_FULL_HEAL
ld hl, UnknownText_0xf739
call PrintText
jr Functionf64c
@@ -2673,7 +2673,7 @@
push bc
ld hl, PartyMon1Moves
ld bc, PartyMon2 - PartyMon1
- call Functionf963
+ call Add_CurPartyMon_Times
ld a, [hl]
and a
jr z, .asm_f6ce
@@ -2709,7 +2709,7 @@
call Functionf8ec
ld hl, PartyMon1PP
ld bc, PartyMon2 - PartyMon1
- call Functionf963
+ call Add_CurPartyMon_Times
ld a, [wd265]
ld b, a
ld a, [hl]
@@ -2749,27 +2749,27 @@
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
@@ -2926,7 +2926,7 @@
; f780
-Functionf780: ; f780
+Play_SFX_FULL_HEAL: ; f780
push de
ld de, SFX_FULL_HEAL
call WaitPlaySFX
@@ -2937,7 +2937,7 @@
Functionf789: ; f789
ld hl, UsedItemText
call PrintText
- call Functionf780
+ call Play_SFX_FULL_HEAL
call Functiona80
; fallthrough
; f795
@@ -3251,7 +3251,7 @@
jr .asm_f91d
.asm_f91a
- call Functionf963
+ call Add_CurPartyMon_Times
.asm_f91d
ld a, [hl]
@@ -3298,7 +3298,7 @@
ret
; f963
-Functionf963: ; f963
+Add_CurPartyMon_Times: ; f963
ld a, [CurPartyMon]
call AddNTimes
--- a/main.asm
+++ b/main.asm
@@ -2932,7 +2932,7 @@
ld a, 15
ld [CurPartyLevel], a
- predef Functiond88c
+ predef AddPkmnToParty
jr nc, .NotGiven
; Caught data.
@@ -7915,7 +7915,8 @@
; d88c
-Functiond88c: ; d88c
+AddPkmnToParty: ; d88c
+; Check if to copy wild Pkmn or generate new Pkmn
ld de, PartyCount
ld a, [MonType]
and $f
@@ -8176,12 +8177,15 @@
ld [de], a
inc de
ld hl, EnemyMonStatus
+ ; Copy EnemyMonStatus
ld a, [hli]
ld [de], a
inc de
+ ; Copy EnemyMonUnused
ld a, [hli]
ld [de], a
inc de
+ ; Copy EnemyMonHP
ld a, [hli]
ld [de], a
inc de
@@ -8194,7 +8198,7 @@
dec a
jr nz, .asm_da3b
ld hl, EnemyMonMaxHP
- ld bc, $000c
+ ld bc, 2*6 ; MaxHP + 5 Stats
call CopyBytes
pop hl
jr .asm_da45
@@ -8201,9 +8205,10 @@
.asm_da3b
pop hl
- ld bc, $000a
+ ld bc, 2*5 ; 5 Stats
add hl, bc
- ld b, $0
+ ld b, $0 ; if b = 1, then the Stats of the Pkmn are calculated
+ ; only the current HP aren't set to MaxHP after this
call CalcPkmnStats
.asm_da45
@@ -8226,6 +8231,7 @@
ret
; da6d
+
FillPP: ; da6d
push bc
ld b, NUM_MOVES
@@ -8876,8 +8882,9 @@
ld [de], a
inc de
+ ; Set all 5 Experience Values to 0
xor a
- ld b, $a
+ ld b, 2*5
.asm_dee5
ld [de], a
inc de
@@ -8920,10 +8927,12 @@
ld de, TempMonMoves
ld bc, NUM_MOVES
call CopyBytes
+
ld hl, sBoxMon1PP
ld de, TempMonPP
ld bc, NUM_MOVES
call CopyBytes
+
ld b, 0
call Functiondcb6
@@ -8932,6 +8941,7 @@
ret
; df42
+
Functiondf42: ; df42
call CloseSRAM
and a
@@ -8999,7 +9009,7 @@
push bc
call CheckSeenMon
push bc
- call Functiond88c
+ call AddPkmnToParty
pop bc
ld a, c
and a
@@ -9476,7 +9486,7 @@
push bc
xor a
ld [MonType], a
- call Functiond88c
+ call AddPkmnToParty
jr nc, .asm_e2b0
ld hl, PartyMonNicknames
ld a, [PartyCount]
@@ -9659,6 +9669,7 @@
ret
; e3d9
+
TextJump_WasSentToBillsPC: ; 0xe3d9
; was sent to BILL's PC.
text_jump Text_WasSentToBillsPC
@@ -35229,7 +35240,7 @@
ld a, OTPARTYMON
ld [MonType], a
push hl
- predef Functiond88c
+ predef AddPkmnToParty
pop hl
jr .loop
; 39806
@@ -35250,7 +35261,7 @@
ld [MonType], a
push hl
- predef Functiond88c
+ predef AddPkmnToParty
ld a, [OTPartyCount]
dec a
ld hl, OTPartyMon1Moves
@@ -35326,7 +35337,7 @@
ld a, OTPARTYMON
ld [MonType], a
push hl
- predef Functiond88c
+ predef AddPkmnToParty
ld a, [OTPartyCount]
dec a
ld hl, OTPartyMon1Item
@@ -35357,7 +35368,7 @@
ld [MonType], a
push hl
- predef Functiond88c
+ predef AddPkmnToParty
ld a, [OTPartyCount]
dec a
ld hl, OTPartyMon1Item
@@ -87322,7 +87333,7 @@
ld [MonType], a
ld [wd10b], a
callab Functione039
- predef Functiond88c
+ predef AddPkmnToParty
ld e, TRADE_DIALOG
call GetTradeAttribute
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -2359,7 +2359,7 @@
ld [MonType], a
push hl
push bc
- predef Functiond88c
+ predef AddPkmnToParty
callba Function4db49
pop bc
pop hl
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -1375,7 +1375,7 @@
db "@"
; 0x1c5b35
-UnknownText_0x1c5b35: ; 0x1c5b35
+Text_Waitbutton_2: ; 0x1c5b35
text_waitbutton
db "@"
; 0x1c5b37
@@ -1480,19 +1480,19 @@
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."
@@ -1499,7 +1499,7 @@
prompt
; 0x1c5cdd
-UnknownText_0x1c5cdd: ; 0x1c5cdd
+Text_PPsIncreased: ; 0x1c5cdd
text_from_ram StringBuffer2
text "'s PP"
line "increased."
--
⑨