ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed trainer pic to trainer front pic

Browse Source
This commit is contained in:
YamaArashi 2015-11-14 07:44:13 -08:00
parent 3af77f0544
commit e205a499de
6 changed files with 214 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
asm/emerald.s
View File

@ -160138,7 +160138,7 @@ sub_805B4F0: ; 805B4F0
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
lsls r5, 3
adds r5, r0
ldrh r0, [r5, 0x4]
@ -164878,7 +164878,7 @@ sub_805DF38: ; 805DF38
bl battle_get_per_side_status
lsls r0, 24
lsls r4, 3
ldr r2, =gTrainerPicTable
ldr r2, =gTrainerFrontPicTable
adds r2, r4, r2
ldr r1, =0x020244d4
ldr r1, [r1]
@ -164889,7 +164889,7 @@ sub_805DF38: ; 805DF38
adds r0, r2, 0
movs r2, 0
bl LZ77UnCompAnyRam
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
adds r4, r0
adds r0, r4, 0
bl gpu_pal_obj_decompress_and_apply
@ -164951,7 +164951,7 @@ nullsub_25: ; 805DFE0
sub_805DFE4: ; 805DFE4
push {lr}
lsls r0, 16
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
lsrs r0, 13
adds r0, r1
ldrh r0, [r0, 0x4]
@ -171593,7 +171593,7 @@ sub_8061690: ; 8061690
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@ -171830,7 +171830,7 @@ sub_80618D8: ; 80618D8
adds r0, r4
ldr r1, =0x0000fffe
strh r1, [r0, 0x2E]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@ -181284,7 +181284,7 @@ sub_8066748: ; 8066748
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@ -181418,7 +181418,7 @@ sub_8066A58: ; 8066A58
adds r0, r4
ldr r1, =0x0000fffe
strh r1, [r0, 0x2E]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@ -342828,13 +342828,13 @@ sub_80B5E6C: ; 80B5E6C
lsrs r0, 24
mov r9, r0
lsrs r4, 21
ldr r3, =gTrainerPaletteTable
ldr r3, =gTrainerFrontPicPaletteTable
mov r8, r3
add r8, r4
mov r0, r8
adds r1, r7, 0
bl gpu_pal_obj_decompress_and_apply2
ldr r0, =gTrainerPicTable
ldr r0, =gTrainerFrontPicTable
adds r4, r0
adds r0, r4, 0
adds r1, r7, 0
@ -342886,12 +342886,12 @@ sub_80B5F0C: ; 80B5F0C
lsls r4, 24
lsls r5, 16
lsrs r5, 16
ldr r0, =gTrainerPicTable
ldr r0, =gTrainerFrontPicTable
lsrs r4, 21
adds r0, r4, r0
ldr r0, [r0]
bl call_LZZUnCompVram
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
adds r4, r0
ldr r0, [r4]
adds r1, r5, 0
@ -757777,7 +757777,7 @@ sub_818888C: ; 818888C
adds r0, r4
movs r1, 0x2
strh r1, [r0, 0x2E]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
mov r2, r8
lsls r0, r2, 3
adds r0, r1
@ -763872,7 +763872,7 @@ sub_818BD04: ; 818BD04
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
lsls r5, 3
adds r5, r0
ldrh r0, [r5, 0x4]
@ -766055,7 +766055,7 @@ load_pokemon_image_TODO: ; 818CFF4
cmp r2, 0
beq @0818D080
lsls r0, r4, 3
ldr r1, =gTrainerPicTable
ldr r1, =gTrainerFrontPicTable
adds r0, r1
adds r1, r5, 0
adds r2, r4, 0
@ -766160,7 +766160,7 @@ sub_818D0C4: ; 818D0C4
adds r0, r3, 0
orrs r0, r1
strh r0, [r2, 0x2]
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
lsls r0, r4, 3
adds r0, r1
ldr r0, [r0]
@ -766180,7 +766180,7 @@ sub_818D0C4: ; 818D0C4
ldr r0, =0x0203ccec
strh r1, [r0, 0x2]
lsls r0, r6, 3
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
adds r0, r1
bl gpu_pal_obj_decompress_and_apply
@0818D16E:
@ -766212,7 +766212,7 @@ sub_818D180: ; 818D180
bl decompress_palette
b @0818D1B4
@0818D1A4:
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
lsls r0, 3
adds r0, r1
ldr r0, [r0]
@ -860428,7 +860428,7 @@ sub_81BD37C: ; 81BD37C
ldrb r1, [r6]
adds r1, r4
strb r0, [r1]
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
lsls r5, 3
adds r5, r0
ldrh r0, [r5, 0x4]
@ -861986,7 +861986,7 @@ sub_81BE10C: ; 81BE10C
ldrh r0, [r2]
bl sub_8162AA0
lsls r0, 24
ldr r1, =gTrainerPaletteTable
ldr r1, =gTrainerFrontPicPaletteTable
lsrs r0, 21
adds r0, r1
ldr r0, [r0]
@ -889704,14 +889704,14 @@ sub_81CC39C: ; 81CC39C
cmp r0, 0
blt @081CC400
lsls r4, r0, 3
ldr r0, =gTrainerPicTable
ldr r0, =gTrainerFrontPicTable
adds r0, r4, r0
ldr r1, =0x00001828
adds r5, r7, r1
adds r1, r5, 0
movs r2, 0
bl sub_80345F0
ldr r0, =gTrainerPaletteTable
ldr r0, =gTrainerFrontPicPaletteTable
adds r4, r0
ldr r0, [r4]
ldr r1, =0x00002028

4
data/data2.s
View File

@ -1397,10 +1397,10 @@ gUnknown_083054E0: ; 83054E0
.incbin "base_emerald.gba", 0x3054e0, 0x174
; 8305654
.include "data/graphics/trainers/trainer_pic_table.s"
.include "data/graphics/trainers/trainer_front_pic_table.s"
; 830593C
.include "data/graphics/trainers/trainer_palette_table.s"
.include "data/graphics/trainers/trainer_front_pic_palette_table.s"
; 8305C24
.incbin "base_emerald.gba", 0x305c24, 0xe8

2
data/graphics/trainers/trainer_palette_table.s → data/graphics/trainers/trainer_front_pic_palette_table.s
View File

@ -1,6 +1,6 @@
.align 2, 0
gTrainerPaletteTable: ; 830593C
gTrainerFrontPicPaletteTable: ; 830593C
obj_pal gTrainerPalette_Hiker, 0
obj_pal gTrainerPalette_AquaGruntM, 1
obj_pal gTrainerPalette_PokemonBreederF, 2

96
data/graphics/trainers/trainer_front_pic_table.s Normal file
View File

@ -0,0 +1,96 @@
.align 2, 0
gTrainerFrontPicTable: ; 8305654
obj_tiles gTrainerFrontPic_Hiker, 0x800, 0
obj_tiles gTrainerFrontPic_AquaGruntM, 0x800, 1
obj_tiles gTrainerFrontPic_PokemonBreederF, 0x800, 2
obj_tiles gTrainerFrontPic_CoolTrainerM, 0x800, 3
obj_tiles gTrainerFrontPic_BirdKeeper, 0x800, 4
obj_tiles gTrainerFrontPic_Collector, 0x800, 5
obj_tiles gTrainerFrontPic_AquaGruntF, 0x800, 6
obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 7
obj_tiles gTrainerFrontPic_MagmaGruntM, 0x800, 8
obj_tiles gTrainerFrontPic_ExpertM, 0x800, 9
obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 10
obj_tiles gTrainerFrontPic_BlackBelt, 0x800, 11
obj_tiles gTrainerFrontPic_AquaAdminF, 0x800, 12
obj_tiles gTrainerFrontPic_AquaLeaderArchie, 0x800, 13
obj_tiles gTrainerFrontPic_HexManiac, 0x800, 14
obj_tiles gTrainerFrontPic_AromaLady, 0x800, 15
obj_tiles gTrainerFrontPic_RuinManiac, 0x800, 16
obj_tiles gTrainerFrontPic_Interviewer, 0x800, 17
obj_tiles gTrainerFrontPic_TuberF, 0x800, 18
obj_tiles gTrainerFrontPic_TuberM, 0x800, 19
obj_tiles gTrainerFrontPic_CoolTrainerF, 0x800, 20
obj_tiles gTrainerFrontPic_Lady, 0x800, 21
obj_tiles gTrainerFrontPic_Beauty, 0x800, 22
obj_tiles gTrainerFrontPic_RichBoy, 0x800, 23
obj_tiles gTrainerFrontPic_ExpertF, 0x800, 24
obj_tiles gTrainerFrontPic_Pokemaniac, 0x800, 25
obj_tiles gTrainerFrontPic_MagmaGruntF, 0x800, 26
obj_tiles gTrainerFrontPic_Guitarist, 0x800, 27
obj_tiles gTrainerFrontPic_Kindler, 0x800, 28
obj_tiles gTrainerFrontPic_Camper, 0x800, 29
obj_tiles gTrainerFrontPic_Picnicker, 0x800, 30
obj_tiles gTrainerFrontPic_BugManiac, 0x800, 31
obj_tiles gTrainerFrontPic_PokemonBreederM, 0x800, 32
obj_tiles gTrainerFrontPic_PsychicM, 0x800, 33
obj_tiles gTrainerFrontPic_PsychicF, 0x800, 34
obj_tiles gTrainerFrontPic_Gentleman, 0x800, 35
obj_tiles gTrainerFrontPic_EliteFourSidney, 0x800, 36
obj_tiles gTrainerFrontPic_EliteFourPhoebe, 0x800, 37
obj_tiles gTrainerFrontPic_EliteFourGlacia, 0x800, 38
obj_tiles gTrainerFrontPic_EliteFourDrake, 0x800, 39
obj_tiles gTrainerFrontPic_LeaderRoxanne, 0x800, 40
obj_tiles gTrainerFrontPic_LeaderBrawly, 0x800, 41
obj_tiles gTrainerFrontPic_LeaderWattson, 0x800, 42
obj_tiles gTrainerFrontPic_LeaderFlannery, 0x800, 43
obj_tiles gTrainerFrontPic_LeaderNorman, 0x800, 44
obj_tiles gTrainerFrontPic_LeaderWinona, 0x800, 45
obj_tiles gTrainerFrontPic_LeaderTateAndLiza, 0x800, 46
obj_tiles gTrainerFrontPic_LeaderJuan, 0x800, 47
obj_tiles gTrainerFrontPic_SchoolKidM, 0x800, 48
obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 49
obj_tiles gTrainerFrontPic_SrAndJr, 0x1000, 50
obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 51
obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 52
obj_tiles gTrainerFrontPic_Youngster, 0x800, 53
obj_tiles gTrainerFrontPic_ChampionWallace, 0x1000, 54
obj_tiles gTrainerFrontPic_Fisherman, 0x800, 55
obj_tiles gTrainerFrontPic_CyclingTriathleteM, 0x1000, 56
obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 57
obj_tiles gTrainerFrontPic_RunningTriathleteM, 0x800, 58
obj_tiles gTrainerFrontPic_RunningTriathleteF, 0x800, 59
obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 60
obj_tiles gTrainerFrontPic_SwimmingTriathleteF, 0x800, 61
obj_tiles gTrainerFrontPic_DragonTamer, 0x800, 62
obj_tiles gTrainerFrontPic_NinjaBoy, 0x800, 63
obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 64
obj_tiles gTrainerFrontPic_ParasolLady, 0x800, 65
obj_tiles gTrainerFrontPic_SwimmerF, 0x800, 66
obj_tiles gTrainerFrontPic_Twins, 0x800, 67
obj_tiles gTrainerFrontPic_Sailor, 0x800, 68
obj_tiles gTrainerFrontPic_MagmaAdmin, 0x800, 69
obj_tiles gTrainerFrontPic_Wally, 0x800, 70
obj_tiles gTrainerFrontPic_Brendan, 0x800, 71
obj_tiles gTrainerFrontPic_May, 0x800, 72
obj_tiles gTrainerFrontPic_BugCatcher, 0x800, 73
obj_tiles gTrainerFrontPic_PokemonRangerM, 0x800, 74
obj_tiles gTrainerFrontPic_PokemonRangerF, 0x800, 75
obj_tiles gTrainerFrontPic_MagmaLeaderMaxie, 0x800, 76
obj_tiles gTrainerFrontPic_Lass, 0x800, 77
obj_tiles gTrainerFrontPic_YoungCouple, 0x800, 78
obj_tiles gTrainerFrontPic_OldCouple, 0x800, 79
obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 80
obj_tiles gTrainerFrontPic_Steven, 0x800, 81
obj_tiles gTrainerFrontPic_SalonMaidenAnabel, 0x800, 82
obj_tiles gTrainerFrontPic_DomeAceTucker, 0x800, 83
obj_tiles gTrainerFrontPic_PalaceMavenSpenser, 0x800, 84
obj_tiles gTrainerFrontPic_ArenaTycoonGreta, 0x1000, 85
obj_tiles gTrainerFrontPic_FactoryHeadNoland, 0x800, 86
obj_tiles gTrainerFrontPic_PikeQueenLucy, 0x800, 87
obj_tiles gTrainerFrontPic_PyramidKingBrandon, 0x800, 88
obj_tiles gTrainerFrontPic_Red, 0x800, 89
obj_tiles gTrainerFrontPic_Leaf, 0x800, 90
obj_tiles gTrainerFrontPic_RubySapphireBrendan, 0x800, 91
obj_tiles gTrainerFrontPic_RubySapphireMay, 0x800, 92

186
data/graphics/trainers/trainer_graphics.s
View File

@ -1,6 +1,6 @@
.align 2, 0
gTrainerPic_Hiker: ; 8D51DC8
gTrainerFrontPic_Hiker: ; 8D51DC8
.incbin "base_emerald.gba", 0xd51dc8, 0x480
.align 2, 0
@ -10,7 +10,7 @@ gTrainerPalette_Hiker: ; 8D52248
.align 2, 0
gTrainerPic_AquaGruntM: ; 8D52270
gTrainerFrontPic_AquaGruntM: ; 8D52270
.incbin "base_emerald.gba", 0xd52270, 0x360
.align 2, 0
@ -20,7 +20,7 @@ gTrainerPalette_AquaGruntM: ; 8D525D0
.align 2, 0
gTrainerPic_PokemonBreederF: ; 8D525F8
gTrainerFrontPic_PokemonBreederF: ; 8D525F8
.incbin "base_emerald.gba", 0xd525f8, 0x334
.align 2, 0
@ -30,7 +30,7 @@ gTrainerPalette_PokemonBreederF: ; 8D5292C
.align 2, 0
gTrainerPic_CoolTrainerM: ; 8D52954
gTrainerFrontPic_CoolTrainerM: ; 8D52954
.incbin "base_emerald.gba", 0xd52954, 0x2e8
.align 2, 0
@ -40,7 +40,7 @@ gTrainerPalette_CoolTrainerM: ; 8D52C3C
.align 2, 0
gTrainerPic_BirdKeeper: ; 8D52C64
gTrainerFrontPic_BirdKeeper: ; 8D52C64
.incbin "base_emerald.gba", 0xd52c64, 0x338
.align 2, 0
@ -50,7 +50,7 @@ gTrainerPalette_BirdKeeper: ; 8D52F9C
.align 2, 0
gTrainerPic_Collector: ; 8D52FC4
gTrainerFrontPic_Collector: ; 8D52FC4
.incbin "base_emerald.gba", 0xd52fc4, 0x404
.align 2, 0
@ -60,7 +60,7 @@ gTrainerPalette_Collector: ; 8D533C8
.align 2, 0
gTrainerPic_AquaGruntF: ; 8D533F0
gTrainerFrontPic_AquaGruntF: ; 8D533F0
.incbin "base_emerald.gba", 0xd533f0, 0x33c
.align 2, 0
@ -70,7 +70,7 @@ gTrainerPalette_AquaGruntF: ; 8D5372C
.align 2, 0
gTrainerPic_SwimmerM: ; 8D53754
gTrainerFrontPic_SwimmerM: ; 8D53754
.incbin "base_emerald.gba", 0xd53754, 0x2c0
.align 2, 0
@ -80,7 +80,7 @@ gTrainerPalette_SwimmerM: ; 8D53A14
.align 2, 0
gTrainerPic_MagmaGruntM: ; 8D53A3C
gTrainerFrontPic_MagmaGruntM: ; 8D53A3C
.incbin "base_emerald.gba", 0xd53a3c, 0x380
.align 2, 0
@ -90,7 +90,7 @@ gTrainerPalette_MagmaGruntM: ; 8D53DBC
.align 2, 0
gTrainerPic_ExpertM: ; 8D53DE4
gTrainerFrontPic_ExpertM: ; 8D53DE4
.incbin "base_emerald.gba", 0xd53de4, 0x340
.align 2, 0
@ -100,7 +100,7 @@ gTrainerPalette_ExpertM: ; 8D54124
.align 2, 0
gTrainerPic_AquaAdminM: ; 8D5414C
gTrainerFrontPic_AquaAdminM: ; 8D5414C
.incbin "base_emerald.gba", 0xd5414c, 0x3b4
.align 2, 0
@ -110,7 +110,7 @@ gTrainerPalette_AquaAdminM: ; 8D54500
.align 2, 0
gTrainerPic_BlackBelt: ; 8D54528
gTrainerFrontPic_BlackBelt: ; 8D54528
.incbin "base_emerald.gba", 0xd54528, 0x364
.align 2, 0
@ -120,7 +120,7 @@ gTrainerPalette_BlackBelt: ; 8D5488C
.align 2, 0
gTrainerPic_AquaAdminF: ; 8D548B4
gTrainerFrontPic_AquaAdminF: ; 8D548B4
.incbin "base_emerald.gba", 0xd548b4, 0x3c4
.align 2, 0
@ -130,7 +130,7 @@ gTrainerPalette_AquaAdminF: ; 8D54C78
.align 2, 0
gTrainerPic_AquaLeaderArchie: ; 8D54CA0
gTrainerFrontPic_AquaLeaderArchie: ; 8D54CA0
.incbin "base_emerald.gba", 0xd54ca0, 0x33c
.align 2, 0
@ -140,7 +140,7 @@ gTrainerPalette_AquaLeaderArchie: ; 8D54FDC
.align 2, 0
gTrainerPic_HexManiac: ; 8D55004
gTrainerFrontPic_HexManiac: ; 8D55004
.incbin "base_emerald.gba", 0xd55004, 0x36c
.align 2, 0
@ -150,7 +150,7 @@ gTrainerPalette_HexManiac: ; 8D55370
.align 2, 0
gTrainerPic_AromaLady: ; 8D55398
gTrainerFrontPic_AromaLady: ; 8D55398
.incbin "base_emerald.gba", 0xd55398, 0x2c4
.align 2, 0
@ -160,7 +160,7 @@ gTrainerPalette_AromaLady: ; 8D5565C
.align 2, 0
gTrainerPic_RuinManiac: ; 8D55684
gTrainerFrontPic_RuinManiac: ; 8D55684
.incbin "base_emerald.gba", 0xd55684, 0x39c
.align 2, 0
@ -170,7 +170,7 @@ gTrainerPalette_RuinManiac: ; 8D55A20
.align 2, 0
gTrainerPic_Interviewer: ; 8D55A48
gTrainerFrontPic_Interviewer: ; 8D55A48
.incbin "base_emerald.gba", 0xd55a48, 0x4a4
.align 2, 0
@ -180,7 +180,7 @@ gTrainerPalette_Interviewer: ; 8D55EEC
.align 2, 0
gTrainerPic_TuberF: ; 8D55F14
gTrainerFrontPic_TuberF: ; 8D55F14
.incbin "base_emerald.gba", 0xd55f14, 0x2a4
.align 2, 0
@ -190,7 +190,7 @@ gTrainerPalette_TuberF: ; 8D561B8
.align 2, 0
gTrainerPic_TuberM: ; 8D561E0
gTrainerFrontPic_TuberM: ; 8D561E0
.incbin "base_emerald.gba", 0xd561e0, 0x28c
.align 2, 0
@ -200,7 +200,7 @@ gTrainerPalette_TuberM: ; 8D5646C
.align 2, 0
gTrainerPic_CoolTrainerF: ; 8D56494
gTrainerFrontPic_CoolTrainerF: ; 8D56494
.incbin "base_emerald.gba", 0xd56494, 0x314
.align 2, 0
@ -210,7 +210,7 @@ gTrainerPalette_CoolTrainerF: ; 8D567A8
.align 2, 0
gTrainerPic_Lady: ; 8D567D0
gTrainerFrontPic_Lady: ; 8D567D0
.incbin "base_emerald.gba", 0xd567d0, 0x3b4
.align 2, 0
@ -220,7 +220,7 @@ gTrainerPalette_Lady: ; 8D56B84
.align 2, 0
gTrainerPic_Beauty: ; 8D56BAC
gTrainerFrontPic_Beauty: ; 8D56BAC
.incbin "base_emerald.gba", 0xd56bac, 0x2e8
.align 2, 0
@ -230,7 +230,7 @@ gTrainerPalette_Beauty: ; 8D56E94
.align 2, 0
gTrainerPic_RichBoy: ; 8D56EBC
gTrainerFrontPic_RichBoy: ; 8D56EBC
.incbin "base_emerald.gba", 0xd56ebc, 0x2b4
.align 2, 0
@ -240,7 +240,7 @@ gTrainerPalette_RichBoy: ; 8D57170
.align 2, 0
gTrainerPic_ExpertF: ; 8D57198
gTrainerFrontPic_ExpertF: ; 8D57198
.incbin "base_emerald.gba", 0xd57198, 0x31c
.align 2, 0
@ -250,7 +250,7 @@ gTrainerPalette_ExpertF: ; 8D574B4
.align 2, 0
gTrainerPic_Pokemaniac: ; 8D574DC
gTrainerFrontPic_Pokemaniac: ; 8D574DC
.incbin "base_emerald.gba", 0xd574dc, 0x370
.align 2, 0
@ -260,7 +260,7 @@ gTrainerPalette_Pokemaniac: ; 8D5784C
.align 2, 0
gTrainerPic_MagmaGruntF: ; 8D57874
gTrainerFrontPic_MagmaGruntF: ; 8D57874
.incbin "base_emerald.gba", 0xd57874, 0x38c
.align 2, 0
@ -270,7 +270,7 @@ gTrainerPalette_MagmaGruntF: ; 8D57C00
.align 2, 0
gTrainerPic_Guitarist: ; 8D57C28
gTrainerFrontPic_Guitarist: ; 8D57C28
.incbin "base_emerald.gba", 0xd57c28, 0x384
.align 2, 0
@ -280,7 +280,7 @@ gTrainerPalette_Guitarist: ; 8D57FAC
.align 2, 0
gTrainerPic_Kindler: ; 8D57FD4
gTrainerFrontPic_Kindler: ; 8D57FD4
.incbin "base_emerald.gba", 0xd57fd4, 0x36c
.align 2, 0
@ -290,7 +290,7 @@ gTrainerPalette_Kindler: ; 8D58340
.align 2, 0
gTrainerPic_Camper: ; 8D58368
gTrainerFrontPic_Camper: ; 8D58368
.incbin "base_emerald.gba", 0xd58368, 0x2e8
.align 2, 0
@ -300,7 +300,7 @@ gTrainerPalette_Camper: ; 8D58650
.align 2, 0
gTrainerPic_Picnicker: ; 8D58678
gTrainerFrontPic_Picnicker: ; 8D58678
.incbin "base_emerald.gba", 0xd58678, 0x2e0
.align 2, 0
@ -310,7 +310,7 @@ gTrainerPalette_Picnicker: ; 8D58958
.align 2, 0
gTrainerPic_BugManiac: ; 8D58980
gTrainerFrontPic_BugManiac: ; 8D58980
.incbin "base_emerald.gba", 0xd58980, 0x450
.align 2, 0
@ -320,7 +320,7 @@ gTrainerPalette_BugManiac: ; 8D58DD0
.align 2, 0
gTrainerPic_PokemonBreederM: ; 8D58DF8
gTrainerFrontPic_PokemonBreederM: ; 8D58DF8
.incbin "base_emerald.gba", 0xd58df8, 0x330
.align 2, 0
@ -330,7 +330,7 @@ gTrainerPalette_PokemonBreederM: ; 8D59128
.align 2, 0
gTrainerPic_PsychicM: ; 8D59150
gTrainerFrontPic_PsychicM: ; 8D59150
.incbin "base_emerald.gba", 0xd59150, 0x32c
.align 2, 0
@ -340,7 +340,7 @@ gTrainerPalette_PsychicM: ; 8D5947C
.align 2, 0
gTrainerPic_PsychicF: ; 8D594A4
gTrainerFrontPic_PsychicF: ; 8D594A4
.incbin "base_emerald.gba", 0xd594a4, 0x328
.align 2, 0
@ -350,7 +350,7 @@ gTrainerPalette_PsychicF: ; 8D597CC
.align 2, 0
gTrainerPic_Gentleman: ; 8D597F4
gTrainerFrontPic_Gentleman: ; 8D597F4
.incbin "base_emerald.gba", 0xd597f4, 0x300
.align 2, 0
@ -360,7 +360,7 @@ gTrainerPalette_Gentleman: ; 8D59AF4
.align 2, 0
gTrainerPic_EliteFourSidney: ; 8D59B1C
gTrainerFrontPic_EliteFourSidney: ; 8D59B1C
.incbin "base_emerald.gba", 0xd59b1c, 0x334
.align 2, 0
@ -370,7 +370,7 @@ gTrainerPalette_EliteFourSidney: ; 8D59E50
.align 2, 0
gTrainerPic_EliteFourPhoebe: ; 8D59E78
gTrainerFrontPic_EliteFourPhoebe: ; 8D59E78
.incbin "base_emerald.gba", 0xd59e78, 0x300
.align 2, 0
@ -380,7 +380,7 @@ gTrainerPalette_EliteFourPhoebe: ; 8D5A178
.align 2, 0
gTrainerPic_EliteFourGlacia: ; 8D5A1A0
gTrainerFrontPic_EliteFourGlacia: ; 8D5A1A0
.incbin "base_emerald.gba", 0xd5a1a0, 0x384
.align 2, 0
@ -390,7 +390,7 @@ gTrainerPalette_EliteFourGlacia: ; 8D5A524
.align 2, 0
gTrainerPic_EliteFourDrake: ; 8D5A54C
gTrainerFrontPic_EliteFourDrake: ; 8D5A54C
.incbin "base_emerald.gba", 0xd5a54c, 0x3a8
.align 2, 0
@ -400,7 +400,7 @@ gTrainerPalette_EliteFourDrake: ; 8D5A8F4
.align 2, 0
gTrainerPic_LeaderRoxanne: ; 8D5A91C
gTrainerFrontPic_LeaderRoxanne: ; 8D5A91C
.incbin "base_emerald.gba", 0xd5a91c, 0x2ec
.align 2, 0
@ -410,7 +410,7 @@ gTrainerPalette_LeaderRoxanne: ; 8D5AC08
.align 2, 0
gTrainerPic_LeaderBrawly: ; 8D5AC30
gTrainerFrontPic_LeaderBrawly: ; 8D5AC30
.incbin "base_emerald.gba", 0xd5ac30, 0x394
.align 2, 0
@ -420,7 +420,7 @@ gTrainerPalette_LeaderBrawly: ; 8D5AFC4
.align 2, 0
gTrainerPic_LeaderWattson: ; 8D5AFEC
gTrainerFrontPic_LeaderWattson: ; 8D5AFEC
.incbin "base_emerald.gba", 0xd5afec, 0x348
.align 2, 0
@ -430,7 +430,7 @@ gTrainerPalette_LeaderWattson: ; 8D5B334
.align 2, 0
gTrainerPic_LeaderFlannery: ; 8D5B35C
gTrainerFrontPic_LeaderFlannery: ; 8D5B35C
.incbin "base_emerald.gba", 0xd5b35c, 0x380
.align 2, 0
@ -440,7 +440,7 @@ gTrainerPalette_LeaderFlannery: ; 8D5B6DC
.align 2, 0
gTrainerPic_LeaderNorman: ; 8D5B704
gTrainerFrontPic_LeaderNorman: ; 8D5B704
.incbin "base_emerald.gba", 0xd5b704, 0x33c
.align 2, 0
@ -450,7 +450,7 @@ gTrainerPalette_LeaderNorman: ; 8D5BA40
.align 2, 0
gTrainerPic_LeaderWinona: ; 8D5BA68
gTrainerFrontPic_LeaderWinona: ; 8D5BA68
.incbin "base_emerald.gba", 0xd5ba68, 0x380
.align 2, 0
@ -460,7 +460,7 @@ gTrainerPalette_LeaderWinona: ; 8D5BDE8
.align 2, 0
gTrainerPic_LeaderTateAndLiza: ; 8D5BE10
gTrainerFrontPic_LeaderTateAndLiza: ; 8D5BE10
.incbin "base_emerald.gba", 0xd5be10, 0x444
.align 2, 0
@ -470,7 +470,7 @@ gTrainerPalette_LeaderTateAndLiza: ; 8D5C254
.align 2, 0
gTrainerPic_LeaderJuan: ; 8D5C27C
gTrainerFrontPic_LeaderJuan: ; 8D5C27C
.incbin "base_emerald.gba", 0xd5c27c, 0x3a8
.align 2, 0
@ -480,7 +480,7 @@ gTrainerPalette_LeaderJuan: ; 8D5C624
.align 2, 0
gTrainerPic_SchoolKidM: ; 8D5C64C
gTrainerFrontPic_SchoolKidM: ; 8D5C64C
.incbin "base_emerald.gba", 0xd5c64c, 0x2c0
.align 2, 0
@ -490,7 +490,7 @@ gTrainerPalette_SchoolKidM: ; 8D5C90C
.align 2, 0
gTrainerPic_SchoolKidF: ; 8D5C934
gTrainerFrontPic_SchoolKidF: ; 8D5C934
.incbin "base_emerald.gba", 0xd5c934, 0x29c
.align 2, 0
@ -500,7 +500,7 @@ gTrainerPalette_SchoolKidF: ; 8D5CBD0
.align 2, 0
gTrainerPic_SrAndJr: ; 8D5CBF8
gTrainerFrontPic_SrAndJr: ; 8D5CBF8
.incbin "base_emerald.gba", 0xd5cbf8, 0x470
.align 2, 0
@ -510,7 +510,7 @@ gTrainerPalette_SrAndJr: ; 8D5D068
.align 2, 0
gTrainerPic_WinstrateM: ; 8D5D090
gTrainerFrontPic_WinstrateM: ; 8D5D090
.incbin "base_emerald.gba", 0xd5d090, 0x3bc
.align 2, 0
@ -520,7 +520,7 @@ gTrainerPalette_WinstrateM: ; 8D5D44C
.align 2, 0
gTrainerPic_WinstrateF: ; 8D5D474
gTrainerFrontPic_WinstrateF: ; 8D5D474
.incbin "base_emerald.gba", 0xd5d474, 0x3cc
.align 2, 0
@ -530,7 +530,7 @@ gTrainerPalette_WinstrateF: ; 8D5D840
.align 2, 0
gTrainerPic_Youngster: ; 8D5D868
gTrainerFrontPic_Youngster: ; 8D5D868
.incbin "base_emerald.gba", 0xd5d868, 0x2a8
.align 2, 0
@ -540,7 +540,7 @@ gTrainerPalette_Youngster: ; 8D5DB10
.align 2, 0
gTrainerPic_ChampionWallace: ; 8D5DB38
gTrainerFrontPic_ChampionWallace: ; 8D5DB38
.incbin "base_emerald.gba", 0xd5db38, 0x454
.align 2, 0
@ -550,7 +550,7 @@ gTrainerPalette_ChampionWallace: ; 8D5DF8C
.align 2, 0
gTrainerPic_Fisherman: ; 8D5DFB4
gTrainerFrontPic_Fisherman: ; 8D5DFB4
.incbin "base_emerald.gba", 0xd5dfb4, 0x3e4
.align 2, 0
@ -560,7 +560,7 @@ gTrainerPalette_Fisherman: ; 8D5E398
.align 2, 0
gTrainerPic_CyclingTriathleteM: ; 8D5E3C0
gTrainerFrontPic_CyclingTriathleteM: ; 8D5E3C0
.incbin "base_emerald.gba", 0xd5e3c0, 0x410
.align 2, 0
@ -570,7 +570,7 @@ gTrainerPalette_CyclingTriathleteM: ; 8D5E7D0
.align 2, 0
gTrainerPic_CyclingTriathleteF: ; 8D5E7F8
gTrainerFrontPic_CyclingTriathleteF: ; 8D5E7F8
.incbin "base_emerald.gba", 0xd5e7f8, 0x40c
.align 2, 0
@ -580,7 +580,7 @@ gTrainerPalette_CyclingTriathleteF: ; 8D5EC04
.align 2, 0
gTrainerPic_RunningTriathleteM: ; 8D5EC2C
gTrainerFrontPic_RunningTriathleteM: ; 8D5EC2C
.incbin "base_emerald.gba", 0xd5ec2c, 0x2b8
.align 2, 0
@ -590,7 +590,7 @@ gTrainerPalette_RunningTriathleteM: ; 8D5EEE4
.align 2, 0
gTrainerPic_RunningTriathleteF: ; 8D5EF0C
gTrainerFrontPic_RunningTriathleteF: ; 8D5EF0C
.incbin "base_emerald.gba", 0xd5ef0c, 0x2a4
.align 2, 0
@ -600,7 +600,7 @@ gTrainerPalette_RunningTriathleteF: ; 8D5F1B0
.align 2, 0
gTrainerPic_SwimmingTriathleteM: ; 8D5F1D8
gTrainerFrontPic_SwimmingTriathleteM: ; 8D5F1D8
.incbin "base_emerald.gba", 0xd5f1d8, 0x32c
.align 2, 0
@ -610,7 +610,7 @@ gTrainerPalette_SwimmingTriathleteM: ; 8D5F504
.align 2, 0
gTrainerPic_SwimmingTriathleteF: ; 8D5F52C
gTrainerFrontPic_SwimmingTriathleteF: ; 8D5F52C
.incbin "base_emerald.gba", 0xd5f52c, 0x2dc
.align 2, 0
@ -620,7 +620,7 @@ gTrainerPalette_SwimmingTriathleteF: ; 8D5F808
.align 2, 0
gTrainerPic_DragonTamer: ; 8D5F830
gTrainerFrontPic_DragonTamer: ; 8D5F830
.incbin "base_emerald.gba", 0xd5f830, 0x354
.align 2, 0
@ -630,7 +630,7 @@ gTrainerPalette_DragonTamer: ; 8D5FB84
.align 2, 0
gTrainerPic_NinjaBoy: ; 8D5FBAC
gTrainerFrontPic_NinjaBoy: ; 8D5FBAC
.incbin "base_emerald.gba", 0xd5fbac, 0x2dc
.align 2, 0
@ -640,7 +640,7 @@ gTrainerPalette_NinjaBoy: ; 8D5FE88
.align 2, 0
gTrainerPic_BattleGirl: ; 8D5FEB0
gTrainerFrontPic_BattleGirl: ; 8D5FEB0
.incbin "base_emerald.gba", 0xd5feb0, 0x320
.align 2, 0
@ -650,7 +650,7 @@ gTrainerPalette_BattleGirl: ; 8D601D0
.align 2, 0
gTrainerPic_ParasolLady: ; 8D601F8
gTrainerFrontPic_ParasolLady: ; 8D601F8
.incbin "base_emerald.gba", 0xd601f8, 0x338
.align 2, 0
@ -660,7 +660,7 @@ gTrainerPalette_ParasolLady: ; 8D60530
.align 2, 0
gTrainerPic_SwimmerF: ; 8D60558
gTrainerFrontPic_SwimmerF: ; 8D60558
.incbin "base_emerald.gba", 0xd60558, 0x2d0
.align 2, 0
@ -670,7 +670,7 @@ gTrainerPalette_SwimmerF: ; 8D60828
.align 2, 0
gTrainerPic_Twins: ; 8D60850
gTrainerFrontPic_Twins: ; 8D60850
.incbin "base_emerald.gba", 0xd60850, 0x3c4
.align 2, 0
@ -680,7 +680,7 @@ gTrainerPalette_Twins: ; 8D60C14
.align 2, 0
gTrainerPic_Sailor: ; 8D60C3C
gTrainerFrontPic_Sailor: ; 8D60C3C
.incbin "base_emerald.gba", 0xd60c3c, 0x3b0
.align 2, 0
@ -690,7 +690,7 @@ gTrainerPalette_Sailor: ; 8D60FEC
.align 2, 0
gTrainerPic_MagmaAdmin: ; 8D61014
gTrainerFrontPic_MagmaAdmin: ; 8D61014
.incbin "base_emerald.gba", 0xd61014, 0x3d8
.align 2, 0
@ -700,7 +700,7 @@ gTrainerPalette_MagmaAdmin: ; 8D613EC
.align 2, 0
gTrainerPic_Wally: ; 8D61414
gTrainerFrontPic_Wally: ; 8D61414
.incbin "base_emerald.gba", 0xd61414, 0x2d0
.align 2, 0
@ -710,7 +710,7 @@ gTrainerPalette_Wally: ; 8D616E4
.align 2, 0
gTrainerPic_Brendan: ; 8D6170C
gTrainerFrontPic_Brendan: ; 8D6170C
.incbin "base_emerald.gba", 0xd6170c, 0x324
.align 2, 0
@ -720,7 +720,7 @@ gTrainerPalette_Brendan: ; 8D61A30
.align 2, 0
gTrainerPic_May: ; 8D61A58
gTrainerFrontPic_May: ; 8D61A58
.incbin "base_emerald.gba", 0xd61a58, 0x300
.align 2, 0
@ -730,7 +730,7 @@ gTrainerPalette_May: ; 8D61D58
.align 2, 0
gTrainerPic_BugCatcher: ; 8D61D80
gTrainerFrontPic_BugCatcher: ; 8D61D80
.incbin "base_emerald.gba", 0xd61d80, 0x32c
.align 2, 0
@ -740,7 +740,7 @@ gTrainerPalette_BugCatcher: ; 8D620AC
.align 2, 0
gTrainerPic_PokemonRangerM: ; 8D620D4
gTrainerFrontPic_PokemonRangerM: ; 8D620D4
.incbin "base_emerald.gba", 0xd620d4, 0x348
.align 2, 0
@ -750,7 +750,7 @@ gTrainerPalette_PokemonRangerM: ; 8D6241C
.align 2, 0
gTrainerPic_PokemonRangerF: ; 8D62444
gTrainerFrontPic_PokemonRangerF: ; 8D62444
.incbin "base_emerald.gba", 0xd62444, 0x334
.align 2, 0
@ -760,7 +760,7 @@ gTrainerPalette_PokemonRangerF: ; 8D62778
.align 2, 0
gTrainerPic_MagmaLeaderMaxie: ; 8D627A0
gTrainerFrontPic_MagmaLeaderMaxie: ; 8D627A0
.incbin "base_emerald.gba", 0xd627a0, 0x2f4
.align 2, 0
@ -770,7 +770,7 @@ gTrainerPalette_MagmaLeaderMaxie: ; 8D62A94
.align 2, 0
gTrainerPic_Lass: ; 8D62ABC
gTrainerFrontPic_Lass: ; 8D62ABC
.incbin "base_emerald.gba", 0xd62abc, 0x2d8
.align 2, 0
@ -780,7 +780,7 @@ gTrainerPalette_Lass: ; 8D62D94
.align 2, 0
gTrainerPic_YoungCouple: ; 8D62DBC
gTrainerFrontPic_YoungCouple: ; 8D62DBC
.incbin "base_emerald.gba", 0xd62dbc, 0x3c0
.align 2, 0
@ -790,7 +790,7 @@ gTrainerPalette_YoungCouple: ; 8D6317C
.align 2, 0
gTrainerPic_OldCouple: ; 8D631A4
gTrainerFrontPic_OldCouple: ; 8D631A4
.incbin "base_emerald.gba", 0xd631a4, 0x510
.align 2, 0
@ -800,7 +800,7 @@ gTrainerPalette_OldCouple: ; 8D636B4
.align 2, 0
gTrainerPic_SisAndBro: ; 8D636DC
gTrainerFrontPic_SisAndBro: ; 8D636DC
.incbin "base_emerald.gba", 0xd636dc, 0x44c
.align 2, 0
@ -810,7 +810,7 @@ gTrainerPalette_SisAndBro: ; 8D63B28
.align 2, 0
gTrainerPic_Steven: ; 8D63B50
gTrainerFrontPic_Steven: ; 8D63B50
.incbin "base_emerald.gba", 0xd63b50, 0x338
.align 2, 0
@ -820,7 +820,7 @@ gTrainerPalette_Steven: ; 8D63E88
.align 2, 0
gTrainerPic_SalonMaidenAnabel: ; 8D63EB0
gTrainerFrontPic_SalonMaidenAnabel: ; 8D63EB0
.incbin "base_emerald.gba", 0xd63eb0, 0x308
.align 2, 0
@ -830,7 +830,7 @@ gTrainerPalette_SalonMaidenAnabel: ; 8D641B8
.align 2, 0
gTrainerPic_DomeAceTucker: ; 8D641E0
gTrainerFrontPic_DomeAceTucker: ; 8D641E0
.incbin "base_emerald.gba", 0xd641e0, 0x404
.align 2, 0
@ -840,7 +840,7 @@ gTrainerPalette_DomeAceTucker: ; 8D645E4
.align 2, 0
gTrainerPic_PalaceMavenSpenser: ; 8D6460C
gTrainerFrontPic_PalaceMavenSpenser: ; 8D6460C
.incbin "base_emerald.gba", 0xd6460c, 0x3a4
.align 2, 0
@ -850,7 +850,7 @@ gTrainerPalette_PalaceMavenSpenser: ; 8D649B0
.align 2, 0
gTrainerPic_ArenaTycoonGreta: ; 8D649D8
gTrainerFrontPic_ArenaTycoonGreta: ; 8D649D8
.incbin "base_emerald.gba", 0xd649d8, 0x330
.align 2, 0
@ -860,7 +860,7 @@ gTrainerPalette_ArenaTycoonGreta: ; 8D64D08
.align 2, 0
gTrainerPic_FactoryHeadNoland: ; 8D64D30
gTrainerFrontPic_FactoryHeadNoland: ; 8D64D30
.incbin "base_emerald.gba", 0xd64d30, 0x37c
.align 2, 0
@ -870,7 +870,7 @@ gTrainerPalette_FactoryHeadNoland: ; 8D650AC
.align 2, 0
gTrainerPic_PikeQueenLucy: ; 8D650D4
gTrainerFrontPic_PikeQueenLucy: ; 8D650D4
.incbin "base_emerald.gba", 0xd650d4, 0x2f4
.align 2, 0
@ -880,7 +880,7 @@ gTrainerPalette_PikeQueenLucy: ; 8D653C8
.align 2, 0
gTrainerPic_PyramidKingBrandon: ; 8D653F0
gTrainerFrontPic_PyramidKingBrandon: ; 8D653F0
.incbin "base_emerald.gba", 0xd653f0, 0x36c
.align 2, 0
@ -890,7 +890,7 @@ gTrainerPalette_PyramidKingBrandon: ; 8D6575C
.align 2, 0
gTrainerPic_Red: ; 8D65784
gTrainerFrontPic_Red: ; 8D65784
.incbin "base_emerald.gba", 0xd65784, 0x30c
.align 2, 0
@ -900,7 +900,7 @@ gTrainerPalette_Red: ; 8D65A90
.align 2, 0
gTrainerPic_Leaf: ; 8D65AB8
gTrainerFrontPic_Leaf: ; 8D65AB8
.incbin "base_emerald.gba", 0xd65ab8, 0x33c
.align 2, 0
@ -910,7 +910,7 @@ gTrainerPalette_Leaf: ; 8D65DF4
.align 2, 0
gTrainerPic_RubySapphireBrendan: ; 8D65E1C
gTrainerFrontPic_RubySapphireBrendan: ; 8D65E1C
.incbin "base_emerald.gba", 0xd65e1c, 0x314
.align 2, 0
@ -920,7 +920,7 @@ gTrainerPalette_RubySapphireBrendan: ; 8D66130
.align 2, 0
gTrainerPic_RubySapphireMay: ; 8D66158
gTrainerFrontPic_RubySapphireMay: ; 8D66158
.incbin "base_emerald.gba", 0xd66158, 0x300
.align 2, 0

96
data/graphics/trainers/trainer_pic_table.s
View File

@ -1,96 +0,0 @@
.align 2, 0
gTrainerPicTable: ; 8305654
obj_tiles gTrainerPic_Hiker, 0x800, 0
obj_tiles gTrainerPic_AquaGruntM, 0x800, 1
obj_tiles gTrainerPic_PokemonBreederF, 0x800, 2
obj_tiles gTrainerPic_CoolTrainerM, 0x800, 3
obj_tiles gTrainerPic_BirdKeeper, 0x800, 4
obj_tiles gTrainerPic_Collector, 0x800, 5
obj_tiles gTrainerPic_AquaGruntF, 0x800, 6
obj_tiles gTrainerPic_SwimmerM, 0x800, 7
obj_tiles gTrainerPic_MagmaGruntM, 0x800, 8
obj_tiles gTrainerPic_ExpertM, 0x800, 9
obj_tiles gTrainerPic_AquaAdminM, 0x800, 10
obj_tiles gTrainerPic_BlackBelt, 0x800, 11
obj_tiles gTrainerPic_AquaAdminF, 0x800, 12
obj_tiles gTrainerPic_AquaLeaderArchie, 0x800, 13
obj_tiles gTrainerPic_HexManiac, 0x800, 14
obj_tiles gTrainerPic_AromaLady, 0x800, 15
obj_tiles gTrainerPic_RuinManiac, 0x800, 16
obj_tiles gTrainerPic_Interviewer, 0x800, 17
obj_tiles gTrainerPic_TuberF, 0x800, 18
obj_tiles gTrainerPic_TuberM, 0x800, 19
obj_tiles gTrainerPic_CoolTrainerF, 0x800, 20
obj_tiles gTrainerPic_Lady, 0x800, 21
obj_tiles gTrainerPic_Beauty, 0x800, 22
obj_tiles gTrainerPic_RichBoy, 0x800, 23
obj_tiles gTrainerPic_ExpertF, 0x800, 24
obj_tiles gTrainerPic_Pokemaniac, 0x800, 25
obj_tiles gTrainerPic_MagmaGruntF, 0x800, 26
obj_tiles gTrainerPic_Guitarist, 0x800, 27
obj_tiles gTrainerPic_Kindler, 0x800, 28
obj_tiles gTrainerPic_Camper, 0x800, 29
obj_tiles gTrainerPic_Picnicker, 0x800, 30
obj_tiles gTrainerPic_BugManiac, 0x800, 31
obj_tiles gTrainerPic_PokemonBreederM, 0x800, 32
obj_tiles gTrainerPic_PsychicM, 0x800, 33
obj_tiles gTrainerPic_PsychicF, 0x800, 34
obj_tiles gTrainerPic_Gentleman, 0x800, 35
obj_tiles gTrainerPic_EliteFourSidney, 0x800, 36
obj_tiles gTrainerPic_EliteFourPhoebe, 0x800, 37
obj_tiles gTrainerPic_EliteFourGlacia, 0x800, 38
obj_tiles gTrainerPic_EliteFourDrake, 0x800, 39
obj_tiles gTrainerPic_LeaderRoxanne, 0x800, 40
obj_tiles gTrainerPic_LeaderBrawly, 0x800, 41
obj_tiles gTrainerPic_LeaderWattson, 0x800, 42
obj_tiles gTrainerPic_LeaderFlannery, 0x800, 43
obj_tiles gTrainerPic_LeaderNorman, 0x800, 44
obj_tiles gTrainerPic_LeaderWinona, 0x800, 45
obj_tiles gTrainerPic_LeaderTateAndLiza, 0x800, 46
obj_tiles gTrainerPic_LeaderJuan, 0x800, 47
obj_tiles gTrainerPic_SchoolKidM, 0x800, 48
obj_tiles gTrainerPic_SchoolKidF, 0x800, 49
obj_tiles gTrainerPic_SrAndJr, 0x1000, 50
obj_tiles gTrainerPic_WinstrateM, 0x1000, 51
obj_tiles gTrainerPic_WinstrateF, 0x800, 52
obj_tiles gTrainerPic_Youngster, 0x800, 53
obj_tiles gTrainerPic_ChampionWallace, 0x1000, 54
obj_tiles gTrainerPic_Fisherman, 0x800, 55
obj_tiles gTrainerPic_CyclingTriathleteM, 0x1000, 56
obj_tiles gTrainerPic_CyclingTriathleteF, 0x800, 57
obj_tiles gTrainerPic_RunningTriathleteM, 0x800, 58
obj_tiles gTrainerPic_RunningTriathleteF, 0x800, 59
obj_tiles gTrainerPic_SwimmingTriathleteM, 0x800, 60
obj_tiles gTrainerPic_SwimmingTriathleteF, 0x800, 61
obj_tiles gTrainerPic_DragonTamer, 0x800, 62
obj_tiles gTrainerPic_NinjaBoy, 0x800, 63
obj_tiles gTrainerPic_BattleGirl, 0x1000, 64
obj_tiles gTrainerPic_ParasolLady, 0x800, 65
obj_tiles gTrainerPic_SwimmerF, 0x800, 66
obj_tiles gTrainerPic_Twins, 0x800, 67
obj_tiles gTrainerPic_Sailor, 0x800, 68
obj_tiles gTrainerPic_MagmaAdmin, 0x800, 69
obj_tiles gTrainerPic_Wally, 0x800, 70
obj_tiles gTrainerPic_Brendan, 0x800, 71
obj_tiles gTrainerPic_May, 0x800, 72
obj_tiles gTrainerPic_BugCatcher, 0x800, 73
obj_tiles gTrainerPic_PokemonRangerM, 0x800, 74
obj_tiles gTrainerPic_PokemonRangerF, 0x800, 75
obj_tiles gTrainerPic_MagmaLeaderMaxie, 0x800, 76
obj_tiles gTrainerPic_Lass, 0x800, 77
obj_tiles gTrainerPic_YoungCouple, 0x800, 78
obj_tiles gTrainerPic_OldCouple, 0x800, 79
obj_tiles gTrainerPic_SisAndBro, 0x800, 80
obj_tiles gTrainerPic_Steven, 0x800, 81
obj_tiles gTrainerPic_SalonMaidenAnabel, 0x800, 82
obj_tiles gTrainerPic_DomeAceTucker, 0x800, 83
obj_tiles gTrainerPic_PalaceMavenSpenser, 0x800, 84
obj_tiles gTrainerPic_ArenaTycoonGreta, 0x1000, 85
obj_tiles gTrainerPic_FactoryHeadNoland, 0x800, 86
obj_tiles gTrainerPic_PikeQueenLucy, 0x800, 87
obj_tiles gTrainerPic_PyramidKingBrandon, 0x800, 88
obj_tiles gTrainerPic_Red, 0x800, 89
obj_tiles gTrainerPic_Leaf, 0x800, 90
obj_tiles gTrainerPic_RubySapphireBrendan, 0x800, 91
obj_tiles gTrainerPic_RubySapphireMay, 0x800, 92