ref: 26227cc45f0242a26b711bbf8711f4dc3aff6380
parent: 72cf53fcd3e56c2fcaf7157135eec5e65d1c1735
author: yenatch <yenatch@gmail.com>
date: Wed Dec 10 15:07:01 EST 2014
Clean up type names.
--- a/engine/battle/9.asm
+++ b/engine/battle/9.asm
@@ -31,7 +31,7 @@
ld a, [W_PLAYERMOVETYPE] ; wcfd5
asm_27d9f: ; 27d9f (9:7d9f)
add a
- ld hl, TypeNamePointers ; $7dae
+ ld hl, TypeNames
ld e, a
ld d, $0
add hl, de
--- a/text/type_names.asm
+++ b/text/type_names.asm
@@ -1,61 +1,48 @@
-TypeNamePointers: ; 27dae (9:7dae)
- dw Type00Name
- dw Type01Name
- dw Type02Name
- dw Type03Name
- dw Type04Name
- dw Type05Name
- dw Type06Name
- dw Type07Name
- dw Type08Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type00Name
- dw Type14Name
- dw Type15Name
- dw Type16Name
- dw Type17Name
- dw Type18Name
- dw Type19Name
- dw Type1AName
+TypeNames:
-Type00Name: ; 27de4 (9:7de4)
- db "NORMAL@"
-Type01Name: ; 27deb (9:7deb)
- db "FIGHTING@"
-Type02Name: ; 27df4 (9:7df4)
- db "FLYING@"
-Type03Name: ; 27dfb (9:7dfb)
- db "POISON@"
-Type14Name: ; 27e02 (9:7e02)
- db "FIRE@"
-Type15Name: ; 27e07 (9:7e07)
- db "WATER@"
-Type16Name: ; 27e0d (9:7e0d)
- db "GRASS@"
-Type17Name: ; 27e13 (9:7e13)
- db "ELECTRIC@"
-Type18Name: ; 27e1c (9:7e1c)
- db "PSYCHIC@"
-Type19Name: ; 27e24 (9:7e24)
- db "ICE@"
-Type04Name: ; 27e28 (9:7e28)
- db "GROUND@"
-Type05Name: ; 27e2f (9:7e2f)
- db "ROCK@"
-Type06Name: ; 27e34 (9:7e34)
- db "BIRD@"
-Type07Name: ; 27e39 (9:7e39)
- db "BUG@"
-Type08Name: ; 27e3d (9:7e3d)
- db "GHOST@"
-Type1AName: ; 27e43 (9:7e43)
- db "DRAGON@"
+ dw .Normal
+ dw .Fighting
+ dw .Flying
+ dw .Poison
+ dw .Ground
+ dw .Rock
+ dw .Bird
+ dw .Bug
+ dw .Ghost
+
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+ dw .Normal
+
+ dw .Fire
+ dw .Water
+ dw .Grass
+ dw .Electric
+ dw .Psychic
+ dw .Ice
+ dw .Dragon
+
+.Normal: db "NORMAL@"
+.Fighting: db "FIGHTING@"
+.Flying: db "FLYING@"
+.Poison: db "POISON@"
+.Fire: db "FIRE@"
+.Water: db "WATER@"
+.Grass: db "GRASS@"
+.Electric: db "ELECTRIC@"
+.Psychic: db "PSYCHIC@"
+.Ice: db "ICE@"
+.Ground: db "GROUND@"
+.Rock: db "ROCK@"
+.Bird: db "BIRD@"
+.Bug: db "BUG@"
+.Ghost: db "GHOST@"
+.Dragon: db "DRAGON@"