diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2015-03-08 11:12:26 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2015-03-08 11:12:26 -0700 |
| commit | 0c7e49017dc1efefbb609dded2e3a49e0b2bc8c5 (patch) | |
| tree | 31d7aa70cd1c3c74f2201ea2efff3ce426c99618 /main.asm | |
| parent | 02982dc38e6019441364b7984bfcf08eef6bcfd9 (diff) | |
Evolution lines.
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -5536,24 +5536,24 @@ Func_1003f: ; 0x1003f ld c, a ld b, $0 add hl, bc - ld a, [$d55b] + ld a, [$d55b] ; this probably gets set to $08 when the rare mons should be used. sla a ld c, a add hl, bc - ld a, [hl] + ld a, [hl] ; a contains mon id dec a ld [$d579], a ld a, [$d579] ld c, a ld b, $0 - ld hl, $561d + ld hl, EvolutionLineIds add hl, bc ld c, [hl] ld h, b ld l, c add hl, bc - add hl, bc - ld bc, $7685 + add hl, bc ; multiply the evolution line id by 3 + ld bc, Data_13685 add hl, bc ld a, [hli] ld [$d5c1], a @@ -5723,7 +5723,14 @@ WildMonPointers: ; 0x112c0 INCLUDE "data/red_wild_mons.asm" INCLUDE "data/blue_wild_mons.asm" -INCBIN "baserom.gbc",$115ce,$14000 - $115ce +INCBIN "baserom.gbc",$115ce,$1161d - $115ce + +INCLUDE "data/evolution_lines.asm" + +INCBIN "baserom.gbc",$116b4,$13685 - $116b4 + +Data_13685: ; 0x13685 + db $12, $12, $10, $10, $10, $10, $12, $12, $0E, $14, $14, $12, $14, $14, $10, $0A, $0A, $0E, $11, $13, $10, $0B, $0B, $10, $12, $12, $0E, $12, $14, $0E, $10, $12, $10, $11, $12, $0E, $11, $12, $0E, $12, $13, $10, $11, $11, $10, $12, $12, $10, $08, $08, $10, $10, $10, $10, $10, $10, $10, $11, $11, $0E, $10, $10, $0E, $14, $14, $0E, $30, $30, $10, $12, $12, $10, $12, $12, $10, $10, $10, $10, $10, $10, $10, $12, $14, $10, $10, $12, $10, $0C, $0C, $12, $12, $14, $0C, $12, $14, $0E, $30, $30, $10, $14, $14, $10, $12, $12, $0E, $12, $12, $0E, $14, $14, $0E, $12, $12, $10, $14, $14, $0E, $10, $10, $0E, $12, $12, $10, $14, $14, $10, $14, $12, $10, $02, $02, $10, $12, $12, $10, $12, $12, $10, $14, $10, $10, $14, $10, $10, $14, $12, $10, $11, $11, $10, $14, $14, $10, $12, $12, $10, $10, $10, $10, $12, $12, $10, $0F, $0F, $0E, $12, $12, $0E, $23, $23, $10, $13, $13, $10, $13, $13, $10, $12, $12, $10, $12, $14, $10, $14, $14, $0E, $12, $12, $0E, $12, $14, $10, $18, $18, $0C, $16, $16, $0C, $14, $14, $10, $12, $12, $10, $10, $10, $0E, $12, $12, $0E, $12, $12, $0E, $0C, $0C, $12, $26, $36, $12, $13, $13, $10, $13, $13, $10, $13, $13, $10, $12, $12, $0E, $14, $14, $0E, $14, $14, $0E SECTION "bank5", ROMX, BANK[$5] |