diff options
Diffstat (limited to 'include')
31 files changed, 225 insertions, 167 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index f1878d222..35039ea30 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -367,7 +367,7 @@ void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *sprite); void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void WaitAnimForDuration(struct Sprite *sprite); -void sub_8074C80(struct Sprite *sprite); +void SetupLinearTranslationWithFixedDuration(struct Sprite *sprite); void TranslateSpriteLinear(struct Sprite *sprite); void TranslateSpriteLinearFixedPoint(struct Sprite *sprite); void TranslateMonSpriteLinear(struct Sprite *sprite); @@ -412,13 +412,13 @@ void BattleAnim_InitAndRunLinearTranslationWithDuration(struct Sprite *sprite); void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite); bool8 AnimFastTranslateLinear(struct Sprite *sprite); void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); -void sub_8075830(struct Sprite *sprite); +void InitAndStartAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode); void ResetSpriteRotScale(u8 spriteId); void SetBattlerSpriteYOffsetFromRotation(u8 spriteId); void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation); -void sub_8075AD8(struct Sprite *sprite); +void TryResetSpriteAffineState(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor); u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7); @@ -439,26 +439,26 @@ void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); void StorePointerInVars(s16 *lo, s16 *hi, const void *ptr); void *LoadPointerFromVars(s16 lo, s16 hi); -void sub_80765D4(struct Task *task, u8 spriteId, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); -u8 sub_8076640(struct Task *task); +void BattleAnimHelper_SetSpriteSquashParams(struct Task *task, u8 spriteId, s16 xScale0, s16 yScale0, s16 xScale1, s16 yScale1, u16 duration); +u8 BattleAnimHelper_RunSpriteSquash(struct Task *task); void AnimTask_GetFrustrationPowerLevel(u8 taskId); -void sub_80767F0(void); +void ResetSpritePriorityOfAllVisibleBattlers(void); u8 GetBattlerSpriteSubpriority(u8 battlerId); u8 GetBattlerSpriteBGPriority(u8 battlerId); // Returns 2 if player left or opp right // Returns 1 if player right or opp left u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); -u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); +u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 templateId, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 ignoreDeoxys); void DestroySpriteAndFreeResources_(struct Sprite *sprite); s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); -u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species); -void sub_8076ED8(struct Sprite *sprite); -void sub_8076F58(struct Sprite *sprite); -void sub_8076FD0(struct Sprite *sprite); +u8 CreateCloneOfSpriteInWindowMode(s32 battlerId, u8 spriteId, s32 species); +void SpriteCB_AnimTranslateSpriteLinearAndFlicker(struct Sprite *sprite); +void SpriteCB_AnimTranslateSpriteLinearAndFlicker2(struct Sprite *sprite); +void SpriteCB_TrackOffsetFromAttackerAndWaitAnim(struct Sprite *sprite); void AnimTask_AttackerPunchWithTrace(u8 taskId); -void sub_807729C(struct Sprite *sprite); +void SpriteCB_WeatherBallUp(struct Sprite *sprite); void AnimWeatherBallDown(struct Sprite *sprite); // battle_anim_mon_movement.c diff --git a/include/berry.h b/include/berry.h index ec0caf11b..abbd20fc7 100644 --- a/include/berry.h +++ b/include/berry.h @@ -62,7 +62,7 @@ void ObjectEventInteractionPickBerryTree(void); void ObjectEventInteractionRemoveBerryTree(void); u8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); -void sub_809C794(void); +void ClearEnigmaBerries(void); const struct Berry * GetBerryInfo(u8 berryIdx); extern const struct Berry gBerries[]; diff --git a/include/blend_palette.h b/include/blend_palette.h index 7f0826187..a84e6c228 100644 --- a/include/blend_palette.h +++ b/include/blend_palette.h @@ -10,6 +10,6 @@ // Exported ROM declarations void BlendPalette(u16, u16, u8, u16); -void sub_8045314(u16 * palbuff, u16 blend_pal, u32 coefficient, s32 size); +void BlendPalettesAt(u16 * palbuff, u16 blend_pal, u32 coefficient, s32 size); #endif //GUARD_BLEND_PALETTE_H diff --git a/include/constants/battle.h b/include/constants/battle.h index e7c9d9d17..9489e8d52 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -49,7 +49,7 @@ #define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. #define BATTLE_TYPE_TRAINER 0x0008 #define BATTLE_TYPE_FIRST_BATTLE 0x0010 -#define BATTLE_TYPE_20 0x0020 +#define BATTLE_TYPE_LINK_ESTABLISHED 0x0020 // Set when the link battle setup callback finishes. #define BATTLE_TYPE_MULTI 0x0040 #define BATTLE_TYPE_SAFARI 0x0080 #define BATTLE_TYPE_BATTLE_TOWER 0x0100 diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 2e9fcaa83..f1291b1ea 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -4,14 +4,14 @@ #define OBJ_EVENT_GFX_RED_NORMAL 0 #define OBJ_EVENT_GFX_RED_BIKE 1 #define OBJ_EVENT_GFX_RED_SURF 2 -#define OBJ_EVENT_GFX_RED_ITEM 3 +#define OBJ_EVENT_GFX_RED_FIELD_MOVE 3 #define OBJ_EVENT_GFX_RED_FISH 4 #define OBJ_EVENT_GFX_RED_VS_SEEKER 5 #define OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE 6 #define OBJ_EVENT_GFX_GREEN_NORMAL 7 #define OBJ_EVENT_GFX_GREEN_BIKE 8 #define OBJ_EVENT_GFX_GREEN_SURF 9 -#define OBJ_EVENT_GFX_GREEN_ITEM 10 +#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE 10 #define OBJ_EVENT_GFX_GREEN_FISH 11 #define OBJ_EVENT_GFX_GREEN_VS_SEEKER 12 #define OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE 13 diff --git a/include/constants/flags.h b/include/constants/flags.h index 12bb5801c..9e76dd4de 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1324,7 +1324,7 @@ #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) -#define FLAG_0x808 (SYS_FLAGS + 0x8) +#define FLAG_SYS_QL_DEPARTED (SYS_FLAGS + 0x8) #define FLAG_0x809 (SYS_FLAGS + 0x9) #define FLAG_0x80A (SYS_FLAGS + 0xA) #define FLAG_0x80B (SYS_FLAGS + 0xB) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index e26f79be0..77cd6de1b 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -107,11 +107,11 @@ #define MB_CUP 0x9B #define MB_PORTHOLE 0x9C #define MB_BLINKING_LIGHTS 0x9E -#define MB_9F 0x9F +#define MB_NEATLY_LINED_UP_TOOLS 0x9F #define MB_IMPRESSIVE_MACHINE 0xA0 #define MB_VIDEO_GAME 0xA1 #define MB_BURGLARY 0xA2 -#define MB_A3 0xA3 +#define MB_TRAINER_TOWER_MONITOR 0xA3 #define MB_CYCLING_ROAD_PULL_DOWN 0xD0 #define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8a32ef7d1..737eed4d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -198,15 +198,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 -#define FRIENDSHIP_EVENT_VITAMIN 0x1 -#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 -#define FRIENDSHIP_EVENT_WALKING 0x5 -#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7 -#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8 +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_MASSAGE 6 +#define FRIENDSHIP_EVENT_FAINT_SMALL 7 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 8 +#define FRIENDSHIP_EVENT_FAINT_LARGE 9 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 @@ -218,4 +219,9 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +// used by ShouldIgnoreDeoxysForm +#define DEOXYS_CHECK_BATTLE_SPRITE 1 +#define DEOXYS_CHECK_TRADE_MAIN 3 +#define DEOXYS_CHECK_BATTLE_ANIM 5 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h index 3565c581e..58efd6ea3 100644 --- a/include/constants/quest_log.h +++ b/include/constants/quest_log.h @@ -8,6 +8,12 @@ #define QL_START_NORMAL 1 #define QL_START_WARP 2 +// gGlobalFieldTintMode +#define QL_TINT_NONE 0 +#define QL_TINT_GRAYSCALE 1 +#define QL_TINT_SEPIA 2 +#define QL_TINT_BACKUP_GRAYSCALE 3 + #define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST) #define QL_EVENT_0 0 // Null diff --git a/include/constants/vars.h b/include/constants/vars.h index 8b7ffbfbd..468b9566e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -122,7 +122,7 @@ #define VAR_EGG_BRAG_STATE 0x404A #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D +#define VAR_QL_ENTRANCE 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 1b7ee756e..25fd988ea 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -129,7 +129,7 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); u8 GetWalkFastestMovementAction(u32); -u8 sub_8063F2C(u32 direction); +u8 GetWalkSlowestMovementAction(u32 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetFaceDirectionFastMovementAction(u32); @@ -149,7 +149,8 @@ const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); u8 GetFirstInactiveObjectEventId(void); u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction); u8 sub_8063FB0(u8 direction); -void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent);void sub_805C774(void); +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); +void CancelPlayerForcedMovement(void); void FreezeObjectEvents(void); bool8 FreezeObjectEvent(struct ObjectEvent *); void UnfreezeObjectEvent(struct ObjectEvent *); @@ -208,7 +209,7 @@ u8 sub_8064008(u32 direction); u8 GetPlayerRunMovementAction(u32 direction); u8 GetPlayerRunSlowMovementAction(u32 direction); u8 GetWalkSlowMovementAction(u32 direction); -u8 sub_80640E4(u32 direction); +u8 GetSpinMovementAction(u32 direction); u8 GetAcroWheelieFaceDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieFaceDirectionMovementAction(u32 direction); u8 GetAcroEndWheelieFaceDirectionMovementAction(u32 direction); diff --git a/include/event_scripts.h b/include/event_scripts.h index 0f076ed28..437b6dcee 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1218,32 +1218,32 @@ extern const u8 PalletTown_PlayersHouse_2F_EventScript_PC[]; extern const u8 EventScript_HiddenItemScript[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_WallTownMap[]; -extern const u8 gUnknown_81A7606[]; -extern const u8 gUnknown_81A760F[]; -extern const u8 gUnknown_81A7618[]; -extern const u8 gUnknown_81A7633[]; -extern const u8 gUnknown_81A763C[]; -extern const u8 gUnknown_81A7621[]; -extern const u8 gUnknown_81A7645[]; -extern const u8 gUnknown_81A762A[]; +extern const u8 EventScript_Bookshelf[]; +extern const u8 EventScript_PokeMartShelf[]; +extern const u8 EventScript_Food[]; +extern const u8 EventScript_ImpressiveMachine[]; +extern const u8 EventScript_Blueprints[]; +extern const u8 EventScript_VideoGame[]; +extern const u8 EventScript_Burglary[]; +extern const u8 EventScript_Computer[]; extern const u8 TrainerTower_EventScript_ShowTime[]; -extern const u8 gUnknown_81A764E[]; -extern const u8 gUnknown_81A7657[]; -extern const u8 gUnknown_81A7660[]; -extern const u8 gUnknown_81A7669[]; -extern const u8 gUnknown_81A7672[]; -extern const u8 gUnknown_81A767B[]; -extern const u8 gUnknown_81A7684[]; -extern const u8 gUnknown_81A768D[]; -extern const u8 gUnknown_81A7696[]; -extern const u8 gUnknown_81A769F[]; -extern const u8 gUnknown_81A76A8[]; -extern const u8 gUnknown_81A76B1[]; -extern const u8 gUnknown_81A76BA[]; -extern const u8 gUnknown_81A76C3[]; -extern const u8 gUnknown_81A76CC[]; -extern const u8 gUnknown_81A76D5[]; -extern const u8 CableClub_EventScript_81BBFD8[]; +extern const u8 EventScript_PlayerFacingTVScreen[]; +extern const u8 EventScript_Cabinet[]; +extern const u8 EventScript_Kitchen[]; +extern const u8 EventScript_Dresser[]; +extern const u8 EventScript_Snacks[]; +extern const u8 EventScript_Painting[]; +extern const u8 EventScript_PowerPlantMachine[]; +extern const u8 EventScript_Telephone[]; +extern const u8 EventScript_AdvertisingPoster[]; +extern const u8 EventScript_TastyFood[]; +extern const u8 EventScript_TrashBin[]; +extern const u8 EventScript_Cup[]; +extern const u8 EventScript_PolishedWindow[]; +extern const u8 EventScript_BeautifulSkyWindow[]; +extern const u8 EventScript_BlinkingLights[]; +extern const u8 EventScript_NeatlyLinedUpTools[]; +extern const u8 CableClub_EventScript_ShowWirelessCommunicationScreen[]; extern const u8 EventScript_Questionnaire[]; extern const u8 CableClub_EventScript_ShowBattleRecords[]; extern const u8 EventScript_Indigo_UltimateGoal[]; diff --git a/include/field_effect.h b/include/field_effect.h index f9760d87f..a0673c517 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -20,7 +20,7 @@ void FieldCB_FallWarpExit(void); void StartEscalatorWarp(u8 metatileBehavior, u8 priority); void StartLavaridgeGymB1FWarp(u8 a0); void StartLavaridgeGym1FWarp(u8 a0); -void sub_8083598(u8 a0); +void ApplyGlobalFieldPaletteTint(u8 paletteIdx); void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 60ece38fe..a254cff83 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -28,7 +28,7 @@ void StartFishing(u8 secondaryId); u8 GetPlayerAvatarObjectId(void); u8 PlayerGetZCoord(void); u8 GetPlayerAvatarGraphicsIdByCurrentState(void); -void sub_805CB70(void); +void StartPlayerAvatarSummonMonForFieldMoveAnim(void); void SetPlayerInvisibility(bool8); void StartTeleportInPlayerAnim(void); void StartTeleportWarpOutPlayerAnim(void); @@ -37,11 +37,11 @@ bool32 WaitTeleportInPlayerAnim(void); bool8 PartyHasMonWithSurf(void); bool8 IsPlayerSurfingNorth(void); u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); -void sub_805CBE8(void); +void StartPlayerAvatarVsSeekerAnim(void); u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior); -void sub_805C0D4(u8 direction); +void PlayerGoSlowest(u8 direction); void PlayerGoSlow(u8 direction); void PlayerGoSpeed1(u8 direction); void PlayerGoSpeed2(u8 direction); @@ -59,7 +59,7 @@ void PlayerJumpLedge(u8 direction); void sub_805C260(void); void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); -void sub_805BEB8(void); +void UpdatePlayerAvatarTransitionState(void); void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender); void nullsub_24(u8 direction); u8 GetRSAvatarGraphicsIdByGender(u8 gender); diff --git a/include/field_specials.h b/include/field_specials.h index 0a4ea7bce..08518da03 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -34,7 +34,7 @@ void IncrementBirthIslandRockStepCount(void); void ResetCyclingRoadChallengeData(void); void ResetFieldTasksArgs(void); bool8 UsedPokemonCenterWarp(void); -void sub_80CC534(void); -void sub_80CC59C(void); +void QuestLog_CheckDepartingIndoorsMap(void); +void QuestLog_TryRecordDepartedLocation(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/field_weather.h b/include/field_weather.h index 195b35318..334bc0863 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -35,8 +35,8 @@ struct Weather u8 fadeScreenCounter; bool8 readyForInit; u8 taskId; - u8 unknown_6CA; - u8 unknown_6CB; + u8 fadeInActive; + u8 fadeInCounter; u16 initStep; u16 finishStep; u8 currWeather; @@ -100,10 +100,10 @@ struct Weather u8 blendUpdateCounter; u8 blendFrameCounter; u8 blendDelay; - s16 unknown_73C; - s16 unknown_73E; - s16 unknown_740; - s16 unknown_742; + s16 droughtBrightnessStage; + s16 droughtLastBrightnessStage; + s16 droughtTimer; + s16 droughtState; u8 filler_744[0xD-4]; s8 loadDroughtPalsIndex; u8 loadDroughtPalsOffset; @@ -119,11 +119,11 @@ void sub_80AEDBC(void); void DoCurrentWeather(void); void SetSav1WeatherFromCurrMapHeader(void); -void sub_807B0C4(u16 *, u16 *, u32); +void SlightlyDarkenPalsInWeather(u16 *, u16 *, u32); void PlayRainStoppingSoundEffect(void); bool8 IsWeatherNotFadingIn(void); void SetWeatherScreenFadeOut(void); -void sub_807B070(void); +void WeatherProcessingIdle(void); u8 GetCurrentWeather(void); void delay(u8, u8, u32); void UpdateSpritePaletteWithWeather(u8 palIdx); @@ -138,11 +138,11 @@ bool8 Weather_UpdateBlend(void); void LoadCustomWeatherSpritePalette(const u16 *palette); void ResetDroughtWeatherPaletteLoading(void); bool8 LoadDroughtWeatherPalettes(void); -void sub_807AC60(void); -void sub_807AC98(void); +void DroughtStateInit(void); +void DroughtStateRun(void); void SetRainStrengthFromSoundEffect(u16 soundEffect); -void sub_807A790(s8 gammaIndex); -void sub_807A7C4(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); +void WeatherShiftGammaIfPalStateIdle(s8 gammaIndex); +void WeatherBeginGammaFade(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); void ApplyWeatherGammaShiftToPal(u8 paletteIndex); void StartWeather(void); void ResumePausedWeather(void); diff --git a/include/fieldmap.h b/include/fieldmap.h index 4ac3a4712..d2eada760 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -28,7 +28,7 @@ bool32 CanCameraMoveInDirection(s32); u32 GetBehaviorByMetatileIdAndMapLayout(const struct MapLayout *mapLayout, u16 metatile, u8 attr); const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection); struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); -void sub_8059948(u8 a0, u8 a1); +void Fieldmap_ApplyGlobalTintToPaletteSlot(u8 slot, u8 count); void save_serialize_map(void); u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 202ff6bd6..28737b520 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -272,19 +272,28 @@ enum { PLAYER_AVATAR_STATE_ACRO_BIKE, PLAYER_AVATAR_STATE_SURFING, PLAYER_AVATAR_STATE_UNDERWATER, - PLAYER_AVATAR_STATE_FIELD_MOVE, - PLAYER_AVATAR_STATE_FISHING, - PLAYER_AVATAR_STATE_WATERING, + PLAYER_AVATAR_STATE_CONTROLLABLE, + PLAYER_AVATAR_STATE_FORCED, + PLAYER_AVATAR_STATE_DASH, }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) -#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) -#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) -#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) -#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) -#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) +#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) +#define PLAYER_AVATAR_FLAG_CONTROLLABLE (1 << PLAYER_AVATAR_STATE_CONTROLLABLE) +#define PLAYER_AVATAR_FLAG_FORCED (1 << PLAYER_AVATAR_STATE_FORCED) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_DASH) + +enum { + PLAYER_AVATAR_GFX_NORMAL, + PLAYER_AVATAR_GFX_BIKE, + PLAYER_AVATAR_GFX_RIDE, + PLAYER_AVATAR_GFX_FIELD_MOVE, + PLAYER_AVATAR_GFX_FISH, + PLAYER_AVATAR_GFX_VSSEEKER, +}; enum { diff --git a/include/graphics.h b/include/graphics.h index 64ae039f8..81b6b4ddf 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4330,7 +4330,7 @@ extern const u32 gSubstituteDollPal[]; // ice extern const u8 gWeatherFogHorizontalTiles[]; extern const u32 gBattleAnimFogTilemap[]; -extern const u16 gUnknown_83C2CE0[]; +extern const u16 gDefaultWeatherSpritePalette[]; // party_menu extern const u32 gPartyMenuPokeball_Gfx[]; diff --git a/include/help_system.h b/include/help_system.h index 8a078f3bc..92e97731e 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -34,7 +34,7 @@ void SetHelpContextDontCheckBattle(u8); void SetHelpContextForMap(void); void SetHelpContext(u8); bool8 HelpSystem_UpdateHasntSeenIntro(void); -bool8 sub_812B45C(void); +bool8 HelpSystem_IsSinglePlayer(void); void HelpSystem_Disable(void); void HelpSystem_Enable(void); void HelpSystem_EnableToggleWithRButton(void); @@ -50,7 +50,7 @@ void HelpSystem_PrintTopicLabel(void); bool8 HelpMenuSubroutine_HelpItemPrint(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer); bool8 HelpMenuSubroutine_ReturnFromHelpItem(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer); bool8 HelpMenuSubroutine_HelpItemWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer); -bool8 sub_812BF88(void); +bool8 GetHelpSystemMenuLevel(void); // help_system bool8 RunHelpSystemCallback(void); @@ -63,30 +63,30 @@ void RestoreGPURegs(void); void RestoreMapTiles(void); void RestoreMapTextColors(void); void CommitTilemap(void); -void sub_813BCF4(void); -void sub_813BD14(u8); -void sub_813BD5C(u8); -void sub_813BDA4(u8); -void sub_813BDE8(u8); -void sub_813BE30(u8); -void sub_813BE78(u8); -void sub_813BEE4(u8); -void sub_813BF50(u8); -void sub_813BFC0(u8); -void sub_813C004(u8, u8); +void HS_BufferFillMapWithTile1FF(void); +void HS_ShowOrHideWordHELPinTopLeft(u8 mode); +void HS_ShowOrHideControlsGuideInTopRight(u8 mode); +void HS_ShowOrHideMainWindowText(u8 mode); +void HS_SetMainWindowBgBrightness(u8 mode); +void HS_ShowOrHideToplevelTooltipWindow(u8 mode); +void HS_ShowOrHideHeaderAndFooterLines_Lighter(u8 mode); +void HS_ShowOrHideHeaderAndFooterLines_Darker(u8 mode); +void HS_ShowOrHideVerticalBlackBarsAlongSides(u8 mode); +void HS_ShowOrHideHeaderLine_Darker_FooterStyle(u8 mode); +void HS_ShowOrHideScrollArrows(u8 which, u8 mode); void HelpSystem_PrintTextRightAlign_Row52(const u8 *str); void HelpSystem_PrintTextAt(const u8 *, u8, u8); -void HelpSystem_PrintTwoStrings(const u8 *a0, const u8 *a1); -void HelpSystem_PrintText_813C584(const u8 *str); +void HelpSystem_PrintQuestionAndAnswerPair(const u8 *a0, const u8 *a1); +void HelpSystem_PrintTopicMouseoverDescription(const u8 *str); void HelpSystem_FillPanel2(void); void HelpSystem_FillPanel1(void); void HelpSystem_InitListMenuController(struct HelpSystemListMenu *, u8, u8); void HelpSystem_SetInputDelay(u8); s32 HelpSystem_GetMenuInput(void); -void sub_813C75C(void); +void HS_UpdateMenuScrollArrows(void); void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); -void HelpSystem_PrintText_Row61(const u8 * str); +void HelpSystem_PrintTextInTopLeftCorner(const u8 * str); void HelpSystem_FillPanel3(void); void PrintListMenuItems(void); void PlaceListMenuCursor(void); diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index 8af4664a0..9d29c31e9 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -127,7 +127,7 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior); bool8 MetatileBehavior_IsDresser(u8 metatileBehavior); bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior); bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingMB_8D(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection); bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection); bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior); bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior); @@ -143,13 +143,13 @@ bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior); bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior); bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior); bool8 MetatileBehavior_IsCup(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_19(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_20(u8 metatileBehavior); +bool8 MetatileBehavior_IsPolishedWindow(u8 metatileBehavior); +bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior); bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior); -bool8 MetatileBehavior_IsMB9F(u8 metatileBehavior); +bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior); bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); -bool8 MetatileBehavior_IsMBA3(u8 metatileBehavior); +bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior); #endif // GUARD_METATILE_BEHAVIOR diff --git a/include/overworld.h b/include/overworld.h index e28a75064..d97aa40dc 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -127,7 +127,7 @@ void CleanupOverworldWindowsAndTilemaps(void); u32 ComputeWhiteOutMoneyLoss(void); extern u8 gDisableMapMusicChangeOnMapLoad; -extern u8 gUnknown_2036E28; +extern u8 gGlobalFieldTintMode; extern bool8 (* gFieldCallback2)(void); diff --git a/include/quest_log.h b/include/quest_log.h index ffe5c2cea..295f942f2 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -6,12 +6,17 @@ #include "constants/quest_log.h" #include "field_control_avatar.h" +// Parameter to QuestLog_OnEscalatorWarp +#define QL_ESCALATOR_OUT 1 +#define QL_ESCALATOR_IN 2 + struct QuestLogEntry { - u8 localId; - u8 mapNum; - u8 mapGroup; - u8 animId; + // When command == 2, these fields have different meanings + u8 localId; // cmd == 2: Pressed A/B, checked wild, held direction, took step + u8 mapNum; // cmd == 2: Always set to 0 + u8 mapGroup; // cmd == 2: Dpad direction + u8 animId; // cmd == 2: Always set to 0 u16 duration; u8 command; }; @@ -32,13 +37,13 @@ extern u16 *gUnknown_203AE04; extern u16 *sEventRecordingPointer; extern u16 sQuestLogCursor; -void sub_8112720(u8); +void QuestLogRecordPlayerAvatarGfxTransition(u8); void SetQuestLogEvent(u16, const u16 *); void SetQLPlayedTheSlots(void); void QuestLog_RecordEnteredMap(u16); u8 sub_8112CAC(void); bool8 QuestLog_SchedulePlaybackCB(void (*func)(void)); -void sub_8111F38(u16 offset, u16 idx); +void QuestLog_BackUpPalette(u16 offset, u16 size); void CommitQuestLogWindow1(void); void QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(void); void ResetQuestLog(void); @@ -54,15 +59,15 @@ void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value); void SetQuestLogRecordAndPlaybackPointers(void *oldSave); void sub_811246C(struct Sprite *sprite); -void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3); +void QuestLogRecordNPCStep(u8 a0, u8 a1, u8 a2, u8 a3); bool8 sub_8111C2C(void); -void sub_81128BC(u8 a0); -void sub_811278C(u8 movementActionId, u8 duration); +void QuestLog_OnEscalatorWarp(u8 direction); +void QuestLogRecordPlayerAvatarGfxTransitionWithDuration(u8 movementActionId, u8 duration); void Special_UpdateTrainerFansAfterLinkBattle(void); -void sub_8112628(u8 movementActionId); -void sub_81126AC(u8 movementActionId, u8 duration); -void sub_8112588(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration); -void sub_8112C9C(void); +void QuestLogRecordPlayerStep(u8 movementActionId); +void QuestLogRecordPlayerStepWithDuration(u8 movementActionId, u8 duration); +void QuestLogRecordNPCStepWithDuration(u8 localId, u8 mapNum, u8 mapGroup, u8 movementActionId, u8 duration); +void QL_AfterRecordFishActionSuccessful(void); void sub_8110920(void); void sub_8111708(void); void sub_81127F8(struct FieldInput * a0); @@ -73,7 +78,7 @@ bool8 QuestLogScenePlaybackIsEnding(void); void sub_8115798(void); bool8 QuestLog_ShouldEndSceneOnMapChange(void); void QuestLog_AdvancePlayhead_(void); -void sub_8111F14(void); +void QuestLog_InitPalettesBackup(void); void sub_8110FCC(void); u8 GetQuestLogStartType(void); void sub_81113E4(void); @@ -90,7 +95,7 @@ u16 *sub_8113CC8(u16 *, struct QuestLogEntry *); u16 *sub_8113D08(u16 *, struct QuestLogEntry *); u16 *sub_8113D48(u16 *, struct QuestLogEntry *); u16 *sub_8113D94(u16 *, struct QuestLogEntry *); -void sub_811381C(void); +void QL_EnableRecordingSteps(void); u16 *QuestLog_SkipCommand(u16 *, u16 **); void sub_8113ABC(const u16 *); u16 *sub_8113C20(u16 *, struct QuestLogEntry *); diff --git a/include/quest_log_player.h b/include/quest_log_player.h index 5aee3f2d0..2b6bb182c 100644 --- a/include/quest_log_player.h +++ b/include/quest_log_player.h @@ -3,8 +3,18 @@ #include "global.h" -void sub_8150454(void); -bool32 sub_8150474(u8 a0); -void sub_8150498(u8 a0); +#define QL_PLAYER_GFX_NORMAL 0 +#define QL_PLAYER_GFX_BIKE 1 +#define QL_PLAYER_GFX_FISH 2 +#define QL_PLAYER_GFX_SURF 3 +#define QL_PLAYER_GFX_STOP_SURF_S 4 +#define QL_PLAYER_GFX_STOP_SURF_N 5 +#define QL_PLAYER_GFX_STOP_SURF_W 6 +#define QL_PLAYER_GFX_STOP_SURF_E 7 +#define QL_PLAYER_GFX_VSSEEKER 8 + +void QuestLogUpdatePlayerSprite(u8 state); +bool32 QuestLogTryRecordPlayerAvatarGfxTransition(u8 state); +void QuestLogCallUpdatePlayerSprite(u8 state); #endif //GUARD_QUEST_LOG_PLAYER_H diff --git a/include/save.h b/include/save.h index 24c03b0fa..3c1962f28 100644 --- a/include/save.h +++ b/include/save.h @@ -105,9 +105,9 @@ u16 CalculateChecksum(void *data, u16 size); void UpdateSaveAddresses(void); u8 HandleSavingData(u8 saveType); u8 TrySavingData(u8 saveType); -u8 sub_80DA3AC(void); -bool8 sub_80DA3D8(void); -u8 sub_80DA40C(void); +u8 SaveGame_AfterLinkTrade(void); +bool8 AfterLinkTradeSaveFailed(void); +u8 ClearSaveAfterLinkTradeSaveFailure(void); u8 sub_80DA434(void); u8 sub_80DA45C(void); bool8 sub_80DA4A0(void); diff --git a/include/sound.h b/include/sound.h index 8ce8a62ad..840c23865 100644 --- a/include/sound.h +++ b/include/sound.h @@ -46,7 +46,7 @@ void SE12PanpotControl(s8 pan); bool8 IsSEPlaying(void); bool8 IsBGMPlaying(void); bool8 IsSpecialSEPlaying(void); -void sub_8072474(u16 volume); -void sub_807249C(void); +void SetBGMVolume_SuppressHelpSystemReduction(u16 volume); +void BGMVolumeMax_EnableHelpSystemReduction(void); #endif // GUARD_SOUND_H diff --git a/include/strings.h b/include/strings.h index b4783c3c4..5ff490fcf 100644 --- a/include/strings.h +++ b/include/strings.h @@ -148,10 +148,10 @@ extern const u8 gTeachyTvText_TMsScript2[]; extern const u8 gTeachyTvText_RegisterScript2[]; // help_system_812B1E0 -extern const u8 gUnknown_841DFA5[]; -extern const u8 gUnknown_841DFAC[]; -extern const u8 gUnknown_841DFBE[]; -extern const u8 gUnknown_841DFC9[]; +extern const u8 gText_HelpSystemControls_A_Next[]; +extern const u8 gText_HelpSystemControls_PickOkEnd[]; +extern const u8 gText_HelpSystemControls_AorBtoCancel[]; +extern const u8 gText_HelpSystemControls_PickOkCancel[]; // help_system extern const u8 gString_Bill[]; diff --git a/include/text.h b/include/text.h index cd10de3e6..f181c6d9c 100644 --- a/include/text.h +++ b/include/text.h @@ -81,16 +81,17 @@ #define CHAR_x 0xEC #define CHAR_y 0xED #define CHAR_z 0xEE -#define CHAR_SPECIAL_F7 0xF7 -#define CHAR_KEYPAD_ICON 0xF8 -#define CHAR_EXTRA_EMOJI 0xF9 #define CHAR_COLON 0xF0 -#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog -#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog -#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code -#define PLACEHOLDER_BEGIN 0xFD // string placeholder -#define CHAR_NEWLINE 0xFE -#define EOS 0xFF // end of string + +#define CHAR_DYNAMIC_PLACEHOLDER 0xF7 +#define CHAR_KEYPAD_ICON 0xF8 +#define CHAR_EXTRA_EMOJI 0xF9 +#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog +#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog +#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code +#define PLACEHOLDER_BEGIN 0xFD // string placeholder +#define CHAR_NEWLINE 0xFE +#define EOS 0xFF // end of string #define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_WHITE 0x1 @@ -125,19 +126,30 @@ #define PLACEHOLDER_ID_KYOGRE 0xD // battle placeholders are located in battle_message.h -#define EXT_CTRL_CODE_COLOR 0x1 -#define EXT_CTRL_CODE_HIGHLIGHT 0x2 -#define EXT_CTRL_CODE_SHADOW 0x3 -#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4 -// -#define EXT_CTRL_CODE_UNKNOWN_7 0x7 -// -#define EXT_CTRL_CODE_CLEAR 0x11 -// -#define EXT_CTRL_CODE_CLEAR_TO 0x13 -#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14 -#define EXT_CTRL_CODE_JPN 0x15 -#define EXT_CTRL_CODE_ENG 0x16 +#define EXT_CTRL_CODE_COLOR 0x1 +#define EXT_CTRL_CODE_HIGHLIGHT 0x2 +#define EXT_CTRL_CODE_SHADOW 0x3 +#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4 +#define EXT_CTRL_CODE_PALETTE 0x5 +#define EXT_CTRL_CODE_FONT 0x6 +#define EXT_CTRL_CODE_RESET_FONT 0x7 +#define EXT_CTRL_CODE_PAUSE 0x8 +#define EXT_CTRL_CODE_WAIT_BUTTON 0x9 +#define EXT_CTRL_CODE_WAIT_SE 0xA +#define EXT_CTRL_CODE_PLAY_BGM 0xB +#define EXT_CTRL_CODE_ESCAPE 0xC +#define EXT_CTRL_CODE_SHIFT_RIGHT 0xD +#define EXT_CTRL_CODE_SHIFT_DOWN 0xE +#define EXT_CTRL_CODE_FILL_WINDOW 0xF +#define EXT_CTRL_CODE_PLAY_SE 0x10 +#define EXT_CTRL_CODE_CLEAR 0x11 +#define EXT_CTRL_CODE_SKIP 0x12 +#define EXT_CTRL_CODE_CLEAR_TO 0x13 +#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14 +#define EXT_CTRL_CODE_JPN 0x15 +#define EXT_CTRL_CODE_ENG 0x16 +#define EXT_CTRL_CODE_STOP_BGM 0x17 +#define EXT_CTRL_CODE_RESUME_BGM 0x18 #define NUM_TEXT_PRINTERS 32 @@ -156,6 +168,15 @@ enum FONTATTR_COLOR_SHADOW }; +struct GlyphInfo +{ + u8 pixels[0x80]; + u8 width; + u8 height; +}; + +extern struct GlyphInfo gGlyphInfo; + struct TextPrinterSubStruct { u8 glyphId:4; // 0x14 @@ -305,7 +326,7 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese); s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); void sub_80062B0(struct Sprite *sprite); u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority); -void sub_8006398(u8 spriteId); +void DestroyTextCursorSprite(u8 spriteId); s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese); #endif // GUARD_TEXT_H diff --git a/include/trade.h b/include/trade.h index 75ec5e178..04ea9406b 100644 --- a/include/trade.h +++ b/include/trade.h @@ -12,7 +12,7 @@ extern const u8 gText_MaleSymbol4[]; extern const u8 gText_FemaleSymbol4[]; extern const u8 gText_GenderlessSymbol[]; -extern const u16 gUnknown_826601C[]; +extern const u16 gTradeOrHatchMonShadowTilemap[]; void CB2_ReturnFromLinkTrade(void); s32 Trade_CalcLinkPlayerCompatibilityParam(void); s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isEventLegal); diff --git a/include/trade_scene.h b/include/trade_scene.h index 52e80e418..31679eafe 100644 --- a/include/trade_scene.h +++ b/include/trade_scene.h @@ -11,7 +11,7 @@ void InitTradeSequenceBgGpuRegs(void); void LinkTradeDrawWindow(void); void LoadTradeAnimGfx(void); -extern const u16 gUnknown_826601C[]; +extern const u16 gTradeOrHatchMonShadowTilemap[]; extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate; #endif //GUARD_TRADE_SCENE_H diff --git a/include/wild_encounter.h b/include/wild_encounter.h index fd44b7d4a..8e151d55d 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -34,7 +34,7 @@ struct WildPokemonHeader extern const struct WildPokemonHeader gWildMonHeaders[]; void DisableWildEncounters(bool8 disabled); -bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior); +bool8 StandardWildEncounter(u32 currMetatileAttrs, u16 previousMetaTileBehavior); bool8 SweetScentWildEncounter(void); bool8 DoesCurrentMapHaveFishingMons(void); void FishingWildEncounter(u8 rod); @@ -46,6 +46,6 @@ u8 GetUnownLetterByPersonalityLoByte(u32 personality); bool8 SweetScentWildEncounter(void); void SeedWildEncounterRng(u16 randVal); void ResetEncounterRateModifiers(void); -bool8 TryStandardWildEncounter(u32 currMetatileBehavior); +bool8 TryStandardWildEncounter(u32 currMetatileAttrs); #endif // GUARD_WILD_ENCOUNTER_H |