Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge c6ff83b79d into 47cac73a61

Browse Source
This commit is contained in:
Frank DeBlasio 2026-03-21 21:55:00 +01:00 committed by GitHub
commit dd40e8522a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 180 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/CeladonCity_Condominiums_3F_Frlg/map.json
View File

@ -46,7 +46,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 4,
"y": 10,
"elevation": 3,

2
data/maps/CeladonCity_Condominiums_RoofRoom_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 3,
"y": 5,
"elevation": 3,

6
data/maps/CinnabarIsland_Gym_Frlg/map.json
View File

@ -19,7 +19,7 @@
{
"local_id": "LOCALID_QUINN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 25,
"y": 11,
"elevation": 3,
@ -63,7 +63,7 @@
{
"local_id": "LOCALID_RAMON",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 16,
"y": 11,
"elevation": 3,
@ -93,7 +93,7 @@
{
"local_id": "LOCALID_DUSTY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 4,
"y": 19,
"elevation": 3,

2
data/maps/CinnabarIsland_PokemonLab_ResearchRoom_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 5,
"y": 4,
"elevation": 3,

2
data/maps/IndigoPlateau_PokemonCenter_1F_Frlg/map.json
View File

@ -76,7 +76,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 23,
"y": 13,
"elevation": 3,

2
data/maps/MtEmber_Exterior_Frlg/map.json
View File

@ -62,7 +62,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 22,
"y": 35,
"elevation": 3,

2
data/maps/OneIsland_KindleRoad_EmberSpa_Frlg/map.json
View File

@ -46,7 +46,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 6,
"y": 8,
"elevation": 3,

12
data/maps/OneIsland_KindleRoad_Frlg/map.json
View File

@ -94,7 +94,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 9,
"y": 53,
"elevation": 3,
@ -108,7 +108,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 18,
"y": 105,
"elevation": 4,
@ -122,7 +122,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 16,
"y": 64,
"elevation": 3,
@ -136,7 +136,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 11,
"y": 64,
"elevation": 3,
@ -178,7 +178,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 8,
"y": 68,
"elevation": 3,
@ -192,7 +192,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 9,
"y": 68,
"elevation": 3,

2
data/maps/OneIsland_PokemonCenter_1F_Frlg/map.json
View File

@ -91,7 +91,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 7,
"y": 4,
"elevation": 3,

2
data/maps/PokemonMansion_2F_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 5,
"y": 23,
"elevation": 3,

2
data/maps/PokemonMansion_3F_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 7,
"y": 13,
"elevation": 3,

2
data/maps/PokemonMansion_B1F_Frlg/map.json
View File

@ -32,7 +32,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 20,
"y": 25,
"elevation": 3,

2
data/maps/RockTunnel_1F_Frlg/map.json
View File

@ -102,7 +102,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 27,
"y": 10,
"elevation": 3,

6
data/maps/RockTunnel_B1F_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 2,
"y": 6,
"elevation": 3,
@ -88,7 +88,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 23,
"y": 23,
"elevation": 3,
@ -116,7 +116,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 29,
"y": 35,
"elevation": 3,

4
data/maps/Route10_Frlg/map.json
View File

@ -57,7 +57,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 15,
"y": 70,
"elevation": 3,
@ -85,7 +85,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 13,
"y": 44,
"elevation": 3,

4
data/maps/Route15_Frlg/map.json
View File

@ -183,7 +183,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 39,
"y": 7,
"elevation": 3,
@ -197,7 +197,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 40,
"y": 7,
"elevation": 3,

4
data/maps/Route4_Frlg/map.json
View File

@ -85,7 +85,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 47,
"y": 3,
"elevation": 3,
@ -99,7 +99,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 50,
"y": 3,
"elevation": 3,

10
data/maps/SaffronCity_Dojo_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 11,
"y": 10,
"elevation": 3,
@ -32,7 +32,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 1,
"y": 10,
"elevation": 3,
@ -46,7 +46,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 11,
"y": 8,
"elevation": 3,
@ -60,7 +60,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 1,
"y": 8,
"elevation": 3,
@ -75,7 +75,7 @@
{
"local_id": "LOCALID_KARATE_MASTER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 6,
"y": 5,
"elevation": 3,

2
data/maps/SaffronCity_Frlg/map.json
View File

@ -236,7 +236,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 47,
"y": 24,
"elevation": 3,

4
data/maps/SaffronCity_PokemonTrainerFanClub_Frlg/map.json
View File

@ -19,7 +19,7 @@
{
"local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 7,
"y": 13,
"elevation": 3,
@ -124,7 +124,7 @@
{
"local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 5,
"y": 11,
"elevation": 3,

4
data/maps/SevenIsland_SevaultCanyon_Frlg/map.json
View File

@ -29,7 +29,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 13,
"y": 43,
"elevation": 3,
@ -295,7 +295,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 8,
"y": 26,
"elevation": 3,

2
data/maps/SixIsland_RuinValley_Frlg/map.json
View File

@ -95,7 +95,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 21,
"y": 29,
"elevation": 5,

2
data/maps/TwoIsland_Frlg/map.json
View File

@ -80,7 +80,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 27,
"y": 6,
"elevation": 3,

4
data/maps/VictoryRoad_2F_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC_FRLG",
"x": 7,
"y": 4,
"elevation": 3,
@ -32,7 +32,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 20,
"y": 11,
"elevation": 4,

6
data/maps/ViridianCity_Gym_Frlg/map.json
View File

@ -18,7 +18,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 10,
"y": 2,
"elevation": 3,
@ -46,7 +46,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 11,
"y": 14,
"elevation": 3,
@ -88,7 +88,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT_FRLG",
"x": 3,
"y": 11,
"elevation": 3,

0
graphics/object_events/pics/people/blackbelt.png → graphics/object_events/pics/people/black_belt_frlg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 864 B

0
graphics/object_events/pics/people/battle_girl.png → graphics/object_events/pics/people/crush_girl.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

0
graphics/object_events/pics/people/super_nerd.png → graphics/object_events/pics/people/poke_maniac_frlg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 826 B

6
include/constants/event_objects.h
View File

@ -284,7 +284,7 @@ enum
OBJ_EVENT_GFX_GREEN_VS_SEEKER,
OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE,
OBJ_EVENT_GFX_BOY,
OBJ_EVENT_GFX_BATTLE_GIRL,
OBJ_EVENT_GFX_CRUSH_GIRL,
OBJ_EVENT_GFX_MAN,
OBJ_EVENT_GFX_ROCKER,
OBJ_EVENT_GFX_BALDING_MAN,
@ -304,9 +304,9 @@ enum
OBJ_EVENT_GFX_ROCKET_M,
OBJ_EVENT_GFX_ROCKET_F,
OBJ_EVENT_GFX_GBA_KID,
OBJ_EVENT_GFX_SUPER_NERD,
OBJ_EVENT_GFX_POKE_MANIAC_FRLG,
OBJ_EVENT_GFX_BIKER,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACK_BELT_FRLG,
OBJ_EVENT_GFX_SCIENTIST,
OBJ_EVENT_GFX_FISHER,
OBJ_EVENT_GFX_CHANNELER,

6
src/data/object_events/object_event_graphics.h
View File

@ -517,7 +517,7 @@ const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people
const u16 gObjectEventPic_Woman1Frlg[] = INCBIN_U16("graphics/object_events/pics/people/woman_1_frlg.4bpp");
const u16 gObjectEventPic_Woman3Frlg[] = INCBIN_U16("graphics/object_events/pics/people/woman_3_frlg.4bpp");
const u16 gObjectEventPic_BugCatcherFrlg[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher_frlg.4bpp");
const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp");
const u16 gObjectEventPic_CrushGirl[] = INCBIN_U16("graphics/object_events/pics/people/crush_girl.4bpp");
const u16 gObjectEventPic_FatManFrlg[] = INCBIN_U16("graphics/object_events/pics/people/fat_man_frlg.4bpp");
const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp");
const u16 gObjectEventPic_Woman2Frlg[] = INCBIN_U16("graphics/object_events/pics/people/woman_2_frlg.4bpp");
@ -533,14 +533,14 @@ const u16 gObjectEventPic_CamperFrlg[] = INCBIN_U16("graphics/object_events/pics
const u16 gObjectEventPic_PicnickerFrlg[] = INCBIN_U16("graphics/object_events/pics/people/picnicker_frlg.4bpp");
const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp");
const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp");
const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp");
const u16 gObjectEventPic_PokeManiacFrlg[] = INCBIN_U16("graphics/object_events/pics/people/poke_maniac_frlg.4bpp");
const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp");
const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp");
const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp");
const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp");
const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp");
const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp");
const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp");
const u16 gObjectEventPic_BlackBeltFrlg[] = INCBIN_U16("graphics/object_events/pics/people/black_belt_frlg.4bpp");
const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp");
const u16 gObjectEventPic_GentlemanFrlg[] = INCBIN_U16("graphics/object_events/pics/people/gentleman_frlg.4bpp");
const u16 gObjectEventPic_SailorFrlg[] = INCBIN_U16("graphics/object_events/pics/people/sailor_frlg.4bpp");

12
src/data/object_events/object_event_graphics_info.h
View File

@ -4906,7 +4906,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@ -4921,7 +4921,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_BattleGirl,
.images = sPicTable_CrushGirl,
.affineAnims = gDummySpriteAffineAnimTable,
};
@ -5210,7 +5210,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiacFrlg = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_PINK,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@ -5225,7 +5225,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_SuperNerd,
.images = sPicTable_PokeManiacFrlg,
.affineAnims = gDummySpriteAffineAnimTable,
};
@ -5343,7 +5343,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBeltFrlg = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@ -5358,7 +5358,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = sOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_Blackbelt,
.images = sPicTable_BlackBeltFrlg,
.affineAnims = gDummySpriteAffineAnimTable,
};

12
src/data/object_events/object_event_graphics_info_pointers.h
View File

@ -258,7 +258,7 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcherF
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LassFrlg;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1Frlg;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatManFrlg;
@ -286,9 +286,9 @@ extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiacFrlg;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBeltFrlg;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HikerFrlg;
extern const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher;
@ -667,7 +667,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_BUG_CATCHER_FRLG] = &gObjectEventGraphicsInfo_BugCatcherFrlg,
[OBJ_EVENT_GFX_LASS_FRLG] = &gObjectEventGraphicsInfo_LassFrlg,
[OBJ_EVENT_GFX_WOMAN_1_FRLG] = &gObjectEventGraphicsInfo_Woman1Frlg,
[OBJ_EVENT_GFX_BATTLE_GIRL] = &gObjectEventGraphicsInfo_BattleGirl,
[OBJ_EVENT_GFX_CRUSH_GIRL] = &gObjectEventGraphicsInfo_CrushGirl,
[OBJ_EVENT_GFX_MAN] = &gObjectEventGraphicsInfo_Man,
[OBJ_EVENT_GFX_ROCKER] = &gObjectEventGraphicsInfo_Rocker,
[OBJ_EVENT_GFX_FAT_MAN_FRLG] = &gObjectEventGraphicsInfo_FatManFrlg,
@ -695,9 +695,9 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_ROCKET_M] = &gObjectEventGraphicsInfo_RocketM,
[OBJ_EVENT_GFX_ROCKET_F] = &gObjectEventGraphicsInfo_RocketF,
[OBJ_EVENT_GFX_GBA_KID] = &gObjectEventGraphicsInfo_GBAKid,
[OBJ_EVENT_GFX_SUPER_NERD] = &gObjectEventGraphicsInfo_SuperNerd,
[OBJ_EVENT_GFX_POKE_MANIAC_FRLG] = &gObjectEventGraphicsInfo_PokeManiacFrlg,
[OBJ_EVENT_GFX_BIKER] = &gObjectEventGraphicsInfo_Biker,
[OBJ_EVENT_GFX_BLACKBELT] = &gObjectEventGraphicsInfo_Blackbelt,
[OBJ_EVENT_GFX_BLACK_BELT_FRLG] = &gObjectEventGraphicsInfo_BlackBeltFrlg,
[OBJ_EVENT_GFX_SCIENTIST] = &gObjectEventGraphicsInfo_Scientist,
[OBJ_EVENT_GFX_HIKER_FRLG] = &gObjectEventGraphicsInfo_HikerFrlg,
[OBJ_EVENT_GFX_FISHER] = &gObjectEventGraphicsInfo_Fisher,

66
src/data/object_events/object_event_pic_tables.h
View File

@ -1635,17 +1635,17 @@ static const struct SpriteFrameImage sPicTable_Woman3Frlg[] = {
overworld_frame(gObjectEventPic_Woman3Frlg, 2, 4, 8),
};
static const struct SpriteFrameImage sPicTable_BattleGirl[] = {
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 0),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 1),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 2),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 3),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 4),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 5),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 6),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 7),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 8),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_CrushGirl[] = {
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 0),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 1),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 2),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 3),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 4),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 5),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 6),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 7),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 8),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_BugCatcherFrlg[] = {
@ -1863,17 +1863,17 @@ static const struct SpriteFrameImage sPicTable_Boy[] = {
overworld_frame(gObjectEventPic_Boy, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_SuperNerd[] = {
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 0),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 1),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 2),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 3),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 4),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 5),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 6),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 7),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 8),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_PokeManiacFrlg[] = {
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 0),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 1),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 2),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 3),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 4),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 5),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 6),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 7),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 8),
overworld_frame(gObjectEventPic_PokeManiacFrlg, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Channeler[] = {
@ -1953,17 +1953,17 @@ static const struct SpriteFrameImage sPicTable_SwimmerFLand[] = {
overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Blackbelt[] = {
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 0),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 1),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 2),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 3),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 4),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 5),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 6),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 7),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 8),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_BlackBeltFrlg[] = {
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 0),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 1),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 2),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 3),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 4),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 5),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 6),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 7),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 8),
overworld_frame(gObjectEventPic_BlackBeltFrlg, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Scientist[] = {

12
src/fame_checker.c
View File

@ -333,20 +333,20 @@
// OBJ_EVENT_GFX_BRUNO,
// OBJ_EVENT_GFX_BRUNO,
// OBJ_EVENT_GFX_CLIPBOARD,
// OBJ_EVENT_GFX_BLACKBELT,
// OBJ_EVENT_GFX_BLACK_BELT_FRLG,
// OBJ_EVENT_GFX_BEAUTY_FRLG,
// OBJ_EVENT_GFX_BLACKBELT,
// OBJ_EVENT_GFX_BLACK_BELT_FRLG,
// // AGATHA
// OBJ_EVENT_GFX_AGATHA,
// OBJ_EVENT_GFX_BLACKBELT,
// OBJ_EVENT_GFX_BLACKBELT,
// OBJ_EVENT_GFX_BLACK_BELT_FRLG,
// OBJ_EVENT_GFX_BLACK_BELT_FRLG,
// OBJ_EVENT_GFX_CLIPBOARD,
// OBJ_EVENT_GFX_AGATHA,
// OBJ_EVENT_GFX_OLD_WOMAN_FRLG,
// // LANCE
// OBJ_EVENT_GFX_LANCE,
// OBJ_EVENT_GFX_LANCE,
// OBJ_EVENT_GFX_BATTLE_GIRL,
// OBJ_EVENT_GFX_CRUSH_GIRL,
// OBJ_EVENT_GFX_WOMAN_1_FRLG,
// OBJ_EVENT_GFX_CLIPBOARD,
// OBJ_EVENT_GFX_COOLTRAINER_M,
@ -1231,7 +1231,7 @@ void UpdatePickStateFromSpecialVar8005(void)
// {
// if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW)
// return;
// if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
// if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
// && gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED
// )
// return;

154
src/trainer_tower.c
View File

@ -109,67 +109,67 @@ const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] =
};
static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID_M, MALE},
{OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_SCHOOL_KID_F, FEMALE},
{OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN_M, MALE},
{OBJ_EVENT_GFX_WOMAN_3_FRLG, FACILITY_CLASS_POKEFAN_F, FEMALE},
{OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT_M, MALE},
{OBJ_EVENT_GFX_OLD_WOMAN_FRLG, FACILITY_CLASS_EXPERT_F, FEMALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
{OBJ_EVENT_GFX_LITTLE_BOY_FRLG, FACILITY_CLASS_NINJA_BOY, MALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, FACILITY_CLASS_PARASOL_LADY, FEMALE},
{OBJ_EVENT_GFX_FAT_MAN_FRLG, FACILITY_CLASS_COLLECTOR, MALE},
{OBJ_EVENT_GFX_YOUNGSTER_FRLG, FACILITY_CLASS_YOUNGSTER_FRLG, MALE},
{OBJ_EVENT_GFX_BUG_CATCHER_FRLG, FACILITY_CLASS_BUG_CATCHER_FRLG, MALE},
{OBJ_EVENT_GFX_LASS_FRLG, FACILITY_CLASS_LASS_FRLG, FEMALE},
{OBJ_EVENT_GFX_SAILOR_FRLG, FACILITY_CLASS_SAILOR_FRLG, MALE},
{OBJ_EVENT_GFX_CAMPER_FRLG, FACILITY_CLASS_CAMPER_FRLG, MALE},
{OBJ_EVENT_GFX_PICNICKER_FRLG, FACILITY_CLASS_PICNICKER_FRLG, FEMALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD_FRLG, MALE},
{OBJ_EVENT_GFX_HIKER_FRLG, FACILITY_CLASS_HIKER_FRLG, MALE},
{OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER_FRLG, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR_FRLG, MALE},
{OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER_FRLG, MALE},
{OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_FRLG, MALE},
{OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M_FRLG, MALE},
{OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL_FRLG, MALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, FACILITY_CLASS_BEAUTY_FRLG, FEMALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_M_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
{OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_FRLG, MALE},
{OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST_FRLG, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M_FRLG, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_FRLG, MALE},
{OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_PSYCHIC_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL_FRLG, FEMALE},
{OBJ_EVENT_GFX_TUBER_F_FRLG, FACILITY_CLASS_TUBER_FRLG, FEMALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_PKMN_BREEDER_FRLG, FEMALE},
{OBJ_EVENT_GFX_CAMPER_FRLG, FACILITY_CLASS_PKMN_RANGER_M_FRLG, MALE},
{OBJ_EVENT_GFX_PICNICKER_FRLG, FACILITY_CLASS_PKMN_RANGER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_AROMA_LADY_FRLG, FEMALE},
{OBJ_EVENT_GFX_HIKER_FRLG, FACILITY_CLASS_RUIN_MANIAC, MALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_LADY_FRLG, FEMALE}
{OBJ_EVENT_GFX_POKE_MANIAC_FRLG, FACILITY_CLASS_HEX_MANIAC, MALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC_FRLG, FACILITY_CLASS_BUG_MANIAC, MALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID_M, MALE},
{OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_SCHOOL_KID_F, FEMALE},
{OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN_M, MALE},
{OBJ_EVENT_GFX_WOMAN_3_FRLG, FACILITY_CLASS_POKEFAN_F, FEMALE},
{OBJ_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT_M, MALE},
{OBJ_EVENT_GFX_OLD_WOMAN_FRLG, FACILITY_CLASS_EXPERT_F, FEMALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
{OBJ_EVENT_GFX_LITTLE_BOY_FRLG, FACILITY_CLASS_NINJA_BOY, MALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, FACILITY_CLASS_PARASOL_LADY, FEMALE},
{OBJ_EVENT_GFX_FAT_MAN_FRLG, FACILITY_CLASS_COLLECTOR, MALE},
{OBJ_EVENT_GFX_YOUNGSTER_FRLG, FACILITY_CLASS_YOUNGSTER_FRLG, MALE},
{OBJ_EVENT_GFX_BUG_CATCHER_FRLG, FACILITY_CLASS_BUG_CATCHER_FRLG, MALE},
{OBJ_EVENT_GFX_LASS_FRLG, FACILITY_CLASS_LASS_FRLG, FEMALE},
{OBJ_EVENT_GFX_SAILOR_FRLG, FACILITY_CLASS_SAILOR_FRLG, MALE},
{OBJ_EVENT_GFX_CAMPER_FRLG, FACILITY_CLASS_CAMPER_FRLG, MALE},
{OBJ_EVENT_GFX_PICNICKER_FRLG, FACILITY_CLASS_PICNICKER_FRLG, FEMALE},
{OBJ_EVENT_GFX_POKE_MANIAC_FRLG, FACILITY_CLASS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC_FRLG, FACILITY_CLASS_SUPER_NERD_FRLG, MALE},
{OBJ_EVENT_GFX_HIKER_FRLG, FACILITY_CLASS_HIKER_FRLG, MALE},
{OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER_FRLG, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC_FRLG, FACILITY_CLASS_BURGLAR_FRLG, MALE},
{OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER_FRLG, MALE},
{OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_FRLG, MALE},
{OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M_FRLG, MALE},
{OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL_FRLG, MALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, FACILITY_CLASS_BEAUTY_FRLG, FEMALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_M_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER_FRLG, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
{OBJ_EVENT_GFX_BLACK_BELT_FRLG, FACILITY_CLASS_BLACK_BELT_FRLG, MALE},
{OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST_FRLG, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M_FRLG, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_FRLG, MALE},
{OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_PSYCHIC_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_CRUSH_GIRL_FRLG, FEMALE},
{OBJ_EVENT_GFX_TUBER_F_FRLG, FACILITY_CLASS_TUBER_FRLG, FEMALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_PKMN_BREEDER_FRLG, FEMALE},
{OBJ_EVENT_GFX_CAMPER_FRLG, FACILITY_CLASS_PKMN_RANGER_M_FRLG, MALE},
{OBJ_EVENT_GFX_PICNICKER_FRLG, FACILITY_CLASS_PKMN_RANGER_F_FRLG, FEMALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_AROMA_LADY_FRLG, FEMALE},
{OBJ_EVENT_GFX_HIKER_FRLG, FACILITY_CLASS_RUIN_MANIAC, MALE},
{OBJ_EVENT_GFX_WOMAN_2_FRLG, FACILITY_CLASS_LADY_FRLG, FEMALE}
};
static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_BEAUTY_FRLG, OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
{OBJ_EVENT_GFX_OLD_MAN_1, OBJ_EVENT_GFX_OLD_WOMAN_FRLG, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
{OBJ_EVENT_GFX_LITTLE_GIRL_FRLG, OBJ_EVENT_GFX_LITTLE_GIRL_FRLG, FACILITY_CLASS_TWINS_FRLG, FEMALE, FEMALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE_FRLG, MALE, FEMALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_FRLG, FEMALE, MALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN_FRLG, FEMALE, MALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO_FRLG, FEMALE, MALE}
{OBJ_EVENT_GFX_BEAUTY_FRLG, OBJ_EVENT_GFX_WOMAN_1_FRLG, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
{OBJ_EVENT_GFX_OLD_MAN_1, OBJ_EVENT_GFX_OLD_WOMAN_FRLG, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
{OBJ_EVENT_GFX_LITTLE_GIRL_FRLG, OBJ_EVENT_GFX_LITTLE_GIRL_FRLG, FACILITY_CLASS_TWINS_FRLG, FEMALE, FEMALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE_FRLG, MALE, FEMALE},
{OBJ_EVENT_GFX_BEAUTY_FRLG, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_FRLG, FEMALE, MALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_BLACK_BELT_FRLG, FACILITY_CLASS_CRUSH_KIN_FRLG, FEMALE, MALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO_FRLG, FEMALE, MALE}
};
static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[] = {
@ -178,19 +178,19 @@ static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[] = {
{FACILITY_CLASS_LEADER_BRAWLY, TRAINER_ENCOUNTER_MUSIC_TWINS},
{FACILITY_CLASS_MAGMA_LEADER_MAXIE, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_POKEFAN_F, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_PSYCHIC_M_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_PICNICKER_FRLG, TRAINER_ENCOUNTER_MUSIC_COOL},
{FACILITY_CLASS_PSYCHIC_M_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_PICNICKER_FRLG, TRAINER_ENCOUNTER_MUSIC_COOL},
{FACILITY_CLASS_GUITARIST, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_RUNNING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_CAMPER_FRLG, TRAINER_ENCOUNTER_MUSIC_TWINS},
{FACILITY_CLASS_CAMPER_FRLG, TRAINER_ENCOUNTER_MUSIC_TWINS},
{FACILITY_CLASS_CYCLING_TRIATHLETE_F, TRAINER_ENCOUNTER_MUSIC_TWINS},
{FACILITY_CLASS_BEAUTY_FRLG, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_BEAUTY_FRLG, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_INTERVIEWER, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_YOUNGSTER_FRLG, TRAINER_ENCOUNTER_MUSIC_RICH},
{FACILITY_CLASS_YOUNGSTER_FRLG, TRAINER_ENCOUNTER_MUSIC_RICH},
{FACILITY_CLASS_MAGMA_GRUNT_F, TRAINER_ENCOUNTER_MUSIC_SWIMMER},
{FACILITY_CLASS_SUPER_NERD_FRLG, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_ENGINEER_FRLG, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_SAILOR_FRLG, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_SUPER_NERD_FRLG, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_ENGINEER_FRLG, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_SAILOR_FRLG, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_BUG_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_KINDLER, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_BATTLE_GIRL, TRAINER_ENCOUNTER_MUSIC_MAGMA},
@ -200,29 +200,29 @@ static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[] = {
{FACILITY_CLASS_EXPERT_F, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_RICH_BOY, TRAINER_ENCOUNTER_MUSIC_RICH},
{FACILITY_CLASS_HEX_MANIAC, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_SWIMMER_F_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_SWIMMER_F_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_CYCLING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_GIRL},
{FACILITY_CLASS_SWIMMER_M_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_SWIMMER_M_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_DRAGON_TAMER, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_BIKER_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_BIKER_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_M, TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS},
{FACILITY_CLASS_CUE_BALL_FRLG, TRAINER_ENCOUNTER_MUSIC_COOL},
{FACILITY_CLASS_CUE_BALL_FRLG, TRAINER_ENCOUNTER_MUSIC_COOL},
{FACILITY_CLASS_SWIMMING_TRIATHLETE_F, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_POKEMANIAC, TRAINER_ENCOUNTER_MUSIC_GIRL},
{FACILITY_CLASS_BUG_CATCHER_FRLG, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_BUG_CATCHER_FRLG, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_OLD_COUPLE, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_LEADER_ROXANNE, TRAINER_ENCOUNTER_MUSIC_TWINS},
{FACILITY_CLASS_BURGLAR_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_BURGLAR_FRLG, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_SCHOOL_KID_M, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_LEADER_TATE_AND_LIZA, TRAINER_ENCOUNTER_MUSIC_INTENSE},
{FACILITY_CLASS_POKEFAN_M, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_EXPERT_M, TRAINER_ENCOUNTER_MUSIC_COOL},
{FACILITY_CLASS_MAGMA_GRUNT_M, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_SR_AND_JR, TRAINER_ENCOUNTER_MUSIC_HIKER},
{FACILITY_CLASS_LASS_FRLG, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_LASS_FRLG, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_SCHOOL_KID_F, TRAINER_ENCOUNTER_MUSIC_MALE},
{FACILITY_CLASS_FISHERMAN_FRLG, TRAINER_ENCOUNTER_MUSIC_GIRL},
{FACILITY_CLASS_HIKER_FRLG, TRAINER_ENCOUNTER_MUSIC_SWIMMER},
{FACILITY_CLASS_FISHERMAN_FRLG, TRAINER_ENCOUNTER_MUSIC_GIRL},
{FACILITY_CLASS_HIKER_FRLG, TRAINER_ENCOUNTER_MUSIC_SWIMMER},
{FACILITY_CLASS_ELITE_FOUR_SIDNEY, TRAINER_ENCOUNTER_MUSIC_FEMALE},
{FACILITY_CLASS_ELITE_FOUR_PHOEBE, TRAINER_ENCOUNTER_MUSIC_MALE}
};
@ -577,7 +577,7 @@ static void BufferTowerOpponentSpeech(void)
u16 trainerId = gSpecialVar_0x8006;
u8 facilityClass;
u8 challengeType = CURR_FLOOR.challengeType;
if (challengeType != CHALLENGE_TYPE_DOUBLE)
facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass;
else
@ -686,7 +686,7 @@ static void GetFloorAlreadyCleared(void)
{
#if FREE_TRAINER_TOWER == FALSE && IS_FRLG
u16 mapLayoutId = gMapHeader.mapLayoutId;
if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared
if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared
&& mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY <= CURR_FLOOR.floorIdx)
gSpecialVar_Result = FALSE;
else