Leahnaya/pokered
1
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2026-08-20 00:14:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Phase 21: Reconcile types/names + types/type_matchups

Browse Source
This commit is contained in:
Brandon M. M. Green
2026-07-09 19:28:33 +00:00
parent ba63d0edd2
commit 0eedff9306
2 changed files with 100 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
wla/data/types/type_matchups_reconcile.asm
View File

@@ -1,89 +1,83 @@
; Reconciled from master RGBDS source: data/types/type_matchups.asm
; RGBDS source is untouched.
; WLA-DX representation for reconciliation only.
; attacker, defender, *=
TypeEffects:
.DB WATER, FIRE, SUPER_EFFECTIVE
.DB FIRE, GRASS, SUPER_EFFECTIVE
.DB FIRE, ICE, SUPER_EFFECTIVE
.DB GRASS, WATER, SUPER_EFFECTIVE
.DB ELECTRIC, WATER, SUPER_EFFECTIVE
.DB WATER, ROCK, SUPER_EFFECTIVE
.DB GROUND, FLYING, NO_EFFECT
.DB WATER, WATER, NOT_VERY_EFFECTIVE
.DB FIRE, FIRE, NOT_VERY_EFFECTIVE
.DB ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE
.DB ICE, ICE, NOT_VERY_EFFECTIVE
.DB GRASS, GRASS, NOT_VERY_EFFECTIVE
TypeEffects::
.DB WATER, FIRE, SUPER_EFFECTIVE
.DB FIRE, GRASS, SUPER_EFFECTIVE
.DB FIRE, ICE, SUPER_EFFECTIVE
.DB GRASS, WATER, SUPER_EFFECTIVE
.DB ELECTRIC, WATER, SUPER_EFFECTIVE
.DB WATER, ROCK, SUPER_EFFECTIVE
.DB GROUND, FLYING, NO_EFFECT
.DB WATER, WATER, NOT_VERY_EFFECTIVE
.DB FIRE, FIRE, NOT_VERY_EFFECTIVE
.DB ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE
.DB ICE, ICE, NOT_VERY_EFFECTIVE
.DB GRASS, GRASS, NOT_VERY_EFFECTIVE
.DB PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
.DB FIRE, WATER, NOT_VERY_EFFECTIVE
.DB GRASS, FIRE, NOT_VERY_EFFECTIVE
.DB WATER, GRASS, NOT_VERY_EFFECTIVE
.DB ELECTRIC, GRASS, NOT_VERY_EFFECTIVE
.DB NORMAL, ROCK, NOT_VERY_EFFECTIVE
.DB NORMAL, GHOST, NO_EFFECT
.DB GHOST, GHOST, SUPER_EFFECTIVE
.DB FIRE, BUG, SUPER_EFFECTIVE
.DB FIRE, ROCK, NOT_VERY_EFFECTIVE
.DB WATER, GROUND, SUPER_EFFECTIVE
.DB ELECTRIC, GROUND, NO_EFFECT
.DB ELECTRIC, FLYING, SUPER_EFFECTIVE
.DB GRASS, GROUND, SUPER_EFFECTIVE
.DB GRASS, BUG, NOT_VERY_EFFECTIVE
.DB GRASS, POISON, NOT_VERY_EFFECTIVE
.DB GRASS, ROCK, SUPER_EFFECTIVE
.DB GRASS, FLYING, NOT_VERY_EFFECTIVE
.DB ICE, WATER, NOT_VERY_EFFECTIVE
.DB ICE, GRASS, SUPER_EFFECTIVE
.DB ICE, GROUND, SUPER_EFFECTIVE
.DB ICE, FLYING, SUPER_EFFECTIVE
.DB FIGHTING, NORMAL, SUPER_EFFECTIVE
.DB FIGHTING, POISON, NOT_VERY_EFFECTIVE
.DB FIGHTING, FLYING, NOT_VERY_EFFECTIVE
.DB FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
.DB FIGHTING, BUG, NOT_VERY_EFFECTIVE
.DB FIGHTING, ROCK, SUPER_EFFECTIVE
.DB FIGHTING, ICE, SUPER_EFFECTIVE
.DB FIGHTING, GHOST, NO_EFFECT
.DB POISON, GRASS, SUPER_EFFECTIVE
.DB POISON, POISON, NOT_VERY_EFFECTIVE
.DB POISON, GROUND, NOT_VERY_EFFECTIVE
.DB POISON, BUG, SUPER_EFFECTIVE
.DB POISON, ROCK, NOT_VERY_EFFECTIVE
.DB POISON, GHOST, NOT_VERY_EFFECTIVE
.DB GROUND, FIRE, SUPER_EFFECTIVE
.DB GROUND, ELECTRIC, SUPER_EFFECTIVE
.DB GROUND, GRASS, NOT_VERY_EFFECTIVE
.DB GROUND, BUG, NOT_VERY_EFFECTIVE
.DB GROUND, ROCK, SUPER_EFFECTIVE
.DB GROUND, POISON, SUPER_EFFECTIVE
.DB FLYING, ELECTRIC, NOT_VERY_EFFECTIVE
.DB FLYING, FIGHTING, SUPER_EFFECTIVE
.DB FLYING, BUG, SUPER_EFFECTIVE
.DB FLYING, GRASS, SUPER_EFFECTIVE
.DB FLYING, ROCK, NOT_VERY_EFFECTIVE
.DB PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE
.DB PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE
.DB BUG, FIRE, NOT_VERY_EFFECTIVE
.DB BUG, GRASS, SUPER_EFFECTIVE
.DB BUG, FIGHTING, NOT_VERY_EFFECTIVE
.DB BUG, FLYING, NOT_VERY_EFFECTIVE
.DB BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE
.DB BUG, GHOST, NOT_VERY_EFFECTIVE
.DB BUG, POISON, SUPER_EFFECTIVE
.DB ROCK, FIRE, SUPER_EFFECTIVE
.DB ROCK, FIGHTING, NOT_VERY_EFFECTIVE
.DB ROCK, GROUND, NOT_VERY_EFFECTIVE
.DB ROCK, FLYING, SUPER_EFFECTIVE
.DB ROCK, BUG, SUPER_EFFECTIVE
.DB ROCK, ICE, SUPER_EFFECTIVE
.DB GHOST, NORMAL, NO_EFFECT
.DB GHOST, PSYCHIC_TYPE, NO_EFFECT
.DB FIRE, DRAGON, NOT_VERY_EFFECTIVE
.DB WATER, DRAGON, NOT_VERY_EFFECTIVE
.DB ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE
.DB GRASS, DRAGON, NOT_VERY_EFFECTIVE
.DB ICE, DRAGON, SUPER_EFFECTIVE
.DB DRAGON, DRAGON, SUPER_EFFECTIVE
.DB -1
.DB FIRE, WATER, NOT_VERY_EFFECTIVE
.DB GRASS, FIRE, NOT_VERY_EFFECTIVE
.DB WATER, GRASS, NOT_VERY_EFFECTIVE
.DB ELECTRIC, GRASS, NOT_VERY_EFFECTIVE
.DB NORMAL, ROCK, NOT_VERY_EFFECTIVE
.DB NORMAL, GHOST, NO_EFFECT
.DB GHOST, GHOST, SUPER_EFFECTIVE
.DB FIRE, BUG, SUPER_EFFECTIVE
.DB FIRE, ROCK, NOT_VERY_EFFECTIVE
.DB WATER, GROUND, SUPER_EFFECTIVE
.DB ELECTRIC, GROUND, NO_EFFECT
.DB ELECTRIC, FLYING, SUPER_EFFECTIVE
.DB GRASS, GROUND, SUPER_EFFECTIVE
.DB GRASS, BUG, NOT_VERY_EFFECTIVE
.DB GRASS, POISON, NOT_VERY_EFFECTIVE
.DB GRASS, ROCK, SUPER_EFFECTIVE
.DB GRASS, FLYING, NOT_VERY_EFFECTIVE
.DB ICE, WATER, NOT_VERY_EFFECTIVE
.DB ICE, GRASS, SUPER_EFFECTIVE
.DB ICE, GROUND, SUPER_EFFECTIVE
.DB ICE, FLYING, SUPER_EFFECTIVE
.DB FIGHTING, NORMAL, SUPER_EFFECTIVE
.DB FIGHTING, POISON, NOT_VERY_EFFECTIVE
.DB FIGHTING, FLYING, NOT_VERY_EFFECTIVE
.DB FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
.DB FIGHTING, BUG, NOT_VERY_EFFECTIVE
.DB FIGHTING, ROCK, SUPER_EFFECTIVE
.DB FIGHTING, ICE, SUPER_EFFECTIVE
.DB FIGHTING, GHOST, NO_EFFECT
.DB POISON, GRASS, SUPER_EFFECTIVE
.DB POISON, POISON, NOT_VERY_EFFECTIVE
.DB POISON, GROUND, NOT_VERY_EFFECTIVE
.DB POISON, BUG, SUPER_EFFECTIVE
.DB POISON, ROCK, NOT_VERY_EFFECTIVE
.DB POISON, GHOST, NOT_VERY_EFFECTIVE
.DB GROUND, FIRE, SUPER_EFFECTIVE
.DB GROUND, ELECTRIC, SUPER_EFFECTIVE
.DB GROUND, GRASS, NOT_VERY_EFFECTIVE
.DB GROUND, BUG, NOT_VERY_EFFECTIVE
.DB GROUND, ROCK, SUPER_EFFECTIVE
.DB GROUND, POISON, SUPER_EFFECTIVE
.DB FLYING, ELECTRIC, NOT_VERY_EFFECTIVE
.DB FLYING, FIGHTING, SUPER_EFFECTIVE
.DB FLYING, BUG, SUPER_EFFECTIVE
.DB FLYING, GRASS, SUPER_EFFECTIVE
.DB FLYING, ROCK, NOT_VERY_EFFECTIVE
.DB PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE
.DB PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE
.DB BUG, FIRE, NOT_VERY_EFFECTIVE
.DB BUG, GRASS, SUPER_EFFECTIVE
.DB BUG, FIGHTING, NOT_VERY_EFFECTIVE
.DB BUG, FLYING, NOT_VERY_EFFECTIVE
.DB BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE
.DB BUG, GHOST, NOT_VERY_EFFECTIVE
.DB BUG, POISON, SUPER_EFFECTIVE
.DB ROCK, FIRE, SUPER_EFFECTIVE
.DB ROCK, FIGHTING, NOT_VERY_EFFECTIVE
.DB ROCK, GROUND, NOT_VERY_EFFECTIVE
.DB ROCK, FLYING, SUPER_EFFECTIVE
.DB ROCK, BUG, SUPER_EFFECTIVE
.DB ROCK, ICE, SUPER_EFFECTIVE
.DB GHOST, NORMAL, NO_EFFECT
.DB GHOST, PSYCHIC_TYPE, NO_EFFECT
.DB FIRE, DRAGON, NOT_VERY_EFFECTIVE
.DB WATER, DRAGON, NOT_VERY_EFFECTIVE
.DB ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE
.DB GRASS, DRAGON, NOT_VERY_EFFECTIVE
.DB ICE, DRAGON, SUPER_EFFECTIVE
.DB DRAGON, DRAGON, SUPER_EFFECTIVE

18
wla/data/types/type_names_reconcile.asm Normal file
View File

@@ -0,0 +1,18 @@
TypeNames::
.DW .Normal
.DW .Fighting
.DW .Flying
.DW .Poison
.DW .Ground
.DW .Rock
.DW .Bird
.DW .Bug
.DW .Ghost
.DW .Normal
.DW .Fire
.DW .Water
.DW .Grass
.DW .Electric
.DW .Psychic
.DW .Ice
.DW .Dragon