diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_anim.h | 38 | ||||
-rw-r--r-- | include/battle_arena.h | 4 | ||||
-rw-r--r-- | include/battle_dome.h | 4 | ||||
-rw-r--r-- | include/battle_factory.h | 4 | ||||
-rw-r--r-- | include/battle_pyramid.h | 14 | ||||
-rw-r--r-- | include/battle_pyramid_bag.h | 2 | ||||
-rw-r--r-- | include/cable_club.h | 1 | ||||
-rwxr-xr-x | include/constants/layouts.h | 76 | ||||
-rw-r--r-- | include/event_scripts.h | 4 | ||||
-rw-r--r-- | include/field_camera.h | 1 | ||||
-rw-r--r-- | include/field_control_avatar.h | 2 | ||||
-rw-r--r-- | include/field_effect.h | 1 | ||||
-rw-r--r-- | include/field_message_box.h | 1 | ||||
-rw-r--r-- | include/field_player_avatar.h | 3 | ||||
-rw-r--r-- | include/field_screen_effect.h | 3 | ||||
-rw-r--r-- | include/field_specials.h | 2 | ||||
-rw-r--r-- | include/field_weather.h | 1 | ||||
-rw-r--r-- | include/fieldmap.h | 8 | ||||
-rw-r--r-- | include/global.h | 24 | ||||
-rw-r--r-- | include/graphics.h | 14 | ||||
-rw-r--r-- | include/link.h | 2 | ||||
-rw-r--r-- | include/link_rfu.h | 1 | ||||
-rw-r--r-- | include/match_call.h | 1 | ||||
-rw-r--r-- | include/rom_818CFC8.h | 11 | ||||
-rw-r--r-- | include/secret_base.h | 2 | ||||
-rw-r--r-- | include/strings.h | 370 | ||||
-rwxr-xr-x | include/tileset_anims.h | 9 |
27 files changed, 374 insertions, 229 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 8e8a17675..d0d323216 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -16,14 +16,14 @@ enum BG_ANIM_SCREEN_BASE_BLOCK, }; -struct UnknownAnimStruct2 +struct BattleAnimBgData { u8 *bgTiles; - u16 *unk4; - u8 unk8; + u16 *bgTilemap; + u8 paletteId; u8 bgId; u16 tilesOffset; - u16 unkC; + u16 unused; }; struct BattleAnimBackground @@ -74,14 +74,14 @@ void HandleIntroSlide(u8 terrainId); int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s -void sub_80A6450(struct Sprite *sprite); +void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite); void sub_80A8E30(struct Sprite *sprite); void sub_80A8B64(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); -void AnimTranslateLinearSimple(struct Sprite *sprite); +void TranslateSpriteLinearFixedPoint(struct Sprite *sprite); void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets); void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets); void StartAnimLinearTranslation(struct Sprite *sprite); @@ -94,7 +94,7 @@ void sub_80A6FD4(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void TrySetSpriteRotScale(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite); -void sub_80A66DC(struct Sprite *sprite); +void TranslateSpriteLinearAndFlicker(struct Sprite *sprite); void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite); void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite); void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2); @@ -108,12 +108,12 @@ u8 GetBattlerSpriteBGPriority(u8 battlerId); void *LoadPointerFromVars(s16 bottom, s16 top); void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr); void sub_80A8278(void); -void sub_80A6B30(struct UnknownAnimStruct2*); -void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); +void sub_80A6B30(struct BattleAnimBgData*); +void sub_80A6B90(struct BattleAnimBgData*, u32 arg1); u8 GetBattlerSpriteSubpriority(u8 battlerId); -bool8 TranslateAnimArc(struct Sprite *sprite); +bool8 TranslateAnimHorizontalArc(struct Sprite *sprite); void sub_80A6630(struct Sprite *sprite); -void sub_80A6680(struct Sprite *sprite); +void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite); void ResetSpriteRotScale(u8 spriteId); void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void InitSpriteDataForLinearTranslation(struct Sprite *sprite); @@ -125,8 +125,8 @@ u8 sub_80A77AC(u8 a1); s16 CloneBattlerSpriteWithBlend(u8); void obj_delete_but_dont_free_vram(struct Sprite*); u8 sub_80A89C8(int, u8, int); -void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); -void sub_80A6CC0(u32, const u32*, u32); +void sub_80A6D60(struct BattleAnimBgData*, const void*, u32); +void AnimLoadCompressedBgGfx(u32, const u32*, u32); void sub_80A6DAC(bool8); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); void sub_80A653C(struct Sprite *); @@ -134,13 +134,13 @@ void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); -void sub_80A67F4(struct Sprite *); -void sub_80A6D48(u32 bgId, const void *src); +void DestroyAnimSpriteAndDisableBlend(struct Sprite *); +void AnimLoadCompressedBgTilemap(u32 bgId, const void *src); void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); bool8 AnimFastTranslateLinear(struct Sprite *sprite); void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite); -void TranslateMonBGUntil(struct Sprite *sprite); -void TranslateSpriteOverDuration(struct Sprite *sprite); +void TranslateMonSpriteLinear(struct Sprite *sprite); +void TranslateSpriteLinear(struct Sprite *sprite); void sub_80A77C8(struct Sprite *sprite); void sub_80A7000(struct Sprite *sprite); void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); @@ -148,7 +148,7 @@ void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); bool8 RunAffineAnimFromTaskData(struct Task *task); void sub_80A78AC(struct Sprite *sprite); -void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused); +void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); void sub_80A749C(struct Sprite *sprite); void sub_80A6DEC(struct Sprite *sprite); @@ -185,7 +185,7 @@ bool8 IsDoubleBattle(void); u8 sub_80A6D94(void); u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); -void oamt_add_pos2_onto_pos1(struct Sprite *sprite); +void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); u8 GetBattlerSpriteDefault_Y(u8 battlerId); u8 GetSubstituteSpriteDefault_Y(u8 battlerId); diff --git a/include/battle_arena.h b/include/battle_arena.h index bf305ea4e..c3bdd4ea7 100644 --- a/include/battle_arena.h +++ b/include/battle_arena.h @@ -8,7 +8,7 @@ void BattleArena_AddMindPoints(u8 battler); void BattleArena_AddSkillPoints(u8 battler); void BattleArena_DeductMindPoints(u8 battler, u16 stringId); void sub_81A586C(u8 battler); -void sub_81A5BF8(void); -void sub_81A5D44(void); +void DrawArenaRefereeTextBox(void); +void RemoveArenaRefereeTextBox(void); #endif //GUARD_BATTLE_ARENA_H diff --git a/include/battle_dome.h b/include/battle_dome.h index 2265f14ce..d1dfdb100 100644 --- a/include/battle_dome.h +++ b/include/battle_dome.h @@ -3,7 +3,7 @@ extern u32 gUnknown_0203CD70; -s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); -s32 TrainerIdToDomeTournamentId(u16 trainerId); +int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); +int TrainerIdToDomeTournamentId(u16 trainerId); #endif // GUARD_BATTLE_DOME_H diff --git a/include/battle_factory.h b/include/battle_factory.h index 2db041b06..5606d60d1 100644 --- a/include/battle_factory.h +++ b/include/battle_factory.h @@ -2,10 +2,10 @@ #define GUARD_BATTLE_FACTORY_H void CallBattleFactoryFunction(void); -bool8 sub_81A6BF4(void); +bool8 InBattleFactory(void); u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1); void FillFactoryBrainParty(void); -u8 sub_81A6F70(u8 battleMode, u8 lvlMode); +u8 GetNumPastRentalsRank(u8 battleMode, u8 lvlMode); u32 GetAiScriptsInBattleFactory(void); void SetMonMoveAvoidReturn(struct Pokemon *mon, u16 moveArg, u8 moveSlot); diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 5d38e9f35..d77172d0b 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -4,21 +4,21 @@ void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); -void sub_81A9B04(void); +void MarkApproachingPyramidTrainersAsBattled(void); void GenerateBattlePyramidWildMon(void); u8 GetPyramidRunMultiplier(void); u8 InBattlePyramid(void); bool8 InBattlePyramid_(void); void sub_81A9E90(void); -void sub_81A9EC8(void); +void SoftResetInBattlePyramid(void); void CopyPyramidTrainerSpeechBefore(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); -u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerId); -void sub_81AA078(u16 *mapArg, u8 arg1); -void sub_81AA1D8(void); -void sub_81AA2F8(void); -u8 sub_81AAA40(void); +u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); +void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); +void LoadBattlePyramidEventObjectTemplates(void); +void LoadBattlePyramidFloorEventObjectScripts(void); +u8 GetNumBattlePyramidEventObjects(void); u16 GetBattlePyramidPickupItemId(void); #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h index 48f8de3c0..c3b799a4d 100644 --- a/include/battle_pyramid_bag.h +++ b/include/battle_pyramid_bag.h @@ -34,7 +34,7 @@ struct PyramidBagCursorData extern struct PyramidBagResources *gPyramidBagResources; extern struct PyramidBagCursorData gPyramidBagCursorData; -void sub_81C4EEC(void); +void InitBattlePyramidBagCursorPosition(void); void CB2_PyramidBagMenuFromStartMenu(void); void sub_81C4F84(void); void sub_81C5924(void); diff --git a/include/cable_club.h b/include/cable_club.h index ebdc82b46..60d56460d 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -15,5 +15,6 @@ void sub_80B360C(void); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); void sub_80B3AF8(u8 taskId); void task00_08081A90(u8 taskId); +bool32 sub_80B39D4(u8 linkPlayerIndex); #endif //GUARD_CABLE_CLUB_H diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33..d4819c46a 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -46,7 +46,7 @@ #define LAYOUT_ROUTE127 43 #define LAYOUT_ROUTE128 44 #define LAYOUT_ROUTE129 45 -#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE130_MIRAGE_ISLAND 46 #define LAYOUT_ROUTE131 47 #define LAYOUT_ROUTE132 48 #define LAYOUT_ROUTE133 49 @@ -75,7 +75,7 @@ #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74 -#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_UNKNOWN_08428450 75 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 @@ -83,8 +83,8 @@ #define LAYOUT_HOUSE_WITH_BED 80 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 -#define LAYOUT_UNKNOWN_MAP_084294C4 83 -#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_UNKNOWN_084294C4 83 +#define LAYOUT_UNKNOWN_084294E8 84 #define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 @@ -170,20 +170,20 @@ #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 -#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 -#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 -#define LAYOUT_UNKNOWN_MAP_0843E708 172 -#define LAYOUT_UNKNOWN_MAP_0843E72C 173 -#define LAYOUT_UNKNOWN_MAP_0843E750 174 -#define LAYOUT_UNKNOWN_MAP_0843E774 175 -#define LAYOUT_UNKNOWN_MAP_0843E798 176 -#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 -#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 -#define LAYOUT_UNKNOWN_MAP_0843E804 179 -#define LAYOUT_UNKNOWN_MAP_0843E828 180 -#define LAYOUT_UNKNOWN_MAP_0843E84C 181 -#define LAYOUT_UNKNOWN_MAP_0843E870 182 -#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_UNKNOWN_0843E6C0 170 +#define LAYOUT_UNKNOWN_0843E6E4 171 +#define LAYOUT_UNKNOWN_0843E708 172 +#define LAYOUT_UNKNOWN_0843E72C 173 +#define LAYOUT_UNKNOWN_0843E750 174 +#define LAYOUT_UNKNOWN_0843E774 175 +#define LAYOUT_UNKNOWN_0843E798 176 +#define LAYOUT_UNKNOWN_0843E7BC 177 +#define LAYOUT_UNKNOWN_0843E7E0 178 +#define LAYOUT_UNKNOWN_0843E804 179 +#define LAYOUT_UNKNOWN_0843E828 180 +#define LAYOUT_UNKNOWN_0843E84C 181 +#define LAYOUT_UNKNOWN_0843E870 182 +#define LAYOUT_UNKNOWN_0843E894 183 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 #define LAYOUT_NEW_MAUVILLE_INSIDE 185 #define LAYOUT_ABANDONED_SHIP_DECK 186 @@ -226,12 +226,12 @@ #define LAYOUT_RECORD_CORNER 223 #define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 #define LAYOUT_LINK_CONTEST_ROOM1 225 -#define LAYOUT_UNKNOWN_MAP_25_29 226 -#define LAYOUT_UNKNOWN_MAP_25_30 227 -#define LAYOUT_UNKNOWN_MAP_25_31 228 -#define LAYOUT_UNKNOWN_MAP_25_32 229 -#define LAYOUT_UNKNOWN_MAP_25_33 230 -#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231 #define LAYOUT_LINK_CONTEST_ROOM2 232 #define LAYOUT_LINK_CONTEST_ROOM3 233 #define LAYOUT_LINK_CONTEST_ROOM4 234 @@ -242,7 +242,7 @@ #define LAYOUT_SAFARI_ZONE_NORTH 239 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 #define LAYOUT_SAFARI_ZONE_SOUTH 241 -#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_UNKNOWN_08447028 242 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 @@ -312,21 +312,21 @@ #define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 #define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 #define LAYOUT_SCORCHED_SLAB 311 -#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA 312 #define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 #define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 #define LAYOUT_EVER_GRANDE_CITY_HALL4 315 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 -#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_ROUTE131_SKY_PILLAR 319 #define LAYOUT_SKY_PILLAR_ENTRANCE 320 #define LAYOUT_SKY_PILLAR_OUTSIDE 321 #define LAYOUT_SKY_PILLAR_1F 322 #define LAYOUT_SKY_PILLAR_2F 323 #define LAYOUT_SKY_PILLAR_3F 324 #define LAYOUT_SKY_PILLAR_4F 325 -#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA 326 #define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 #define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 @@ -357,9 +357,9 @@ #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 -#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 -#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_UNKNOWN_084693AC 359 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 @@ -432,15 +432,15 @@ #define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 #define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 #define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 -#define LAYOUT_UNKNOWN_MAP_08480DAC 432 -#define LAYOUT_UNKNOWN_MAP_08480F54 433 -#define LAYOUT_UNKNOWN_MAP_084810FC 434 -#define LAYOUT_UNKNOWN_MAP_084812A4 435 -#define LAYOUT_UNKNOWN_MAP_0848144C 436 -#define LAYOUT_UNKNOWN_MAP_084815F4 437 -#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE 432 +#define LAYOUT_SKY_PILLAR_1F_CLEAN 433 +#define LAYOUT_SKY_PILLAR_2F_CLEAN 434 +#define LAYOUT_SKY_PILLAR_3F_CLEAN 435 +#define LAYOUT_SKY_PILLAR_4F_CLEAN 436 +#define LAYOUT_SKY_PILLAR_5F_CLEAN 437 +#define LAYOUT_SKY_PILLAR_TOP_CLEAN 438 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 -#define LAYOUT_UNKNOWN_MAP_08481DBC 441 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/event_scripts.h b/include/event_scripts.h index afeac6628..65e2c74b7 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -576,8 +576,8 @@ extern const u8 gUnknown_082A8350[]; // Battle Pyramid. extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; +extern const u8 BattlePyramid_TrainerBattle[]; +extern const u8 BattlePyramid_FindItemBall[]; // fldeff misc extern const u8 EventScript_275A86[]; diff --git a/include/field_camera.h b/include/field_camera.h index fdc4c5450..fecea244e 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -32,5 +32,6 @@ void SetCameraPanningCallback(void (*a)(void)); void SetCameraPanning(s16 a, s16 b); void InstallCameraPanAheadCallback(void); void UpdateCameraPanning(void); +void FieldUpdateBgTilemapScroll(void); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 3cc4a8324..738cceb3e 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -37,5 +37,7 @@ u8 sub_8068F18(void); bool8 dive_warp(struct MapPosition *position, u16 b); int SetCableClubWarp(void); u8 TrySetDiveWarp(void); +const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); +u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); #endif // GUARD_FIELDCONTROLAVATAR_H diff --git a/include/field_effect.h b/include/field_effect.h index 7620cedcd..205dbb68a 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -13,6 +13,7 @@ extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); +void FieldEffectActiveListClear(void); void sub_80B69DC(void); u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); diff --git a/include/field_message_box.h b/include/field_message_box.h index 9515a54fd..58f782d9c 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -17,5 +17,6 @@ void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); u8 GetFieldMessageBoxMode(void); void sub_8098374(void); +void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 3aedec5de..45cd0dbd9 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -60,5 +60,8 @@ bool8 IsPlayerFacingSurfableFishableWater(void); bool8 IsPlayerSurfingNorth(void); void sub_808C228(u8 direction); u8 sub_808BCD0(void); +void sub_808B578(void); +u8 GetFRLGAvatarGraphicsIdByGender(u8); +u8 GetRSAvatarGraphicsIdByGender(u8); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 3daf8d892..2b8b3a5a3 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -34,11 +34,12 @@ void sub_80AF948(void); void sub_80AF9F8(void); void sub_80AFC60(void); void sub_80B009C(u8 flashLevel); -void door_upload_tiles(void); +void WriteBattlePyramidViewScanlineEffectBuffer(void); void sub_80B0244(void); void sub_80B0268(void); void sub_80B0534(void); void sub_80B058C(void); void sub_80B05B4(void); +void WriteFlashScanlineEffectBuffer(u8 flashLevel); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/field_specials.h b/include/field_specials.h index 10433299b..981d65c0a 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -23,5 +23,7 @@ bool8 sub_813B9C0(void); void SetShoalItemFlag(u16 v0); void UpdateFrontierManiac(u16 a0); void UpdateFrontierGambler(u16 a0); +void ResetCyclingRoadChallengeData(void); +bool8 warp0_in_pokecenter(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/field_weather.h b/include/field_weather.h index 91dcef1dc..2d73f2b94 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -233,5 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); +void sub_80AEE84(void); #endif // GUARD_WEATHER_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 3f5cc5ec8..24bc4989a 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -32,7 +32,13 @@ void sub_8088B3C(u16 x, u16 y); void InitMap(void); void InitMapFromSavedGame(void); void InitTrainerHillMap(void); -void InitBattlePyramidMap(u8 a0); +void InitBattlePyramidMap(bool8 setPlayerPosition); +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout); +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout); +void apply_map_tileset2_palette(struct MapLayout const *mapLayout); +void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); +extern void copy_map_tileset1_to_vram(const struct MapLayout *); +extern void copy_map_tileset2_to_vram(const struct MapLayout *); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/global.h b/include/global.h index f45d36f68..14a6387cd 100644 --- a/include/global.h +++ b/include/global.h @@ -277,7 +277,7 @@ struct FrontierMonData u8 nature; }; -struct Struct_field_E70 +struct RentalMon { u16 monId; u32 personality; @@ -316,7 +316,7 @@ struct BattleFrontier /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB4*/ u16 trainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; @@ -345,7 +345,7 @@ struct BattleFrontier /*0xDC6*/ u16 field_DC6; /*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; - /*0xDD8*/ u16 field_DD8; + /*0xDD8*/ u16 arenaRewardItem; /*0xDDA*/ u16 arenaWinStreaks[2]; /*0xDDE*/ u16 arenaRecordStreaks[2]; /*0xDE2*/ u16 factoryWinStreaks[2][2]; @@ -356,21 +356,21 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u8 field_E10_1:3; - /*0xE10*/ u8 field_E10_2:4; - /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[3]; - /*0xE18*/ u16 field_E18; + /*0xE10*/ u8 pikeHintedRoomIndex:3; + /*0xE10*/ u8 pikeHintedRoomType:4; + /*0xE10*/ u8 pikeHealingRoomsDisabled:1; + /*0xE12*/ u16 pikeHeldItemsBackup[3]; + /*0xE18*/ u16 pyramidRewardItem; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE22*/ u16 field_E22[4]; - /*0xE2A*/ u8 field_E2A; + /*0xE22*/ u16 pyramidRandoms[4]; + /*0xE2A*/ u8 pyramidTrainerFlags; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE68*/ u8 field_E68; + /*0xE68*/ u8 pyramidLightRadius; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; - /*0xE70*/ struct Struct_field_E70 field_E70[6]; + /*0xE70*/ struct RentalMon rentalMons[6]; /*0xEB8*/ u16 battlePoints; /*0xEBA*/ u16 field_EBA; /*0xEBC*/ u32 battlesCount; diff --git a/include/graphics.h b/include/graphics.h index f7eaa394d..58a9666a6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4104,9 +4104,13 @@ extern const u32 gUnknown_08D83B2C[]; extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; +extern const u16 gTilesetAnims_BattleDomePals0_0[]; +extern const u16 gTilesetAnims_BattleDomePals0_1[]; +extern const u16 gTilesetAnims_BattleDomePals0_2[]; +extern const u16 gTilesetAnims_BattleDomePals0_3[]; -extern const u32 gUnknown_08D854E8[]; -extern const u32 gUnknown_08D855E8[]; +extern const u32 gBattleArenaJudgementSymbolsGfx[]; +extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gContest2Pal[]; extern const u32 gBattleAnimSpriteSheet_000[]; @@ -4724,9 +4728,9 @@ extern const u32 gBattleAnimBackgroundTilemap_17[]; extern const u32 gBattleAnimBackgroundTilemap_20[]; extern const u32 gBattleAnimBackgroundTilemap_21[]; -extern const u32 gUnknown_08C1D0AC[]; -extern const u32 gUnknown_08C1D1E8[]; -extern const u32 gUnknown_08C1D210[]; +extern const u32 gMetalShineGfx[]; +extern const u32 gMetalShinePalette[]; +extern const u32 gMetalShineTilemap[]; extern const u32 gUnknown_08C20668[]; extern const u32 gUnknown_08C20684[]; diff --git a/include/link.h b/include/link.h index 9552f062c..52a631570 100644 --- a/include/link.h +++ b/include/link.h @@ -312,5 +312,7 @@ void sub_800AB18(void); void sub_8009F18(void); bool8 sub_800AA60(void); void sub_800ABF4(u16 a0); +bool32 sub_8009F3C(void); +u32 sub_800B4DC(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 08cab616c..d468d6c49 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -282,5 +282,6 @@ void sub_800EF7C(void); bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); +void sub_8010198(void); #endif //GUARD_LINK_RFU_H diff --git a/include/match_call.h b/include/match_call.h index 1f431bfaf..17d40d41c 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -11,5 +11,6 @@ enum { }; s32 GetRematchIdxByTrainerIdx(s32 trainerIdx); +void InitMatchCallCounters(void); #endif //GUARD_MATCH_CALL_H diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h deleted file mode 100644 index 1d0626b2b..000000000 --- a/include/rom_818CFC8.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Scott Norton on 9/6/17. -// - -#ifndef GUARD_ROM_818CFC8_H -#define GUARD_ROM_818CFC8_H - -bool8 InBattlePyramid(void); -u8 sub_81AAA40(void); - -#endif //GUARD_ROM_818CFC8_H diff --git a/include/secret_base.h b/include/secret_base.h index 4b44d4678..57ad81fee 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -22,6 +22,8 @@ void sub_80EB56C(void); void sub_80EB9E0(void); void sub_80EBB28(void); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); +bool8 sub_80E909C(void); +void sub_80EB218(void); // SetCurrentSecretBaseFromPosition void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events); diff --git a/include/strings.h b/include/strings.h index 74f3ca727..9557dcca2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1687,133 +1687,251 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; +// Battle Dome. +extern const u8 gBattleDomeOpponentPotentialText1[]; +extern const u8 gBattleDomeOpponentPotentialText2[]; +extern const u8 gBattleDomeOpponentPotentialText3[]; +extern const u8 gBattleDomeOpponentPotentialText4[]; +extern const u8 gBattleDomeOpponentPotentialText5[]; +extern const u8 gBattleDomeOpponentPotentialText6[]; +extern const u8 gBattleDomeOpponentPotentialText7[]; +extern const u8 gBattleDomeOpponentPotentialText8[]; +extern const u8 gBattleDomeOpponentPotentialText9[]; +extern const u8 gBattleDomeOpponentPotentialText10[]; +extern const u8 gBattleDomeOpponentPotentialText11[]; +extern const u8 gBattleDomeOpponentPotentialText12[]; +extern const u8 gBattleDomeOpponentPotentialText13[]; +extern const u8 gBattleDomeOpponentPotentialText14[]; +extern const u8 gBattleDomeOpponentPotentialText15[]; +extern const u8 gBattleDomeOpponentPotentialText16[]; +extern const u8 gBattleDomeOpponentPotentialText17[]; +extern const u8 gBattleDomeOpponentStyleText1[]; +extern const u8 gBattleDomeOpponentStyleText2[]; +extern const u8 gBattleDomeOpponentStyleText3[]; +extern const u8 gBattleDomeOpponentStyleText4[]; +extern const u8 gBattleDomeOpponentStyleText5[]; +extern const u8 gBattleDomeOpponentStyleText6[]; +extern const u8 gBattleDomeOpponentStyleText7[]; +extern const u8 gBattleDomeOpponentStyleText8[]; +extern const u8 gBattleDomeOpponentStyleText9[]; +extern const u8 gBattleDomeOpponentStyleText10[]; +extern const u8 gBattleDomeOpponentStyleText11[]; +extern const u8 gBattleDomeOpponentStyleText12[]; +extern const u8 gBattleDomeOpponentStyleText13[]; +extern const u8 gBattleDomeOpponentStyleText14[]; +extern const u8 gBattleDomeOpponentStyleText15[]; +extern const u8 gBattleDomeOpponentStyleText16[]; +extern const u8 gBattleDomeOpponentStyleText17[]; +extern const u8 gBattleDomeOpponentStyleText18[]; +extern const u8 gBattleDomeOpponentStyleText19[]; +extern const u8 gBattleDomeOpponentStyleText20[]; +extern const u8 gBattleDomeOpponentStyleText21[]; +extern const u8 gBattleDomeOpponentStyleText22[]; +extern const u8 gBattleDomeOpponentStyleText23[]; +extern const u8 gBattleDomeOpponentStyleText24[]; +extern const u8 gBattleDomeOpponentStyleText25[]; +extern const u8 gBattleDomeOpponentStyleText26[]; +extern const u8 gBattleDomeOpponentStyleText27[]; +extern const u8 gBattleDomeOpponentStyleText28[]; +extern const u8 gBattleDomeOpponentStyleTextUnused1[]; +extern const u8 gBattleDomeOpponentStyleTextUnused2[]; +extern const u8 gBattleDomeOpponentStyleTextUnused3[]; +extern const u8 gBattleDomeOpponentStyleTextUnused4[]; +extern const u8 gBattleDomeOpponentStatsText1[]; +extern const u8 gBattleDomeOpponentStatsText2[]; +extern const u8 gBattleDomeOpponentStatsText3[]; +extern const u8 gBattleDomeOpponentStatsText4[]; +extern const u8 gBattleDomeOpponentStatsText5[]; +extern const u8 gBattleDomeOpponentStatsText6[]; +extern const u8 gBattleDomeOpponentStatsText7[]; +extern const u8 gBattleDomeOpponentStatsText8[]; +extern const u8 gBattleDomeOpponentStatsText9[]; +extern const u8 gBattleDomeOpponentStatsText10[]; +extern const u8 gBattleDomeOpponentStatsText11[]; +extern const u8 gBattleDomeOpponentStatsText12[]; +extern const u8 gBattleDomeOpponentStatsText13[]; +extern const u8 gBattleDomeOpponentStatsText14[]; +extern const u8 gBattleDomeOpponentStatsText15[]; +extern const u8 gBattleDomeOpponentStatsText16[]; +extern const u8 gBattleDomeOpponentStatsText17[]; +extern const u8 gBattleDomeOpponentStatsText18[]; +extern const u8 gBattleDomeOpponentStatsText19[]; +extern const u8 gBattleDomeOpponentStatsText20[]; +extern const u8 gBattleDomeOpponentStatsText21[]; +extern const u8 gBattleDomeOpponentStatsText22[]; +extern const u8 gBattleDomeOpponentStatsText23[]; +extern const u8 gBattleDomeOpponentStatsText24[]; +extern const u8 gBattleDomeOpponentStatsText25[]; +extern const u8 gBattleDomeOpponentStatsText26[]; +extern const u8 gBattleDomeOpponentStatsText27[]; +extern const u8 gBattleDomeOpponentStatsText28[]; +extern const u8 gBattleDomeOpponentStatsText29[]; +extern const u8 gBattleDomeOpponentStatsText30[]; +extern const u8 gBattleDomeOpponentStatsText31[]; +extern const u8 gBattleDomeOpponentStatsText32[]; +extern const u8 gBattleDomeOpponentStatsText33[]; +extern const u8 gBattleDomeOpponentStatsText34[]; +extern const u8 gBattleDomeOpponentStatsText35[]; +extern const u8 gBattleDomeOpponentStatsText36[]; +extern const u8 gBattleDomeOpponentStatsText37[]; +extern const u8 gBattleDomeOpponentStatsText38[]; +extern const u8 gBattleDomeOpponentStatsText39[]; +extern const u8 gBattleDomeOpponentStatsText40[]; +extern const u8 gBattleDomeOpponentStatsText41[]; +extern const u8 gBattleDomeOpponentStatsText42[]; +extern const u8 gBattleDomeOpponentStatsText43[]; +extern const u8 gBattleDomeMatchNumberText1[]; +extern const u8 gBattleDomeMatchNumberText2[]; +extern const u8 gBattleDomeMatchNumberText3[]; +extern const u8 gBattleDomeMatchNumberText4[]; +extern const u8 gBattleDomeMatchNumberText5[]; +extern const u8 gBattleDomeMatchNumberText6[]; +extern const u8 gBattleDomeMatchNumberText7[]; +extern const u8 gBattleDomeMatchNumberText8[]; +extern const u8 gBattleDomeMatchNumberText9[]; +extern const u8 gBattleDomeMatchNumberText10[]; +extern const u8 gBattleDomeMatchNumberText11[]; +extern const u8 gBattleDomeMatchNumberText12[]; +extern const u8 gBattleDomeMatchNumberText13[]; +extern const u8 gBattleDomeMatchNumberText14[]; +extern const u8 gBattleDomeMatchNumberText15[]; +extern const u8 gBattleDomeWinText1[]; +extern const u8 gBattleDomeWinText2[]; +extern const u8 gBattleDomeWinText3[]; +extern const u8 gBattleDomeWinText4[]; +extern const u8 gBattleDomeWinText5[]; +extern const u8 gBattleDomeWinText6[]; +extern const u8 gBattleDomeWinText7[]; + // Battle Pyramid. -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; +extern const u8 BattlePyramid_ExitHintUp_Text1[]; +extern const u8 BattlePyramid_ExitHintLeft_Text1[]; +extern const u8 BattlePyramid_ExitHintRight_Text1[]; +extern const u8 BattlePyramid_ExitHintDown_Text1[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[]; +extern const u8 BattlePyramid_OneItemRemaining_Text1[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text1[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text1[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text1[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text1[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text1[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text1[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[]; +extern const u8 BattlePyramid_ExitHintUp_Text2[]; +extern const u8 BattlePyramid_ExitHintLeft_Text2[]; +extern const u8 BattlePyramid_ExitHintRight_Text2[]; +extern const u8 BattlePyramid_ExitHintDown_Text2[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[]; +extern const u8 BattlePyramid_OneItemRemaining_Text2[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text2[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text2[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text2[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text2[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text2[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text2[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[]; +extern const u8 BattlePyramid_ExitHintUp_Text3[]; +extern const u8 BattlePyramid_ExitHintLeft_Text3[]; +extern const u8 BattlePyramid_ExitHintRight_Text3[]; +extern const u8 BattlePyramid_ExitHintDown_Text3[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[]; +extern const u8 BattlePyramid_OneItemRemaining_Text3[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text3[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text3[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text3[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text3[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text3[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text3[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[]; +extern const u8 BattlePyramid_ExitHintUp_Text4[]; +extern const u8 BattlePyramid_ExitHintLeft_Text4[]; +extern const u8 BattlePyramid_ExitHintRight_Text4[]; +extern const u8 BattlePyramid_ExitHintDown_Text4[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[]; +extern const u8 BattlePyramid_OneItemRemaining_Text4[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text4[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text4[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text4[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text4[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text4[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text4[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[]; +extern const u8 BattlePyramid_ExitHintUp_Text5[]; +extern const u8 BattlePyramid_ExitHintLeft_Text5[]; +extern const u8 BattlePyramid_ExitHintRight_Text5[]; +extern const u8 BattlePyramid_ExitHintDown_Text5[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[]; +extern const u8 BattlePyramid_OneItemRemaining_Text5[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text5[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text5[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text5[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text5[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text5[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text5[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[]; +extern const u8 BattlePyramid_ExitHintUp_Text6[]; +extern const u8 BattlePyramid_ExitHintLeft_Text6[]; +extern const u8 BattlePyramid_ExitHintRight_Text6[]; +extern const u8 BattlePyramid_ExitHintDown_Text6[]; +extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[]; +extern const u8 BattlePyramid_OneItemRemaining_Text6[]; +extern const u8 BattlePyramid_TwoItemsRemaining_Text6[]; +extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[]; +extern const u8 BattlePyramid_FourItemsRemaining_Text6[]; +extern const u8 BattlePyramid_FiveItemsRemaining_Text6[]; +extern const u8 BattlePyramid_SixItemsRemaining_Text6[]; +extern const u8 BattlePyramid_SevenItemsRemaining_Text6[]; +extern const u8 BattlePyramid_EightItemsRemaining_Text6[]; +extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_OneTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_FourTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_SixTrainersRemaining_Text6[]; +extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[]; + + // PC strings extern const u8 gText_ExitFromBox[]; diff --git a/include/tileset_anims.h b/include/tileset_anims.h new file mode 100755 index 000000000..0e515f044 --- /dev/null +++ b/include/tileset_anims.h @@ -0,0 +1,9 @@ +#ifndef GUARD_TILESET_ANIMS_H +#define GUARD_TILESET_ANIMS_H + +void InitTilesetAnimations(void); +void InitSecondaryTilesetAnimation(void); +void UpdateTilesetAnimations(void); +void TransferTilesetAnimsBuffer(void); + +#endif // GUARD_TILESET_ANIMS_H |