Merge branch 'master' into document-eventscripts
This commit is contained in:
GriffinR
19
include/constants/contest.h
Normal file
19
include/constants/contest.h
Normal file
@@ -0,0 +1,19 @@
|
||||
#ifndef GUARD_CONSTANTS_CONTEST_H
|
||||
#define GUARD_CONSTANTS_CONTEST_H
|
||||
|
||||
#define CONTESTANT_COUNT 4
|
||||
#define APPLAUSE_METER_SIZE 5
|
||||
#define CONTEST_TURN_COUNT 5
|
||||
|
||||
#define LINK_CONTEST_FLAG_IS_LINK (1 << 0)
|
||||
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
|
||||
#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
|
||||
|
||||
#define CONTEST_CATEGORY_COOL 0
|
||||
#define CONTEST_CATEGORY_BEAUTY 1
|
||||
#define CONTEST_CATEGORY_CUTE 2
|
||||
#define CONTEST_CATEGORY_SMART 3
|
||||
#define CONTEST_CATEGORY_TOUGH 4
|
||||
#define CONTEST_CATEGORIES_COUNT 5
|
||||
|
||||
#endif // GUARD_CONSTANTS_CONTEST_H
|
||||
@@ -50,6 +50,8 @@
|
||||
#define PYRAMID_BAG_ITEMS_COUNT 10
|
||||
#define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode.
|
||||
|
||||
#define TRAINER_ID_LENGTH 4
|
||||
|
||||
// string lengths
|
||||
#define ITEM_NAME_LENGTH 14
|
||||
#define POKEMON_NAME_LENGTH 10
|
||||
@@ -74,4 +76,14 @@
|
||||
#define OPTIONS_BATTLE_STYLE_SHIFT 0
|
||||
#define OPTIONS_BATTLE_STYLE_SET 1
|
||||
|
||||
#define DIR_NONE 0
|
||||
#define DIR_SOUTH 1
|
||||
#define DIR_NORTH 2
|
||||
#define DIR_WEST 3
|
||||
#define DIR_EAST 4
|
||||
#define DIR_SOUTHWEST 5
|
||||
#define DIR_SOUTHEAST 6
|
||||
#define DIR_NORTHWEST 7
|
||||
#define DIR_NORTHEAST 8
|
||||
|
||||
#endif // GUARD_CONSTANTS_GLOBAL_H
|
||||
|
||||
26
include/constants/lilycove_lady.h
Normal file
26
include/constants/lilycove_lady.h
Normal file
@@ -0,0 +1,26 @@
|
||||
#ifndef GUARD_LILYCOVE_LADY_CONSTANTS_H
|
||||
#define GUARD_LILYCOVE_LADY_CONSTANTS_H
|
||||
|
||||
#define LILYCOVE_LADY_QUIZ 0
|
||||
#define LILYCOVE_LADY_FAVOR 1
|
||||
#define LILYCOVE_LADY_CONTEST 2
|
||||
#define LILYCOVE_LADY_COUNT 3
|
||||
|
||||
#define LILYCOVE_LADY_STATE_READY 0
|
||||
#define LILYCOVE_LADY_STATE_COMPLETED 1
|
||||
#define LILYCOVE_LADY_STATE_PRIZE 2
|
||||
|
||||
#define LILYCOVE_LADY_GIFT_THRESHOLD 5
|
||||
|
||||
#define QUIZ_AUTHOR_PLAYER 0
|
||||
#define QUIZ_AUTHOR_OTHER_PLAYER 1
|
||||
#define QUIZ_AUTHOR_LADY 2
|
||||
|
||||
// Would be redundant with the above set if GF hadn't mixed the order
|
||||
#define QUIZ_AUTHOR_NAME_LADY 0
|
||||
#define QUIZ_AUTHOR_NAME_PLAYER 1
|
||||
#define QUIZ_AUTHOR_NAME_OTHER_PLAYER 2
|
||||
|
||||
#define QUIZ_QUESTION_LEN 9
|
||||
|
||||
#endif
|
||||
@@ -398,67 +398,67 @@
|
||||
#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8))
|
||||
|
||||
// Map Group 25
|
||||
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
|
||||
#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8))
|
||||
#define MAP_TRADE_CENTER (25 | (25 << 8))
|
||||
#define MAP_RECORD_CORNER (26 | (25 << 8))
|
||||
#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8))
|
||||
#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8))
|
||||
#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8))
|
||||
#define MAP_UNION_ROOM (60 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
|
||||
#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
|
||||
#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8))
|
||||
#define MAP_TRADE_CENTER (25 | (25 << 8))
|
||||
#define MAP_RECORD_CORNER (26 | (25 << 8))
|
||||
#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
|
||||
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8))
|
||||
#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8))
|
||||
#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
|
||||
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8))
|
||||
#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8))
|
||||
#define MAP_UNION_ROOM (60 | (25 << 8))
|
||||
|
||||
// Map Group 26
|
||||
#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))
|
||||
|
||||
@@ -2,10 +2,7 @@
|
||||
#define GUARD_CONTEST_H
|
||||
|
||||
#include "palette.h"
|
||||
|
||||
#define CONTESTANT_COUNT 4
|
||||
#define APPLAUSE_METER_SIZE 5
|
||||
#define CONTEST_TURN_COUNT 5
|
||||
#include "constants/contest.h"
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -18,20 +15,6 @@ enum
|
||||
CONTEST_DEBUG_MODE_PRINT_UNK_D
|
||||
};
|
||||
|
||||
#define LINK_CONTEST_FLAG_IS_LINK (1 << 0)
|
||||
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
|
||||
#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
|
||||
|
||||
enum
|
||||
{
|
||||
CONTEST_CATEGORY_COOL,
|
||||
CONTEST_CATEGORY_BEAUTY,
|
||||
CONTEST_CATEGORY_CUTE,
|
||||
CONTEST_CATEGORY_SMART,
|
||||
CONTEST_CATEGORY_TOUGH,
|
||||
CONTEST_CATEGORIES_COUNT,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
CONTEST_EFFECT_HIGHLY_APPEALING,
|
||||
|
||||
@@ -7,6 +7,6 @@
|
||||
extern EWRAM_DATA bool8 gHasHallOfFameRecords;
|
||||
|
||||
// Exported ROM declarations
|
||||
void sub_8175620(void);
|
||||
void CB2_StartCreditsSequence(void);
|
||||
|
||||
#endif // GUARD_CREDITS_H
|
||||
|
||||
@@ -68,6 +68,10 @@ struct OamData
|
||||
/*0x06*/ u16 affineParam;
|
||||
};
|
||||
|
||||
#define ST_OAM_HFLIP 0x08
|
||||
#define ST_OAM_VFLIP 0x10
|
||||
#define ST_OAM_MNUM_FLIP_MASK 0x18
|
||||
|
||||
#define ST_OAM_OBJ_NORMAL 0
|
||||
#define ST_OAM_OBJ_BLEND 1
|
||||
#define ST_OAM_OBJ_WINDOW 2
|
||||
|
||||
@@ -265,19 +265,6 @@ enum
|
||||
ACRO_BIKE_STATE6,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
DIR_NONE,
|
||||
DIR_SOUTH,
|
||||
DIR_NORTH,
|
||||
DIR_WEST,
|
||||
DIR_EAST,
|
||||
DIR_SOUTHWEST,
|
||||
DIR_SOUTHEAST,
|
||||
DIR_NORTHWEST,
|
||||
DIR_NORTHEAST,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
COLLISION_LEDGE_JUMP = 6
|
||||
|
||||
@@ -224,7 +224,7 @@ struct Apprentice
|
||||
u8 number;
|
||||
struct ApprenticeMon party[3];
|
||||
u16 easyChatWords[6];
|
||||
u8 playerId[4];
|
||||
u8 playerId[TRAINER_ID_LENGTH];
|
||||
u8 playerName[PLAYER_NAME_LENGTH];
|
||||
u8 language;
|
||||
u32 checksum;
|
||||
@@ -263,7 +263,7 @@ struct EmeraldBattleTowerRecord
|
||||
/*0x01*/ u8 facilityClass;
|
||||
/*0x02*/ u16 winStreak;
|
||||
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x0C*/ u8 trainerId[4];
|
||||
/*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
|
||||
/*0x10*/ u16 greeting[6];
|
||||
/*0x1C*/ u16 speechWon[6];
|
||||
/*0x28*/ u16 speechLost[6];
|
||||
@@ -278,7 +278,7 @@ struct BattleTowerEReaderTrainer
|
||||
/*0x01*/ u8 facilityClass;
|
||||
/*0x02*/ u16 winStreak;
|
||||
/*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x0C*/ u8 trainerId[4];
|
||||
/*0x0C*/ u8 trainerId[TRAINER_ID_LENGTH];
|
||||
/*0x10*/ u16 greeting[6];
|
||||
/*0x1C*/ u16 farewellPlayerLost[6];
|
||||
/*0x28*/ u16 farewellPlayerWon[6];
|
||||
@@ -425,7 +425,7 @@ struct PlayersApprentice
|
||||
|
||||
struct RankingHall1P
|
||||
{
|
||||
u8 id[4];
|
||||
u8 id[TRAINER_ID_LENGTH];
|
||||
u16 winStreak;
|
||||
u8 name[PLAYER_NAME_LENGTH + 1];
|
||||
u8 language;
|
||||
@@ -433,8 +433,8 @@ struct RankingHall1P
|
||||
|
||||
struct RankingHall2P
|
||||
{
|
||||
u8 id1[4];
|
||||
u8 id2[4];
|
||||
u8 id1[TRAINER_ID_LENGTH];
|
||||
u8 id2[TRAINER_ID_LENGTH];
|
||||
u16 winStreak;
|
||||
u8 name1[PLAYER_NAME_LENGTH + 1];
|
||||
u8 name2[PLAYER_NAME_LENGTH + 1];
|
||||
@@ -446,7 +446,7 @@ struct SaveBlock2
|
||||
/*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x08*/ u8 playerGender; // MALE, FEMALE
|
||||
/*0x09*/ u8 specialSaveWarpFlags;
|
||||
/*0x0A*/ u8 playerTrainerId[4];
|
||||
/*0x0A*/ u8 playerTrainerId[TRAINER_ID_LENGTH];
|
||||
/*0x0E*/ u16 playTimeHours;
|
||||
/*0x10*/ u8 playTimeMinutes;
|
||||
/*0x11*/ u8 playTimeSeconds;
|
||||
@@ -495,7 +495,7 @@ struct SecretBase
|
||||
/*0x1A9D*/ u8 battledOwnerToday:1;
|
||||
/*0x1A9D*/ u8 registryStatus:2;
|
||||
/*0x1A9E*/ u8 trainerName[PLAYER_NAME_LENGTH];
|
||||
/*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
|
||||
/*0x1AA5*/ u8 trainerId[TRAINER_ID_LENGTH]; // byte 0 is used for determining trainer class
|
||||
/*0x1AA9*/ u8 language;
|
||||
/*0x1AAA*/ u16 numSecretBasesReceived;
|
||||
/*0x1AAC*/ u8 numTimesEntered;
|
||||
@@ -581,7 +581,7 @@ struct MailStruct
|
||||
{
|
||||
/*0x00*/ u16 words[MAIL_WORDS_COUNT];
|
||||
/*0x12*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x1A*/ u8 trainerId[4];
|
||||
/*0x1A*/ u8 trainerId[TRAINER_ID_LENGTH];
|
||||
/*0x1E*/ u16 species;
|
||||
/*0x20*/ u16 itemId;
|
||||
};
|
||||
@@ -598,7 +598,7 @@ struct MauvilleManBard
|
||||
/*0x0E*/ u16 temporaryLyrics[6];
|
||||
/*0x1A*/ u8 playerName[8];
|
||||
/*0x22*/ u8 filler_2DB6[0x3];
|
||||
/*0x25*/ u8 playerTrainerId[4];
|
||||
/*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH];
|
||||
/*0x29*/ bool8 hasChangedSong;
|
||||
/*0x2A*/ u8 language;
|
||||
}; /*size = 0x2C*/
|
||||
@@ -737,50 +737,43 @@ struct RecordMixingDayCareMail
|
||||
bool16 holdsItem[DAYCARE_MON_COUNT];
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
LILYCOVE_LADY_QUIZ,
|
||||
LILYCOVE_LADY_FAVOUR,
|
||||
LILYCOVE_LADY_CONTEST
|
||||
};
|
||||
|
||||
struct LilycoveLadyQuiz
|
||||
{
|
||||
/*0x000*/ u8 id;
|
||||
/*0x001*/ u8 phase;
|
||||
/*0x002*/ u16 unk_002[9];
|
||||
/*0x014*/ u16 unk_014;
|
||||
/*0x016*/ u16 unk_016;
|
||||
/*0x001*/ u8 state;
|
||||
/*0x002*/ u16 question[9];
|
||||
/*0x014*/ u16 correctAnswer;
|
||||
/*0x016*/ u16 playerAnswer;
|
||||
/*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x020*/ u16 playerTrainerId[4];
|
||||
/*0x028*/ u16 itemId;
|
||||
/*0x02a*/ u8 unk_02a;
|
||||
/*0x02b*/ u8 unk_02b;
|
||||
/*0x02c*/ u8 unk_02c;
|
||||
/*0x020*/ u16 playerTrainerId[TRAINER_ID_LENGTH];
|
||||
/*0x028*/ u16 prize;
|
||||
/*0x02a*/ bool8 waitingForChallenger;
|
||||
/*0x02b*/ u8 questionId;
|
||||
/*0x02c*/ u8 prevQuestionId;
|
||||
/*0x02d*/ u8 language;
|
||||
};
|
||||
|
||||
struct LilycoveLadyFavour
|
||||
struct LilycoveLadyFavor
|
||||
{
|
||||
/*0x000*/ u8 id;
|
||||
/*0x001*/ u8 phase;
|
||||
/*0x002*/ u8 unk_002;
|
||||
/*0x003*/ u8 unk_003;
|
||||
/*0x001*/ u8 state;
|
||||
/*0x002*/ bool8 likedItem;
|
||||
/*0x003*/ u8 numItemsGiven;
|
||||
/*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x00c*/ u8 unk_00c;
|
||||
/*0x00c*/ u8 favorId;
|
||||
/*0x00e*/ u16 itemId;
|
||||
/*0x010*/ u16 unk_010;
|
||||
/*0x010*/ u16 bestItem;
|
||||
/*0x012*/ u8 language;
|
||||
};
|
||||
|
||||
struct LilycoveLadyContest
|
||||
{
|
||||
/*0x000*/ u8 id;
|
||||
/*0x001*/ u8 phase;
|
||||
/*0x002*/ u8 fave_pkblk;
|
||||
/*0x003*/ u8 other_pkblk;
|
||||
/*0x001*/ bool8 givenPokeblock;
|
||||
/*0x002*/ u8 numGoodPokeblocksGiven;
|
||||
/*0x003*/ u8 numOtherPokeblocksGiven;
|
||||
/*0x004*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
|
||||
/*0x00c*/ u8 max_sheen;
|
||||
/*0x00c*/ u8 maxSheen;
|
||||
/*0x00d*/ u8 category;
|
||||
/*0x00e*/ u8 language;
|
||||
};
|
||||
@@ -788,7 +781,7 @@ struct LilycoveLadyContest
|
||||
typedef union // 3b58
|
||||
{
|
||||
struct LilycoveLadyQuiz quiz;
|
||||
struct LilycoveLadyFavour favour;
|
||||
struct LilycoveLadyFavor favor;
|
||||
struct LilycoveLadyContest contest;
|
||||
u8 id;
|
||||
u8 pad[0x40];
|
||||
|
||||
@@ -69,8 +69,8 @@ extern u16 gSpecialVar_ItemId;
|
||||
|
||||
// Exported ROM declarations
|
||||
void sub_81AAC14(void);
|
||||
void sub_81AAC50(void);
|
||||
void sub_81AAC70(void);
|
||||
void FavorLadyOpenBagMenu(void);
|
||||
void QuizLadyOpenBagMenu(void);
|
||||
void sub_81AAC28(void);
|
||||
void sub_81AABB0(void);
|
||||
void SetInitialScrollAndCursorPositions(u8 pocketId);
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
#define GUARD_LILYCOVE_LADY_H
|
||||
|
||||
u8 GetLilycoveLadyId(void);
|
||||
void SetLilycoveLady(void);
|
||||
void sub_818DA78(void);
|
||||
void sub_818DEF4(void);
|
||||
void sub_818E564(void);
|
||||
void sub_818E570(const LilycoveLady *lilycoveLady);
|
||||
void InitLilycoveLady(void);
|
||||
void ResetLilycoveLadyForRecordMix(void);
|
||||
void FieldCallback_FavorLadyEnableScriptContexts(void);
|
||||
void FieldCallback_QuizLadyEnableScriptContexts(void);
|
||||
void QuizLadyClearQuestionForRecordMix(const LilycoveLady *lilycoveLady);
|
||||
bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
|
||||
void sub_818E7E0(u8 *dest1, u8 *dest2);
|
||||
void sub_818E81C(u8 *dest);
|
||||
void sub_818E848(u8 *dest);
|
||||
void sub_818E868(u8 *dest, u8 category);
|
||||
void BufferContestLadyMonName(u8 *dest1, u8 *dest2);
|
||||
void BufferContestLadyPlayerName(u8 *dest);
|
||||
void BufferContestLadyLanguage(u8 *dest);
|
||||
void BufferContestName(u8 *dest, u8 category);
|
||||
u8 sub_818E880(void);
|
||||
|
||||
#endif //GUARD_LILYCOVE_LADY_H
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
extern u8 gUnusedPokedexU8;
|
||||
extern void (*gUnknown_030060B4)(void);
|
||||
|
||||
#define KANTO_DEX_COUNT 151
|
||||
#define HOENN_DEX_COUNT 202
|
||||
#define NATIONAL_DEX_COUNT 386
|
||||
|
||||
@@ -43,7 +44,7 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
|
||||
u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
|
||||
bool16 HasAllHoennMons(void);
|
||||
void ResetPokedexScrollPositions(void);
|
||||
u16 sub_80C0944(void);
|
||||
bool16 HasAllMons(void);
|
||||
void CB2_Pokedex(void);
|
||||
|
||||
#endif // GUARD_POKEDEX_H
|
||||
|
||||
@@ -506,7 +506,7 @@ u8 CalculatePlayerPartyCount(void);
|
||||
u8 CalculateEnemyPartyCount(void);
|
||||
u8 GetMonsStateToDoubles(void);
|
||||
u8 GetMonsStateToDoubles_2(void);
|
||||
u8 GetAbilityBySpecies(u16 species, bool8 abilityNum);
|
||||
u8 GetAbilityBySpecies(u16 species, u8 abilityNum);
|
||||
u8 GetMonAbility(struct Pokemon *mon);
|
||||
void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord);
|
||||
u8 GetSecretBaseTrainerPicIndex(void);
|
||||
|
||||
@@ -56,6 +56,32 @@ enum
|
||||
POKENAV_MENU_E,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
MC_HEADER_MR_STONE,
|
||||
MC_HEADER_PROF_BIRCH,
|
||||
MC_HEADER_BRENDAN,
|
||||
MC_HEADER_MAY,
|
||||
MC_HEADER_WALLY,
|
||||
MC_HEADER_NORMAN,
|
||||
MC_HEADER_MOM,
|
||||
MC_HEADER_STEVEN,
|
||||
MC_HEADER_SCOTT,
|
||||
MC_HEADER_ROXANNE,
|
||||
MC_HEADER_BRAWLY,
|
||||
MC_HEADER_WATTSON,
|
||||
MC_HEADER_FLANNERY,
|
||||
MC_HEADER_WINONA,
|
||||
MC_HEADER_TATE_LIZA,
|
||||
MC_HEADER_JUAN,
|
||||
MC_HEADER_SIDNEY,
|
||||
MC_HEADER_PHOEBE,
|
||||
MC_HEADER_GLACIA,
|
||||
MC_HEADER_DRAKE,
|
||||
MC_HEADER_WALLACE,
|
||||
MC_HEADER_COUNT
|
||||
};
|
||||
|
||||
// pokenav.c
|
||||
void sub_81C7694(u32);
|
||||
u32 sub_81C76AC(void);
|
||||
@@ -109,15 +135,15 @@ bool32 sub_81C81D4(const struct BgTemplate *arg0, struct MatchCallListTemplate *
|
||||
void sub_81C8234(void);
|
||||
|
||||
// pokenav_match_call_data.c
|
||||
bool32 sub_81D17E8(u32 idx);
|
||||
bool32 MatchCall_HasCheckPage(u32 idx);
|
||||
u8 MatchCallMapSecGetByIndex(u32 idx);
|
||||
bool32 sub_81D1BF8(u32 idx);
|
||||
bool32 MatchCallFlagGetByIndex(u32 idx);
|
||||
u32 MatchCall_GetRematchTableIdx(u32 idx);
|
||||
u32 GetTrainerIdxByRematchIdx(u32 rematchIdx);
|
||||
int sub_81D1BD0(u32 idx);
|
||||
int MatchCall_GetOverrideFacilityClass(u32 idx);
|
||||
void MatchCall_GetMessage(u32 idx, u8 *dest);
|
||||
const u8 *sub_81D1B40(u32 idx, u32 offset);
|
||||
const u8 *MatchCall_GetOverrideFlavorText(u32 idx, u32 offset);
|
||||
void sub_81D1A78(u32 idx, const u8 **desc, const u8 **name);
|
||||
|
||||
// pokenav_main_menu.c
|
||||
|
||||
@@ -2744,6 +2744,31 @@ extern const u8 gText_JumpsInARow[];
|
||||
extern const u8 gText_BestScore2[];
|
||||
extern const u8 gText_ExcellentsInARow[];
|
||||
|
||||
// Lilycove Lady
|
||||
extern const u8 gText_ContestLady_Handsome[];
|
||||
extern const u8 gText_ContestLady_Vinny[];
|
||||
extern const u8 gText_ContestLady_Moreme[];
|
||||
extern const u8 gText_ContestLady_Ironhard[];
|
||||
extern const u8 gText_ContestLady_Muscle[];
|
||||
extern const u8 gText_ContestLady_Coolness[];
|
||||
extern const u8 gText_ContestLady_Beauty[];
|
||||
extern const u8 gText_ContestLady_Cuteness[];
|
||||
extern const u8 gText_ContestLady_Smartness[];
|
||||
extern const u8 gText_ContestLady_Toughness[];
|
||||
extern const u8 gText_QuizLady_Lady[];
|
||||
extern const u8 gText_FavorLady_Slippery[];
|
||||
extern const u8 gText_FavorLady_Roundish[];
|
||||
extern const u8 gText_FavorLady_Whamish[];
|
||||
extern const u8 gText_FavorLady_Shiny[];
|
||||
extern const u8 gText_FavorLady_Sticky[];
|
||||
extern const u8 gText_FavorLady_Pointy[];
|
||||
|
||||
extern const u8 gText_CoolnessContest[];
|
||||
extern const u8 gText_BeautyContest[];
|
||||
extern const u8 gText_CutenessContest[];
|
||||
extern const u8 gText_SmartnessContest[];
|
||||
extern const u8 gText_ToughnessContest[];
|
||||
|
||||
// Pokenav Match Call
|
||||
extern const u8 gText_CallCantBeMadeHere[];
|
||||
extern const u8 gText_NumberRegistered[];
|
||||
|
||||
Reference in New Issue
Block a user