diff options
| -rwxr-xr-x | data/text/unused_gen1_trainer_names.asm | 71 | ||||
| -rwxr-xr-x | engine/battle/unreferenced_getgen1trainerclassname.asm | 21 | ||||
| -rw-r--r-- | main.asm | 4 |
3 files changed, 93 insertions, 3 deletions
diff --git a/data/text/unused_gen1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm new file mode 100755 index 00000000..fa839f36 --- /dev/null +++ b/data/text/unused_gen1_trainer_names.asm @@ -0,0 +1,71 @@ +Gen1TrainerClassNames: +; Untranslated trainer class names from Red. + dw .Youngster + dw .BugCatcher + dw .Lass + dw wOTClassName ; sailor + dw .JrTrainerM + dw .JrTrainerF + dw .Pokemaniac + dw .SuperNerd + dw wOTClassName ; hiker + dw wOTClassName ; biker + dw .Burglar + dw .Engineer + dw .Jack + dw wOTClassName ; fisher + dw .Swimmer + dw wOTClassName ; cue ball + dw wOTClassName ; gambler + dw .Beauty + dw wOTClassName ; psychic + dw .Rocker + dw .Juggler + dw wOTClassName ; tamer + dw wOTClassName ; bird keeper + dw .Blackbelt + dw wOTClassName ; rival1 + dw .ProfOak + dw .Chief + dw .Scientist + dw wOTClassName ; giovanni + dw .Rocket + dw .CooltrainerM + dw .CooltrainerF + dw wOTClassName ; bruno + dw wOTClassName ; brock + dw wOTClassName ; misty + dw wOTClassName ; lt.surge + dw wOTClassName ; erika + dw wOTClassName ; koga + dw wOTClassName ; blaine + dw wOTClassName ; sabrina + dw wOTClassName ; gentleman + dw wOTClassName ; rival2 + dw wOTClassName ; rival3 + dw wOTClassName ; lorelei + dw wOTClassName ; channeler + dw wOTClassName ; agatha + dw wOTClassName ; lance + +.Youngster: db "たんパン@" +.BugCatcher: db "むしとり@" +.Lass: db "ミニスカ@" +.JrTrainerM: db "ボーイ@" +.JrTrainerF: db "ガール@" +.Pokemaniac: db "マニア@" +.SuperNerd: db "りかけい@" +.Burglar: db "どろぼう@" +.Engineer: db "オヤジ@" +.Jack: db "ジャック@" +.Swimmer: db "かいパン@" +.Beauty: db "おねえさん@" +.Rocker: db "グループ@" +.Juggler: db "ジャグラー@" +.Blackbelt: db "からて@" +.ProfOak: db "オーキド@" +.Chief: db "チーフ@" +.Scientist: db "けんきゅういん@" +.Rocket: db "だんいん@" +.CooltrainerM: db "エりート♂@" +.CooltrainerF: db "エりート♀@" diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm new file mode 100755 index 00000000..04532523 --- /dev/null +++ b/engine/battle/unreferenced_getgen1trainerclassname.asm @@ -0,0 +1,21 @@ +Unreferenced_GetGen1TrainerClassName: + ld hl, Gen1TrainerClassNames + ld a, [wTrainerClass] + 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, wStringBuffer1 +.copy + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .copy + ret + +INCLUDE "data/text/unused_gen1_trainer_names.asm" @@ -367,9 +367,7 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/pokemon/tempmon.asm" INCLUDE "engine/pokemon/types.asm" - -unk_014_4a5b: - dr $50a5b, $50b3d +INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm" DrawPlayerHP:: dr $50b3d, $50b41 |