diff --git a/asm/emerald.s b/asm/emerald.s index a54c4f4d2a..96ddf96bc7 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -160138,7 +160138,7 @@ sub_805B4F0: ; 805B4F0 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable 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, =gUnknown_08305654 + ldr r2, =gTrainerPicTable 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, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r3, =gTrainerPaletteTable mov r8, r3 add r8, r4 mov r0, r8 adds r1, r7, 0 bl gpu_pal_obj_decompress_and_apply2 - ldr r0, =gUnknown_08305654 + ldr r0, =gTrainerPicTable 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, =gUnknown_08305654 + ldr r0, =gTrainerPicTable lsrs r4, 21 adds r0, r4, r0 ldr r0, [r0] bl call_LZZUnCompVram - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable 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, =gUnknown_08305654 + ldr r1, =gTrainerPicTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable 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, =gUnknown_0830593C + ldr r1, =gTrainerPaletteTable 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, =gUnknown_08305654 + ldr r0, =gTrainerPicTable adds r0, r4, r0 ldr r1, =0x00001828 adds r5, r7, r1 adds r1, r5, 0 movs r2, 0 bl sub_80345F0 - ldr r0, =gUnknown_0830593C + ldr r0, =gTrainerPaletteTable adds r4, r0 ldr r0, [r4] ldr r1, =0x00002028 diff --git a/data/data2.s b/data/data2.s index b888aedb26..24f600a586 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1396,11 +1396,14 @@ gUnknown_0830536C: ; 830536C gUnknown_083054E0: ; 83054E0 .incbin "base_emerald.gba", 0x3054e0, 0x174 -gUnknown_08305654: ; 8305654 - .incbin "base_emerald.gba", 0x305654, 0x2e8 +; 8305654 + .include "data/graphics/trainers/trainer_pic_table.s" -gUnknown_0830593C: ; 830593C - .incbin "base_emerald.gba", 0x30593c, 0x3d0 +; 830593C + .include "data/graphics/trainers/trainer_palette_table.s" + +; 8305C24 + .incbin "base_emerald.gba", 0x305c24, 0xe8 gUnknown_08305D0C: ; 8305D0C .incbin "base_emerald.gba", 0x305d0c, 0x20 @@ -12360,7 +12363,10 @@ gUnknown_08C2EA9C: ; 8C2EA9C .include "data/graphics/pokemon/mon_graphics.s" ; 8D51DC8 - .incbin "base_emerald.gba", 0xd51dc8, 0x25708 + .include "data/graphics/trainers/trainer_graphics.s" + +; 8D66480 + .incbin "base_emerald.gba", 0xd66480, 0x11050 .align 2, 0 diff --git a/data/graphics/trainers/trainer_graphics.s b/data/graphics/trainers/trainer_graphics.s new file mode 100644 index 0000000000..4a6512bf5a --- /dev/null +++ b/data/graphics/trainers/trainer_graphics.s @@ -0,0 +1,929 @@ + .align 2, 0 + +gTrainerPic_Hiker: ; 8D51DC8 + .incbin "base_emerald.gba", 0xd51dc8, 0x480 + + .align 2, 0 + +gTrainerPalette_Hiker: ; 8D52248 + .incbin "base_emerald.gba", 0xd52248, 0x28 + + .align 2, 0 + +gTrainerPic_AquaGruntM: ; 8D52270 + .incbin "base_emerald.gba", 0xd52270, 0x360 + + .align 2, 0 + +gTrainerPalette_AquaGruntM: ; 8D525D0 + .incbin "base_emerald.gba", 0xd525d0, 0x28 + + .align 2, 0 + +gTrainerPic_PokemonBreederF: ; 8D525F8 + .incbin "base_emerald.gba", 0xd525f8, 0x334 + + .align 2, 0 + +gTrainerPalette_PokemonBreederF: ; 8D5292C + .incbin "base_emerald.gba", 0xd5292c, 0x28 + + .align 2, 0 + +gTrainerPic_CoolTrainerM: ; 8D52954 + .incbin "base_emerald.gba", 0xd52954, 0x2e8 + + .align 2, 0 + +gTrainerPalette_CoolTrainerM: ; 8D52C3C + .incbin "base_emerald.gba", 0xd52c3c, 0x28 + + .align 2, 0 + +gTrainerPic_BirdKeeper: ; 8D52C64 + .incbin "base_emerald.gba", 0xd52c64, 0x338 + + .align 2, 0 + +gTrainerPalette_BirdKeeper: ; 8D52F9C + .incbin "base_emerald.gba", 0xd52f9c, 0x28 + + .align 2, 0 + +gTrainerPic_Collector: ; 8D52FC4 + .incbin "base_emerald.gba", 0xd52fc4, 0x404 + + .align 2, 0 + +gTrainerPalette_Collector: ; 8D533C8 + .incbin "base_emerald.gba", 0xd533c8, 0x28 + + .align 2, 0 + +gTrainerPic_AquaGruntF: ; 8D533F0 + .incbin "base_emerald.gba", 0xd533f0, 0x33c + + .align 2, 0 + +gTrainerPalette_AquaGruntF: ; 8D5372C + .incbin "base_emerald.gba", 0xd5372c, 0x28 + + .align 2, 0 + +gTrainerPic_SwimmerM: ; 8D53754 + .incbin "base_emerald.gba", 0xd53754, 0x2c0 + + .align 2, 0 + +gTrainerPalette_SwimmerM: ; 8D53A14 + .incbin "base_emerald.gba", 0xd53a14, 0x28 + + .align 2, 0 + +gTrainerPic_MagmaGruntM: ; 8D53A3C + .incbin "base_emerald.gba", 0xd53a3c, 0x380 + + .align 2, 0 + +gTrainerPalette_MagmaGruntM: ; 8D53DBC + .incbin "base_emerald.gba", 0xd53dbc, 0x28 + + .align 2, 0 + +gTrainerPic_ExpertM: ; 8D53DE4 + .incbin "base_emerald.gba", 0xd53de4, 0x340 + + .align 2, 0 + +gTrainerPalette_ExpertM: ; 8D54124 + .incbin "base_emerald.gba", 0xd54124, 0x28 + + .align 2, 0 + +gTrainerPic_AquaAdminM: ; 8D5414C + .incbin "base_emerald.gba", 0xd5414c, 0x3b4 + + .align 2, 0 + +gTrainerPalette_AquaAdminM: ; 8D54500 + .incbin "base_emerald.gba", 0xd54500, 0x28 + + .align 2, 0 + +gTrainerPic_BlackBelt: ; 8D54528 + .incbin "base_emerald.gba", 0xd54528, 0x364 + + .align 2, 0 + +gTrainerPalette_BlackBelt: ; 8D5488C + .incbin "base_emerald.gba", 0xd5488c, 0x28 + + .align 2, 0 + +gTrainerPic_AquaAdminF: ; 8D548B4 + .incbin "base_emerald.gba", 0xd548b4, 0x3c4 + + .align 2, 0 + +gTrainerPalette_AquaAdminF: ; 8D54C78 + .incbin "base_emerald.gba", 0xd54c78, 0x28 + + .align 2, 0 + +gTrainerPic_AquaLeaderArchie: ; 8D54CA0 + .incbin "base_emerald.gba", 0xd54ca0, 0x33c + + .align 2, 0 + +gTrainerPalette_AquaLeaderArchie: ; 8D54FDC + .incbin "base_emerald.gba", 0xd54fdc, 0x28 + + .align 2, 0 + +gTrainerPic_HexManiac: ; 8D55004 + .incbin "base_emerald.gba", 0xd55004, 0x36c + + .align 2, 0 + +gTrainerPalette_HexManiac: ; 8D55370 + .incbin "base_emerald.gba", 0xd55370, 0x28 + + .align 2, 0 + +gTrainerPic_AromaLady: ; 8D55398 + .incbin "base_emerald.gba", 0xd55398, 0x2c4 + + .align 2, 0 + +gTrainerPalette_AromaLady: ; 8D5565C + .incbin "base_emerald.gba", 0xd5565c, 0x28 + + .align 2, 0 + +gTrainerPic_RuinManiac: ; 8D55684 + .incbin "base_emerald.gba", 0xd55684, 0x39c + + .align 2, 0 + +gTrainerPalette_RuinManiac: ; 8D55A20 + .incbin "base_emerald.gba", 0xd55a20, 0x28 + + .align 2, 0 + +gTrainerPic_Interviewer: ; 8D55A48 + .incbin "base_emerald.gba", 0xd55a48, 0x4a4 + + .align 2, 0 + +gTrainerPalette_Interviewer: ; 8D55EEC + .incbin "base_emerald.gba", 0xd55eec, 0x28 + + .align 2, 0 + +gTrainerPic_TuberF: ; 8D55F14 + .incbin "base_emerald.gba", 0xd55f14, 0x2a4 + + .align 2, 0 + +gTrainerPalette_TuberF: ; 8D561B8 + .incbin "base_emerald.gba", 0xd561b8, 0x28 + + .align 2, 0 + +gTrainerPic_TuberM: ; 8D561E0 + .incbin "base_emerald.gba", 0xd561e0, 0x28c + + .align 2, 0 + +gTrainerPalette_TuberM: ; 8D5646C + .incbin "base_emerald.gba", 0xd5646c, 0x28 + + .align 2, 0 + +gTrainerPic_CoolTrainerF: ; 8D56494 + .incbin "base_emerald.gba", 0xd56494, 0x314 + + .align 2, 0 + +gTrainerPalette_CoolTrainerF: ; 8D567A8 + .incbin "base_emerald.gba", 0xd567a8, 0x28 + + .align 2, 0 + +gTrainerPic_Lady: ; 8D567D0 + .incbin "base_emerald.gba", 0xd567d0, 0x3b4 + + .align 2, 0 + +gTrainerPalette_Lady: ; 8D56B84 + .incbin "base_emerald.gba", 0xd56b84, 0x28 + + .align 2, 0 + +gTrainerPic_Beauty: ; 8D56BAC + .incbin "base_emerald.gba", 0xd56bac, 0x2e8 + + .align 2, 0 + +gTrainerPalette_Beauty: ; 8D56E94 + .incbin "base_emerald.gba", 0xd56e94, 0x28 + + .align 2, 0 + +gTrainerPic_RichBoy: ; 8D56EBC + .incbin "base_emerald.gba", 0xd56ebc, 0x2b4 + + .align 2, 0 + +gTrainerPalette_RichBoy: ; 8D57170 + .incbin "base_emerald.gba", 0xd57170, 0x28 + + .align 2, 0 + +gTrainerPic_ExpertF: ; 8D57198 + .incbin "base_emerald.gba", 0xd57198, 0x31c + + .align 2, 0 + +gTrainerPalette_ExpertF: ; 8D574B4 + .incbin "base_emerald.gba", 0xd574b4, 0x28 + + .align 2, 0 + +gTrainerPic_Pokemaniac: ; 8D574DC + .incbin "base_emerald.gba", 0xd574dc, 0x370 + + .align 2, 0 + +gTrainerPalette_Pokemaniac: ; 8D5784C + .incbin "base_emerald.gba", 0xd5784c, 0x28 + + .align 2, 0 + +gTrainerPic_MagmaGruntF: ; 8D57874 + .incbin "base_emerald.gba", 0xd57874, 0x38c + + .align 2, 0 + +gTrainerPalette_MagmaGruntF: ; 8D57C00 + .incbin "base_emerald.gba", 0xd57c00, 0x28 + + .align 2, 0 + +gTrainerPic_Guitarist: ; 8D57C28 + .incbin "base_emerald.gba", 0xd57c28, 0x384 + + .align 2, 0 + +gTrainerPalette_Guitarist: ; 8D57FAC + .incbin "base_emerald.gba", 0xd57fac, 0x28 + + .align 2, 0 + +gTrainerPic_Kindler: ; 8D57FD4 + .incbin "base_emerald.gba", 0xd57fd4, 0x36c + + .align 2, 0 + +gTrainerPalette_Kindler: ; 8D58340 + .incbin "base_emerald.gba", 0xd58340, 0x28 + + .align 2, 0 + +gTrainerPic_Camper: ; 8D58368 + .incbin "base_emerald.gba", 0xd58368, 0x2e8 + + .align 2, 0 + +gTrainerPalette_Camper: ; 8D58650 + .incbin "base_emerald.gba", 0xd58650, 0x28 + + .align 2, 0 + +gTrainerPic_Picnicker: ; 8D58678 + .incbin "base_emerald.gba", 0xd58678, 0x2e0 + + .align 2, 0 + +gTrainerPalette_Picnicker: ; 8D58958 + .incbin "base_emerald.gba", 0xd58958, 0x28 + + .align 2, 0 + +gTrainerPic_BugManiac: ; 8D58980 + .incbin "base_emerald.gba", 0xd58980, 0x450 + + .align 2, 0 + +gTrainerPalette_BugManiac: ; 8D58DD0 + .incbin "base_emerald.gba", 0xd58dd0, 0x28 + + .align 2, 0 + +gTrainerPic_PokemonBreederM: ; 8D58DF8 + .incbin "base_emerald.gba", 0xd58df8, 0x330 + + .align 2, 0 + +gTrainerPalette_PokemonBreederM: ; 8D59128 + .incbin "base_emerald.gba", 0xd59128, 0x28 + + .align 2, 0 + +gTrainerPic_PsychicM: ; 8D59150 + .incbin "base_emerald.gba", 0xd59150, 0x32c + + .align 2, 0 + +gTrainerPalette_PsychicM: ; 8D5947C + .incbin "base_emerald.gba", 0xd5947c, 0x28 + + .align 2, 0 + +gTrainerPic_PsychicF: ; 8D594A4 + .incbin "base_emerald.gba", 0xd594a4, 0x328 + + .align 2, 0 + +gTrainerPalette_PsychicF: ; 8D597CC + .incbin "base_emerald.gba", 0xd597cc, 0x28 + + .align 2, 0 + +gTrainerPic_Gentleman: ; 8D597F4 + .incbin "base_emerald.gba", 0xd597f4, 0x300 + + .align 2, 0 + +gTrainerPalette_Gentleman: ; 8D59AF4 + .incbin "base_emerald.gba", 0xd59af4, 0x28 + + .align 2, 0 + +gTrainerPic_EliteFourSidney: ; 8D59B1C + .incbin "base_emerald.gba", 0xd59b1c, 0x334 + + .align 2, 0 + +gTrainerPalette_EliteFourSidney: ; 8D59E50 + .incbin "base_emerald.gba", 0xd59e50, 0x28 + + .align 2, 0 + +gTrainerPic_EliteFourPhoebe: ; 8D59E78 + .incbin "base_emerald.gba", 0xd59e78, 0x300 + + .align 2, 0 + +gTrainerPalette_EliteFourPhoebe: ; 8D5A178 + .incbin "base_emerald.gba", 0xd5a178, 0x28 + + .align 2, 0 + +gTrainerPic_EliteFourGlacia: ; 8D5A1A0 + .incbin "base_emerald.gba", 0xd5a1a0, 0x384 + + .align 2, 0 + +gTrainerPalette_EliteFourGlacia: ; 8D5A524 + .incbin "base_emerald.gba", 0xd5a524, 0x28 + + .align 2, 0 + +gTrainerPic_EliteFourDrake: ; 8D5A54C + .incbin "base_emerald.gba", 0xd5a54c, 0x3a8 + + .align 2, 0 + +gTrainerPalette_EliteFourDrake: ; 8D5A8F4 + .incbin "base_emerald.gba", 0xd5a8f4, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderRoxanne: ; 8D5A91C + .incbin "base_emerald.gba", 0xd5a91c, 0x2ec + + .align 2, 0 + +gTrainerPalette_LeaderRoxanne: ; 8D5AC08 + .incbin "base_emerald.gba", 0xd5ac08, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderBrawly: ; 8D5AC30 + .incbin "base_emerald.gba", 0xd5ac30, 0x394 + + .align 2, 0 + +gTrainerPalette_LeaderBrawly: ; 8D5AFC4 + .incbin "base_emerald.gba", 0xd5afc4, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderWattson: ; 8D5AFEC + .incbin "base_emerald.gba", 0xd5afec, 0x348 + + .align 2, 0 + +gTrainerPalette_LeaderWattson: ; 8D5B334 + .incbin "base_emerald.gba", 0xd5b334, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderFlannery: ; 8D5B35C + .incbin "base_emerald.gba", 0xd5b35c, 0x380 + + .align 2, 0 + +gTrainerPalette_LeaderFlannery: ; 8D5B6DC + .incbin "base_emerald.gba", 0xd5b6dc, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderNorman: ; 8D5B704 + .incbin "base_emerald.gba", 0xd5b704, 0x33c + + .align 2, 0 + +gTrainerPalette_LeaderNorman: ; 8D5BA40 + .incbin "base_emerald.gba", 0xd5ba40, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderWinona: ; 8D5BA68 + .incbin "base_emerald.gba", 0xd5ba68, 0x380 + + .align 2, 0 + +gTrainerPalette_LeaderWinona: ; 8D5BDE8 + .incbin "base_emerald.gba", 0xd5bde8, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderTateAndLiza: ; 8D5BE10 + .incbin "base_emerald.gba", 0xd5be10, 0x444 + + .align 2, 0 + +gTrainerPalette_LeaderTateAndLiza: ; 8D5C254 + .incbin "base_emerald.gba", 0xd5c254, 0x28 + + .align 2, 0 + +gTrainerPic_LeaderJuan: ; 8D5C27C + .incbin "base_emerald.gba", 0xd5c27c, 0x3a8 + + .align 2, 0 + +gTrainerPalette_LeaderJuan: ; 8D5C624 + .incbin "base_emerald.gba", 0xd5c624, 0x28 + + .align 2, 0 + +gTrainerPic_SchoolKidM: ; 8D5C64C + .incbin "base_emerald.gba", 0xd5c64c, 0x2c0 + + .align 2, 0 + +gTrainerPalette_SchoolKidM: ; 8D5C90C + .incbin "base_emerald.gba", 0xd5c90c, 0x28 + + .align 2, 0 + +gTrainerPic_SchoolKidF: ; 8D5C934 + .incbin "base_emerald.gba", 0xd5c934, 0x29c + + .align 2, 0 + +gTrainerPalette_SchoolKidF: ; 8D5CBD0 + .incbin "base_emerald.gba", 0xd5cbd0, 0x28 + + .align 2, 0 + +gTrainerPic_SrAndJr: ; 8D5CBF8 + .incbin "base_emerald.gba", 0xd5cbf8, 0x470 + + .align 2, 0 + +gTrainerPalette_SrAndJr: ; 8D5D068 + .incbin "base_emerald.gba", 0xd5d068, 0x28 + + .align 2, 0 + +gTrainerPic_WinstrateM: ; 8D5D090 + .incbin "base_emerald.gba", 0xd5d090, 0x3bc + + .align 2, 0 + +gTrainerPalette_WinstrateM: ; 8D5D44C + .incbin "base_emerald.gba", 0xd5d44c, 0x28 + + .align 2, 0 + +gTrainerPic_WinstrateF: ; 8D5D474 + .incbin "base_emerald.gba", 0xd5d474, 0x3cc + + .align 2, 0 + +gTrainerPalette_WinstrateF: ; 8D5D840 + .incbin "base_emerald.gba", 0xd5d840, 0x28 + + .align 2, 0 + +gTrainerPic_Youngster: ; 8D5D868 + .incbin "base_emerald.gba", 0xd5d868, 0x2a8 + + .align 2, 0 + +gTrainerPalette_Youngster: ; 8D5DB10 + .incbin "base_emerald.gba", 0xd5db10, 0x28 + + .align 2, 0 + +gTrainerPic_ChampionWallace: ; 8D5DB38 + .incbin "base_emerald.gba", 0xd5db38, 0x454 + + .align 2, 0 + +gTrainerPalette_ChampionWallace: ; 8D5DF8C + .incbin "base_emerald.gba", 0xd5df8c, 0x28 + + .align 2, 0 + +gTrainerPic_Fisherman: ; 8D5DFB4 + .incbin "base_emerald.gba", 0xd5dfb4, 0x3e4 + + .align 2, 0 + +gTrainerPalette_Fisherman: ; 8D5E398 + .incbin "base_emerald.gba", 0xd5e398, 0x28 + + .align 2, 0 + +gTrainerPic_CyclingTriathleteM: ; 8D5E3C0 + .incbin "base_emerald.gba", 0xd5e3c0, 0x410 + + .align 2, 0 + +gTrainerPalette_CyclingTriathleteM: ; 8D5E7D0 + .incbin "base_emerald.gba", 0xd5e7d0, 0x28 + + .align 2, 0 + +gTrainerPic_CyclingTriathleteF: ; 8D5E7F8 + .incbin "base_emerald.gba", 0xd5e7f8, 0x40c + + .align 2, 0 + +gTrainerPalette_CyclingTriathleteF: ; 8D5EC04 + .incbin "base_emerald.gba", 0xd5ec04, 0x28 + + .align 2, 0 + +gTrainerPic_RunningTriathleteM: ; 8D5EC2C + .incbin "base_emerald.gba", 0xd5ec2c, 0x2b8 + + .align 2, 0 + +gTrainerPalette_RunningTriathleteM: ; 8D5EEE4 + .incbin "base_emerald.gba", 0xd5eee4, 0x28 + + .align 2, 0 + +gTrainerPic_RunningTriathleteF: ; 8D5EF0C + .incbin "base_emerald.gba", 0xd5ef0c, 0x2a4 + + .align 2, 0 + +gTrainerPalette_RunningTriathleteF: ; 8D5F1B0 + .incbin "base_emerald.gba", 0xd5f1b0, 0x28 + + .align 2, 0 + +gTrainerPic_SwimmingTriathleteM: ; 8D5F1D8 + .incbin "base_emerald.gba", 0xd5f1d8, 0x32c + + .align 2, 0 + +gTrainerPalette_SwimmingTriathleteM: ; 8D5F504 + .incbin "base_emerald.gba", 0xd5f504, 0x28 + + .align 2, 0 + +gTrainerPic_SwimmingTriathleteF: ; 8D5F52C + .incbin "base_emerald.gba", 0xd5f52c, 0x2dc + + .align 2, 0 + +gTrainerPalette_SwimmingTriathleteF: ; 8D5F808 + .incbin "base_emerald.gba", 0xd5f808, 0x28 + + .align 2, 0 + +gTrainerPic_DragonTamer: ; 8D5F830 + .incbin "base_emerald.gba", 0xd5f830, 0x354 + + .align 2, 0 + +gTrainerPalette_DragonTamer: ; 8D5FB84 + .incbin "base_emerald.gba", 0xd5fb84, 0x28 + + .align 2, 0 + +gTrainerPic_NinjaBoy: ; 8D5FBAC + .incbin "base_emerald.gba", 0xd5fbac, 0x2dc + + .align 2, 0 + +gTrainerPalette_NinjaBoy: ; 8D5FE88 + .incbin "base_emerald.gba", 0xd5fe88, 0x28 + + .align 2, 0 + +gTrainerPic_BattleGirl: ; 8D5FEB0 + .incbin "base_emerald.gba", 0xd5feb0, 0x320 + + .align 2, 0 + +gTrainerPalette_BattleGirl: ; 8D601D0 + .incbin "base_emerald.gba", 0xd601d0, 0x28 + + .align 2, 0 + +gTrainerPic_ParasolLady: ; 8D601F8 + .incbin "base_emerald.gba", 0xd601f8, 0x338 + + .align 2, 0 + +gTrainerPalette_ParasolLady: ; 8D60530 + .incbin "base_emerald.gba", 0xd60530, 0x28 + + .align 2, 0 + +gTrainerPic_SwimmerF: ; 8D60558 + .incbin "base_emerald.gba", 0xd60558, 0x2d0 + + .align 2, 0 + +gTrainerPalette_SwimmerF: ; 8D60828 + .incbin "base_emerald.gba", 0xd60828, 0x28 + + .align 2, 0 + +gTrainerPic_Twins: ; 8D60850 + .incbin "base_emerald.gba", 0xd60850, 0x3c4 + + .align 2, 0 + +gTrainerPalette_Twins: ; 8D60C14 + .incbin "base_emerald.gba", 0xd60c14, 0x28 + + .align 2, 0 + +gTrainerPic_Sailor: ; 8D60C3C + .incbin "base_emerald.gba", 0xd60c3c, 0x3b0 + + .align 2, 0 + +gTrainerPalette_Sailor: ; 8D60FEC + .incbin "base_emerald.gba", 0xd60fec, 0x28 + + .align 2, 0 + +gTrainerPic_MagmaAdmin: ; 8D61014 + .incbin "base_emerald.gba", 0xd61014, 0x3d8 + + .align 2, 0 + +gTrainerPalette_MagmaAdmin: ; 8D613EC + .incbin "base_emerald.gba", 0xd613ec, 0x28 + + .align 2, 0 + +gTrainerPic_Wally: ; 8D61414 + .incbin "base_emerald.gba", 0xd61414, 0x2d0 + + .align 2, 0 + +gTrainerPalette_Wally: ; 8D616E4 + .incbin "base_emerald.gba", 0xd616e4, 0x28 + + .align 2, 0 + +gTrainerPic_Brendan: ; 8D6170C + .incbin "base_emerald.gba", 0xd6170c, 0x324 + + .align 2, 0 + +gTrainerPalette_Brendan: ; 8D61A30 + .incbin "base_emerald.gba", 0xd61a30, 0x28 + + .align 2, 0 + +gTrainerPic_May: ; 8D61A58 + .incbin "base_emerald.gba", 0xd61a58, 0x300 + + .align 2, 0 + +gTrainerPalette_May: ; 8D61D58 + .incbin "base_emerald.gba", 0xd61d58, 0x28 + + .align 2, 0 + +gTrainerPic_BugCatcher: ; 8D61D80 + .incbin "base_emerald.gba", 0xd61d80, 0x32c + + .align 2, 0 + +gTrainerPalette_BugCatcher: ; 8D620AC + .incbin "base_emerald.gba", 0xd620ac, 0x28 + + .align 2, 0 + +gTrainerPic_PokemonRangerM: ; 8D620D4 + .incbin "base_emerald.gba", 0xd620d4, 0x348 + + .align 2, 0 + +gTrainerPalette_PokemonRangerM: ; 8D6241C + .incbin "base_emerald.gba", 0xd6241c, 0x28 + + .align 2, 0 + +gTrainerPic_PokemonRangerF: ; 8D62444 + .incbin "base_emerald.gba", 0xd62444, 0x334 + + .align 2, 0 + +gTrainerPalette_PokemonRangerF: ; 8D62778 + .incbin "base_emerald.gba", 0xd62778, 0x28 + + .align 2, 0 + +gTrainerPic_MagmaLeaderMaxie: ; 8D627A0 + .incbin "base_emerald.gba", 0xd627a0, 0x2f4 + + .align 2, 0 + +gTrainerPalette_MagmaLeaderMaxie: ; 8D62A94 + .incbin "base_emerald.gba", 0xd62a94, 0x28 + + .align 2, 0 + +gTrainerPic_Lass: ; 8D62ABC + .incbin "base_emerald.gba", 0xd62abc, 0x2d8 + + .align 2, 0 + +gTrainerPalette_Lass: ; 8D62D94 + .incbin "base_emerald.gba", 0xd62d94, 0x28 + + .align 2, 0 + +gTrainerPic_YoungCouple: ; 8D62DBC + .incbin "base_emerald.gba", 0xd62dbc, 0x3c0 + + .align 2, 0 + +gTrainerPalette_YoungCouple: ; 8D6317C + .incbin "base_emerald.gba", 0xd6317c, 0x28 + + .align 2, 0 + +gTrainerPic_OldCouple: ; 8D631A4 + .incbin "base_emerald.gba", 0xd631a4, 0x510 + + .align 2, 0 + +gTrainerPalette_OldCouple: ; 8D636B4 + .incbin "base_emerald.gba", 0xd636b4, 0x28 + + .align 2, 0 + +gTrainerPic_SisAndBro: ; 8D636DC + .incbin "base_emerald.gba", 0xd636dc, 0x44c + + .align 2, 0 + +gTrainerPalette_SisAndBro: ; 8D63B28 + .incbin "base_emerald.gba", 0xd63b28, 0x28 + + .align 2, 0 + +gTrainerPic_Steven: ; 8D63B50 + .incbin "base_emerald.gba", 0xd63b50, 0x338 + + .align 2, 0 + +gTrainerPalette_Steven: ; 8D63E88 + .incbin "base_emerald.gba", 0xd63e88, 0x28 + + .align 2, 0 + +gTrainerPic_SalonMaidenAnabel: ; 8D63EB0 + .incbin "base_emerald.gba", 0xd63eb0, 0x308 + + .align 2, 0 + +gTrainerPalette_SalonMaidenAnabel: ; 8D641B8 + .incbin "base_emerald.gba", 0xd641b8, 0x28 + + .align 2, 0 + +gTrainerPic_DomeAceTucker: ; 8D641E0 + .incbin "base_emerald.gba", 0xd641e0, 0x404 + + .align 2, 0 + +gTrainerPalette_DomeAceTucker: ; 8D645E4 + .incbin "base_emerald.gba", 0xd645e4, 0x28 + + .align 2, 0 + +gTrainerPic_PalaceMavenSpenser: ; 8D6460C + .incbin "base_emerald.gba", 0xd6460c, 0x3a4 + + .align 2, 0 + +gTrainerPalette_PalaceMavenSpenser: ; 8D649B0 + .incbin "base_emerald.gba", 0xd649b0, 0x28 + + .align 2, 0 + +gTrainerPic_ArenaTycoonGreta: ; 8D649D8 + .incbin "base_emerald.gba", 0xd649d8, 0x330 + + .align 2, 0 + +gTrainerPalette_ArenaTycoonGreta: ; 8D64D08 + .incbin "base_emerald.gba", 0xd64d08, 0x28 + + .align 2, 0 + +gTrainerPic_FactoryHeadNoland: ; 8D64D30 + .incbin "base_emerald.gba", 0xd64d30, 0x37c + + .align 2, 0 + +gTrainerPalette_FactoryHeadNoland: ; 8D650AC + .incbin "base_emerald.gba", 0xd650ac, 0x28 + + .align 2, 0 + +gTrainerPic_PikeQueenLucy: ; 8D650D4 + .incbin "base_emerald.gba", 0xd650d4, 0x2f4 + + .align 2, 0 + +gTrainerPalette_PikeQueenLucy: ; 8D653C8 + .incbin "base_emerald.gba", 0xd653c8, 0x28 + + .align 2, 0 + +gTrainerPic_PyramidKingBrandon: ; 8D653F0 + .incbin "base_emerald.gba", 0xd653f0, 0x36c + + .align 2, 0 + +gTrainerPalette_PyramidKingBrandon: ; 8D6575C + .incbin "base_emerald.gba", 0xd6575c, 0x28 + + .align 2, 0 + +gTrainerPic_Red: ; 8D65784 + .incbin "base_emerald.gba", 0xd65784, 0x30c + + .align 2, 0 + +gTrainerPalette_Red: ; 8D65A90 + .incbin "base_emerald.gba", 0xd65a90, 0x28 + + .align 2, 0 + +gTrainerPic_Leaf: ; 8D65AB8 + .incbin "base_emerald.gba", 0xd65ab8, 0x33c + + .align 2, 0 + +gTrainerPalette_Leaf: ; 8D65DF4 + .incbin "base_emerald.gba", 0xd65df4, 0x28 + + .align 2, 0 + +gTrainerPic_Brendan2: ; 8D65E1C + .incbin "base_emerald.gba", 0xd65e1c, 0x314 + + .align 2, 0 + +gTrainerPalette_Brendan2: ; 8D66130 + .incbin "base_emerald.gba", 0xd66130, 0x28 + + .align 2, 0 + +gTrainerPic_May2: ; 8D66158 + .incbin "base_emerald.gba", 0xd66158, 0x300 + + .align 2, 0 + +gTrainerPalette_May2: ; 8D66458 + .incbin "base_emerald.gba", 0xd66458, 0x28 diff --git a/data/graphics/trainers/trainer_palette_table.s b/data/graphics/trainers/trainer_palette_table.s new file mode 100644 index 0000000000..bf0b6f2e68 --- /dev/null +++ b/data/graphics/trainers/trainer_palette_table.s @@ -0,0 +1,96 @@ + .align 2, 0 + +gTrainerPaletteTable: ; 830593C + obj_pal gTrainerPalette_Hiker, 0 + obj_pal gTrainerPalette_AquaGruntM, 1 + obj_pal gTrainerPalette_PokemonBreederF, 2 + obj_pal gTrainerPalette_CoolTrainerM, 3 + obj_pal gTrainerPalette_BirdKeeper, 4 + obj_pal gTrainerPalette_Collector, 5 + obj_pal gTrainerPalette_AquaGruntF, 6 + obj_pal gTrainerPalette_SwimmerM, 7 + obj_pal gTrainerPalette_MagmaGruntM, 8 + obj_pal gTrainerPalette_ExpertM, 9 + obj_pal gTrainerPalette_AquaAdminM, 10 + obj_pal gTrainerPalette_BlackBelt, 11 + obj_pal gTrainerPalette_AquaAdminF, 12 + obj_pal gTrainerPalette_AquaLeaderArchie, 13 + obj_pal gTrainerPalette_HexManiac, 14 + obj_pal gTrainerPalette_AromaLady, 15 + obj_pal gTrainerPalette_RuinManiac, 16 + obj_pal gTrainerPalette_Interviewer, 17 + obj_pal gTrainerPalette_TuberF, 18 + obj_pal gTrainerPalette_TuberM, 19 + obj_pal gTrainerPalette_CoolTrainerF, 20 + obj_pal gTrainerPalette_Lady, 21 + obj_pal gTrainerPalette_Beauty, 22 + obj_pal gTrainerPalette_RichBoy, 23 + obj_pal gTrainerPalette_ExpertF, 24 + obj_pal gTrainerPalette_Pokemaniac, 25 + obj_pal gTrainerPalette_MagmaGruntF, 26 + obj_pal gTrainerPalette_Guitarist, 27 + obj_pal gTrainerPalette_Kindler, 28 + obj_pal gTrainerPalette_Camper, 29 + obj_pal gTrainerPalette_Picnicker, 30 + obj_pal gTrainerPalette_BugManiac, 31 + obj_pal gTrainerPalette_PokemonBreederM, 32 + obj_pal gTrainerPalette_PsychicM, 33 + obj_pal gTrainerPalette_PsychicF, 34 + obj_pal gTrainerPalette_Gentleman, 35 + obj_pal gTrainerPalette_EliteFourSidney, 36 + obj_pal gTrainerPalette_EliteFourPhoebe, 37 + obj_pal gTrainerPalette_EliteFourGlacia, 38 + obj_pal gTrainerPalette_EliteFourDrake, 39 + obj_pal gTrainerPalette_LeaderRoxanne, 40 + obj_pal gTrainerPalette_LeaderBrawly, 41 + obj_pal gTrainerPalette_LeaderWattson, 42 + obj_pal gTrainerPalette_LeaderFlannery, 43 + obj_pal gTrainerPalette_LeaderNorman, 44 + obj_pal gTrainerPalette_LeaderWinona, 45 + obj_pal gTrainerPalette_LeaderTateAndLiza, 46 + obj_pal gTrainerPalette_LeaderJuan, 47 + obj_pal gTrainerPalette_SchoolKidM, 48 + obj_pal gTrainerPalette_SchoolKidF, 49 + obj_pal gTrainerPalette_SrAndJr, 50 + obj_pal gTrainerPalette_WinstrateM, 51 + obj_pal gTrainerPalette_WinstrateF, 52 + obj_pal gTrainerPalette_Youngster, 53 + obj_pal gTrainerPalette_ChampionWallace, 54 + obj_pal gTrainerPalette_Fisherman, 55 + obj_pal gTrainerPalette_CyclingTriathleteM, 56 + obj_pal gTrainerPalette_CyclingTriathleteF, 57 + obj_pal gTrainerPalette_RunningTriathleteM, 58 + obj_pal gTrainerPalette_RunningTriathleteF, 59 + obj_pal gTrainerPalette_SwimmingTriathleteM, 60 + obj_pal gTrainerPalette_SwimmingTriathleteF, 61 + obj_pal gTrainerPalette_DragonTamer, 62 + obj_pal gTrainerPalette_NinjaBoy, 63 + obj_pal gTrainerPalette_BattleGirl, 64 + obj_pal gTrainerPalette_ParasolLady, 65 + obj_pal gTrainerPalette_SwimmerF, 66 + obj_pal gTrainerPalette_Twins, 67 + obj_pal gTrainerPalette_Sailor, 68 + obj_pal gTrainerPalette_MagmaAdmin, 69 + obj_pal gTrainerPalette_Wally, 70 + obj_pal gTrainerPalette_Brendan, 71 + obj_pal gTrainerPalette_May, 72 + obj_pal gTrainerPalette_BugCatcher, 73 + obj_pal gTrainerPalette_PokemonRangerM, 74 + obj_pal gTrainerPalette_PokemonRangerF, 75 + obj_pal gTrainerPalette_MagmaLeaderMaxie, 76 + obj_pal gTrainerPalette_Lass, 77 + obj_pal gTrainerPalette_YoungCouple, 78 + obj_pal gTrainerPalette_OldCouple, 79 + obj_pal gTrainerPalette_SisAndBro, 80 + obj_pal gTrainerPalette_Steven, 81 + obj_pal gTrainerPalette_SalonMaidenAnabel, 82 + obj_pal gTrainerPalette_DomeAceTucker, 83 + obj_pal gTrainerPalette_PalaceMavenSpenser, 84 + obj_pal gTrainerPalette_ArenaTycoonGreta, 85 + obj_pal gTrainerPalette_FactoryHeadNoland, 86 + obj_pal gTrainerPalette_PikeQueenLucy, 87 + obj_pal gTrainerPalette_PyramidKingBrandon, 88 + obj_pal gTrainerPalette_Red, 89 + obj_pal gTrainerPalette_Leaf, 90 + obj_pal gTrainerPalette_Brendan2, 91 + obj_pal gTrainerPalette_May2, 92 diff --git a/data/graphics/trainers/trainer_pic_table.s b/data/graphics/trainers/trainer_pic_table.s new file mode 100644 index 0000000000..c255c0ceb9 --- /dev/null +++ b/data/graphics/trainers/trainer_pic_table.s @@ -0,0 +1,96 @@ + .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_Brendan2, 0x800, 91 + obj_tiles gTrainerPic_May2, 0x800, 92