From f9b70b820b697c9be5cc1b449d591c5c73fd5734 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Sep 2023 00:05:09 -0400 Subject: [PATCH] Synced symbols with pmdsky-debug --- asm/include/overlay_29_022E9618.inc | 9 +- asm/include/overlay_29_022EAB50.inc | 10 +- asm/include/overlay_29_022EE36C.inc | 8 +- asm/include/overlay_29_022F7388.inc | 8 +- asm/include/overlay_29_022FC9C0.inc | 4 +- asm/include/overlay_29_02307F1C.inc | 2 +- asm/include/overlay_29_02308FE0.inc | 90 +++--- asm/include/overlay_29_0230F02C.inc | 18 +- asm/include/overlay_29_02319FB0.inc | 4 +- asm/include/overlay_29_0231B1B8.inc | 44 +-- asm/include/overlay_29_0231CBEC.inc | 104 +++---- asm/include/overlay_29_0231F594.inc | 2 +- asm/include/overlay_29_0232A3FC.inc | 38 +-- asm/include/overlay_29_0232C524.inc | 32 +-- asm/include/overlay_29_0232E274.inc | 10 +- asm/include/overlay_29_0232E864.inc | 6 +- asm/include/overlay_29_02337CCC.inc | 24 +- asm/main_0200C4CC.s | 36 +-- asm/overlay_10.s | 424 ++++++++++++++-------------- asm/overlay_29_022E9618.s | 12 +- asm/overlay_29_022EAB50.s | 26 +- asm/overlay_29_022EE36C.s | 20 +- asm/overlay_29_022F7388.s | 16 +- asm/overlay_29_022FC9C0.s | 4 +- asm/overlay_29_02307F1C.s | 4 +- asm/overlay_29_02308FE0.s | 238 ++++++++-------- asm/overlay_29_0230F02C.s | 40 +-- asm/overlay_29_02319FB0.s | 10 +- asm/overlay_29_0231B1B8.s | 88 +++--- asm/overlay_29_0231CBEC.s | 40 +-- asm/overlay_29_0231F594.s | 4 +- asm/overlay_29_0232A3FC.s | 120 ++++---- asm/overlay_29_0232C524.s | 84 +++--- asm/overlay_29_0232E274.s | 36 +-- asm/overlay_29_0232E864.s | 12 +- asm/overlay_29_02337CCC.s | 60 ++-- asm/overlay_29_0234EC38.s | 88 +++--- 37 files changed, 887 insertions(+), 888 deletions(-) diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index b836d370..6b4d5558 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -2,6 +2,10 @@ .public __divsi3 .public _020AFC4C .public abs +.public DIRECTIONS_XY +.public DISPLACEMENTS_WITHIN_2_LARGEST_FIRST +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +.public DISPLACEMENTS_WITHIN_3 .public DisplayUi .public EntityIsValid__022E95F4 .public GetLeader @@ -32,14 +36,10 @@ .public ov29_0234B854 .public ov29_02351628 .public ov29_02351658 -.public DIRECTIONS_XY .public ov29_0235171E .public ov29_0235179C .public ov29_023517A0 .public ov29_023517A2 -.public ov29_023517DC -.public ov29_02351844 -.public ov29_023518AC .public ov29_02353538 .public ov29_02353540 .public ov29_02353560 @@ -54,4 +54,3 @@ .public sub_02051E20 .public UpdateCamera .public UpdateMinimap - diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index c783cde7..30abef21 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -12,6 +12,8 @@ .public EnemyEvolution .public EntityIsValid__022EC608 .public ExecuteMonsterAction +.public FIXED_ROOM_PROPERTIES_TABLE +.public FRACTIONAL_TURN_SEQUENCE .public GetCanMoveFlag .public GetEquivItemIndex .public GetFloorType @@ -25,12 +27,11 @@ .public IsCurrentFixedRoomBossFight .public IsFloorOver .public IsHM +.public ITEM_CATEGORY_ACTIONS .public ItemZInit .public LogMessageByIdWithPopupCheckUserTarget .public MoveMonsterToPos -.public ov10_022C51FC -.public ov10_022C555C -.public ov10_022C6C70 +.public MUSIC_ID_TABLE .public ov29_022E555C .public ov29_022E81F8 .public ov29_022EF9C8 @@ -39,12 +40,10 @@ .public ov29_02347040 .public ov29_02348FD8 .public ov29_023516E8 -.public ov29_02352010 .public ov29_02352030 .public ov29_02352032 .public ov29_02352070 .public ov29_02352074 -.public ov29_02352284 .public ov29_023522B6 .public ov29_02353538 .public ov29_02353570 @@ -54,6 +53,7 @@ .public ov29_0237C920 .public ov29_0237C922 .public ov29_0237C96C +.public RANDOM_MUSIC_ID_TABLE .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public RemoveGroundItem diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 334e1b51..47d6a504 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -3,9 +3,11 @@ .public AnimationDelayOrSomething .public ApplyDamageAndEffectsWrapper .public AreLateGameTrapsEnabled +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR .public CalcStatusDuration .public DIRECTIONS_XY +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST .public DrawMinimapTile .public DungeonRandInt .public EntityIsValid__022EE348 @@ -39,7 +41,6 @@ .public ov10_022C44E4 .public ov10_022C45C8 .public ov10_022C45CC -.public ov10_022C4720 .public ov10_022C4770 .public ov10_022C4B18 .public ov10_022C6C7A @@ -59,14 +60,13 @@ .public ov29_02346344 .public ov29_0234B084 .public ov29_0235171E -.public ov29_02351844 -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353538 .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem .public RemoveHeldItemNoHole .public ShouldDisplayEntityWrapper +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnMonster .public sub_02001888 .public sub_0200FA68 diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 2c91df71..f6f5083e 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -7,10 +7,12 @@ .public AnimationDelayOrSomething .public ApplyItemEffect .public BAG_ITEMS_PTR_MIRROR +.public BELLY_DRAIN_IN_WALLS_INT .public CanAttackInDirection .public CanMonsterSpawn .public CanMonsterUseItem .public CanSeeTarget +.public CASTFORM_WEATHER_ATTRIBUTE_TABLE .public CeilFixedPoint .public CheckTeamMemberIdx .public Conversion2IsActive @@ -32,6 +34,7 @@ .public EntityIsValid__022F7364 .public EntityIsValid__022FC99C .public ExclusiveItemEffectFlagTest +.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE .public FreeOtherWrappedMonsters .public GendersEqualNotGenderless .public GetAbility @@ -116,11 +119,8 @@ .public MemFree .public MonsterIsType .public OpenMessageLog -.public ov10_022C48DC -.public ov10_022C4C6C .public ov10_022C4C6E .public ov10_022C4C70 -.public ov10_022C5938 .public ov29_022DDA54 .public ov29_022DDB68 .public ov29_022E0A04 @@ -177,7 +177,6 @@ .public ov29_0234EF24 .public ov29_0235171E .public ov29_02351E28 -.public ov29_02352768 .public ov29_02353538 .public ov29_0235355C .public ov29_0237C9B0 @@ -225,4 +224,5 @@ .public UpdateMinimap .public UpdateStatusIconFlags .public WAN_TABLE +.public WEATHER_BALL_TYPE_TABLE .public YesNoMenu diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 4f233dd5..867066da 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -1,10 +1,10 @@ #pragma once -.public OUTLAW_LEVEL_TABLE .public AbilityIsActiveVeneer .public AddHeldItemToBag .public AdvanceFrame .public AnimationDelayOrSomething .public CalcSpeedStageWrapper +.public CASTFORM_WEATHER_ATTRIBUTE_TABLE .public CreateEnemyEntity .public DIRECTIONS_XY .public DisplayActions @@ -63,11 +63,11 @@ .public MewSpawnCheck .public MoveMonsterToPos .public MultiplyByFixedPoint +.public OUTLAW_LEVEL_TABLE .public ov10_022C4520 .public ov10_022C45A4 .public ov10_022C4858 .public ov10_022C489C -.public ov10_022C4C6C .public ov10_022C4F3C .public ov10_022C4F3D .public ov29_022DDA54 diff --git a/asm/include/overlay_29_02307F1C.inc b/asm/include/overlay_29_02307F1C.inc index 7f036be9..743559b6 100644 --- a/asm/include/overlay_29_02307F1C.inc +++ b/asm/include/overlay_29_02307F1C.inc @@ -10,8 +10,8 @@ .public GetTileSafe .public HasHeldItem .public MewSpawnCheck +.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS .public MultiplyByFixedPoint .public ov10_022C4560 -.public ov10_022C4660 .public ov29_02353538 .public SpawnMonster diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index ccff7fd8..acfd28c2 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -1,31 +1,42 @@ #pragma once .public __divsi3 -.public _020A18CC -.public _020A18D4 -.public _020A18D8 -.public _020A18E8 -.public _020A18EC -.public _020A18F0 -.public _020A18F4 -.public _020A18F8 .public AbilityIsActiveVeneer .public abs .public ActivateMotorDrive .public AddExpSpecial .public AddFixedPoint64 .public AdvanceFrame +.public AFTERMATH_CHANCE +.public AIR_BLADE_DAMAGE_MULTIPLIER .public ApplyDamageAndEffects .public AURA_BOW_STAT_BOOST .public AuraBowIsActive .public BAG_ITEMS_PTR_MIRROR +.public BURN_DAMAGE_MULTIPLIER .public CanEnemyEvolve .public CanSeeTarget .public CeilFixedPoint .public ChangeDungeonMusic .public ClampedLn +.public CLOUDY_DAMAGE_MULTIPLIER +.public DAMAGE_FORMULA_AT_PREFACTOR +.public DAMAGE_FORMULA_CONSTANT_SHIFT +.public DAMAGE_FORMULA_DEF_PREFACTOR +.public DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR +.public DAMAGE_FORMULA_FLV_SHIFT +.public DAMAGE_FORMULA_LN_ARG_PREFACTOR +.public DAMAGE_FORMULA_LN_PREFACTOR +.public DAMAGE_FORMULA_MAX_BASE +.public DAMAGE_FORMULA_MIN_BASE +.public DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +.public DAMAGE_MULTIPLIER_0_5 +.public DAMAGE_MULTIPLIER_1_5 +.public DAMAGE_MULTIPLIER_2 +.public DAMAGE_STRING_IDS .public DebugPrint0 .public DebugRecruitingEnabled .public DEF_SCARF_STAT_BOOST +.public DEFENSIVE_STAT_STAGE_MULTIPLIERS .public DivideFixedPoint64 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -95,6 +106,15 @@ .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public MATCHUP_IMMUNE_MULTIPLIER +.public MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_NEUTRAL_MULTIPLIER +.public MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER +.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +.public ME_FIRST_MULTIPLIER .public MemZero .public MewSpawnCheck .public MonsterHasNegativeStatus @@ -106,52 +126,25 @@ .public MUNCH_BELT_STAT_BOOST .public MusicTableIdxToMusicId .public NearbyAllyIqSkillIsEnabled +.public OFFENSIVE_STAT_STAGE_MULTIPLIERS .public OtherMonsterAbilityIsActive .public ov10_022BDC68 .public ov10_022BDE50 .public ov10_022BF964 .public ov10_022C4410 .public ov10_022C441C -.public ov10_022C4430 .public ov10_022C443C .public ov10_022C447C -.public ov10_022C44DC .public ov10_022C44FC -.public ov10_022C4510 -.public ov10_022C455C -.public ov10_022C4594 -.public ov10_022C4598 .public ov10_022C45B4 .public ov10_022C45C4 -.public ov10_022C45E0 .public ov10_022C45FC -.public ov10_022C4640 -.public ov10_022C46A4 -.public ov10_022C46F0 .public ov10_022C46FC .public ov10_022C4700 .public ov10_022C4704 .public ov10_022C4708 .public ov10_022C470C -.public ov10_022C4710 -.public ov10_022C4744 -.public ov10_022C474C -.public ov10_022C4758 -.public ov10_022C47C0 -.public ov10_022C47F8 -.public ov10_022C4810 -.public ov10_022C4818 -.public ov10_022C481C -.public ov10_022C4820 -.public ov10_022C4824 -.public ov10_022C482C .public ov10_022C4834 -.public ov10_022C4844 -.public ov10_022C4D14 -.public ov10_022C4D98 -.public ov10_022C4DEC -.public ov10_022C5064 -.public ov10_022C56B0 .public ov10_022C593C .public ov29_022E1B28 .public ov29_022E2470 @@ -213,16 +206,8 @@ .public ov29_0234EE10 .public ov29_0234F008 .public ov29_02352838 -.public ov29_0235283C -.public ov29_02352844 -.public ov29_0235284C -.public ov29_0235285C -.public ov29_02352864 -.public ov29_0235286C -.public ov29_0235287C .public ov29_02352884 .public ov29_02352894 -.public ov29_023528A4 .public ov29_02352984 .public ov29_02352990 .public ov29_0235299C @@ -234,7 +219,6 @@ .public ov29_0235322C .public ov29_02353230 .public ov29_02353234 -.public ov29_02353330 .public ov29_02353538 .public ov29_023535D4 .public ov29_0237CA6C @@ -250,16 +234,25 @@ .public PlayEffectAnimationEntity .public PointCameraToMonster .public POWER_BAND_STAT_BOOST +.public POWER_PITCHER_DAMAGE_MULTIPLIER .public PreprocessString +.public RECRUITMENT_LEVEL_BOOST_TABLE .public ResetDamageData .public RestorePpAllMovesSetFlags .public RestoreRandomMovePP .public RoundUpDiv256 +.public SCOPE_LENS_CRIT_RATE_BOOST +.public SET_DAMAGE_STATUS_DAMAGE .public SetItemAcquired .public SetMonsterFlag2 .public SetPokemonBattled .public SetPokemonJoined .public ShouldDisplayEntityWrapper +.public SOLID_ROCK_MULTIPLIER +.public SPAWN_CAP_NO_MONSTER_HOUSE +.public SPAWN_CAP_WITH_MONSTER_HOUSE +.public SPAWN_COOLDOWN +.public SPAWN_COOLDOWN_THIEF_ALERT .public SpawnDroppedItemWrapper .public SpawnMonster .public SPECIAL_BAND_STAT_BOOST @@ -280,9 +273,16 @@ .public sub_02058EB0 .public SubInitMonster .public SubstitutePlaceholderStringTags +.public SUPER_LUCK_CRIT_RATE_BOOST +.public TECHNICIAN_MOVE_POWER_THRESHOLD +.public TINTED_LENS_MULTIPLIER .public TryAftermathExplosion .public TryIncreaseHp .public TrySpawnEnemyItemDrop +.public TYPE_ADVANTAGE_MASTER_CRIT_RATE +.public TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS +.public TYPE_MATCHUP_COMBINATOR_TABLE +.public TYPE_MATCHUP_TABLE .public UpdateAiTargetPos .public UpdateEntityPixelPos .public UpdateStateFlags diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index 928c18b8..b1ab3cb7 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -3,9 +3,13 @@ .public abs .public AddMoneyCarried .public ApplyDamageAndEffectsWrapper +.public BAD_POISON_DAMAGE_COOLDOWN +.public BAD_POISON_DAMAGE_TABLE .public BAG_ITEMS_PTR_MIRROR .public BinToDecFixedPoint .public BoostSpeedOneStage +.public BURN_DAMAGE +.public BURN_DAMAGE_COOLDOWN .public CanSeeTarget .public CeilFixedPoint .public DIRECTIONS_XY @@ -38,35 +42,28 @@ .public IsFloating .public IsFloorOver .public ItemIsActive__02311034 +.public LEECH_SEED_DAMAGE_COOLDOWN +.public LEECH_SEED_HP_DRAIN .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser .public MonsterHasNegativeStatus .public MonsterIsType .public MultiplyFixedPoint64 -.public ov10_022C4414 .public ov10_022C4454 .public ov10_022C446C .public ov10_022C44BC -.public ov10_022C44D4 -.public ov10_022C44D8 -.public ov10_022C4588 .public ov10_022C4590 .public ov10_022C45D0 .public ov10_022C45E8 .public ov10_022C45F0 -.public ov10_022C4610 .public ov10_022C464C .public ov10_022C4650 .public ov10_022C4664 -.public ov10_022C466C .public ov10_022C46A0 -.public ov10_022C46A8 -.public ov10_022C46AC .public ov10_022C46EC .public ov10_022C4A5C .public ov10_022C4BBC .public ov10_022C4BE4 -.public ov10_022C4C9C .public ov10_022C4FC4 .public ov29_022E42E8 .public ov29_022E53F0 @@ -103,9 +100,12 @@ .public ov29_023529A8 .public ov29_02353538 .public ov29_023536FC +.public POISON_DAMAGE +.public POISON_DAMAGE_COOLDOWN .public RemoveGroundItem .public ShouldMonsterRunAwayVariation .public SpawnDroppedItemWrapper +.public SPEED_BOOST_TURNS .public sub_0200D8AC .public sub_0201116C .public sub_02050FF8 diff --git a/asm/include/overlay_29_02319FB0.inc b/asm/include/overlay_29_02319FB0.inc index 0777093a..d3cc0da3 100644 --- a/asm/include/overlay_29_02319FB0.inc +++ b/asm/include/overlay_29_02319FB0.inc @@ -36,9 +36,8 @@ .public LogMessageByIdWithPopupCheckUserTarget .public MonsterHasNegativeStatus .public MonsterIsType +.public NATURAL_GIFT_ITEM_TABLE .public ov10_022C459C -.public ov10_022C48DC -.public ov10_022C5130 .public ov29_022E3ED0 .public ov29_022E4110 .public ov29_022EB4E8 @@ -67,3 +66,4 @@ .public TryActivateTruant .public UpdateAiTargetPos .public UpdateMovePp +.public WEATHER_BALL_TYPE_TABLE diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index fb286d28..f3b14c68 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/asm/include/overlay_29_0231B1B8.inc @@ -2,6 +2,7 @@ .public AbilityIsActiveVeneer .public AddHeldItemToBag .public AnimationDelayOrSomething +.public APPLES_AND_BERRIES_ITEM_IDS .public ApplyBlastSeedEffect .public ApplyCalciumEffect .public ApplyCheriBerryEffect @@ -26,8 +27,11 @@ .public ApplyZincEffect .public BoostIQ .public BoostSpeedOneStage +.public CACNEA_SPIKE_POWER .public CalcDamageFixedNoCategory +.public CALCIUM_STAT_BOOST .public CalcStatusDuration +.public CORSOLA_TWIG_POWER .public DealDamageProjectile .public DungeonGetSpriteIndex .public EndNegativeStatusConditionWrapper @@ -36,46 +40,34 @@ .public EntityIsValid__0231CBC8 .public ExclusiveItemEffectFlagTest .public FemaleToMaleForm +.public GEO_PEBBLE_DAMAGE .public GetActiveTeamMember .public GetItemCategoryVeneer .public GetSleepAnimationId +.public GOLD_FANG_POWER +.public GOLD_THORN_POWER +.public GRAVELEROCK_DAMAGE .public GUMMI_STAT_BOOST .public InitMove .public IqSkillIsEnabled +.public IRON_STAT_BOOST +.public IRON_THORN_POWER .public IsBagFull .public IsMonsterSleeping .public IsShaymin .public IsSkyExclusiveDungeon .public LevelUpItemEffect +.public LIFE_SEED_HP_BOOST .public LogMessageByIdWithPopupCheckUserTarget -.public ov10_022C4420 -.public ov10_022C4438 -.public ov10_022C4478 -.public ov10_022C44D0 +.public ORAN_BERRY_FULL_HP_BOOST +.public ORAN_BERRY_HP_RESTORATION +.public OREN_BERRY_DAMAGE .public ov10_022C44EC -.public ov10_022C44F4 -.public ov10_022C44F8 .public ov10_022C4530 .public ov10_022C4558 .public ov10_022C4574 .public ov10_022C457C -.public ov10_022C45EC -.public ov10_022C45F4 -.public ov10_022C4624 -.public ov10_022C46B4 -.public ov10_022C46B8 -.public ov10_022C46BC -.public ov10_022C46C4 -.public ov10_022C46C8 -.public ov10_022C46CC -.public ov10_022C46D8 -.public ov10_022C46DC -.public ov10_022C46E0 -.public ov10_022C46E4 -.public ov10_022C46E8 -.public ov10_022C4720 .public ov10_022C4864 -.public ov10_022C4EB8 .public ov29_022E28D4 .public ov29_022E3590 .public ov29_022E5A00 @@ -98,9 +90,16 @@ .public ov29_0234B084 .public ov29_0234BA54 .public ov29_02353538 +.public PROTEIN_STAT_BOOST +.public RARE_FOSSIL_DAMAGE .public RestoreAllMovePP .public SetMonsterTypeAndAbility +.public SILVER_SPIKE_POWER +.public SITRUS_BERRY_FULL_HP_BOOST +.public SITRUS_BERRY_HP_RESTORATION +.public SLEEP_TURN_RANGE .public SpawnDroppedItemWrapper +.public STICK_POWER .public sub_020017EC .public sub_0201CF80 .public SubstitutePlaceholderStringTags @@ -121,3 +120,4 @@ .public TryWarp .public UpdateShopkeeperModeAfterAttack .public WONDER_GUMMI_STAT_BOOST +.public ZINC_STAT_BOOST diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index c2cc8223..c1c4d8f4 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -1,16 +1,26 @@ #pragma once +.public _020A1894 .public AbilityIsActiveVeneer .public AllocAndLoadFileInPack +.public ATK_STAT_IDX +.public BoostIQ .public BoostOffensiveStat .public CalcDamageFixedNoCategory .public CanSeeInvisibleMonsters .public CeilFixedPoint +.public ChangeDungeonMusic +.public ChangeShayminForme .public CheckTeamMemberIdxVeneer .public ClearMonsterActionFields +.public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY .public DisplayMessage2 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 +.public EAT_ITEM_EFFECT_IGNORE_LIST +.public EndBurnClassStatus .public EndFrozenClassStatus +.public EnsureCanStandCurrentTile .public EntityIsValid__0231CBC8 .public EntityIsValid__0231EDD8 .public FemaleToMaleForm @@ -25,12 +35,19 @@ .public GetPerformanceFlagWithChecks .public GetTile .public GetTileSafe +.public GetWeatherColorTable +.public GINSENG_CHANCE_3 +.public GUMMI_BELLY_RESTORE_TABLE +.public GUMMI_IQ_STRING_IDS .public HandleSir0Translation .public InitMove +.public IQ_GUMMI_GAIN_TABLE .public IqSkillIsEnabled .public IsBlinded +.public IsCurrentFixedRoomBossFight .public IsEdible .public IsExperienceLocked +.public IsFullFloorFixedRoom .public IsHM .public IsItemValidVeneer .public LogMessageByIdWithPopup @@ -38,33 +55,28 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerOffensiveStat -.public RestoreAllMovePP -.public SetMonsterActionFields -.public StairsAlwaysReachable -.public SubstitutePlaceholderStringTags -.public TryInflictBurnStatus -.public TryInflictParalysisStatus -.public TryInflictPoisonedStatus -.public TryInflictShadowHoldStatus -.public TryWarp -.public UnloadFile +.public MonsterHasNegativeStatus +.public MusicTableIdxToMusicId +.public ov10_022C44CC +.public ov10_022C44E8 +.public ov10_022C45D4 +.public ov10_022C45D8 +.public ov10_022C45DC +.public ov10_022C45E4 +.public ov10_022C4680 +.public ov10_022C47E0 +.public ov10_022C47F0 .public ov29_022DD828 .public ov29_022DE47C .public ov29_022DE608 -.public GetWeatherColorTable .public ov29_022E0378 -.public IsCurrentFixedRoomBossFight -.public ShouldDisplayEntityWrapper .public ov29_022E5AE4 .public ov29_022E5BD8 .public ov29_022EA370 .public ov29_022EA428 -.public MusicTableIdxToMusicId -.public ChangeDungeonMusic .public ov29_022EAF20 .public ov29_022EAF34 .public ov29_022EB398 -.public RemoveUsedItem .public ov29_022EB668 .public ov29_022EFB20 .public ov29_022EFB84 @@ -76,9 +88,7 @@ .public ov29_022F8830 .public ov29_022F9C74 .public ov29_022FA02C -.public BoostIQ .public ov29_022FBA54 -.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_023008DC .public ov29_023009A0 @@ -87,27 +97,19 @@ .public ov29_023038D4 .public ov29_02304B64 .public ov29_02305814 -.public EndBurnClassStatus -.public TryDecreaseBelly -.public TryIncreaseBelly -.public TryInflictEndureStatus -.public ChangeShayminForme -.public EnsureCanStandCurrentTile -.public IsFullFloorFixedRoom .public ov29_0233665C -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility .public ov29_0233785C .public ov29_02338530 -.public SetDoughSeedFlag -.public UpdateMinimap .public ov29_02339FF4 .public ov29_0233FB1C .public ov29_02344B44 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234BA54 -.public YesNoMenu +.public ov29_023529AC +.public ov29_023529B0 +.public ov29_02353324 +.public ov29_02353538 .public ov30_023853BC .public ov30_023853E0 .public ov30_02385FE0 @@ -116,28 +118,26 @@ .public ov31_02386204 .public ov31_02386308 .public ov31_023877EC +.public RemoveUsedItem +.public RestoreAllMovePP +.public SetDoughSeedFlag +.public SetMonsterActionFields +.public ShouldDisplayEntityWrapper +.public SPATK_STAT_IDX +.public StairsAlwaysReachable .public sub_02050FF8 .public sub_02053D1C -.public DIRECTIONS_XY +.public SubstitutePlaceholderStringTags +.public TryDecreaseBelly +.public TryIncreaseBelly +.public TryInflictBurnStatus +.public TryInflictEndureStatus +.public TryInflictParalysisStatus +.public TryInflictPoisonedStatus +.public TryInflictShadowHoldStatus +.public TryWarp +.public UnloadFile +.public UpdateMinimap +.public UpdateTrapsVisibility .public WONDER_GUMMI_IQ_GAIN -.public _020A1894 -.public IQ_GUMMI_GAIN_TABLE -.public _020A2538 -.public ov10_022C44CC -.public ov10_022C44E8 -.public ov10_022C45D4 -.public ov10_022C45D8 -.public ov10_022C45DC -.public ov10_022C45E4 -.public ov10_022C4680 -.public ov10_022C46C0 -.public ov10_022C47E0 -.public ov10_022C47F0 -.public ov10_022C4B74 -.public ov29_023529AC -.public ov29_023529B0 -.public ov29_02352AE8 -.public ov29_02352AEC -.public ov29_023532D0 -.public ov29_02353324 -.public ov29_02353538 +.public YesNoMenu diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index e75ac35d..ca837670 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/asm/include/overlay_29_0231F594.inc @@ -5,6 +5,7 @@ .public AreOrbsAllowedVeneer .public AreTrawlOrbsAllowed .public DetermineTileWalkableNeighbors +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST .public DrawMinimapTile .public EntityIsValid__0231FBFC .public GetItemInfo @@ -21,7 +22,6 @@ .public ov29_02304B64 .public ov29_02336694 .public ov29_023457C8 -.public ov29_02351844 .public ov29_02353538 .public RemoveGroundItem .public SpawnItem diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index 66cadf9d..0d4936c1 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -5,16 +5,21 @@ .public AdvanceFrame .public AnimationDelayOrSomething .public ApplyDamageAndEffectsWrapper +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR +.public BLAZE_KICK_BURN_CHANCE .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage .public CalcDamageFixedWrapper .public CalcStatusDuration .public CeilFixedPoint +.public CRUSH_CLAW_LOWER_DEFENSE_CHANCE .public DealDamage .public DefenderAbilityIsActiveMoveEffects__02329F14 .public DIRECTIONS_XY +.public DIZZY_PUNCH_CONFUSE_CHANCE +.public DRAGON_RAGE_FIXED_DAMAGE .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public DungeonRandOutcomeUserAction @@ -22,10 +27,12 @@ .public EndFrozenStatus .public EntityIsValidMoveEffects__0232A3D8 .public EntityIsValidMoveEffects__0232C500 +.public ERUPTION_DAMAGE_MULT_TABLE .public GetDamageSourceWrapper .public GetMoveCategory .public GetMoveType .public GetTileSafe +.public IMPRISON_TURN_RANGE .public InitMove .public InitStandardItem .public IsBagFull @@ -40,29 +47,16 @@ .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +.public METAL_CLAW_BOOST_ATTACK_CHANCE +.public METRONOME_TABLE +.public MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE .public MoveMonsterToPos -.public ov10_022C448C -.public ov10_022C44A4 .public ov10_022C44B4 -.public ov10_022C44C4 -.public ov10_022C44E0 -.public ov10_022C450C -.public ov10_022C4540 -.public ov10_022C4548 -.public ov10_022C454C -.public ov10_022C4554 -.public ov10_022C4608 -.public ov10_022C46D4 -.public ov10_022C471C -.public ov10_022C4720 -.public ov10_022C4748 -.public ov10_022C48BC .public ov10_022C4924 -.public ov10_022C49C4 .public ov10_022C49D4 .public ov10_022C4C3C .public ov10_022C4C3E -.public ov10_022C5DDC .public ov10_022C5DE0 .public ov10_022C6321 .public ov10_022C6322 @@ -83,15 +77,20 @@ .public ov29_02332F18 .public ov29_0234B084 .public ov29_0235171E -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02352B1C .public ov29_02353538 .public ov29_0237CA84 .public ov29_0237CA88 +.public POISON_TAIL_POISON_CHANCE .public RemoveEquivItem +.public REST_TURN_RANGE .public RevealTrapsNearby +.public SECRET_POWER_EFFECT_CHANCE +.public SKULL_BASH_DAMAGE_MULTIPLIER +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnDroppedItem +.public STEEL_WING_BOOST_DEFENSE_CHANCE .public StringFromMessageId .public sub_02025888 .public sub_02050FF8 @@ -131,3 +130,4 @@ .public TwoTurnMoveForcedMiss .public UpdateEntityPixelPos .public UpdateTrapsVisibility +.public WHIRLPOOL_CONSTRICTION_CHANCE diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 61b919ef..5244ea7a 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -1,6 +1,7 @@ #pragma once .public __divsi3 .public AbilityIsActiveVeneer +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR .public BoostDefensiveStat .public BoostOffensiveStat @@ -8,6 +9,7 @@ .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public CalcStatusDuration +.public CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE .public CountMovesOutOfPp .public DealDamage .public DealDamageWithTypeAndPowerBoost @@ -22,6 +24,7 @@ .public EntityIsValidMoveEffects__0232C500 .public EntityIsValidMoveEffects__0232E250 .public FixedRoomIsSubstituteRoom +.public FLARE_BLITZ_BURN_CHANCE .public GenerateStandardItem .public GetApparentWeather .public GetBodySize @@ -40,9 +43,14 @@ .public GetVisibilityRange .public HandleFaint .public HasDropeyeStatus +.public HEAL_ORDER_HP_RESTORATION +.public HEALING_WISH_HP_RESTORATION +.public ICE_FANG_CRINGE_CHANCE +.public ICE_FANG_FREEZE_CHANCE .public IsChargingTwoTurnMove .public IsCurrentFixedRoomBossFight .public IsFullFloorFixedRoom +.public LAST_RESORT_DAMAGE_MULT_TABLE .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat @@ -50,22 +58,8 @@ .public LowerSpeed .public MewSpawnCheck .public MistIsActive -.public ov10_022C44B8 -.public ov10_022C44F0 -.public ov10_022C4518 -.public ov10_022C452C -.public ov10_022C453C .public ov10_022C456C .public ov10_022C45BC -.public ov10_022C4654 -.public ov10_022C4678 -.public ov10_022C4684 -.public ov10_022C46F4 -.public ov10_022C4720 -.public ov10_022C47DC -.public ov10_022C4944 -.public ov10_022C4964 -.public ov10_022C49B4 .public ov29_022E09E8 .public ov29_022E1AAC .public ov29_022E1AD4 @@ -101,8 +95,6 @@ .public ov29_0234B0B4 .public ov29_0234BA54 .public ov29_0235171E -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02352B38 .public ov29_02352B3C .public ov29_02353538 @@ -110,10 +102,16 @@ .public RevealEnemies .public RevealItems .public RevealStairs +.public ROOST_HP_RESTORATION_TABLE +.public SHADOW_FORCE_DAMAGE_MULTIPLIER +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnDroppedItemWrapper .public StringFromMessageId .public sub_02024FB8 .public SubstitutePlaceholderStringTags +.public THUNDER_FANG_CRINGE_CHANCE +.public THUNDER_FANG_PARALYZE_CHANCE .public TransferNegativeStatusCondition .public TryActivateIdentifyCondition .public TryActivateWeather @@ -146,3 +144,5 @@ .public TryWarp .public UpdateMinimap .public UpdateTrapsVisibility +.public WEATHER_MOVE_TURN_COUNT +.public WRING_OUT_DAMAGE_MULT_TABLE diff --git a/asm/include/overlay_29_0232E274.inc b/asm/include/overlay_29_0232E274.inc index 7012cf38..26e030e5 100644 --- a/asm/include/overlay_29_0232E274.inc +++ b/asm/include/overlay_29_0232E274.inc @@ -1,5 +1,6 @@ #pragma once .public AbilityIsActiveVeneer +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage @@ -14,18 +15,17 @@ .public EndSleepClassStatus .public EntityIsValid__0232E840 .public EntityIsValidMoveEffects__0232E250 +.public FIRE_FANG_CRINGE_CHANCE +.public FLARE_BLITZ_BURN_CHANCE +.public HEALING_WISH_HP_RESTORATION .public LogMessageByIdWithPopupCheckUserTarget .public LowerOffensiveStat -.public ov10_022C449C -.public ov10_022C4684 -.public ov10_022C46F4 .public ov29_02318D98 .public ov29_0234AFFC -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353718 .public ResetHitChanceStat .public RestoreAllMovePP +.public SPATK_STAT_IDX .public sub_02054EC8 .public SubstitutePlaceholderStringTags .public TryIncreaseHp diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index cd75ae84..e1f63c9c 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -5,6 +5,7 @@ .public ApplyDamageAndEffects .public ApplyDamageAndEffectsWrapper .public AreEntitiesAdjacent +.public ATK_STAT_IDX .public CalcDamage .public CanAttackInDirection .public CanBeSnatched @@ -335,6 +336,7 @@ .public EntityIsValid__0232E840 .public EntityIsValid__02333FAC .public ExclusiveItemEffectFlagTest +.public FOREWARN_FORCED_MISS_CHANCE .public GetApparentWeather .public GetDamageSourceWrapper .public GetDirectionTowardsPosition @@ -369,7 +371,6 @@ .public ov01_0233103C .public ov01_023315F4 .public ov10_022BFD6C -.public ov10_022C4468 .public ov10_022C4480 .public ov10_022C4504 .public ov10_022C4508 @@ -414,8 +415,6 @@ .public ov29_023381C0 .public ov29_02344B44 .public ov29_0234B034 -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353538 .public ov29_02353718 .public ov29_0237CA68 @@ -424,6 +423,7 @@ .public ov29_0237CA80 .public PlayMoveAnimation .public ShouldDisplayEntityWrapper +.public SPATK_STAT_IDX .public sub_02050FF8 .public SubFixedPoint .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index baaf706c..8d1da943 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -4,6 +4,7 @@ .public _020AFC70 .public abs .public AllocAndLoadFileInPack +.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN .public DetermineAllTilesWalkableNeighbors .public DetermineTileWalkableNeighbors .public DIRECTIONS_XY @@ -14,6 +15,9 @@ .public DungeonRngSetSecondary .public EntityIsValid__02337CA8 .public EntityIsValid__02344AF8 +.public FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS +.public FIXED_ROOM_ENTITY_SPAWN_TABLE +.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE .public GenerateCleanItem .public GenerateStandardItem .public GetActiveTeamMember @@ -39,6 +43,7 @@ .public GetTrapInfo .public GetVictoriesOnOneFloor .public HandleSir0Translation +.public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER .public InitOtherMonsterData .public InitRender3dElement64 .public InitStandardItem @@ -55,26 +60,22 @@ .public IsItemInBag .public IsOutlawMonsterHouseFloor .public IsTreasureBox +.public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER .public LoadFileFromRom .public LoadScriptVariableValue .public LoadWteFromFileDirectory .public LogMessageByIdWithPopupCheckUser +.public MAP_COLOR_TABLE .public MarkShopkeeperSpawn .public MemAlloc .public Memcpy32 .public MemFree .public MemZero +.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS +.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS .public MultiplyByFixedPoint .public ov10_022BFD20 -.public ov10_022C440C -.public ov10_022C44AC -.public ov10_022C4660 -.public ov10_022C484C -.public ov10_022C4850 .public ov10_022C4B34 -.public ov10_022C52EC -.public ov10_022C5938 -.public ov10_022C631C .public ov10_022C6326 .public ov10_022C6327 .public ov10_022C6C74 @@ -121,8 +122,6 @@ .public ov29_0234B1A4 .public ov29_0234C668 .public ov29_0234C738 -.public ov29_0234FDFC -.public ov29_023502EC .public ov29_023502F0 .public ov29_023502F4 .public ov29_02352B5C @@ -130,9 +129,7 @@ .public ov29_02352F40 .public ov29_02352F7C .public ov29_02352FCC -.public ov29_02352FD0 .public ov29_02352FF4 -.public ov29_02353010 .public ov29_02353030 .public ov29_02353050 .public ov29_02353110 @@ -160,6 +157,7 @@ .public SECONDARY_TERRAIN_TYPES .public SetMonsterLevelAndId .public SetVictoriesOnOneFloor +.public SHOP_ITEM_CHANCES .public ShouldMinimapDisplayEntity .public SpawnEnemyTrapAtPos .public SpawnItem @@ -179,6 +177,8 @@ .public sub_02056880 .public SubstitutePlaceholderStringTags .public TeamMemberHasExclusiveItemEffectActive +.public TILESET_PROPERTIES +.public TREASURE_BOX_1_ITEM_IDS .public UnloadFile .public UpdateTrapsVisibility .public ZInit8 diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 7b2c0bb8..2e7adf96 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169954,17 +169954,17 @@ EVOLUTION_HP_BONUS: .global _020A18C8 _020A18C8: .byte 0x02, 0x00, 0x00, 0x00 - .global _020A18CC -_020A18CC: + .global DAMAGE_FORMULA_FLV_SHIFT +DAMAGE_FORMULA_FLV_SHIFT: .byte 0x00, 0x32, 0x00, 0x00 .global EVOLUTION_PHYSICAL_STAT_BONUSES EVOLUTION_PHYSICAL_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 - .global _020A18D4 -_020A18D4: + .global DAMAGE_FORMULA_CONSTANT_SHIFT +DAMAGE_FORMULA_CONSTANT_SHIFT: .byte 0x00, 0xC9, 0xFE, 0xFF - .global _020A18D8 -_020A18D8: + .global DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR +DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR: .byte 0x00, 0x08, 0x00, 0x00 .global EGG_STAT_BONUSES EGG_STAT_BONUSES: @@ -169975,20 +169975,20 @@ _020A18E0: .global EVOLUTION_SPECIAL_STAT_BONUSES EVOLUTION_SPECIAL_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 - .global _020A18E8 -_020A18E8: + .global DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER: .byte 0x54, 0x01, 0x00, 0x00 - .global _020A18EC -_020A18EC: + .global DAMAGE_FORMULA_LN_PREFACTOR +DAMAGE_FORMULA_LN_PREFACTOR: .byte 0x00, 0x32, 0x00, 0x00 - .global _020A18F0 -_020A18F0: + .global DAMAGE_FORMULA_DEF_PREFACTOR +DAMAGE_FORMULA_DEF_PREFACTOR: .byte 0x80, 0xFF, 0xFF, 0xFF - .global _020A18F4 -_020A18F4: + .global DAMAGE_FORMULA_AT_PREFACTOR +DAMAGE_FORMULA_AT_PREFACTOR: .byte 0x99, 0x00, 0x00, 0x00 - .global _020A18F8 -_020A18F8: + .global DAMAGE_FORMULA_LN_ARG_PREFACTOR +DAMAGE_FORMULA_LN_ARG_PREFACTOR: .byte 0x00, 0x0A, 0x00, 0x00 .global _020A18FC _020A18FC: @@ -170248,8 +170248,8 @@ IQ_GUMMI_GAIN_TABLE: .byte 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x05, 0x00 - .global _020A2538 -_020A2538: + .global GUMMI_BELLY_RESTORE_TABLE +GUMMI_BELLY_RESTORE_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index e990016a..8fb67795 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9113,14 +9113,14 @@ ov10_022C43F8: .global ov10_022C4404 ov10_022C4404: .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 - .global ov10_022C440C -ov10_022C440C: + .global FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS +FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS: .byte 0x1C, 0x00, 0x00, 0x00 .global ov10_022C4410 ov10_022C4410: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4414 -ov10_022C4414: + .global BAD_POISON_DAMAGE_COOLDOWN +BAD_POISON_DAMAGE_COOLDOWN: .byte 0x05, 0x00, 0x00, 0x00 .global ov10_022C4418 ov10_022C4418: @@ -9128,18 +9128,18 @@ ov10_022C4418: .global ov10_022C441C ov10_022C441C: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4420 -ov10_022C4420: + .global PROTEIN_STAT_BOOST +PROTEIN_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 - .global ov10_022C4430 -ov10_022C4430: + .global SPAWN_CAP_NO_MONSTER_HOUSE +SPAWN_CAP_NO_MONSTER_HOUSE: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C4434 ov10_022C4434: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4438 -ov10_022C4438: + .global OREN_BERRY_DAMAGE +OREN_BERRY_DAMAGE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C443C ov10_022C443C: @@ -9155,15 +9155,15 @@ ov10_022C4458: ov10_022C445C: .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x18, 0x00, 0x00, 0x00 - .global ov10_022C4468 -ov10_022C4468: + .global FOREWARN_FORCED_MISS_CHANCE +FOREWARN_FORCED_MISS_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C446C ov10_022C446C: .byte 0x05, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .byte 0x21, 0x00, 0x00, 0x00 - .global ov10_022C4478 -ov10_022C4478: + .global SITRUS_BERRY_HP_RESTORATION +SITRUS_BERRY_HP_RESTORATION: .byte 0x64, 0x00, 0x00, 0x00 .global ov10_022C447C ov10_022C447C: @@ -9172,48 +9172,48 @@ ov10_022C447C: ov10_022C4480: .byte 0x14, 0x00, 0x00, 0x00 .byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .global ov10_022C448C -ov10_022C448C: + .global POISON_TAIL_POISON_CHANCE +POISON_TAIL_POISON_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 - .global ov10_022C449C -ov10_022C449C: + .global FIRE_FANG_CRINGE_CHANCE +FIRE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .global ov10_022C44A4 -ov10_022C44A4: + .global WHIRLPOOL_CONSTRICTION_CHANCE +WHIRLPOOL_CONSTRICTION_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44AC -ov10_022C44AC: + .global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS +MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS: .byte 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .global ov10_022C44B4 ov10_022C44B4: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C44B8 -ov10_022C44B8: + .global HEAL_ORDER_HP_RESTORATION +HEAL_ORDER_HP_RESTORATION: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C44BC ov10_022C44BC: .byte 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44C4 -ov10_022C44C4: + .global STEEL_WING_BOOST_DEFENSE_CHANCE +STEEL_WING_BOOST_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 .global ov10_022C44CC ov10_022C44CC: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C44D0 -ov10_022C44D0: + .global GOLD_THORN_POWER +GOLD_THORN_POWER: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C44D4 -ov10_022C44D4: + .global BURN_DAMAGE +BURN_DAMAGE: .byte 0x06, 0x00, 0x00, 0x00 - .global ov10_022C44D8 -ov10_022C44D8: + .global POISON_DAMAGE +POISON_DAMAGE: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C44DC -ov10_022C44DC: + .global SPAWN_COOLDOWN +SPAWN_COOLDOWN: .byte 0x24, 0x00, 0x00, 0x00 - .global ov10_022C44E0 -ov10_022C44E0: + .global MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE +MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C44E4 ov10_022C44E4: @@ -9224,14 +9224,14 @@ ov10_022C44E8: .global ov10_022C44EC ov10_022C44EC: .byte 0x3C, 0x00, 0x00, 0x00 - .global ov10_022C44F0 -ov10_022C44F0: + .global CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE +CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 - .global ov10_022C44F4 -ov10_022C44F4: + .global ORAN_BERRY_FULL_HP_BOOST +ORAN_BERRY_FULL_HP_BOOST: .byte 0x00, 0x00, 0x00, 0x00 - .global ov10_022C44F8 -ov10_022C44F8: + .global LIFE_SEED_HP_BOOST +LIFE_SEED_HP_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .global ov10_022C44FC ov10_022C44FC: @@ -9242,48 +9242,48 @@ ov10_022C4504: .global ov10_022C4508 ov10_022C4508: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C450C -ov10_022C450C: + .global LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4510 -ov10_022C4510: + .global SUPER_LUCK_CRIT_RATE_BOOST +SUPER_LUCK_CRIT_RATE_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4518 -ov10_022C4518: + .global ICE_FANG_FREEZE_CHANCE +ICE_FANG_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 .global ov10_022C4520 ov10_022C4520: .byte 0x19, 0x00, 0x00, 0x00 .byte 0x0C, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C452C -ov10_022C452C: + .global THUNDER_FANG_PARALYZE_CHANCE +THUNDER_FANG_PARALYZE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C4530 ov10_022C4530: .byte 0x0F, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 - .global ov10_022C453C -ov10_022C453C: + .global ICE_FANG_CRINGE_CHANCE +ICE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C4540 -ov10_022C4540: + .global BLAZE_KICK_BURN_CHANCE +BLAZE_KICK_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4548 -ov10_022C4548: + .global DIZZY_PUNCH_CONFUSE_CHANCE +DIZZY_PUNCH_CONFUSE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C454C -ov10_022C454C: + .global SECRET_POWER_EFFECT_CHANCE +SECRET_POWER_EFFECT_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4554 -ov10_022C4554: + .global METAL_CLAW_BOOST_ATTACK_CHANCE +METAL_CLAW_BOOST_ATTACK_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4558 ov10_022C4558: .byte 0x01, 0x00, 0x00, 0x00 - .global ov10_022C455C -ov10_022C455C: + .global TECHNICIAN_MOVE_POWER_THRESHOLD +TECHNICIAN_MOVE_POWER_THRESHOLD: .byte 0x04, 0x00, 0x00, 0x00 .global ov10_022C4560 ov10_022C4560: @@ -9302,17 +9302,17 @@ ov10_022C4574: ov10_022C457C: .byte 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4588 -ov10_022C4588: + .global LEECH_SEED_HP_DRAIN +LEECH_SEED_HP_DRAIN: .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4590 ov10_022C4590: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4594 -ov10_022C4594: + .global AFTERMATH_CHANCE +AFTERMATH_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4598 -ov10_022C4598: + .global SET_DAMAGE_STATUS_DAMAGE +SET_DAMAGE_STATUS_DAMAGE: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C459C ov10_022C459C: @@ -9353,8 +9353,8 @@ ov10_022C45D8: .global ov10_022C45DC ov10_022C45DC: .byte 0x23, 0x00, 0x00, 0x00 - .global ov10_022C45E0 -ov10_022C45E0: + .global TYPE_ADVANTAGE_MASTER_CRIT_RATE +TYPE_ADVANTAGE_MASTER_CRIT_RATE: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C45E4 ov10_022C45E4: @@ -9362,14 +9362,14 @@ ov10_022C45E4: .global ov10_022C45E8 ov10_022C45E8: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C45EC -ov10_022C45EC: + .global ORAN_BERRY_HP_RESTORATION +ORAN_BERRY_HP_RESTORATION: .byte 0x64, 0x00, 0x00, 0x00 .global ov10_022C45F0 ov10_022C45F0: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C45F4 -ov10_022C45F4: + .global SITRUS_BERRY_FULL_HP_BOOST +SITRUS_BERRY_FULL_HP_BOOST: .byte 0x02, 0x00, 0x00, 0x00 .global ov10_022C45F8 ov10_022C45F8: @@ -9378,24 +9378,24 @@ ov10_022C45F8: ov10_022C45FC: .byte 0x05, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4608 -ov10_022C4608: + .global CRUSH_CLAW_LOWER_DEFENSE_CHANCE +CRUSH_CLAW_LOWER_DEFENSE_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C460C ov10_022C460C: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4610 -ov10_022C4610: + .global BURN_DAMAGE_COOLDOWN +BURN_DAMAGE_COOLDOWN: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C4614 ov10_022C4614: .byte 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - .global ov10_022C4624 -ov10_022C4624: + .global STICK_POWER +STICK_POWER: .byte 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 .byte 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - .global ov10_022C4640 -ov10_022C4640: + .global SPAWN_COOLDOWN_THIEF_ALERT +SPAWN_COOLDOWN_THIEF_ALERT: .byte 0x03, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4648 @@ -9407,91 +9407,91 @@ ov10_022C464C: .global ov10_022C4650 ov10_022C4650: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4654 -ov10_022C4654: + .global WEATHER_MOVE_TURN_COUNT +WEATHER_MOVE_TURN_COUNT: .byte 0xB8, 0x0B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4660 -ov10_022C4660: + .global MONSTER_HOUSE_MAX_MONSTER_SPAWNS +MONSTER_HOUSE_MAX_MONSTER_SPAWNS: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4664 ov10_022C4664: .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C466C -ov10_022C466C: + .global SPEED_BOOST_TURNS +SPEED_BOOST_TURNS: .byte 0xFA, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00 .byte 0x9C, 0xFF, 0x00, 0x00 - .global ov10_022C4678 -ov10_022C4678: + .global THUNDER_FANG_CRINGE_CHANCE +THUNDER_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4680 ov10_022C4680: .byte 0x3C, 0x00, 0x00, 0x00 - .global ov10_022C4684 -ov10_022C4684: + .global FLARE_BLITZ_BURN_CHANCE +FLARE_BLITZ_BURN_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .global ov10_022C46A0 ov10_022C46A0: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C46A4 -ov10_022C46A4: + .global SPAWN_CAP_WITH_MONSTER_HOUSE +SPAWN_CAP_WITH_MONSTER_HOUSE: .byte 0x04, 0x00, 0x00, 0x00 - .global ov10_022C46A8 -ov10_022C46A8: + .global POISON_DAMAGE_COOLDOWN +POISON_DAMAGE_COOLDOWN: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C46AC -ov10_022C46AC: + .global LEECH_SEED_DAMAGE_COOLDOWN +LEECH_SEED_DAMAGE_COOLDOWN: .byte 0x02, 0x00, 0x00, 0x00 .global ov10_022C46B0 ov10_022C46B0: .byte 0x5A, 0x00, 0x00, 0x00 - .global ov10_022C46B4 -ov10_022C46B4: + .global GEO_PEBBLE_DAMAGE +GEO_PEBBLE_DAMAGE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C46B8 -ov10_022C46B8: + .global GRAVELEROCK_DAMAGE +GRAVELEROCK_DAMAGE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C46BC -ov10_022C46BC: + .global RARE_FOSSIL_DAMAGE +RARE_FOSSIL_DAMAGE: .byte 0x64, 0x00, 0x00, 0x00 - .global ov10_022C46C0 -ov10_022C46C0: + .global GINSENG_CHANCE_3 +GINSENG_CHANCE_3: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C46C4 -ov10_022C46C4: + .global ZINC_STAT_BOOST +ZINC_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46C8 -ov10_022C46C8: + .global IRON_STAT_BOOST +IRON_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46CC -ov10_022C46CC: + .global CALCIUM_STAT_BOOST +CALCIUM_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00 - .global ov10_022C46D4 -ov10_022C46D4: + .global DRAGON_RAGE_FIXED_DAMAGE +DRAGON_RAGE_FIXED_DAMAGE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C46D8 -ov10_022C46D8: + .global CORSOLA_TWIG_POWER +CORSOLA_TWIG_POWER: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C46DC -ov10_022C46DC: + .global CACNEA_SPIKE_POWER +CACNEA_SPIKE_POWER: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C46E0 -ov10_022C46E0: + .global GOLD_FANG_POWER +GOLD_FANG_POWER: .byte 0x07, 0x00, 0x00, 0x00 - .global ov10_022C46E4 -ov10_022C46E4: + .global SILVER_SPIKE_POWER +SILVER_SPIKE_POWER: .byte 0x06, 0x00, 0x00, 0x00 - .global ov10_022C46E8 -ov10_022C46E8: + .global IRON_THORN_POWER +IRON_THORN_POWER: .byte 0x04, 0x00, 0x00, 0x00 .global ov10_022C46EC ov10_022C46EC: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46F0 -ov10_022C46F0: + .global SCOPE_LENS_CRIT_RATE_BOOST +SCOPE_LENS_CRIT_RATE_BOOST: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C46F4 -ov10_022C46F4: + .global HEALING_WISH_HP_RESTORATION +HEALING_WISH_HP_RESTORATION: .byte 0xE7, 0x03, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 .global ov10_022C46FC ov10_022C46FC: @@ -9508,15 +9508,15 @@ ov10_022C4708: .global ov10_022C470C ov10_022C470C: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4710 -ov10_022C4710: + .global ME_FIRST_MULTIPLIER +ME_FIRST_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C471C -ov10_022C471C: + .global IMPRISON_TURN_RANGE +IMPRISON_TURN_RANGE: .byte 0x03, 0x00, 0x06, 0x00 - .global ov10_022C4720 -ov10_022C4720: + .global SLEEP_TURN_RANGE +SLEEP_TURN_RANGE: .byte 0x03, 0x00, 0x07, 0x00 .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C472C @@ -9537,21 +9537,21 @@ ov10_022C473C: .global ov10_022C4740 ov10_022C4740: .byte 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C4744 -ov10_022C4744: + .global BURN_DAMAGE_MULTIPLIER +BURN_DAMAGE_MULTIPLIER: .byte 0xCC, 0x00, 0x00, 0x00 - .global ov10_022C4748 -ov10_022C4748: + .global REST_TURN_RANGE +REST_TURN_RANGE: .byte 0x01, 0x00, 0x04, 0x00 - .global ov10_022C474C -ov10_022C474C: + .global MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: .byte 0xB3, 0x01, 0x00, 0x00 .global ov10_022C4750 ov10_022C4750: .byte 0x06, 0x00, 0x0C, 0x00 .byte 0x03, 0x00, 0x05, 0x00 - .global ov10_022C4758 -ov10_022C4758: + .global MATCHUP_IMMUNE_MULTIPLIER +MATCHUP_IMMUNE_MULTIPLIER: .byte 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00 .global ov10_022C4760 ov10_022C4760: @@ -9570,16 +9570,16 @@ ov10_022C4794: .global ov10_022C47B8 ov10_022C47B8: .byte 0x01, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C47C0 -ov10_022C47C0: + .global TINTED_LENS_MULTIPLIER +TINTED_LENS_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x04, 0x00, 0x14, 0x00, 0x1E, 0x00 .global ov10_022C47CC ov10_022C47CC: .byte 0x0A, 0x00, 0x0C, 0x00, 0x03, 0x00, 0x03, 0x00 .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C47DC -ov10_022C47DC: + .global SHADOW_FORCE_DAMAGE_MULTIPLIER +SHADOW_FORCE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C47E0 ov10_022C47E0: @@ -9591,33 +9591,33 @@ ov10_022C47F0: .global ov10_022C47F4 ov10_022C47F4: .byte 0x01, 0x00, 0x04, 0x00 - .global ov10_022C47F8 -ov10_022C47F8: + .global POWER_PITCHER_DAMAGE_MULTIPLIER +POWER_PITCHER_DAMAGE_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C4800 ov10_022C4800: .byte 0x78, 0x00, 0x00, 0x00 .byte 0x04, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 - .global ov10_022C4810 -ov10_022C4810: + .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER: .byte 0xB5, 0x00, 0x00, 0x00 .global ov10_022C4814 ov10_022C4814: .byte 0x44, 0x00, 0x00, 0x00 - .global ov10_022C4818 -ov10_022C4818: + .global MATCHUP_SUPER_EFFECTIVE_MULTIPLIER +MATCHUP_SUPER_EFFECTIVE_MULTIPLIER: .byte 0x66, 0x01, 0x00, 0x00 - .global ov10_022C481C -ov10_022C481C: + .global MATCHUP_NEUTRAL_MULTIPLIER +MATCHUP_NEUTRAL_MULTIPLIER: .byte 0x00, 0x01, 0x00, 0x00 - .global ov10_022C4820 -ov10_022C4820: + .global MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER: .byte 0x40, 0x00, 0x00, 0x00 - .global ov10_022C4824 -ov10_022C4824: + .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: .byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C482C -ov10_022C482C: + .global MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER: .byte 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 .global ov10_022C4834 ov10_022C4834: @@ -9628,14 +9628,14 @@ ov10_022C483C: .global ov10_022C4840 ov10_022C4840: .byte 0x01, 0x00, 0x03, 0x00 - .global ov10_022C4844 -ov10_022C4844: + .global AIR_BLADE_DAMAGE_MULTIPLIER +AIR_BLADE_DAMAGE_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C484C -ov10_022C484C: + .global KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER +KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 - .global ov10_022C4850 -ov10_022C4850: + .global HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER +HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 .global ov10_022C4854 ov10_022C4854: @@ -9660,8 +9660,8 @@ ov10_022C489C: .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x1E, 0x00 - .global ov10_022C48BC -ov10_022C48BC: + .global SKULL_BASH_DAMAGE_MULTIPLIER +SKULL_BASH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: @@ -9672,8 +9672,8 @@ ov10_022C48CC: .global ov10_022C48D4 ov10_022C48D4: .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C48DC -ov10_022C48DC: + .global WEATHER_BALL_TYPE_TABLE +WEATHER_BALL_TYPE_TABLE: .byte 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06 .global ov10_022C48E4 ov10_022C48E4: @@ -9695,22 +9695,22 @@ ov10_022C4924: .global ov10_022C4934 ov10_022C4934: .byte 0x4D, 0x00, 0x47, 0x00, 0x7B, 0x05, 0x49, 0x00, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C4944 -ov10_022C4944: + .global LAST_RESORT_DAMAGE_MULT_TABLE +LAST_RESORT_DAMAGE_MULT_TABLE: .byte 0x00, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4964 -ov10_022C4964: + .global ROOST_HP_RESTORATION_TABLE +ROOST_HP_RESTORATION_TABLE: .byte 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49B4 -ov10_022C49B4: + .global WRING_OUT_DAMAGE_MULT_TABLE +WRING_OUT_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49C4 -ov10_022C49C4: + .global ERUPTION_DAMAGE_MULT_TABLE +ERUPTION_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .global ov10_022C49D4 ov10_022C49D4: @@ -9785,8 +9785,8 @@ ov10_022C4B34: .byte 0x5D, 0x00, 0xBA, 0x00, 0x90, 0x00, 0x90, 0x00, 0x37, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C4B74 -ov10_022C4B74: + .global EAT_ITEM_EFFECT_IGNORE_LIST +EAT_ITEM_EFFECT_IGNORE_LIST: .byte 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4F, 0x00, 0x53, 0x00, 0x54, 0x00, 0x56, 0x00, 0x5B, 0x00 .byte 0x57, 0x00, 0x5C, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x6F, 0x00, 0x68, 0x00, 0x6B, 0x00, 0x75, 0x00 .byte 0x71, 0x00, 0x00, 0x00 @@ -9817,8 +9817,8 @@ ov10_022C4C3E: .byte 0x64, 0x00, 0x28, 0x00, 0xC8, 0x00, 0x23, 0x00, 0x2C, 0x01, 0x1E, 0x00, 0x90, 0x01, 0x19, 0x00 .byte 0xF4, 0x01, 0x14, 0x00, 0x58, 0x02, 0x0F, 0x00, 0xBC, 0x02, 0x0A, 0x00, 0xE8, 0x03, 0x05, 0x00 .byte 0x10, 0x27, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00 - .global ov10_022C4C6C -ov10_022C4C6C: + .global CASTFORM_WEATHER_ATTRIBUTE_TABLE +CASTFORM_WEATHER_ATTRIBUTE_TABLE: .byte 0x01, 0x00 .global ov10_022C4C6E ov10_022C4C6E: @@ -9829,8 +9829,8 @@ ov10_022C4C70: .byte 0x7D, 0x01, 0xD5, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03 .byte 0x03, 0x00, 0x7E, 0x01, 0xD6, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03, 0x01, 0x00, 0x7B, 0x01 .byte 0xD3, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03 - .global ov10_022C4C9C -ov10_022C4C9C: + .global BAD_POISON_DAMAGE_TABLE +BAD_POISON_DAMAGE_TABLE: .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 @@ -9839,8 +9839,8 @@ ov10_022C4C9C: .byte 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00 .byte 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00, 0x5D, 0x00, 0x5E, 0x00 .byte 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x6A, 0x00, 0x6B, 0x00, 0x68, 0x00, 0x75, 0x00, 0x00, 0x00 - .global ov10_022C4D14 -ov10_022C4D14: + .global TYPE_MATCHUP_COMBINATOR_TABLE +TYPE_MATCHUP_COMBINATOR_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 @@ -9852,16 +9852,16 @@ ov10_022C4D54: .byte 0x0D, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0D, 0x00, 0x0F, 0x00 - .global ov10_022C4D98 -ov10_022C4D98: + .global OFFENSIVE_STAT_STAGE_MULTIPLIERS +OFFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x80, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00 .byte 0x8F, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xA1, 0x00, 0x00, 0x00 .byte 0xAB, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x33, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 .byte 0x99, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 .byte 0xCC, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00 - .global ov10_022C4DEC -ov10_022C4DEC: + .global DEFENSIVE_STAT_STAGE_MULTIPLIERS +DEFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x07, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 .byte 0x4C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 @@ -9876,8 +9876,8 @@ ov10_022C4DEC: .byte 0xC0, 0x5D, 0x32, 0x02, 0x0E, 0x01, 0x00, 0x00, 0xF4, 0x7A, 0x32, 0x02, 0x59, 0x01, 0x00, 0x00 .byte 0xF4, 0x7A, 0x32, 0x02, 0xE6, 0x01, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02, 0xF5, 0x01, 0x00, 0x00 .byte 0x00, 0x90, 0x32, 0x02 - .global ov10_022C4EB8 -ov10_022C4EB8: + .global APPLES_AND_BERRIES_ITEM_IDS +APPLES_AND_BERRIES_ITEM_IDS: .byte 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00 .byte 0x4B, 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00 .byte 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00 @@ -9913,8 +9913,8 @@ ov10_022C4FC4: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 - .global ov10_022C5064 -ov10_022C5064: + .global RECRUITMENT_LEVEL_BOOST_TABLE +RECRUITMENT_LEVEL_BOOST_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9928,8 +9928,8 @@ ov10_022C5064: .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0xF5, 0x00, 0xF5, 0x00, 0x00, 0x00 - .global ov10_022C5130 -ov10_022C5130: + .global NATURAL_GIFT_ITEM_TABLE +NATURAL_GIFT_ITEM_TABLE: .byte 0x45, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x46, 0x00, 0x08, 0x00, 0x01, 0x00, 0x47, 0x00, 0x0B, 0x00, 0x03, 0x00, 0x48, 0x00 .byte 0x0E, 0x00, 0x02, 0x00, 0x49, 0x00, 0x09, 0x00, 0x01, 0x00, 0x4A, 0x00, 0x10, 0x00, 0x02, 0x00 @@ -9944,8 +9944,8 @@ ov10_022C5130: .byte 0x0E, 0x00, 0x02, 0x00, 0x69, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x6A, 0x00, 0x06, 0x00, 0x02, 0x00 .byte 0x6B, 0x00, 0x08, 0x00, 0x02, 0x00, 0x75, 0x00, 0x08, 0x00, 0x05, 0x00, 0x76, 0x00, 0x11, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C51FC -ov10_022C51FC: + .global RANDOM_MUSIC_ID_TABLE +RANDOM_MUSIC_ID_TABLE: .byte 0x24, 0x00, 0x3B, 0x00, 0x1D, 0x00, 0x3A, 0x00 .byte 0x2E, 0x00, 0x1A, 0x00, 0x37, 0x00, 0x15, 0x00, 0x2F, 0x00, 0x16, 0x00, 0x36, 0x00, 0x2A, 0x00 .byte 0x22, 0x00, 0x24, 0x00, 0x23, 0x00, 0x1E, 0x00, 0x35, 0x00, 0x3A, 0x00, 0x17, 0x00, 0x28, 0x00 @@ -9962,8 +9962,8 @@ ov10_022C51FC: .byte 0x29, 0x00, 0x2E, 0x00, 0x16, 0x00, 0x1F, 0x00, 0x23, 0x00, 0x24, 0x00, 0x1D, 0x00, 0x5E, 0x00 .byte 0x3E, 0x00, 0x3F, 0x00, 0x28, 0x00, 0x2A, 0x00, 0x1A, 0x00, 0x18, 0x00, 0x16, 0x00, 0x91, 0x00 .byte 0x1E, 0x00, 0x1F, 0x00, 0x8F, 0x00, 0x90, 0x00 - .global ov10_022C52EC -ov10_022C52EC: + .global SHOP_ITEM_CHANCES +SHOP_ITEM_CHANCES: .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 @@ -10004,8 +10004,8 @@ ov10_022C52EC: .byte 0xCC, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 .byte 0x66, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 .byte 0x33, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00 - .global ov10_022C555C -ov10_022C555C: + .global MUSIC_ID_TABLE +MUSIC_ID_TABLE: .byte 0xE7, 0x03, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00 .byte 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00 .byte 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00 @@ -10028,8 +10028,8 @@ ov10_022C555C: .byte 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x8A, 0x00 .byte 0x12, 0x00, 0x0B, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x10, 0x00, 0xA5, 0x00, 0xA5, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x12, 0x00, 0x46, 0x00, 0x13, 0x00 - .global ov10_022C56B0 -ov10_022C56B0: + .global TYPE_MATCHUP_TABLE +TYPE_MATCHUP_TABLE: .byte 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 @@ -10072,8 +10072,8 @@ ov10_022C56B0: .byte 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x01, 0x00 - .global ov10_022C5938 -ov10_022C5938: + .global FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE +FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE: .byte 0x0A, 0x00, 0x64, 0x00 .global ov10_022C593C ov10_022C593C: @@ -10152,8 +10152,8 @@ ov10_022C593C: .byte 0x32, 0x32, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 .byte 0x1E, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0x78, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00 .byte 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 - .global ov10_022C5DDC -ov10_022C5DDC: + .global METRONOME_TABLE +METRONOME_TABLE: .byte 0x01, 0x00, 0x00, 0x00 .global ov10_022C5DE0 ov10_022C5DE0: @@ -10242,8 +10242,8 @@ ov10_022C5DE0: .byte 0x13, 0x02, 0x00, 0x00, 0x00, 0xE4, 0x32, 0x02, 0x15, 0x02, 0x00, 0x00, 0xA0, 0xE4, 0x32, 0x02 .byte 0x16, 0x02, 0x00, 0x00, 0x60, 0xE5, 0x32, 0x02, 0x1B, 0x02, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02 .byte 0x1D, 0x02, 0x00, 0x00, 0x08, 0x7C, 0x32, 0x02 - .global ov10_022C631C -ov10_022C631C: + .global TILESET_PROPERTIES +TILESET_PROPERTIES: .byte 0x01, 0x00, 0x00, 0x00 .global ov10_022C6320 ov10_022C6320: @@ -10409,8 +10409,8 @@ ov10_022C6327: .byte 0x00, 0x02, 0x04, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00 .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00 - .global ov10_022C6C70 -ov10_022C6C70: + .global FIXED_ROOM_PROPERTIES_TABLE +FIXED_ROOM_PROPERTIES_TABLE: .byte 0x00, 0x00, 0x00, 0x00 .global ov10_022C6C74 ov10_022C6C74: diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index 5b9e879a..f0d2e51a 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -299,36 +299,36 @@ _022E99EC: .word ov29_02353538 FindClosestUnoccupiedTileWithin2: ; 0x022E99F0 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A08 ; =ov29_02351844 + ldr r2, _022E9A08 ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A08: .word ov29_02351844 +_022E9A08: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST arm_func_end FindClosestUnoccupiedTileWithin2 arm_func_start FindFarthestUnoccupiedTileWithin2 FindFarthestUnoccupiedTileWithin2: ; 0x022E9A0C stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A24 ; =ov29_023517DC + ldr r2, _022E9A24 ; =DISPLACEMENTS_WITHIN_2_LARGEST_FIRST mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A24: .word ov29_023517DC +_022E9A24: .word DISPLACEMENTS_WITHIN_2_LARGEST_FIRST arm_func_end FindFarthestUnoccupiedTileWithin2 arm_func_start FindUnoccupiedTileWithin3 FindUnoccupiedTileWithin3: ; 0x022E9A28 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A40 ; =ov29_023518AC + ldr r2, _022E9A40 ; =DISPLACEMENTS_WITHIN_3 mov r3, #0x31 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A40: .word ov29_023518AC +_022E9A40: .word DISPLACEMENTS_WITHIN_3 arm_func_end FindUnoccupiedTileWithin3 arm_func_start TickStatusTurnCounter diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index db4f6de3..db2942ac 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -164,7 +164,7 @@ MusicTableIdxToMusicId: ; 0x022EAD00 stmdb sp!, {r4, lr} mov r1, #0xaa bl __divsi3 - ldr r0, _022EAD5C ; =ov10_022C555C + ldr r0, _022EAD5C ; =MUSIC_ID_TABLE mov r1, r1, lsl #1 ldrh r4, [r0, r1] tst r4, #0x8000 @@ -178,16 +178,16 @@ MusicTableIdxToMusicId: ; 0x022EAD00 ldr r1, _022EAD60 ; =0x00007FFF mov r0, r0, lsl #0x10 and r1, r4, r1 - ldr r3, _022EAD64 ; =ov10_022C51FC + ldr r3, _022EAD64 ; =RANDOM_MUSIC_ID_TABLE mov r1, r1, lsl #0x10 mov r2, r0, asr #0xf add r0, r3, r1, lsr #13 ldrh r0, [r2, r0] ldmia sp!, {r4, pc} .align 2, 0 -_022EAD5C: .word ov10_022C555C +_022EAD5C: .word MUSIC_ID_TABLE _022EAD60: .word 0x00007FFF -_022EAD64: .word ov10_022C51FC +_022EAD64: .word RANDOM_MUSIC_ID_TABLE arm_func_end MusicTableIdxToMusicId arm_func_start ov29_022EAD68 @@ -215,7 +215,7 @@ _022EADAC: ldr r0, _022EAE0C ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _022EAE10 ; =ov10_022C6C70 + ldr r2, _022EAE10 ; =FIXED_ROOM_PROPERTIES_TABLE add r0, r0, #0x4000 ldrb r3, [r0, #0xda] smulbb r1, r3, r1 @@ -239,7 +239,7 @@ _022EAE00: .align 2, 0 _022EAE08: .word 0x00001410 _022EAE0C: .word ov29_02353538 -_022EAE10: .word ov10_022C6C70 +_022EAE10: .word FIXED_ROOM_PROPERTIES_TABLE arm_func_end ov29_022EAD68 arm_func_start ChangeDungeonMusic @@ -881,13 +881,13 @@ GetItemAction: ; 0x022EB5D8 moveq r0, #0x35 ldmeqia sp!, {r3, pc} bl GetItemCategoryVeneer - ldr r1, _022EB608 ; =ov29_02352010 + ldr r1, _022EB608 ; =ITEM_CATEGORY_ACTIONS mov r0, r0, lsl #1 ldrh r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 _022EB604: .word 0x0000016B -_022EB608: .word ov29_02352010 +_022EB608: .word ITEM_CATEGORY_ACTIONS arm_func_end GetItemAction arm_func_start RemoveUsedItem @@ -1539,7 +1539,7 @@ _022EBD80: strb r1, [r6, #0x14e] bl CalcSpeedStageWrapper ldr r1, _022EC2FC ; =ov29_02353538 - ldr r3, _022EC300 ; =ov29_02352284 + ldr r3, _022EC300 ; =FRACTIONAL_TURN_SEQUENCE ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -1730,7 +1730,7 @@ _022EC094: mov sb, #0 mov r5, sb mov r7, sb - ldr r6, _022EC300 ; =ov29_02352284 + ldr r6, _022EC300 ; =FRACTIONAL_TURN_SEQUENCE mov fp, #0x32 ldr r4, _022EC2FC ; =ov29_02353538 b _022EC1C0 @@ -1893,7 +1893,7 @@ _022EC2F4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EC2FC: .word ov29_02353538 -_022EC300: .word ov29_02352284 +_022EC300: .word FRACTIONAL_TURN_SEQUENCE _022EC304: .word ov29_023522B6 arm_func_end RunFractionalTurn @@ -1910,7 +1910,7 @@ RunLeaderTurn: ; 0x022EC308 mov r0, r4 bl CalcSpeedStageWrapper ldr r1, _022EC600 ; =ov29_02353538 - ldr r3, _022EC604 ; =ov29_02352284 + ldr r3, _022EC604 ; =FRACTIONAL_TURN_SEQUENCE ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -2100,5 +2100,5 @@ _022EC5DC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EC600: .word ov29_02353538 -_022EC604: .word ov29_02352284 +_022EC604: .word FRACTIONAL_TURN_SEQUENCE arm_func_end RunLeaderTurn diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 91a694f6..81fd936b 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -16,7 +16,7 @@ ApplyMudTrapEffect: ; 0x022EE36C mov ip, #1 mov r3, #3 bge _022EE3B8 - ldr r0, _022EE42C ; =ov29_02352AEC + ldr r0, _022EE42C ; =ATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -27,7 +27,7 @@ ApplyMudTrapEffect: ; 0x022EE36C _022EE3B8: cmp r0, #0x32 bge _022EE3E0 - ldr r0, _022EE430 ; =ov29_02352AE8 + ldr r0, _022EE430 ; =SPATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -38,7 +38,7 @@ _022EE3B8: _022EE3E0: cmp r0, #0x4b bge _022EE408 - ldr r0, _022EE42C ; =ov29_02352AEC + ldr r0, _022EE42C ; =ATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -47,7 +47,7 @@ _022EE3E0: bl LowerDefensiveStat b _022EE424 _022EE408: - ldr r0, _022EE430 ; =ov29_02352AE8 + ldr r0, _022EE430 ; =SPATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -58,8 +58,8 @@ _022EE424: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EE42C: .word ov29_02352AEC -_022EE430: .word ov29_02352AE8 +_022EE42C: .word ATK_STAT_IDX +_022EE430: .word SPATK_STAT_IDX arm_func_end ApplyMudTrapEffect arm_func_start ApplyStickyTrapEffect @@ -773,7 +773,7 @@ _022EEDC4: ldrsh r2, [r1, r4] ldrsh r3, [r5, #6] mov r4, #1 - ldr r1, _022EEE4C ; =ov29_02351844 + ldr r1, _022EEE4C ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST add r2, r3, r2 strh r2, [sp, #0xe] str r4, [sp] @@ -790,7 +790,7 @@ _022EEE38: _022EEE40: .word 0x0000130F _022EEE44: .word DIRECTIONS_XY _022EEE48: .word ov29_0235171E -_022EEE4C: .word ov29_02351844 +_022EEE4C: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST arm_func_end ApplyTripTrapEffect arm_func_start ApplyStealthRockTrapEffect @@ -1122,7 +1122,7 @@ _022EF2A4: _022EF2C4: cmp r5, #0 beq _022EF454 - ldr r1, _022EF460 ; =ov10_022C4720 + ldr r1, _022EF460 ; =SLEEP_TURN_RANGE mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -1240,7 +1240,7 @@ _022EF454: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EF460: .word ov10_022C4720 +_022EF460: .word SLEEP_TURN_RANGE _022EF464: .word 0x00000251 _022EF468: .word ov10_022C45C8 _022EF46C: .word 0x00000252 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index 03bf4489..0cd6791c 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -2174,7 +2174,7 @@ SetMonsterTypeAndAbility: ; 0x022F9194 bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022F9234 ; =ov10_022C4C6C + ldr r1, _022F9234 ; =CASTFORM_WEATHER_ATTRIBUTE_TABLE mov r0, #0 ldrb r1, [r1, r2] strb r1, [r4, #0x5e] @@ -2208,7 +2208,7 @@ _022F9200: strb r1, [r0, #0xe] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F9234: .word ov10_022C4C6C +_022F9234: .word CASTFORM_WEATHER_ATTRIBUTE_TABLE _022F9238: .word ov29_02353538 arm_func_end SetMonsterTypeAndAbility @@ -2502,7 +2502,7 @@ _022F95FC: bne _022F9658 mov r0, sb bl GetApparentWeather - ldr r1, _022F96C4 ; =ov10_022C48DC + ldr r1, _022F96C4 ; =WEATHER_BALL_TYPE_TABLE ldrb r4, [r1, r0] _022F9658: cmp r4, #0 @@ -2533,7 +2533,7 @@ _022F9658: .align 2, 0 _022F96BC: .word ov29_02353538 _022F96C0: .word 0x00000C18 -_022F96C4: .word ov10_022C48DC +_022F96C4: .word WEATHER_BALL_TYPE_TABLE _022F96C8: .word 0x00000C19 arm_func_end TryActivateTraceAndColorChange @@ -3062,7 +3062,7 @@ _022F9D50: mov r0, r1 strh r4, [r3] strh r0, [r3, #2] - ldr r1, _022F9E94 ; =ov29_02352768 + ldr r1, _022F9E94 ; =BELLY_DRAIN_IN_WALLS_INT ldr r0, [r3] ldrh r2, [r1] strh r4, [sp, #8] @@ -3135,7 +3135,7 @@ _022F9E80: _022F9E88: .word ov29_02353538 _022F9E8C: .word SECONDARY_TERRAIN_TYPES _022F9E90: .word 0x00000115 -_022F9E94: .word ov29_02352768 +_022F9E94: .word BELLY_DRAIN_IN_WALLS_INT _022F9E98: .word 0x00000C1A _022F9E9C: .word 0x00000C1B arm_func_end ov29_022F9C74 @@ -5590,7 +5590,7 @@ InitOtherMonsterData: ; 0x022FBE58 strb r6, [ip, #0x100] ldrsh r5, [ip, #0x12] ldrsh r3, [ip, #0x16] - ldr r7, _022FBF04 ; =ov10_022C5938 + ldr r7, _022FBF04 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE mov r0, #0xc add r5, r5, r3 smlabb r3, r1, r0, r7 @@ -5627,7 +5627,7 @@ InitOtherMonsterData: ; 0x022FBE58 bl ov29_022FB83C ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FBF04: .word ov10_022C5938 +_022FBF04: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE arm_func_end InitOtherMonsterData arm_func_start ov29_022FBF08 diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index f7768bf3..b1914413 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -1472,7 +1472,7 @@ _022FDEA0: bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022FDF9C ; =ov10_022C4C6C + ldr r1, _022FDF9C ; =CASTFORM_WEATHER_ATTRIBUTE_TABLE mov r0, #0 ldrb r1, [r1, r2] strb r1, [sl, #0x5e] @@ -1512,7 +1512,7 @@ _022FDF48: bl ov29_02307DC0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FDF9C: .word ov10_022C4C6C +_022FDF9C: .word CASTFORM_WEATHER_ATTRIBUTE_TABLE _022FDFA0: .word ov29_02353538 arm_func_end SubInitMonster diff --git a/asm/overlay_29_02307F1C.s b/asm/overlay_29_02307F1C.s index 0a64e448..b0c264eb 100644 --- a/asm/overlay_29_02307F1C.s +++ b/asm/overlay_29_02307F1C.s @@ -152,7 +152,7 @@ _0230811C: blt _023080B4 _02308124: ldr r0, _02308274 ; =ov10_022C4560 - ldr r1, _02308278 ; =ov10_022C4660 + ldr r1, _02308278 ; =MONSTER_HOUSE_MAX_MONSTER_SPAWNS ldrsh r0, [r0] ldrsh r1, [r1] bl DungeonRandRange @@ -248,5 +248,5 @@ _02308268: .align 2, 0 _02308270: .word ov29_02353538 _02308274: .word ov10_022C4560 -_02308278: .word ov10_022C4660 +_02308278: .word MONSTER_HOUSE_MAX_MONSTER_SPAWNS arm_func_end TryTriggerMonsterHouse diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index e7428395..c14aa8c9 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -52,7 +52,7 @@ _0230905C: cmpeq r0, #3 ldreqb r0, [r6, #0xf] cmpeq r0, #0 - ldreq r0, _02309F98 ; =ov10_022C4598 + ldreq r0, _02309F98 ; =SET_DAMAGE_STATUS_DAMAGE ldreqsh r0, [r0] streq r0, [r6] ldr r0, [r8] @@ -274,7 +274,7 @@ _02309398: mov r0, #0 b _0230A918 _023093D8: - ldr sl, _02309FAC ; =ov29_023528A4 + ldr sl, _02309FAC ; =TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS b _0230944C _023093E0: ldrb r0, [r6, #0xc] @@ -521,7 +521,7 @@ _02309740: ldr r1, [r6, #4] ldr r2, [r4, #0xb8] cmp r1, #0x1b - ldrlt r0, _02309FD8 ; =ov29_02353330 + ldrlt r0, _02309FD8 ; =DAMAGE_STRING_IDS movge sl, #0 movlt r1, r1, lsl #1 ldrlth sl, [r0, r1] @@ -1092,12 +1092,12 @@ _02309F44: ldr r6, _02309FFC ; =ov29_02353538 b _0230A090 .align 2, 0 -_02309F98: .word ov10_022C4598 +_02309F98: .word SET_DAMAGE_STATUS_DAMAGE _02309F9C: .word 0x00000C46 _02309FA0: .word 0x0000024D _02309FA4: .word 0x0000270F _02309FA8: .word 0x00000C41 -_02309FAC: .word ov29_023528A4 +_02309FAC: .word TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS _02309FB0: .word ov10_022C45C4 _02309FB4: .word 0x00000C42 _02309FB8: .word 0x00000C43 @@ -1108,7 +1108,7 @@ _02309FC8: .word ov29_023535D4 _02309FCC: .word 0x000002B6 _02309FD0: .word 0x00000C48 _02309FD4: .word 0x000003E7 -_02309FD8: .word ov29_02353330 +_02309FD8: .word DAMAGE_STRING_IDS _02309FDC: .word 0x0000025F _02309FE0: .word 0x00000C49 _02309FE4: .word 0x00000C4A @@ -1829,7 +1829,7 @@ AftermathCheck: ; 0x0230AA0C bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230AA78 - ldr r0, _0230AA84 ; =ov10_022C4594 + ldr r0, _0230AA84 ; =AFTERMATH_CHANCE ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -1852,7 +1852,7 @@ _0230AA7C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230AA84: .word ov10_022C4594 +_0230AA84: .word AFTERMATH_CHANCE _0230AA88: .word 0x0000026F arm_func_end AftermathCheck @@ -1904,7 +1904,7 @@ _0230AB18: cmp r6, #2 blt _0230AAC8 ldrsh r2, [sp] - ldr r0, _0230AB54 ; =ov10_022C4D14 + ldr r0, _0230AB54 ; =TYPE_MATCHUP_COMBINATOR_TABLE ldrsh r1, [sp, #2] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] @@ -1912,7 +1912,7 @@ _0230AB18: .align 2, 0 _0230AB4C: .word ov29_02352838 _0230AB50: .word ov29_02353538 -_0230AB54: .word ov10_022C4D14 +_0230AB54: .word TYPE_MATCHUP_COMBINATOR_TABLE arm_func_end GetTypeMatchupBothTypes arm_func_start ScrappyShouldActivate @@ -2040,7 +2040,7 @@ _0230ACCC: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _0230ACE0: - ldr r1, _0230AD00 ; =ov10_022C56B0 + ldr r1, _0230AD00 ; =TYPE_MATCHUP_TABLE mov r0, #0x24 mla r0, r5, r0, r1 add r1, r4, r6 @@ -2049,7 +2049,7 @@ _0230ACE0: ldrsh r0, [r1, r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0230AD00: .word ov10_022C56B0 +_0230AD00: .word TYPE_MATCHUP_TABLE arm_func_end GetTypeMatchup arm_func_start CalcTypeBasedDamageEffects @@ -2100,30 +2100,30 @@ CalcTypeBasedDamageEffects: ; 0x0230AD04 mov r2, r8 str r3, [r7, #8] bl ScrappyShouldActivate - ldr r3, _0230B778 ; =ov10_022C4820 + ldr r3, _0230B778 ; =MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x28] ldr r0, [r3] - ldr r2, _0230B77C ; =ov10_022C4824 + ldr r2, _0230B77C ; =MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x24] ldr r0, [r2] - ldr r1, _0230B780 ; =ov10_022C482C + ldr r1, _0230B780 ; =MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x20] ldr r0, [r1] - ldr r1, _0230B784 ; =ov10_022C4758 + ldr r1, _0230B784 ; =MATCHUP_IMMUNE_MULTIPLIER str r0, [sp, #0x1c] - ldr r0, _0230B788 ; =ov10_022C474C + ldr r0, _0230B788 ; =MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER mov r4, #0 ldr r0, [r0] str r0, [sp, #0x18] ldr r0, [r1] - ldr r1, _0230B78C ; =ov10_022C481C + ldr r1, _0230B78C ; =MATCHUP_NEUTRAL_MULTIPLIER str r0, [sp, #0x14] - ldr r0, _0230B790 ; =ov10_022C4810 + ldr r0, _0230B790 ; =MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER ldr r0, [r0] str r0, [sp, #0x10] ldr r0, [r1] str r0, [sp, #0xc] - ldr r0, _0230B794 ; =ov10_022C4818 + ldr r0, _0230B794 ; =MATCHUP_SUPER_EFFECTIVE_MULTIPLIER ldr r0, [r0] str r0, [sp, #8] b _0230AF8C @@ -2231,7 +2231,7 @@ _0230AF94: ldr r0, _0230B798 ; =ov29_02353538 ldr r4, [sp, #0x34] ldr r2, [r0] - ldr r1, _0230B79C ; =ov10_022C4D14 + ldr r1, _0230B79C ; =TYPE_MATCHUP_COMBINATOR_TABLE strb r4, [r2, #0x18c] ldr r3, [sp, #0x38] ldr r2, [r0] @@ -2259,7 +2259,7 @@ _0230AFEC: ldr r0, [r7, #8] cmp r0, #1 bne _0230B02C - ldr r1, _0230B7A0 ; =ov10_022C47C0 + ldr r1, _0230B7A0 ; =TINTED_LENS_MULTIPLIER add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2286,7 +2286,7 @@ _0230B064: ldr r0, [r7, #8] cmp r0, #3 bne _0230B080 - ldr r2, _0230B7A4 ; =ov29_02352864 + ldr r2, _0230B7A4 ; =SOLID_ROCK_MULTIPLIER mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2296,7 +2296,7 @@ _0230B080: bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230B0A4 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2309,12 +2309,12 @@ _0230B0A4: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B104 - ldr r0, _0230B7AC ; =ov10_022C455C + ldr r0, _0230B7AC ; =TECHNICIAN_MOVE_POWER_THRESHOLD ldrsh r1, [r0] ldr r0, [sp, #4] cmp r0, r1 bgt _0230B104 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2337,7 +2337,7 @@ _0230B104: cmp r0, #0 beq _0230B14C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2375,7 +2375,7 @@ _0230B198: cmp r0, #0 beq _0230B1DC ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2441,7 +2441,7 @@ _0230B248: cmp r7, #0 beq _0230B2D4 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2486,7 +2486,7 @@ _0230B2F4: cmp r7, #0 beq _0230B380 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2531,7 +2531,7 @@ _0230B3A0: cmp r7, #0 beq _0230B42C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2576,7 +2576,7 @@ _0230B44C: cmp r7, #0 beq _0230B4D8 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2601,7 +2601,7 @@ _0230B4F8: cmp r0, #0 beq _0230B534 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2612,7 +2612,7 @@ _0230B534: ldrb r0, [r6, #0xbf] cmp r0, #1 bne _0230B560 - ldr r1, _0230B7CC ; =ov10_022C4744 + ldr r1, _0230B7CC ; =BURN_DAMAGE_MULTIPLIER add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2639,13 +2639,13 @@ _0230B560: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B5BC - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 b _0230B5CC _0230B5BC: - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2658,7 +2658,7 @@ _0230B5CC: cmp r8, #2 bne _0230B60C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2670,7 +2670,7 @@ _0230B60C: cmp r8, #3 bne _0230B634 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2683,7 +2683,7 @@ _0230B634: cmp r8, #2 bne _0230B668 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2695,7 +2695,7 @@ _0230B668: cmp r8, #3 bne _0230B690 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2707,7 +2707,7 @@ _0230B690: bne _0230B6C0 cmp r8, #1 beq _0230B6C0 - ldr r2, _0230B7D0 ; =ov29_0235285C + ldr r2, _0230B7D0 ; =CLOUDY_DAMAGE_MULTIPLIER mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2727,7 +2727,7 @@ _0230B6C0: _0230B6E0: cmp r8, #5 bne _0230B700 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r3, #1 mov r0, fp mov r1, fp @@ -2742,7 +2742,7 @@ _0230B700: beq _0230B738 cmp r8, #2 bne _0230B738 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r3, #1 mov r0, fp mov r1, fp @@ -2754,7 +2754,7 @@ _0230B738: cmpeq r0, #0xb bne _0230B768 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2768,29 +2768,29 @@ _0230B76C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0230B774: .word ov29_02352838 -_0230B778: .word ov10_022C4820 -_0230B77C: .word ov10_022C4824 -_0230B780: .word ov10_022C482C -_0230B784: .word ov10_022C4758 -_0230B788: .word ov10_022C474C -_0230B78C: .word ov10_022C481C -_0230B790: .word ov10_022C4810 -_0230B794: .word ov10_022C4818 +_0230B778: .word MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +_0230B77C: .word MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +_0230B780: .word MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +_0230B784: .word MATCHUP_IMMUNE_MULTIPLIER +_0230B788: .word MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +_0230B78C: .word MATCHUP_NEUTRAL_MULTIPLIER +_0230B790: .word MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +_0230B794: .word MATCHUP_SUPER_EFFECTIVE_MULTIPLIER _0230B798: .word ov29_02353538 -_0230B79C: .word ov10_022C4D14 -_0230B7A0: .word ov10_022C47C0 -_0230B7A4: .word ov29_02352864 -_0230B7A8: .word ov29_0235283C -_0230B7AC: .word ov10_022C455C -_0230B7B0: .word ov29_02352844 +_0230B79C: .word TYPE_MATCHUP_COMBINATOR_TABLE +_0230B7A0: .word TINTED_LENS_MULTIPLIER +_0230B7A4: .word SOLID_ROCK_MULTIPLIER +_0230B7A8: .word DAMAGE_MULTIPLIER_0_5 +_0230B7AC: .word TECHNICIAN_MOVE_POWER_THRESHOLD +_0230B7B0: .word DAMAGE_MULTIPLIER_1_5 _0230B7B4: .word 0x00000C3E _0230B7B8: .word 0x000003E7 -_0230B7BC: .word ov29_0235284C +_0230B7BC: .word DAMAGE_MULTIPLIER_2 _0230B7C0: .word 0x00000C4F _0230B7C4: .word 0x00000C51 _0230B7C8: .word 0x00000C52 -_0230B7CC: .word ov10_022C4744 -_0230B7D0: .word ov29_0235285C +_0230B7CC: .word BURN_DAMAGE_MULTIPLIER +_0230B7D0: .word CLOUDY_DAMAGE_MULTIPLIER arm_func_end CalcTypeBasedDamageEffects arm_func_start ov29_0230B7D4 @@ -3089,7 +3089,7 @@ CalcDamage: ; 0x0230BBAC ldrb r0, [r6, #0x221] cmp r0, #0 beq _0230BC1C - ldr r1, _0230C454 ; =ov10_022C4710 + ldr r1, _0230C454 ; =ME_FIRST_MULTIPLIER ldr r0, [sp, #0x1c] ldr r1, [r1] bl MultiplyByFixedPoint @@ -3513,7 +3513,7 @@ _0230C23C: movlt r0, #0 strlt r0, [sp, #0x44] ldr r0, [sp, #0x44] - ldr r2, _0230C470 ; =ov10_022C4D98 + ldr r2, _0230C470 ; =OFFENSIVE_STAT_STAGE_MULTIPLIERS cmp r0, #0x14 movgt r0, #0x14 strgt r0, [sp, #0x44] @@ -3541,7 +3541,7 @@ _0230C23C: strb r4, [r5, #0xb] add r0, r7, #0x1c ldrb r2, [r0, r1] - ldr r1, _0230C474 ; =ov10_022C4DEC + ldr r1, _0230C474 ; =DEFENSIVE_STAT_STAGE_MULTIPLIERS strh r2, [r5, #0xe] ldr r2, [sp, #0x18] ldr r1, [r1, r4, lsl #2] @@ -3648,15 +3648,15 @@ _0230C41C: b _0230C5E0 .align 2, 0 _0230C450: .word ov29_02353538 -_0230C454: .word ov10_022C4710 +_0230C454: .word ME_FIRST_MULTIPLIER _0230C458: .word 0x000001D3 _0230C45C: .word 0x00000163 _0230C460: .word 0x000001A3 _0230C464: .word 0x000001A5 _0230C468: .word 0x00000211 _0230C46C: .word 0x000001BD -_0230C470: .word ov10_022C4D98 -_0230C474: .word ov10_022C4DEC +_0230C470: .word OFFENSIVE_STAT_STAGE_MULTIPLIERS +_0230C474: .word DEFENSIVE_STAT_STAGE_MULTIPLIERS _0230C478: .word POWER_BAND_STAT_BOOST _0230C47C: .word MUNCH_BELT_STAT_BOOST _0230C480: .word AURA_BOW_STAT_BOOST @@ -3667,20 +3667,20 @@ _0230C490: .word 0x00000C53 _0230C494: .word 0x00000C54 _0230C498: .word 0x00000C55 _0230C49C: .word 0x000003E7 -_0230C4A0: .word _020A18D8 +_0230C4A0: .word DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR _0230C4A4: .word ov29_02352984 _0230C4A8: .word ov29_02352990 _0230C4AC: .word ov29_0235299C -_0230C4B0: .word _020A18F4 -_0230C4B4: .word _020A18F0 -_0230C4B8: .word _020A18CC -_0230C4BC: .word _020A18F8 -_0230C4C0: .word _020A18EC -_0230C4C4: .word _020A18D4 -_0230C4C8: .word _020A18E8 -_0230C4CC: .word ov29_0235286C +_0230C4B0: .word DAMAGE_FORMULA_AT_PREFACTOR +_0230C4B4: .word DAMAGE_FORMULA_DEF_PREFACTOR +_0230C4B8: .word DAMAGE_FORMULA_FLV_SHIFT +_0230C4BC: .word DAMAGE_FORMULA_LN_ARG_PREFACTOR +_0230C4C0: .word DAMAGE_FORMULA_LN_PREFACTOR +_0230C4C4: .word DAMAGE_FORMULA_CONSTANT_SHIFT +_0230C4C8: .word DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +_0230C4CC: .word DAMAGE_FORMULA_MAX_BASE _0230C4D0: .word ov29_02352838 -_0230C4D4: .word ov29_0235287C +_0230C4D4: .word DAMAGE_FORMULA_MIN_BASE _0230C4D8: ldr r0, [sp, #0xf8] cmp r0, #0 @@ -4004,7 +4004,7 @@ _0230C940: add r0, sp, #0x88 sub r1, r2, r1 bl IntToFixedPoint64 - ldr r1, _0230C4A0 ; =_020A18D8 + ldr r1, _0230C4A0 ; =DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR add r0, sp, #0x80 ldr r1, [r1] bl FixedPoint32To64 @@ -4049,7 +4049,7 @@ _0230C940: mov r1, r0 ldr r0, _0230C4AC ; =ov29_0235299C bl DebugPrint0 - ldr r1, _0230C4B0 ; =_020A18F4 + ldr r1, _0230C4B0 ; =DAMAGE_FORMULA_AT_PREFACTOR add r0, sp, #0x70 ldr r1, [r1] bl FixedPoint32To64 @@ -4057,7 +4057,7 @@ _0230C940: add r1, sp, #0xa0 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B4 ; =_020A18F0 + ldr r1, _0230C4B4 ; =DAMAGE_FORMULA_DEF_PREFACTOR add r0, sp, #0x68 ldr r1, [r1] bl FixedPoint32To64 @@ -4065,7 +4065,7 @@ _0230C940: add r1, sp, #0x98 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B8 ; =_020A18CC + ldr r1, _0230C4B8 ; =DAMAGE_FORMULA_FLV_SHIFT add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4073,7 +4073,7 @@ _0230C940: add r1, sp, #0xa8 add r2, sp, #0x78 bl AddFixedPoint64 - ldr r1, _0230C4BC ; =_020A18F8 + ldr r1, _0230C4BC ; =DAMAGE_FORMULA_LN_ARG_PREFACTOR add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4086,7 +4086,7 @@ _0230C940: mov r1, r0 add r0, sp, #0x60 bl ClampedLn - ldr r1, _0230C4C0 ; =_020A18EC + ldr r1, _0230C4C0 ; =DAMAGE_FORMULA_LN_PREFACTOR add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4102,7 +4102,7 @@ _0230C940: add r2, sp, #0x60 mov r1, r0 bl AddFixedPoint64 - ldr r1, _0230C4C4 ; =_020A18D4 + ldr r1, _0230C4C4 ; =DAMAGE_FORMULA_CONSTANT_SHIFT add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4116,7 +4116,7 @@ _0230C940: ldrb r0, [r6, #6] cmp r0, #0 beq _0230CB78 - ldr r1, _0230C4C8 ; =_020A18E8 + ldr r1, _0230C4C8 ; =DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4125,7 +4125,7 @@ _0230C940: mov r1, r0 bl DivideFixedPoint64 _0230CB78: - ldr r0, _0230C4CC ; =ov29_0235286C + ldr r0, _0230C4CC ; =DAMAGE_FORMULA_MAX_BASE add r1, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 @@ -4134,7 +4134,7 @@ _0230CB78: ldrne r0, [r0, #0x34] strne r1, [sp, #0xb4] strne r0, [sp, #0xb0] - ldr r1, _0230C4D4 ; =ov29_0235287C + ldr r1, _0230C4D4 ; =DAMAGE_FORMULA_MIN_BASE add r0, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 @@ -4218,7 +4218,7 @@ _0230CCD0: mov r0, sb bl PlayEffectAnimation0x171 add r0, sp, #0xb8 - ldr r2, _0230D064 ; =ov29_0235283C + ldr r2, _0230D064 ; =DAMAGE_MULTIPLIER_0_5 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4239,7 +4239,7 @@ _0230CD1C: mov r0, sb bl PlayEffectAnimation0x171Full add r0, sp, #0xb8 - ldr r2, _0230D064 ; =ov29_0235283C + ldr r2, _0230D064 ; =DAMAGE_MULTIPLIER_0_5 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4291,7 +4291,7 @@ _0230CD3C: cmp r0, #0 beq _0230CE04 _0230CDF0: - ldr r0, _0230D068 ; =ov10_022C46F0 + ldr r0, _0230D068 ; =SCOPE_LENS_CRIT_RATE_BOOST mov r1, #1 ldrsh r0, [r0] strb r1, [r5, #0x38] @@ -4301,7 +4301,7 @@ _0230CE04: mov r1, #0x58 bl AbilityIsActiveVeneer cmp r0, #0 - ldrne r0, _0230D06C ; =ov10_022C4510 + ldrne r0, _0230D06C ; =SUPER_LUCK_CRIT_RATE_BOOST movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x49] @@ -4310,7 +4310,7 @@ _0230CE04: mov r0, sb bl ItemIsActive__0230A9DC cmp r0, #0 - ldrne r0, _0230D068 ; =ov10_022C46F0 + ldrne r0, _0230D068 ; =SCOPE_LENS_CRIT_RATE_BOOST movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x39] @@ -4321,7 +4321,7 @@ _0230CE04: mov r1, #1 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _0230D070 ; =ov10_022C45E0 + ldrne r0, _0230D070 ; =TYPE_ADVANTAGE_MASTER_CRIT_RATE movne r1, #1 ldrnesh r4, [r0] strneb r1, [r5, #0x3d] @@ -4347,14 +4347,14 @@ _0230CE74: cmp r0, #0 add r0, sp, #0xb8 beq _0230CEE0 - ldr r2, _0230D074 ; =ov29_0235284C + ldr r2, _0230D074 ; =DAMAGE_MULTIPLIER_2 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 strb r0, [r5, #0x4a] b _0230CEEC _0230CEE0: - ldr r2, _0230D078 ; =ov29_02352844 + ldr r2, _0230D078 ; =DAMAGE_MULTIPLIER_1_5 mov r1, r0 bl MultiplyFixedPoint64 _0230CEEC: @@ -4420,7 +4420,7 @@ _0230CFBC: bl IqSkillIsEnabled cmp r0, #0 beq _0230CFFC - ldr r0, _0230D080 ; =ov10_022C47F8 + ldr r0, _0230D080 ; =POWER_PITCHER_DAMAGE_MULTIPLIER ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4440,7 +4440,7 @@ ov29_0230D000: ; 0x0230D000 bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230D038 - ldr r0, _0230D084 ; =ov10_022C4844 + ldr r0, _0230D084 ; =AIR_BLADE_DAMAGE_MULTIPLIER ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4461,15 +4461,15 @@ _0230D054: .align 2, 0 _0230D05C: .word 0x00000C58 _0230D060: .word 0x00000C57 -_0230D064: .word ov29_0235283C -_0230D068: .word ov10_022C46F0 -_0230D06C: .word ov10_022C4510 -_0230D070: .word ov10_022C45E0 -_0230D074: .word ov29_0235284C -_0230D078: .word ov29_02352844 +_0230D064: .word DAMAGE_MULTIPLIER_0_5 +_0230D068: .word SCOPE_LENS_CRIT_RATE_BOOST +_0230D06C: .word SUPER_LUCK_CRIT_RATE_BOOST +_0230D070: .word TYPE_ADVANTAGE_MASTER_CRIT_RATE +_0230D074: .word DAMAGE_MULTIPLIER_2 +_0230D078: .word DAMAGE_MULTIPLIER_1_5 _0230D07C: .word 0x00000195 -_0230D080: .word ov10_022C47F8 -_0230D084: .word ov10_022C4844 +_0230D080: .word POWER_PITCHER_DAMAGE_MULTIPLIER +_0230D084: .word AIR_BLADE_DAMAGE_MULTIPLIER arm_func_end ov29_0230D000 arm_func_start ov29_0230D088 @@ -4644,7 +4644,7 @@ _0230D298: cmp r0, #0 beq _0230D2F8 ldr r2, [sp, #0x10] - ldr r0, _0230D39C ; =ov10_022C4D14 + ldr r0, _0230D39C ; =TYPE_MATCHUP_COMBINATOR_TABLE ldr r1, [sp, #0x14] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] @@ -4661,7 +4661,7 @@ _0230D2F8: bl IqSkillIsEnabled cmp r0, #0 beq _0230D334 - ldr r1, _0230D3A4 ; =ov10_022C47F8 + ldr r1, _0230D3A4 ; =POWER_PITCHER_DAMAGE_MULTIPLIER mov r0, r8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -4694,9 +4694,9 @@ _0230D334: add sp, sp, #0x2c ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0230D39C: .word ov10_022C4D14 +_0230D39C: .word TYPE_MATCHUP_COMBINATOR_TABLE _0230D3A0: .word 0x00000256 -_0230D3A4: .word ov10_022C47F8 +_0230D3A4: .word POWER_PITCHER_DAMAGE_MULTIPLIER arm_func_end CalcDamageFixed arm_func_start CalcDamageFixedNoCategory @@ -5627,7 +5627,7 @@ _0230DFD4: ldrnesh r0, [r0] mov r1, r1, lsl #1 addne r6, r6, r0 - ldr r0, _0230E060 ; =ov10_022C5064 + ldr r0, _0230E060 ; =RECRUITMENT_LEVEL_BOOST_TABLE ldrsh r0, [r0, r1] add r0, r6, r0 cmp r4, r0 @@ -5654,7 +5654,7 @@ _0230E050: .word ov10_022C4708 _0230E054: .word ov10_022C4704 _0230E058: .word ov10_022C4700 _0230E05C: .word ov10_022C46FC -_0230E060: .word ov10_022C5064 +_0230E060: .word RECRUITMENT_LEVEL_BOOST_TABLE arm_func_end RecruitCheck arm_func_start TryRecruit @@ -6123,14 +6123,14 @@ TrySpawnMonsterAndTickSpawnCounter: ; 0x0230E6BC ldrb r1, [r7, #0x790] cmp r1, #0 bne _0230E710 - ldr r1, _0230E8DC ; =ov10_022C44DC + ldr r1, _0230E8DC ; =SPAWN_COOLDOWN ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 bge _0230E724 b _0230E8D0 _0230E710: - ldr r1, _0230E8E0 ; =ov10_022C4640 + ldr r1, _0230E8E0 ; =SPAWN_COOLDOWN_THIEF_ALERT ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 @@ -6188,13 +6188,13 @@ _0230E7B8: ldrb r0, [r0, #0xc9] cmp r0, #0xff bne _0230E7FC - ldr r0, _0230E8E4 ; =ov10_022C4430 + ldr r0, _0230E8E4 ; =SPAWN_CAP_NO_MONSTER_HOUSE ldrsh r0, [r0] cmp r5, r0 blt _0230E80C b _0230E8D0 _0230E7FC: - ldr r0, _0230E8E8 ; =ov10_022C46A4 + ldr r0, _0230E8E8 ; =SPAWN_CAP_WITH_MONSTER_HOUSE ldrsh r0, [r0] cmp r5, r0 bge _0230E8D0 @@ -6256,9 +6256,9 @@ _0230E8D0: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0230E8D8: .word ov29_02353538 -_0230E8DC: .word ov10_022C44DC -_0230E8E0: .word ov10_022C4640 -_0230E8E4: .word ov10_022C4430 -_0230E8E8: .word ov10_022C46A4 +_0230E8DC: .word SPAWN_COOLDOWN +_0230E8E0: .word SPAWN_COOLDOWN_THIEF_ALERT +_0230E8E4: .word SPAWN_CAP_NO_MONSTER_HOUSE +_0230E8E8: .word SPAWN_CAP_WITH_MONSTER_HOUSE _0230E8EC: .word 0x00000C5D arm_func_end TrySpawnMonsterAndTickSpawnCounter diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index 2f1cc3fd..8b5779d9 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -1460,7 +1460,7 @@ _02310474: cmp r0, #0 beq _023104C0 ldrb r1, [r4, #0x11f] - ldr r0, _02310AA8 ; =ov10_022C466C + ldr r0, _02310AA8 ; =SPEED_BOOST_TURNS add r2, r1, #1 ldrsh r0, [r0] and r1, r2, #0xff @@ -1508,13 +1508,13 @@ _023104F8: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AAC ; =ov10_022C4610 + ldr r1, _02310AAC ; =BURN_DAMAGE_COOLDOWN mov r0, r5 ldrsh r2, [r1] mov r1, r5 strb r2, [r4, #0xc1] bl ov29_02307BDC - ldr r0, _02310AB0 ; =ov10_022C44D4 + ldr r0, _02310AB0 ; =BURN_DAMAGE mov r2, #1 ldrsh r1, [r0] mov r0, r5 @@ -1671,7 +1671,7 @@ _02310754: ldreqb r0, [r4, #0xbf] cmpeq r0, #2 bne _02310FF4 - ldr r1, _02310AC0 ; =ov10_022C46A8 + ldr r1, _02310AC0 ; =POISON_DAMAGE_COOLDOWN mov r0, r5 ldrsh r2, [r1] mov r1, r5 @@ -1682,7 +1682,7 @@ _02310754: bl AbilityIsActiveVeneer cmp r0, #0 beq _023107F8 - ldr r0, _02310AC4 ; =ov10_022C44D8 + ldr r0, _02310AC4 ; =POISON_DAMAGE mov r6, #1 ldrsh r2, [r0] mov r0, r5 @@ -1692,7 +1692,7 @@ _02310754: bl TryIncreaseHp b _02310810 _023107F8: - ldr r0, _02310AC4 ; =ov10_022C44D8 + ldr r0, _02310AC4 ; =POISON_DAMAGE mov r2, #3 ldrsh r1, [r0] mov r0, r5 @@ -1721,7 +1721,7 @@ _02310830: cmp r6, #0x1d addlo r0, r6, #1 strlob r0, [r4, #0xc2] - ldr r0, _02310AC8 ; =ov10_022C4414 + ldr r0, _02310AC8 ; =BAD_POISON_DAMAGE_COOLDOWN cmp r6, #0x1d ldrsh r0, [r0] movge r6, #0x1d @@ -1747,7 +1747,7 @@ _02310830: bl AbilityIsActiveVeneer cmp r0, #0 beq _023108F4 - ldr r0, _02310ACC ; =ov10_022C4C9C + ldr r0, _02310ACC ; =BAD_POISON_DAMAGE_TABLE mov r1, r6, lsl #1 ldrsh r2, [r0, r1] mov r6, #1 @@ -1758,7 +1758,7 @@ _02310830: bl TryIncreaseHp b _02310910 _023108F4: - ldr r0, _02310ACC ; =ov10_022C4C9C + ldr r0, _02310ACC ; =BAD_POISON_DAMAGE_TABLE mov r1, r6, lsl #1 ldrsh r1, [r0, r1] mov r2, #3 @@ -1873,16 +1873,16 @@ _02310A98: .word 0x00000DBD _02310A9C: .word ov10_022C46EC _02310AA0: .word 0x0000025F _02310AA4: .word ov10_022C46A0 -_02310AA8: .word ov10_022C466C -_02310AAC: .word ov10_022C4610 -_02310AB0: .word ov10_022C44D4 +_02310AA8: .word SPEED_BOOST_TURNS +_02310AAC: .word BURN_DAMAGE_COOLDOWN +_02310AB0: .word BURN_DAMAGE _02310AB4: .word 0x000003E7 _02310AB8: .word ov10_022C4664 _02310ABC: .word ov10_022C464C -_02310AC0: .word ov10_022C46A8 -_02310AC4: .word ov10_022C44D8 -_02310AC8: .word ov10_022C4414 -_02310ACC: .word ov10_022C4C9C +_02310AC0: .word POISON_DAMAGE_COOLDOWN +_02310AC4: .word POISON_DAMAGE +_02310AC8: .word BAD_POISON_DAMAGE_COOLDOWN +_02310ACC: .word BAD_POISON_DAMAGE_TABLE _02310AD0: .word ov10_022C4454 _02310AD4: .word ov10_022C446C _02310AD8: .word ov10_022C45F0 @@ -1891,8 +1891,8 @@ _02310AE0: .word 0x0000024A _02310AE4: .word ov10_022C45E8 _02310AE8: .word ov10_022C4590 _02310AEC: .word ov10_022C44BC -_02310AF0: .word ov10_022C46AC -_02310AF4: .word ov10_022C4588 +_02310AF0: .word LEECH_SEED_DAMAGE_COOLDOWN +_02310AF4: .word LEECH_SEED_HP_DRAIN _02310AF8: cmp r0, #5 bne _02310B6C @@ -1994,12 +1994,12 @@ _02310C28: ldr r0, _02310A84 ; =ov29_02353538 ldrb r2, [r4, #0xe8] ldr r0, [r0] - ldr r1, _02310AF0 ; =ov10_022C46AC + ldr r1, _02310AF0 ; =LEECH_SEED_DAMAGE_COOLDOWN add r0, r0, r2, lsl #2 add r0, r0, #0x12000 ldr r7, [r0, #0xb78] ldrsh r1, [r1] - ldr r0, _02310AF4 ; =ov10_022C4588 + ldr r0, _02310AF4 ; =LEECH_SEED_HP_DRAIN cmp r7, #0 ldrsh r6, [r0] strb r1, [r4, #0xea] diff --git a/asm/overlay_29_02319FB0.s b/asm/overlay_29_02319FB0.s index 0ac4b77a..5c7289e3 100644 --- a/asm/overlay_29_02319FB0.s +++ b/asm/overlay_29_02319FB0.s @@ -1103,7 +1103,7 @@ GetEntityNaturalGiftInfo: ; 0x0231AE90 cmpne r0, #0 beq _0231AF00 mov ip, #0 - ldr r3, _0231AF08 ; =ov10_022C5130 + ldr r3, _0231AF08 ; =NATURAL_GIFT_ITEM_TABLE mov lr, ip mov r1, #6 _0231AEC0: @@ -1121,25 +1121,25 @@ _0231AEC0: b _0231AEC0 _0231AEF0: cmp ip, #0 - ldrne r0, _0231AF08 ; =ov10_022C5130 + ldrne r0, _0231AF08 ; =NATURAL_GIFT_ITEM_TABLE addne r0, r0, r5 ldmneia sp!, {r3, r4, r5, pc} _0231AF00: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0231AF08: .word ov10_022C5130 +_0231AF08: .word NATURAL_GIFT_ITEM_TABLE arm_func_end GetEntityNaturalGiftInfo arm_func_start GetEntityWeatherBallType GetEntityWeatherBallType: ; 0x0231AF0C stmdb sp!, {r3, lr} bl GetApparentWeather - ldr r1, _0231AF20 ; =ov10_022C48DC + ldr r1, _0231AF20 ; =WEATHER_BALL_TYPE_TABLE ldrb r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 -_0231AF20: .word ov10_022C48DC +_0231AF20: .word WEATHER_BALL_TYPE_TABLE arm_func_end GetEntityWeatherBallType arm_func_start ov29_0231AF24 diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index 0c0c04a5..e46a75cf 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -912,7 +912,7 @@ _0231BE50: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x52 bl InitMove - ldr r0, _0231C704 ; =ov10_022C4624 + ldr r0, _0231C704 ; =STICK_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -927,7 +927,7 @@ _0231BE88: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x4a bl InitMove - ldr r0, _0231C708 ; =ov10_022C46E8 + ldr r0, _0231C708 ; =IRON_THORN_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -942,7 +942,7 @@ _0231BEC0: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x42 bl InitMove - ldr r0, _0231C70C ; =ov10_022C46E4 + ldr r0, _0231C70C ; =SILVER_SPIKE_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -957,7 +957,7 @@ _0231BEF8: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x3a bl InitMove - ldr r0, _0231C710 ; =ov10_022C46E0 + ldr r0, _0231C710 ; =GOLD_FANG_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -972,7 +972,7 @@ _0231BF30: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x32 bl InitMove - ldr r0, _0231C714 ; =ov10_022C46DC + ldr r0, _0231C714 ; =CACNEA_SPIKE_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -987,7 +987,7 @@ _0231BF68: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x2a bl InitMove - ldr r0, _0231C718 ; =ov10_022C46D8 + ldr r0, _0231C718 ; =CORSOLA_TWIG_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1001,7 +1001,7 @@ _0231BF68: _0231BFA0: mov r4, #0 str r4, [sp] - ldr r0, _0231C71C ; =ov10_022C46B4 + ldr r0, _0231C71C ; =GEO_PEBBLE_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1017,7 +1017,7 @@ _0231BFA0: _0231BFDC: mov r4, #0 str r4, [sp] - ldr r0, _0231C724 ; =ov10_022C46B8 + ldr r0, _0231C724 ; =GRAVELEROCK_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1034,7 +1034,7 @@ _0231C018: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x22 bl InitMove - ldr r0, _0231C728 ; =ov10_022C44D0 + ldr r0, _0231C728 ; =GOLD_THORN_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1048,7 +1048,7 @@ _0231C018: _0231C050: mov r4, #0 str r4, [sp] - ldr r0, _0231C72C ; =ov10_022C46BC + ldr r0, _0231C72C ; =RARE_FOSSIL_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1069,8 +1069,8 @@ _0231C08C: bl EndNegativeStatusConditionWrapper b _0231CB14 _0231C0A4: - ldr r1, _0231C730 ; =ov10_022C45EC - ldr r0, _0231C734 ; =ov10_022C44F4 + ldr r1, _0231C730 ; =ORAN_BERRY_HP_RESTORATION + ldr r0, _0231C734 ; =ORAN_BERRY_FULL_HP_BOOST ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1080,8 +1080,8 @@ _0231C0A4: bl TryIncreaseHp b _0231CB14 _0231C0CC: - ldr r1, _0231C738 ; =ov10_022C4478 - ldr r0, _0231C73C ; =ov10_022C45F4 + ldr r1, _0231C738 ; =SITRUS_BERRY_HP_RESTORATION + ldr r0, _0231C73C ; =SITRUS_BERRY_FULL_HP_BOOST ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1091,7 +1091,7 @@ _0231C0CC: bl TryIncreaseHp b _0231CB14 _0231C0F4: - ldr r0, _0231C740 ; =ov10_022C44F8 + ldr r0, _0231C740 ; =LIFE_SEED_HP_BOOST mov r4, #1 ldrsh r3, [r0] mov r0, r8 @@ -1150,7 +1150,7 @@ _0231C1A4: bl TryWarp b _0231CB14 _0231C1BC: - ldr r1, _0231C744 ; =ov10_022C4720 + ldr r1, _0231C744 ; =SLEEP_TURN_RANGE mov r0, r7 mov r2, #1 bl CalcStatusDuration @@ -1219,28 +1219,28 @@ _0231C28C: bl RestoreAllMovePP b _0231CB14 _0231C2A4: - ldr r1, _0231C750 ; =ov10_022C4420 + ldr r1, _0231C750 ; =PROTEIN_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyProteinEffect b _0231CB14 _0231C2BC: - ldr r1, _0231C754 ; =ov10_022C46CC + ldr r1, _0231C754 ; =CALCIUM_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyCalciumEffect b _0231CB14 _0231C2D4: - ldr r1, _0231C758 ; =ov10_022C46C8 + ldr r1, _0231C758 ; =IRON_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyIronEffect b _0231CB14 _0231C2EC: - ldr r1, _0231C75C ; =ov10_022C46C4 + ldr r1, _0231C75C ; =ZINC_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1538,29 +1538,29 @@ _0231C6F4: .word 0x000001A2 _0231C6F8: .word 0x000001A6 _0231C6FC: .word 0x000001AA _0231C700: .word 0x00000195 -_0231C704: .word ov10_022C4624 -_0231C708: .word ov10_022C46E8 -_0231C70C: .word ov10_022C46E4 -_0231C710: .word ov10_022C46E0 -_0231C714: .word ov10_022C46DC -_0231C718: .word ov10_022C46D8 -_0231C71C: .word ov10_022C46B4 +_0231C704: .word STICK_POWER +_0231C708: .word IRON_THORN_POWER +_0231C70C: .word SILVER_SPIKE_POWER +_0231C710: .word GOLD_FANG_POWER +_0231C714: .word CACNEA_SPIKE_POWER +_0231C718: .word CORSOLA_TWIG_POWER +_0231C71C: .word GEO_PEBBLE_DAMAGE _0231C720: .word 0x0000024F -_0231C724: .word ov10_022C46B8 -_0231C728: .word ov10_022C44D0 -_0231C72C: .word ov10_022C46BC -_0231C730: .word ov10_022C45EC -_0231C734: .word ov10_022C44F4 -_0231C738: .word ov10_022C4478 -_0231C73C: .word ov10_022C45F4 -_0231C740: .word ov10_022C44F8 -_0231C744: .word ov10_022C4720 +_0231C724: .word GRAVELEROCK_DAMAGE +_0231C728: .word GOLD_THORN_POWER +_0231C72C: .word RARE_FOSSIL_DAMAGE +_0231C730: .word ORAN_BERRY_HP_RESTORATION +_0231C734: .word ORAN_BERRY_FULL_HP_BOOST +_0231C738: .word SITRUS_BERRY_HP_RESTORATION +_0231C73C: .word SITRUS_BERRY_FULL_HP_BOOST +_0231C740: .word LIFE_SEED_HP_BOOST +_0231C744: .word SLEEP_TURN_RANGE _0231C748: .word 0x00000BE9 _0231C74C: .word 0x000003E7 -_0231C750: .word ov10_022C4420 -_0231C754: .word ov10_022C46CC -_0231C758: .word ov10_022C46C8 -_0231C75C: .word ov10_022C46C4 +_0231C750: .word PROTEIN_STAT_BOOST +_0231C754: .word CALCIUM_STAT_BOOST +_0231C758: .word IRON_STAT_BOOST +_0231C75C: .word ZINC_STAT_BOOST _0231C760: .word GUMMI_STAT_BOOST _0231C764: .word WONDER_GUMMI_STAT_BOOST _0231C768: @@ -1591,7 +1591,7 @@ _0231C7B0: _0231C7C0: mov r4, #0 str r4, [sp] - ldr r0, _0231CBB0 ; =ov10_022C4438 + ldr r0, _0231CBB0 ; =OREN_BERRY_DAMAGE str r4, [sp, #4] mov r1, #0x270 str r1, [sp, #8] @@ -1838,7 +1838,7 @@ _0231CB14: _0231CB48: cmp r0, #0 beq _0231CB9C - ldr r0, _0231CBC0 ; =ov10_022C4EB8 + ldr r0, _0231CBC0 ; =APPLES_AND_BERRIES_ITEM_IDS b _0231CB90 _0231CB58: cmp r4, r1 @@ -1868,10 +1868,10 @@ _0231CBA4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0231CBAC: .word 0x00000C75 -_0231CBB0: .word ov10_022C4438 +_0231CBB0: .word OREN_BERRY_DAMAGE _0231CBB4: .word 0x00000C67 _0231CBB8: .word 0x00000C76 _0231CBBC: .word ov10_022C44EC -_0231CBC0: .word ov10_022C4EB8 +_0231CBC0: .word APPLES_AND_BERRIES_ITEM_IDS _0231CBC4: .word ov10_022C4864 arm_func_end ApplyItemEffect diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 1c48eb17..6ffb95da 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -151,14 +151,14 @@ ApplyVileSeedEffect: ; 0x0231CD80 strh r2, [sp, #0xa] cmp r0, #0 strgth r0, [sp, #0xa] - ldr r0, _0231CE14 ; =ov29_02352AEC + ldr r0, _0231CE14 ; =ATK_STAT_IDX ldrsh r3, [sp, #8] ldr r2, [r0] mov r0, r5 mov r1, r4 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0231CE18 ; =ov29_02352AE8 + ldr r0, _0231CE18 ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -171,8 +171,8 @@ ApplyVileSeedEffect: ; 0x0231CD80 ldmia sp!, {r4, r5, pc} .align 2, 0 _0231CE10: .word ov29_023529AC -_0231CE14: .word ov29_02352AEC -_0231CE18: .word ov29_02352AE8 +_0231CE14: .word ATK_STAT_IDX +_0231CE18: .word SPATK_STAT_IDX arm_func_end ApplyVileSeedEffect arm_func_start ApplyViolentSeedEffect @@ -180,14 +180,14 @@ ApplyViolentSeedEffect: ; 0x0231CE1C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] - ldr r2, _0231CE60 ; =ov29_02352AEC + ldr r2, _0231CE60 ; =ATK_STAT_IDX ldrsh r3, [r4, #0x24] ldr r2, [r2] mov r6, r0 rsb r3, r3, #0x14 bl BoostOffensiveStat ldrsh r3, [r4, #0x26] - ldr r1, _0231CE64 ; =ov29_02352AE8 + ldr r1, _0231CE64 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -195,8 +195,8 @@ ApplyViolentSeedEffect: ; 0x0231CE1C bl BoostOffensiveStat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0231CE60: .word ov29_02352AEC -_0231CE64: .word ov29_02352AE8 +_0231CE60: .word ATK_STAT_IDX +_0231CE64: .word SPATK_STAT_IDX arm_func_end ApplyViolentSeedEffect arm_func_start ApplyGinsengEffect @@ -209,7 +209,7 @@ ApplyGinsengEffect: ; 0x0231CE68 mov r4, #0 mov r5, #1 bl DungeonRandInt - ldr r1, _0231CF78 ; =ov10_022C46C0 + ldr r1, _0231CF78 ; =GINSENG_CHANCE_3 mov ip, #0 ldrsh r1, [r1] add r3, r6, #0x124 @@ -275,7 +275,7 @@ _0231CF64: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231CF78: .word ov10_022C46C0 +_0231CF78: .word GINSENG_CHANCE_3 _0231CF7C: .word 0x00000BEF _0231CF80: .word 0x00000BEE arm_func_end ApplyGinsengEffect @@ -404,7 +404,7 @@ _0231D108: cmp ip, r0 addgt fp, r4, ip addle fp, r4, r0 - ldr ip, _0231D474 ; =_020A2538 + ldr ip, _0231D474 ; =GUMMI_BELLY_RESTORE_TABLE mov r0, r2, lsl #1 add r2, ip, r1 add r1, ip, r6 @@ -471,7 +471,7 @@ _0231D214: movge fp, #2 movlt fp, #3 _0231D23C: - ldr r0, _0231D480 ; =ov29_023532D0 + ldr r0, _0231D480 ; =GUMMI_IQ_STRING_IDS mov r1, r5, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -631,10 +631,10 @@ _0231D460: _0231D468: .word WONDER_GUMMI_IQ_GAIN _0231D46C: .word _020A1894 _0231D470: .word IQ_GUMMI_GAIN_TABLE -_0231D474: .word _020A2538 +_0231D474: .word GUMMI_BELLY_RESTORE_TABLE _0231D478: .word 0x000003E7 _0231D47C: .word 0x00000BF3 -_0231D480: .word ov29_023532D0 +_0231D480: .word GUMMI_IQ_STRING_IDS _0231D484: .word ov29_02353324 _0231D488: .word ov10_022C44CC _0231D48C: .word ov10_022C45E4 @@ -758,7 +758,7 @@ _0231D60C: bl TryInflictParalysisStatus b _0231D66C _0231D624: - ldr r0, _0231D678 ; =ov29_02352AEC + ldr r0, _0231D678 ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -767,7 +767,7 @@ _0231D624: mov r3, #3 str ip, [sp, #4] bl LowerOffensiveStat - ldr r0, _0231D67C ; =ov29_02352AE8 + ldr r0, _0231D67C ; =SPATK_STAT_IDX mov ip, #1 str ip, [sp] ldr r2, [r0] @@ -781,8 +781,8 @@ _0231D66C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0231D674: .word ov10_022C4680 -_0231D678: .word ov29_02352AEC -_0231D67C: .word ov29_02352AE8 +_0231D678: .word ATK_STAT_IDX +_0231D67C: .word SPATK_STAT_IDX arm_func_end ApplyGrimyFoodEffect arm_func_start ApplyMixElixirEffect @@ -2171,7 +2171,7 @@ _0231E9B0: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0231E9EC ; =ov10_022C4B74 + ldr r0, _0231E9EC ; =EAT_ITEM_EFFECT_IGNORE_LIST b _0231E9D8 _0231E9C8: cmp r4, r1 @@ -2185,7 +2185,7 @@ _0231E9D8: mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_0231E9EC: .word ov10_022C4B74 +_0231E9EC: .word EAT_ITEM_EFFECT_IGNORE_LIST arm_func_end ShouldTryEatItem arm_func_start GetMaxPpWrapper diff --git a/asm/overlay_29_0231F594.s b/asm/overlay_29_0231F594.s index 3392dd81..42909c79 100644 --- a/asm/overlay_29_0231F594.s +++ b/asm/overlay_29_0231F594.s @@ -233,7 +233,7 @@ _0231F8BC: ldrsh r1, [sl, #4] ldrsh r0, [sl, #6] mov r7, #0 - ldr r5, _0231FBF0 ; =ov29_02351844 + ldr r5, _0231FBF0 ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST mov r8, r7 strh r1, [sp, #0x14] strh r0, [sp, #0x16] @@ -455,7 +455,7 @@ _0231FBDC: _0231FBE4: .word ov29_02353538 _0231FBE8: .word 0x000013BC _0231FBEC: .word 0x00000BCF -_0231FBF0: .word ov29_02351844 +_0231FBF0: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST _0231FBF4: .word 0x00000222 _0231FBF8: .word 0x00000BD1 arm_func_end ov29_0231F6E4 diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index 196693be..58d70277 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -33,7 +33,7 @@ DoMoveRest: ; 0x0232A414 bl TryInflictNappingStatus b _0232A474 _0232A454: - ldr r1, _0232A47C ; =ov10_022C4748 + ldr r1, _0232A47C ; =REST_TURN_RANGE mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -45,7 +45,7 @@ _0232A474: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A47C: .word ov10_022C4748 +_0232A47C: .word REST_TURN_RANGE arm_func_end DoMoveRest arm_func_start DoMoveIngrain @@ -121,7 +121,7 @@ DoMoveSuperpower: ; 0x0232A524 movne r4, #1 cmp r4, #0 beq _0232A59C - ldr r0, _0232A5A8 ; =ov29_02352AEC + ldr r0, _0232A5A8 ; =ATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -145,7 +145,7 @@ _0232A59C: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_0232A5A8: .word ov29_02352AEC +_0232A5A8: .word ATK_STAT_IDX arm_func_end DoMoveSuperpower arm_func_start DoMoveSteelWing @@ -162,7 +162,7 @@ DoMoveSteelWing: ; 0x0232A5AC bl DealDamage cmp r0, #0 beq _0232A628 - ldr r1, _0232A63C ; =ov10_022C44C4 + ldr r1, _0232A63C ; =STEEL_WING_BOOST_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -188,7 +188,7 @@ _0232A628: add sp, sp, #0x10 bx lr .align 2, 0 -_0232A63C: .word ov10_022C44C4 +_0232A63C: .word STEEL_WING_BOOST_DEFENSE_CHANCE arm_func_end DoMoveSteelWing arm_func_start DoMoveSpitUp @@ -648,7 +648,7 @@ DoMoveBellyDrum: ; 0x0232AC54 bl CeilFixedPoint cmp r0, #1 ble _0232ACD8 - ldr r1, _0232AD00 ; =ov29_02352AEC + ldr r1, _0232AD00 ; =ATK_STAT_IDX mov r0, r7 ldr r2, [r1] mov r1, r6 @@ -679,7 +679,7 @@ _0232ACF8: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232AD00: .word ov29_02352AEC +_0232AD00: .word ATK_STAT_IDX _0232AD04: .word 0x00000EEB arm_func_end DoMoveBellyDrum @@ -703,7 +703,7 @@ DoMoveSecretPower: ; 0x0232AD18 bl DealDamage cmp r0, #0 beq _0232AED0 - ldr r1, _0232AEDC ; =ov10_022C454C + ldr r1, _0232AEDC ; =SECRET_POWER_EFFECT_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -741,7 +741,7 @@ _0232ADB4: bl TryInflictPoisonedStatus b _0232AED0 _0232ADCC: - ldr r1, _0232AEE8 ; =ov10_022C4720 + ldr r1, _0232AEE8 ; =SLEEP_TURN_RANGE mov r0, r5 mov r2, r4 bl CalcStatusDuration @@ -759,7 +759,7 @@ _0232ADF4: bl LowerSpeed b _0232AED0 _0232AE0C: - ldr r0, _0232AEEC ; =ov29_02352AEC + ldr r0, _0232AEEC ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -770,7 +770,7 @@ _0232AE0C: bl LowerOffensiveStat b _0232AED0 _0232AE34: - ldr r0, _0232AEEC ; =ov29_02352AEC + ldr r0, _0232AEEC ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -781,7 +781,7 @@ _0232AE34: bl LowerDefensiveStat b _0232AED0 _0232AE5C: - ldr r1, _0232AEEC ; =ov29_02352AEC + ldr r1, _0232AEEC ; =ATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -819,11 +819,11 @@ _0232AED0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232AEDC: .word ov10_022C454C +_0232AEDC: .word SECRET_POWER_EFFECT_CHANCE _0232AEE0: .word ov29_02353538 _0232AEE4: .word ov10_022C6321 -_0232AEE8: .word ov10_022C4720 -_0232AEEC: .word ov29_02352AEC +_0232AEE8: .word SLEEP_TURN_RANGE +_0232AEEC: .word ATK_STAT_IDX arm_func_end DoMoveSecretPower arm_func_start DoMoveDamageConfuse30 @@ -838,7 +838,7 @@ DoMoveDamageConfuse30: ; 0x0232AEF0 bl DealDamage cmp r0, #0 beq _0232AF4C - ldr r1, _0232AF58 ; =ov10_022C4548 + ldr r1, _0232AF58 ; =DIZZY_PUNCH_CONFUSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -856,13 +856,13 @@ _0232AF4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232AF58: .word ov10_022C4548 +_0232AF58: .word DIZZY_PUNCH_CONFUSE_CHANCE arm_func_end DoMoveDamageConfuse30 arm_func_start DoMoveBulkUp DoMoveBulkUp: ; 0x0232AF5C stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232AF9C ; =ov29_02352AEC + ldr r2, _0232AF9C ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -878,7 +878,7 @@ DoMoveBulkUp: ; 0x0232AF5C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AF9C: .word ov29_02352AEC +_0232AF9C: .word ATK_STAT_IDX arm_func_end DoMoveBulkUp arm_func_start DoMovePause @@ -887,7 +887,7 @@ DoMovePause: ; 0x0232AFA0 sub sp, sp, #8 mov r4, r1 mov r5, r0 - ldr r1, _0232AFEC ; =ov10_022C471C + ldr r1, _0232AFEC ; =IMPRISON_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -903,14 +903,14 @@ DoMovePause: ; 0x0232AFA0 add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AFEC: .word ov10_022C471C +_0232AFEC: .word IMPRISON_TURN_RANGE arm_func_end DoMovePause arm_func_start DoMoveFeatherDance DoMoveFeatherDance: ; 0x0232AFF0 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _0232B020 ; =ov29_02352AEC + ldr r2, _0232B020 ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r2] str ip, [sp] @@ -921,7 +921,7 @@ DoMoveFeatherDance: ; 0x0232AFF0 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232B020: .word ov29_02352AEC +_0232B020: .word ATK_STAT_IDX arm_func_end DoMoveFeatherDance arm_func_start DoMoveBeatUp @@ -1029,7 +1029,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DealDamage cmp r0, #0 beq _0232B1D0 - ldr r1, _0232B1DC ; =ov10_022C4608 + ldr r1, _0232B1DC ; =CRUSH_CLAW_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1037,7 +1037,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B1D0 - ldr r0, _0232B1E0 ; =ov29_02352AEC + ldr r0, _0232B1E0 ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1051,8 +1051,8 @@ _0232B1D0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B1DC: .word ov10_022C4608 -_0232B1E0: .word ov29_02352AEC +_0232B1DC: .word CRUSH_CLAW_LOWER_DEFENSE_CHANCE +_0232B1E0: .word ATK_STAT_IDX arm_func_end DoMoveCrushClaw arm_func_start DoMoveBlazeKick @@ -1073,7 +1073,7 @@ DoMoveBlazeKick: ; 0x0232B1E4 bl DealDamage cmp r0, #0 beq _0232B25C - ldr r1, _0232B268 ; =ov10_022C4540 + ldr r1, _0232B268 ; =BLAZE_KICK_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1092,7 +1092,7 @@ _0232B25C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232B268: .word ov10_022C4540 +_0232B268: .word BLAZE_KICK_BURN_CHANCE arm_func_end DoMoveBlazeKick arm_func_start DoMovePresent @@ -1206,7 +1206,7 @@ DoMoveEruption: ; 0x0232B368 movle r2, #2 movgt r2, #3 _0232B3FC: - ldr r1, _0232B430 ; =ov10_022C49C4 + ldr r1, _0232B430 ; =ERUPTION_DAMAGE_MULT_TABLE mov r0, r7 ldr r3, [r1, r2, lsl #2] mov r1, r6 @@ -1220,7 +1220,7 @@ _0232B3FC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232B42C: .word 0x000003E7 -_0232B430: .word ov10_022C49C4 +_0232B430: .word ERUPTION_DAMAGE_MULT_TABLE arm_func_end DoMoveEruption arm_func_start DoMoveParalyze__0232B434 @@ -1269,7 +1269,7 @@ DoMovePoisonTail: ; 0x0232B494 bl DealDamage cmp r0, #0 beq _0232B4F0 - ldr r1, _0232B4FC ; =ov10_022C448C + ldr r1, _0232B4FC ; =POISON_TAIL_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1287,7 +1287,7 @@ _0232B4F0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232B4FC: .word ov10_022C448C +_0232B4FC: .word POISON_TAIL_POISON_CHANCE arm_func_end DoMovePoisonTail arm_func_start DoMoveBlowback @@ -1353,14 +1353,14 @@ _0232B5C4: .word 0x00000EEE arm_func_start DoMoveTailGlow DoMoveTailGlow: ; 0x0232B5C8 stmdb sp!, {r3, lr} - ldr r2, _0232B5E4 ; =ov29_02352AE8 + ldr r2, _0232B5E4 ; =SPATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B5E4: .word ov29_02352AE8 +_0232B5E4: .word SPATK_STAT_IDX arm_func_end DoMoveTailGlow arm_func_start DoMoveDamageConstrict10 @@ -1397,7 +1397,7 @@ _0232B640: bl DealDamage cmp r0, #0 beq _0232B694 - ldr r1, _0232B6A0 ; =ov10_022C44A4 + ldr r1, _0232B6A0 ; =WHIRLPOOL_CONSTRICTION_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -1415,7 +1415,7 @@ _0232B694: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232B69C: .word 0x00000123 -_0232B6A0: .word ov10_022C44A4 +_0232B6A0: .word WHIRLPOOL_CONSTRICTION_CHANCE arm_func_end DoMoveDamageConstrict10 arm_func_start DoMovePerishSong @@ -1528,14 +1528,14 @@ DoMoveProtect: ; 0x0232B7D0 arm_func_start DoMoveDefenseCurl DoMoveDefenseCurl: ; 0x0232B7E0 stmdb sp!, {r3, lr} - ldr r2, _0232B7FC ; =ov29_02352AEC + ldr r2, _0232B7FC ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B7FC: .word ov29_02352AEC +_0232B7FC: .word ATK_STAT_IDX arm_func_end DoMoveDefenseCurl arm_func_start DoMoveDecoy @@ -1562,7 +1562,7 @@ DoMoveMistBall: ; 0x0232B820 bl DealDamage cmp r0, #0 beq _0232B88C - ldr r1, _0232B898 ; =ov10_022C44E0 + ldr r1, _0232B898 ; =MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1570,7 +1570,7 @@ DoMoveMistBall: ; 0x0232B820 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B88C - ldr r0, _0232B89C ; =ov29_02352AE8 + ldr r0, _0232B89C ; =SPATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1584,8 +1584,8 @@ _0232B88C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B898: .word ov10_022C44E0 -_0232B89C: .word ov29_02352AE8 +_0232B898: .word MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE +_0232B89C: .word SPATK_STAT_IDX arm_func_end DoMoveMistBall arm_func_start DoMoveDestinyBond @@ -1620,7 +1620,7 @@ DoMoveMirrorCoat: ; 0x0232B8D4 arm_func_start DoMoveCalmMind DoMoveCalmMind: ; 0x0232B8E4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232B924 ; =ov29_02352AE8 + ldr r2, _0232B924 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -1636,7 +1636,7 @@ DoMoveCalmMind: ; 0x0232B8E4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232B924: .word ov29_02352AE8 +_0232B924: .word SPATK_STAT_IDX arm_func_end DoMoveCalmMind arm_func_start DoMoveHiddenPower @@ -1662,7 +1662,7 @@ DoMoveMetalClaw: ; 0x0232B940 bl DealDamage cmp r0, #0 beq _0232B9B8 - ldr r1, _0232B9CC ; =ov10_022C4554 + ldr r1, _0232B9CC ; =METAL_CLAW_BOOST_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -1688,7 +1688,7 @@ _0232B9B8: add sp, sp, #0x10 bx lr .align 2, 0 -_0232B9CC: .word ov10_022C4554 +_0232B9CC: .word METAL_CLAW_BOOST_ATTACK_CHANCE arm_func_end DoMoveMetalClaw arm_func_start DoMoveAttract @@ -1890,7 +1890,7 @@ DoMoveMetronome: ; 0x0232BC64 ldr r2, _0232BCB8 ; =ov29_0237CA88 mov r5, r0 ldr r6, [r2] - ldr r0, _0232BCBC ; =ov10_022C5DDC + ldr r0, _0232BCBC ; =METRONOME_TABLE mov r2, r6, lsl #3 mov r4, r1 ldrh r1, [r0, r2] @@ -1908,7 +1908,7 @@ DoMoveMetronome: ; 0x0232BC64 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232BCB8: .word ov29_0237CA88 -_0232BCBC: .word ov10_022C5DDC +_0232BCBC: .word METRONOME_TABLE _0232BCC0: .word ov10_022C5DE0 arm_func_end DoMoveMetronome @@ -2150,7 +2150,7 @@ DoMoveDragonRage: ; 0x0232BF88 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _0232C024 ; =ov10_022C46D4 + ldr r2, _0232C024 ; =DRAGON_RAGE_FIXED_DAMAGE mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -2164,13 +2164,13 @@ DoMoveDragonRage: ; 0x0232BF88 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232C024: .word ov10_022C46D4 +_0232C024: .word DRAGON_RAGE_FIXED_DAMAGE arm_func_end DoMoveDragonRage arm_func_start DoMoveDragonDance DoMoveDragonDance: ; 0x0232C028 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232C060 ; =ov29_02352AEC + ldr r2, _0232C060 ; =ATK_STAT_IDX mov r5, r0 ldr r2, [r2] mov r4, r1 @@ -2184,7 +2184,7 @@ DoMoveDragonDance: ; 0x0232C028 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C060: .word ov29_02352AEC +_0232C060: .word ATK_STAT_IDX arm_func_end DoMoveDragonDance arm_func_start DoMoveSkullBash @@ -2198,7 +2198,7 @@ DoMoveSkullBash: ; 0x0232C064 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232C0C0 - ldr r1, _0232C0EC ; =ov10_022C48BC + ldr r1, _0232C0EC ; =SKULL_BASH_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2226,7 +2226,7 @@ _0232C0E4: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232C0EC: .word ov10_022C48BC +_0232C0EC: .word SKULL_BASH_DAMAGE_MULTIPLIER _0232C0F0: .word 0x00000CEB arm_func_end DoMoveSkullBash @@ -2254,7 +2254,7 @@ _0232C128: bl DealDamage cmp r0, #0 beq _0232C18C - ldr r1, _0232C19C ; =ov10_022C450C + ldr r1, _0232C19C ; =LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -2262,7 +2262,7 @@ _0232C128: bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232C18C - ldr r0, _0232C1A0 ; =ov29_02352AE8 + ldr r0, _0232C1A0 ; =SPATK_STAT_IDX mov r3, r6 ldr r2, [r0] mov r1, r4 @@ -2277,8 +2277,8 @@ _0232C18C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0232C198: .word 0x0000014F -_0232C19C: .word ov10_022C450C -_0232C1A0: .word ov29_02352AE8 +_0232C19C: .word LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +_0232C1A0: .word SPATK_STAT_IDX arm_func_end DoMoveDamageLowerSpecialDefense50 arm_func_start DoMoveStruggle diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index cb2daae8..94493556 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -132,7 +132,7 @@ DoMoveSiesta: ; 0x0232C6B4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _0232C6EC ; =ov10_022C4720 + ldr r1, _0232C6EC ; =SLEEP_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -144,7 +144,7 @@ DoMoveSiesta: ; 0x0232C6B4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C6EC: .word ov10_022C4720 +_0232C6EC: .word SLEEP_TURN_RANGE arm_func_end DoMoveSiesta arm_func_start DoMoveTwoEdge @@ -1091,7 +1091,7 @@ DoMoveHealingWish: ; 0x0232D298 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232D2E4 ; =ov10_022C46F4 + ldr r2, _0232D2E4 ; =HEALING_WISH_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1105,7 +1105,7 @@ DoMoveHealingWish: ; 0x0232D298 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D2E4: .word ov10_022C46F4 +_0232D2E4: .word HEALING_WISH_HP_RESTORATION arm_func_end DoMoveHealingWish arm_func_start DoMoveCloseCombat @@ -1119,7 +1119,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 cmp r0, #0 moveq r0, #0 beq _0232D358 - ldr r0, _0232D360 ; =ov29_02352AEC + ldr r0, _0232D360 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1128,7 +1128,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 mov ip, #0 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0232D364 ; =ov29_02352AE8 + ldr r0, _0232D364 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1142,8 +1142,8 @@ _0232D358: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232D360: .word ov29_02352AEC -_0232D364: .word ov29_02352AE8 +_0232D360: .word ATK_STAT_IDX +_0232D364: .word SPATK_STAT_IDX arm_func_end DoMoveCloseCombat arm_func_start DoMoveLuckyChant @@ -1186,7 +1186,7 @@ _0232D3D4: .word 0x00000F2E arm_func_start DoMoveHealOrder DoMoveHealOrder: ; 0x0232D3D8 stmdb sp!, {r3, lr} - ldr r2, _0232D3FC ; =ov10_022C44B8 + ldr r2, _0232D3FC ; =HEAL_ORDER_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1195,7 +1195,7 @@ DoMoveHealOrder: ; 0x0232D3D8 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232D3FC: .word ov10_022C44B8 +_0232D3FC: .word HEAL_ORDER_HP_RESTORATION arm_func_end DoMoveHealOrder arm_func_start DoMoveHealBlock @@ -1219,7 +1219,7 @@ DoMoveThunderFang: ; 0x0232D418 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D4A4 ; =ov10_022C452C + ldr r1, _0232D4A4 ; =THUNDER_FANG_PARALYZE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1232,7 +1232,7 @@ DoMoveThunderFang: ; 0x0232D418 mov r3, r2 bl TryInflictParalysisStatus _0232D46C: - ldr r1, _0232D4A8 ; =ov10_022C4678 + ldr r1, _0232D4A8 ; =THUNDER_FANG_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1248,8 +1248,8 @@ _0232D49C: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D4A4: .word ov10_022C452C -_0232D4A8: .word ov10_022C4678 +_0232D4A4: .word THUNDER_FANG_PARALYZE_CHANCE +_0232D4A8: .word THUNDER_FANG_CRINGE_CHANCE arm_func_end DoMoveThunderFang arm_func_start DoMoveDefog @@ -1276,7 +1276,7 @@ _0232D4E0: mov r1, r5 bl EndReflectClassStatus _0232D4FC: - ldr r1, _0232D554 ; =ov29_02352AE8 + ldr r1, _0232D554 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1286,7 +1286,7 @@ _0232D4FC: bl GetApparentWeather cmp r0, #6 bne _0232D548 - ldr r1, _0232D558 ; =ov10_022C4654 + ldr r1, _0232D558 ; =WEATHER_MOVE_TURN_COUNT ldr r0, _0232D55C ; =ov29_02353538 ldrsh r3, [r1] ldr r1, [r0] @@ -1300,8 +1300,8 @@ _0232D548: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0232D550: .word 0x00000ED2 -_0232D554: .word ov29_02352AE8 -_0232D558: .word ov10_022C4654 +_0232D554: .word SPATK_STAT_IDX +_0232D558: .word WEATHER_MOVE_TURN_COUNT _0232D55C: .word ov29_02353538 arm_func_end DoMoveDefog @@ -1372,7 +1372,7 @@ DoMoveIceFang: ; 0x0232D620 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D6A8 ; =ov10_022C4518 + ldr r1, _0232D6A8 ; =ICE_FANG_FREEZE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1384,7 +1384,7 @@ DoMoveIceFang: ; 0x0232D620 mov r2, #0 bl TryInflictFrozenStatus _0232D670: - ldr r1, _0232D6AC ; =ov10_022C453C + ldr r1, _0232D6AC ; =ICE_FANG_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1400,8 +1400,8 @@ _0232D6A0: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D6A8: .word ov10_022C4518 -_0232D6AC: .word ov10_022C453C +_0232D6A8: .word ICE_FANG_FREEZE_CHANCE +_0232D6AC: .word ICE_FANG_CRINGE_CHANCE arm_func_end DoMoveIceFang arm_func_start DoMovePsychoShift @@ -1550,7 +1550,7 @@ DoMoveShadowForce: ; 0x0232D860 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232D8CC - ldr r1, _0232D8F4 ; =ov10_022C47DC + ldr r1, _0232D8F4 ; =SHADOW_FORCE_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1581,7 +1581,7 @@ _0232D8EC: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232D8F4: .word ov10_022C47DC +_0232D8F4: .word SHADOW_FORCE_DAMAGE_MULTIPLIER _0232D8F8: .word 0x00000CD7 arm_func_end DoMoveShadowForce @@ -1639,14 +1639,14 @@ DoMoveChargeBeam: ; 0x0232D97C cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D9DC ; =ov10_022C44F0 + ldr r1, _0232D9DC ; =CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232D9D4 - ldr r1, _0232D9E0 ; =ov29_02352AE8 + ldr r1, _0232D9E0 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r5 @@ -1656,8 +1656,8 @@ _0232D9D4: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D9DC: .word ov10_022C44F0 -_0232D9E0: .word ov29_02352AE8 +_0232D9DC: .word CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE +_0232D9E0: .word SPATK_STAT_IDX arm_func_end DoMoveChargeBeam arm_func_start DoMoveDamageEatItem @@ -1780,7 +1780,7 @@ _0232DB7C: ldr r0, [r1, r0, lsl #2] cmp r0, #0 bne _0232DBAC - ldr r1, _0232DC4C ; =ov29_02352AEC + ldr r1, _0232DC4C ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1790,7 +1790,7 @@ _0232DB7C: _0232DBAC: cmp r0, #2 bne _0232DBD0 - ldr r1, _0232DC4C ; =ov29_02352AEC + ldr r1, _0232DC4C ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1800,7 +1800,7 @@ _0232DBAC: _0232DBD0: cmp r0, #1 bne _0232DBF4 - ldr r1, _0232DC50 ; =ov29_02352AE8 + ldr r1, _0232DC50 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1810,7 +1810,7 @@ _0232DBD0: _0232DBF4: cmp r0, #3 bne _0232DC18 - ldr r1, _0232DC50 ; =ov29_02352AE8 + ldr r1, _0232DC50 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1833,8 +1833,8 @@ _0232DC38: .align 2, 0 _0232DC44: .word ov29_02352B3C _0232DC48: .word 0x00000F0E -_0232DC4C: .word ov29_02352AEC -_0232DC50: .word ov29_02352AE8 +_0232DC4C: .word ATK_STAT_IDX +_0232DC50: .word SPATK_STAT_IDX arm_func_end DoMoveAcupressure arm_func_start DoMoveMagnetRise @@ -1900,7 +1900,7 @@ DoMoveLastResort: ; 0x0232DCD4 _0232DD10: cmp r0, #0 ble _0232DD44 - ldr r1, _0232DD70 ; =ov10_022C4944 + ldr r1, _0232DD70 ; =LAST_RESORT_DAMAGE_MULT_TABLE sub r0, r0, #1 ldr r3, [r1, r0, lsl #2] mov r0, r8 @@ -1925,7 +1925,7 @@ _0232DD64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232DD70: .word ov10_022C4944 +_0232DD70: .word LAST_RESORT_DAMAGE_MULT_TABLE _0232DD74: .word 0x00000EBC arm_func_end DoMoveLastResort @@ -2053,7 +2053,7 @@ DoMoveDamageHpDependent: ; 0x0232DE84 movle r5, #2 movgt r5, #3 _0232DF08: - ldr r4, _0232DF34 ; =ov10_022C49B4 + ldr r4, _0232DF34 ; =WRING_OUT_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2065,7 +2065,7 @@ _0232DF08: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232DF30: .word 0x000003E7 -_0232DF34: .word ov10_022C49B4 +_0232DF34: .word WRING_OUT_DAMAGE_MULT_TABLE arm_func_end DoMoveDamageHpDependent arm_func_start DoMoveHeartSwap @@ -2119,7 +2119,7 @@ DoMoveRoost: ; 0x0232DFC8 bl GetApparentWeather mov r3, #1 str r3, [sp] - ldr r1, _0232E07C ; =ov10_022C4964 + ldr r1, _0232E07C ; =ROOST_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2159,7 +2159,7 @@ _0232E070: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232E07C: .word ov10_022C4964 +_0232E07C: .word ROOST_HP_RESTORATION_TABLE _0232E080: .word 0x00000CC9 arm_func_end DoMoveRoost @@ -2241,7 +2241,7 @@ DoMoveFlareBlitz: ; 0x0232E130 bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E1B4 - ldr r1, _0232E248 ; =ov10_022C4684 + ldr r1, _0232E248 ; =FLARE_BLITZ_BURN_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r7 @@ -2295,6 +2295,6 @@ _0232E240: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E248: .word ov10_022C4684 +_0232E248: .word FLARE_BLITZ_BURN_CHANCE _0232E24C: .word 0x000003E7 arm_func_end DoMoveFlareBlitz diff --git a/asm/overlay_29_0232E274.s b/asm/overlay_29_0232E274.s index b28260af..8493c481 100644 --- a/asm/overlay_29_0232E274.s +++ b/asm/overlay_29_0232E274.s @@ -6,13 +6,13 @@ arm_func_start DoMoveDefendOrder DoMoveDefendOrder: ; 0x0232E274 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232E2B0 ; =ov29_02352AEC + ldr r2, _0232E2B0 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 mov r4, r1 bl BoostDefensiveStat - ldr r1, _0232E2B4 ; =ov29_02352AE8 + ldr r1, _0232E2B4 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -21,8 +21,8 @@ DoMoveDefendOrder: ; 0x0232E274 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E2B0: .word ov29_02352AEC -_0232E2B4: .word ov29_02352AE8 +_0232E2B0: .word ATK_STAT_IDX +_0232E2B4: .word SPATK_STAT_IDX arm_func_end DoMoveDefendOrder arm_func_start DoMoveFireFang @@ -42,7 +42,7 @@ DoMoveFireFang: ; 0x0232E2B8 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r1, _0232E360 ; =ov10_022C4684 + ldr r1, _0232E360 ; =FLARE_BLITZ_BURN_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -56,7 +56,7 @@ DoMoveFireFang: ; 0x0232E2B8 str r2, [sp] bl TryInflictBurnStatus _0232E328: - ldr r1, _0232E364 ; =ov10_022C449C + ldr r1, _0232E364 ; =FIRE_FANG_CRINGE_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -72,8 +72,8 @@ _0232E358: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E360: .word ov10_022C4684 -_0232E364: .word ov10_022C449C +_0232E360: .word FLARE_BLITZ_BURN_CHANCE +_0232E364: .word FIRE_FANG_CRINGE_CHANCE arm_func_end DoMoveFireFang arm_func_start DoMoveLunarDance @@ -84,7 +84,7 @@ DoMoveLunarDance: ; 0x0232E368 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232E3C8 ; =ov10_022C46F4 + ldr r2, _0232E3C8 ; =HEALING_WISH_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -103,7 +103,7 @@ DoMoveLunarDance: ; 0x0232E368 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E3C8: .word ov10_022C46F4 +_0232E3C8: .word HEALING_WISH_HP_RESTORATION _0232E3CC: .word 0x000003E7 arm_func_end DoMoveLunarDance @@ -249,7 +249,7 @@ DoMoveCaptivate: ; 0x0232E560 bl DefenderAbilityIsActiveMoveEffects__0232DE20 cmp r0, #0 bne _0232E5D4 - ldr r0, _0232E61C ; =ov29_02352AE8 + ldr r0, _0232E61C ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -281,7 +281,7 @@ _0232E614: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232E61C: .word ov29_02352AE8 +_0232E61C: .word SPATK_STAT_IDX _0232E620: .word 0x00000F0F arm_func_end DoMoveCaptivate @@ -296,7 +296,7 @@ DoMoveLeafStorm: ; 0x0232E624 cmp r0, #0 moveq r0, #0 beq _0232E670 - ldr r0, _0232E678 ; =ov29_02352AE8 + ldr r0, _0232E678 ; =SPATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -310,7 +310,7 @@ _0232E670: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E678: .word ov29_02352AE8 +_0232E678: .word SPATK_STAT_IDX arm_func_end DoMoveLeafStorm arm_func_start DoMoveDracoMeteor @@ -327,7 +327,7 @@ DoMoveDracoMeteor: ; 0x0232E67C ldrsh r0, [sp, #0x10] cmp r0, #0 bne _0232E6D0 - ldr r0, _0232E6DC ; =ov29_02352AE8 + ldr r0, _0232E6DC ; =SPATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -342,7 +342,7 @@ _0232E6D4: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E6DC: .word ov29_02352AE8 +_0232E6DC: .word SPATK_STAT_IDX arm_func_end DoMoveDracoMeteor arm_func_start DoMoveRockPolish @@ -365,14 +365,14 @@ DoMoveRockPolish: ; 0x0232E6E0 arm_func_start DoMoveNastyPlot DoMoveNastyPlot: ; 0x0232E714 stmdb sp!, {r3, lr} - ldr r2, _0232E730 ; =ov29_02352AE8 + ldr r2, _0232E730 ; =SPATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232E730: .word ov29_02352AE8 +_0232E730: .word SPATK_STAT_IDX arm_func_end DoMoveNastyPlot arm_func_start DoMoveTag0x1AB diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 8b450f32..9b295cde 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -10,18 +10,18 @@ ExecuteMoveEffect: ; 0x0232E864 ldr fp, _0232F7AC ; =ov10_022C45F8 str r0, [sp, #0x14] ldrsh r0, [fp] - ldr r5, _0232F7B0 ; =ov29_02352AE8 + ldr r5, _0232F7B0 ; =SPATK_STAT_IDX ldr sl, _0232F7B4 ; =ov10_022C483C ldr r7, [r5] str r0, [sp, #0x34] ldr r0, [sl] - ldr r4, _0232F7B8 ; =ov29_02352AEC + ldr r4, _0232F7B8 ; =ATK_STAT_IDX mov r8, r2 ldr r6, [r4] mov r2, #0 str r2, [sp, #0x78] str r6, [sp, #0xa0] - ldr r5, _0232F7BC ; =ov10_022C4468 + ldr r5, _0232F7BC ; =FOREWARN_FORCED_MISS_CHANCE str r0, [sp, #0x30] ldrsh r0, [r5] ldr r4, _0232F7C0 ; =ov10_022C460C @@ -1050,10 +1050,10 @@ _0232F79C: b _0232F87C .align 2, 0 _0232F7AC: .word ov10_022C45F8 -_0232F7B0: .word ov29_02352AE8 +_0232F7B0: .word SPATK_STAT_IDX _0232F7B4: .word ov10_022C483C -_0232F7B8: .word ov29_02352AEC -_0232F7BC: .word ov10_022C4468 +_0232F7B8: .word ATK_STAT_IDX +_0232F7BC: .word FOREWARN_FORCED_MISS_CHANCE _0232F7C0: .word ov10_022C460C _0232F7C4: .word ov10_022C4480 _0232F7C8: .word ov10_022C4614 diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 2e2fdc25..bb66de5e 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -1684,7 +1684,7 @@ ov29_02339148: ; 0x02339148 ldr r0, _02339188 ; =ov29_02353538 mov r2, #0xc ldr r0, [r0] - ldr r3, _0233918C ; =ov10_022C631C + ldr r3, _0233918C ; =TILESET_PROPERTIES add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] mov r1, #0 @@ -1698,7 +1698,7 @@ ov29_02339148: ; 0x02339148 ldmia sp!, {r4, pc} .align 2, 0 _02339188: .word ov29_02353538 -_0233918C: .word ov10_022C631C +_0233918C: .word TILESET_PROPERTIES arm_func_end ov29_02339148 arm_func_start ov29_02339190 @@ -1723,7 +1723,7 @@ ov29_023391C0: ; 0x023391C0 ldr r0, _023391E4 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _023391E8 ; =ov10_022C631C + ldr r2, _023391E8 ; =TILESET_PROPERTIES add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] smulbb r0, r0, r1 @@ -1731,7 +1731,7 @@ ov29_023391C0: ; 0x023391C0 bx lr .align 2, 0 _023391E4: .word ov29_02353538 -_023391E8: .word ov10_022C631C +_023391E8: .word TILESET_PROPERTIES arm_func_end ov29_023391C0 arm_func_start DrawMinimapTile @@ -3153,7 +3153,7 @@ _0233A544: .word ov29_0235377C arm_func_start ov29_0233A548 ov29_0233A548: ; 0x0233A548 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r2, _0233A5E0 ; =ov29_02352FD0 + ldr r2, _0233A5E0 ; =MAP_COLOR_TABLE ldr r7, _0233A5E4 ; =ov29_0235376C mov r6, r1 add r5, r2, r0, lsl #2 @@ -3195,7 +3195,7 @@ _0233A5D0: blt _0233A560 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233A5E0: .word ov29_02352FD0 +_0233A5E0: .word MAP_COLOR_TABLE _0233A5E4: .word ov29_0235376C arm_func_end ov29_0233A548 @@ -8478,7 +8478,7 @@ _0233F014: _0233F01C: cmp r5, #8 bne _0233F0C4 - ldr r1, _0233F11C ; =ov29_02353010 + ldr r1, _0233F11C ; =CORNER_CARDINAL_NEIGHBOR_IS_OPEN ldr r0, [sp, #0x20] mov r5, #0 add r6, r1, r0, lsl #3 @@ -8551,7 +8551,7 @@ _0233F100: .align 2, 0 _0233F114: .word 0x000001C2 _0233F118: .word DIRECTIONS_XY -_0233F11C: .word ov29_02353010 +_0233F11C: .word CORNER_CARDINAL_NEIGHBOR_IS_OPEN arm_func_end GenerateRoomImperfections arm_func_start CreateHallway @@ -10903,7 +10903,7 @@ _0234113C: mov r0, r4 bl DungeonRandRange mov r8, r0 - ldr r0, _02341468 ; =ov10_022C44AC + ldr r0, _02341468 ; =MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS cmp r8, #6 ldrsh r0, [r0] movlt r8, #6 @@ -10914,7 +10914,7 @@ _0234113C: bl ShuffleSpawnPositions mov r0, r6 bl DungeonRandInt - ldr r1, _0234146C ; =ov10_022C440C + ldr r1, _0234146C ; =FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS mov r7, r0 ldrb fp, [r1] mov sb, #0 @@ -11110,8 +11110,8 @@ _02341458: .word ov29_02353538 _0234145C: .word ov29_0237CFBC _02341460: .word 0x0002C9E8 _02341464: .word 0x00012AFA -_02341468: .word ov10_022C44AC -_0234146C: .word ov10_022C440C +_02341468: .word MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS +_0234146C: .word FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS arm_func_end MarkNonEnemySpawns arm_func_start MarkEnemySpawns @@ -11226,7 +11226,7 @@ _023415F4: ldrb r2, [r0, #0xc4] cmp r2, #0 beq _02341754 - ldr r1, _02341768 ; =ov10_022C4660 + ldr r1, _02341768 ; =MONSTER_HOUSE_MAX_MONSTER_SPAWNS ldr r0, [sp] ldrsh r6, [r1] cmp r0, #0 @@ -11322,7 +11322,7 @@ _02341754: .align 2, 0 _02341760: .word ov29_02353538 _02341764: .word ov29_0237CFBC -_02341768: .word ov10_022C4660 +_02341768: .word MONSTER_HOUSE_MAX_MONSTER_SPAWNS arm_func_end MarkEnemySpawns arm_func_start SetSecondaryTerrainOnWall @@ -12723,7 +12723,7 @@ _02342AC8: mov sl, r0 cmp r0, r5 bge _02342B58 - ldr r0, _02342B78 ; =ov10_022C52EC + ldr r0, _02342B78 ; =SHOP_ITEM_CHANCES add fp, r0, r7, lsl #1 _02342AE8: mov r0, sb @@ -12766,7 +12766,7 @@ _02342B6C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02342B74: .word ov29_0237CFBC -_02342B78: .word ov10_022C52EC +_02342B78: .word SHOP_ITEM_CHANCES arm_func_end ov29_023427E4 arm_func_start ResetInnerBoundaryTileRows @@ -12991,7 +12991,7 @@ _02342E30: bl ShouldBoostHiddenStairsSpawnChance cmp r0, #0 beq _02342E94 - ldr r1, _02342EB8 ; =ov10_022C4850 + ldr r1, _02342EB8 ; =HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER mov r0, r6, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13014,7 +13014,7 @@ _02342EA8: .align 2, 0 _02342EB0: .word ov29_02353538 _02342EB4: .word ov29_0235378C -_02342EB8: .word ov10_022C4850 +_02342EB8: .word HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER arm_func_end GetHiddenStairsType arm_func_start GetFinalKecleonShopSpawnChance @@ -13025,7 +13025,7 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, pc} - ldr r1, _02342F04 ; =ov10_022C484C + ldr r1, _02342F04 ; =KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER mov r0, r4, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13038,7 +13038,7 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC mov r0, r0, asr #0x10 ldmia sp!, {r4, pc} .align 2, 0 -_02342F04: .word ov10_022C484C +_02342F04: .word KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER arm_func_end GetFinalKecleonShopSpawnChance arm_func_start ResetHiddenStairsSpawn @@ -13380,7 +13380,7 @@ _023433B8: mov r0, #0xc smulbb r2, r1, r0 ldr r0, _02343938 ; =ov29_023502F4 - ldr r1, _0234393C ; =ov29_023502EC + ldr r1, _0234393C ; =FIXED_ROOM_ENTITY_SPAWN_TABLE ldr r8, [r0, r2] ldr sl, [r1, r2] ldrb r0, [r8, #2] @@ -13542,7 +13542,7 @@ _023435BC: mov r3, r1 str r0, [sp, #4] ldr fp, _02343958 ; =ov29_023534F0 - ldr r0, _0234395C ; =ov29_0234FDFC + ldr r0, _0234395C ; =TREASURE_BOX_1_ITEM_IDS ldr r3, [fp, r3, lsl #2] ldrsh r0, [r0, r2] ldrsh r3, [r3, sl] @@ -13656,7 +13656,7 @@ _023437C8: cmpne sb, #0xa str r1, [sp, #0x28] strb r1, [sp, #0x32] - ldreq r1, _02343964 ; =ov10_022C5938 + ldreq r1, _02343964 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE ldreq r0, [sp, #0x1c] strh fp, [sp, #0x24] ldreqsh r0, [r1, r0] @@ -13750,7 +13750,7 @@ _0234392C: .word ov29_02353538 _02343930: .word ov29_0237CFC0 _02343934: .word 0x000001FF _02343938: .word ov29_023502F4 -_0234393C: .word ov29_023502EC +_0234393C: .word FIXED_ROOM_ENTITY_SPAWN_TABLE _02343940: .word ov29_023502F0 _02343944: .word ov10_022C4B34 _02343948: .word ov29_02353050 @@ -13758,9 +13758,9 @@ _0234394C: .word 0x00000578 _02343950: .word 0x00000181 _02343954: .word 0xFFFFFA7E _02343958: .word ov29_023534F0 -_0234395C: .word ov29_0234FDFC +_0234395C: .word TREASURE_BOX_1_ITEM_IDS _02343960: .word 0x00000229 -_02343964: .word ov10_022C5938 +_02343964: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE _02343968: .word 0x0002C9E6 arm_func_end PlaceFixedRoomTile @@ -14159,7 +14159,7 @@ _02343E78: sub r0, r1, #0xe00 cmp r2, r0 bgt _0234400C - ldr r1, _0234403C ; =ov29_023502EC + ldr r1, _0234403C ; =FIXED_ROOM_ENTITY_SPAWN_TABLE sub r2, r2, #0x10 mov r0, #0xc smlabb r0, r2, r0, r1 @@ -14242,7 +14242,7 @@ _02343FA0: _02343FCC: mov r0, #0xc mul r2, r3, r0 - ldr r1, _02344050 ; =ov10_022C5938 + ldr r1, _02344050 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE add r0, sp, #0xc ldrsh r1, [r1, r2] mov r2, r8 @@ -14275,12 +14275,12 @@ _0234402C: .align 2, 0 _02344034: .word ov29_02353794 _02344038: .word 0x00000FFF -_0234403C: .word ov29_023502EC +_0234403C: .word FIXED_ROOM_ENTITY_SPAWN_TABLE _02344040: .word 0x00000229 _02344044: .word 0x00000483 _02344048: .word ov29_02353538 _0234404C: .word 0x00000485 -_02344050: .word ov10_022C5938 +_02344050: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE arm_func_end LoadFixedRoom arm_func_start OpenFixedBin diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index d9292844..916b4bf5 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -1393,8 +1393,8 @@ ov29_0234FDF4: .global ov29_0234FDF8 ov29_0234FDF8: .byte 0x19, 0x00, 0x00, 0x00 - .global ov29_0234FDFC -ov29_0234FDFC: + .global TREASURE_BOX_1_ITEM_IDS +TREASURE_BOX_1_ITEM_IDS: .byte 0x6C, 0x01, 0x6F, 0x01, 0x72, 0x01, 0x75, 0x01, 0x78, 0x01, 0x7B, 0x01, 0x7E, 0x01, 0x81, 0x01 .byte 0x84, 0x01, 0x87, 0x01, 0x8A, 0x01, 0x8D, 0x01 .global FIXED_ROOM_REVISIT_OVERRIDES @@ -1963,8 +1963,8 @@ ov29_023502DC: .global ov29_023502E4 ov29_023502E4: .byte 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_023502EC -ov29_023502EC: + .global FIXED_ROOM_ENTITY_SPAWN_TABLE +FIXED_ROOM_ENTITY_SPAWN_TABLE: .word FIXED_ROOM_ITEM_SPAWN_TABLE .global ov29_023502F0 ov29_023502F0: @@ -3047,8 +3047,8 @@ ov29_023517A2: .byte 0xFF, 0xFF, 0xFF, 0xFF .word ov29_02351B00 .byte 0xFF, 0xFF, 0x01, 0x00 - .global ov29_023517DC -ov29_023517DC: + .global DISPLACEMENTS_WITHIN_2_LARGEST_FIRST +DISPLACEMENTS_WITHIN_2_LARGEST_FIRST: .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF .byte 0xFF, 0xFF, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF @@ -3056,8 +3056,8 @@ ov29_023517DC: .byte 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x63, 0x00 - .global ov29_02351844 -ov29_02351844: + .global DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .byte 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF @@ -3065,8 +3065,8 @@ ov29_02351844: .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0xFE, 0xFF, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00 .byte 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00 - .global ov29_023518AC -ov29_023518AC: + .global DISPLACEMENTS_WITHIN_3 +DISPLACEMENTS_WITHIN_3: .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00 @@ -3198,8 +3198,8 @@ ov29_02351E28: .byte 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00 .byte 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00 .byte 0x63, 0x00, 0x63, 0x00 - .global ov29_02352010 -ov29_02352010: + .global ITEM_CATEGORY_ACTIONS +ITEM_CATEGORY_ACTIONS: .byte 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x10, 0x00 .byte 0x00, 0x00, 0x12, 0x00, 0x12, 0x00, 0x31, 0x00, 0x2C, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -3252,8 +3252,8 @@ ov29_02352074: .byte 0xC4, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC5, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC6, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC8, 0x09, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .global ov29_02352284 -ov29_02352284: + .global FRACTIONAL_TURN_SEQUENCE +FRACTIONAL_TURN_SEQUENCE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3381,8 +3381,8 @@ ov29_02352758: .global ov29_02352760 ov29_02352760: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02352768 -ov29_02352768: + .global BELLY_DRAIN_IN_WALLS_INT +BELLY_DRAIN_IN_WALLS_INT: .byte 0x05, 0x00, 0x00, 0x00 .global ov29_0235276C ov29_0235276C: @@ -3419,26 +3419,26 @@ ov29_02352810: .global ov29_02352838 ov29_02352838: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_0235283C -ov29_0235283C: + .global DAMAGE_MULTIPLIER_0_5 +DAMAGE_MULTIPLIER_0_5: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00 - .global ov29_02352844 -ov29_02352844: + .global DAMAGE_MULTIPLIER_1_5 +DAMAGE_MULTIPLIER_1_5: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00 - .global ov29_0235284C -ov29_0235284C: + .global DAMAGE_MULTIPLIER_2 +DAMAGE_MULTIPLIER_2: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_0235285C -ov29_0235285C: + .global CLOUDY_DAMAGE_MULTIPLIER +CLOUDY_DAMAGE_MULTIPLIER: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 - .global ov29_02352864 -ov29_02352864: + .global SOLID_ROCK_MULTIPLIER +SOLID_ROCK_MULTIPLIER: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 - .global ov29_0235286C -ov29_0235286C: + .global DAMAGE_FORMULA_MAX_BASE +DAMAGE_FORMULA_MAX_BASE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_0235287C -ov29_0235287C: + .global DAMAGE_FORMULA_MIN_BASE +DAMAGE_FORMULA_MIN_BASE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 .global ov29_02352884 ov29_02352884: @@ -3448,8 +3448,8 @@ ov29_02352884: ov29_02352894: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov29_023528A4 -ov29_023528A4: + .global TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS +TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS: .byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 .byte 0x05, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00 @@ -3510,11 +3510,11 @@ ov29_023529EC: .byte 0x5C, 0x01, 0x06, 0x00, 0x99, 0x00, 0x07, 0x00, 0xCD, 0x00, 0x08, 0x00, 0x9C, 0x00, 0x09, 0x00 .byte 0x08, 0x00, 0x0A, 0x00, 0xDD, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02352AE8 -ov29_02352AE8: + .global SPATK_STAT_IDX +SPATK_STAT_IDX: .byte 0x01, 0x00, 0x00, 0x00 - .global ov29_02352AEC -ov29_02352AEC: + .global ATK_STAT_IDX +ATK_STAT_IDX: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x19, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00 .byte 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3612,8 +3612,8 @@ ov29_02352F7C: .global ov29_02352FCC ov29_02352FCC: .byte 0x01, 0x00, 0x01, 0x00 - .global ov29_02352FD0 -ov29_02352FD0: + .global MAP_COLOR_TABLE +MAP_COLOR_TABLE: .byte 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00 .byte 0x80, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0xC0, 0x00 @@ -3622,8 +3622,8 @@ ov29_02352FF4: .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 .byte 0x04, 0x00, 0x00, 0x00 - .global ov29_02353010 -ov29_02353010: + .global CORNER_CARDINAL_NEIGHBOR_IS_OPEN +CORNER_CARDINAL_NEIGHBOR_IS_OPEN: .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x01, 0x00, 0x00, 0x00 @@ -3760,8 +3760,8 @@ ov29_02353234: .byte 0xE0, 0x3F, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD0, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xCF, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x3F, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0xDB, 0x3F, 0x00, 0x00 - .global ov29_023532D0 -ov29_023532D0: + .global GUMMI_IQ_STRING_IDS +GUMMI_IQ_STRING_IDS: .byte 0x48, 0x0B, 0x49, 0x0B, 0x4A, 0x0B, 0x4B, 0x0B, 0x0C, 0x00, 0x00, 0x00 .byte 0xDA, 0x3F, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xD7, 0x3F, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 .byte 0xE5, 0x3F, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xD8, 0x3F, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 @@ -3772,8 +3772,8 @@ ov29_023532D0: ov29_02353324: .byte 0x4C, 0x0B, 0x4D, 0x0B, 0x4E, 0x0B, 0x4F, 0x0B .byte 0x50, 0x0B, 0x00, 0x00 - .global ov29_02353330 -ov29_02353330: + .global DAMAGE_STRING_IDS +DAMAGE_STRING_IDS: .byte 0x78, 0x0B, 0x79, 0x0B, 0x7A, 0x0B, 0x7B, 0x0B, 0x7C, 0x0B, 0x7D, 0x0B .byte 0x7E, 0x0B, 0x7F, 0x0B, 0x80, 0x0B, 0x81, 0x0B, 0x82, 0x0B, 0x83, 0x0B, 0x84, 0x0B, 0x85, 0x0B .byte 0x00, 0x00, 0x86, 0x0B, 0x87, 0x0B, 0x88, 0x0B, 0x89, 0x0B, 0x8A, 0x0B, 0x8B, 0x0B, 0x8D, 0x0B