Merge branch 'master' into master

This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions

View file

@ -26,6 +26,7 @@ EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm"
ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm"
PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm"
RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm"
GorochuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorochu.asm"
SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm"
SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm"
NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm"