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

Merge branch 'master' into doc-tilesets

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:13:58 -05:00
committed by GitHub
parent 4ab216f309 04130a97d9
commit 1d006c2661
249 changed files with 11504 additions and 11961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle.h
+1 -1
View File
@@ -71,7 +71,7 @@
#define BATTLE_TYPE_x800000 0x800000
#define BATTLE_TYPE_RECORDED 0x1000000
#define BATTLE_TYPE_x2000000 0x2000000
#define BATTLE_TYPE_TRAINER_HILL 0x4000000
#define BATTLE_TYPE_x4000000 0x4000000
#define BATTLE_TYPE_SECRET_BASE 0x8000000
#define BATTLE_TYPE_GROUDON 0x10000000
#define BATTLE_TYPE_KYOGRE 0x20000000
include/constants/easy_chat.h
+1 -16
View File
@@ -6,22 +6,7 @@
#define EASY_CHAT_TYPE_BATTLE_WON 2
#define EASY_CHAT_TYPE_BATTLE_LOST 3
#define EASY_CHAT_TYPE_MAIL 4
#define EASY_CHAT_TYPE_INTERVIEW 5
#define EASY_CHAT_TYPE_BARD_SONG 6
#define EASY_CHAT_TYPE_FAN_CLUB 7
#define EASY_CHAT_TYPE_UNK_8 8
#define EASY_CHAT_TYPE_TRENDY_PHRASE 9
#define EASY_CHAT_TYPE_GABBY_AND_TY 10
#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11
#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12
#define EASY_CHAT_TYPE_GOOD_SAYING 13
#define EASY_CHAT_TYPE_FAN_QUESTION 14
#define EASY_CHAT_TYPE_QUIZ_ANSWER 15
#define EASY_CHAT_TYPE_QUIZ_QUESTION 16
#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17
#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18
#define EASY_CHAT_TYPE_APPRENTICE 19
#define EASY_CHAT_TYPE_QUESTIONNAIRE 20
#define EASY_CHAT_TYPE_QUESTIONNAIRE 14
#define EC_GROUP_POKEMON_2 0x0
#define EC_GROUP_TRAINER 0x1
include/constants/flags.h
+1 -1
View File
@@ -1415,7 +1415,7 @@
#define FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST (SYS_FLAGS + 0xB7)
#define FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE (SYS_FLAGS + 0xB8)
#define FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE (SYS_FLAGS + 0xB9)
#define FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY (SYS_FLAGS + 0xBA)
#define FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY (SYS_FLAGS + 0xBA)
#define FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F (SYS_FLAGS + 0xBB)
#define FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE (SYS_FLAGS + 0xBC)
#define FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH (SYS_FLAGS + 0xBD)
include/constants/global.h
+2
View File
@@ -34,6 +34,8 @@
#define QUEST_LOG_SCENE_COUNT 4
#define NUM_TOWER_CHALLENGE_TYPES 4
#define MALE 0
#define FEMALE 1
#define GENDER_COUNT 2
include/constants/layouts.h
+27 -27
View File
@@ -279,17 +279,17 @@
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F 295
#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK 296
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F 300
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F 301
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F 302
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F 303
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F 304
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F 305
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306
#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307
#define LAYOUT_TRAINER_TOWER_LOBBY 297
#define LAYOUT_TRAINER_TOWER_1F 298
#define LAYOUT_TRAINER_TOWER_2F 299
#define LAYOUT_TRAINER_TOWER_3F 300
#define LAYOUT_TRAINER_TOWER_4F 301
#define LAYOUT_TRAINER_TOWER_5F 302
#define LAYOUT_TRAINER_TOWER_6F 303
#define LAYOUT_TRAINER_TOWER_7F 304
#define LAYOUT_TRAINER_TOWER_8F 305
#define LAYOUT_TRAINER_TOWER_ROOF 306
#define LAYOUT_TRAINER_TOWER_ELEVATOR 307
#define LAYOUT_CERULEAN_CITY_HOUSE5 308
#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F 309
#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310
@@ -348,22 +348,22 @@
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER 363
#define LAYOUT_NAVEL_ROCK_B1F 364
#define LAYOUT_NAVEL_ROCK_FORK 365
#define LAYOUT_UNUSED_LAYOUT_834BC2C 366
#define LAYOUT_UNUSED_LAYOUT_834BEB4 367
#define LAYOUT_UNUSED_LAYOUT_834C13C 368
#define LAYOUT_UNUSED_LAYOUT_834C3C4 369
#define LAYOUT_UNUSED_LAYOUT_834C64C 370
#define LAYOUT_UNUSED_LAYOUT_834C8D4 371
#define LAYOUT_UNUSED_LAYOUT_834CB5C 372
#define LAYOUT_UNUSED_LAYOUT_834CDE4 373
#define LAYOUT_UNUSED_LAYOUT_834D06C 374
#define LAYOUT_UNUSED_LAYOUT_834D2F4 375
#define LAYOUT_UNUSED_LAYOUT_834D57C 376
#define LAYOUT_UNUSED_LAYOUT_834D804 377
#define LAYOUT_UNUSED_LAYOUT_834DA8C 378
#define LAYOUT_UNUSED_LAYOUT_834DD14 379
#define LAYOUT_UNUSED_LAYOUT_834DF9C 380
#define LAYOUT_UNUSED_LAYOUT_834E224 381
#define LAYOUT_TRAINER_TOWER_1F_DOUBLES 366
#define LAYOUT_TRAINER_TOWER_2F_DOUBLES 367
#define LAYOUT_TRAINER_TOWER_3F_DOUBLES 368
#define LAYOUT_TRAINER_TOWER_4F_DOUBLES 369
#define LAYOUT_TRAINER_TOWER_5F_DOUBLES 370
#define LAYOUT_TRAINER_TOWER_6F_DOUBLES 371
#define LAYOUT_TRAINER_TOWER_7F_DOUBLES 372
#define LAYOUT_TRAINER_TOWER_8F_DOUBLES 373
#define LAYOUT_TRAINER_TOWER_1F_KNOCKOUT 374
#define LAYOUT_TRAINER_TOWER_2F_KNOCKOUT 375
#define LAYOUT_TRAINER_TOWER_3F_KNOCKOUT 376
#define LAYOUT_TRAINER_TOWER_4F_KNOCKOUT 377
#define LAYOUT_TRAINER_TOWER_5F_KNOCKOUT 378
#define LAYOUT_TRAINER_TOWER_6F_KNOCKOUT 379
#define LAYOUT_TRAINER_TOWER_7F_KNOCKOUT 380
#define LAYOUT_TRAINER_TOWER_8F_KNOCKOUT 381
#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1 382
#define LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA 383
include/constants/map_groups.h
+11 -11
View File
@@ -135,17 +135,17 @@
// Map Group 2
#define MAP_NAVEL_ROCK_EXTERIOR (0 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_1F (1 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_2F (2 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_3F (3 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_4F (4 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_5F (5 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_6F (6 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_7F (7 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_8F (8 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF (9 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY (10 | (2 << 8))
#define MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR (11 | (2 << 8))
#define MAP_TRAINER_TOWER_1F (1 | (2 << 8))
#define MAP_TRAINER_TOWER_2F (2 | (2 << 8))
#define MAP_TRAINER_TOWER_3F (3 | (2 << 8))
#define MAP_TRAINER_TOWER_4F (4 | (2 << 8))
#define MAP_TRAINER_TOWER_5F (5 | (2 << 8))
#define MAP_TRAINER_TOWER_6F (6 | (2 << 8))
#define MAP_TRAINER_TOWER_7F (7 | (2 << 8))
#define MAP_TRAINER_TOWER_8F (8 | (2 << 8))
#define MAP_TRAINER_TOWER_ROOF (9 | (2 << 8))
#define MAP_TRAINER_TOWER_LOBBY (10 | (2 << 8))
#define MAP_TRAINER_TOWER_ELEVATOR (11 | (2 << 8))
#define MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE (12 | (2 << 8))
#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM1 (13 | (2 << 8))
#define MAP_FIVE_ISLAND_LOST_CAVE_ROOM2 (14 | (2 << 8))
include/constants/metatile_labels.h
+3
View File
@@ -85,5 +85,8 @@
// gTileset_MtEmber
#define METATILE_MtEmber_CaveEntrance 0x346
// Trainer Tower
#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287
#define METATILE_TrainerTower_CounterBarrier 0x2B4
#endif // GUARD_METATILE_LABELS_H
include/constants/party_menu.h
-1
View File
@@ -64,7 +64,6 @@
#define PARTY_MENU_TYPE_UNION_ROOM_TRADE 9 // trading board
#define PARTY_MENU_TYPE_SPIN_TRADE 10 // Unused beta for Gen IV's Spin Trade
#define PARTY_MENU_TYPE_MINIGAME 11
#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS 12
#define PARTY_ACTION_CHOOSE_MON 0
#define PARTY_ACTION_SEND_OUT 1
include/constants/trainer_tower.h
+46
View File
@@ -0,0 +1,46 @@
#ifndef GUARD_CONSTANTS_TRAINER_TOWER_H
#define GUARD_CONSTANTS_TRAINER_TOWER_H
#define CHALLENGE_TYPE_SINGLE 0
#define CHALLENGE_TYPE_DOUBLE 1
#define CHALLENGE_TYPE_KNOCKOUT 2
// Mixed challenges use one of the above 3 for each floor
#define CHALLENGE_STATUS_LOST 0
#define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related
#define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing
#define MAX_TRAINER_TOWER_FLOORS 8
#define MAX_TRAINERS_PER_FLOOR 3
#define TRAINER_TOWER_FUNC_INIT_FLOOR 0
#define TRAINER_TOWER_FUNC_GET_SPEECH 1
#define TRAINER_TOWER_FUNC_DO_BATTLE 2
#define TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE 3
#define TRAINER_TOWER_FUNC_CLEARED_FLOOR 4
#define TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED 5
#define TRAINER_TOWER_FUNC_START_CHALLENGE 6
#define TRAINER_TOWER_FUNC_GET_OWNER_STATE 7
#define TRAINER_TOWER_FUNC_GIVE_PRIZE 8
#define TRAINER_TOWER_FUNC_CHECK_FINAL_TIME 9
#define TRAINER_TOWER_FUNC_RESUME_TIMER 10
#define TRAINER_TOWER_FUNC_SET_LOST 11
#define TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS 12
#define TRAINER_TOWER_FUNC_GET_TIME 13
#define TRAINER_TOWER_FUNC_SHOW_RESULTS 14
#define TRAINER_TOWER_FUNC_CLOSE_RESULTS 15
#define TRAINER_TOWER_FUNC_CHECK_DOUBLES 16
#define TRAINER_TOWER_FUNC_GET_NUM_FLOORS 17
#define TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER 18
#define TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC 19
#define TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE 20
#define TRAINER_TOWER_TEXT_INTRO 2
#define TRAINER_TOWER_TEXT_PLAYER_LOST 3
#define TRAINER_TOWER_TEXT_PLAYER_WON 4
#define TRAINER_TOWER_TEXT_AFTER 5
#define TRAINER_TOWER_MAX_TIME 215999 // 60 * 60 * 60 - 1
#endif //GUARD_CONSTANTS_TRAINER_TOWER_H
include/constants/union_room.h
+45
View File
@@ -1,6 +1,48 @@
#ifndef GUARD_CONSTANTS_UNION_ROOM_H
#define GUARD_CONSTANTS_UNION_ROOM_H
#define UNION_ROOM_SPAWN_NONE 0
#define UNION_ROOM_SPAWN_IN 1
#define UNION_ROOM_SPAWN_OUT 2
#define ACTIVITY_NONE 0
#define ACTIVITY_BATTLE 1
#define ACTIVITY_DBLBATTLE 2
#define ACTIVITY_MLTBATTLE 3
#define ACTIVITY_TRADE 4
#define ACTIVITY_CHAT 5
#define ACTIVITY_WCARD 6
#define ACTIVITY_WNEWS 7
#define ACTIVITY_CARD 8
#define ACTIVITY_PJUMP 9
#define ACTIVITY_BCRUSH 10
#define ACTIVITY_BPICK 11
#define ACTIVITY_SEARCH 12
#define ACTIVITY_SPINTRADE 13
#define ACTIVITY_ITEMTRADE 14
// Player response
#define ACTIVITY_ACCEPT 17
#define ACTIVITY_DECLINE 18
#define ACTIVITY_NPCTALK 19
#define ACTIVITY_PLYRTALK 20
// Duplicate IDs?
#define ACTIVITY_WCARD2 21
#define ACTIVITY_WNEWS2 22
#define IN_UNION_ROOM 0x40
// Used in UR_AddTextPrinterParameterized
#define UR_COLOR_DKE_WHT_LTE 0
#define UR_COLOR_RED_WHT_LTR 1
#define UR_COLOR_GRN_WHT_LTG 2
#define UR_COLOR_WHT_WHT_LTE 3
#define UR_COLOR_WHT_DKE_LTE 4
#define UR_COLOR_GRN_DN6_LTB 5
#define UR_COLOR_DN5_DN6_LTB 6
#define LINK_GROUP_SINGLE_BATTLE 0
#define LINK_GROUP_DOUBLE_BATTLE 1
#define LINK_GROUP_MULTI_BATTLE 2
@@ -12,4 +54,7 @@
#define LINK_GROUP_WONDER_NEWS 8
#define NUM_LINK_GROUP_TYPES 9
#define LINK_GROUP_UNION_ROOM_RESUME 9
#define LINK_GROUP_UNION_ROOM_INIT 10
#endif //GUARD_CONSTANTS_UNION_ROOM_H