mirror of https://github.com/pret/pokecrystal.git
Recomment type names.
This is mostly just whitespace reduction.
This commit is contained in:
parent
43fb5732a2
commit
e2ec8a1d13
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const_def
|
const_def
|
||||||
|
|
||||||
PHYSICAL EQU const_value
|
PHYSICAL EQU const_value
|
||||||
|
@ -13,7 +12,6 @@ PHYSICAL EQU const_value
|
||||||
const GHOST
|
const GHOST
|
||||||
const STEEL
|
const STEEL
|
||||||
|
|
||||||
|
|
||||||
UNUSED_TYPES EQU const_value
|
UNUSED_TYPES EQU const_value
|
||||||
const TYPE_10
|
const TYPE_10
|
||||||
const TYPE_11
|
const TYPE_11
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
PrintMonTypes: ; 5090d
|
PrintMonTypes: ; 5090d
|
||||||
; Print both types of CurSpecies on the stats screen at hl.
|
; Print one or both types of [CurSpecies]
|
||||||
|
; on the stats screen at hl.
|
||||||
|
|
||||||
push hl
|
push hl
|
||||||
call GetBaseData
|
call GetBaseData
|
||||||
|
@ -7,27 +8,29 @@ PrintMonTypes: ; 5090d
|
||||||
|
|
||||||
push hl
|
push hl
|
||||||
ld a, [BaseType1]
|
ld a, [BaseType1]
|
||||||
call .PrintType
|
call .Print
|
||||||
|
|
||||||
|
; Single-typed monsters really
|
||||||
|
; have two of the same type.
|
||||||
ld a, [BaseType1]
|
ld a, [BaseType1]
|
||||||
ld b, a
|
ld b, a
|
||||||
ld a, [BaseType2]
|
ld a, [BaseType2]
|
||||||
cp b
|
cp b
|
||||||
pop hl
|
pop hl
|
||||||
jr z, .HideSecondType
|
jr z, .hide_type_2
|
||||||
|
|
||||||
; Next row
|
ld bc, SCREEN_WIDTH
|
||||||
ld bc, 20
|
|
||||||
add hl, bc
|
add hl, bc
|
||||||
|
|
||||||
.PrintType
|
.Print
|
||||||
ld b, a
|
ld b, a
|
||||||
jr PrintType
|
jr PrintType
|
||||||
|
|
||||||
.HideSecondType
|
.hide_type_2
|
||||||
; This doesn't actually do anything.
|
; Erase any type name that was here before.
|
||||||
|
; Seems to be pointless in localized versions.
|
||||||
ld a, " "
|
ld a, " "
|
||||||
ld bc, 20 - 3
|
ld bc, SCREEN_WIDTH - 3
|
||||||
add hl, bc
|
add hl, bc
|
||||||
ld [hl], a
|
ld [hl], a
|
||||||
inc bc
|
inc bc
|
||||||
|
@ -36,6 +39,7 @@ PrintMonTypes: ; 5090d
|
||||||
jp ByteFill
|
jp ByteFill
|
||||||
; 5093a
|
; 5093a
|
||||||
|
|
||||||
|
|
||||||
PrintMoveType: ; 5093a
|
PrintMoveType: ; 5093a
|
||||||
; Print the type of move b at hl.
|
; Print the type of move b at hl.
|
||||||
|
|
||||||
|
@ -52,10 +56,11 @@ PrintMoveType: ; 5093a
|
||||||
pop hl
|
pop hl
|
||||||
|
|
||||||
ld b, a
|
ld b, a
|
||||||
; 50953
|
|
||||||
|
|
||||||
PrintType: ; 50953
|
PrintType: ; 50953
|
||||||
; Print type b at hl.
|
; Print type b at hl.
|
||||||
|
|
||||||
ld a, b
|
ld a, b
|
||||||
|
|
||||||
push hl
|
push hl
|
||||||
|
@ -74,7 +79,8 @@ PrintType: ; 50953
|
||||||
|
|
||||||
|
|
||||||
GetTypeName: ; 50964
|
GetTypeName: ; 50964
|
||||||
; Copy the name of type $d265 to StringBuffer1.
|
; Copy the name of type [$d265] to StringBuffer1.
|
||||||
|
|
||||||
ld a, [$d265]
|
ld a, [$d265]
|
||||||
ld hl, TypeNames
|
ld hl, TypeNames
|
||||||
ld e, a
|
ld e, a
|
||||||
|
@ -85,7 +91,7 @@ GetTypeName: ; 50964
|
||||||
ld h, [hl]
|
ld h, [hl]
|
||||||
ld l, a
|
ld l, a
|
||||||
ld de, StringBuffer1
|
ld de, StringBuffer1
|
||||||
ld bc, $000d
|
ld bc, 13
|
||||||
jp CopyBytes
|
jp CopyBytes
|
||||||
; 5097b
|
; 5097b
|
||||||
|
|
||||||
|
@ -110,7 +116,7 @@ TypeNames: ; 5097b
|
||||||
dw Normal
|
dw Normal
|
||||||
dw Normal
|
dw Normal
|
||||||
dw Normal
|
dw Normal
|
||||||
dw UnknownType
|
dw CurseType
|
||||||
dw Fire
|
dw Fire
|
||||||
dw Water
|
dw Water
|
||||||
dw Grass
|
dw Grass
|
||||||
|
@ -120,43 +126,24 @@ TypeNames: ; 5097b
|
||||||
dw Dragon
|
dw Dragon
|
||||||
dw Dark
|
dw Dark
|
||||||
|
|
||||||
Normal:
|
Normal: db "NORMAL@"
|
||||||
db "NORMAL@"
|
Fighting: db "FIGHTING@"
|
||||||
Fighting:
|
Flying: db "FLYING@"
|
||||||
db "FIGHTING@"
|
Poison: db "POISON@"
|
||||||
Flying:
|
CurseType: db "???@"
|
||||||
db "FLYING@"
|
Fire: db "FIRE@"
|
||||||
Poison:
|
Water: db "WATER@"
|
||||||
db "POISON@"
|
Grass: db "GRASS@"
|
||||||
UnknownType:
|
Electric: db "ELECTRIC@"
|
||||||
db "???@"
|
Psychic: db "PSYCHIC@"
|
||||||
Fire:
|
Ice: db "ICE@"
|
||||||
db "FIRE@"
|
Ground: db "GROUND@"
|
||||||
Water:
|
Rock: db "ROCK@"
|
||||||
db "WATER@"
|
Bird: db "BIRD@"
|
||||||
Grass:
|
Bug: db "BUG@"
|
||||||
db "GRASS@"
|
Ghost: db "GHOST@"
|
||||||
Electric:
|
Steel: db "STEEL@"
|
||||||
db "ELECTRIC@"
|
Dragon: db "DRAGON@"
|
||||||
Psychic:
|
Dark: db "DARK@"
|
||||||
db "PSYCHIC@"
|
|
||||||
Ice:
|
|
||||||
db "ICE@"
|
|
||||||
Ground:
|
|
||||||
db "GROUND@"
|
|
||||||
Rock:
|
|
||||||
db "ROCK@"
|
|
||||||
Bird:
|
|
||||||
db "BIRD@"
|
|
||||||
Bug:
|
|
||||||
db "BUG@"
|
|
||||||
Ghost:
|
|
||||||
db "GHOST@"
|
|
||||||
Steel:
|
|
||||||
db "STEEL@"
|
|
||||||
Dragon:
|
|
||||||
db "DRAGON@"
|
|
||||||
Dark:
|
|
||||||
db "DARK@"
|
|
||||||
; 50a28
|
|
||||||
|
|
||||||
|
; 50a28
|
||||||
|
|
Loading…
Reference in New Issue