summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/trainers/class_names.asm65
-rw-r--r--main.asm3
-rw-r--r--shim.sym1
3 files changed, 68 insertions, 1 deletions
diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
new file mode 100644
index 0000000..284876d
--- /dev/null
+++ b/data/trainers/class_names.asm
@@ -0,0 +1,65 @@
+TrainerClassNames:: ; 38d90
+ db "ハヤト@"
+ db "アカネ@"
+ db "ツクシ@"
+ db "エノキ@"
+ db "オケラ@"
+ db "ミカン@"
+ db "ブルー@"
+ db "ガマ@"
+ db "ライバル@"
+ db "オーキドはかせ@"
+ db "サカキ@"
+ db "しゅじんこう@"
+ db "シバ@"
+ db "カスミ@"
+ db "カンナ@"
+ db "ワタル@"
+ db "ゲルゲだんいん♂@"
+ db "さんにんしゅう@"
+ db "さんにんしゅう@"
+ db "さんにんしゅう@"
+ db "ロケットだんいん♀@"
+ db "たんパンこぞう@"
+ db "じゅくがえり@"
+ db "ひよっこ@"
+ db "ミニスカート@"
+ db "てんさい@"
+ db "プロフェッショナル♂@"
+ db "プロフェッショナル♀@"
+ db "おとなのおねえさん@"
+ db "かいじゅうマニア@"
+ db "ロケットだんいん♂@"
+ db "ジェントルマン@"
+ db "せんせい♂@"
+ db "せんせい♀@"
+ db "とっちゃんぼうや@"
+ db "むしとりしょうねん@"
+ db "つりびと@"
+ db "かいパンやろう@"
+ db "ビキニのおねえさん@"
+ db "ふなのり@"
+ db "りかけいのおとこ@"
+ db "でんきやのオヤジ@"
+ db "でんきグループ@"
+ db "やまおとこ@"
+ db "ぼうそうぞく@"
+ db "ロッククライマー@"
+ db "かじばどろぼう@"
+ db "ひふきやろう@"
+ db "ジプシージャグラー@"
+ db "からておう@"
+ db "スポーツマン@"
+ db "ちょうのうりょくしゃ@"
+ db "カンフーマスター@"
+ db "うらないし@"
+ db "ふりょう@"
+ db "ぼうず@"
+ db "イタコ@"
+ db "へいし@"
+ db "ゲルゲだんいん♀@"
+ db "まいこはん@"
+ db "ふたごちゃん@"
+ db "ゲルゲだんいん♂@"
+ db "してんのう♂@"
+ db "してんのう♀@"
diff --git a/main.asm b/main.asm
index 2d9990f..56df9bd 100644
--- a/main.asm
+++ b/main.asm
@@ -172,6 +172,9 @@ INCBIN "gfx/tilesets/tileset_0c.2bpp"
SECTION "Type Matchups", ROMX[$506D],BANK[$0D]
INCLUDE "data/types/type_matchups.asm"
+SECTION "TrainerClassNames", ROMX[$4D90],BANK[$E]
+INCLUDE "data/trainers/class_names.asm"
+
INCLUDE "data/trainers/parties.asm"
SECTION "Alphabetical Pokedex Order", ROMX[$4943],BANK[$10]
diff --git a/shim.sym b/shim.sym
index b75eddb..8293946 100644
--- a/shim.sym
+++ b/shim.sym
@@ -77,7 +77,6 @@
0e:4b78 LoadTrainerClassName
0e:4ba0 LoadTrainerClassName.got_name
0e:4ba9 LoadTrainerClass
-0E:4D90 TrainerClassNames
10:52A1 MoveNames