diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2016-12-07 20:25:11 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-12-07 20:25:11 -0500 |
commit | 511c2e475df24745d994f78426532d930f64e67c (patch) | |
tree | 4c03e4a1607ed235c0812157ee74f8f0c359d1d4 | |
parent | f418327100c110a7b47fb3be342276b5edd0be17 (diff) |
I think I got all the executable code
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | data/evolution_line_starts.asm | 79 | ||||
-rwxr-xr-x | data/evolution_methods.asm | 758 | ||||
-rwxr-xr-x | main.asm | 956 | ||||
-rwxr-xr-x | sram.asm | 7 | ||||
-rwxr-xr-x | text.asm | 18 |
6 files changed, 1023 insertions, 797 deletions
@@ -6,7 +6,7 @@ # Build Pokemon Pinball. ROMS := pokepinball.gbc -OBJS := main.o wram.o +OBJS := main.o wram.o sram.o # If your default python is 3, you may want to change this to python27. PYTHON := python diff --git a/data/evolution_line_starts.asm b/data/evolution_line_starts.asm new file mode 100755 index 0000000..45f7329 --- /dev/null +++ b/data/evolution_line_starts.asm @@ -0,0 +1,79 @@ + db BULBASAUR - 1 + db CHARMANDER - 1 + db SQUIRTLE - 1 + db CATERPIE - 1 + db WEEDLE - 1 + db PIDGEY - 1 + db RATTATA - 1 + db SPEAROW - 1 + db EKANS - 1 + db PIKACHU - 1 + db SANDSHREW - 1 + db NIDORAN_F - 1 + db NIDORAN_M - 1 + db CLEFAIRY - 1 + db VULPIX - 1 + db JIGGLYPUFF - 1 + db ZUBAT - 1 + db ODDISH - 1 + db PARAS - 1 + db VENONAT - 1 + db DIGLETT - 1 + db MEOWTH - 1 + db PSYDUCK - 1 + db MANKEY - 1 + db GROWLITHE - 1 + db POLIWAG - 1 + db ABRA - 1 + db MACHOP - 1 + db BELLSPROUT - 1 + db TENTACOOL - 1 + db GEODUDE - 1 + db PONYTA - 1 + db SLOWPOKE - 1 + db MAGNEMITE - 1 + db FARFETCH_D - 1 + db DODUO - 1 + db SEEL - 1 + db GRIMER - 1 + db SHELLDER - 1 + db GASTLY - 1 + db ONIX - 1 + db DROWZEE - 1 + db KRABBY - 1 + db VOLTORB - 1 + db EXEGGCUTE - 1 + db CUBONE - 1 + db HITMONLEE - 1 + db HITMONCHAN - 1 + db LICKITUNG - 1 + db KOFFING - 1 + db RHYHORN - 1 + db CHANSEY - 1 + db TANGELA - 1 + db KANGASKHAN - 1 + db HORSEA - 1 + db GOLDEEN - 1 + db STARYU - 1 + db MR_MIME - 1 + db SCYTHER - 1 + db JYNX - 1 + db ELECTABUZZ - 1 + db MAGMAR - 1 + db PINSIR - 1 + db TAUROS - 1 + db MAGIKARP - 1 + db LAPRAS - 1 + db DITTO - 1 + db EEVEE - 1 + db PORYGON - 1 + db OMANYTE - 1 + db KABUTO - 1 + db AERODACTYL - 1 + db SNORLAX - 1 + db ARTICUNO - 1 + db ZAPDOS - 1 + db MOLTRES - 1 + db DRATINI - 1 + db MEWTWO - 1 + db MEW - 1 diff --git a/data/evolution_methods.asm b/data/evolution_methods.asm new file mode 100755 index 0000000..a166dd8 --- /dev/null +++ b/data/evolution_methods.asm @@ -0,0 +1,758 @@ +MonEvolutions: ; 0x116b3 +; Lists the possible evolution types for each pokemon +; Each pokemon has three entries becuase Eevee has three +; evolution possibilities. + ; BULBASAUR + db IVYSAUR, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; IVYSAUR + db VENUSAUR, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VENUSAUR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CHARMANDER + db CHARMELEON, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CHARMELEON + db CHARIZARD, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CHARIZARD + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SQUIRTLE + db WARTORTLE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; WARTORTLE + db BLASTOISE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; BLASTOISE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CATERPIE + db METAPOD, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; METAPOD + db BUTTERFREE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; BUTTERFREE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; WEEDLE + db KAKUNA, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KAKUNA + db BEEDRILL, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; BEEDRILL + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PIDGEY + db PIDGEOTTO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PIDGEOTTO + db PIDGEOT, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PIDGEOT + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RATTATA + db RATICATE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RATICATE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SPEAROW + db FEAROW, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; FEAROW + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; EKANS + db ARBOK, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ARBOK + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PIKACHU + db RAICHU, EVO_THUNDER_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RAICHU + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SANDSHREW + db SANDSLASH, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SANDSLASH + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDORAN_F + db NIDORINA, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDORINA + db NIDOQUEEN, EVO_MOON_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDOQUEEN + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDORAN_M + db NIDORINO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDORINO + db NIDOKING, EVO_MOON_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NIDOKING + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CLEFAIRY + db CLEFABLE, EVO_MOON_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CLEFABLE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VULPIX + db NINETALES, EVO_FIRE_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; NINETALES + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; JIGGLYPUFF + db WIGGLYTUFF, EVO_MOON_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; WIGGLYTUFF + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ZUBAT + db GOLBAT, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GOLBAT + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ODDISH + db GLOOM, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GLOOM + db VILEPLUME, EVO_LEAF_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VILEPLUME + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PARAS + db PARASECT, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PARASECT + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VENONAT + db VENOMOTH, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VENOMOTH + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DIGLETT + db DUGTRIO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DUGTRIO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MEOWTH + db PERSIAN, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PERSIAN + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PSYDUCK + db GOLDUCK, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GOLDUCK + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MANKEY + db PRIMEAPE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PRIMEAPE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GROWLITHE + db ARCANINE, EVO_FIRE_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ARCANINE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; POLIWAG + db POLIWHIRL, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; POLIWHIRL + db POLIWRATH, EVO_WATER_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; POLIWRATH + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ABRA + db KADABRA, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KADABRA + db ALAKAZAM, EVO_LINK_CABLE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ALAKAZAM + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MACHOP + db MACHOKE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MACHOKE + db MACHAMP, EVO_LINK_CABLE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MACHAMP + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; BELLSPROUT + db WEEPINBELL, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; WEEPINBELL + db VICTREEBEL, EVO_LEAF_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VICTREEBEL + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; TENTACOOL + db TENTACRUEL, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; TENTACRUEL + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GEODUDE + db GRAVELER, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GRAVELER + db GOLEM, EVO_LINK_CABLE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GOLEM + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PONYTA + db RAPIDASH, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RAPIDASH + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SLOWPOKE + db SLOWBRO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SLOWBRO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MAGNEMITE + db MAGNETON, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MAGNETON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; FARFETCH_D + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DODUO + db DODRIO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DODRIO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SEEL + db DEWGONG, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DEWGONG + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GRIMER + db MUK, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MUK + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SHELLDER + db CLOYSTER, EVO_WATER_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CLOYSTER + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GASTLY + db HAUNTER, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; HAUNTER + db GENGAR, EVO_LINK_CABLE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GENGAR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ONIX + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DROWZEE + db HYPNO, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; HYPNO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KRABBY + db KINGLER, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KINGLER + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; VOLTORB + db ELECTRODE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ELECTRODE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; EXEGGCUTE + db EXEGGUTOR, EVO_LEAF_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; EXEGGUTOR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CUBONE + db MAROWAK, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MAROWAK + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; HITMONLEE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; HITMONCHAN + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; LICKITUNG + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KOFFING + db WEEZING, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; WEEZING + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RHYHORN + db RHYDON, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; RHYDON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; CHANSEY + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; TANGELA + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KANGASKHAN + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; HORSEA + db SEADRA, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SEADRA + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GOLDEEN + db SEAKING, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SEAKING + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; STARYU + db STARMIE, EVO_WATER_STONE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; STARMIE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MR_MIME + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SCYTHER + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; JYNX + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ELECTABUZZ + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MAGMAR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PINSIR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; TAUROS + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MAGIKARP + db GYARADOS, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; GYARADOS + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; LAPRAS + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DITTO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; EEVEE + db VAPOREON, EVO_WATER_STONE + db JOLTEON, EVO_THUNDER_STONE + db FLAREON, EVO_FIRE_STONE + + ; VAPOREON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; JOLTEON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; FLAREON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; PORYGON + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; OMANYTE + db OMASTAR, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; OMASTAR + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KABUTO + db KABUTOPS, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; KABUTOPS + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; AERODACTYL + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; SNORLAX + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ARTICUNO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; ZAPDOS + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MOLTRES + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DRATINI + db DRAGONAIR, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DRAGONAIR + db DRAGONITE, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; DRAGONITE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MEWTWO + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + + ; MEW + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE + db $00, EVO_EXPERIENCE @@ -11511,7 +11511,7 @@ FadeOutCopyrightScreenAndLoadData: ; 0x82a8 ld [hFarCallTempA], a callba CopyInitialHighScores .loadedHighScores - ld hl, $a10c + ld hl, sPokedexFlags ld de, wPokedexFlags ld bc, $0098 call Func_f0c @@ -21615,7 +21615,7 @@ Func_101d9: ; 0x101d9 pop bc push de xor a - ld de, $11d2 + ld de, Func_11d2 call Func_10c5 pop de pop hl @@ -21666,7 +21666,7 @@ Func_10230: ; 0x10230 pop bc push de xor a - ld de, $118d + ld de, Func_118d call Func_10c5 pop de pop hl @@ -21744,7 +21744,7 @@ Func_102bc: ; 0x102bc ld [de], a xor a ld bc, wc1b8 - ld de, $1266 + ld de, Func_1266 call Func_10c5 ret @@ -21811,7 +21811,7 @@ Func_10301: ; 0x10301 ld [de], a xor a ld bc, wc1b8 - ld de, $1266 + ld de, Func_1266 call Func_10c5 ret @@ -21884,7 +21884,7 @@ Func_1038e: ; 0x1038e pop bc push de xor a - ld de, $11d2 + ld de, Func_11d2 call Func_10c5 pop de pop bc @@ -21907,21 +21907,23 @@ Data_103c6: ; 0x103c6 db $40, $04, $C0, $82, $C0, $02 Func_10414: ; 0x10414 - ld a, $4 - ld bc, $4420 - ld de, $11b5 + ld a, BANK(Data_10420) + ld bc, Data_10420 + ld de, Func_11b5 call Func_10c5 ret +Data_10420: dr $10420, $10432 Func_10432: ; 0x10432 - ld a, $4 - ld bc, $443e + ld a, BANK(Data_1043e) + ld bc, Data_1043e ld de, LoadTileLists call Func_10c5 ret +Data_1043e: dr $1043e, $10464 Func_10464: ; 0x10464 @@ -22151,8 +22153,8 @@ Func_10611: ; 0x10611 ld c, a ld a, [hl] ld b, a - ld a, $4 - ld de, $11d2 + ld a, BANK(Data_1062a) + ld de, Func_11d2 call Func_10c5 ret @@ -22327,7 +22329,7 @@ SetPokemonSeenFlag: ; 0x10753 add hl, bc set 0, [hl] ld hl, wPokedexFlags - ld de, $a10c + ld de, sPokedexFlags ld bc, $0098 call SaveData ret @@ -22348,7 +22350,7 @@ SetPokemonOwnedFlag: ; 0x1077c add hl, bc set 1, [hl] ld hl, wPokedexFlags - ld de, $a10c + ld de, sPokedexFlags ld bc, $0098 call SaveData ret @@ -22440,12 +22442,12 @@ Func_10825: ; 0x10825 call Func_30e8 call Func_30db ld hl, wd5e9 - ld de, $2a50 + ld de, Data_2a50 call Func_3372 pop de pop bc ld hl, wd5e4 - ld de, $2a43 + ld de, JackpotText call Func_3357 ret @@ -22780,15 +22782,15 @@ Func_10aff: ; 0x10aff ret VideoData_10b2a: ; 0x10b2a - dwb $7A00, $25 + dab StageRedFieldTopGfx3 dw $8900 dw $E0 - dwb $7A00, $25 + dab StageRedFieldTopGfx3 dw $8900 dw $E0 - dwb $7A00, $25 + dab StageRedFieldTopGfx3 dw $8900 dw $E0 @@ -23615,25 +23617,25 @@ Func_1120e: ; 0x1120e ret VRAMData_1123b: ; 0x1123b - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 - dwb $6600, $35 + dab StageBlueFieldTopGfx3 dw $8600, $E0 WildMonOffsetsPointers: ; 0x1126c @@ -23694,770 +23696,9 @@ WildMonPointers: ; 0x112c0 INCLUDE "data/red_wild_mons.asm" INCLUDE "data/blue_wild_mons.asm" - - dr $115ce, $1161d - +INCLUDE "data/evolution_line_starts.asm" INCLUDE "data/evolution_lines.asm" - -MonEvolutions: ; 0x116b3 -; Lists the possible evolution types for each pokemon -; Each pokemon has three entries becuase Eevee has three -; evolution possibilities. - ; BULBASAUR - db IVYSAUR, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; IVYSAUR - db VENUSAUR, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VENUSAUR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CHARMANDER - db CHARMELEON, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CHARMELEON - db CHARIZARD, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CHARIZARD - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SQUIRTLE - db WARTORTLE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; WARTORTLE - db BLASTOISE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; BLASTOISE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CATERPIE - db METAPOD, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; METAPOD - db BUTTERFREE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; BUTTERFREE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; WEEDLE - db KAKUNA, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KAKUNA - db BEEDRILL, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; BEEDRILL - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PIDGEY - db PIDGEOTTO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PIDGEOTTO - db PIDGEOT, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PIDGEOT - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RATTATA - db RATICATE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RATICATE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SPEAROW - db FEAROW, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; FEAROW - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; EKANS - db ARBOK, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ARBOK - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PIKACHU - db RAICHU, EVO_THUNDER_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RAICHU - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SANDSHREW - db SANDSLASH, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SANDSLASH - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDORAN_F - db NIDORINA, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDORINA - db NIDOQUEEN, EVO_MOON_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDOQUEEN - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDORAN_M - db NIDORINO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDORINO - db NIDOKING, EVO_MOON_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NIDOKING - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CLEFAIRY - db CLEFABLE, EVO_MOON_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CLEFABLE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VULPIX - db NINETALES, EVO_FIRE_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; NINETALES - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; JIGGLYPUFF - db WIGGLYTUFF, EVO_MOON_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; WIGGLYTUFF - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ZUBAT - db GOLBAT, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GOLBAT - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ODDISH - db GLOOM, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GLOOM - db VILEPLUME, EVO_LEAF_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VILEPLUME - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PARAS - db PARASECT, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PARASECT - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VENONAT - db VENOMOTH, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VENOMOTH - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DIGLETT - db DUGTRIO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DUGTRIO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MEOWTH - db PERSIAN, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PERSIAN - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PSYDUCK - db GOLDUCK, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GOLDUCK - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MANKEY - db PRIMEAPE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PRIMEAPE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GROWLITHE - db ARCANINE, EVO_FIRE_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ARCANINE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; POLIWAG - db POLIWHIRL, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; POLIWHIRL - db POLIWRATH, EVO_WATER_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; POLIWRATH - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ABRA - db KADABRA, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KADABRA - db ALAKAZAM, EVO_LINK_CABLE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ALAKAZAM - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MACHOP - db MACHOKE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MACHOKE - db MACHAMP, EVO_LINK_CABLE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MACHAMP - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; BELLSPROUT - db WEEPINBELL, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; WEEPINBELL - db VICTREEBEL, EVO_LEAF_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VICTREEBEL - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; TENTACOOL - db TENTACRUEL, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; TENTACRUEL - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GEODUDE - db GRAVELER, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GRAVELER - db GOLEM, EVO_LINK_CABLE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GOLEM - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PONYTA - db RAPIDASH, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RAPIDASH - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SLOWPOKE - db SLOWBRO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SLOWBRO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MAGNEMITE - db MAGNETON, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MAGNETON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; FARFETCH_D - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DODUO - db DODRIO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DODRIO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SEEL - db DEWGONG, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DEWGONG - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GRIMER - db MUK, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MUK - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SHELLDER - db CLOYSTER, EVO_WATER_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CLOYSTER - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GASTLY - db HAUNTER, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; HAUNTER - db GENGAR, EVO_LINK_CABLE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GENGAR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ONIX - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DROWZEE - db HYPNO, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; HYPNO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KRABBY - db KINGLER, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KINGLER - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; VOLTORB - db ELECTRODE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ELECTRODE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; EXEGGCUTE - db EXEGGUTOR, EVO_LEAF_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; EXEGGUTOR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CUBONE - db MAROWAK, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MAROWAK - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; HITMONLEE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; HITMONCHAN - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; LICKITUNG - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KOFFING - db WEEZING, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; WEEZING - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RHYHORN - db RHYDON, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; RHYDON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; CHANSEY - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; TANGELA - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KANGASKHAN - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; HORSEA - db SEADRA, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SEADRA - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GOLDEEN - db SEAKING, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SEAKING - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; STARYU - db STARMIE, EVO_WATER_STONE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; STARMIE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MR_MIME - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SCYTHER - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; JYNX - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ELECTABUZZ - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MAGMAR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PINSIR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; TAUROS - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MAGIKARP - db GYARADOS, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; GYARADOS - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; LAPRAS - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DITTO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; EEVEE - db VAPOREON, EVO_WATER_STONE - db JOLTEON, EVO_THUNDER_STONE - db FLAREON, EVO_FIRE_STONE - - ; VAPOREON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; JOLTEON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; FLAREON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; PORYGON - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; OMANYTE - db OMASTAR, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; OMASTAR - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KABUTO - db KABUTOPS, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; KABUTOPS - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; AERODACTYL - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; SNORLAX - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ARTICUNO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; ZAPDOS - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MOLTRES - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DRATINI - db DRAGONAIR, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DRAGONAIR - db DRAGONITE, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; DRAGONITE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MEWTWO - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - - ; MEW - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - db $00, EVO_EXPERIENCE - +INCLUDE "data/evolution_methods.asm" INCLUDE "data/mon_names.asm" CatchEmModeInitialIndicatorStates: ; 0x123ae @@ -27850,8 +27091,8 @@ Func_155bb: ; 0x155bb ld c, [hl] inc hl ld b, [hl] - ld a, $5 - ld de, $1266 + ld a, BANK(Data_157f7) + ld de, Func_1266 call Func_10c5 ret @@ -44588,7 +43829,123 @@ MonInfoPokedexScreen: ; 0x28178 call Func_2885c ret - dr $281cb, $28289 +Func_281cb: + ld a, [wCurPokedexIndex] + ld c, a + ld b, $0 + sla c + rl b + add c + ld c, a + jr nc, .asm_281da + inc b +.asm_281da + ld a, [wd960] + and a + jr nz, .asm_281fb + ld hl, MonBillboardPalettePointers + add hl, bc + ld a, BANK(MonBillboardPalettePointers) + call ReadByteFromBank + inc hl + ld e, a + ld a, BANK(MonBillboardPalettePointers) + call ReadByteFromBank + inc hl + ld d, a + ld a, BANK(MonBillboardPalettePointers) + call ReadByteFromBank + ld [$ff8c], a + jr .asm_28214 + +.asm_281fb + ld hl, MonAnimatedPalettePointers + add hl, bc + ld a, BANK(MonAnimatedPalettePointers) + call ReadByteFromBank + inc hl + ld e, a + ld a, BANK(MonAnimatedPalettePointers) + call ReadByteFromBank + inc hl + ld d, a + ld a, BANK(MonAnimatedPalettePointers) + call ReadByteFromBank + ld [$ff8c], a +.asm_28214 + ld h, d + ld l, e + ld de, wda8a + ld b, $8 +.asm_2821b + push bc + ld a, [$ff8c] + call ReadByteFromBank + inc hl + ld c, a + ld a, [$ff8c] + call ReadByteFromBank + inc hl + ld b, a + ld a, c + and $1f + ld [de], a + inc de + srl b + rr c + srl b + rr c + srl b + rr c + srl b + rr c + srl b + rr c + ld a, c + and $1f + ld [de], a + inc de + srl b + rr c + srl b + rr c + srl b + rr c + srl b + rr c + srl b + rr c + ld a, c + and $1f + ld [de], a + inc de + pop bc + dec b + jr nz, .asm_2821b + ld hl, Data_28289 + ld de, wda8a + ld b, $18 +.asm_2826d + push hl + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [de] + inc de + push af + swap a + and $f + call PutTileInVRAM + inc hl + pop af + and $f + call PutTileInVRAM + pop hl + inc hl + inc hl + dec b + jr nz, .asm_2826d + ret Data_28289: dr $28289, $282b9 @@ -46300,7 +45657,7 @@ Func_28e73: ; 0x28e73 rl b sla c rl b - ld hl, $5566 ; todo + ld hl, Func_29566 ld a, l sub c ld l, a @@ -46312,7 +45669,16 @@ Func_28e73: ; 0x28e73 ld a, [wd860] ret - dr $28e9a, $2957c +Func_28e9a: +REPT 20 * 87 + ld [hli], a +ENDR +Func_29566: +REPT 20 + ld [hli], a +ENDR + pop hl + ret Func_2957c: ; 0x2957c ld a, BANK(PokedexDescriptionPointers) diff --git a/sram.asm b/sram.asm new file mode 100755 index 0000000..e79d216 --- /dev/null +++ b/sram.asm @@ -0,0 +1,7 @@ +SECTION "SRAM 0", SRAM, BANK [$0] + +s0_a000:: + ds $10c + +sPokedexFlags:: ; 0xa10c + ds $98 @@ -55,7 +55,23 @@ OneBillionText: db "1,000,000,000 @" Data_2a21: - dr $2a21, $2a56 + db $44, $00, $40, $00 + db "HIT @" + db $48, $10, $40, $00, $00, $00 + +Data_2a30: + db $42, $00, $40, $00 + db "FLIPPED @" + +Data_2a3d: + db $4a, $10, $40, $00, $00, $00 + +JackpotText: + db $42, $00, $b4, $00 + db "JACKPOT @" + +Data_2a50: + db $4a, $10, $b4, $00, $00, $00 YouGotAText: db $05, $54, $00, $00, $00, $1e |