Merge pull request #20 from PikalaxALT/dump_trainer_class_names

Dump trainer class names
This commit is contained in:
Marcus Huderle
2018-10-14 08:03:22 -05:00
committed by GitHub
4 changed files with 114 additions and 6 deletions
+2 -2
View File
@@ -1726,12 +1726,12 @@ _080D8084:
movs r0, 0xD
_080D8094:
muls r1, r0
ldr r0, _080D80A0 @ =gUnknown_823E558
ldr r0, _080D80A0 @ =gTrainerClassNames
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D809C: .4byte gTrainers
_080D80A0: .4byte gUnknown_823E558
_080D80A0: .4byte gTrainerClassNames
_080D80A4:
ldr r0, _080D80E8 @ =gTrainerBattleOpponent_A
ldrh r2, [r0]
+2 -2
View File
@@ -10960,7 +10960,7 @@ sub_811B31C: @ 811B31C
lsrs r0, 16
movs r1, 0xD
muls r1, r0
ldr r0, _0811B4B4 @ =gUnknown_823E558
ldr r0, _0811B4B4 @ =gTrainerClassNames
adds r1, r0
adds r0, r6, 0
bl StringCopy
@@ -11109,7 +11109,7 @@ _0811B45E:
b _0811B4F0
.align 2, 0
_0811B4B0: .4byte gUnknown_2039624
_0811B4B4: .4byte gUnknown_823E558
_0811B4B4: .4byte gTrainerClassNames
_0811B4B8: .4byte gUnknown_84594B0
_0811B4BC: .4byte gUnknown_84594C4
_0811B4C0: .4byte gStringVar4
+3 -2
View File
@@ -115,9 +115,10 @@ gUnknown_8239FD4:: @ 8239FD4
gUnknown_823A004:: @ 823A004
.incbin "baserom.gba", 0x23A004, 0x4554
gUnknown_823E558:: @ 823E558
.incbin "baserom.gba", 0x23E558, 0x570
gTrainerClassNames:: @ 823E558
.include "data/text/trainer_class_names.inc"
.align 2, 0
gTrainers:: @ 823EAD8
.incbin "baserom.gba", 0x23EAC8, 0x7418
+107
View File
@@ -0,0 +1,107 @@
.string "{PKMN} TRAINER$", 13
.string "{PKMN} TRAINER$", 13
.string "AQUA LEADER$", 13
.string "TEAM AQUA$", 13
.string "AROMA LADY$", 13
.string "RUIN MANIAC$", 13
.string "INTERVIEWER$", 13
.string "TUBER$", 13
.string "TUBER$", 13
.string "COOLTRAINER$", 13
.string "HEX MANIAC$", 13
.string "LADY$", 13
.string "BEAUTY$", 13
.string "RICH BOY$", 13
.string "POKéMANIAC$", 13
.string "SWIMMER♂$", 13
.string "BLACK BELT$", 13
.string "GUITARIST$", 13
.string "KINDLER$", 13
.string "CAMPER$", 13
.string "BUG MANIAC$", 13
.string "PSYCHIC$", 13
.string "GENTLEMAN$", 13
.string "ELITE FOUR$", 13
.string "LEADER$", 13
.string "SCHOOL KID$", 13
.string "SR. AND JR.$", 13
.string "POKéFAN$", 13
.string "EXPERT$", 13
.string "YOUNGSTER$", 13
.string "CHAMPION$", 13
.string "FISHERMAN$", 13
.string "TRIATHLETE$", 13
.string "DRAGON TAMER$", 13
.string "BIRD KEEPER$", 13
.string "NINJA BOY$", 13
.string "BATTLE GIRL$", 13
.string "PARASOL LADY$", 13
.string "SWIMMER♀$", 13
.string "PICNICKER$", 13
.string "TWINS$", 13
.string "SAILOR$", 13
.string "BOARDER$", 13
.string "COLLECTOR$", 13
.string "{PKMN} TRAINER$", 13
.string "{PKMN} BREEDER$", 13
.string "{PKMN} RANGER$", 13
.string "MAGMA LEADER$", 13
.string "TEAM MAGMA$", 13
.string "LASS$", 13
.string "BUG CATCHER$", 13
.string "HIKER$", 13
.string "YOUNG COUPLE$", 13
.string "OLD COUPLE$", 13
.string "SIS AND BRO$", 13
.string "AQUA ADMIN$", 13
.string "MAGMA ADMIN$", 13
.string "YOUNGSTER$", 13
.string "BUG CATCHER$", 13
.string "LASS$", 13
.string "SAILOR$", 13
.string "CAMPER$", 13
.string "PICNICKER$", 13
.string "POKéMANIAC$", 13
.string "SUPER NERD$", 13
.string "HIKER$", 13
.string "BIKER$", 13
.string "BURGLAR$", 13
.string "ENGINEER$", 13
.string "FISHERMAN$", 13
.string "SWIMMER♂$", 13
.string "CUE BALL$", 13
.string "GAMER$", 13
.string "BEAUTY$", 13
.string "SWIMMER♀$", 13
.string "PSYCHIC$", 13
.string "ROCKER$", 13
.string "JUGGLER$", 13
.string "TAMER$", 13
.string "BIRD KEEPER$", 13
.string "BLACK BELT$", 13
.string "RIVAL$", 13
.string "SCIENTIST$", 13
.string "BOSS$", 13
.string "LEADER$", 13
.string "TEAM ROCKET$", 13
.string "COOLTRAINER$", 13
.string "ELITE FOUR$", 13
.string "GENTLEMAN$", 13
.string "RIVAL$", 13
.string "CHAMPION$", 13
.string "CHANNELER$", 13
.string "TWINS$", 13
.string "COOL COUPLE$", 13
.string "YOUNG COUPLE$", 13
.string "CRUSH KIN$", 13
.string "SIS AND BRO$", 13
.string "{PKMN} PROF.$", 13
.string "PLAYER$", 13
.string "CRUSH GIRL$", 13
.string "TUBER$", 13
.string "{PKMN} BREEDER$", 13
.string "{PKMN} RANGER$", 13
.string "AROMA LADY$", 13
.string "RUIN MANIAC$", 13
.string "LADY$", 13
.string "PAINTER$", 13