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

Merge branch 'master' into doc-sixisland

Browse Source
This commit is contained in:
GriffinR
2020-03-02 10:48:56 -05:00
committed by GitHub
parent 47f6e9f973 5198a05272
commit 6280a3786b
141 changed files with 2894 additions and 4342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_records.h
+1
View File
@@ -2,5 +2,6 @@
#define GUARD_BATTLE_RECORDS_H
void ClearPlayerLinkBattleRecords(void);
void TryRecordLinkBattleOutcome(s32 battlerId);
#endif // GUARD_BATTLE_RECORDS_H
include/cable_club.h
+2 -2
View File
@@ -9,7 +9,7 @@
// Exported ROM declarations
void sub_8081A90(u8 taskId);
u8 sub_8081150(void);
void sub_8081668(void);
u8 CreateTask_ReestablishLinkInCableClubRoom(void);
void CB2_ReturnFromCableClubBattle(void);
#endif //GUARD_CABLE_CLUB_H
include/constants/facility_trainer_classes.h
+4 -4
View File
@@ -133,10 +133,10 @@
#define FACILITY_CLASS_CRUSH_KIN 0x81
#define FACILITY_CLASS_SIS_AND_BRO_2 0x82
#define FACILITY_CLASS_PKMN_PROF 0x83
#define FACILITY_CLASS_PLAYER 0x84
#define FACILITY_CLASS_PLAYER_2 0x85
#define FACILITY_CLASS_PLAYER_3 0x86
#define FACILITY_CLASS_PLAYER_4 0x87
#define FACILITY_CLASS_BRENDAN 0x84
#define FACILITY_CLASS_MAY 0x85
#define FACILITY_CLASS_RED 0x86
#define FACILITY_CLASS_LEAF 0x87
#define FACILITY_CLASS_TEAM_ROCKET_2 0x88
#define FACILITY_CLASS_PSYCHIC_4 0x89
#define FACILITY_CLASS_CRUSH_GIRL 0x8A
include/constants/flags.h
+4 -1
View File
@@ -670,7 +670,7 @@
#define FLAG_SILPH_11F_DOOR 0x28D
#define FLAG_0x28E 0x28E
#define FLAG_0x28F 0x28F
#define FLAG_MET_STICKER_LADY 0x290
#define FLAG_MET_STICKER_MAN 0x290
#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291
#define FLAG_GOT_VS_SEEKER 0x292
#define FLAG_GOT_TM19_FROM_ERIKA 0x293
@@ -1327,6 +1327,7 @@
#define FLAG_0x808 (SYS_FLAGS + 0x8)
#define PERMA_SYS_FLAGS_START 0x820
#define FLAG_BADGE01_GET (SYS_FLAGS + 0x20)
#define FLAG_BADGE02_GET (SYS_FLAGS + 0x21)
#define FLAG_BADGE03_GET (SYS_FLAGS + 0x22)
@@ -1335,6 +1336,8 @@
#define FLAG_BADGE06_GET (SYS_FLAGS + 0x25)
#define FLAG_BADGE07_GET (SYS_FLAGS + 0x26)
#define FLAG_BADGE08_GET (SYS_FLAGS + 0x27)
#define NUM_BADGES (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET)
#define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28)
#define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29)
#define FLAG_0x82A (SYS_FLAGS + 0x2A)
include/constants/metatile_labels.h
+4
View File
@@ -190,6 +190,10 @@
#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311
#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312
// gTileset_SeviiIslands45
#define METATILE_SeviiIslands45_RocketWarehouseDoor_Locked 0x30B
#define METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked 0x2AF
// gTileset_SeviiIslands67
#define METATILE_SeviiIslands67_DottedHoleDoor_Closed 0x357
#define METATILE_SeviiIslands67_DottedHoleDoor_Open 0x358
include/constants/trainer_card.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef GUARD_CONSTANTS_TRAINER_CARD_H
#define GUARD_CONSTANTS_TRAINER_CARD_H
#define TRAINER_CARD_PROFILE_LENGTH 4
#define TRAINER_CARD_STICKER_TYPES 3
#define CARD_TYPE_FRLG 0
#define CARD_TYPE_RSE 1
#define MON_ICON_TINT_NORMAL 0
#define MON_ICON_TINT_BLACK 1
#define MON_ICON_TINT_PINK 2
#define MON_ICON_TINT_SEPIA 3
#define NUM_LINK_TRAINER_CARD_CLASSES 8
#endif // GUARD_CONSTANTS_TRAINER_CARD_H
include/event_scripts.h
+6
View File
@@ -1204,4 +1204,10 @@ extern const u8 EventScript_BagItemCanBeRegistered[];
// fldeff_cut
extern const u8 EventScript_FldEffCut[];
// cable_club
extern const u8 CableClub_Text_WhenAllPlayersReadyAConfirmBCancel[];
extern const u8 CableClub_Text_AwaitingLinkupBCancel[];
extern const u8 CableClub_Text_StartLinkWithXPlayersAConfirmBCancel[];
extern const u8 CableClub_Text_PleaseWaitBCancel[];
#endif //GUARD_EVENT_SCRIPTS_H
include/field_message_box.h
+1
View File
@@ -8,5 +8,6 @@ bool8 sub_8098238(const u8 *message);
bool8 ShowFieldAutoScrollMessage(const u8 *message);
void HideFieldMessageBox(void);
bool8 IsFieldMessageBoxHidden(void);
bool8 textbox_any_visible(void);
#endif // GUARD_FIELD_MESSAGE_BOX_H
include/graphics.h
+4 -4
View File
@@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[];
extern const u16 gUnknown_8D2FBB4[];
// trainer card
extern const u16 gFireRedTrainerCard_Pal[];
extern const u32 gFireRedTrainerCard_Gfx[];
extern const u16 gEmeraldTrainerCard_Pal[];
extern const u32 gEmeraldTrainerCard_Gfx[];
extern const u16 gKantoTrainerCard_Pal[];
extern const u32 gKantoTrainerCard_Gfx[];
extern const u16 gHoennTrainerCard_Pal[];
extern const u32 gHoennTrainerCard_Gfx[];
// battle_interface
extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
include/link.h
+11 -1
View File
@@ -77,6 +77,10 @@
#define LINKTYPE_BATTLE_TOWER_50 0x2266
#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277
#define LINKTYPE_BATTLE_TOWER 0x2288
#define LINKTYPE_0x3311 0x3311
#define LINKTYPE_0x3322 0x3322
#define LINKTYPE_0x4411 0x4411
#define LINKTYPE_0x6601 0x6601
#define MASTER_HANDSHAKE 0x8FFF
#define SLAVE_HANDSHAKE 0xB9A0
@@ -199,6 +203,7 @@ extern u16 word_3002910[];
extern bool8 gReceivedRemoteLinkPlayers;
extern bool8 gLinkVSyncDisabled;
extern u8 gWirelessCommType;
extern struct LinkPlayer gLocalLinkPlayer;
extern u8 gShouldAdvanceLinkState;
extern u16 gLinkPartnersHeldKeys[6];
@@ -272,12 +277,17 @@ void ClearLinkCallback_2(void);
void LinkRfu_SetRfuFuncToSend6600(void);
void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
bool8 IsWirelessAdapterConnected(void);
bool8 sub_800A474(u8 a0);
bool8 sub_800A474(u8 blockRequestType);
void LinkVSync(void);
bool8 HandleLinkConnection(void);
void PrepareLocalLinkPlayerBlock(void);
void LinkPlayerFromBlock(u32 who);
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06);
u8 sub_800A8D4(void);
void sub_800AA24(void);
void sub_800A900(u8 a0);
u8 sub_800A8A4(void);
void sub_800A9A4(void);
void SetLocalLinkPlayerId(u8 playerId);
#endif // GUARD_LINK_H
include/overworld.h
+6
View File
@@ -177,6 +177,12 @@ void sub_805546C(u8 a0);
bool32 sub_80582E0(void);
bool32 sub_8058274(void);
u8 GetCurrentMapBattleScene(void);
void sub_8055DB8(void);
void sub_8057F5C(void);
void sub_8057F34(void);
u32 sub_8057EC0(void);
void sub_8057F70(void);
void sub_8057F48(void);
extern u16 gHeldKeyCodeToSend;
include/quest_log.h
+1
View File
@@ -50,5 +50,6 @@ void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void sub_8110840(void *oldSave);
void sub_8112F18(u8 windowId);
bool8 sub_8111C2C(void);
void Special_UpdateTrainerFansAfterLinkBattle(void);
#endif //GUARD_QUEST_LOG_H
include/strings.h
+7
View File
@@ -1141,4 +1141,11 @@ extern const u8 gText_BestScore2[];
extern const u8 gText_ExcellentsInARow[];
extern const u8 gText_PkmnJumpRecords[];
// cable_club
extern const u8 gUnknown_841DF82[];
extern const u8 gUnknown_841DF8B[];
extern const u8 gUnknown_841DF92[];
extern const u8 gUnknown_841DF99[];
extern const u8 gUnknown_841DFA0[];
#endif //GUARD_STRINGS_H
include/trainer_card.h
+15 -8
View File
@@ -1,7 +1,9 @@
#ifndef GUARD_TRAINER_CARD_H
#define GUARD_TRAINER_CARD_H
struct TrainerCard
#include "constants/trainer_card.h"
struct TrainerCardRSE
{
/*0x00*/ u8 gender;
/*0x01*/ u8 stars;
@@ -23,19 +25,24 @@ struct TrainerCard
/*0x1E*/ u16 pokeblocksWithFriends;
/*0x20*/ u16 pokemonTrades;
/*0x24*/ u32 money;
/*0x28*/ u16 var_28[4];
/*0x28*/ u16 easyChatProfile[TRAINER_CARD_PROFILE_LENGTH];
/*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
};
struct TrainerCard
{
/*0x00*/ struct TrainerCardRSE rse;
/*0x38*/ u8 version;
/*0x3A*/ u16 var_3A;
/*0x3A*/ bool16 hasAllFrontierSymbols;
/*0x3C*/ u32 berryCrushPoints;
/*0x40*/ u32 unionRoomNum;
/*0x44*/ u32 berriesPicked;
/*0x48*/ u32 jumpsInRow;
/*0x4C*/ bool8 var_4C;
/*0x48*/ u32 jumpsInRow;
/*0x4C*/ bool8 shouldDrawStickers;
/*0x4D*/ bool8 hasAllMons;
/*0x4E*/ u8 var_4E;
/*0x4F*/ u8 var_4F;
/*0x50*/ u8 var_50[4];
/*0x4E*/ u8 monIconTint;
/*0x4F*/ u8 facilityClass;
/*0x50*/ u8 stickers[TRAINER_CARD_STICKER_TYPES];
/*0x54*/ u16 monSpecies[PARTY_SIZE];
};
include/trainer_pokemon_sprites.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
bool16 ResetAllPicSprites(void);
u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
include/union_room.h
+1
View File
@@ -163,5 +163,6 @@ extern u16 gUnionRoomOfferedSpecies;
extern u8 gUnionRoomRequestedMonType;
void StartUnionRoomBattle(u16 battleFlags);
u8 UnionRoom_CreateTask_CallCB2ReturnFromLinkTrade(void);
#endif //GUARD_UNION_ROOM_H