evolution table

This commit is contained in:
YamaArashi 2015-10-12 18:08:47 -07:00
parent bfae72bf1d
commit d5b5623de7
5 changed files with 1458 additions and 12 deletions

View File

@ -194146,7 +194146,7 @@ GetEvolutionTargetSpecies: ; 806D098
@0806D136: @0806D136:
movs r2, 0 movs r2, 0
str r2, [sp, 0x4] str r2, [sp, 0x4]
ldr r3, =gUnknown_0832531C ldr r3, =gEvolutionTable
lsls r6, r7, 2 lsls r6, r7, 2
b @0806D38E b @0806D38E
.align 2, 0 .align 2, 0
@ -194170,7 +194170,7 @@ GetEvolutionTargetSpecies: ; 806D098
str r0, [sp, 0x4] str r0, [sp, 0x4]
lsls r6, r7, 2 lsls r6, r7, 2
@0806D16A: @0806D16A:
ldr r1, =gUnknown_0832531C ldr r1, =gEvolutionTable
ldr r0, [sp, 0x4] ldr r0, [sp, 0x4]
lsls r2, r0, 3 lsls r2, r0, 3
adds r0, r6, r7 adds r0, r6, r7
@ -194252,7 +194252,7 @@ GetEvolutionTargetSpecies: ; 806D098
bhi @0806D21E bhi @0806D21E
b @0806D332 b @0806D332
@0806D21E: @0806D21E:
ldr r1, =gUnknown_0832531C ldr r1, =gEvolutionTable
adds r0, r6, r7 adds r0, r6, r7
lsls r0, 3 lsls r0, 3
adds r0, r4, r0 adds r0, r4, r0
@ -194402,7 +194402,7 @@ GetEvolutionTargetSpecies: ; 806D098
b @0806D3AE b @0806D3AE
@0806D340: @0806D340:
lsls r6, r7, 2 lsls r6, r7, 2
ldr r1, =gUnknown_0832531C ldr r1, =gEvolutionTable
adds r0, r6, r7 adds r0, r6, r7
lsls r0, 3 lsls r0, 3
adds r4, r0, r1 adds r4, r0, r1
@ -200354,7 +200354,7 @@ sub_8070004: ; 8070004
lsrs r2, r0, 16 lsrs r2, r0, 16
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
ldr r0, =gUnknown_0832531C ldr r0, =gEvolutionTable
mov r12, r0 mov r12, r0
@08070016: @08070016:
movs r7, 0 movs r7, 0
@ -612823,7 +612823,7 @@ sub_813E3DC: ; 813E3DC
str r0, [sp, 0x8] str r0, [sp, 0x8]
add r0, r10 add r0, r10
lsls r7, r0, 3 lsls r7, r0, 3
ldr r1, =gUnknown_0832531C ldr r1, =gEvolutionTable
adds r1, r7 adds r1, r7
mov r8, r1 mov r8, r1
ldrh r0, [r1] ldrh r0, [r1]
@ -612848,7 +612848,7 @@ sub_813E3DC: ; 813E3DC
ldrb r0, [r6] ldrb r0, [r6]
muls r0, r5 muls r0, r5
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_0832531C ldr r1, =gEvolutionTable
adds r2, r1, r7 adds r2, r1, r7
adds r2, 0xC adds r2, 0xC
movs r1, 0xB movs r1, 0xB
@ -612932,7 +612932,7 @@ sub_813E3DC: ; 813E3DC
adds r0, r5 adds r0, r5
bl pokemon_calc_effective_stats bl pokemon_calc_effective_stats
bl calc_player_party_count bl calc_player_party_count
ldr r0, =gUnknown_0832531C ldr r0, =gEvolutionTable
mov r4, r8 mov r4, r8
add r4, r10 add r4, r10
lsls r4, 3 lsls r4, 3

View File

@ -93,3 +93,14 @@
.macro level_up_move level, move .macro level_up_move level, move
.2byte (\level << 9) | \move .2byte (\level << 9) | \move
.endm .endm
.macro evo_entry method, parameter, target_pokemon
.2byte \method
.2byte \parameter
.2byte \target_pokemon
.2byte 0 ; padding
.endm
.macro empty_evo_entries count
.fill 8 * \count, 1, 0
.endm

View File

@ -34,3 +34,19 @@
.set BODY_COLOR_PINK, 0x09 .set BODY_COLOR_PINK, 0x09
.set SUMMARY_SCREEN_FLIP_SPRITE, 0x80 .set SUMMARY_SCREEN_FLIP_SPRITE, 0x80
.set EVO_FRIENDSHIP, 0x0001 ; Pokémon levels up with friendship ≥ 220
.set EVO_FRIENDSHIP_DAY, 0x0002 ; Pokémon levels up during the day with friendship ≥ 220
.set EVO_FRIENDSHIP_NIGHT, 0x0003 ; Pokémon levels up at night with friendship ≥ 220
.set EVO_LEVEL, 0x0004 ; Pokémon reaches the specified level
.set EVO_TRADE, 0x0005 ; Pokémon is traded
.set EVO_TRADE_ITEM, 0x0006 ; Pokémon is traded while it's holding the specified item
.set EVO_ITEM, 0x0007 ; specified item is used on Pokémon
.set EVO_LEVEL_ATK_GT_DEF, 0x0008 ; Pokémon reaches the specified level with attack > defense
.set EVO_LEVEL_ATK_EQ_DEF, 0x0009 ; Pokémon reaches the specified level with attack = defense
.set EVO_LEVEL_ATK_LT_DEF, 0x000a ; Pokémon reaches the specified level with attack < defense
.set EVO_LEVEL_SILCOON, 0x000b ; Pokémon reaches the specified level with a Silcoon personality value
.set EVO_LEVEL_CASCOON, 0x000c ; Pokémon reaches the specified level with a Cascoon personality value
.set EVO_LEVEL_NINJASK, 0x000d ; Pokémon reaches the specified level (special value for Ninjask)
.set EVO_LEVEL_SHEDINJA, 0x000e ; Pokémon reaches the specified level (special value for Shedinja)
.set EVO_BEAUTY, 0x000f ; Pokémon levels up with beauty ≥ specified value

View File

@ -1673,10 +1673,8 @@ gUnknown_0831F61C: ; 831F61C
; 83230DC ; 83230DC
.include "data/level_up_learnsets.s" .include "data/level_up_learnsets.s"
.align 2, 0 ; 832531C
.include "data/evolution_table.s"
gUnknown_0832531C: ; 832531C
.incbin "base_emerald.gba", 0x32531c, 0x4060
; 832937C ; 832937C
.include "data/level_up_learnset_pointers.s" .include "data/level_up_learnset_pointers.s"

1421
data/evolution_table.s Normal file

File diff suppressed because it is too large Load Diff