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

Sync Cable Club scripts

Browse Source
This commit is contained in:
GriffinR
2020-01-10 16:55:58 -05:00
parent a537577671
commit 0bb7f18b8e
120 changed files with 1142 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/layouts.h
+5 -5
View File
@@ -36,10 +36,10 @@
#define LAYOUT_CINNABAR_ISLAND_GYM 36
#define LAYOUT_VIRIDIAN_CITY_GYM 37
#define LAYOUT_UNUSED_LAYOUT_82D88C8 46
#define LAYOUT_UNKNOWN_MAP_00_00 47
#define LAYOUT_UNKNOWN_MAP_00_01 48
#define LAYOUT_UNKNOWN_MAP_00_02 49
#define LAYOUT_UNKNOWN_MAP_00_03 50
#define LAYOUT_BATTLE_COLOSSEUM_2P 47
#define LAYOUT_TRADE_CENTER 48
#define LAYOUT_RECORD_CENTER 49
#define LAYOUT_BATTLE_COLOSSEUM_4P 50
#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
#define LAYOUT_UNUSED_LAYOUT_82D9B24 52
#define LAYOUT_UNUSED_LAYOUT_82DA7C8 53
@@ -244,7 +244,7 @@
#define LAYOUT_UNUSED_LAYOUT_83377F0 259
#define LAYOUT_UNUSED_LAYOUT_8338354 260
#define LAYOUT_UNUSED_LAYOUT_8338738 261
#define LAYOUT_UNKNOWN_MAP_00_04 262
#define LAYOUT_UNION_ROOM 262
#define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263
#define LAYOUT_UNUSED_LAYOUT_8338B4C 264
#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265
include/constants/map_groups.h
+5 -5
View File
@@ -2,11 +2,11 @@
#define GUARD_CONSTANTS_MAP_GROUPS_H
// Map Group 0
#define MAP_UNKNOWN_MAP_00_00 (0 | (0 << 8))
#define MAP_UNKNOWN_MAP_00_01 (1 | (0 << 8))
#define MAP_UNKNOWN_MAP_00_02 (2 | (0 << 8))
#define MAP_UNKNOWN_MAP_00_03 (3 | (0 << 8))
#define MAP_UNKNOWN_MAP_00_04 (4 | (0 << 8))
#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
#define MAP_TRADE_CENTER (1 | (0 << 8))
#define MAP_RECORD_CENTER (2 | (0 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
#define MAP_UNION_ROOM (4 | (0 << 8))
// Map Group 1
#define MAP_VIRIDIAN_FOREST (0 | (1 << 8))
include/constants/pokemon.h
+4
View File
@@ -87,4 +87,8 @@
#define MON_ALREADY_KNOWS_MOVE 0xFFFE
#define MON_HAS_MAX_MOVES 0xFFFF
#define PLAYER_HAS_TWO_USABLE_MONS 0x0
#define PLAYER_HAS_ONE_MON 0x1
#define PLAYER_HAS_ONE_USABLE_MON 0x2
#endif // GUARD_CONSTANTS_POKEMON_H
include/constants/union_room.h
+28
View File
@@ -0,0 +1,28 @@
#ifndef GUARD_CONSTANTS_UNION_ROOM_H
#define GUARD_CONSTANTS_UNION_ROOM_H
#define LINK_GROUP_SINGLE_BATTLE 0
#define LINK_GROUP_DOUBLE_BATTLE 1
#define LINK_GROUP_MULTI_BATTLE 2
#define LINK_GROUP_TRADE 3
#define LINK_GROUP_POKEMON_JUMP 4
#define LINK_GROUP_BERRY_CRUSH 5
#define LINK_GROUP_BERRY_PICKING 6
#define LINK_GROUP_WONDER_CARD 7
#define LINK_GROUP_WONDER_NEWS 8
#define LINK_GROUP_UNK_9 9
#define LINK_GROUP_UNK_10 10
#define LINK_GROUP_UNK_11 11
#define LINK_GROUP_RECORD_CORNER 12
#define LINK_GROUP_BERRY_BLENDER 13
#define LINK_GROUP_UNK_14 14
#define LINK_GROUP_COOL_CONTEST 15
#define LINK_GROUP_BEAUTY_CONTEST 16
#define LINK_GROUP_CUTE_CONTEST 17
#define LINK_GROUP_SMART_CONTEST 18
#define LINK_GROUP_TOUGH_CONTEST 19
#define LINK_GROUP_BATTLE_TOWER 20
#define LINK_GROUP_BATTLE_TOWER_OPEN 21
#define NUM_LINK_GROUP_TYPES 22
#endif //GUARD_CONSTANTS_UNION_ROOM_H
include/event_scripts.h
+6 -6
View File
@@ -1178,12 +1178,12 @@ extern const u8 gText_DifferentGameFile[];
// script_menu
extern const u8 EventScript_1A7AE0[];
extern const u8 Text_1BC388[];
extern const u8 Text_1BC3C7[];
extern const u8 Text_1BCB42[];
extern const u8 Text_1BCA95[];
extern const u8 Text_1BCACB[];
extern const u8 Text_1BCAF2[];
extern const u8 CableClub_Text_TradeMonsUsingLinkCable[];
extern const u8 CableClub_Text_BattleUsingLinkCable[];
extern const u8 CableClub_Text_CancelSelectedItem[];
extern const u8 CableClub_Text_YouMayTradeHere[];
extern const u8 CableClub_Text_YouMayBattleHere[];
extern const u8 CableClub_Text_CanMakeBerryPowder[];
extern const u8 EventScript_PC[];
extern const u8 EventScript_RepelWoreOff[];
include/pokemon.h
-4
View File
@@ -104,10 +104,6 @@
#define MON_GIVEN_TO_PC 0x1
#define MON_CANT_GIVE 0x2
#define PLAYER_HAS_TWO_USABLE_MONS 0x0
#define PLAYER_HAS_ONE_MON 0x1
#define PLAYER_HAS_ONE_USABLE_MON 0x2
#define MON_MALE 0x00
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
include/script_pokemon_util_80A0058.h
+1 -1
View File
@@ -4,7 +4,7 @@
bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3);
bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
void sp000_heal_pokemon(void);
void HealPlayerParty(void);
void ReducePlayerPartyToThree(void);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H