dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*actual* final pass at unifying on object event

Browse Source
This commit is contained in:
garak
2019-12-17 21:09:15 -05:00
parent fabe354c01
commit 8ee35bc615
377 changed files with 1967 additions and 5531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_tower.c
+2 -2
View File
@@ -24,7 +24,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/vars.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
static EWRAM_DATA u16 sSpecialVar_0x8004_Copy = 0;
@@ -389,7 +389,7 @@ void ChooseNextBattleTowerTrainer(void)
static void SetBattleTowerTrainerGfxId(u8 trainerClass)
{
VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_YOUNGSTER);
VarSet(VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_YOUNGSTER);
}
void SetEReaderTrainerGfxId(void)
src/easy_chat.c
+1 -1
View File
@@ -25,7 +25,7 @@
#include "text_window.h"
#include "window.h"
#include "constants/easy_chat.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
#include "constants/flags.h"
#include "constants/songs.h"
#include "constants/species.h"
src/field_specials.c
+4 -4
View File
@@ -41,7 +41,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/items.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
#include "constants/maps.h"
#include "constants/region_map.h"
#include "constants/moves.h"
@@ -314,7 +314,7 @@ void Special_AnimatePcTurnOff()
void SpawnCameraObject(void)
{
u8 objectEventId = SpawnSpecialObjectEventParameterized(MAP_OBJ_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
gObjectEvents[objectEventId].mapobj_bit_13 = TRUE;
CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
}
@@ -1513,8 +1513,8 @@ u8 ContextNpcGetTextColor(void)
else
{
gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
if (gfxId >= MAP_OBJ_GFX_VAR_0)
gfxId = VarGetObjectEventGraphicsId(gfxId - MAP_OBJ_GFX_VAR_0);
if (gfxId >= OBJECT_EVENT_GFX_VAR_0)
gfxId = VarGetObjectEventGraphicsId(gfxId - OBJECT_EVENT_GFX_VAR_0);
return GetColorFromTextColorTable(gfxId);
}
}
src/fldeff_dig.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "overworld.h"
#include "party_menu.h"
#include "sprite.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
static void FieldCallback_Dig(void);
static void sub_80C9AFC(void);
src/fldeff_rocksmash.c
+2 -2
View File
@@ -15,7 +15,7 @@
#include "wild_encounter.h"
#include "event_object_movement.h"
#include "constants/songs.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
#include "constants/map_types.h"
static void task08_080C9820(u8 taskId);
@@ -106,7 +106,7 @@ static void sub_80C99A0(u8 taskId)
bool8 SetUpFieldMove_RockSmash(void)
{
if (CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_BREAKABLE_ROCK*/0x60) == TRUE)
if (CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_BREAKABLE_ROCK*/0x60) == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = sub_80C9A10;
src/fldeff_strength.c
+2 -2
View File
@@ -7,14 +7,14 @@
#include "fldeff.h"
#include "event_scripts.h"
#include "constants/songs.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
static void FldEff_UseStrength(void);
static void sub_80D08A8(void);
bool8 SetUpFieldMove_Strength(void)
{
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*MAP_OBJ_GFX_PUSHABLE_BOULDER*/0x61) != TRUE)
if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(/*OBJECT_EVENT_GFX_PUSHABLE_BOULDER*/0x61) != TRUE)
{
return FALSE;
}
src/trainer_tower.c
+97 -97
View File
@@ -30,7 +30,7 @@
#include "constants/layouts.h"
#include "constants/trainers.h"
#include "constants/facility_trainer_classes.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
struct UnkStruct_203F458
{
@@ -113,102 +113,102 @@ extern const u8 gUnknown_83FE998[];
extern const u8 *const gUnknown_83FE9C4[];
static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE},
{MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE},
{MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE},
{MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE},
{MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE},
{MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE},
{MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE},
{MAP_OBJ_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
{MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE},
{MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
{MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
{MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE},
{MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE},
{MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE},
{MAP_OBJ_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE},
{MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE},
{MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE},
{MAP_OBJ_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE},
{MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE},
{MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE},
{MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE},
{MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE},
{MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
{MAP_OBJ_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE},
{MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE},
{MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE},
{MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE},
{MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE},
{MAP_OBJ_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE},
{MAP_OBJ_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE},
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE},
{MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE},
{MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE},
{MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS, FEMALE},
{MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE},
{MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER, MALE},
{MAP_OBJ_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE},
{MAP_OBJ_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE},
{MAP_OBJ_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE},
{MAP_OBJ_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE},
{MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE},
{MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE},
{MAP_OBJ_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE},
{MAP_OBJ_GFX_BIKER, FACILITY_CLASS_BIKER, MALE},
{MAP_OBJ_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE},
{MAP_OBJ_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE},
{MAP_OBJ_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE},
{MAP_OBJ_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE},
{MAP_OBJ_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE},
{MAP_OBJ_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE},
{MAP_OBJ_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE},
{MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
{MAP_OBJ_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE},
{MAP_OBJ_GFX_MAN, FACILITY_CLASS_TAMER, MALE},
{MAP_OBJ_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE},
{MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE},
{MAP_OBJ_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE},
{MAP_OBJ_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE},
{MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE},
{MAP_OBJ_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE},
{MAP_OBJ_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE},
{MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE},
{MAP_OBJ_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
{MAP_OBJ_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE},
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE},
{MAP_OBJ_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE},
{MAP_OBJ_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE},
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE},
{MAP_OBJ_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE},
{MAP_OBJ_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE},
{MAP_OBJ_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE}
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY, FEMALE},
{OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC, MALE},
{OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE},
{OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_TUBER_2, MALE},
{OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER, MALE},
{OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_2, FEMALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY, FEMALE},
{OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY, FEMALE},
{OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
{OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE, MALE},
{OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
{OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
{OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC, MALE},
{OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_2, FEMALE},
{OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE},
{OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_SCHOOL_KID, MALE},
{OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SCHOOL_KID_2, FEMALE},
{OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_POKEFAN, MALE},
{OBJECT_EVENT_GFX_WOMAN_3, FACILITY_CLASS_POKEFAN_2, FEMALE},
{OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_EXPERT, MALE},
{OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_EXPERT_2, FEMALE},
{OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER, MALE},
{OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE},
{OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
{OBJECT_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE},
{OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE},
{OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE, FEMALE},
{OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE},
{OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE},
{OBJECT_EVENT_GFX_FAT_MAN, FACILITY_CLASS_COLLECTOR, MALE},
{OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_PKMN_BREEDER, MALE},
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_2, FEMALE},
{OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER, MALE},
{OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_2, FEMALE},
{OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS, FEMALE},
{OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER, MALE},
{OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE},
{OBJECT_EVENT_GFX_YOUNGSTER, FACILITY_CLASS_YOUNGSTER_2, MALE},
{OBJECT_EVENT_GFX_BUG_CATCHER, FACILITY_CLASS_BUG_CATCHER_2, MALE},
{OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_LASS_2, FEMALE},
{OBJECT_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR_2, MALE},
{OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER_2, MALE},
{OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER_2, FEMALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC_2, MALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE},
{OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER_2, MALE},
{OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE},
{OBJECT_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE},
{OBJECT_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE},
{OBJECT_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN_2, MALE},
{OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2, MALE},
{OBJECT_EVENT_GFX_BIKER, FACILITY_CLASS_CUE_BALL, MALE},
{OBJECT_EVENT_GFX_OLD_MAN_1, FACILITY_CLASS_GAMER, MALE},
{OBJECT_EVENT_GFX_BEAUTY, FACILITY_CLASS_BEAUTY_2, FEMALE},
{OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
{OBJECT_EVENT_GFX_BOY, FACILITY_CLASS_PSYCHIC_3, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_ROCKER, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE},
{OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE},
{OBJECT_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER_2, MALE},
{OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT_2, MALE},
{OBJECT_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE},
{OBJECT_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_3, MALE},
{OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_4, FEMALE},
{OBJECT_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN_2, MALE},
{OBJECT_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE},
{OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_4, FEMALE},
{OBJECT_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
{OBJECT_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER_3, FEMALE},
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER_3, FEMALE},
{OBJECT_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_3, MALE},
{OBJECT_EVENT_GFX_PICNICKER, FACILITY_CLASS_PKMN_RANGER_4, FEMALE},
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_AROMA_LADY_2, FEMALE},
{OBJECT_EVENT_GFX_HIKER, FACILITY_CLASS_RUIN_MANIAC_2, MALE},
{OBJECT_EVENT_GFX_WOMAN_2, FACILITY_CLASS_LADY_2, FEMALE},
{OBJECT_EVENT_GFX_LASS, FACILITY_CLASS_PAINTER, FEMALE}
};
static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
{MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
{MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE},
{MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE},
{MAP_OBJ_GFX_OLD_MAN_1, MAP_OBJ_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
{MAP_OBJ_GFX_TUBER_M_2, MAP_OBJ_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE},
{MAP_OBJ_GFX_LITTLE_GIRL, MAP_OBJ_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE},
{MAP_OBJ_GFX_COOLTRAINER_M, MAP_OBJ_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE},
{MAP_OBJ_GFX_BEAUTY, MAP_OBJ_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
{MAP_OBJ_GFX_BATTLE_GIRL, MAP_OBJ_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
{MAP_OBJ_GFX_SWIMMER_F_LAND, MAP_OBJ_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE}
{OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_WOMAN_1, FACILITY_CLASS_SR_AND_JR, FEMALE, FEMALE},
{OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE},
{OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE},
{OBJECT_EVENT_GFX_OLD_MAN_1, OBJECT_EVENT_GFX_OLD_WOMAN, FACILITY_CLASS_OLD_COUPLE, MALE, FEMALE},
{OBJECT_EVENT_GFX_TUBER_M_2, OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO, MALE, FEMALE},
{OBJECT_EVENT_GFX_LITTLE_GIRL, OBJECT_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS_2, FEMALE, FEMALE},
{OBJECT_EVENT_GFX_COOLTRAINER_M, OBJECT_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE},
{OBJECT_EVENT_GFX_BEAUTY, OBJECT_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
{OBJECT_EVENT_GFX_BATTLE_GIRL, OBJECT_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
{OBJECT_EVENT_GFX_SWIMMER_F_LAND, OBJECT_EVENT_GFX_TUBER_M_2, FACILITY_CLASS_SIS_AND_BRO_2, FEMALE, MALE}
};
static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {
@@ -674,8 +674,8 @@ static void SetTrainerTowerNPCGraphics(void)
}
else
{
r1 = MAP_OBJ_GFX_YOUNGSTER;
r4_ = MAP_OBJ_GFX_YOUNGSTER;
r1 = OBJECT_EVENT_GFX_YOUNGSTER;
r4_ = OBJECT_EVENT_GFX_YOUNGSTER;
}
VarSet(VAR_OBJ_GFX_ID_0, r1);
VarSet(VAR_OBJ_GFX_ID_3, r4_);
@@ -692,7 +692,7 @@ static void SetTrainerTowerNPCGraphics(void)
if (r3 != NELEMS(sSingleBattleTrainerInfo))
r1 = sSingleBattleTrainerInfo[r3].mapObjGfx;
else
r1 = MAP_OBJ_GFX_YOUNGSTER;
r1 = OBJECT_EVENT_GFX_YOUNGSTER;
switch (r4)
{
case 0:
src/vs_seeker.c
+32 -32
View File
@@ -24,7 +24,7 @@
#include "unk_810c3a4.h"
#include "vs_seeker.h"
#include "constants/movement_commands.h"
#include "constants/map_objects.h"
#include "constants/object_events.h"
#include "constants/trainers.h"
#include "constants/maps.h"
@@ -56,10 +56,10 @@ struct VsSeekerTrainerInfo
struct VsSeekerStruct
{
/*0x000*/ struct VsSeekerTrainerInfo trainerInfo[MAP_OBJECTS_COUNT];
/*0x000*/ struct VsSeekerTrainerInfo trainerInfo[OBJECT_EVENTS_COUNT];
/*0x100*/ u8 filler_100[0x300];
/*0x400*/ u16 trainerIdxArray[MAP_OBJECTS_COUNT];
/*0x420*/ u8 runningBehaviourEtcArray[MAP_OBJECTS_COUNT];
/*0x400*/ u16 trainerIdxArray[OBJECT_EVENTS_COUNT];
/*0x420*/ u8 runningBehaviourEtcArray[OBJECT_EVENTS_COUNT];
/*0x430*/ u8 numRematchableTrainers;
/*0x431*/ u8 trainerHasNotYetBeenFought:1;
/*0x431*/ u8 trainerDoesNotWantRematch:1;
@@ -68,7 +68,7 @@ struct VsSeekerStruct
};
extern u16 gSpecialVar_LastTalked;
extern struct ObjectEvent gObjectEvents[MAP_OBJECTS_COUNT];
extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT];
extern u8 gSelectedObjectEvent;
// static declarations
@@ -591,7 +591,7 @@ static void sub_810C3B8(u8 taskId)
if (task->data[1] == 0)
{
for (i = 0; i < MAP_OBJECTS_COUNT; i++)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
if (sub_810CF04(i) == TRUE)
{
@@ -756,7 +756,7 @@ static void sub_810C594(void)
{
u8 i;
for (i = 0; i < MAP_OBJECTS_COUNT; i++)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
struct ObjectEvent * objectEvent = &gObjectEvents[i];
if (objectEvent->animPattern == 0x4D || objectEvent->animPattern == 0x4E || objectEvent->animPattern == 0x4F)
@@ -1414,32 +1414,32 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
{
switch (graphicsId)
{
case MAP_OBJ_GFX_LITTLE_GIRL:
case MAP_OBJ_GFX_YOUNGSTER:
case MAP_OBJ_GFX_BOY:
case MAP_OBJ_GFX_BUG_CATCHER:
case MAP_OBJ_GFX_LASS:
case MAP_OBJ_GFX_WOMAN_1:
case MAP_OBJ_GFX_BATTLE_GIRL:
case MAP_OBJ_GFX_MAN:
case MAP_OBJ_GFX_ROCKER:
case MAP_OBJ_GFX_WOMAN_2:
case MAP_OBJ_GFX_BEAUTY:
case MAP_OBJ_GFX_BALDING_MAN:
case MAP_OBJ_GFX_TUBER_F:
case MAP_OBJ_GFX_CAMPER:
case MAP_OBJ_GFX_PICNICKER:
case MAP_OBJ_GFX_COOLTRAINER_M:
case MAP_OBJ_GFX_COOLTRAINER_F:
case MAP_OBJ_GFX_SWIMMER_M_LAND:
case MAP_OBJ_GFX_SWIMMER_F_LAND:
case MAP_OBJ_GFX_BLACKBELT:
case MAP_OBJ_GFX_HIKER:
case MAP_OBJ_GFX_SAILOR:
case OBJECT_EVENT_GFX_LITTLE_GIRL:
case OBJECT_EVENT_GFX_YOUNGSTER:
case OBJECT_EVENT_GFX_BOY:
case OBJECT_EVENT_GFX_BUG_CATCHER:
case OBJECT_EVENT_GFX_LASS:
case OBJECT_EVENT_GFX_WOMAN_1:
case OBJECT_EVENT_GFX_BATTLE_GIRL:
case OBJECT_EVENT_GFX_MAN:
case OBJECT_EVENT_GFX_ROCKER:
case OBJECT_EVENT_GFX_WOMAN_2:
case OBJECT_EVENT_GFX_BEAUTY:
case OBJECT_EVENT_GFX_BALDING_MAN:
case OBJECT_EVENT_GFX_TUBER_F:
case OBJECT_EVENT_GFX_CAMPER:
case OBJECT_EVENT_GFX_PICNICKER:
case OBJECT_EVENT_GFX_COOLTRAINER_M:
case OBJECT_EVENT_GFX_COOLTRAINER_F:
case OBJECT_EVENT_GFX_SWIMMER_M_LAND:
case OBJECT_EVENT_GFX_SWIMMER_F_LAND:
case OBJECT_EVENT_GFX_BLACKBELT:
case OBJECT_EVENT_GFX_HIKER:
case OBJECT_EVENT_GFX_SAILOR:
return 0x4e;
case MAP_OBJ_GFX_TUBER_M_1:
case MAP_OBJ_GFX_SWIMMER_M_WATER:
case MAP_OBJ_GFX_SWIMMER_F_WATER:
case OBJECT_EVENT_GFX_TUBER_M_1:
case OBJECT_EVENT_GFX_SWIMMER_M_WATER:
case OBJECT_EVENT_GFX_SWIMMER_F_WATER:
return 0x4f;
default:
return 0x4d;