From 54e9ffec87b2a168685038f4324cc4cb9e8efeef Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 21 Sep 2023 23:55:17 -0400 Subject: [PATCH] Synced symbols from pmdsky-debug --- asm/include/overlay_29_02300108.inc | 12 +- asm/include/overlay_29_02311034.inc | 6 +- asm/include/overlay_29_023118D8.inc | 2 +- asm/include/overlay_29_0232145C.inc | 16 +- asm/include/overlay_29_02325644.inc | 62 ++--- asm/include/overlay_29_02328030.inc | 48 ++-- asm/include/overlay_29_023350FC.inc | 2 +- asm/include/overlay_29_023456BC.inc | 2 +- asm/include/overlay_31.inc | 2 +- asm/main_0200C4CC.s | 8 +- asm/overlay_10.s | 276 ++++++++++----------- asm/overlay_29_02300108.s | 24 +- asm/overlay_29_02311034.s | 14 +- asm/overlay_29_023118D8.s | 4 +- asm/overlay_29_0232145C.s | 36 +-- asm/overlay_29_02325644.s | 124 +++++----- asm/overlay_29_02328030.s | 96 ++++---- asm/overlay_29_023350FC.s | 6 +- asm/overlay_29_023456BC.s | 4 +- asm/overlay_29_0234EC38.s | 8 +- asm/overlay_30.s | 76 +++--- asm/overlay_31.s | 356 ++++++++++++++-------------- asm/overlay_34.s | 32 +-- 23 files changed, 608 insertions(+), 608 deletions(-) diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index ff0a4c06..e5274640 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -1,7 +1,5 @@ #pragma once .public __divsi3 -.public _020A188C -.public _020A18A4 .public CanLearnIqSkill .public CanSeeTarget .public CanThrowItems @@ -13,8 +11,10 @@ .public EntityIsValid__023000E4 .public EntityIsValid__02302A38 .public EvolveMonster +.public EXCLUSIVE_ITEM_EXP_BOOST .public ExclusiveItemEffectFlagTest .public ExclusiveItemEffectIsActive__022FFF28 +.public EXP_ELITE_EXP_BOOST .public GetActiveTeamMember .public GetApparentWeather .public GetEntityNaturalGiftInfo @@ -44,12 +44,11 @@ .public LevelUp .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUserTarget +.public MIN_IQ_EXCLUSIVE_MOVE_USER +.public MIN_IQ_ITEM_MASTER +.public MIRACLE_CHEST_EXP_BOOST .public MistIsActive .public MultiplyByFixedPoint -.public ov10_022C44A8 -.public ov10_022C458C -.public ov10_022C4698 -.public ov10_022C469C .public ov29_022E2470 .public ov29_022E62A8 .public ov29_022FAFD4 @@ -90,3 +89,4 @@ .public sub_02058C9C .public SubstitutePlaceholderStringTags .public vsprintf +.public WONDER_CHEST_EXP_BOOST diff --git a/asm/include/overlay_29_02311034.inc b/asm/include/overlay_29_02311034.inc index 68c58d37..329cb4c9 100644 --- a/asm/include/overlay_29_02311034.inc +++ b/asm/include/overlay_29_02311034.inc @@ -22,16 +22,16 @@ .public GetApparentWeather .public GetRegenSpeed .public HasHeldItem +.public ICE_BODY_BONUS_REGEN .public IqSkillIsEnabled .public IsFloorOver .public LogMessageByIdWithPopupCheckUser -.public ov10_022C4578 -.public ov10_022C4630 .public ov10_022C4674 -.public ov10_022C46D0 .public ov10_022C46F8 .public ov29_0234B294 .public ov29_02353318 +.public RAIN_ABILITY_BONUS_REGEN .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter .public UpdateStatusIconFlags +.public WISH_BONUS_REGEN diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index eddda8a3..4638c0a0 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -31,7 +31,6 @@ .public ov10_022C4878 .public ov10_022C4880 .public ov10_022C4884 -.public ov10_022C4888 .public ov10_022C488C .public ov10_022C4890 .public ov10_022C4894 @@ -86,6 +85,7 @@ .public ov29_02353538 .public SafeguardIsActive .public SECONDARY_TERRAIN_TYPES +.public SPEED_BOOST_TURN_RANGE .public sub_02025888 .public sub_020258E4 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index b7bc280f..2672a83e 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -8,6 +8,7 @@ .public AreEntitiesAdjacent .public BoostSpeedOneStage .public CalcStatusDuration +.public DETECT_BAND_MOVE_ACCURACY_DROP .public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB50 @@ -40,6 +41,7 @@ .public HasHeldItem .public InitMove .public InitMoveCheckId +.public INTIMIDATOR_ACTIVATION_CHANCE .public IqSkillIsEnabled .public Is2TurnsMove .public IsAffectedByTaunt @@ -52,8 +54,12 @@ .public LogMessageWithPopup .public LogMessageWithPopupCheckUser .public LowerSpeed +.public MALE_ACCURACY_STAGE_MULTIPLIERS +.public MALE_EVASION_STAGE_MULTIPLIERS .public METRONOME_TABLE .public MoveIsNotPhysical +.public NATURE_POWER_TABLE +.public NIGHTMARE_TURN_RANGE .public ov00_022BFDAC .public ov00_022BFDEC .public ov10_022BDE50 @@ -69,14 +75,7 @@ .public ov10_022BFD8C .public ov10_022BFDCC .public ov10_022C4584 -.public ov10_022C45B8 .public ov10_022C4714 -.public ov10_022C4724 -.public ov10_022C47A8 -.public ov10_022C4808 -.public ov10_022C4E40 -.public ov10_022C540C -.public ov10_022C5460 .public ov29_022DE5D8 .public ov29_022DE5F0 .public ov29_022E28D4 @@ -123,7 +122,6 @@ .public ov29_02352A60 .public ov29_02352A6C .public ov29_02352A8C -.public ov29_02352AAC .public ov29_02352AD8 .public ov29_02352B1C .public ov29_02353538 @@ -134,6 +132,7 @@ .public ov29_0237CA88 .public PlayMoveAnimation .public PositionHasMonster +.public QUICK_DODGER_MOVE_ACCURACY_DROP .public SetAndLoadCurrentAttackAnimation .public ShouldDisplayEntityWrapper .public ShouldMovePlayAlternativeAnimation @@ -162,5 +161,6 @@ .public TryInflictSleepStatus .public TrySealMove .public TryWarp +.public TWO_TURN_MOVES_AND_STATUSES .public UpdateAiTargetPos .public WanTableSpriteHasAnimationGroup diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index ae9eaa6e..b8c4cf3c 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -6,15 +6,21 @@ .public ApplyDefensiveStatMultiplier .public ApplyOffensiveStatMultiplier .public ATK_STAT_IDX +.public AURORA_BEAM_LOWER_ATTACK_CHANCE +.public BITE_CRINGE_CHANCE .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat .public BoostSpeedOneStage +.public BUBBLE_LOWER_SPEED_CHANCE .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public CalcStatusDuration +.public CONSTRICT_LOWER_SPEED_CHANCE +.public CRUNCH_LOWER_DEFENSE_CHANCE .public DealDamage .public DealDamageWithType +.public DIG_DAMAGE_MULTIPLIER .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public DungeonRandRange @@ -25,7 +31,11 @@ .public EntityIsValid__02325620 .public EntityIsValidMoveEffects__0232800C .public ExclusiveItemEffectFlagTest +.public FACADE_DAMAGE_MULTIPLIER +.public FLAME_WHEEL_BURN_CHANCE +.public FLAMETHROWER_BURN_CHANCE .public FlashFireShouldActivate +.public FOCUS_PUNCH_DAMAGE_MULTIPLIER .public FormatMoveStringMore .public GetApparentWeather .public GetDamageSourceWrapper @@ -36,6 +46,7 @@ .public GetMoveType .public GetTileAtEntity .public InitMove +.public IRON_TAIL_LOWER_DEFENSE_CHANCE .public IsChargingTwoTurnMove .public IsMonsterSleeping .public LogMessageByIdWithPopupCheckUserTarget @@ -43,41 +54,15 @@ .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public METEOR_MASH_BOOST_ATTACK_CHANCE .public MirrorMoveIsActive +.public MORNING_SUN_HP_RESTORATION_TABLE +.public NIGHTMARE_TURN_RANGE +.public OCTAZOOKA_LOWER_ACCURACY_CHANCE .public ov10_022BED90 .public ov10_022BF160 .public ov10_022BFC5C -.public ov10_022C4428 -.public ov10_022C4440 -.public ov10_022C444C -.public ov10_022C4450 -.public ov10_022C4488 -.public ov10_022C4500 -.public ov10_022C4514 -.public ov10_022C4534 -.public ov10_022C4538 -.public ov10_022C4544 -.public ov10_022C4600 -.public ov10_022C4604 -.public ov10_022C462C -.public ov10_022C4634 -.public ov10_022C4658 -.public ov10_022C4688 -.public ov10_022C4690 -.public ov10_022C4718 -.public ov10_022C4724 -.public ov10_022C4798 -.public ov10_022C47C4 -.public ov10_022C47E4 -.public ov10_022C4860 .public ov10_022C48A8 -.public ov10_022C48B0 -.public ov10_022C48B4 -.public ov10_022C4954 -.public ov10_022C4984 -.public ov10_022C4994 -.public ov10_022C49A4 -.public ov10_022C4B54 .public ov10_022C4C0C .public ov10_022C4C0E .public ov29_022E2CA0 @@ -93,17 +78,29 @@ .public ov29_0234B034 .public ov29_0234BA54 .public ov29_02352AD8 -.public ov29_02352AF0 .public ov29_02353538 .public ov29_0237CA69 .public ov29_0237CA6A .public ov29_0237CA6D .public ov29_0237CA70 +.public POWDER_SNOW_FREEZE_CHANCE +.public PSYBEAM_CONFUSE_CHANCE +.public RAZOR_WIND_DAMAGE_MULTIPLIER +.public REVERSAL_DAMAGE_MULT_TABLE +.public ROCK_SLIDE_CRINGE_CHANCE +.public ROLLOUT_DAMAGE_MULT_TABLE +.public SILVER_WIND_BOOST_CHANCE +.public SKY_ATTACK_CRINGE_CHANCE .public SLEEP_TURN_RANGE +.public SMOKESCREEN_TURN_RANGE +.public SNORE_CRINGE_CHANCE .public SPATK_STAT_IDX .public StringFromMessageId .public sub_0201CF90 .public SubstitutePlaceholderStringTags +.public SURE_SHOT_TURN_RANGE +.public SYNTHESIS_HP_RESTORATION_TABLE +.public THUNDER_PARALYZE_CHANCE .public TryActivateWeather .public TryIncreaseHp .public TryInflictBurnStatus @@ -127,6 +124,9 @@ .public TryInflictWhifferStatus .public TryInflictYawningStatus .public TryResetStatChanges +.public WATER_SPOUT_DAMAGE_MULT_TABLE +.public WEATHER_BALL_DAMAGE_MULT_TABLE .public WEATHER_BALL_TYPE_TABLE .public WEATHER_MOVE_TURN_COUNT .public WHIRLPOOL_CONSTRICTION_CHANCE +.public YAWN_TURN_RANGE diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 19356570..a7926ea7 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -8,10 +8,13 @@ .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat +.public BOUNCE_DAMAGE_MULTIPLIER +.public BOUNCE_PARALYZE_CHANCE .public CalcDamage .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public DealDamage +.public DIVE_DAMAGE_MULTIPLIER .public DoMoveTakeaway .public DungeonRandInt .public DungeonRandOutcomeUserAction @@ -20,6 +23,9 @@ .public EntityIsValidMoveEffects__0232800C .public EntityIsValidMoveEffects__0232A3D8 .public ExclusiveItemEffectFlagTest +.public EXTRASENSORY_CRINGE_CHANCE +.public FAKE_OUT_CRINGE_CHANCE +.public FLY_DAMAGE_MULTIPLIER .public GenerateStandardItem .public GetApparentWeather .public GetDamageSourceWrapper @@ -29,38 +35,19 @@ .public GetMoveType .public GetMoveTypeForMonster .public GetTileAtEntity +.public HEADBUTT_CRINGE_CHANCE .public InitMove .public IsChargingTwoTurnMove .public IsSameMove .public LevitateIsActive +.public LICK_PARALYZE_CHANCE .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat -.public ov10_022C4424 -.public ov10_022C4444 -.public ov10_022C4448 -.public ov10_022C4484 -.public ov10_022C4490 -.public ov10_022C4494 -.public ov10_022C4498 -.public ov10_022C44A0 -.public ov10_022C451C -.public ov10_022C4528 -.public ov10_022C4568 -.public ov10_022C461C -.public ov10_022C463C -.public ov10_022C4644 -.public ov10_022C465C -.public ov10_022C4668 -.public ov10_022C4670 -.public ov10_022C4694 -.public ov10_022C47E8 -.public ov10_022C47EC -.public ov10_022C48A4 -.public ov10_022C48C0 -.public ov10_022C4974 -.public ov10_022C4E40 +.public MOONLIGHT_HP_RESTORATION_TABLE +.public MUDDY_WATER_LOWER_ACCURACY_CHANCE +.public NATURE_POWER_TABLE .public ov10_022C4E44 .public ov10_022C6324 .public ov29_022E56A0 @@ -87,11 +74,21 @@ .public ov29_0237CA6B .public ov29_0237CA78 .public ov29_0237CA7C +.public POISON_FANG_POISON_CHANCE +.public POISON_STING_POISON_CHANCE .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole +.public SACRED_FIRE_BURN_CHANCE +.public SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE +.public SMOG_POISON_CHANCE +.public SOLARBEAM_DAMAGE_MULTIPLIER +.public SONICBOOM_FIXED_DAMAGE .public SPATK_STAT_IDX .public StringFromMessageId .public SubstitutePlaceholderStringTags +.public THUNDERBOLT_PARALYZE_CHANCE +.public THUNDERSHOCK_PARALYZE_CHANCE +.public TRI_ATTACK_STATUS_CHANCE .public TryActivateWeather .public TryEndStatusWithAbility .public TryExplosion @@ -111,4 +108,7 @@ .public TryInflictTauntStatus .public TryInflictWishStatus .public TryWarp +.public TWINEEDLE_POISON_CHANCE +.public TWISTER_CRINGE_CHANCE +.public WATERFALL_CRINGE_CHANCE .public WEATHER_MOVE_TURN_COUNT diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index db109f11..b9154c7c 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -39,7 +39,6 @@ .public ov10_022C26A0 .public ov10_022C26BC .public ov10_022C2720 -.public ov10_022C478C .public ov29_022DE0EC .public ov29_022DE608 .public ov29_022E0378 @@ -76,6 +75,7 @@ .public SECONDARY_TERRAIN_TYPES .public SetBothScreensWindowColorToDefault .public SetScreenWindowsColor +.public SPORT_CONDITION_TURN_RANGE .public sub_0201E020 .public sub_0201E080 .public sub_0201F2A0 diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 013d4712..ca6b78f2 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -55,7 +55,6 @@ .public LogMessageByIdWithPopupCheckUserUnknown .public MONEY_QUANTITY_TABLE .public MonsterHasEmbargoStatus -.public ov10_022C4474 .public ov10_022C44C8 .public ov10_022C48EC .public ov10_022C4CD8 @@ -108,5 +107,6 @@ .public SubstitutePlaceholderStringTags .public TestItemAiFlag .public TwoTurnMoveForcedMiss +.public UNOWN_STONE_DROP_CHANCE .public UpdateEntityPixelPos .public YesNoMenu diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 23eed5f9..16a97030 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -144,7 +144,7 @@ .public ov29_02353538 .public ov29_0237C91C .public ov29_0238280C -.public ov31_02389E20 +.public OVERLAY31_UNKNOWN_STRING_IDS .public PositionHasItem .public PreprocessString .public PreprocessStringFromMessageId diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 0832f426..1c27657c 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169911,8 +169911,8 @@ _020A1884: .global GUMMI_STAT_BOOST GUMMI_STAT_BOOST: .byte 0x01, 0x00, 0x00, 0x00 - .global _020A188C -_020A188C: + .global MIN_IQ_EXCLUSIVE_MOVE_USER +MIN_IQ_EXCLUSIVE_MOVE_USER: .byte 0x4B, 0x01, 0x00, 0x00 .global WONDER_GUMMI_IQ_GAIN WONDER_GUMMI_IQ_GAIN: @@ -169929,8 +169929,8 @@ _020A189C: .global _020A18A0 _020A18A0: .byte 0x05, 0x00, 0x00, 0x00 - .global _020A18A4 -_020A18A4: + .global MIN_IQ_ITEM_MASTER +MIN_IQ_ITEM_MASTER: .byte 0x96, 0x00, 0x00, 0x00 .global DEF_SCARF_STAT_BOOST DEF_SCARF_STAT_BOOST: diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 361ba844..a271ce6f 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9131,11 +9131,11 @@ ov10_022C441C: .global PROTEIN_STAT_BOOST PROTEIN_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C4424 -ov10_022C4424: + .global WATERFALL_CRINGE_CHANCE +WATERFALL_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4428 -ov10_022C4428: + .global AURORA_BEAM_LOWER_ATTACK_CHANCE +AURORA_BEAM_LOWER_ATTACK_CHANCE: .byte 0x3C, 0x00, 0x00, 0x00 .global ov10_022C442C ov10_022C442C: @@ -9152,20 +9152,20 @@ OREN_BERRY_DAMAGE: .global ov10_022C443C ov10_022C443C: .byte 0xC9, 0x00, 0x00, 0x00 - .global ov10_022C4440 -ov10_022C4440: + .global IRON_TAIL_LOWER_DEFENSE_CHANCE +IRON_TAIL_LOWER_DEFENSE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4444 -ov10_022C4444: + .global TWINEEDLE_POISON_CHANCE +TWINEEDLE_POISON_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4448 -ov10_022C4448: + .global EXTRASENSORY_CRINGE_CHANCE +EXTRASENSORY_CRINGE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C444C -ov10_022C444C: + .global ROCK_SLIDE_CRINGE_CHANCE +ROCK_SLIDE_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4450 -ov10_022C4450: + .global CRUNCH_LOWER_DEFENSE_CHANCE +CRUNCH_LOWER_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4454 ov10_022C4454: @@ -9191,8 +9191,8 @@ ov10_022C446C: .global ov10_022C4470 ov10_022C4470: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4474 -ov10_022C4474: + .global UNOWN_STONE_DROP_CHANCE +UNOWN_STONE_DROP_CHANCE: .byte 0x21, 0x00, 0x00, 0x00 .global SITRUS_BERRY_HP_RESTORATION SITRUS_BERRY_HP_RESTORATION: @@ -9203,35 +9203,35 @@ ov10_022C447C: .global ov10_022C4480 ov10_022C4480: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4484 -ov10_022C4484: + .global MUDDY_WATER_LOWER_ACCURACY_CHANCE +MUDDY_WATER_LOWER_ACCURACY_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 - .global ov10_022C4488 -ov10_022C4488: + .global SILVER_WIND_BOOST_CHANCE +SILVER_WIND_BOOST_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global POISON_TAIL_POISON_CHANCE POISON_TAIL_POISON_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4490 -ov10_022C4490: + .global THUNDERSHOCK_PARALYZE_CHANCE +THUNDERSHOCK_PARALYZE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4494 -ov10_022C4494: + .global BOUNCE_PARALYZE_CHANCE +BOUNCE_PARALYZE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4498 -ov10_022C4498: + .global HEADBUTT_CRINGE_CHANCE +HEADBUTT_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 .global FIRE_FANG_CRINGE_CHANCE FIRE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C44A0 -ov10_022C44A0: + .global SACRED_FIRE_BURN_CHANCE +SACRED_FIRE_BURN_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global WHIRLPOOL_CONSTRICTION_CHANCE WHIRLPOOL_CONSTRICTION_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44A8 -ov10_022C44A8: + .global EXP_ELITE_EXP_BOOST +EXP_ELITE_EXP_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 .global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS: @@ -9296,8 +9296,8 @@ LIFE_SEED_HP_BOOST: .global ov10_022C44FC ov10_022C44FC: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4500 -ov10_022C4500: + .global OCTAZOOKA_LOWER_ACCURACY_CHANCE +OCTAZOOKA_LOWER_ACCURACY_CHANCE: .byte 0x3C, 0x00, 0x00, 0x00 .global ov10_022C4504 ov10_022C4504: @@ -9311,14 +9311,14 @@ LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE: .global SUPER_LUCK_CRIT_RATE_BOOST SUPER_LUCK_CRIT_RATE_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4514 -ov10_022C4514: + .global CONSTRICT_LOWER_SPEED_CHANCE +CONSTRICT_LOWER_SPEED_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ICE_FANG_FREEZE_CHANCE ICE_FANG_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C451C -ov10_022C451C: + .global SMOG_POISON_CHANCE +SMOG_POISON_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C4520 ov10_022C4520: @@ -9326,8 +9326,8 @@ ov10_022C4520: .global ov10_022C4524 ov10_022C4524: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4528 -ov10_022C4528: + .global LICK_PARALYZE_CHANCE +LICK_PARALYZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global THUNDER_FANG_PARALYZE_CHANCE THUNDER_FANG_PARALYZE_CHANCE: @@ -9335,11 +9335,11 @@ THUNDER_FANG_PARALYZE_CHANCE: .global ov10_022C4530 ov10_022C4530: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4534 -ov10_022C4534: + .global BITE_CRINGE_CHANCE +BITE_CRINGE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4538 -ov10_022C4538: + .global SKY_ATTACK_CRINGE_CHANCE +SKY_ATTACK_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 .global ICE_FANG_CRINGE_CHANCE ICE_FANG_CRINGE_CHANCE: @@ -9347,8 +9347,8 @@ ICE_FANG_CRINGE_CHANCE: .global BLAZE_KICK_BURN_CHANCE BLAZE_KICK_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4544 -ov10_022C4544: + .global FLAMETHROWER_BURN_CHANCE +FLAMETHROWER_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global DIZZY_PUNCH_CONFUSE_CHANCE DIZZY_PUNCH_CONFUSE_CHANCE: @@ -9374,8 +9374,8 @@ ov10_022C4560: .global ov10_022C4564 ov10_022C4564: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4568 -ov10_022C4568: + .global SONICBOOM_FIXED_DAMAGE +SONICBOOM_FIXED_DAMAGE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C456C ov10_022C456C: @@ -9386,8 +9386,8 @@ ov10_022C4570: .global ov10_022C4574 ov10_022C4574: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C4578 -ov10_022C4578: + .global RAIN_ABILITY_BONUS_REGEN +RAIN_ABILITY_BONUS_REGEN: .byte 0x6A, 0xFF, 0x00, 0x00 .global ov10_022C457C ov10_022C457C: @@ -9398,8 +9398,8 @@ ov10_022C4584: .global LEECH_SEED_HP_DRAIN LEECH_SEED_HP_DRAIN: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C458C -ov10_022C458C: + .global EXCLUSIVE_ITEM_EXP_BOOST +EXCLUSIVE_ITEM_EXP_BOOST: .byte 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4590 ov10_022C4590: @@ -9431,8 +9431,8 @@ ov10_022C45B0: .global ov10_022C45B4 ov10_022C45B4: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C45B8 -ov10_022C45B8: + .global INTIMIDATOR_ACTIVATION_CHANCE +INTIMIDATOR_ACTIVATION_CHANCE: .byte 0x20, 0x00, 0x00, 0x00 .global ov10_022C45BC ov10_022C45BC: @@ -9485,11 +9485,11 @@ ov10_022C45F8: .global ov10_022C45FC ov10_022C45FC: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C4600 -ov10_022C4600: + .global SNORE_CRINGE_CHANCE +SNORE_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4604 -ov10_022C4604: + .global METEOR_MASH_BOOST_ATTACK_CHANCE +METEOR_MASH_BOOST_ATTACK_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global CRUSH_CLAW_LOWER_DEFENSE_CHANCE CRUSH_CLAW_LOWER_DEFENSE_CHANCE: @@ -9506,8 +9506,8 @@ ov10_022C4614: .global ov10_022C4618 ov10_022C4618: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C461C -ov10_022C461C: + .global SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE +SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4620 ov10_022C4620: @@ -9518,26 +9518,26 @@ STICK_POWER: .global ov10_022C4628 ov10_022C4628: .byte 0x08, 0x00, 0x00, 0x00 - .global ov10_022C462C -ov10_022C462C: + .global BUBBLE_LOWER_SPEED_CHANCE +BUBBLE_LOWER_SPEED_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4630 -ov10_022C4630: + .global ICE_BODY_BONUS_REGEN +ICE_BODY_BONUS_REGEN: .byte 0x9C, 0xFF, 0x00, 0x00 - .global ov10_022C4634 -ov10_022C4634: + .global POWDER_SNOW_FREEZE_CHANCE +POWDER_SNOW_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C4638 ov10_022C4638: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C463C -ov10_022C463C: + .global POISON_STING_POISON_CHANCE +POISON_STING_POISON_CHANCE: .byte 0x12, 0x00, 0x00, 0x00 .global SPAWN_COOLDOWN_THIEF_ALERT SPAWN_COOLDOWN_THIEF_ALERT: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C4644 -ov10_022C4644: + .global POISON_FANG_POISON_CHANCE +POISON_FANG_POISON_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4648 ov10_022C4648: @@ -9551,11 +9551,11 @@ ov10_022C4650: .global WEATHER_MOVE_TURN_COUNT WEATHER_MOVE_TURN_COUNT: .byte 0xB8, 0x0B, 0x00, 0x00 - .global ov10_022C4658 -ov10_022C4658: + .global THUNDER_PARALYZE_CHANCE +THUNDER_PARALYZE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C465C -ov10_022C465C: + .global THUNDERBOLT_PARALYZE_CHANCE +THUNDERBOLT_PARALYZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global MONSTER_HOUSE_MAX_MONSTER_SPAWNS MONSTER_HOUSE_MAX_MONSTER_SPAWNS: @@ -9563,14 +9563,14 @@ MONSTER_HOUSE_MAX_MONSTER_SPAWNS: .global ov10_022C4664 ov10_022C4664: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4668 -ov10_022C4668: + .global TWISTER_CRINGE_CHANCE +TWISTER_CRINGE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global SPEED_BOOST_TURNS SPEED_BOOST_TURNS: .byte 0xFA, 0x00, 0x00, 0x00 - .global ov10_022C4670 -ov10_022C4670: + .global FAKE_OUT_CRINGE_CHANCE +FAKE_OUT_CRINGE_CHANCE: .byte 0x23, 0x00, 0x00, 0x00 .global ov10_022C4674 ov10_022C4674: @@ -9587,23 +9587,23 @@ ov10_022C4680: .global FLARE_BLITZ_BURN_CHANCE FLARE_BLITZ_BURN_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C4688 -ov10_022C4688: + .global FLAME_WHEEL_BURN_CHANCE +FLAME_WHEEL_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C468C ov10_022C468C: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4690 -ov10_022C4690: + .global PSYBEAM_CONFUSE_CHANCE +PSYBEAM_CONFUSE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4694 -ov10_022C4694: + .global TRI_ATTACK_STATUS_CHANCE +TRI_ATTACK_STATUS_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4698 -ov10_022C4698: + .global MIRACLE_CHEST_EXP_BOOST +MIRACLE_CHEST_EXP_BOOST: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C469C -ov10_022C469C: + .global WONDER_CHEST_EXP_BOOST +WONDER_CHEST_EXP_BOOST: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C46A0 ov10_022C46A0: @@ -9641,8 +9641,8 @@ IRON_STAT_BOOST: .global CALCIUM_STAT_BOOST CALCIUM_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46D0 -ov10_022C46D0: + .global WISH_BONUS_REGEN +WISH_BONUS_REGEN: .byte 0x24, 0xFF, 0x00, 0x00 .global DRAGON_RAGE_FIXED_DAMAGE DRAGON_RAGE_FIXED_DAMAGE: @@ -9695,8 +9695,8 @@ ME_FIRST_MULTIPLIER: .global ov10_022C4714 ov10_022C4714: .byte 0x01, 0x00, 0x01, 0x00 - .global ov10_022C4718 -ov10_022C4718: + .global FACADE_DAMAGE_MULTIPLIER +FACADE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global IMPRISON_TURN_RANGE IMPRISON_TURN_RANGE: @@ -9704,8 +9704,8 @@ IMPRISON_TURN_RANGE: .global SLEEP_TURN_RANGE SLEEP_TURN_RANGE: .byte 0x03, 0x00, 0x07, 0x00 - .global ov10_022C4724 -ov10_022C4724: + .global NIGHTMARE_TURN_RANGE +NIGHTMARE_TURN_RANGE: .byte 0x04, 0x00, 0x08, 0x00 .global ov10_022C4728 ov10_022C4728: @@ -9782,8 +9782,8 @@ ov10_022C4784: .global ov10_022C4788 ov10_022C4788: .byte 0x03, 0x00, 0x05, 0x00 - .global ov10_022C478C -ov10_022C478C: + .global SPORT_CONDITION_TURN_RANGE +SPORT_CONDITION_TURN_RANGE: .byte 0x0A, 0x00, 0x0C, 0x00 .global ov10_022C4790 ov10_022C4790: @@ -9791,8 +9791,8 @@ ov10_022C4790: .global ov10_022C4794 ov10_022C4794: .byte 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C4798 -ov10_022C4798: + .global SURE_SHOT_TURN_RANGE +SURE_SHOT_TURN_RANGE: .byte 0x0A, 0x00, 0x0C, 0x00 .global ov10_022C479C ov10_022C479C: @@ -9803,8 +9803,8 @@ ov10_022C47A0: .global ov10_022C47A4 ov10_022C47A4: .byte 0x02, 0x00, 0x04, 0x00 - .global ov10_022C47A8 -ov10_022C47A8: + .global DETECT_BAND_MOVE_ACCURACY_DROP +DETECT_BAND_MOVE_ACCURACY_DROP: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C47AC ov10_022C47AC: @@ -9824,8 +9824,8 @@ ov10_022C47BC: .global TINTED_LENS_MULTIPLIER TINTED_LENS_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 - .global ov10_022C47C4 -ov10_022C47C4: + .global SMOKESCREEN_TURN_RANGE +SMOKESCREEN_TURN_RANGE: .byte 0x01, 0x00, 0x04, 0x00 .global ov10_022C47C8 ov10_022C47C8: @@ -9848,14 +9848,14 @@ SHADOW_FORCE_DAMAGE_MULTIPLIER: .global ov10_022C47E0 ov10_022C47E0: .byte 0x0A, 0x00, 0x05, 0x00 - .global ov10_022C47E4 -ov10_022C47E4: + .global DIG_DAMAGE_MULTIPLIER +DIG_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C47E8 -ov10_022C47E8: + .global DIVE_DAMAGE_MULTIPLIER +DIVE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C47EC -ov10_022C47EC: + .global BOUNCE_DAMAGE_MULTIPLIER +BOUNCE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C47F0 ov10_022C47F0: @@ -9875,8 +9875,8 @@ ov10_022C4800: .global ov10_022C4804 ov10_022C4804: .byte 0x04, 0x00, 0x06, 0x00 - .global ov10_022C4808 -ov10_022C4808: + .global QUICK_DODGER_MOVE_ACCURACY_DROP +QUICK_DODGER_MOVE_ACCURACY_DROP: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C480C ov10_022C480C: @@ -9941,8 +9941,8 @@ ov10_022C4858: .global ov10_022C485C ov10_022C485C: .byte 0x0F, 0x00, 0x14, 0x00 - .global ov10_022C4860 -ov10_022C4860: + .global YAWN_TURN_RANGE +YAWN_TURN_RANGE: .byte 0x02, 0x00, 0x02, 0x00 .global ov10_022C4864 ov10_022C4864: @@ -9971,8 +9971,8 @@ ov10_022C4880: .global ov10_022C4884 ov10_022C4884: .byte 0x01, 0x00, 0x01, 0x00 - .global ov10_022C4888 -ov10_022C4888: + .global SPEED_BOOST_TURN_RANGE +SPEED_BOOST_TURN_RANGE: .byte 0x08, 0x00, 0x0A, 0x00 .global ov10_022C488C ov10_022C488C: @@ -9992,8 +9992,8 @@ ov10_022C489C: .global ov10_022C48A0 ov10_022C48A0: .byte 0x03, 0x00, 0x06, 0x00 - .global ov10_022C48A4 -ov10_022C48A4: + .global SOLARBEAM_DAMAGE_MULTIPLIER +SOLARBEAM_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48A8 ov10_022C48A8: @@ -10001,11 +10001,11 @@ ov10_022C48A8: .global ov10_022C48AC ov10_022C48AC: .byte 0x02, 0x00, 0x05, 0x00 - .global ov10_022C48B0 -ov10_022C48B0: + .global RAZOR_WIND_DAMAGE_MULTIPLIER +RAZOR_WIND_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C48B4 -ov10_022C48B4: + .global FOCUS_PUNCH_DAMAGE_MULTIPLIER +FOCUS_PUNCH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48B8 ov10_022C48B8: @@ -10013,8 +10013,8 @@ ov10_022C48B8: .global SKULL_BASH_DAMAGE_MULTIPLIER SKULL_BASH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C48C0 -ov10_022C48C0: + .global FLY_DAMAGE_MULTIPLIER +FLY_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: @@ -10054,23 +10054,23 @@ ov10_022C4934: .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 - .global ov10_022C4954 -ov10_022C4954: + .global SYNTHESIS_HP_RESTORATION_TABLE +SYNTHESIS_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .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 - .global ov10_022C4974 -ov10_022C4974: + .global MOONLIGHT_HP_RESTORATION_TABLE +MOONLIGHT_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4984 -ov10_022C4984: + .global MORNING_SUN_HP_RESTORATION_TABLE +MORNING_SUN_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4994 -ov10_022C4994: + .global REVERSAL_DAMAGE_MULT_TABLE +REVERSAL_DAMAGE_MULT_TABLE: .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49A4 -ov10_022C49A4: + .global WATER_SPOUT_DAMAGE_MULT_TABLE +WATER_SPOUT_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .global WRING_OUT_DAMAGE_MULT_TABLE WRING_OUT_DAMAGE_MULT_TABLE: @@ -10149,8 +10149,8 @@ ov10_022C4B18: ov10_022C4B34: .byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00, 0x81, 0x00, 0x81, 0x00, 0x73, 0x00, 0x73, 0x00 .byte 0x5D, 0x00, 0xBA, 0x00, 0x90, 0x00, 0x90, 0x00, 0x37, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C4B54 -ov10_022C4B54: + .global WEATHER_BALL_DAMAGE_MULT_TABLE +WEATHER_BALL_DAMAGE_MULT_TABLE: .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 EAT_ITEM_EFFECT_IGNORE_LIST @@ -10245,8 +10245,8 @@ DEFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x00, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00 .byte 0x19, 0x02, 0x00, 0x00, 0x4C, 0x02, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xB3, 0x02, 0x00, 0x00 .byte 0xE6, 0x02, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00 - .global ov10_022C4E40 -ov10_022C4E40: + .global NATURE_POWER_TABLE +NATURE_POWER_TABLE: .byte 0xDB, 0x00, 0x00, 0x00 .global ov10_022C4E44 ov10_022C4E44: @@ -10365,16 +10365,16 @@ SHOP_ITEM_CHANCES: .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 - .global ov10_022C540C -ov10_022C540C: + .global MALE_ACCURACY_STAGE_MULTIPLIERS +MALE_ACCURACY_STAGE_MULTIPLIERS: .byte 0x54, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00 .byte 0x5E, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00 .byte 0x8C, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00 .byte 0xD9, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C5460 -ov10_022C5460: + .global MALE_EVASION_STAGE_MULTIPLIERS +MALE_EVASION_STAGE_MULTIPLIERS: .byte 0x00, 0x02, 0x00, 0x00 .byte 0xE6, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index 5cd7bd92..afcc9b82 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -2374,7 +2374,7 @@ _0230202C: cmp r6, #0x19 blt _02301FE4 _02302034: - ldr r0, _023021E8 ; =_020A188C + ldr r0, _023021E8 ; =MIN_IQ_EXCLUSIVE_MOVE_USER ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2392,7 +2392,7 @@ _02302068: bl ov29_022FBDE0 cmp r0, #0 bne _0230208C - ldr r0, _023021EC ; =_020A18A4 + ldr r0, _023021EC ; =MIN_IQ_ITEM_MASTER ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2497,8 +2497,8 @@ _023021C4: bl EnableIqSkill ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023021E8: .word _020A188C -_023021EC: .word _020A18A4 +_023021E8: .word MIN_IQ_EXCLUSIVE_MOVE_USER +_023021EC: .word MIN_IQ_ITEM_MASTER arm_func_end UpdateIqSkills arm_func_start ov29_023021F0 @@ -2793,7 +2793,7 @@ _02302580: bl IqSkillIsEnabled cmp r0, #0 beq _023025C0 - ldr r0, _023026B8 ; =ov10_022C44A8 + ldr r0, _023026B8 ; =EXP_ELITE_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2808,7 +2808,7 @@ _023025C0: bl ItemIsActive__023026CC cmp r0, #0 beq _023025F8 - ldr r0, _023026BC ; =ov10_022C469C + ldr r0, _023026BC ; =WONDER_CHEST_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2823,7 +2823,7 @@ _023025F8: bl ItemIsActive__023026CC cmp r0, #0 beq _02302630 - ldr r0, _023026C0 ; =ov10_022C4698 + ldr r0, _023026C0 ; =MIRACLE_CHEST_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2844,7 +2844,7 @@ _02302630: _02302650: cmp r0, #0 beq _0230267C - ldr r0, _023026C4 ; =ov10_022C458C + ldr r0, _023026C4 ; =EXCLUSIVE_ITEM_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2870,10 +2870,10 @@ _0230267C: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _023026B4: .word ov29_02353538 -_023026B8: .word ov10_022C44A8 -_023026BC: .word ov10_022C469C -_023026C0: .word ov10_022C4698 -_023026C4: .word ov10_022C458C +_023026B8: .word EXP_ELITE_EXP_BOOST +_023026BC: .word WONDER_CHEST_EXP_BOOST +_023026C0: .word MIRACLE_CHEST_EXP_BOOST +_023026C4: .word EXCLUSIVE_ITEM_EXP_BOOST _023026C8: .word 0x0098967F arm_func_end AddExpSpecial diff --git a/asm/overlay_29_02311034.s b/asm/overlay_29_02311034.s index f9155a40..14444419 100644 --- a/asm/overlay_29_02311034.s +++ b/asm/overlay_29_02311034.s @@ -94,7 +94,7 @@ _0231115C: ldrb r0, [r7, #0xd5] mov r1, #3 cmp r0, #6 - ldreq r0, _02311804 ; =ov10_022C46D0 + ldreq r0, _02311804 ; =WISH_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 mov r0, sl @@ -104,7 +104,7 @@ _0231115C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =ov10_022C4578 + ldreq r0, _02311808 ; =RAIN_ABILITY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _0231119C: @@ -116,7 +116,7 @@ _0231119C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =ov10_022C4578 + ldreq r0, _02311808 ; =RAIN_ABILITY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _023111C8: @@ -128,7 +128,7 @@ _023111C8: mov r0, sl bl GetApparentWeather cmp r0, #5 - ldreq r0, _0231180C ; =ov10_022C4630 + ldreq r0, _0231180C ; =ICE_BODY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _023111F4: @@ -545,9 +545,9 @@ _023117A8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02311800: .word ov10_022C46F8 -_02311804: .word ov10_022C46D0 -_02311808: .word ov10_022C4578 -_0231180C: .word ov10_022C4630 +_02311804: .word WISH_BONUS_REGEN +_02311808: .word RAIN_ABILITY_BONUS_REGEN +_0231180C: .word ICE_BODY_BONUS_REGEN _02311810: .word ov10_022C4674 _02311814: .word 0x000003E7 _02311818: .word 0x00000CC6 diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index 45494093..e32b8c99 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -3410,7 +3410,7 @@ BoostSpeed: ; 0x02314810 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} cmp r6, #0 bne _02314850 - ldr r1, _0231492C ; =ov10_022C4888 + ldr r1, _0231492C ; =SPEED_BOOST_TURN_RANGE mov r0, r8 mov r2, #0 bl CalcStatusDuration @@ -3478,7 +3478,7 @@ _02314920: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231492C: .word ov10_022C4888 +_0231492C: .word SPEED_BOOST_TURN_RANGE _02314930: .word 0x00000DDB _02314934: .word 0x00000DDA _02314938: .word ov29_02353318 diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 4943b904..a0d9f625 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -670,7 +670,7 @@ _02321DB8: ldr r1, _02322258 ; =0x00000EA3 mov r0, r6 bl LogMessageByIdWithPopupCheckUser - ldr r1, _0232225C ; =ov10_022C4724 + ldr r1, _0232225C ; =NIGHTMARE_TURN_RANGE mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -978,7 +978,7 @@ _0232224C: .word 0x00000E8D _02322250: .word 0x00000E8E _02322254: .word 0x00000E8F _02322258: .word 0x00000EA3 -_0232225C: .word ov10_022C4724 +_0232225C: .word NIGHTMARE_TURN_RANGE _02322260: .word 0x00000E91 _02322264: .word 0x00000E92 _02322268: .word 0x00000E93 @@ -1124,7 +1124,7 @@ _02322460: cmp r1, #0x77 bne _023224C4 bl GetNaturePowerVariant - ldr r1, _02322D28 ; =ov10_022C4E40 + ldr r1, _02322D28 ; =NATURE_POWER_TABLE mov r0, r0, lsl #3 ldrh r1, [r1, r0] add r0, sp, #0x30 @@ -1348,7 +1348,7 @@ _023227A8: bl ov29_02324514 str r0, [sp, #0x24] _023227B0: - ldr r0, _02322D50 ; =ov10_022C45B8 + ldr r0, _02322D50 ; =INTIMIDATOR_ACTIVATION_CHANCE mov r7, #0 ldrsh r0, [r0] str r0, [sp, #0x14] @@ -1724,7 +1724,7 @@ _02322D18: .word 0x0000014A _02322D1C: .word ov29_0237CA88 _02322D20: .word METRONOME_TABLE _02322D24: .word 0x00000EA4 -_02322D28: .word ov10_022C4E40 +_02322D28: .word NATURE_POWER_TABLE _02322D2C: .word 0x00000EA5 _02322D30: .word 0x00000EA6 _02322D34: .word 0x00000EA7 @@ -1734,7 +1734,7 @@ _02322D40: .word 0x00000E7A _02322D44: .word ov29_0237CA68 _02322D48: .word 0x00000163 _02322D4C: .word ov10_022C4584 -_02322D50: .word ov10_022C45B8 +_02322D50: .word INTIMIDATOR_ACTIVATION_CHANCE _02322D54: .word 0x000001ED _02322D58: .word ov29_0235370C _02322D5C: .word 0x00000EA9 @@ -2863,14 +2863,14 @@ _02323D00: bl HasHeldItem _02323D4C: cmp r0, #0 - ldrne r0, _02324014 ; =ov10_022C47A8 + ldrne r0, _02324014 ; =DETECT_BAND_MOVE_ACCURACY_DROP mov r1, #5 ldrne r0, [r0] subne r8, r8, r0 mov r0, r6 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _02324018 ; =ov10_022C4808 + ldrne r0, _02324018 ; =QUICK_DODGER_MOVE_ACCURACY_DROP mov r1, #0x33 ldrne r0, [r0] ldrsh sb, [sb, #0x2c] @@ -3018,7 +3018,7 @@ _02323F44: cmp sb, #0x14 movgt sb, #0x14 _02323F94: - ldr r2, _02324028 ; =ov10_022C540C + ldr r2, _02324028 ; =MALE_ACCURACY_STAGE_MULTIPLIERS ldr r0, [sp, #4] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3030,7 +3030,7 @@ _02323F94: cmp r3, #0 movlt r3, #0 cmp r3, #0x6400 - ldr r2, _0232402C ; =ov10_022C5460 + ldr r2, _0232402C ; =MALE_EVASION_STAGE_MULTIPLIERS ldr r0, [sp] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3052,13 +3052,13 @@ _02324008: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02324010: .word 0x00000163 -_02324014: .word ov10_022C47A8 -_02324018: .word ov10_022C4808 +_02324014: .word DETECT_BAND_MOVE_ACCURACY_DROP +_02324018: .word QUICK_DODGER_MOVE_ACCURACY_DROP _0232401C: .word 0x0000010E _02324020: .word 0x000003E7 _02324024: .word ov29_02353710 -_02324028: .word ov10_022C540C -_0232402C: .word ov10_022C5460 +_02324028: .word MALE_ACCURACY_STAGE_MULTIPLIERS +_0232402C: .word MALE_EVASION_STAGE_MULTIPLIERS arm_func_end MoveHitCheck arm_func_start ov29_02324030 @@ -3464,7 +3464,7 @@ IsChargingTwoTurnMove: ; 0x023245A4 ldmeqia sp!, {r3, r4, r5, pc} ldr ip, [r5, #0xb4] mov lr, #0 - ldr r2, _02324618 ; =ov29_02352AAC + ldr r2, _02324618 ; =TWO_TURN_MOVES_AND_STATUSES b _02324608 _023245D0: mov r3, lr, lsl #2 @@ -3487,7 +3487,7 @@ _02324608: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02324618: .word ov29_02352AAC +_02324618: .word TWO_TURN_MOVES_AND_STATUSES arm_func_end IsChargingTwoTurnMove arm_func_start ov29_0232461C @@ -3716,7 +3716,7 @@ _023248D8: cmp r0, #0x77 bne _02324920 bl GetNaturePowerVariant - ldr r1, _02324930 ; =ov10_022C4E40 + ldr r1, _02324930 ; =NATURE_POWER_TABLE mov r0, r0, lsl #3 ldrh r0, [r1, r0] cmp r0, #0x76 @@ -3729,7 +3729,7 @@ _02324928: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02324930: .word ov10_022C4E40 +_02324930: .word NATURE_POWER_TABLE arm_func_end TwoTurnMoveForcedMiss arm_func_start DungeonRandOutcomeUserTargetInteraction diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index 5cfe87f9..14afbf01 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -580,7 +580,7 @@ DoMoveIronTail: ; 0x02325DE4 bl DealDamage cmp r0, #0 beq _02325E50 - ldr r1, _02325E5C ; =ov10_022C4440 + ldr r1, _02325E5C ; =IRON_TAIL_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -602,7 +602,7 @@ _02325E50: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02325E5C: .word ov10_022C4440 +_02325E5C: .word IRON_TAIL_LOWER_DEFENSE_CHANCE _02325E60: .word ATK_STAT_IDX arm_func_end DoMoveIronTail @@ -613,7 +613,7 @@ DoMoveDamageMultihitUntilMiss: ; 0x02325E64 ldr ip, _02325EB8 ; =ov29_0237CA70 str r3, [sp] ldr ip, [ip] - ldr r3, _02325EBC ; =ov29_02352AF0 + ldr r3, _02325EBC ; =ROLLOUT_DAMAGE_MULT_TABLE mov r4, #0 ldr r3, [r3, ip, lsl #2] bl DealDamage @@ -631,7 +631,7 @@ DoMoveDamageMultihitUntilMiss: ; 0x02325E64 ldmia sp!, {r3, r4, pc} .align 2, 0 _02325EB8: .word ov29_0237CA70 -_02325EBC: .word ov29_02352AF0 +_02325EBC: .word ROLLOUT_DAMAGE_MULT_TABLE _02325EC0: .word ov29_0237CA69 arm_func_end DoMoveDamageMultihitUntilMiss @@ -640,7 +640,7 @@ DoMoveYawn: ; 0x02325EC4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325EFC ; =ov10_022C4860 + ldr r1, _02325EFC ; =YAWN_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -652,7 +652,7 @@ DoMoveYawn: ; 0x02325EC4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325EFC: .word ov10_022C4860 +_02325EFC: .word YAWN_TURN_RANGE arm_func_end DoMoveYawn arm_func_start DoMoveSleep @@ -680,7 +680,7 @@ DoMoveNightmare: ; 0x02325F3C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325F70 ; =ov10_022C4724 + ldr r1, _02325F70 ; =NIGHTMARE_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -691,7 +691,7 @@ DoMoveNightmare: ; 0x02325F3C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325F70: .word ov10_022C4724 +_02325F70: .word NIGHTMARE_TURN_RANGE arm_func_end DoMoveNightmare arm_func_start DoMoveMorningSun @@ -701,7 +701,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02325FB0 ; =ov10_022C4984 + ldr r1, _02325FB0 ; =MORNING_SUN_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -712,7 +712,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325FB0: .word ov10_022C4984 +_02325FB0: .word MORNING_SUN_HP_RESTORATION_TABLE arm_func_end DoMoveMorningSun arm_func_start DoMoveVitalThrow @@ -752,7 +752,7 @@ _02326014: bl IsChargingTwoTurnMove cmp r0, #0 beq _02326050 - ldr r1, _02326080 ; =ov10_022C47E4 + ldr r1, _02326080 ; =DIG_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -778,7 +778,7 @@ _02326074: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232607C: .word 0x00000EC4 -_02326080: .word ov10_022C47E4 +_02326080: .word DIG_DAMAGE_MULTIPLIER _02326084: .word 0x00000CD6 arm_func_end DoMoveDig @@ -890,7 +890,7 @@ DoMoveBubble: ; 0x023261A0 bl DealDamage cmp r0, #0 beq _023261FC - ldr r1, _02326208 ; =ov10_022C462C + ldr r1, _02326208 ; =BUBBLE_LOWER_SPEED_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -908,7 +908,7 @@ _023261FC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326208: .word ov10_022C462C +_02326208: .word BUBBLE_LOWER_SPEED_CHANCE arm_func_end DoMoveBubble arm_func_start DoMoveEncore @@ -1205,7 +1205,7 @@ DoMoveSnore: ; 0x023265A4 bl DealDamage cmp r0, #0 beq _02326634 - ldr r1, _02326640 ; =ov10_022C4600 + ldr r1, _02326640 ; =SNORE_CRINGE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1229,7 +1229,7 @@ _02326634: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326640: .word ov10_022C4600 +_02326640: .word SNORE_CRINGE_CHANCE _02326644: .word 0x00000ECD arm_func_end DoMoveSnore @@ -1260,7 +1260,7 @@ DoMoveDamageCringe30: ; 0x02326670 bl DealDamage cmp r0, #0 beq _023266CC - ldr r1, _023266D8 ; =ov10_022C444C + ldr r1, _023266D8 ; =ROCK_SLIDE_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1278,7 +1278,7 @@ _023266CC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023266D8: .word ov10_022C444C +_023266D8: .word ROCK_SLIDE_CRINGE_CHANCE arm_func_end DoMoveDamageCringe30 arm_func_start DoMoveWeatherBall @@ -1294,7 +1294,7 @@ DoMoveWeatherBall: ; 0x023266DC mov r0, r8 mov r1, r7 bl EndFrozenStatus - ldr ip, _02326748 ; =ov10_022C4B54 + ldr ip, _02326748 ; =WEATHER_BALL_DAMAGE_MULT_TABLE ldr r2, _0232674C ; =WEATHER_BALL_TYPE_TABLE ldr ip, [ip, r4, lsl #2] ldrb r2, [r2, r4] @@ -1311,7 +1311,7 @@ DoMoveWeatherBall: ; 0x023266DC add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326748: .word ov10_022C4B54 +_02326748: .word WEATHER_BALL_DAMAGE_MULT_TABLE _0232674C: .word WEATHER_BALL_TYPE_TABLE arm_func_end DoMoveWeatherBall @@ -1439,7 +1439,7 @@ DoMoveSmokescreen: ; 0x023268CC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02326904 ; =ov10_022C47C4 + ldr r1, _02326904 ; =SMOKESCREEN_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -1451,7 +1451,7 @@ DoMoveSmokescreen: ; 0x023268CC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02326904: .word ov10_022C47C4 +_02326904: .word SMOKESCREEN_TURN_RANGE arm_func_end DoMoveSmokescreen arm_func_start DoMoveMirrorMove @@ -1509,7 +1509,7 @@ DoMoveAuroraBeam: ; 0x02326990 bl DealDamage cmp r0, #0 beq _023269F8 - ldr r1, _02326A04 ; =ov10_022C4428 + ldr r1, _02326A04 ; =AURORA_BEAM_LOWER_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1530,7 +1530,7 @@ _023269F8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326A04: .word ov10_022C4428 +_02326A04: .word AURORA_BEAM_LOWER_ATTACK_CHANCE _02326A08: .word ATK_STAT_IDX arm_func_end DoMoveAuroraBeam @@ -1577,7 +1577,7 @@ DoMoveOctazooka: ; 0x02326A74 bl DealDamage cmp r0, #0 beq _02326AD4 - ldr r1, _02326AE0 ; =ov10_022C4500 + ldr r1, _02326AE0 ; =OCTAZOOKA_LOWER_ACCURACY_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1596,7 +1596,7 @@ _02326AD4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326AE0: .word ov10_022C4500 +_02326AE0: .word OCTAZOOKA_LOWER_ACCURACY_CHANCE _02326AE4: .word ATK_STAT_IDX arm_func_end DoMoveOctazooka @@ -1768,7 +1768,7 @@ DoMoveDamageBurn10FlameWheel: ; 0x02326CC8 bl DealDamage cmp r0, #0 beq _02326D40 - ldr r1, _02326D4C ; =ov10_022C4688 + ldr r1, _02326D4C ; =FLAME_WHEEL_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1787,7 +1787,7 @@ _02326D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326D4C: .word ov10_022C4688 +_02326D4C: .word FLAME_WHEEL_BURN_CHANCE arm_func_end DoMoveDamageBurn10FlameWheel arm_func_start DoMoveDamageBurn10 @@ -1808,7 +1808,7 @@ DoMoveDamageBurn10: ; 0x02326D50 bl DealDamage cmp r0, #0 beq _02326DC8 - ldr r1, _02326DD4 ; =ov10_022C4544 + ldr r1, _02326DD4 ; =FLAMETHROWER_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1827,7 +1827,7 @@ _02326DC8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326DD4: .word ov10_022C4544 +_02326DD4: .word FLAMETHROWER_BURN_CHANCE arm_func_end DoMoveDamageBurn10 arm_func_start DoMoveExpose @@ -1925,7 +1925,7 @@ DoMoveRazorWind: ; 0x02326EB8 bl IsChargingTwoTurnMove cmp r0, #0 beq _02326F14 - ldr r1, _02326F40 ; =ov10_022C48B0 + ldr r1, _02326F40 ; =RAZOR_WIND_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1953,7 +1953,7 @@ _02326F38: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02326F40: .word ov10_022C48B0 +_02326F40: .word RAZOR_WIND_DAMAGE_MULTIPLIER _02326F44: .word 0x00000CCD arm_func_end DoMoveRazorWind @@ -2038,7 +2038,7 @@ DoMoveCrunch: ; 0x02327034 bl DealDamage cmp r0, #0 beq _023270A0 - ldr r1, _023270AC ; =ov10_022C4450 + ldr r1, _023270AC ; =CRUNCH_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2060,7 +2060,7 @@ _023270A0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023270AC: .word ov10_022C4450 +_023270AC: .word CRUNCH_LOWER_DEFENSE_CHANCE _023270B0: .word ATK_STAT_IDX arm_func_end DoMoveCrunch @@ -2076,7 +2076,7 @@ DoMoveDamageCringe20: ; 0x023270B4 bl DealDamage cmp r0, #0 beq _02327110 - ldr r1, _0232711C ; =ov10_022C4534 + ldr r1, _0232711C ; =BITE_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2094,7 +2094,7 @@ _02327110: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232711C: .word ov10_022C4534 +_0232711C: .word BITE_CRINGE_CHANCE arm_func_end DoMoveDamageCringe20 arm_func_start DoMoveDamageParalyze20 @@ -2109,7 +2109,7 @@ DoMoveDamageParalyze20: ; 0x02327120 bl DealDamage cmp r0, #0 beq _0232717C - ldr r1, _02327188 ; =ov10_022C4658 + ldr r1, _02327188 ; =THUNDER_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2127,7 +2127,7 @@ _0232717C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327188: .word ov10_022C4658 +_02327188: .word THUNDER_PARALYZE_CHANCE arm_func_end DoMoveDamageParalyze20 arm_func_start DoMoveEndeavor @@ -2189,7 +2189,7 @@ DoMoveFacade: ; 0x0232724C mov lr, #0x100 ldrb ip, [ip, #0xbf] cmp ip, #0 - ldrne ip, _02327288 ; =ov10_022C4718 + ldrne ip, _02327288 ; =FACADE_DAMAGE_MULTIPLIER str r3, [sp] ldrne lr, [ip] mov r3, lr @@ -2200,7 +2200,7 @@ DoMoveFacade: ; 0x0232724C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02327288: .word ov10_022C4718 +_02327288: .word FACADE_DAMAGE_MULTIPLIER arm_func_end DoMoveFacade arm_func_start DoMoveDamageLowerSpeed20 @@ -2215,7 +2215,7 @@ DoMoveDamageLowerSpeed20: ; 0x0232728C bl DealDamage cmp r0, #0 beq _023272E8 - ldr r1, _023272F4 ; =ov10_022C4514 + ldr r1, _023272F4 ; =CONSTRICT_LOWER_SPEED_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2233,7 +2233,7 @@ _023272E8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023272F4: .word ov10_022C4514 +_023272F4: .word CONSTRICT_LOWER_SPEED_CHANCE arm_func_end DoMoveDamageLowerSpeed20 arm_func_start DoMoveBrickBreak @@ -2311,7 +2311,7 @@ DoMoveFocusPunch: ; 0x023273CC bl IsChargingTwoTurnMove cmp r0, #0 beq _02327428 - ldr r1, _02327454 ; =ov10_022C48B4 + ldr r1, _02327454 ; =FOCUS_PUNCH_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2339,7 +2339,7 @@ _0232744C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02327454: .word ov10_022C48B4 +_02327454: .word FOCUS_PUNCH_DAMAGE_MULTIPLIER arm_func_end DoMoveFocusPunch arm_func_start DoMoveDamageDrain @@ -2468,7 +2468,7 @@ DoMoveReversal: ; 0x02327598 movle r5, #2 movgt r5, #3 _0232761C: - ldr r4, _02327648 ; =ov10_022C4994 + ldr r4, _02327648 ; =REVERSAL_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2480,7 +2480,7 @@ _0232761C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327644: .word 0x000003E7 -_02327648: .word ov10_022C4994 +_02327648: .word REVERSAL_DAMAGE_MULT_TABLE arm_func_end DoMoveReversal arm_func_start DoMoveSmellingSalt @@ -2638,7 +2638,7 @@ DoMoveDamageBoostAllStats: ; 0x02327804 bl DealDamage cmp r0, #0 beq _023278D4 - ldr r1, _023278E0 ; =ov10_022C4488 + ldr r1, _023278E0 ; =SILVER_WIND_BOOST_CHANCE mov r0, r6 ldrsh r1, [r1] mov r4, #1 @@ -2686,7 +2686,7 @@ _023278D4: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023278E0: .word ov10_022C4488 +_023278E0: .word SILVER_WIND_BOOST_CHANCE _023278E4: .word SPATK_STAT_IDX arm_func_end DoMoveDamageBoostAllStats @@ -2697,7 +2697,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02327924 ; =ov10_022C4954 + ldr r1, _02327924 ; =SYNTHESIS_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2708,7 +2708,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02327924: .word ov10_022C4954 +_02327924: .word SYNTHESIS_HP_RESTORATION_TABLE arm_func_end DoMoveSynthesis arm_func_start DoMoveBoostSpeed1 @@ -2759,7 +2759,7 @@ DoMoveSureShot: ; 0x023279AC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _023279E0 ; =ov10_022C4798 + ldr r1, _023279E0 ; =SURE_SHOT_TURN_RANGE mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -2770,7 +2770,7 @@ DoMoveSureShot: ; 0x023279AC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023279E0: .word ov10_022C4798 +_023279E0: .word SURE_SHOT_TURN_RANGE arm_func_end DoMoveSureShot arm_func_start DoMoveCosmicPower @@ -2817,7 +2817,7 @@ DoMoveSkyAttack: ; 0x02327A28 bl DealDamage cmp r0, #0 beq _02327AAC - ldr r1, _02327AEC ; =ov10_022C4538 + ldr r1, _02327AEC ; =SKY_ATTACK_CRINGE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2850,7 +2850,7 @@ _02327ADC: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02327AE8: .word ov10_022C48A8 -_02327AEC: .word ov10_022C4538 +_02327AEC: .word SKY_ATTACK_CRINGE_CHANCE _02327AF0: .word 0x00000CD1 arm_func_end DoMoveSkyAttack @@ -2866,7 +2866,7 @@ DoMoveDamageFreeze15: ; 0x02327AF4 bl DealDamage cmp r0, #0 beq _02327B4C - ldr r1, _02327B58 ; =ov10_022C4634 + ldr r1, _02327B58 ; =POWDER_SNOW_FREEZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2883,7 +2883,7 @@ _02327B4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327B58: .word ov10_022C4634 +_02327B58: .word POWDER_SNOW_FREEZE_CHANCE arm_func_end DoMoveDamageFreeze15 arm_func_start DoMoveMeteorMash @@ -2897,7 +2897,7 @@ DoMoveMeteorMash: ; 0x02327B5C bl DealDamage cmp r0, #0 beq _02327BCC - ldr r1, _02327BD8 ; =ov10_022C4604 + ldr r1, _02327BD8 ; =METEOR_MASH_BOOST_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -2921,7 +2921,7 @@ _02327BCC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327BD8: .word ov10_022C4604 +_02327BD8: .word METEOR_MASH_BOOST_ATTACK_CHANCE _02327BDC: .word ATK_STAT_IDX arm_func_end DoMoveMeteorMash @@ -2955,7 +2955,7 @@ DoMoveDamageConfuse10: ; 0x02327C08 bl DealDamage cmp r0, #0 beq _02327C64 - ldr r1, _02327C70 ; =ov10_022C4690 + ldr r1, _02327C70 ; =PSYBEAM_CONFUSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2973,7 +2973,7 @@ _02327C64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327C70: .word ov10_022C4690 +_02327C70: .word PSYBEAM_CONFUSE_CHANCE arm_func_end DoMoveDamageConfuse10 arm_func_start DoMovePsywave @@ -3122,7 +3122,7 @@ DoMoveWaterSpout: ; 0x02327DE0 movle r5, #2 movgt r5, #3 _02327E64: - ldr r4, _02327E90 ; =ov10_022C49A4 + ldr r4, _02327E90 ; =WATER_SPOUT_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -3134,7 +3134,7 @@ _02327E64: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327E8C: .word 0x000003E7 -_02327E90: .word ov10_022C49A4 +_02327E90: .word WATER_SPOUT_DAMAGE_MULT_TABLE arm_func_end DoMoveWaterSpout arm_func_start DoMovePsychUp diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index 3dbbfa5b..488200f2 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -83,7 +83,7 @@ DoMoveNaturePower: ; 0x02328110 mov r5, r3 bl GetNaturePowerVariant mov r4, r0 - ldr r0, _02328164 ; =ov10_022C4E40 + ldr r0, _02328164 ; =NATURE_POWER_TABLE mov r1, r4, lsl #3 ldrh r1, [r0, r1] add r0, sp, #0 @@ -98,7 +98,7 @@ DoMoveNaturePower: ; 0x02328110 add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328164: .word ov10_022C4E40 +_02328164: .word NATURE_POWER_TABLE _02328168: .word ov10_022C4E44 arm_func_end DoMoveNaturePower @@ -114,7 +114,7 @@ DoMoveDamageParalyze10: ; 0x0232816C bl DealDamage cmp r0, #0 beq _023281C8 - ldr r1, _023281D4 ; =ov10_022C4528 + ldr r1, _023281D4 ; =LICK_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -132,7 +132,7 @@ _023281C8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023281D4: .word ov10_022C4528 +_023281D4: .word LICK_PARALYZE_CHANCE arm_func_end DoMoveDamageParalyze10 arm_func_start DoMoveSelfdestruct @@ -183,7 +183,7 @@ DoMoveShadowBall: ; 0x02328248 bl DealDamage cmp r0, #0 beq _023282B4 - ldr r1, _023282C0 ; =ov10_022C461C + ldr r1, _023282C0 ; =SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -205,7 +205,7 @@ _023282B4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023282C0: .word ov10_022C461C +_023282C0: .word SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE _023282C4: .word SPATK_STAT_IDX arm_func_end DoMoveShadowBall @@ -250,7 +250,7 @@ DoMoveThunderbolt: ; 0x02328328 bl DealDamage cmp r0, #0 beq _02328384 - ldr r1, _02328390 ; =ov10_022C465C + ldr r1, _02328390 ; =THUNDERBOLT_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -268,7 +268,7 @@ _02328384: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328390: .word ov10_022C465C +_02328390: .word THUNDERBOLT_PARALYZE_CHANCE arm_func_end DoMoveThunderbolt arm_func_start DoMoveMist @@ -369,7 +369,7 @@ DoMoveDamageCringe10: ; 0x023284BC bl DealDamage cmp r0, #0 beq _02328518 - ldr r1, _02328524 ; =ov10_022C4448 + ldr r1, _02328524 ; =EXTRASENSORY_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -387,7 +387,7 @@ _02328518: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328524: .word ov10_022C4448 +_02328524: .word EXTRASENSORY_CRINGE_CHANCE arm_func_end DoMoveDamageCringe10 arm_func_start DoMoveSafeguard @@ -671,7 +671,7 @@ DoMoveHeadbutt: ; 0x023288C4 bl DealDamage cmp r0, #0 beq _02328920 - ldr r1, _0232892C ; =ov10_022C4498 + ldr r1, _0232892C ; =HEADBUTT_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -689,7 +689,7 @@ _02328920: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232892C: .word ov10_022C4498 +_0232892C: .word HEADBUTT_CRINGE_CHANCE arm_func_end DoMoveHeadbutt arm_func_start DoMoveDoubleEdge @@ -802,7 +802,7 @@ DoMoveDamagePoison40: ; 0x02328A74 bl DealDamage cmp r0, #0 beq _02328AD0 - ldr r1, _02328ADC ; =ov10_022C451C + ldr r1, _02328ADC ; =SMOG_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -820,7 +820,7 @@ _02328AD0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328ADC: .word ov10_022C451C +_02328ADC: .word SMOG_POISON_CHANCE arm_func_end DoMoveDamagePoison40 arm_func_start DoMoveGrowth @@ -854,7 +854,7 @@ DoMoveSacredFire: ; 0x02328B00 bl DealDamage cmp r0, #0 beq _02328B78 - ldr r1, _02328B84 ; =ov10_022C44A0 + ldr r1, _02328B84 ; =SACRED_FIRE_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -873,7 +873,7 @@ _02328B78: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328B84: .word ov10_022C44A0 +_02328B84: .word SACRED_FIRE_BURN_CHANCE arm_func_end DoMoveSacredFire arm_func_start DoMoveOhko @@ -961,7 +961,7 @@ DoMoveSolarBeam: ; 0x02328C74 _02328CAC: cmp r0, #0 beq _02328D0C - ldr r0, _02328D3C ; =ov10_022C48A4 + ldr r0, _02328D3C ; =SOLARBEAM_DAMAGE_MULTIPLIER cmp r8, #2 ldr r3, [r0] beq _02328CD4 @@ -1000,7 +1000,7 @@ _02328D30: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328D3C: .word ov10_022C48A4 +_02328D3C: .word SOLARBEAM_DAMAGE_MULTIPLIER _02328D40: .word 0x00000CD2 arm_func_end DoMoveSolarBeam @@ -1032,7 +1032,7 @@ DoMoveSonicBoom: ; 0x02328D44 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _02328DE0 ; =ov10_022C4568 + ldr r2, _02328DE0 ; =SONICBOOM_FIXED_DAMAGE mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -1046,7 +1046,7 @@ DoMoveSonicBoom: ; 0x02328D44 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328DE0: .word ov10_022C4568 +_02328DE0: .word SONICBOOM_FIXED_DAMAGE arm_func_end DoMoveSonicBoom arm_func_start DoMoveFly @@ -1060,7 +1060,7 @@ DoMoveFly: ; 0x02328DE4 bl IsChargingTwoTurnMove cmp r0, #0 beq _02328E40 - ldr r1, _02328E6C ; =ov10_022C48C0 + ldr r1, _02328E6C ; =FLY_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1088,7 +1088,7 @@ _02328E64: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328E6C: .word ov10_022C48C0 +_02328E6C: .word FLY_DAMAGE_MULTIPLIER _02328E70: .word 0x00000CD3 arm_func_end DoMoveFly @@ -1142,7 +1142,7 @@ _02328F0C: bl IsChargingTwoTurnMove cmp r0, #0 beq _02328F58 - ldr r1, _02328F8C ; =ov10_022C47E8 + ldr r1, _02328F8C ; =DIVE_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -1172,7 +1172,7 @@ _02328F7C: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02328F88: .word 0x00000ED8 -_02328F8C: .word ov10_022C47E8 +_02328F8C: .word DIVE_DAMAGE_MULTIPLIER _02328F90: .word 0x00000CD5 arm_func_end DoMoveDive @@ -1188,7 +1188,7 @@ DoMoveWaterfall: ; 0x02328F94 bl DealDamage cmp r0, #0 beq _02328FF0 - ldr r1, _02328FFC ; =ov10_022C4424 + ldr r1, _02328FFC ; =WATERFALL_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1206,7 +1206,7 @@ _02328FF0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328FFC: .word ov10_022C4424 +_02328FFC: .word WATERFALL_CRINGE_CHANCE arm_func_end DoMoveWaterfall arm_func_start DoMoveDamageLowerAccuracy40 @@ -1221,7 +1221,7 @@ DoMoveDamageLowerAccuracy40: ; 0x02329000 bl DealDamage cmp r0, #0 beq _02329060 - ldr r1, _0232906C ; =ov10_022C4484 + ldr r1, _0232906C ; =MUDDY_WATER_LOWER_ACCURACY_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1240,7 +1240,7 @@ _02329060: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232906C: .word ov10_022C4484 +_0232906C: .word MUDDY_WATER_LOWER_ACCURACY_CHANCE _02329070: .word ATK_STAT_IDX arm_func_end DoMoveDamageLowerAccuracy40 @@ -1293,7 +1293,7 @@ DoMoveTwister: ; 0x023290CC bl DealDamage cmp r0, #0 beq _0232914C - ldr r1, _02329158 ; =ov10_022C4668 + ldr r1, _02329158 ; =TWISTER_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1311,7 +1311,7 @@ _0232914C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329158: .word ov10_022C4668 +_02329158: .word TWISTER_CRINGE_CHANCE arm_func_end DoMoveTwister arm_func_start DoMoveTwineedle @@ -1336,7 +1336,7 @@ DoMoveTwineedle: ; 0x0232915C ldr r0, [r0] cmp r0, #2 bne _023291DC - ldr r1, _023291F0 ; =ov10_022C4444 + ldr r1, _023291F0 ; =TWINEEDLE_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1355,7 +1355,7 @@ _023291DC: .align 2, 0 _023291E8: .word ov29_0237CA6B _023291EC: .word ov29_0237CA78 -_023291F0: .word ov10_022C4444 +_023291F0: .word TWINEEDLE_POISON_CHANCE arm_func_end DoMoveTwineedle arm_func_start DoMoveRecoverHpTeam @@ -1518,7 +1518,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02329434 ; =ov10_022C4974 + ldr r1, _02329434 ; =MOONLIGHT_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -1529,7 +1529,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02329434: .word ov10_022C4974 +_02329434: .word MOONLIGHT_HP_RESTORATION_TABLE arm_func_end DoMoveMoonlight arm_func_start DoMoveHornDrill @@ -1768,7 +1768,7 @@ DoMoveThundershock: ; 0x02329710 bl DealDamage cmp r0, #0 beq _0232976C - ldr r1, _02329778 ; =ov10_022C4490 + ldr r1, _02329778 ; =THUNDERSHOCK_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1786,7 +1786,7 @@ _0232976C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329778: .word ov10_022C4490 +_02329778: .word THUNDERSHOCK_PARALYZE_CHANCE arm_func_end DoMoveThundershock arm_func_start DoMoveThunderWave @@ -1894,7 +1894,7 @@ DoMovePoisonFang: ; 0x02329898 bl DealDamage cmp r0, #0 beq _023298F4 - ldr r1, _02329900 ; =ov10_022C4644 + ldr r1, _02329900 ; =POISON_FANG_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1912,7 +1912,7 @@ _023298F4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329900: .word ov10_022C4644 +_02329900: .word POISON_FANG_POISON_CHANCE arm_func_end DoMovePoisonFang arm_func_start DoMoveDamagePoison18 @@ -1927,7 +1927,7 @@ DoMoveDamagePoison18: ; 0x02329904 bl DealDamage cmp r0, #0 beq _02329960 - ldr r1, _0232996C ; =ov10_022C463C + ldr r1, _0232996C ; =POISON_STING_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1945,7 +1945,7 @@ _02329960: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232996C: .word ov10_022C463C +_0232996C: .word POISON_STING_POISON_CHANCE arm_func_end DoMoveDamagePoison18 arm_func_start DoMoveJumpKick @@ -2043,7 +2043,7 @@ DoMoveBounce: ; 0x02329A9C bl IsChargingTwoTurnMove cmp r0, #0 beq _02329B2C - ldr r1, _02329B5C ; =ov10_022C47EC + ldr r1, _02329B5C ; =BOUNCE_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -2052,7 +2052,7 @@ DoMoveBounce: ; 0x02329A9C bl DealDamage cmp r0, #0 beq _02329B20 - ldr r1, _02329B60 ; =ov10_022C4494 + ldr r1, _02329B60 ; =BOUNCE_PARALYZE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2084,8 +2084,8 @@ _02329B50: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02329B5C: .word ov10_022C47EC -_02329B60: .word ov10_022C4494 +_02329B5C: .word BOUNCE_DAMAGE_MULTIPLIER +_02329B60: .word BOUNCE_PARALYZE_CHANCE _02329B64: .word 0x00000CD4 arm_func_end DoMoveBounce @@ -2183,7 +2183,7 @@ DoMoveTriAttack: ; 0x02329C94 bl DealDamage cmp r0, #0 beq _02329D40 - ldr r1, _02329D4C ; =ov10_022C4694 + ldr r1, _02329D4C ; =TRI_ATTACK_STATUS_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2224,7 +2224,7 @@ _02329D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329D4C: .word ov10_022C4694 +_02329D4C: .word TRI_ATTACK_STATUS_CHANCE arm_func_end DoMoveTriAttack arm_func_start DoMoveSwapItems @@ -2665,7 +2665,7 @@ DoMoveFakeOut: ; 0x0232A2BC bl DealDamage cmp r0, #0 beq _0232A318 - ldr r1, _0232A324 ; =ov10_022C4670 + ldr r1, _0232A324 ; =FAKE_OUT_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2683,7 +2683,7 @@ _0232A318: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232A324: .word ov10_022C4670 +_0232A324: .word FAKE_OUT_CRINGE_CHANCE arm_func_end DoMoveFakeOut arm_func_start DoMoveSleepTalk diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index de0149fa..46b95571 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -248,7 +248,7 @@ ActivateSportCondition: ; 0x0233544C cmp r0, #0 mov r0, #0 bne _02335488 - ldr r1, _023354B4 ; =ov10_022C478C + ldr r1, _023354B4 ; =SPORT_CONDITION_TURN_RANGE mov r2, r0 bl CalcStatusDuration ldr r1, _023354B8 ; =ov29_02353538 @@ -260,7 +260,7 @@ ActivateSportCondition: ; 0x0233544C bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} _02335488: - ldr r1, _023354B4 ; =ov10_022C478C + ldr r1, _023354B4 ; =SPORT_CONDITION_TURN_RANGE mov r2, r0 bl CalcStatusDuration ldr r1, _023354B8 ; =ov29_02353538 @@ -272,7 +272,7 @@ _02335488: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} .align 2, 0 -_023354B4: .word ov10_022C478C +_023354B4: .word SPORT_CONDITION_TURN_RANGE _023354B8: .word ov29_02353538 _023354BC: .word 0x00000CDA _023354C0: .word 0x00000CDB diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 1d024e50..27eb6afd 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -690,7 +690,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _023460D8 ; =ov10_022C4474 + ldr r0, _023460D8 ; =UNOWN_STONE_DROP_CHANCE ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -709,7 +709,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023460D8: .word ov10_022C4474 +_023460D8: .word UNOWN_STONE_DROP_CHANCE arm_func_end TryGenerateUnownStoneDrop arm_func_start ov29_023460DC diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index 3ec3172c..0b6d9f93 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -3560,8 +3560,8 @@ ov29_02352A6C: ov29_02352A8C: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov29_02352AAC -ov29_02352AAC: + .global TWO_TURN_MOVES_AND_STATUSES +TWO_TURN_MOVES_AND_STATUSES: .byte 0x97, 0x00, 0x02, 0x00, 0x64, 0x00, 0x03, 0x00, 0x3C, 0x00, 0x04, 0x00, 0x4B, 0x00, 0x05, 0x00 .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 @@ -3575,8 +3575,8 @@ SPATK_STAT_IDX: .global ATK_STAT_IDX ATK_STAT_IDX: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_02352AF0 -ov29_02352AF0: + .global ROLLOUT_DAMAGE_MULT_TABLE +ROLLOUT_DAMAGE_MULT_TABLE: .byte 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 diff --git a/asm/overlay_30.s b/asm/overlay_30.s index 852e9991..fc737a6b 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -352,7 +352,7 @@ WriteQuicksaveData: ; 0x02382C6C mov r2, #4 str r3, [sp] bl ov30_02385C54 - ldr r1, _02382D6C ; =ov30_02386080 + ldr r1, _02382D6C ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CE0 ldr r1, _02382D70 ; =ov29_02353538 @@ -362,7 +362,7 @@ WriteQuicksaveData: ; 0x02382C6C add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385C54 - ldr r1, _02382D6C ; =ov30_02386080 + ldr r1, _02382D6C ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CE0 ldr r2, _02382D70 ; =ov29_02353538 @@ -398,7 +398,7 @@ _02382CF8: bl ov30_02382FB8 add r0, sp, #4 bl ov30_02383084 - ldr r1, _02382D7C ; =ov30_0238608C + ldr r1, _02382D7C ; =OVERLAY30_JP_STRING_2 add r0, sp, #4 bl ov30_02385CE0 add r0, sp, #4 @@ -406,11 +406,11 @@ _02382CF8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02382D6C: .word ov30_02386080 +_02382D6C: .word OVERLAY30_JP_STRING_1 _02382D70: .word ov29_02353538 _02382D74: .word 0x0002C9E6 _02382D78: .word 0x0002C9EA -_02382D7C: .word ov30_0238608C +_02382D7C: .word OVERLAY30_JP_STRING_2 arm_func_end WriteQuicksaveData arm_func_start ov31_02382D80 @@ -426,7 +426,7 @@ _02382D98: add r2, r2, #1 cmp r2, #5 blt _02382D98 - ldr r1, _02382E8C ; =ov30_02386080 + ldr r1, _02382E8C ; =OVERLAY30_JP_STRING_1 mov r0, sl bl ov30_02385CE0 mov sb, #0 @@ -495,7 +495,7 @@ _02382E78: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382E8C: .word ov30_02386080 +_02382E8C: .word OVERLAY30_JP_STRING_1 _02382E90: .word ov29_02353538 arm_func_end ov30_02382E18 @@ -512,7 +512,7 @@ _02382EAC: add r2, r2, #1 cmp r2, #7 blt _02382EAC - ldr r1, _02382FB0 ; =ov30_02386080 + ldr r1, _02382FB0 ; =OVERLAY30_JP_STRING_1 mov r0, sl bl ov30_02385CE0 mov sb, #0 @@ -577,7 +577,7 @@ _02382F9C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382FB0: .word ov30_02386080 +_02382FB0: .word OVERLAY30_JP_STRING_1 _02382FB4: .word ov29_02353538 arm_func_end ov30_02382E94 @@ -585,7 +585,7 @@ _02382FB4: .word ov29_02353538 ov30_02382FB8: ; 0x02382FB8 stmdb sp!, {r3, r4, r5, lr} ldr r2, _0238307C ; =ov29_02353538 - ldr r1, _02383080 ; =ov30_02386080 + ldr r1, _02383080 ; =OVERLAY30_JP_STRING_1 ldr r2, [r2] mov r5, r0 add r2, r2, #0x2c @@ -635,13 +635,13 @@ _02383034: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0238307C: .word ov29_02353538 -_02383080: .word ov30_02386080 +_02383080: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02382FB8 arm_func_start ov30_02383084 ov30_02383084: ; 0x02383084 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _023831E0 ; =ov30_02386080 + ldr r1, _023831E0 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CE0 ldr r1, _023831E4 ; =ov29_02353538 @@ -730,7 +730,7 @@ _023831B8: blt _023831B8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023831E0: .word ov30_02386080 +_023831E0: .word OVERLAY30_JP_STRING_1 _023831E4: .word ov29_02353538 arm_func_end ov30_02383084 @@ -1437,7 +1437,7 @@ _02383C4C: arm_func_start ov30_02383C70 ov30_02383C70: ; 0x02383C70 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384090 ; =ov30_02386080 + ldr r1, _02384090 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CE0 ldr r1, _02384094 ; =ov29_02353538 @@ -1708,7 +1708,7 @@ _02383FE8: bl ov30_02385D34 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384090: .word ov30_02386080 +_02384090: .word OVERLAY30_JP_STRING_1 _02384094: .word ov29_02353538 _02384098: .word 0x00012AFE arm_func_end ov30_02383C70 @@ -1716,7 +1716,7 @@ _02384098: .word 0x00012AFE arm_func_start ov30_0238409C ov30_0238409C: ; 0x0238409C stmdb sp!, {r4, lr} - ldr r1, _02384200 ; =ov30_02386080 + ldr r1, _02384200 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CE0 ldr r1, _02384204 ; =ov29_02353538 @@ -1805,7 +1805,7 @@ ov30_0238409C: ; 0x0238409C bl ov30_02385DD4 ldmia sp!, {r4, pc} .align 2, 0 -_02384200: .word ov30_02386080 +_02384200: .word OVERLAY30_JP_STRING_1 _02384204: .word ov29_02353538 arm_func_end ov30_0238409C @@ -1894,7 +1894,7 @@ ov30_023842F4: ; 0x023842F4 add r1, sp, #0 mov r2, #4 bl ov30_02385CA4 - ldr r1, _023843F0 ; =ov30_02386080 + ldr r1, _023843F0 ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CF0 ldr r1, _023843F4 ; =ov29_02353538 @@ -1904,7 +1904,7 @@ ov30_023842F4: ; 0x023842F4 add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385CA4 - ldr r1, _023843F0 ; =ov30_02386080 + ldr r1, _023843F0 ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 @@ -1939,7 +1939,7 @@ _02384378: bl ov30_02384C6C add r0, sp, #4 bl ov30_02384CD4 - ldr r1, _023843FC ; =ov30_0238608C + ldr r1, _023843FC ; =OVERLAY30_JP_STRING_2 add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 @@ -1948,16 +1948,16 @@ _02384378: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023843F0: .word ov30_02386080 +_023843F0: .word OVERLAY30_JP_STRING_1 _023843F4: .word ov29_02353538 _023843F8: .word 0x0002C9E6 -_023843FC: .word ov30_0238608C +_023843FC: .word OVERLAY30_JP_STRING_2 arm_func_end ov30_023842F4 arm_func_start ov30_02384400 ov30_02384400: ; 0x02384400 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384830 ; =ov30_02386080 + ldr r1, _02384830 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CF0 mov r0, sl @@ -2232,7 +2232,7 @@ _0238477C: strh r0, [r2, r1] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384830: .word ov30_02386080 +_02384830: .word OVERLAY30_JP_STRING_1 _02384834: .word ov29_02353538 _02384838: .word 0x00012AFE arm_func_end ov30_02384400 @@ -2269,7 +2269,7 @@ ov30_0238483C: ; 0x0238483C arm_func_start ov30_023848A0 ov30_023848A0: ; 0x023848A0 stmdb sp!, {r4, lr} - ldr r1, _02384A18 ; =ov30_02386080 + ldr r1, _02384A18 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CF0 ldr r1, _02384A1C ; =ov29_02353538 @@ -2363,7 +2363,7 @@ ov30_023848A0: ; 0x023848A0 strb r0, [r1, #0x248] ldmia sp!, {r4, pc} .align 2, 0 -_02384A18: .word ov30_02386080 +_02384A18: .word OVERLAY30_JP_STRING_1 _02384A1C: .word ov29_02353538 arm_func_end ov30_023848A0 @@ -2407,7 +2407,7 @@ ov30_02384A94: ; 0x02384A94 sub sp, sp, #0xc mov r7, r0 bl ov29_02344B1C - ldr r1, _02384B20 ; =ov30_02386080 + ldr r1, _02384B20 ; =OVERLAY30_JP_STRING_1 mov r0, r7 bl ov30_02385CF0 mov r6, #0 @@ -2441,7 +2441,7 @@ _02384B08: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02384B20: .word ov30_02386080 +_02384B20: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02384A94 arm_func_start ov30_02384B24 @@ -2476,7 +2476,7 @@ ov30_02384B24: ; 0x02384B24 ov30_02384B84: ; 0x02384B84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r1, _02384C68 ; =ov30_02386080 + ldr r1, _02384C68 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CF0 mov sb, #0 @@ -2534,14 +2534,14 @@ _02384C54: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384C68: .word ov30_02386080 +_02384C68: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02384B84 arm_func_start ov30_02384C6C ov30_02384C6C: ; 0x02384C6C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r1, _02384CCC ; =ov30_02386080 + ldr r1, _02384CCC ; =OVERLAY30_JP_STRING_1 mov r6, r0 bl ov30_02385CF0 mov r0, r6 @@ -2565,14 +2565,14 @@ _02384CC4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02384CCC: .word ov30_02386080 +_02384CCC: .word OVERLAY30_JP_STRING_1 _02384CD0: .word ov29_02353538 arm_func_end ov30_02384C6C arm_func_start ov30_02384CD4 ov30_02384CD4: ; 0x02384CD4 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _02384E20 ; =ov30_02386080 + ldr r1, _02384E20 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CF0 mov r0, r4 @@ -2657,7 +2657,7 @@ _02384E00: blt _02384E00 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02384E20: .word ov30_02386080 +_02384E20: .word OVERLAY30_JP_STRING_1 _02384E24: .word ov29_02353538 arm_func_end ov30_02384CD4 @@ -4008,11 +4008,11 @@ _0238607C: .word ov30_02385CA4 arm_func_end ov30_02386074 ; 0x02386080 - .global ov30_02386080 -ov30_02386080: + .global OVERLAY30_JP_STRING_1 +OVERLAY30_JP_STRING_1: .byte 0x82, 0xDD, 0x82, 0xB3, 0x82, 0xAB, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 - .global ov30_0238608C -ov30_0238608C: + .global OVERLAY30_JP_STRING_2 +OVERLAY30_JP_STRING_2: .byte 0x82, 0xE2, 0x82, 0xE6 .byte 0x82, 0xA2, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index e2daa2da..731da6c4 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -6,7 +6,7 @@ arm_func_start EntryOverlay31 EntryOverlay31: ; 0x02382820 stmdb sp!, {r3, lr} - ldr r0, _0238285C ; =ov31_02389DB4 + ldr r0, _0238285C ; =DUNGEON_D_BOX_LAYOUT_3 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} @@ -21,7 +21,7 @@ EntryOverlay31: ; 0x02382820 str r0, [r1, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0238285C: .word ov31_02389DB4 +_0238285C: .word DUNGEON_D_BOX_LAYOUT_3 _02382860: .word ov31_0238A260 arm_func_end EntryOverlay31 @@ -300,22 +300,22 @@ _02382BEC: str r1, [sp, #0x64] bl Arm9LoadUnkFieldNa0x2029EC8 str r0, [sp, #4] - ldr r0, _02382D90 ; =ov31_02389D94 + ldr r0, _02382D90 ; =DUNGEON_D_BOX_LAYOUT_1 ldr r1, _02382D94 ; =0x00000233 - ldr r3, _02382D98 ; =ov31_02389DD4 + ldr r3, _02382D98 ; =DUNGEON_MAIN_MENU add r2, sp, #4 bl sub_0202A5CC ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382D9C ; =ov31_02382864 ldr r2, [r2] strb r0, [r2] - ldr r0, _02382DA0 ; =ov31_02389DC4 + ldr r0, _02382DA0 ; =DUNGEON_D_BOX_LAYOUT_4 bl sub_0202F8C4 ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382DA4 ; =DungeonMenuSwitch ldr r2, [r2] strb r0, [r2, #2] - ldr r0, _02382DA8 ; =ov31_02389DA4 + ldr r0, _02382DA8 ; =DUNGEON_D_BOX_LAYOUT_2 bl sub_0202F8C4 ldr r1, _02382D8C ; =ov31_0238A260 ldr r2, [r1] @@ -404,13 +404,13 @@ _02382D84: ldmia sp!, {pc} .align 2, 0 _02382D8C: .word ov31_0238A260 -_02382D90: .word ov31_02389D94 +_02382D90: .word DUNGEON_D_BOX_LAYOUT_1 _02382D94: .word 0x00000233 -_02382D98: .word ov31_02389DD4 +_02382D98: .word DUNGEON_MAIN_MENU _02382D9C: .word ov31_02382864 -_02382DA0: .word ov31_02389DC4 +_02382DA0: .word DUNGEON_D_BOX_LAYOUT_4 _02382DA4: .word DungeonMenuSwitch -_02382DA8: .word ov31_02389DA4 +_02382DA8: .word DUNGEON_D_BOX_LAYOUT_2 arm_func_end ov31_02382B54 arm_func_start ov31_02382DAC @@ -511,7 +511,7 @@ _02382ED0: .word ov31_0238A2A0 ov31_02382ED4: ; 0x02382ED4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _02382F60 ; =ov31_02389E30 + ldr r0, _02382F60 ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -546,7 +546,7 @@ _02382F50: str r4, [r0, #0x14] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02382F60: .word ov31_02389E30 +_02382F60: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 _02382F64: .word ov31_0238A2A0 arm_func_end ov31_02382ED4 @@ -595,8 +595,8 @@ _02382FDC: ; jump table b _0238320C ; case 5 _02382FF4: ldr r2, [r1, #0x14] - ldr r3, _0238321C ; =ov31_02389E70 - ldr r0, _02383220 ; =ov31_02389E60 + ldr r3, _0238321C ; =DUNGEON_SUBMENU_1 + ldr r0, _02383220 ; =DUNGEON_D_BOX_LAYOUT_7 add r3, r3, r2, lsl #5 ldr r1, _02383224 ; =0x00400013 mov r2, #0 @@ -609,7 +609,7 @@ _02382FF4: ldr r0, [r1, #4] mov r4, #0 ldr r1, [r0, #0x14] - ldr r0, _0238322C ; =ov31_02389E50 + ldr r0, _0238322C ; =DUNGEON_D_BOX_LAYOUT_6 mov r1, r1, lsl #2 ldrh r3, [r3, r1] str r2, [sp, #0xac] @@ -707,7 +707,7 @@ _02383170: mov r1, r1, lsl #2 ldrh r1, [r0, r1] mov ip, #1 - ldr r0, _0238323C ; =ov31_02389E40 + ldr r0, _0238323C ; =DUNGEON_D_BOX_LAYOUT_5 strh r1, [sp, #0x10] str ip, [sp] ldr r1, _02383240 ; =0x00001812 @@ -742,15 +742,15 @@ _02383210: ldmia sp!, {r4, pc} .align 2, 0 _02383218: .word ov31_0238A2A0 -_0238321C: .word ov31_02389E70 -_02383220: .word ov31_02389E60 +_0238321C: .word DUNGEON_SUBMENU_1 +_02383220: .word DUNGEON_D_BOX_LAYOUT_7 _02383224: .word 0x00400013 _02383228: .word ov31_02389E22 -_0238322C: .word ov31_02389E50 +_0238322C: .word DUNGEON_D_BOX_LAYOUT_6 _02383230: .word 0x80000813 _02383234: .word ov31_02382F68 _02383238: .word ov29_0237C91C -_0238323C: .word ov31_02389E40 +_0238323C: .word DUNGEON_D_BOX_LAYOUT_5 _02383240: .word 0x00001812 _02383244: .word ov31_02383248 arm_func_end ov31_02382FBC @@ -759,7 +759,7 @@ _02383244: .word ov31_02383248 ov31_02383248: ; 0x02383248 stmdb sp!, {r4, lr} ldr r1, _02383284 ; =ov31_0238A2A0 - ldr r2, _02383288 ; =ov31_02389E20 + ldr r2, _02383288 ; =OVERLAY31_UNKNOWN_STRING_IDS ldr r1, [r1, #4] mov r4, r0 ldr r0, [r1, #0x14] @@ -774,7 +774,7 @@ ov31_02383248: ; 0x02383248 ldmia sp!, {r4, pc} .align 2, 0 _02383284: .word ov31_0238A2A0 -_02383288: .word ov31_02389E20 +_02383288: .word OVERLAY31_UNKNOWN_STRING_IDS arm_func_end ov31_02383248 arm_func_start ov31_0238328C @@ -1003,7 +1003,7 @@ _02383528: moveq r0, #0 tst r0, #0xff beq _02383590 - ldr r2, _0238364C ; =ov31_02389EF0 + ldr r2, _0238364C ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 mov r5, #1 mov r0, r8 mov r3, r4 @@ -1067,7 +1067,7 @@ _02383638: .align 2, 0 _02383644: .word ov31_0238A26C _02383648: .word BAG_ITEMS_PTR_MIRROR -_0238364C: .word ov31_02389EF0 +_0238364C: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 _02383650: .word ov31_02389F5C _02383654: .word ov29_02353538 arm_func_end ov31_02383478 @@ -1107,7 +1107,7 @@ ov31_0238367C: ; 0x0238367C str r2, [sp, #0x38] str lr, [sp] ldrsh r4, [r0, #4] - ldr r0, _02383728 ; =ov31_02389EFC + ldr r0, _02383728 ; =DUNGEON_D_BOX_LAYOUT_8 add ip, r4, #0xd1 add r4, ip, #0x2900 mov ip, r4, lsl #0x10 @@ -1132,7 +1132,7 @@ _023836F0: .align 2, 0 _02383720: .word 0x00001013 _02383724: .word 0x000008E4 -_02383728: .word ov31_02389EFC +_02383728: .word DUNGEON_D_BOX_LAYOUT_8 arm_func_end ov31_0238367C arm_func_start ov31_0238372C @@ -1360,7 +1360,7 @@ _02383A1C: mov r0, #3 bl Arm9LoadUnkFieldNa0x2029EC8 mov r1, r0 - ldr r0, _0238489C ; =ov31_02389F64 + ldr r0, _0238489C ; =OVERLAY31_JP_STRING bl DebugPrint0 bl GetNbItemsInBag ldr r2, _02384898 ; =ov31_0238A26C @@ -1538,7 +1538,7 @@ _02383C44: add r1, r1, #0x1000 strb r0, [r1, #0x193] beq _02383CEC - ldr r0, _023848B0 ; =ov31_02389F1C + ldr r0, _023848B0 ; =DUNGEON_D_BOX_LAYOUT_10 ldr r1, _023848B4 ; =ov31_02383854 bl sub_0202F8C4 ldr r1, _02384898 ; =ov31_0238A26C @@ -1547,7 +1547,7 @@ _02383C44: strb r0, [r1, #0x194] b _02383D78 _02383CEC: - ldr r0, _023848B8 ; =ov31_02389F2C + ldr r0, _023848B8 ; =DUNGEON_D_BOX_LAYOUT_11 mov r1, #0 bl sub_0202F8C4 ldr r2, _02384898 ; =ov31_0238A26C @@ -1573,7 +1573,7 @@ _02383D1C: add r2, sp, #0x500 str r4, [sp, #8] mov r4, #0 - ldr r0, _023848C0 ; =ov31_02389F3C + ldr r0, _023848C0 ; =DUNGEON_D_BOX_LAYOUT_12 ldr r1, _023848C4 ; =0x00400813 ldr r3, _023848AC ; =ov31_02383478 add r2, r2, #0x9c @@ -2347,16 +2347,16 @@ _02384860: b _02384908 .align 2, 0 _02384898: .word ov31_0238A26C -_0238489C: .word ov31_02389F64 +_0238489C: .word OVERLAY31_JP_STRING _023848A0: .word 0x000008E5 _023848A4: .word BAG_ITEMS_PTR_MIRROR _023848A8: .word ov29_02353538 _023848AC: .word ov31_02383478 -_023848B0: .word ov31_02389F1C +_023848B0: .word DUNGEON_D_BOX_LAYOUT_10 _023848B4: .word ov31_02383854 -_023848B8: .word ov31_02389F2C +_023848B8: .word DUNGEON_D_BOX_LAYOUT_11 _023848BC: .word 0x000008E3 -_023848C0: .word ov31_02389F3C +_023848C0: .word DUNGEON_D_BOX_LAYOUT_12 _023848C4: .word 0x00400813 _023848C8: .word 0x000008E7 _023848CC: .word ov31_02389F5C @@ -2677,8 +2677,8 @@ _02384C9C: ldr r1, _02385130 ; =0x00000213 add r3, r3, #0x1000 cmp r0, #0 - ldrne r0, _02385134 ; =ov31_02389F4C - ldreq r0, _02385138 ; =ov31_02389F0C + ldrne r0, _02385134 ; =DUNGEON_D_BOX_LAYOUT_13 + ldreq r0, _02385138 ; =DUNGEON_D_BOX_LAYOUT_9 bl sub_0202A5CC ldr r4, _02384898 ; =ov31_0238A26C mov r8, #0x14 @@ -2943,8 +2943,8 @@ _0238511C: _02385128: .word ov29_0237C91C _0238512C: .word 0x000008E8 _02385130: .word 0x00000213 -_02385134: .word ov31_02389F4C -_02385138: .word ov31_02389F0C +_02385134: .word DUNGEON_D_BOX_LAYOUT_13 +_02385138: .word DUNGEON_D_BOX_LAYOUT_9 arm_func_end ov31_023838E4 arm_func_start ov31_0238513C @@ -3174,7 +3174,7 @@ HandleMovesMenu: ; 0x02385404 ldr r0, [sp, #0x154] cmp r0, #1 bne _0238547C - ldr r0, _02385F74 ; =ov31_02389F88 + ldr r0, _02385F74 ; =DUNGEON_D_BOX_LAYOUT_14 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3188,7 +3188,7 @@ HandleMovesMenu: ; 0x02385404 bl sub_0202F23C b _023854AC _0238547C: - ldr r0, _02385F80 ; =ov31_02389FA8 + ldr r0, _02385F80 ; =DUNGEON_D_BOX_LAYOUT_16 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3750,7 +3750,7 @@ _02385C60: cmp r3, #0 moveq r1, #3 streqb r1, [r0] - ldr r0, _02385F90 ; =ov31_02389F98 + ldr r0, _02385F90 ; =DUNGEON_D_BOX_LAYOUT_15 ldr r1, _02385F94 ; =0x80000213 add r2, sp, #0x3c add r3, sp, #0xd4 @@ -3964,14 +3964,14 @@ _02385F50: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02385F70: .word ov31_0238A270 -_02385F74: .word ov31_02389F88 +_02385F74: .word DUNGEON_D_BOX_LAYOUT_14 _02385F78: .word 0x00003FCD _02385F7C: .word 0x00000404 -_02385F80: .word ov31_02389FA8 +_02385F80: .word DUNGEON_D_BOX_LAYOUT_16 _02385F84: .word 0x00003FCC _02385F88: .word ov29_02353538 _02385F8C: .word 0x000008DC -_02385F90: .word ov31_02389F98 +_02385F90: .word DUNGEON_D_BOX_LAYOUT_15 _02385F94: .word 0x80000213 _02385F98: .word 0x0000099B _02385F9C: .word 0x000009A8 @@ -4564,7 +4564,7 @@ _0238674C: strh r0, [fp, r1] add r0, fp, r2, lsl #3 str r8, [r0, #4] - ldr r0, _02386B18 ; =ov31_02389F98 + ldr r0, _02386B18 ; =DUNGEON_D_BOX_LAYOUT_15 ldr r1, _02386B1C ; =0x00000213 add r2, sp, #0x24 mov r3, fp @@ -4817,7 +4817,7 @@ _02386AE8: _02386B0C: .word ov31_0238A270 _02386B10: .word ov29_0235352C _02386B14: .word 0x000008DC -_02386B18: .word ov31_02389F98 +_02386B18: .word DUNGEON_D_BOX_LAYOUT_15 _02386B1C: .word 0x00000213 _02386B20: .word 0x000008D6 _02386B24: .word 0x000008D7 @@ -4929,7 +4929,7 @@ ov31_02386C6C: ; 0x02386C6C str r5, [r0, #0x64] _02386C90: bl ov00_022EA62C - ldr r0, _02386F10 ; =ov31_02389FC8 + ldr r0, _02386F10 ; =DUNGEON_D_BOX_LAYOUT_18 ldr r1, _02386F14 ; =ov31_02386B28 bl sub_0202F8C4 ldr r1, _02386F0C ; =ov31_0238A27C @@ -4975,7 +4975,7 @@ _02386CF0: add r1, r0, #0x58 bl ov31_0238513C ldr r1, _02386F0C ; =ov31_0238A27C - ldr r0, _02386F18 ; =ov31_02389FB8 + ldr r0, _02386F18 ; =DUNGEON_D_BOX_LAYOUT_17 ldr r3, [r1] ldr r1, _02386F1C ; =0x00000213 add r4, r3, #0x58 @@ -5026,7 +5026,7 @@ _02386D70: str r3, [sp, #0x1c] str r2, [sp] ldrb r2, [r0] - ldr r0, _02386F24 ; =ov31_02389FD8 + ldr r0, _02386F24 ; =DUNGEON_D_BOX_LAYOUT_19 sub r3, r1, #0x740 add r2, r2, #0xda add r2, r2, #0x3400 @@ -5097,12 +5097,12 @@ _02386EF8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02386F0C: .word ov31_0238A27C -_02386F10: .word ov31_02389FC8 +_02386F10: .word DUNGEON_D_BOX_LAYOUT_18 _02386F14: .word ov31_02386B28 -_02386F18: .word ov31_02389FB8 +_02386F18: .word DUNGEON_D_BOX_LAYOUT_17 _02386F1C: .word 0x00000213 _02386F20: .word 0x00001013 -_02386F24: .word ov31_02389FD8 +_02386F24: .word DUNGEON_D_BOX_LAYOUT_19 _02386F28: .word ov29_0237C91C arm_func_end ov31_02386C6C @@ -5220,7 +5220,7 @@ TeamMenu: ; 0x0238704C mov r3, r7 bl ov31_02388114 ldr r2, _02387618 ; =ov31_0238A280 - ldr r1, _02387620 ; =ov31_0238A014 + ldr r1, _02387620 ; =DUNGEON_D_BOX_LAYOUT_22 ldr r3, [r2] str r0, [r3, #0x7a8] ldr r0, [r2] @@ -5475,7 +5475,7 @@ _02387410: bl Arm9LoadUnkFieldNa0x2029EC8 add r4, r0, #1 ldr r1, _02387618 ; =ov31_0238A280 - ldr r0, _02387630 ; =ov31_0238A024 + ldr r0, _02387630 ; =DUNGEON_D_BOX_LAYOUT_23 ldr r3, [r1] ldr r1, _02387634 ; =0x00000233 add r2, sp, #0x18 @@ -5586,11 +5586,11 @@ _023875F0: _02387614: .word 0x000007AC _02387618: .word ov31_0238A280 _0238761C: .word ov31_02387014 -_02387620: .word ov31_0238A014 +_02387620: .word DUNGEON_D_BOX_LAYOUT_22 _02387624: .word ov29_02353538 _02387628: .word 0x00005AA5 _0238762C: .word 0x00000A3C -_02387630: .word ov31_0238A024 +_02387630: .word DUNGEON_D_BOX_LAYOUT_23 _02387634: .word 0x00000233 _02387638: .word ov29_0237C91C arm_func_end TeamMenu @@ -6015,7 +6015,7 @@ _02387B80: orr r1, r1, #0x33 ldr r3, [r0] str r2, [sp, #0x148] - ldr r0, _023880B8 ; =ov31_0238A004 + ldr r0, _023880B8 ; =DUNGEON_D_BOX_LAYOUT_21 add r2, sp, #0xe8 orr r1, r1, #0x1200 bl sub_0202A690 @@ -6023,7 +6023,7 @@ _02387B80: ldr r1, _023880BC ; =ov31_0238778C ldr r2, [r2] strb r0, [r2, #0x695] - ldr r0, _023880C0 ; =ov31_0238A034 + ldr r0, _023880C0 ; =DUNGEON_D_BOX_LAYOUT_24 bl sub_0202F8C4 ldr r1, _02388084 ; =ov31_0238A280 ldr r3, _023880C4 ; =0x00000A36 @@ -6044,7 +6044,7 @@ _02387B80: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r0, _023880C8 ; =DUNGEON_D_BOX_LAYOUT_20 ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 @@ -6065,7 +6065,7 @@ _02387CA8: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r0, _023880C8 ; =DUNGEON_D_BOX_LAYOUT_20 ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 @@ -6179,7 +6179,7 @@ _02387E6C: mov r0, #1 str r0, [sp] ldr r0, [r5] - ldr r2, _023880D4 ; =ov31_02389FE8 + ldr r2, _023880D4 ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 add r0, r0, #0x12 add r1, r7, #0x62 add r0, r0, #0x600 @@ -6335,14 +6335,14 @@ _023880A8: .word ov31_0238A074 _023880AC: .word ov31_0238A07C _023880B0: .word ov31_0238A084 _023880B4: .word 0x00000A3A -_023880B8: .word ov31_0238A004 +_023880B8: .word DUNGEON_D_BOX_LAYOUT_21 _023880BC: .word ov31_0238778C -_023880C0: .word ov31_0238A034 +_023880C0: .word DUNGEON_D_BOX_LAYOUT_24 _023880C4: .word 0x00000A36 -_023880C8: .word ov31_02389FF4 +_023880C8: .word DUNGEON_D_BOX_LAYOUT_20 _023880CC: .word ov31_023877C4 _023880D0: .word 0x00000A3D -_023880D4: .word ov31_02389FE8 +_023880D4: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 arm_func_end ov31_023877EC arm_func_start ov31_023880D8 @@ -6889,10 +6889,10 @@ _023887D8: ldr r0, _023889B8 ; =ov31_0238A284 mov r5, #0x10 ldr r1, [r0] - ldr r0, _023889C0 ; =ov31_0238A10C + ldr r0, _023889C0 ; =DUNGEON_D_BOX_LAYOUT_25 add r4, r1, #0xc ldr r1, _023889C4 ; =0x00001A13 - ldr r3, _023889C8 ; =ov31_0238A11C + ldr r3, _023889C8 ; =DUNGEON_SUBMENU_5 add r2, sp, #4 strh ip, [sp, #0xc] str r5, [sp, #0x10] @@ -7004,9 +7004,9 @@ _023889B0: .align 2, 0 _023889B8: .word ov31_0238A284 _023889BC: .word 0x000008C2 -_023889C0: .word ov31_0238A10C +_023889C0: .word DUNGEON_D_BOX_LAYOUT_25 _023889C4: .word 0x00001A13 -_023889C8: .word ov31_0238A11C +_023889C8: .word DUNGEON_SUBMENU_5 _023889CC: .word 0x000008C5 _023889D0: .word 0x000008C6 _023889D4: .word 0x0000025A @@ -7206,7 +7206,7 @@ _02388C34: str r0, [sp, #0x14] mov ip, #0 str ip, [sp] - ldr r0, _02388D48 ; =ov31_0238A134 + ldr r0, _02388D48 ; =DUNGEON_D_BOX_LAYOUT_26 ldr r1, _02388D4C ; =0x00001813 ldr r3, _02388D50 ; =ov31_02388D54 add r2, sp, #8 @@ -7256,7 +7256,7 @@ _02388D38: .word 0x00000B44 _02388D3C: .word ov29_0238280C _02388D40: .word 0x00000B45 _02388D44: .word 0x00000B46 -_02388D48: .word ov31_0238A134 +_02388D48: .word DUNGEON_D_BOX_LAYOUT_26 _02388D4C: .word 0x00001813 _02388D50: .word ov31_02388D54 arm_func_end RecruitmentSearchMenuLoop @@ -7357,7 +7357,7 @@ ov31_02388E88: ; 0x02388E88 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x84 sub sp, sp, #0x400 - ldr r0, _02389164 ; =ov31_0238A144 + ldr r0, _02389164 ; =OVERLAY31_UNKNOWN_STRUCT__NA_238A144 bl sub_020348E4 cmp r0, #0 beq _02389158 @@ -7557,7 +7557,7 @@ _02389158: add sp, sp, #0x400 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02389164: .word ov31_0238A144 +_02389164: .word OVERLAY31_UNKNOWN_STRUCT__NA_238A144 _02389168: .word 0x00000D98 _0238916C: .word ov31_0238A288 _02389170: .word 0x00000483 @@ -7587,7 +7587,7 @@ ov31_023891A8: ; 0x023891A8 mov r5, r0 bl sub_02030A18 mov r4, r0 - ldr r0, _023891F8 ; =ov31_0238A1A0 + ldr r0, _023891F8 ; =DUNGEON_SUBMENU_6 mov r1, r4, lsl #3 ldrh r1, [r0, r1] mov r0, r5 @@ -7604,7 +7604,7 @@ ov31_023891A8: ; 0x023891A8 bl sub_02026214 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023891F8: .word ov31_0238A1A0 +_023891F8: .word DUNGEON_SUBMENU_6 arm_func_end ov31_023891A8 arm_func_start HelpMenuLoop @@ -7628,9 +7628,9 @@ _0238921C: ; jump table _02389238: ldr ip, _02389400 ; =0x00003FA7 mov r4, #0x10 - ldr r0, _02389404 ; =ov31_0238A170 + ldr r0, _02389404 ; =DUNGEON_D_BOX_LAYOUT_27 ldr r1, _02389408 ; =0x00401813 - ldr r3, _0238940C ; =ov31_0238A1A0 + ldr r3, _0238940C ; =DUNGEON_SUBMENU_6 add r2, sp, #8 strh ip, [sp, #0x10] str r4, [sp, #0x14] @@ -7702,11 +7702,11 @@ _02389344: mov r0, #0x10 str r0, [sp, #0x14] ldr r1, [r2, #4] - ldr r0, _0238940C ; =ov31_0238A1A0 + ldr r0, _0238940C ; =DUNGEON_SUBMENU_6 mov r1, r1, lsl #3 ldrh r1, [r0, r1] mov ip, #8 - ldr r0, _02389410 ; =ov31_0238A180 + ldr r0, _02389410 ; =DUNGEON_D_BOX_LAYOUT_28 strh r1, [sp, #0x10] ldr r2, [r2, #4] ldr r1, _02389414 ; =0x00009833 @@ -7752,10 +7752,10 @@ _023893F4: .align 2, 0 _023893FC: .word ov31_0238A28C _02389400: .word 0x00003FA7 -_02389404: .word ov31_0238A170 +_02389404: .word DUNGEON_D_BOX_LAYOUT_27 _02389408: .word 0x00401813 -_0238940C: .word ov31_0238A1A0 -_02389410: .word ov31_0238A180 +_0238940C: .word DUNGEON_SUBMENU_6 +_02389410: .word DUNGEON_D_BOX_LAYOUT_28 _02389414: .word 0x00009833 _02389418: .word ov31_023891A8 arm_func_end HelpMenuLoop @@ -7763,7 +7763,7 @@ _02389418: .word ov31_023891A8 arm_func_start ov31_0238941C ov31_0238941C: ; 0x0238941C stmdb sp!, {r3, lr} - ldr r0, _02389458 ; =ov31_0238A190 + ldr r0, _02389458 ; =OVERLAY31_UNKNOWN_STRUCT__NA_238A190 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} @@ -7778,7 +7778,7 @@ ov31_0238941C: ; 0x0238941C str r2, [r0, #8] ldmia sp!, {r3, pc} .align 2, 0 -_02389458: .word ov31_0238A190 +_02389458: .word OVERLAY31_UNKNOWN_STRUCT__NA_238A190 _0238945C: .word ov31_0238A28C arm_func_end ov31_0238941C @@ -7854,7 +7854,7 @@ ov31_0238948C: ; 0x0238948C add r0, r5, #0x78 str r0, [sp, #0xe4] _02389560: - ldr r0, _023898F8 ; =ov31_0238A208 + ldr r0, _023898F8 ; =DUNGEON_D_BOX_LAYOUT_31 ldr r1, _023898FC ; =0x80401813 add r2, sp, #0x9c add r3, r5, #0xc4 @@ -7927,7 +7927,7 @@ _02389640: add r0, r5, #1 str r1, [r2, #0x10] bl ov29_0234E988 - ldr r0, _02389908 ; =ov31_0238A1F8 + ldr r0, _02389908 ; =DUNGEON_D_BOX_LAYOUT_30 ldr r1, _0238990C ; =0x80000213 add r2, sp, #4 add r3, r5, #4 @@ -8105,11 +8105,11 @@ _023898B0: .align 2, 0 _023898F0: .word 0x00000F5F _023898F4: .word 0x00000F5E -_023898F8: .word ov31_0238A208 +_023898F8: .word DUNGEON_D_BOX_LAYOUT_31 _023898FC: .word 0x80401813 _02389900: .word 0x00003F02 _02389904: .word 0x00000A3C -_02389908: .word ov31_0238A1F8 +_02389908: .word DUNGEON_D_BOX_LAYOUT_30 _0238990C: .word 0x80000213 _02389910: .word 0x00003F07 _02389914: .word 0x00003F04 @@ -8141,7 +8141,7 @@ ov31_0238994C: ; 0x0238994C mov r0, r1, asr #2 add r2, r2, r3, lsr #29 add ip, r1, r0, lsr #29 - ldr r6, _023899B0 ; =ov31_0238A218 + ldr r6, _023899B0 ; =DUNGEON_D_BOX_LAYOUT_32 mov lr, r2, asr #3 add r5, sp, #0 ldmia r6, {r0, r1, r2, r3} @@ -8160,7 +8160,7 @@ ov31_0238994C: ; 0x0238994C add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023899B0: .word ov31_0238A218 +_023899B0: .word DUNGEON_D_BOX_LAYOUT_32 _023899B4: .word ov31_02389A04 arm_func_end ov31_0238994C @@ -8416,7 +8416,7 @@ ov31_02389CC0: ; 0x02389CC0 str r1, [sp] str r2, [sp, #4] mov r2, #0 - ldr r0, _02389D74 ; =ov31_0238A1E8 + ldr r0, _02389D74 ; =DUNGEON_D_BOX_LAYOUT_29 ldr r1, _02389D78 ; =0x00001013 ldr r3, _02389D7C ; =0x00000A3B str r2, [sp, #8] @@ -8448,7 +8448,7 @@ _02389D6C: add sp, sp, #0x5c ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_02389D74: .word ov31_0238A1E8 +_02389D74: .word DUNGEON_D_BOX_LAYOUT_29 _02389D78: .word 0x00001013 _02389D7C: .word 0x00000A3B arm_func_end ov31_02389CC0 @@ -8463,20 +8463,20 @@ ov31_02389D80: ; 0x02389D80 arm_func_end ov31_02389D80 ; 0x02389D94 - .global ov31_02389D94 -ov31_02389D94: + .global DUNGEON_D_BOX_LAYOUT_1 +DUNGEON_D_BOX_LAYOUT_1: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x0C, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DA4 -ov31_02389DA4: + .global DUNGEON_D_BOX_LAYOUT_2 +DUNGEON_D_BOX_LAYOUT_2: .byte 0x00, 0x00, 0x00, 0x00, 0x0B, 0x04, 0x13, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DB4 -ov31_02389DB4: + .global DUNGEON_D_BOX_LAYOUT_3 +DUNGEON_D_BOX_LAYOUT_3: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0x2D, 0x38, 0x02, 0x54, 0x2B, 0x38, 0x02 - .global ov31_02389DC4 -ov31_02389DC4: + .global DUNGEON_D_BOX_LAYOUT_4 +DUNGEON_D_BOX_LAYOUT_4: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x06, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DD4 -ov31_02389DD4: + .global DUNGEON_MAIN_MENU +DUNGEON_MAIN_MENU: .byte 0xAD, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xAF, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB0, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0xB1, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB3, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 @@ -8484,31 +8484,31 @@ ov31_02389DD4: .global ov31_02389E14 ov31_02389E14: .byte 0x5B, 0x64, 0x75, 0x6E, 0x67, 0x65, 0x6F, 0x6E, 0x3A, 0x30, 0x5D, 0x00 - .global ov31_02389E20 -ov31_02389E20: + .global OVERLAY31_UNKNOWN_STRING_IDS +OVERLAY31_UNKNOWN_STRING_IDS: .byte 0xC7, 0x08 .global ov31_02389E22 ov31_02389E22: .byte 0xCB, 0x08 .byte 0xC8, 0x08, 0xCC, 0x08, 0xC9, 0x08, 0xCD, 0x08, 0xCA, 0x08, 0xCE, 0x08 - .global ov31_02389E30 -ov31_02389E30: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 +OVERLAY31_UNKNOWN_STRUCT__NA_2389E30: .byte 0x0E, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xF0, 0x32, 0x38, 0x02, 0xBC, 0x2F, 0x38, 0x02 - .global ov31_02389E40 -ov31_02389E40: + .global DUNGEON_D_BOX_LAYOUT_5 +DUNGEON_D_BOX_LAYOUT_5: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x1C, 0x0D, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E50 -ov31_02389E50: + .global DUNGEON_D_BOX_LAYOUT_6 +DUNGEON_D_BOX_LAYOUT_6: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x13, 0x04, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E60 -ov31_02389E60: + .global DUNGEON_D_BOX_LAYOUT_7 +DUNGEON_D_BOX_LAYOUT_7: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x17, 0x02, 0x07, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E70 -ov31_02389E70: + .global DUNGEON_SUBMENU_1 +DUNGEON_SUBMENU_1: .byte 0xAD, 0x09, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 @@ -8518,83 +8518,83 @@ ov31_02389E70: .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_02389EF0 -ov31_02389EF0: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 +OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0: .byte 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov31_02389EFC -ov31_02389EFC: + .global DUNGEON_D_BOX_LAYOUT_8 +DUNGEON_D_BOX_LAYOUT_8: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F0C -ov31_02389F0C: + .global DUNGEON_D_BOX_LAYOUT_9 +DUNGEON_D_BOX_LAYOUT_9: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x07, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F1C -ov31_02389F1C: + .global DUNGEON_D_BOX_LAYOUT_10 +DUNGEON_D_BOX_LAYOUT_10: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x02 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F2C -ov31_02389F2C: + .global DUNGEON_D_BOX_LAYOUT_11 +DUNGEON_D_BOX_LAYOUT_11: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x12, 0x02 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F3C -ov31_02389F3C: + .global DUNGEON_D_BOX_LAYOUT_12 +DUNGEON_D_BOX_LAYOUT_12: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F4C -ov31_02389F4C: + .global DUNGEON_D_BOX_LAYOUT_13 +DUNGEON_D_BOX_LAYOUT_13: .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x07, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov31_02389F5C ov31_02389F5C: .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 - .global ov31_02389F64 -ov31_02389F64: + .global OVERLAY31_JP_STRING +OVERLAY31_JP_STRING: .byte 0x0A, 0x0A, 0x2D, 0x2D, 0x2D, 0x2D, 0x81, 0x40, 0x20, 0x8F, 0x89, 0x8A, 0xFA, 0x83, 0x7C, 0x83 .byte 0x57, 0x83, 0x56, 0x83, 0x87, 0x83, 0x93, 0x3D, 0x25, 0x64, 0x81, 0x40, 0x2D, 0x2D, 0x2D, 0x2D .byte 0x2D, 0x20, 0x0A, 0x00 - .global ov31_02389F88 -ov31_02389F88: + .global DUNGEON_D_BOX_LAYOUT_14 +DUNGEON_D_BOX_LAYOUT_14: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F98 -ov31_02389F98: + .global DUNGEON_D_BOX_LAYOUT_15 +DUNGEON_D_BOX_LAYOUT_15: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FA8 -ov31_02389FA8: + .global DUNGEON_D_BOX_LAYOUT_16 +DUNGEON_D_BOX_LAYOUT_16: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x04, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FB8 -ov31_02389FB8: + .global DUNGEON_D_BOX_LAYOUT_17 +DUNGEON_D_BOX_LAYOUT_17: .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FC8 -ov31_02389FC8: + .global DUNGEON_D_BOX_LAYOUT_18 +DUNGEON_D_BOX_LAYOUT_18: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x04, 0x00, 0xFE, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FD8 -ov31_02389FD8: + .global DUNGEON_D_BOX_LAYOUT_19 +DUNGEON_D_BOX_LAYOUT_19: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FE8 -ov31_02389FE8: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 +OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov31_02389FF4 -ov31_02389FF4: + .global DUNGEON_D_BOX_LAYOUT_20 +DUNGEON_D_BOX_LAYOUT_20: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x0E, 0x12, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A004 -ov31_0238A004: + .global DUNGEON_D_BOX_LAYOUT_21 +DUNGEON_D_BOX_LAYOUT_21: .byte 0x00, 0x00, 0x00, 0x00, 0x0E, 0x02, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A014 -ov31_0238A014: + .global DUNGEON_D_BOX_LAYOUT_22 +DUNGEON_D_BOX_LAYOUT_22: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A024 -ov31_0238A024: + .global DUNGEON_D_BOX_LAYOUT_23 +DUNGEON_D_BOX_LAYOUT_23: .byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A034 -ov31_0238A034: + .global DUNGEON_D_BOX_LAYOUT_24 +DUNGEON_D_BOX_LAYOUT_24: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0A, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov31_0238A044 ov31_0238A044: @@ -8658,58 +8658,58 @@ ov31_0238A0E8: .byte 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43 .byte 0x4C, 0x55, 0x4D, 0x5F, 0x53, 0x45, 0x54, 0x3A, 0x38, 0x30, 0x5D, 0x5B, 0x73, 0x74, 0x72, 0x69 .byte 0x6E, 0x67, 0x3A, 0x31, 0x5D, 0x00, 0x00, 0x00 - .global ov31_0238A10C -ov31_0238A10C: + .global DUNGEON_D_BOX_LAYOUT_25 +DUNGEON_D_BOX_LAYOUT_25: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0C, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A11C -ov31_0238A11C: + .global DUNGEON_SUBMENU_5 +DUNGEON_SUBMENU_5: .byte 0xC3, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xC4, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_0238A134 -ov31_0238A134: + .global DUNGEON_D_BOX_LAYOUT_26 +DUNGEON_D_BOX_LAYOUT_26: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x12, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A144 -ov31_0238A144: + .global OVERLAY31_UNKNOWN_STRUCT__NA_238A144 +OVERLAY31_UNKNOWN_STRUCT__NA_238A144: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x91, 0x38, 0x02, 0x04, 0x8C, 0x38, 0x02 .global ov31_0238A154 ov31_0238A154: .byte 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x33, 0x5D, 0x20, 0x5B, 0x43, 0x53, 0x3A .byte 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00 - .global ov31_0238A170 -ov31_0238A170: + .global DUNGEON_D_BOX_LAYOUT_27 +DUNGEON_D_BOX_LAYOUT_27: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A180 -ov31_0238A180: + .global DUNGEON_D_BOX_LAYOUT_28 +DUNGEON_D_BOX_LAYOUT_28: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A190 -ov31_0238A190: + .global OVERLAY31_UNKNOWN_STRUCT__NA_238A190 +OVERLAY31_UNKNOWN_STRUCT__NA_238A190: .byte 0x0E, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x60, 0x94, 0x38, 0x02, 0xFC, 0x91, 0x38, 0x02 - .global ov31_0238A1A0 -ov31_0238A1A0: + .global DUNGEON_SUBMENU_6 +DUNGEON_SUBMENU_6: .byte 0xA8, 0x3F, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xA9, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xAA, 0x3F, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xAC, 0x3F, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xAD, 0x3F, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xAE, 0x3F, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00, 0xAF, 0x3F, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_0238A1E8 -ov31_0238A1E8: + .global DUNGEON_D_BOX_LAYOUT_29 +DUNGEON_D_BOX_LAYOUT_29: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A1F8 -ov31_0238A1F8: + .global DUNGEON_D_BOX_LAYOUT_30 +DUNGEON_D_BOX_LAYOUT_30: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A208 -ov31_0238A208: + .global DUNGEON_D_BOX_LAYOUT_31 +DUNGEON_D_BOX_LAYOUT_31: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A218 -ov31_0238A218: + .global DUNGEON_D_BOX_LAYOUT_32 +DUNGEON_D_BOX_LAYOUT_32: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x0F, 0x02, 0x00, 0xFE, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .global ov31_0238A228 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 11ce6104..445e5258 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -758,7 +758,7 @@ _022DCBC0: arm_func_start ov34_022DCBCC ov34_022DCBCC: ; 0x022DCBCC stmdb sp!, {r3, lr} - ldr r0, _022DCBEC ; =ov34_022DD014 + ldr r0, _022DCBEC ; =OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 bl sub_020348E4 cmp r0, #0 ldrne r0, _022DCBF0 ; =ov34_022DD084 @@ -766,7 +766,7 @@ ov34_022DCBCC: ; 0x022DCBCC strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCBEC: .word ov34_022DD014 +_022DCBEC: .word OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 _022DCBF0: .word ov34_022DD084 arm_func_end ov34_022DCBCC @@ -780,7 +780,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldr r1, _022DCC84 ; =ov34_022DD084 mov ip, #1 str r0, [r1] - ldr r3, _022DCC88 ; =ov34_022DD024 + ldr r3, _022DCC88 ; =START_MENU_CONFIRM add r2, sp, #0 mov r0, #0 mov r1, #0x31 @@ -810,7 +810,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldmia sp!, {r3, pc} .align 2, 0 _022DCC84: .word ov34_022DD084 -_022DCC88: .word ov34_022DD024 +_022DCC88: .word START_MENU_CONFIRM _022DCC8C: .word 0x00000408 _022DCC90: .word 0x00000255 arm_func_end ov34_022DCBF4 @@ -913,7 +913,7 @@ _022DCDC8: .word ov34_022DD084 arm_func_start ov34_022DCDCC ov34_022DCDCC: ; 0x022DCDCC stmdb sp!, {r3, lr} - ldr r0, _022DCDEC ; =ov34_022DD03C + ldr r0, _022DCDEC ; =OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C bl sub_020348E4 cmp r0, #0 ldrne r0, _022DCDF0 ; =ov34_022DD08C @@ -921,7 +921,7 @@ ov34_022DCDCC: ; 0x022DCDCC strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCDEC: .word ov34_022DD03C +_022DCDEC: .word OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C _022DCDF0: .word ov34_022DD08C arm_func_end ov34_022DCDCC @@ -933,7 +933,7 @@ ov34_022DCDF4: ; 0x022DCDF4 mov r1, r0 bl MemAlloc ldr r1, _022DCE7C ; =ov34_022DD08C - ldr r3, _022DCE80 ; =ov34_022DD04C + ldr r3, _022DCE80 ; =DUNGEON_DEBUG_MENU str r0, [r1] add r2, sp, #0 mov r0, #0 @@ -963,7 +963,7 @@ ov34_022DCDF4: ; 0x022DCDF4 ldmia sp!, {r3, pc} .align 2, 0 _022DCE7C: .word ov34_022DD08C -_022DCE80: .word ov34_022DD04C +_022DCE80: .word DUNGEON_DEBUG_MENU _022DCE84: .word 0x00000408 _022DCE88: .word 0x00003D1C arm_func_end ov34_022DCDF4 @@ -1086,19 +1086,19 @@ ov34_022DCFF4: .global ov34_022DD004 ov34_022DD004: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x77, 0x5F, 0x65, 0x73, 0x72, 0x62, 0x2E, 0x62, 0x67, 0x70, 0x00 - .global ov34_022DD014 -ov34_022DD014: + .global OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 +OVERLAY34_UNKNOWN_STRUCT__NA_22DD014: .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCB, 0x2D, 0x02, 0x94, 0xCC, 0x2D, 0x02, 0xE0, 0xCC, 0x2D, 0x02 - .global ov34_022DD024 -ov34_022DD024: + .global START_MENU_CONFIRM +START_MENU_CONFIRM: .byte 0x56, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x57, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov34_022DD03C -ov34_022DD03C: + .global OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C +OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C: .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCD, 0x2D, 0x02 .byte 0x8C, 0xCE, 0x2D, 0x02, 0xD8, 0xCE, 0x2D, 0x02 - .global ov34_022DD04C -ov34_022DD04C: + .global DUNGEON_DEBUG_MENU +DUNGEON_DEBUG_MENU: .byte 0x1D, 0x3D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x1E, 0x3D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x3D, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x20, 0x3D, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00