diff --git a/README.md b/README.md index 995ad76..082f91f 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,12 @@ JEP-affiliated musicians require music to be used with direct credit for non-com - Nayru62 (Crystal Legacy) - [DVs & Hidden Power display code](https://github.com/cRz-Shadows/Pokemon_Crystal_Legacy/blob/main/engine/pokemon/stats_screen.asm) - SoupPotato - Move Animations and Pallettes [here](https://github.com/PiaCarrot/mae-pokeorange/commit/9e148c8a28bbe6850f3df11605b4f7b4068a4652) and [here](https://github.com/PiaCarrot/mae-pokeorange/commit/52f8f8e77189b01453590c5496bbc7a9332b6237). +## Academic References +* Bolles, D. & Bolles, A. (1996). A Grammar of the Yucatecan Mayan Language. Revised ed. Lancaster, California: Labyrinthos Press. ISBN 0-911437-49-5. Available at: http://www.famsi.org/reports/96072/grammar/index.html +* Boot, E. (2009). The Updated Preliminary Classic Maya - English, English - Classic Maya Vocabulary of Hieroglyphic Readings. Updated edition. Mesoweb Resources. Available at: https://www.mesoweb.com/resources/vocabulary/Vocabulary-2009.01.pdf + +When naming Ajawalcan, we used academic sources compiling the grammar and vocabulary of Yucatan Mayan and Classical Mayan, aiming to represent indiginous Latin American cultures the best we could. The name literally translates to "Kingly serpent" or "Lordly serpent", where "Ajaw" was the name for a king or ruler, and "can" is the spelling for "serpent" used in Kukulcan, the deity worshipped by Mayans of the day. + Original readme proceeding... # 16-bit index expansion for Crystal diff --git a/data/pokemon/base_stats/inoshika.asm b/data/pokemon/base_stats/inoshika.asm index f4a4f2d..f51278f 100644 --- a/data/pokemon/base_stats/inoshika.asm +++ b/data/pokemon/base_stats/inoshika.asm @@ -1,6 +1,6 @@ db 0 ; species ID placeholder - db 95, 100, 80, 55, 70, 60 + db 97, 107, 87, 57, 77, 67 ; hp atk def spd sat sdf db NORMAL, ROCK ; type @@ -17,5 +17,5 @@ dn EGG_NONE, EGG_NONE ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH + tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, BLIZZARD, THUNDER, PSYCHIC_M, SHADOW_BALL, FIRE_BLAST, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/dex_entries/coatl.asm b/data/pokemon/dex_entries/coatl.asm index edf41c2..db38b22 100644 --- a/data/pokemon/dex_entries/coatl.asm +++ b/data/pokemon/dex_entries/coatl.asm @@ -1,10 +1,12 @@ db "FEATHERED@" ; species name dw 311, 191 ; height, weight - placeholder - db "Seen as a deity in" - next "South America," - next "COATL likes to" + db "Seen as a deity" + next "that balances" + next "life and death." - page "TRANSFORM to" - next "live amongst" - next "humans.@" + page "Playful, it TRAN-" + next "SFORMs to mingle" + next "with humans.@" +; In Mayan theology, Kukulcan balanced life and death; people would be sacrificed to it in Chichen Itza. +; We obviously don't want to reference this in-game, so I'm taking a playful interpretation instead. diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 2aac6fb..3b7b34d 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -374,7 +374,7 @@ PokemonNames:: db "CYCLORP@@@" db "KITSEN@@@@" db "WISPIRIT@@" - db "COATL@@@@@" + db "AJAWALCAN@" ; Previously Coatl. db "AVALOP@@@@" db "INOSHIKA@@" db "RUDDERNAUT"