Fix Evolution Scene Bug

This commit is contained in:
Skeli
2021-04-26 14:47:43 -04:00
parent a2a9474ba6
commit 51cc73c650
2 changed files with 42 additions and 0 deletions

View File

@@ -110,3 +110,42 @@ CreateMonSprite_PicBoxHook:
ldr r2, =0x8083994 | 1
bxr2:
bx r2
.pool
@0x80CDF10 with r1
EvolutionSceneHook1:
mov r9, r0
mov r0, r5 @currSpecies
mov r1, r9 @personality
bl TryGetFemaleGenderedSpecies
lsl r0, #0x3
ldr r1, =gMonFrontPicTable
add r0, r1
ldr r2, =0x80CDF18 | 1
bx r2
.pool
@0x80CDF88 with r2
EvolutionSceneHook2:
strb r0, [r1]
mov r0, r10 @speciesToEvolve
mov r1, r9 @personality
bl TryGetFemaleGenderedSpecies
lsl r0, #0x3
ldr r2, =gMonFrontPicTable
add r0, r2
ldr r2, =0x80CDF92 | 1
bx r2
.pool
@0x80CE1C0 with r2
EvolutionSceneHook3:
strb r0, [r1]
mov r0, r5 @postEvoSpecies
mov r1, r6 @personality
bl TryGetFemaleGenderedSpecies
lsl r0, #0x3
ldr r1, =gMonFrontPicTable
add r0, r1
ldr r2, =0x80CE1C8 | 1
bx r2

3
hooks
View File

@@ -16,6 +16,9 @@ HasAllRegionalMons 8088F58 0
HasAllMons 8088F84 0
GenderedMonIconHook 8096E38 2
GetIconSpecies 8096F5C 2
EvolutionSceneHook1 80CDF10 1
EvolutionSceneHook2 80CDF88 2
EvolutionSceneHook3 80CE1C0 2
PokedexMemoryAllocationHook 81025E8 0
LoadPokedexViews 8103518 1
DisplayRegionalDexNumHook 8104A66 1