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

@ -32,6 +32,7 @@ PokemonCries::
mon_cry CRY_EKANS, 224, 144 ; ARBOK
mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU
mon_cry CRY_RAICHU, 238, 136 ; RAICHU
mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU
mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH
mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F