pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

changed name of some labels

Browse Source
This commit is contained in:
JimB16 2015-10-10 13:45:39 +02:00
parent 6730600d9b
commit 4b722eb530
10 changed files with 119 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
battle/ai/scoring.asm
View File

@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a
ld [hBattleTurn], a ld [hBattleTurn], a
push hl push hl
callab EnemyAttackDamage callab EnemyAttackDamage
callab BattleCommand62_DamageCalcWithStats callab BattleCommand_DamageCalcWithStats
callab BattleCommand07_CalcDamageTypeMultiplier callab BattleCommand_CalcDamageTypeMultiplier
pop hl pop hl
ld a, [CurDamage + 1] ld a, [CurDamage + 1]
ld c, a ld c, a
@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7
.asm_39400 .asm_39400
callab EnemyAttackDamage callab EnemyAttackDamage
callab BattleCommand62_DamageCalcWithStats callab BattleCommand_DamageCalcWithStats
callab BattleCommand07_CalcDamageTypeMultiplier callab BattleCommand_CalcDamageTypeMultiplier
ret ret
.ConstantDamageEffects .ConstantDamageEffects

10
battle/core.asm
View File

@ -645,7 +645,7 @@ Function3c434: ; 3c434
ld [wd235], a ld [wd235], a
inc a ; POUND inc a ; POUND
ld [FXAnimIDLo], a ld [FXAnimIDLo], a
call Function3e4bc call MoveSelectionScreen
push af push af
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
call UpdateBattleHuds call UpdateBattleHuds
@ -5584,7 +5584,7 @@ CheckAmuletCoin: ; 3e4a8
ret ret
; 3e4bc ; 3e4bc
Function3e4bc: ; 3e4bc MoveSelectionScreen: ; 3e4bc
call IsMobileBattle call IsMobileBattle
jr nz, .asm_3e4c8 jr nz, .asm_3e4c8
callba Function100b9f callba Function100b9f
@ -5784,7 +5784,7 @@ Function3e4bc: ; 3e4bc
.asm_3e613 .asm_3e613
call StdBattleTextBox call StdBattleTextBox
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
jp Function3e4bc jp MoveSelectionScreen
; 3e61c ; 3e61c
.string_3e61c ; 3e61c .string_3e61c ; 3e61c
@ -5869,7 +5869,7 @@ endr
.asm_3e69e .asm_3e69e
xor a xor a
ld [wd0e3], a ld [wd0e3], a
jp Function3e4bc jp MoveSelectionScreen
.asm_3e6a5 .asm_3e6a5
push hl push hl
@ -5896,7 +5896,7 @@ endr
.asm_3e6bf .asm_3e6bf
ld a, [wcfa9] ld a, [wcfa9]
ld [wd0e3], a ld [wd0e3], a
jp Function3e4bc jp MoveSelectionScreen
; 3e6c8 ; 3e6c8
MoveInfoBox: ; 3e6c8 MoveInfoBox: ; 3e6c8

8
battle/effect_command_pointers.asm
View File

@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand04 ; 34555 dw BattleCommand04 ; 34555
dw BattleCommand05 ; 34631 dw BattleCommand05 ; 34631
dw BattleCommand06 ; 352dc dw BattleCommand06 ; 352dc
dw BattleCommand07_CalcDamageTypeMultiplier ; 346d2 dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
dw BattleCommand08 ; 34cfd dw BattleCommand08 ; 34cfd
dw BattleCommand09 ; 34d32 dw BattleCommand09 ; 34d32
dw BattleCommand0a ; 34eee dw BattleCommand0a ; 34eee
@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand5f ; 377ce dw BattleCommand5f ; 377ce
dw BattleCommand60 ; 3784b dw BattleCommand60 ; 3784b
dw BattleCommand61 ; 37874 dw BattleCommand61 ; 37874
dw BattleCommand62_DamageCalcWithStats ; 35612 dw BattleCommand_DamageCalcWithStats ; 35612 - 62
dw BattleCommand63 ; 3790e dw BattleCommand63 ; 3790e
dw BattleCommand64 ; 37939 dw BattleCommand64 ; 37939
dw BattleCommand65 ; 37972 dw BattleCommand65 ; 37972
@ -148,7 +148,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand90 ; 34ecc dw BattleCommand90 ; 34ecc
dw BattleCommand91 ; 34fdb dw BattleCommand91 ; 34fdb
dw BattleCommand92 ; 34fd1 dw BattleCommand92 ; 34fd1
dw BattleCommand93 ; 34ffd dw BattleCommand_SwitchTurn ; 34ffd - 93
dw BattleCommand94 ; 36a82 dw BattleCommand94 ; 36a82
dw BattleCommand95 ; 37c1a dw BattleCommand95 ; 37c1a
dw BattleCommand96 ; 37c55 dw BattleCommand96 ; 37c55
@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommanda6 ; 365af dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3 dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5 dw BattleCommanda8 ; 355b5
dw BattleCommanda9_IfAttackMissedResetDamage ; 355d5 dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
dw BattleCommandaa ; 37e80 dw BattleCommandaa ; 37e80
dw BattleCommandab ; 34f57 dw BattleCommandab ; 34f57
dw BattleCommandac ; 3658f dw BattleCommandac ; 3658f

80
battle/effect_commands.asm
View File

@ -385,9 +385,9 @@ CantMove: ; 341f0
Function34216: ; 34216 Function34216: ; 34216
call SwitchTurn call BattleCommand_SwitchTurn
call CantMove call CantMove
jp SwitchTurn jp BattleCommand_SwitchTurn
; 3421f ; 3421f
@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f
ld hl, HurtItselfText ld hl, HurtItselfText
call StdBattleTextBox call StdBattleTextBox
call Function355dd call Function355dd
call BattleCommand62_DamageCalcWithStats call BattleCommand_DamageCalcWithStats
call BattleCommand0a call BattleCommand0a
xor a xor a
ld [wcfca], a ld [wcfca], a
@ -652,7 +652,7 @@ HitConfusion: ; 343a5
ld [CriticalHit], a ld [CriticalHit], a
call Function355dd call Function355dd
call BattleCommand62_DamageCalcWithStats call BattleCommand_DamageCalcWithStats
call BattleCommand0a call BattleCommand0a
xor a xor a
@ -1336,7 +1336,7 @@ BattleCommand4f: ; 346cd
; 346d2 ; 346d2
BattleCommand07_CalcDamageTypeMultiplier: ; 346d2 BattleCommand_CalcDamageTypeMultiplier: ; 346d2
; STAB = Same Type Attack Bonus ; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar call GetBattleVar
@ -2872,8 +2872,7 @@ BattleCommand91_92: ; 34feb
; 34ffd ; 34ffd
SwitchTurn: ; 34ffd BattleCommand_SwitchTurn: ; 34ffd
BattleCommand93: ; 34ffd
; switchturn ; switchturn
ld a, [hBattleTurn] ld a, [hBattleTurn]
@ -3246,7 +3245,7 @@ BattleCommand11: ; 351c0
predef Functionc6e0 predef Functionc6e0
call RefreshBattleHuds call RefreshBattleHuds
call SwitchTurn call BattleCommand_SwitchTurn
xor a xor a
ld [wcfca], a ld [wcfca], a
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
@ -3254,7 +3253,7 @@ BattleCommand11: ; 351c0
ld [wc689], a ld [wc689], a
ld a, $c2 ld a, $c2
call Function37e44 call Function37e44
call SwitchTurn call BattleCommand_SwitchTurn
jr .asm_3524d ; 3522f $1c jr .asm_3524d ; 3522f $1c
@ -3305,10 +3304,10 @@ BattleCommand12: ; 35250
ret z ret z
ld [de], a ld [de], a
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, RageBuildingText ld hl, RageBuildingText
call StdBattleTextBox call StdBattleTextBox
jp SwitchTurn jp BattleCommand_SwitchTurn
; 3527b ; 3527b
@ -3953,10 +3952,9 @@ Function355bd: ; 355bd
call GetPartyLocation call GetPartyLocation
pop bc pop bc
ret ret
; 355d5
BattleCommanda9_IfAttackMissedResetDamage: ; 355d5 BattleCommand_IfAttackMissedResetDamage: ; 355d5
; clearmissdamage ; clearmissdamage
ld a, [AttackMissed] ld a, [AttackMissed]
and a and a
@ -4004,7 +4002,7 @@ endr
; 35612 ; 35612
BattleCommand62_DamageCalcWithStats: ; 35612 BattleCommand_DamageCalcWithStats: ; 35612
; damagecalc ; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b. ; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@ -4412,7 +4410,7 @@ BattleCommand3f: ; 35726
call EnemyAttackDamage call EnemyAttackDamage
.notEnemysTurn .notEnemysTurn
call BattleCommand62_DamageCalcWithStats call BattleCommand_DamageCalcWithStats
pop hl pop hl
ld [hl], 1 ld [hl], 1
ret ret
@ -4754,7 +4752,7 @@ BattleCommand44: ; 359e6
cp CURSE_T cp CURSE_T
jr z, .asm_35a50 jr z, .asm_35a50
call AnimateCurrentMove call AnimateCurrentMove
call SwitchTurn call BattleCommand_SwitchTurn
.asm_35a13 .asm_35a13
call BattleRandom call BattleRandom
@ -4783,7 +4781,7 @@ BattleCommand44: ; 359e6
ld a, [wd265] ld a, [wd265]
cp $a cp $a
jr nc, .asm_35a13 jr nc, .asm_35a13
call SwitchTurn call BattleCommand_SwitchTurn
ld a, [hl] ld a, [hl]
ld [wd265], a ld [wd265], a
@ -5457,13 +5455,13 @@ Function35de0: ; 35de0
ld hl, SubFadedText ld hl, SubFadedText
call StdBattleTextBox call StdBattleTextBox
call SwitchTurn call BattleCommand_SwitchTurn
call BattleCommanda7 call BattleCommanda7
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, Function37ec7 call z, Function37ec7
call SwitchTurn call BattleCommand_SwitchTurn
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr call GetBattleVarAddr
@ -6539,15 +6537,15 @@ Function3641a: ; 3641a
and a and a
jr z, .Player jr z, .Player
call SwitchTurn call BattleCommand_SwitchTurn
call Function365d7 call Function365d7
call SwitchTurn call BattleCommand_SwitchTurn
jr .end jr .end
.Player .Player
call SwitchTurn call BattleCommand_SwitchTurn
call Function365fd call Function365fd
call SwitchTurn call BattleCommand_SwitchTurn
.end .end
ld a, 1 ld a, 1
and a and a
@ -6828,7 +6826,7 @@ Function365d7: ; 365d7
ld hl, BadgeStatBoosts ld hl, BadgeStatBoosts
call CallBattleCore call CallBattleCore
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, Function3ec39 ld hl, Function3ec39
call CallBattleCore call CallBattleCore
@ -6836,7 +6834,7 @@ Function365d7: ; 365d7
ld hl, Function3ec76 ld hl, Function3ec76
call CallBattleCore call CallBattleCore
jp SwitchTurn jp BattleCommand_SwitchTurn
; 365fd ; 365fd
@ -6848,7 +6846,7 @@ Function365fd: ; 365fd
ld a, $5 ld a, $5
call Function3661d call Function3661d
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, Function3ec39 ld hl, Function3ec39
call CallBattleCore call CallBattleCore
@ -6856,7 +6854,7 @@ Function365fd: ; 365fd
ld hl, Function3ec76 ld hl, Function3ec76
call CallBattleCore call CallBattleCore
jp SwitchTurn jp BattleCommand_SwitchTurn
; 3661d ; 3661d
@ -7056,10 +7054,10 @@ BattleCommand3e: ; 3671a
ld [de], a ld [de], a
jr nz, .asm_3674c ; 36730 $1a jr nz, .asm_3674c ; 36730 $1a
res 1, [hl] res 1, [hl]
call SwitchTurn call BattleCommand_SwitchTurn
call Function37962 call Function37962
push af push af
call SwitchTurn call BattleCommand_SwitchTurn
pop af pop af
jr nz, .asm_3674c ; 3673f $b jr nz, .asm_3674c ; 3673f $b
set 7, [hl] set 7, [hl]
@ -8823,10 +8821,10 @@ BattleCommand2c: ; 3713e
call CallBattleCore call CallBattleCore
.asm_371a9 .asm_371a9
call AnimateCurrentMove call AnimateCurrentMove
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, Function3ccef ld hl, Function3ccef
call CallBattleCore call CallBattleCore
call SwitchTurn call BattleCommand_SwitchTurn
call UpdateUserInParty call UpdateUserInParty
call RefreshBattleHuds call RefreshBattleHuds
ld hl, RegainedHealthText ld hl, RegainedHealthText
@ -9500,7 +9498,7 @@ BattleCommand61: ; 37874
push de push de
.asm_3787d .asm_3787d
call BattleCommand07_CalcDamageTypeMultiplier call BattleCommand_CalcDamageTypeMultiplier
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $3 cp $3
@ -9544,7 +9542,7 @@ BattleCommand61: ; 37874
ld a, $3 ld a, $3
ld [wc689], a ld [wc689], a
call AnimateCurrentMove call AnimateCurrentMove
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, AICheckPlayerMaxHP ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
@ -9557,18 +9555,18 @@ BattleCommand61: ; 37874
ld hl, GetQuarterMaxHP ld hl, GetQuarterMaxHP
call CallBattleCore call CallBattleCore
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, Function3ccef ld hl, Function3ccef
call CallBattleCore call CallBattleCore
call SwitchTurn call BattleCommand_SwitchTurn
ld hl, RegainedHealthText ld hl, RegainedHealthText
call StdBattleTextBox call StdBattleTextBox
call SwitchTurn call BattleCommand_SwitchTurn
call UpdateOpponentInParty call UpdateOpponentInParty
jr .asm_37904 ; 378f1 $11 jr .asm_37904 ; 378f1 $11
.asm_378f3 .asm_378f3
call SwitchTurn call BattleCommand_SwitchTurn
call Function37ed5 call Function37ed5
jr nc, .asm_37904 ; 378f9 $9 jr nc, .asm_37904 ; 378f9 $9
call AnimateFailedMove call AnimateFailedMove
@ -10094,11 +10092,11 @@ endr
rst FarCall rst FarCall
call AnimateCurrentMove call AnimateCurrentMove
call SwitchTurn call BattleCommand_SwitchTurn
callab Function3ccef callab Function3ccef
call SwitchTurn call BattleCommand_SwitchTurn
call UpdateUserInParty call UpdateUserInParty
; 'regained health!' ; 'regained health!'
@ -10596,11 +10594,11 @@ Function37e54: ; 37e54
push hl push hl
push de push de
push bc push bc
call SwitchTurn call BattleCommand_SwitchTurn
callab PlayBattleAnim callab PlayBattleAnim
call SwitchTurn call BattleCommand_SwitchTurn
pop bc pop bc
pop de pop de
pop hl pop hl

4
battle/effects/curse.asm
View File

@ -44,10 +44,10 @@ BattleCommand54: ; 37588
call AnimateCurrentMove call AnimateCurrentMove
ld a, $2 ld a, $2
call Function36532 call Function36532
call SwitchTurn call BattleCommand_SwitchTurn
call BattleCommand8d call BattleCommand8d
call ResetMiss call ResetMiss
call SwitchTurn call BattleCommand_SwitchTurn
call BattleCommand70 call BattleCommand70
call BattleCommand8c call BattleCommand8c
call ResetMiss call ResetMiss

2
engine/predef.asm
View File

@ -36,7 +36,7 @@ PredefPointers:: ; 856b
add_predef FlagPredef add_predef FlagPredef
add_predef Functionc699 add_predef Functionc699
add_predef FillPP add_predef FillPP
add_predef Functiond88c add_predef AddPkmnToParty
add_predef Functionda96 add_predef Functionda96
add_predef SentGetPkmnIntoFromBox add_predef SentGetPkmnIntoFromBox
add_predef SentPkmnIntoBox add_predef SentPkmnIntoBox

68
items/item_effects.asm
View File

@ -562,7 +562,7 @@ endr
ld [MonType], a ld [MonType], a
call ClearSprites call ClearSprites
predef Functiond88c predef AddPkmnToParty
callba Function4db49 callba Function4db49
@ -1143,13 +1143,13 @@ Functionedce: ; edce
ld de, MUSIC_CAPTURE ld de, MUSIC_CAPTURE
call PlayMusic call PlayMusic
pop bc pop bc
ld hl, UnknownText_0xede6 ld hl, TextJump_Waitbutton
ret ret
; ede6 ; ede6
UnknownText_0xede6: ; 0xede6 TextJump_Waitbutton: ; 0xede6
; @ ; @
text_jump UnknownText_0x1c5b35 text_jump Text_Waitbutton_2
db "@" db "@"
; 0xedeb ; 0xedeb
@ -1262,7 +1262,7 @@ Calcium: ; ee3d
ld bc, $000d ld bc, $000d
call CopyBytes call CopyBytes
call Functionf780 call Play_SFX_FULL_HEAL
ld hl, UnknownText_0xeea6 ld hl, UnknownText_0xeea6
call PrintText call PrintText
@ -1518,7 +1518,7 @@ Functionefda: ; efda (3:6fda)
ld a, b ld a, b
ld [PartyMenuActionText], a ld [PartyMenuActionText], a
call Functionf030 call Functionf030
call Functionf780 call Play_SFX_FULL_HEAL
call Functionf279 call Functionf279
call Functionf795 call Functionf795
ld a, $0 ld a, $0
@ -2525,18 +2525,18 @@ Mysteryberry: ; f5bf
call Functionf1f9 call Functionf1f9
jp c, Functionf6e0 jp c, Functionf6e0
.asm_f5cd .restart_func
ld a, [wd002] ld a, [wd002]
cp MAX_ELIXER cp MAX_ELIXER
jp z, Functionf6af jp z, Functionf6af
cp ELIXER cp ELIXER
jp z, Functionf6af jp z, Functionf6af
ld hl, UnknownText_0xf725 ld hl, TextJump_RaiseThePPOfWhichMove
ld a, [wd002] ld a, [wd002]
cp PP_UP cp PP_UP
jr z, .asm_f5e7 jr z, .asm_f5e7
ld hl, UnknownText_0xf72a ld hl, TextJump_RestoreThePPOfWhichMove
.asm_f5e7 .asm_f5e7
call PrintText call PrintText
@ -2547,7 +2547,7 @@ Mysteryberry: ; f5bf
ld [CurMoveNum], a ld [CurMoveNum], a
ld a, $2 ld a, $2
ld [wd235], a ld [wd235], a
callba Function3e4bc callba MoveSelectionScreen
pop bc pop bc
ld a, b ld a, b
@ -2555,7 +2555,7 @@ Mysteryberry: ; f5bf
jr nz, .asm_f5c5 jr nz, .asm_f5c5
ld hl, PartyMon1Moves ld hl, PartyMon1Moves
ld bc, PartyMon2 - PartyMon1 ld bc, PartyMon2 - PartyMon1
call Functionf963 call Add_CurPartyMon_Times
push hl push hl
ld a, [hl] ld a, [hl]
@ -2570,29 +2570,29 @@ Mysteryberry: ; f5bf
ld a, [hl] ld a, [hl]
cp $a6 cp $a6
jr z, .asm_f62f jr z, .pp_is_maxed_out
ld bc, $0015 ld bc, $0015
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp $c0 cp $c0
jr c, .asm_f637 jr c, .increase_pp
.asm_f62f .pp_is_maxed_out
ld hl, UnknownText_0xf72f ld hl, TextJump_PPIsMaxedOut
call PrintText call PrintText
jr .asm_f5cd jr .restart_func
.asm_f637 .increase_pp
ld a, [hl] ld a, [hl]
add $40 add $40
ld [hl], a ld [hl], a
ld a, $1 ld a, $1
ld [wd265], a ld [wd265], a
call Functionf84c call Functionf84c
call Functionf780 call Play_SFX_FULL_HEAL
ld hl, UnknownText_0xf734 ld hl, TextJump_PPsIncreased
call PrintText call PrintText
Functionf64c: ; f64c Functionf64c: ; f64c
@ -2615,7 +2615,7 @@ Functionf652: ; f652
call .asm_f677 call .asm_f677
.asm_f66c .asm_f66c
call Functionf780 call Play_SFX_FULL_HEAL
ld hl, UnknownText_0xf739 ld hl, UnknownText_0xf739
call PrintText call PrintText
jr Functionf64c jr Functionf64c
@ -2673,7 +2673,7 @@ Functionf6af: ; f6af
push bc push bc
ld hl, PartyMon1Moves ld hl, PartyMon1Moves
ld bc, PartyMon2 - PartyMon1 ld bc, PartyMon2 - PartyMon1
call Functionf963 call Add_CurPartyMon_Times
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_f6ce jr z, .asm_f6ce
@ -2709,7 +2709,7 @@ Functionf6e8: ; f6e8
call Functionf8ec call Functionf8ec
ld hl, PartyMon1PP ld hl, PartyMon1PP
ld bc, PartyMon2 - PartyMon1 ld bc, PartyMon2 - PartyMon1
call Functionf963 call Add_CurPartyMon_Times
ld a, [wd265] ld a, [wd265]
ld b, a ld b, a
ld a, [hl] ld a, [hl]
@ -2749,27 +2749,27 @@ Functionf6e8: ; f6e8
ret ret
; f725 ; f725
UnknownText_0xf725: ; 0xf725 TextJump_RaiseThePPOfWhichMove: ; 0xf725
; Raise the PP of which move? ; Raise the PP of which move?
text_jump UnknownText_0x1c5c8a text_jump Text_RaiseThePPOfWhichMove
db "@" db "@"
; 0xf72a ; 0xf72a
UnknownText_0xf72a: ; 0xf72a TextJump_RestoreThePPOfWhichMove: ; 0xf72a
; Restore the PP of which move? ; Restore the PP of which move?
text_jump UnknownText_0x1c5ca7 text_jump Text_RestoreThePPOfWhichMove
db "@" db "@"
; 0xf72f ; 0xf72f
UnknownText_0xf72f: ; 0xf72f TextJump_PPIsMaxedOut: ; 0xf72f
; 's PP is maxed out. ; 's PP is maxed out.
text_jump UnknownText_0x1c5cc6 text_jump Text_PPIsMaxedOut
db "@" db "@"
; 0xf734 ; 0xf734
UnknownText_0xf734: ; 0xf734 TextJump_PPsIncreased: ; 0xf734
; 's PP increased. ; 's PP increased.
text_jump UnknownText_0x1c5cdd text_jump Text_PPsIncreased
db "@" db "@"
; 0xf739 ; 0xf739
@ -2926,7 +2926,7 @@ ItemB3: ; f77d
; f780 ; f780
Functionf780: ; f780 Play_SFX_FULL_HEAL: ; f780
push de push de
ld de, SFX_FULL_HEAL ld de, SFX_FULL_HEAL
call WaitPlaySFX call WaitPlaySFX
@ -2937,7 +2937,7 @@ Functionf780: ; f780
Functionf789: ; f789 Functionf789: ; f789
ld hl, UsedItemText ld hl, UsedItemText
call PrintText call PrintText
call Functionf780 call Play_SFX_FULL_HEAL
call Functiona80 call Functiona80
; fallthrough ; fallthrough
; f795 ; f795
@ -3251,7 +3251,7 @@ Functionf8ec: ; f8ec
jr .asm_f91d jr .asm_f91d
.asm_f91a .asm_f91a
call Functionf963 call Add_CurPartyMon_Times
.asm_f91d .asm_f91d
ld a, [hl] ld a, [hl]
@ -3298,7 +3298,7 @@ Functionf8ec: ; f8ec
ret ret
; f963 ; f963
Functionf963: ; f963 Add_CurPartyMon_Times: ; f963
ld a, [CurPartyMon] ld a, [CurPartyMon]
call AddNTimes call AddNTimes

37
main.asm
View File

@ -2932,7 +2932,7 @@ SpecialGiveShuckle: ; 7305
ld a, 15 ld a, 15
ld [CurPartyLevel], a ld [CurPartyLevel], a
predef Functiond88c predef AddPkmnToParty
jr nc, .NotGiven jr nc, .NotGiven
; Caught data. ; Caught data.
@ -7915,7 +7915,8 @@ Functiond839: ; d839
; d88c ; d88c
Functiond88c: ; d88c AddPkmnToParty: ; d88c
; Check if to copy wild Pkmn or generate new Pkmn
ld de, PartyCount ld de, PartyCount
ld a, [MonType] ld a, [MonType]
and $f and $f
@ -8176,12 +8177,15 @@ endr
ld [de], a ld [de], a
inc de inc de
ld hl, EnemyMonStatus ld hl, EnemyMonStatus
; Copy EnemyMonStatus
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
; Copy EnemyMonUnused
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
; Copy EnemyMonHP
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
@ -8194,16 +8198,17 @@ endr
dec a dec a
jr nz, .asm_da3b jr nz, .asm_da3b
ld hl, EnemyMonMaxHP ld hl, EnemyMonMaxHP
ld bc, $000c ld bc, 2*6 ; MaxHP + 5 Stats
call CopyBytes call CopyBytes
pop hl pop hl
jr .asm_da45 jr .asm_da45
.asm_da3b .asm_da3b
pop hl pop hl
ld bc, $000a ld bc, 2*5 ; 5 Stats
add hl, bc 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 call CalcPkmnStats
.asm_da45 .asm_da45
@ -8226,6 +8231,7 @@ endr
ret ret
; da6d ; da6d
FillPP: ; da6d FillPP: ; da6d
push bc push bc
ld b, NUM_MOVES ld b, NUM_MOVES
@ -8876,8 +8882,9 @@ SentPkmnIntoBox: ; de6e
ld [de], a ld [de], a
inc de inc de
; Set all 5 Experience Values to 0
xor a xor a
ld b, $a ld b, 2*5
.asm_dee5 .asm_dee5
ld [de], a ld [de], a
inc de inc de
@ -8920,10 +8927,12 @@ SentPkmnIntoBox: ; de6e
ld de, TempMonMoves ld de, TempMonMoves
ld bc, NUM_MOVES ld bc, NUM_MOVES
call CopyBytes call CopyBytes
ld hl, sBoxMon1PP ld hl, sBoxMon1PP
ld de, TempMonPP ld de, TempMonPP
ld bc, NUM_MOVES ld bc, NUM_MOVES
call CopyBytes call CopyBytes
ld b, 0 ld b, 0
call Functiondcb6 call Functiondcb6
@ -8932,6 +8941,7 @@ SentPkmnIntoBox: ; de6e
ret ret
; df42 ; df42
Functiondf42: ; df42 Functiondf42: ; df42
call CloseSRAM call CloseSRAM
and a and a
@ -8999,7 +9009,7 @@ GiveEgg:: ; df8c
push bc push bc
call CheckSeenMon call CheckSeenMon
push bc push bc
call Functiond88c call AddPkmnToParty
pop bc pop bc
ld a, c ld a, c
and a and a
@ -9476,7 +9486,7 @@ GivePoke:: ; e277
push bc push bc
xor a xor a
ld [MonType], a ld [MonType], a
call Functiond88c call AddPkmnToParty
jr nc, .asm_e2b0 jr nc, .asm_e2b0
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld a, [PartyCount] ld a, [PartyCount]
@ -9659,6 +9669,7 @@ Functione3d4: ; e3d4
ret ret
; e3d9 ; e3d9
TextJump_WasSentToBillsPC: ; 0xe3d9 TextJump_WasSentToBillsPC: ; 0xe3d9
; was sent to BILL's PC. ; was sent to BILL's PC.
text_jump Text_WasSentToBillsPC text_jump Text_WasSentToBillsPC
@ -35229,7 +35240,7 @@ TrainerType1: ; 397eb
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef Functiond88c predef AddPkmnToParty
pop hl pop hl
jr .loop jr .loop
; 39806 ; 39806
@ -35250,7 +35261,7 @@ TrainerType2: ; 39806
ld [MonType], a ld [MonType], a
push hl push hl
predef Functiond88c predef AddPkmnToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Moves ld hl, OTPartyMon1Moves
@ -35326,7 +35337,7 @@ TrainerType3: ; 39871
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [MonType], a
push hl push hl
predef Functiond88c predef AddPkmnToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item
@ -35357,7 +35368,7 @@ TrainerType4: ; 3989d
ld [MonType], a ld [MonType], a
push hl push hl
predef Functiond88c predef AddPkmnToParty
ld a, [OTPartyCount] ld a, [OTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, OTPartyMon1Item
@ -87322,7 +87333,7 @@ Functionfcc63: ; fcc63
ld [MonType], a ld [MonType], a
ld [wd10b], a ld [wd10b], a
callab Functione039 callab Functione039
predef Functiond88c predef AddPkmnToParty
ld e, TRADE_DIALOG ld e, TRADE_DIALOG
call GetTradeAttribute call GetTradeAttribute

2
misc/mobile_5f.asm
View File

@ -2359,7 +2359,7 @@ Function17ded9: ; 17ded9
ld [MonType], a ld [MonType], a
push hl push hl
push bc push bc
predef Functiond88c predef AddPkmnToParty
callba Function4db49 callba Function4db49
pop bc pop bc
pop hl pop hl

10
text/common_4.asm
View File

@ -1375,7 +1375,7 @@ UnknownText_0x1c5b34: ; 0x1c5b34
db "@" db "@"
; 0x1c5b35 ; 0x1c5b35
UnknownText_0x1c5b35: ; 0x1c5b35 Text_Waitbutton_2: ; 0x1c5b35
text_waitbutton text_waitbutton
db "@" db "@"
; 0x1c5b37 ; 0x1c5b37
@ -1480,26 +1480,26 @@ UnknownText_0x1c5c89: ; 0x1c5c89
db "@" db "@"
; 0x1c5c8a ; 0x1c5c8a
UnknownText_0x1c5c8a: ; 0x1c5c8a Text_RaiseThePPOfWhichMove: ; 0x1c5c8a
text "Raise the PP of" text "Raise the PP of"
line "which move?" line "which move?"
done done
; 0x1c5ca7 ; 0x1c5ca7
UnknownText_0x1c5ca7: ; 0x1c5ca7 Text_RestoreThePPOfWhichMove: ; 0x1c5ca7
text "Restore the PP of" text "Restore the PP of"
line "which move?" line "which move?"
done done
; 0x1c5cc6 ; 0x1c5cc6
UnknownText_0x1c5cc6: ; 0x1c5cc6 Text_PPIsMaxedOut: ; 0x1c5cc6
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text "'s PP" text "'s PP"
line "is maxed out." line "is maxed out."
prompt prompt
; 0x1c5cdd ; 0x1c5cdd
UnknownText_0x1c5cdd: ; 0x1c5cdd Text_PPsIncreased: ; 0x1c5cdd
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text "'s PP" text "'s PP"
line "increased." line "increased."