summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-16 18:07:06 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-16 18:07:06 -0500
commit01ba6bed889be703dbeaf8fa9be56f1b782606a1 (patch)
tree408bfb24c21ea7dd6a9902b22728a77d47d0e13a /data
parent5407d8de920b779d760d88153d8e314a687d100e (diff)
Move code out of data/
Diffstat (limited to 'data')
-rw-r--r--data/unused/dakutens.asm4
-rw-r--r--data/unused/gen_1_trainer_names.asm74
2 files changed, 29 insertions, 49 deletions
diff --git a/data/unused/dakutens.asm b/data/unused/dakutens.asm
index 82e884fdf..756018d79 100644
--- a/data/unused/dakutens.asm
+++ b/data/unused/dakutens.asm
@@ -1,4 +1,4 @@
-Dakutens: ; unused
+UnreferencedDakutens:
db "かが", "きぎ", "くぐ", "けげ", "こご"
db "さざ", "しじ", "すず", "せぜ", "そぞ"
db "ただ", "ちぢ", "つづ", "てで", "とど"
@@ -9,7 +9,7 @@ Dakutens: ; unused
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db -1 ; end
-Handakutens: ; unused
+UnreferencedHandakutens:
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db -1 ; end
diff --git a/data/unused/gen_1_trainer_names.asm b/data/unused/gen_1_trainer_names.asm
index e7e985f84..ae28f9c9e 100644
--- a/data/unused/gen_1_trainer_names.asm
+++ b/data/unused/gen_1_trainer_names.asm
@@ -1,72 +1,52 @@
-Unreferenced_GetGen1TrainerClassName: ; 50a28
- ld hl, .Strings
- ld a, [TrainerClass]
- dec a
- ld c, a
- ld b, 0
- add hl, bc
- add hl, bc
- ld a, [hli]
- ld h, [hl]
- ld l, a
- ld de, StringBuffer1
-.copy
- ld a, [hli]
- ld [de], a
- inc de
- cp "@"
- jr nz, .copy
- ret
-
-.Strings: ; 50a42
+Gen1TrainerClassNames: ; 50a42
; Untranslated trainer class names from Red.
dw .Youngster
dw .BugCatcher
dw .Lass
- dw OTClassName
+ dw OTClassName ; sailor
dw .JrTrainerM
dw .JrTrainerF
dw .Pokemaniac
dw .SuperNerd
- dw OTClassName
- dw OTClassName
+ dw OTClassName ; hiker
+ dw OTClassName ; biker
dw .Burglar
dw .Engineer
dw .Jack
- dw OTClassName
+ dw OTClassName ; fisher
dw .Swimmer
- dw OTClassName
- dw OTClassName
+ dw OTClassName ; cue ball
+ dw OTClassName ; gambler
dw .Beauty
- dw OTClassName
+ dw OTClassName ; psychic
dw .Rocker
dw .Juggler
- dw OTClassName
- dw OTClassName
+ dw OTClassName ; tamer
+ dw OTClassName ; bird keeper
dw .Blackbelt
- dw OTClassName
+ dw OTClassName ; rival1
dw .ProfOak
dw .Chief
dw .Scientist
- dw OTClassName
+ dw OTClassName ; giovanni
dw .Rocket
dw .CooltrainerM
dw .CooltrainerF
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
- dw OTClassName
+ dw OTClassName ; bruno
+ dw OTClassName ; brock
+ dw OTClassName ; misty
+ dw OTClassName ; lt.surge
+ dw OTClassName ; erika
+ dw OTClassName ; koga
+ dw OTClassName ; blaine
+ dw OTClassName ; sabrina
+ dw OTClassName ; gentleman
+ dw OTClassName ; rival2
+ dw OTClassName ; rival3
+ dw OTClassName ; lorelei
+ dw OTClassName ; channeler
+ dw OTClassName ; agatha
+ dw OTClassName ; lance
.Youngster: db "たんパン@"
.BugCatcher: db "むしとり@"