mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-13 15:13:42 +01:00
label pokemon3.s
This commit is contained in:
DizzyEggg
parent
33ee3115ab
commit
cdd36116f2
@ -8721,7 +8721,7 @@ _080449D2:
|
||||
adds r0, r2, r0
|
||||
ldr r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_806E880
|
||||
bl GetFlavourRelationByPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bge _080449F0
|
||||
@ -8782,7 +8782,7 @@ _08044A50:
|
||||
adds r0, r1, r0
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl sub_806E880
|
||||
bl GetFlavourRelationByPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bge _08044A6E
|
||||
@ -8845,7 +8845,7 @@ _08044ACC:
|
||||
adds r0, r5, r0
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x2
|
||||
bl sub_806E880
|
||||
bl GetFlavourRelationByPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bge _08044AFC
|
||||
@ -8916,7 +8916,7 @@ _08044B60:
|
||||
adds r0, r2, r0
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x3
|
||||
bl sub_806E880
|
||||
bl GetFlavourRelationByPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bge _08044B90
|
||||
@ -8987,7 +8987,7 @@ _08044BF2:
|
||||
adds r0, r1, r0
|
||||
ldr r0, [r0]
|
||||
movs r1, 0x4
|
||||
bl sub_806E880
|
||||
bl GetFlavourRelationByPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bge _08044C24
|
||||
@ -10864,7 +10864,7 @@ _08045D08:
|
||||
ldr r0, [r0]
|
||||
adds r2, 0x3C
|
||||
adds r1, r2
|
||||
bl sub_806E8D4
|
||||
bl IsOtherTrainer
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08045DAC
|
||||
|
||||
@ -8031,7 +8031,7 @@ _0804A6AA:
|
||||
muls r0, r1
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
bl sub_806E8A8
|
||||
bl IsTradedMon
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804A714
|
||||
@ -8189,7 +8189,7 @@ _0804A78E:
|
||||
muls r1, r2
|
||||
adds r1, r3
|
||||
ldrh r1, [r1]
|
||||
bl sub_806DADC
|
||||
bl MonGainEVs
|
||||
_0804A824:
|
||||
ldr r0, =gBattleStruct
|
||||
ldr r1, [r0]
|
||||
@ -8428,7 +8428,7 @@ _0804A9B2:
|
||||
adds r0, r1, 0
|
||||
adds r0, r7
|
||||
movs r1, 0
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
ldr r1, =gBattlePartyID
|
||||
mov r2, r9
|
||||
ldr r0, [r2]
|
||||
@ -14973,7 +14973,7 @@ _0804E224:
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_806E804
|
||||
bl IsHMMove2
|
||||
cmp r0, 0
|
||||
beq _0804E274
|
||||
ldr r0, =0x0000013f
|
||||
|
||||
@ -253,7 +253,7 @@ _0805714A:
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x8
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
b _080571CE
|
||||
.pool
|
||||
_08057198:
|
||||
@ -266,7 +266,7 @@ _08057198:
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x6
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
b _080571CE
|
||||
.pool
|
||||
_080571B8:
|
||||
@ -279,7 +279,7 @@ _080571B8:
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
movs r1, 0x6
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
_080571CE:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
|
||||
@ -78,7 +78,7 @@ sub_809E7E8: @ 809E7E8
|
||||
adds r0, r4, 0
|
||||
bl sub_80AEFBC
|
||||
adds r0, r4, 0
|
||||
bl sub_806DE44
|
||||
bl UpdatePartyPokerusTime
|
||||
adds r0, r4, 0
|
||||
bl sub_8137904
|
||||
adds r0, r4, 0
|
||||
|
||||
@ -226,7 +226,7 @@ _0806FBBC:
|
||||
movs r2, 0x50
|
||||
bl memcpy
|
||||
adds r0, r5, 0
|
||||
bl RestoreBoxMonMovesPP
|
||||
bl BoxMonRestorePP
|
||||
adds r1, r5, 0
|
||||
adds r1, 0x88
|
||||
movs r0, 0
|
||||
@ -335,7 +335,7 @@ sub_806FCA4: @ 806FCA4
|
||||
ldr r7, =0x0000ffff
|
||||
_0806FCAC:
|
||||
adds r0, r4, 0
|
||||
bl sub_806DF74
|
||||
bl TryIncrementMonLevel
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0806FCE8
|
||||
@ -1380,7 +1380,7 @@ _080704C4:
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r1, =gUnknown_020249C4
|
||||
bl sub_806E204
|
||||
bl GetLevelUpMovesBySpecies
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
str r0, [sp, 0x4]
|
||||
@ -1495,7 +1495,7 @@ _080705C2:
|
||||
lsls r1, r5, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r7, 0
|
||||
bl sub_806E00C
|
||||
bl CanMonLearnTMHM
|
||||
cmp r0, 0
|
||||
beq _080705FE
|
||||
ldrh r1, [r4]
|
||||
|
||||
@ -246,7 +246,7 @@ sub_80714B8: @ 80714B8
|
||||
movs r1, 0x23
|
||||
bl SetMonData
|
||||
adds r0, r5, 0
|
||||
bl RestoreMonMovesPP
|
||||
bl MonRestorePP
|
||||
adds r0, r5, 0
|
||||
bl CalculateMonStats
|
||||
add sp, 0x14
|
||||
|
||||
@ -2282,7 +2282,7 @@ _0813EFC8:
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_806E804
|
||||
bl IsHMMove2
|
||||
cmp r0, 0
|
||||
beq _0813F014
|
||||
ldr r0, =gUnknown_085CC270
|
||||
@ -3434,7 +3434,7 @@ _0813FAEC:
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
adds r0, r4, 0
|
||||
bl sub_806E804
|
||||
bl IsHMMove2
|
||||
cmp r0, 0
|
||||
beq _0813FB3C
|
||||
ldr r0, =gUnknown_085CC270
|
||||
|
||||
@ -1366,7 +1366,7 @@ per_step_scripts: @ 809C9F4
|
||||
b _0809CB24
|
||||
_0809CA04:
|
||||
bl sub_80B215C
|
||||
bl happiness_algorithm_step
|
||||
bl AdjustFriendship_step
|
||||
bl sub_81D4998
|
||||
ldr r0, =gUnknown_02037590
|
||||
ldrb r1, [r0]
|
||||
@ -1500,8 +1500,8 @@ sub_809CB30: @ 809CB30
|
||||
.pool
|
||||
thumb_func_end sub_809CB30
|
||||
|
||||
thumb_func_start happiness_algorithm_step
|
||||
happiness_algorithm_step: @ 809CB44
|
||||
thumb_func_start AdjustFriendship_step
|
||||
AdjustFriendship_step: @ 809CB44
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =0x0000402a
|
||||
bl GetVarPointer
|
||||
@ -1519,7 +1519,7 @@ happiness_algorithm_step: @ 809CB44
|
||||
_0809CB62:
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x5
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
adds r5, 0x64
|
||||
subs r4, 0x1
|
||||
cmp r4, 0
|
||||
@ -1529,7 +1529,7 @@ _0809CB72:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end happiness_algorithm_step
|
||||
thumb_func_end AdjustFriendship_step
|
||||
|
||||
thumb_func_start overworld_poison_timer_set
|
||||
overworld_poison_timer_set: @ 809CB80
|
||||
|
||||
@ -73,7 +73,7 @@ sub_80F95C0: @ 80F95C0
|
||||
str r0, [sp]
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x7
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x37
|
||||
mov r2, sp
|
||||
|
||||
@ -2441,7 +2441,7 @@ sub_8174A88: @ 8174A88
|
||||
ldrh r0, [r7, 0x8]
|
||||
lsls r0, 23
|
||||
lsrs r0, 23
|
||||
bl sub_806E3C0
|
||||
bl SpeciesToPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
ldr r0, =0x0000ffff
|
||||
|
||||
@ -56002,7 +56002,7 @@ sub_80261F8: @ 80261F8
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
adds r0, r1, 0
|
||||
bl sub_806EBA4
|
||||
bl IsMonShiny
|
||||
strb r0, [r4]
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
|
||||
@ -223,7 +223,7 @@ _08068430:
|
||||
mov r2, r8
|
||||
bl SetMonData
|
||||
adds r0, r7, 0
|
||||
bl RestoreMonMovesPP
|
||||
bl MonRestorePP
|
||||
adds r0, r7, 0
|
||||
bl CalculateMonStats
|
||||
add sp, 0x58
|
||||
|
||||
@ -2963,7 +2963,7 @@ _0806B4B2:
|
||||
cmp r0, 0
|
||||
bne _0806B514
|
||||
mov r0, r8
|
||||
bl RestoreMonMovesPP
|
||||
bl MonRestorePP
|
||||
adds r0, r4, 0
|
||||
mov r1, r8
|
||||
movs r2, 0x50
|
||||
|
||||
176
asm/pokemon_3.s
176
asm/pokemon_3.s
@ -1557,8 +1557,8 @@ _0806D92E:
|
||||
bx r1
|
||||
thumb_func_end nature_stat_mod
|
||||
|
||||
thumb_func_start happiness_algorithm
|
||||
happiness_algorithm: @ 806D934
|
||||
thumb_func_start AdjustFriendship
|
||||
AdjustFriendship: @ 806D934
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
@ -1760,10 +1760,10 @@ _0806DAC2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end happiness_algorithm
|
||||
thumb_func_end AdjustFriendship
|
||||
|
||||
thumb_func_start sub_806DADC
|
||||
sub_806DADC: @ 806DADC
|
||||
thumb_func_start MonGainEVs
|
||||
MonGainEVs: @ 806DADC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -1795,7 +1795,7 @@ _0806DAF0:
|
||||
_0806DB14:
|
||||
mov r0, r8
|
||||
movs r1, 0
|
||||
bl sub_806DDE4
|
||||
bl CheckPartyHasHadPokerus
|
||||
lsls r0, 24
|
||||
movs r2, 0x1
|
||||
cmp r0, 0
|
||||
@ -1973,10 +1973,10 @@ _0806DC7A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_806DADC
|
||||
thumb_func_end MonGainEVs
|
||||
|
||||
thumb_func_start sub_806DC8C
|
||||
sub_806DC8C: @ 806DC8C
|
||||
thumb_func_start GetMonEVCount
|
||||
GetMonEVCount: @ 806DC8C
|
||||
push {r4-r6,lr}
|
||||
adds r6, r0, 0
|
||||
movs r5, 0
|
||||
@ -1997,10 +1997,10 @@ _0806DC94:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DC8C
|
||||
thumb_func_end GetMonEVCount
|
||||
|
||||
thumb_func_start sub_806DCB4
|
||||
sub_806DCB4: @ 806DCB4
|
||||
thumb_func_start RandomlyGivePartyPokerus
|
||||
RandomlyGivePartyPokerus: @ 806DCB4
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
adds r6, r0, 0
|
||||
@ -2047,7 +2047,7 @@ _0806DCDA:
|
||||
adds r0, r1
|
||||
ldrb r1, [r0]
|
||||
adds r0, r6, 0
|
||||
bl sub_806DDE4
|
||||
bl CheckPartyHasHadPokerus
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806DD70
|
||||
@ -2096,10 +2096,10 @@ _0806DD70:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_806DCB4
|
||||
thumb_func_end RandomlyGivePartyPokerus
|
||||
|
||||
thumb_func_start sub_806DD7C
|
||||
sub_806DD7C: @ 806DD7C
|
||||
thumb_func_start CheckPartyPokerus
|
||||
CheckPartyPokerus: @ 806DD7C
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
@ -2153,10 +2153,10 @@ _0806DDD8:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DD7C
|
||||
thumb_func_end CheckPartyPokerus
|
||||
|
||||
thumb_func_start sub_806DDE4
|
||||
sub_806DDE4: @ 806DDE4
|
||||
thumb_func_start CheckPartyHasHadPokerus
|
||||
CheckPartyHasHadPokerus: @ 806DDE4
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
@ -2206,10 +2206,10 @@ _0806DE38:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DDE4
|
||||
thumb_func_end CheckPartyHasHadPokerus
|
||||
|
||||
thumb_func_start sub_806DE44
|
||||
sub_806DE44: @ 806DE44
|
||||
thumb_func_start UpdatePartyPokerusTime
|
||||
UpdatePartyPokerusTime: @ 806DE44
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 16
|
||||
@ -2275,10 +2275,10 @@ _0806DEB2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_806DE44
|
||||
thumb_func_end UpdatePartyPokerusTime
|
||||
|
||||
thumb_func_start sub_806DEC4
|
||||
sub_806DEC4: @ 806DEC4
|
||||
thumb_func_start PartySpreadPokerus
|
||||
PartySpreadPokerus: @ 806DEC4
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
adds r7, r0, 0
|
||||
@ -2362,10 +2362,10 @@ _0806DF6A:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_806DEC4
|
||||
thumb_func_end PartySpreadPokerus
|
||||
|
||||
thumb_func_start sub_806DF74
|
||||
sub_806DF74: @ 806DF74
|
||||
thumb_func_start TryIncrementMonLevel
|
||||
TryIncrementMonLevel: @ 806DF74
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r5, r0, 0
|
||||
@ -2437,10 +2437,10 @@ _0806E004:
|
||||
pop {r4-r6}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806DF74
|
||||
thumb_func_end TryIncrementMonLevel
|
||||
|
||||
thumb_func_start sub_806E00C
|
||||
sub_806E00C: @ 806E00C
|
||||
thumb_func_start CanMonLearnTMHM
|
||||
CanMonLearnTMHM: @ 806E00C
|
||||
push {r4,r5,lr}
|
||||
lsls r1, 24
|
||||
lsrs r4, r1, 24
|
||||
@ -2485,10 +2485,10 @@ _0806E05A:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E00C
|
||||
thumb_func_end CanMonLearnTMHM
|
||||
|
||||
thumb_func_start sub_806E064
|
||||
sub_806E064: @ 806E064
|
||||
thumb_func_start CanSpeciesLearnTMHM
|
||||
CanSpeciesLearnTMHM: @ 806E064
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
@ -2530,10 +2530,10 @@ _0806E0AA:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E064
|
||||
thumb_func_end CanSpeciesLearnTMHM
|
||||
|
||||
thumb_func_start sub_806E0B4
|
||||
sub_806E0B4: @ 806E0B4
|
||||
thumb_func_start GetMoveRelearnerMoves
|
||||
GetMoveRelearnerMoves: @ 806E0B4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2701,10 +2701,10 @@ _0806E1E4:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E0B4
|
||||
thumb_func_end GetMoveRelearnerMoves
|
||||
|
||||
thumb_func_start sub_806E204
|
||||
sub_806E204: @ 806E204
|
||||
thumb_func_start GetLevelUpMovesBySpecies
|
||||
GetLevelUpMovesBySpecies: @ 806E204
|
||||
push {r4-r7,lr}
|
||||
adds r6, r1, 0
|
||||
lsls r0, 16
|
||||
@ -2746,10 +2746,10 @@ _0806E248:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E204
|
||||
thumb_func_end GetLevelUpMovesBySpecies
|
||||
|
||||
thumb_func_start sub_806E25C
|
||||
sub_806E25C: @ 806E25C
|
||||
thumb_func_start GetNumberOfRelearnableMoves
|
||||
GetNumberOfRelearnableMoves: @ 806E25C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2929,10 +2929,10 @@ _0806E3A2:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E25C
|
||||
thumb_func_end GetNumberOfRelearnableMoves
|
||||
|
||||
thumb_func_start sub_806E3C0
|
||||
sub_806E3C0: @ 806E3C0
|
||||
thumb_func_start SpeciesToPokedexNum
|
||||
SpeciesToPokedexNum: @ 806E3C0
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
@ -2959,7 +2959,7 @@ _0806E3F2:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E3C0
|
||||
thumb_func_end SpeciesToPokedexNum
|
||||
|
||||
thumb_func_start sub_806E3F8
|
||||
sub_806E3F8: @ 806E3F8
|
||||
@ -3418,12 +3418,12 @@ _0806E7F8:
|
||||
.pool
|
||||
thumb_func_end sub_806E7CC
|
||||
|
||||
thumb_func_start sub_806E804
|
||||
sub_806E804: @ 806E804
|
||||
thumb_func_start IsHMMove2
|
||||
IsHMMove2: @ 806E804
|
||||
push {r4,lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
ldr r2, =gUnknown_08329EEA
|
||||
ldr r2, =gHMMoves
|
||||
ldrh r0, [r2]
|
||||
ldr r1, =0x0000ffff
|
||||
cmp r0, r1
|
||||
@ -3449,7 +3449,7 @@ _0806E838:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E804
|
||||
thumb_func_end IsHMMove2
|
||||
|
||||
thumb_func_start sub_806E840
|
||||
sub_806E840: @ 806E840
|
||||
@ -3466,15 +3466,15 @@ sub_806E840: @ 806E840
|
||||
.pool
|
||||
thumb_func_end sub_806E840
|
||||
|
||||
thumb_func_start sub_806E858
|
||||
sub_806E858: @ 806E858
|
||||
thumb_func_start GetMonFlavourRelation
|
||||
GetMonFlavourRelation: @ 806E858
|
||||
push {r4,lr}
|
||||
lsls r4, r1, 24
|
||||
lsrs r4, 24
|
||||
bl GetNature
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, =gUnknown_085B25A0
|
||||
ldr r2, =gPokeblockFlavorCompatibilityTable
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
adds r1, r4
|
||||
@ -3485,17 +3485,17 @@ sub_806E858: @ 806E858
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E858
|
||||
thumb_func_end GetMonFlavourRelation
|
||||
|
||||
thumb_func_start sub_806E880
|
||||
sub_806E880: @ 806E880
|
||||
thumb_func_start GetFlavourRelationByPersonality
|
||||
GetFlavourRelationByPersonality: @ 806E880
|
||||
push {r4,lr}
|
||||
lsls r4, r1, 24
|
||||
lsrs r4, 24
|
||||
bl GetNatureFromPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, =gUnknown_085B25A0
|
||||
ldr r2, =gPokeblockFlavorCompatibilityTable
|
||||
lsls r1, r0, 2
|
||||
adds r1, r0
|
||||
adds r1, r4
|
||||
@ -3506,10 +3506,10 @@ sub_806E880: @ 806E880
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806E880
|
||||
thumb_func_end GetFlavourRelationByPersonality
|
||||
|
||||
thumb_func_start sub_806E8A8
|
||||
sub_806E8A8: @ 806E8A8
|
||||
thumb_func_start IsTradedMon
|
||||
IsTradedMon: @ 806E8A8
|
||||
push {r4,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
@ -3521,17 +3521,17 @@ sub_806E8A8: @ 806E8A8
|
||||
movs r2, 0
|
||||
bl GetMonData
|
||||
mov r1, sp
|
||||
bl sub_806E8D4
|
||||
bl IsOtherTrainer
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
add sp, 0x8
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E8A8
|
||||
thumb_func_end IsTradedMon
|
||||
|
||||
thumb_func_start sub_806E8D4
|
||||
sub_806E8D4: @ 806E8D4
|
||||
thumb_func_start IsOtherTrainer
|
||||
IsOtherTrainer: @ 806E8D4
|
||||
push {r4,r5,lr}
|
||||
adds r5, r1, 0
|
||||
ldr r1, =gSaveBlock2Ptr
|
||||
@ -3574,18 +3574,18 @@ _0806E91E:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806E8D4
|
||||
thumb_func_end IsOtherTrainer
|
||||
|
||||
thumb_func_start RestoreMonMovesPP
|
||||
RestoreMonMovesPP: @ 806E924
|
||||
thumb_func_start MonRestorePP
|
||||
MonRestorePP: @ 806E924
|
||||
push {lr}
|
||||
bl RestoreBoxMonMovesPP
|
||||
bl BoxMonRestorePP
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end RestoreMonMovesPP
|
||||
thumb_func_end MonRestorePP
|
||||
|
||||
thumb_func_start RestoreBoxMonMovesPP
|
||||
RestoreBoxMonMovesPP: @ 806E930
|
||||
thumb_func_start BoxMonRestorePP
|
||||
BoxMonRestorePP: @ 806E930
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
adds r5, r0, 0
|
||||
@ -3632,7 +3632,7 @@ _0806E984:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end RestoreBoxMonMovesPP
|
||||
thumb_func_end BoxMonRestorePP
|
||||
|
||||
thumb_func_start sub_806E994
|
||||
sub_806E994: @ 806E994
|
||||
@ -3705,8 +3705,8 @@ _0806E9F6:
|
||||
.pool
|
||||
thumb_func_end sub_806E994
|
||||
|
||||
thumb_func_start sub_806EA40
|
||||
sub_806EA40: @ 806EA40
|
||||
thumb_func_start GetWildMonTableIdInAlteringCave
|
||||
GetWildMonTableIdInAlteringCave: @ 806EA40
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r3, r0, 16
|
||||
@ -3728,10 +3728,10 @@ _0806EA58:
|
||||
_0806EA62:
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806EA40
|
||||
thumb_func_end GetWildMonTableIdInAlteringCave
|
||||
|
||||
thumb_func_start sub_806EA68
|
||||
sub_806EA68: @ 806EA68
|
||||
thumb_func_start SetWildMonHeldItem
|
||||
SetWildMonHeldItem: @ 806EA68
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -3783,7 +3783,7 @@ _0806EAC6:
|
||||
cmp r1, r0
|
||||
bne _0806EB2C
|
||||
adds r0, r4, 0
|
||||
bl sub_806EA40
|
||||
bl GetWildMonTableIdInAlteringCave
|
||||
adds r2, r0, 0
|
||||
cmp r2, 0
|
||||
beq _0806EB04
|
||||
@ -3791,7 +3791,7 @@ _0806EAC6:
|
||||
bcc _0806EB90
|
||||
ldr r0, =gEnemyParty
|
||||
lsls r2, 2
|
||||
ldr r1, =gUnknown_08329EFE
|
||||
ldr r1, =gAlteringCaveWildMonHeldItems
|
||||
b _0806EB6C
|
||||
.pool
|
||||
_0806EB04:
|
||||
@ -3864,10 +3864,10 @@ _0806EB90:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_806EA68
|
||||
thumb_func_end SetWildMonHeldItem
|
||||
|
||||
thumb_func_start sub_806EBA4
|
||||
sub_806EBA4: @ 806EBA4
|
||||
thumb_func_start IsMonShiny
|
||||
IsMonShiny: @ 806EBA4
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0x1
|
||||
@ -3880,16 +3880,16 @@ sub_806EBA4: @ 806EBA4
|
||||
bl GetMonData
|
||||
adds r1, r0, 0
|
||||
adds r0, r5, 0
|
||||
bl sub_806EBD0
|
||||
bl IsShinyOtIdPersonality
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_806EBA4
|
||||
thumb_func_end IsMonShiny
|
||||
|
||||
thumb_func_start sub_806EBD0
|
||||
sub_806EBD0: @ 806EBD0
|
||||
thumb_func_start IsShinyOtIdPersonality
|
||||
IsShinyOtIdPersonality: @ 806EBD0
|
||||
push {r4,lr}
|
||||
movs r4, 0
|
||||
lsrs r2, r0, 16
|
||||
@ -3909,7 +3909,7 @@ _0806EBEA:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_806EBD0
|
||||
thumb_func_end IsShinyOtIdPersonality
|
||||
|
||||
thumb_func_start sub_806EBF8
|
||||
sub_806EBF8: @ 806EBF8
|
||||
|
||||
@ -851,7 +851,7 @@ _0806C410:
|
||||
.4byte _0806C994
|
||||
_0806C430:
|
||||
mov r0, r8
|
||||
bl sub_806DC8C
|
||||
bl GetMonEVCount
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
ldr r5, [sp, 0x24]
|
||||
@ -1542,7 +1542,7 @@ _0806C9F8:
|
||||
.4byte _0806CC68
|
||||
_0806CA18:
|
||||
mov r0, r8
|
||||
bl sub_806DC8C
|
||||
bl GetMonEVCount
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
ldr r5, [sp, 0x24]
|
||||
|
||||
@ -3188,7 +3188,7 @@ sub_8136FE4: @ 8136FE4
|
||||
lsrs r0, 24
|
||||
movs r6, 0
|
||||
movs r4, 0
|
||||
ldr r1, =gUnknown_085B25A0
|
||||
ldr r1, =gPokeblockFlavorCompatibilityTable
|
||||
mov r9, r1
|
||||
lsls r1, r0, 2
|
||||
adds r7, r1, r0
|
||||
@ -7545,7 +7545,7 @@ sub_81393C8: @ 81393C8
|
||||
muls r0, r1
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
bl sub_806DC8C
|
||||
bl GetMonEVCount
|
||||
lsls r0, 16
|
||||
ldr r1, =0x01fd0000
|
||||
cmp r0, r1
|
||||
@ -7724,7 +7724,7 @@ sub_8139540: @ 8139540
|
||||
push {lr}
|
||||
ldr r0, =gPlayerParty
|
||||
movs r1, 0x3F
|
||||
bl sub_806DD7C
|
||||
bl CheckPartyPokerus
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08139558
|
||||
|
||||
@ -3306,7 +3306,7 @@ _080369AE:
|
||||
movs r2, 0
|
||||
bl LoadTrainerParty
|
||||
_080369E4:
|
||||
bl sub_806EA68
|
||||
bl SetWildMonHeldItem
|
||||
_080369E8:
|
||||
ldr r1, =gMain
|
||||
ldr r2, =0x00000439
|
||||
@ -3331,7 +3331,7 @@ _080369E8:
|
||||
_08036A10:
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x3
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
adds r4, 0x64
|
||||
cmp r4, r5
|
||||
ble _08036A10
|
||||
@ -9702,7 +9702,7 @@ _0803A1E4:
|
||||
cmp r2, 0x43
|
||||
bls _0803A1E4
|
||||
ldr r0, =gEnemyParty
|
||||
bl sub_806EBA4
|
||||
bl IsMonShiny
|
||||
ldr r3, =gBattleResults
|
||||
movs r1, 0x1
|
||||
ands r1, r0
|
||||
@ -16555,9 +16555,9 @@ c4_overworld: @ 803DF70
|
||||
bne _0803DF8C
|
||||
ldr r4, =gPlayerParty
|
||||
adds r0, r4, 0
|
||||
bl sub_806DCB4
|
||||
bl RandomlyGivePartyPokerus
|
||||
adds r0, r4, 0
|
||||
bl sub_806DEC4
|
||||
bl PartySpreadPokerus
|
||||
_0803DF8C:
|
||||
ldr r4, [r6]
|
||||
adds r0, r4, 0
|
||||
|
||||
@ -13284,7 +13284,7 @@ _080CE0C0:
|
||||
ldr r0, [r5]
|
||||
ldr r4, =0x000020a4
|
||||
adds r0, r4
|
||||
bl RestoreBoxMonMovesPP
|
||||
bl BoxMonRestorePP
|
||||
ldr r2, [r5]
|
||||
adds r2, r4
|
||||
adds r0, r6, 0
|
||||
|
||||
@ -13835,7 +13835,7 @@ sub_8161280: @ 8161280
|
||||
ldr r2, =gPlayerParty
|
||||
adds r0, r2
|
||||
adds r1, 0x12
|
||||
bl sub_806E0B4
|
||||
bl GetMoveRelearnerMoves
|
||||
ldr r1, [r4]
|
||||
movs r6, 0x88
|
||||
lsls r6, 1
|
||||
|
||||
@ -6107,7 +6107,7 @@ _08165440:
|
||||
str r4, [sp, 0x44]
|
||||
ldr r0, =0x0000ef2a
|
||||
adds r1, r4, 0
|
||||
bl sub_806EBD0
|
||||
bl IsShinyOtIdPersonality
|
||||
lsls r0, 24
|
||||
lsrs r7, r0, 24
|
||||
cmp r7, 0
|
||||
@ -9566,7 +9566,7 @@ _0816721C:
|
||||
adds r0, r6, r0
|
||||
ldrb r1, [r0]
|
||||
mov r0, r10
|
||||
bl sub_806E858
|
||||
bl GetMonFlavourRelation
|
||||
lsls r0, 24
|
||||
asrs r2, r0, 24
|
||||
cmp r0, r9
|
||||
|
||||
@ -36725,7 +36725,7 @@ _081A006C:
|
||||
lsrs r4, r0, 24
|
||||
ldr r0, [sp, 0x8]
|
||||
adds r1, r4, 0
|
||||
bl sub_806E064
|
||||
bl CanSpeciesLearnTMHM
|
||||
adds r2, r0, 0
|
||||
cmp r2, 0
|
||||
beq _081A006C
|
||||
@ -45909,7 +45909,7 @@ _081A4E96:
|
||||
orrs r7, r0
|
||||
ldr r0, =0x0000ef2a
|
||||
adds r1, r7, 0
|
||||
bl sub_806EBD0
|
||||
bl IsShinyOtIdPersonality
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081A4E96
|
||||
@ -68587,7 +68587,7 @@ sub_81B0B60: @ 81B0B60
|
||||
muls r0, r4
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
bl sub_806E25C
|
||||
bl GetNumberOfRelearnableMoves
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081B0B88
|
||||
@ -71213,7 +71213,7 @@ _081B206E:
|
||||
bne _081B2096
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_806DD7C
|
||||
bl CheckPartyPokerus
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081B2094
|
||||
@ -71536,7 +71536,7 @@ _081B22FA:
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r5, 0
|
||||
bl sub_806E00C
|
||||
bl CanMonLearnTMHM
|
||||
cmp r0, 0
|
||||
beq _081B2334
|
||||
adds r0, r7, 0
|
||||
@ -80282,7 +80282,7 @@ sub_81B6EB4: @ 81B6EB4
|
||||
bne _081B6EF0
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x4
|
||||
bl happiness_algorithm
|
||||
bl AdjustFriendship
|
||||
movs r0, 0xA9
|
||||
lsls r0, 1
|
||||
cmp r4, r0
|
||||
@ -84818,7 +84818,7 @@ _081B95A4:
|
||||
muls r0, r1
|
||||
ldr r1, =gPlayerParty
|
||||
adds r0, r1
|
||||
bl sub_806E25C
|
||||
bl GetNumberOfRelearnableMoves
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
|
||||
@ -6828,13 +6828,13 @@ sub_81C2228: @ 81C2228
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
movs r1, 0
|
||||
bl sub_806DD7C
|
||||
bl CheckPartyPokerus
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081C225C
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_806DDE4
|
||||
bl CheckPartyHasHadPokerus
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _081C225C
|
||||
@ -7332,7 +7332,7 @@ sub_81C2628: @ 81C2628
|
||||
adds r7, r0, 0
|
||||
adds r7, 0x70
|
||||
ldrh r0, [r7]
|
||||
bl sub_806E3C0
|
||||
bl SpeciesToPokedexNum
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
ldr r0, =0x0000ffff
|
||||
@ -7352,7 +7352,7 @@ sub_81C2628: @ 81C2628
|
||||
adds r1, r4, 0
|
||||
bl StringAppend
|
||||
mov r0, r8
|
||||
bl sub_806EBA4
|
||||
bl IsMonShiny
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0
|
||||
@ -7389,7 +7389,7 @@ _081C26CE:
|
||||
movs r0, 0x11
|
||||
bl ClearWindowTilemap
|
||||
mov r0, r8
|
||||
bl sub_806EBA4
|
||||
bl IsMonShiny
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _081C26E8
|
||||
|
||||
@ -98,13 +98,13 @@ gUnknown_08329EC8:: @ 8329EC8
|
||||
gUnknown_08329ECE:: @ 8329ECE
|
||||
.incbin "baserom.gba", 0x329ece, 0x1c
|
||||
|
||||
gUnknown_08329EEA:: @ 8329EEA
|
||||
gHMMoves:: @ 8329EEA
|
||||
.incbin "baserom.gba", 0x329eea, 0x12
|
||||
|
||||
gUnknown_08329EFC:: @ 8329EFC
|
||||
.incbin "baserom.gba", 0x329efc, 0x2
|
||||
|
||||
gUnknown_08329EFE:: @ 8329EFE
|
||||
gAlteringCaveWildMonHeldItems:: @ 8329EFE
|
||||
.incbin "baserom.gba", 0x329efe, 0x2a
|
||||
|
||||
gUnknown_08329F28:: @ 8329F28
|
||||
|
||||
@ -110,7 +110,7 @@ gUnknown_085B22B8:: @ 85B22B8
|
||||
gUnknown_085B22D0:: @ 85B22D0
|
||||
.incbin "baserom.gba", 0x5b22d0, 0x2d0
|
||||
|
||||
gUnknown_085B25A0:: @ 85B25A0
|
||||
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
|
||||
.incbin "baserom.gba", 0x5b25a0, 0x80
|
||||
|
||||
gUnknown_085B2620:: @ 85B2620
|
||||
|
||||
@ -506,7 +506,7 @@ u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon);
|
||||
u16 GiveMoveToMon(struct Pokemon *mon, u16 move);
|
||||
u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
|
||||
u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move);
|
||||
void RestoreMonMovesPP(struct Pokemon *mon);
|
||||
void MonRestorePP(struct Pokemon *mon);
|
||||
void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot);
|
||||
void SetBattleMonMoveSlot(struct BattlePokemon *mon, u16 move, u8 slot);
|
||||
void GiveMonInitialMoveset(struct Pokemon *mon);
|
||||
|
||||
@ -320,6 +320,6 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src)
|
||||
SetMonData(mon, MON_DATA_SPATK_IV, &value);
|
||||
value = src->spDefenseIV;
|
||||
SetMonData(mon, MON_DATA_SPDEF_IV, &value);
|
||||
RestoreMonMovesPP(mon);
|
||||
MonRestorePP(mon);
|
||||
CalculateMonStats(mon);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user