diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
| commit | 8bf255b9f84f7e4f93e85a75512a002ef240a10f (patch) | |
| tree | 786ae5588f8bfe4b067cb3e91fd66cc4d95bd2da /main.asm | |
| parent | 7cc2571529d6b3f5ffcbb71c62fab31b27ba224a (diff) | |
Prepare to merge
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 54 |
1 files changed, 27 insertions, 27 deletions
@@ -6621,7 +6621,7 @@ GetOTName: ; 39550 .ok ld bc, TRAINER_CLASS_NAME_LENGTH - ld de, OTName + ld de, OTClassName push de call CopyBytes pop de @@ -9154,50 +9154,50 @@ Strings50a42: ; 50a42 dw .Youngster dw .BugCatcher dw .Lass - dw OTName + dw OTClassName dw .JrTrainerM dw .JrTrainerF dw .Pokemaniac dw .SuperNerd - dw OTName - dw OTName + dw OTClassName + dw OTClassName dw .Burglar dw .Engineer dw .Jack - dw OTName + dw OTClassName dw .Swimmer - dw OTName - dw OTName + dw OTClassName + dw OTClassName dw .Beauty - dw OTName + dw OTClassName dw .Rocker dw .Juggler - dw OTName - dw OTName + dw OTClassName + dw OTClassName dw .Blackbelt - dw OTName + dw OTClassName dw .ProfOak dw .Chief dw .Scientist - dw OTName + dw OTClassName dw .Rocket dw .CooltrainerM dw .CooltrainerF - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName - dw OTName + 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 .Youngster db "たんパン@" .BugCatcher db "むしとり@" |