diff --git a/asm/include/overlay_29_022DEBA4.inc b/asm/include/overlay_29_022DEBA4.inc index 6892008a..e09c907a 100644 --- a/asm/include/overlay_29_022DEBA4.inc +++ b/asm/include/overlay_29_022DEBA4.inc @@ -22,6 +22,7 @@ .public FadeToBlack .public FillMissionDestinationInfo .public FIXED_ROOM_REVISIT_OVERRIDES +.public FreeAlertBoxInfo .public FreeLoadedAttackSpriteAndMore .public FreeTopScreenStatus .public GenerateDungeonRngSeed @@ -38,8 +39,10 @@ .public GetMaxRescueAttempts .public GetTurnLimit .public IncrementNbSteals +.public InitAlertBoxInfo .public InitDungeonRng .public InitEnemySpawnStats +.public InitMessageLogPreprocessorArgs .public IsBossFight .public IsDungeonEndReasonFailure .public IsFloorOver @@ -189,12 +192,7 @@ .public ov29_02349188 .public ov29_02349658 .public ov29_02349C84 -.public ov29_0234AFA4 -.public ov29_0234AFD0 .public ov29_0234B010 -.public ov29_0234B04C -.public ov29_0234B06C -.public ov29_0234B09C .public ov29_0234B1A4 .public ov29_0234B4CC .public ov29_0234BA18 @@ -227,6 +225,8 @@ .public SetHiddenFloorField .public SetHiddenStairsField .public SetMaxReachedFloor +.public SetMessageLogPreprocessorArgsFlagVal +.public SetMessageLogPreprocessorArgsNumberVal .public SetMinimapDataE447 .public SpawnInitialMonsters .public SpawnShopkeepers diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index 934b8909..cedea9da 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -8,6 +8,7 @@ .public GetLeader .public GetMaxItemsAllowed .public GetMaxPpWrapper +.public GetMessageLogPreprocessorArgs .public GetTileSafe .public GetTrapInfo .public HandleFaint @@ -17,10 +18,9 @@ .public IsMoneyAllowed .public ov29_022E0A18 .public ov29_022E68BC -.public ov29_0234B034 -.public ov29_0234B0B4 .public ov29_0237CFC0 .public RemoveAllItems .public SECONDARY_TERRAIN_TYPES +.public SetMessageLogPreprocessorArgsString .public SetMoneyCarried .public SubInitMonster diff --git a/asm/include/overlay_29_022E2810.inc b/asm/include/overlay_29_022E2810.inc index 96d8ed84..333bb6aa 100644 --- a/asm/include/overlay_29_022E2810.inc +++ b/asm/include/overlay_29_022E2810.inc @@ -6,6 +6,7 @@ .public EntityIsValid__022E1A1C .public EntityIsValid__022E32E8 .public GetForcedLossReason +.public GetMessageLogPreprocessorArgs .public GetMonsterName .public HasDropeyeStatus .public IsBlinded @@ -16,19 +17,18 @@ .public ov29_022E3534 .public ov29_022E3A58 .public ov29_022ED82C -.public ov29_022EDF7C -.public ov29_0230040C .public ov29_023047DC .public ov29_02304954 .public ov29_0233711C .public ov29_023372A4 -.public ov29_02344BA8 -.public ov29_0234B034 .public ov29_0237C84C +.public PrepareItemForPrinting2 +.public SetPreprocessorArgsStringToName .public strcpy .public StringFromId .public sub_02009194 .public sub_020091B0 +.public SubstitutePlaceholderTrapTags .public TeamMemberHasEnabledIqSkill .public UpdateMinimap .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022EDCBC.inc b/asm/include/overlay_29_022EDCBC.inc index 1798b1e4..3b3192eb 100644 --- a/asm/include/overlay_29_022EDCBC.inc +++ b/asm/include/overlay_29_022EDCBC.inc @@ -7,6 +7,8 @@ .public DungeonRandOutcome__022EAB20 .public EnemyEvolution .public EntityIsValid__022EE348 +.public GetMessageLogPreprocessorArgs +.public GetSize0x80Buffer2 .public GetTile .public GetTileSafe .public GetTrapInfo @@ -21,9 +23,7 @@ .public ov29_022E58B0 .public ov29_022E7A30 .public ov29_022F9840 -.public ov29_0234B034 .public SpawnTrap -.public sub_02024FC8 .public SubstitutePlaceholderStringTags .public TRAP_BUSTER_ACTIVATION_CHANCE .public UpdateShopkeeperModeAfterTrap diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 5df14a93..15ab72bb 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -37,6 +37,7 @@ .public GetItemToUse .public GetLeader .public GetLeaderMonster +.public GetMessageLogPreprocessorArgs .public GetMoneyCarried .public GetMonsterGenderVeneer .public GetPressedButtons @@ -104,7 +105,6 @@ .public ov29_022FA2F0 .public ov29_022FA360 .public ov29_022FB920 -.public ov29_022FBAB4 .public ov29_022FBDF0 .public ov29_022FF3F4 .public ov29_022FF958 @@ -129,10 +129,6 @@ .public ov29_02348ECC .public ov29_023491B8 .public ov29_0234A980 -.public ov29_0234B034 -.public ov29_0234B0CC -.public ov29_0234B104 -.public ov29_0234B118 .public ov29_0234B1A4 .public ov29_0234B4CC .public ov29_0234BA54 @@ -172,10 +168,14 @@ .public RemoveEquivItemNoHole .public RemoveGroundItem .public RemoveHolderForItemInBag +.public ResetTriggerFlags .public SetActionUseMovePlayer .public SetDecoyAiTracker .public SetHolderForItemInBag .public SetLeaderActionFields +.public SetMessageLogPreprocessorArgsSpeakerId +.public SetMessageLogPreprocessorArgsSpeakerId0x30000 +.public SetMessageLogPreprocessorArgsStringToName .public SetMonsterActionFields .public ShouldMonsterRunAway .public ShouldMonsterRunAwayAndShowEffect diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc index ab6c33a3..dddf251b 100644 --- a/asm/include/overlay_29_022F52B0.inc +++ b/asm/include/overlay_29_022F52B0.inc @@ -9,6 +9,7 @@ .public ExclusiveItemEffectFlagTest .public GetItemCategoryVeneer .public GetItemToUse +.public GetMessageLogPreprocessorArgs .public HandleCurvedProjectileThrow .public IqSkillIsEnabled .public ItemIsActive__022F5994 @@ -22,20 +23,19 @@ .public ov29_022EA370 .public ov29_022EB378 .public ov29_022F3B8C -.public ov29_0230040C .public ov29_02304A48 .public ov29_0230F9A4 .public ov29_02343D30 .public ov29_02346FB8 .public ov29_02347000 .public ov29_02347518 -.public ov29_0234B034 .public PrepareItemForPrinting__02345728 .public PrepareItemForPrinting__02345754 .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public RemoveGroundItem .public RemoveUsedItem +.public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper .public ShouldMonsterRunAwayAndShowEffect .public SpawnItem diff --git a/asm/include/overlay_29_022F59C4.inc b/asm/include/overlay_29_022F59C4.inc index d33d73df..5dbdb074 100644 --- a/asm/include/overlay_29_022F59C4.inc +++ b/asm/include/overlay_29_022F59C4.inc @@ -14,9 +14,11 @@ .public GetActiveTeamMember .public GetDirectionTowardsPosition .public GetLeader +.public GetMessageLogPreprocessorArgs .public GetMissionDestination .public GetNumberOfAttacks .public GetPersonalityIndex +.public GetSize0x80Buffer .public GetStringFromFileVeneer .public GetTalkLine .public GetTreatmentBetweenMonsters @@ -36,30 +38,28 @@ .public ov29_022F6748 .public ov29_022F87C0 .public ov29_022FA574 -.public ov29_0230040C .public ov29_023009CC .public ov29_02304AFC .public ov29_0231AE3C .public ov29_0232145C .public ov29_02322374 -.public ov29_02338430 .public ov29_0233A248 .public ov29_02344544 .public ov29_02348C64 .public ov29_0234A2D4 .public ov29_0234A5E4 -.public ov29_0234B034 -.public ov29_0234B0B4 .public ov29_0234CFA0 .public ov29_0234D304 .public ov29_02352750 .public ov29_02352758 .public ov29_0237CA80 +.public RevealAttackedTile +.public SetMessageLogPreprocessorArgsString +.public SetPreprocessorArgsStringToName .public ShouldUsePp .public strcpy .public strncpy .public sub_02020880 -.public sub_02024FB8 .public SubstitutePlaceholderStringTags .public TryActivateTruant .public TryEndPetrifiedOrSleepStatus diff --git a/asm/include/overlay_29_022F62CC.inc b/asm/include/overlay_29_022F62CC.inc index e44184bc..6a2937e7 100644 --- a/asm/include/overlay_29_022F62CC.inc +++ b/asm/include/overlay_29_022F62CC.inc @@ -46,11 +46,11 @@ .public ov29_02304A48 .public ov29_0231B490 .public ov29_0231B4AC -.public ov29_0234B09C .public ov29_02352760 .public ov29_023535A8 .public ov29_0237C9B0 .public RemoveGroundItem +.public SetMessageLogPreprocessorArgsNumberVal .public SpawnItem .public sub_020018A4 .public TeamLeaderIqSkillIsEnabled diff --git a/asm/include/overlay_29_022F7768.inc b/asm/include/overlay_29_022F7768.inc index 4e5f8b2c..6bb56cf8 100644 --- a/asm/include/overlay_29_022F7768.inc +++ b/asm/include/overlay_29_022F7768.inc @@ -59,8 +59,6 @@ .public ov29_02339F88 .public ov29_02349688 .public ov29_0234B010 -.public ov29_0234B06C -.public ov29_0234B0B4 .public ov29_0234B1A4 .public ov29_0234EF24 .public ov29_0237C9B0 @@ -68,6 +66,8 @@ .public RemoveHolderForItemInBag .public RevertGiratinaAndShaymin .public SetForcedLossReason +.public SetMessageLogPreprocessorArgsFlagVal +.public SetMessageLogPreprocessorArgsString .public SetMissionTargetEnemyDefeated .public ShouldMonsterRunAway .public StoryRestrictionsEnabled diff --git a/asm/include/overlay_29_022F9744.inc b/asm/include/overlay_29_022F9744.inc index f9489b42..2ce00b46 100644 --- a/asm/include/overlay_29_022F9744.inc +++ b/asm/include/overlay_29_022F9744.inc @@ -33,6 +33,7 @@ .public GetLearnableIqSkills .public GetMaxPp .public GetMaxPpWrapper +.public GetMessageLogPreprocessorArgs .public GetMobilityType .public GetMonsterEvoStatus .public GetMoveTypeForMonster @@ -57,19 +58,18 @@ .public ov29_022EA370 .public ov29_022EF938 .public ov29_022F87C0 -.public ov29_0230040C .public ov29_023018AC .public ov29_023021F0 .public ov29_02304A48 .public ov29_02307CE0 .public ov29_02307DD0 -.public ov29_0234B034 .public PointCameraToMonster .public PrepareItemForPrinting__02345728 .public RestoreAllMovePP .public SECONDARY_TERRAIN_TYPES .public SetActionPassTurnOrWalk .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper .public ShowPpRestoreEffect .public sub_0201405C diff --git a/asm/include/overlay_29_022FACBC.inc b/asm/include/overlay_29_022FACBC.inc index c04b00cc..1f64d1e3 100644 --- a/asm/include/overlay_29_022FACBC.inc +++ b/asm/include/overlay_29_022FACBC.inc @@ -23,10 +23,10 @@ .public ov29_022E6928 .public ov29_022EA370 .public ov29_0230F9A4 -.public ov29_0234B09C .public PrepareItemForPrinting__02345728 .public RandInt .public RemoveEquivItem +.public SetMessageLogPreprocessorArgsNumberVal .public ShouldTryEatItem .public SubstitutePlaceholderStringTags .public TryIncreaseHp diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index d521ec30..96d4ea45 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -58,13 +58,13 @@ .public ov29_0231A9F8 .public ov29_02337CCC .public ov29_02346888 -.public ov29_0234B024 .public ov29_0234BA54 .public ov29_0237C9C0 .public ov29_0237CA68 .public ov29_0237CA6C .public PositionIsOnHiddenStairs .public SetHiddenFloorField +.public SetMessageLogGroupStartFlag .public SubstitutePlaceholderStringTags .public TryActivateFlashFireOnAllMonsters .public TrySpawnTrapperTrap diff --git a/asm/include/overlay_29_0230027C.inc b/asm/include/overlay_29_0230027C.inc index 08e85c62..a1fd6eab 100644 --- a/asm/include/overlay_29_0230027C.inc +++ b/asm/include/overlay_29_0230027C.inc @@ -8,12 +8,12 @@ .public GetName .public GetNameRaw .public GetNameWithGender -.public ov29_0234B0B4 +.public GetSize0x80Buffer .public ov29_023527C0 .public ov29_023527D0 +.public SetMessageLogPreprocessorArgsString .public strcpy .public StringFromId -.public sub_02024FB8 .public sub_02056084 .public sub_02058534 .public sub_0205858C diff --git a/asm/include/overlay_29_023026FC.inc b/asm/include/overlay_29_023026FC.inc index 9f5f857d..76cdf6f6 100644 --- a/asm/include/overlay_29_023026FC.inc +++ b/asm/include/overlay_29_023026FC.inc @@ -7,15 +7,15 @@ .public EvolveMonster .public GetEvolutions .public GetForcedLossReason +.public GetMessageLogPreprocessorArgs .public GetUnlockedTacticFlags .public IsExpEnabledInDungeon .public IsOnMonsterSpawnList .public LevelUp .public LogMessageByIdWithPopup .public ov29_022E2470 -.public ov29_0230040C .public ov29_02302C04 .public ov29_02302CC8 -.public ov29_0234B034 -.public ov29_0234B09C .public ov29_023527F8 +.public SetMessageLogPreprocessorArgsNumberVal +.public SetPreprocessorArgsStringToName diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index ae9e8b03..5969ada1 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -16,6 +16,7 @@ .public GetLeader .public GetLoadedAttackSpriteId .public GetLvlUpEntry +.public GetMessageLogPreprocessorArgs .public GetMonsterName .public GetMovesetLevelUpPtr .public GetPersonalityIndex @@ -46,16 +47,12 @@ .public ov29_022EAC9C .public ov29_022EBCE8 .public ov29_022ECB38 -.public ov29_0230040C .public ov29_023009CC .public ov29_023021F0 .public ov29_02304830 .public ov29_02318D58 .public ov29_0231EA04 .public ov29_02338988 -.public ov29_0234B034 -.public ov29_0234B06C -.public ov29_0234B09C .public ov29_0234B4E0 .public ov29_0234CFA0 .public ov29_0234D234 @@ -74,8 +71,11 @@ .public ov29_0237C9C9 .public Rand16Bit .public SetAndPlayAnimationForAnimationControl +.public SetMessageLogPreprocessorArgsFlagVal +.public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterTypeAndAbility .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public SetSpriteIdForAnimationControl .public SpawnMonster .public strcat diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 93e66cdf..f3845179 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -83,7 +83,6 @@ .public ov29_0233847C .public ov29_02344B9C .public ov29_0234969C -.public ov29_0234B09C .public ov29_0234B1A4 .public ov29_0234BA54 .public ov29_02353218 @@ -102,6 +101,7 @@ .public RestorePpAllMovesSetFlags .public RestoreRandomMovePP .public SET_DAMAGE_STATUS_DAMAGE +.public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterFlag2 .public SetPokemonBattled .public ShouldDisplayEntityWrapper diff --git a/asm/include/overlay_29_0230AA0C.inc b/asm/include/overlay_29_0230AA0C.inc index fffefb46..2d8b2f38 100644 --- a/asm/include/overlay_29_0230AA0C.inc +++ b/asm/include/overlay_29_0230AA0C.inc @@ -59,6 +59,7 @@ .public GetEquivItemIndex .public GetFirstEmptyMemberIdx .public GetItemAtIdx +.public GetMessageLogPreprocessorArgs .public GetMonsterGenderVeneer .public GetMoveCategory .public GetNameString @@ -125,15 +126,12 @@ .public ov29_022E81F8 .public ov29_022EACAC .public ov29_022FBDE0 -.public ov29_0230040C .public ov29_02304A48 .public ov29_02305F60 .public ov29_0230E5A8 .public ov29_0230E5FC .public ov29_0230E658 .public ov29_02337EC0 -.public ov29_0234B034 -.public ov29_0234B0B4 .public ov29_0234B1A4 .public ov29_0234BA54 .public ov29_0234D630 @@ -142,7 +140,7 @@ .public ov29_0234D8A0 .public ov29_0234EE10 .public ov29_02352838 -.public ov29_02352884 +.public WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS .public ov29_02352894 .public ov29_02352984 .public ov29_02352990 @@ -166,8 +164,10 @@ .public RoundUpDiv256 .public SCOPE_LENS_CRIT_RATE_BOOST .public SetItemAcquired +.public SetMessageLogPreprocessorArgsString .public SetPokemonJoined .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public SOLID_ROCK_MULTIPLIER .public SPECIAL_BAND_STAT_BOOST .public StrcpySimple diff --git a/asm/include/overlay_29_0230E5A8.inc b/asm/include/overlay_29_0230E5A8.inc index f77684fd..c24fa136 100644 --- a/asm/include/overlay_29_0230E5A8.inc +++ b/asm/include/overlay_29_0230E5A8.inc @@ -4,6 +4,7 @@ .public DungeonRandInt .public EntityIsValid__0230E8F0 .public GetKecleonIdToSpawnByFloor +.public GetMessageLogPreprocessorArgs .public GetMonsterIdToSpawn .public GetMonsterLevelToSpawn .public GetRandomMovementChance @@ -14,7 +15,6 @@ .public ov29_022E62F0 .public ov29_022FBC94 .public ov29_022FD318 -.public ov29_0234B034 .public ov29_0234BB50 .public ov29_0234D6C8 .public PreprocessString diff --git a/asm/include/overlay_29_02311C28.inc b/asm/include/overlay_29_02311C28.inc index d5161fab..b5ebe662 100644 --- a/asm/include/overlay_29_02311C28.inc +++ b/asm/include/overlay_29_02311C28.inc @@ -12,6 +12,7 @@ .public ExclusiveItemEffectIsActive__023147EC .public ExclusiveItemEffectIsActiveWithLogging .public GetExclusiveItemWithEffectFromBag +.public GetMessageLogPreprocessorArgs .public GetTile .public GetTileAtEntity .public IsProtectedFromNegativeStatus @@ -62,17 +63,16 @@ .public ov29_022E5258 .public ov29_022E52F8 .public ov29_022E53EC -.public ov29_0230040C .public ov29_023018AC .public ov29_02304A48 .public ov29_02304A84 -.public ov29_0234B034 -.public ov29_0234B0B4 .public PlayExclamationPointEffect__022E5D4C .public PrepareItemForPrinting__02345728 .public SafeguardIsActive .public SECONDARY_TERRAIN_TYPES +.public SetMessageLogPreprocessorArgsString .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public SubstitutePlaceholderStringTags .public TryActivateQuickFeet .public TryActivateSteadfast diff --git a/asm/include/overlay_29_0231516C.inc b/asm/include/overlay_29_0231516C.inc index 8938784e..1929f37c 100644 --- a/asm/include/overlay_29_0231516C.inc +++ b/asm/include/overlay_29_0231516C.inc @@ -23,6 +23,7 @@ .public GetMonsterApparentId .public GetMonsterIdFromSpawnEntry .public GetNameWithGender +.public GetSize0x80Buffer .public HiddenStairsTrigger .public IqSkillIsEnabled .public IsProtectedFromNegativeStatus @@ -82,14 +83,13 @@ .public ov29_022E486C .public ov29_022E81F8 .public ov29_02304830 -.public ov29_0234B09C -.public ov29_0234B0B4 .public PERISH_SONG_TURN_RANGE .public SafeguardIsActive +.public SetMessageLogPreprocessorArgsNumberVal +.public SetMessageLogPreprocessorArgsString .public ShouldDisplayEntityWrapper .public strcpy .public sub_02001888 -.public sub_02024FB8 .public sub_02050EBC .public sub_02050F78 .public sub_02050FF8 diff --git a/asm/include/overlay_29_0231A9F8.inc b/asm/include/overlay_29_0231A9F8.inc index 43505d33..7a4d8ea5 100644 --- a/asm/include/overlay_29_0231A9F8.inc +++ b/asm/include/overlay_29_0231A9F8.inc @@ -10,11 +10,11 @@ .public IsFloorOver .public LogMessageByIdWithPopupCheckUser .public ov29_022EB4E8 -.public ov29_022FBAB4 .public ov29_02321274 .public ov29_02322374 .public PrepareItemForPrinting__02345728 .public RemoveUsedItem +.public ResetTriggerFlags .public SubstitutePlaceholderStringTags .public TryActivateTruant .public UpdateAiTargetPos diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index e867f89d..f2aefea5 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -82,7 +82,6 @@ .public ov29_023021F0 .public ov29_023038D4 .public ov29_02339FF4 -.public ov29_0234B09C .public ov29_0234BA54 .public ov29_023529AC .public ov29_023529B0 @@ -96,6 +95,7 @@ .public RemoveUsedItem .public RestoreAllMovePP .public SetDoughSeedFlag +.public SetMessageLogPreprocessorArgsNumberVal .public SetMonsterActionFields .public SetPreprocessorArgsIdVal .public ShouldDisplayEntityWrapper diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index dba14558..08581034 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -19,6 +19,7 @@ .public FormatMoveStringMore .public GetApparentWeather .public GetEntityMoveTargetAndRange +.public GetMessageLogPreprocessorArgs .public GetMoveMessageFromId .public GetMoveNbStrikes .public GetNaturePowerVariant @@ -48,8 +49,6 @@ .public ov29_022EA370 .public ov29_022F9840 .public ov29_022FAA04 -.public ov29_022FBAB4 -.public ov29_0230040C .public ov29_02304B14 .public ov29_02318D58 .public ov29_02321288 @@ -61,10 +60,11 @@ .public ov29_02324C9C .public ov29_023383A8 .public ov29_02344B9C -.public ov29_0234B034 .public ov29_0235370C .public ov29_0237CA68 +.public ResetTriggerFlags .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public SLEEP_TURN_RANGE .public StringFromId .public sub_0201D1B0 diff --git a/asm/include/overlay_29_02322DDC.inc b/asm/include/overlay_29_02322DDC.inc index 98dd030a..ab5370e6 100644 --- a/asm/include/overlay_29_02322DDC.inc +++ b/asm/include/overlay_29_02322DDC.inc @@ -11,6 +11,7 @@ .public GetApparentWeather .public GetBodySize .public GetEntityMoveTargetAndRange +.public GetMessageLogPreprocessorArgs .public GetMoveAnimation .public GetMoveAnimationId .public GetMoveAnimationSpeed @@ -27,20 +28,19 @@ .public ov29_022E2CA0 .public ov29_022EA370 .public ov29_022FAFD4 -.public ov29_0230040C .public ov29_023024E0 .public ov29_02304A48 .public ov29_023243B4 .public ov29_02324D60 .public ov29_02324E78 .public ov29_023250D4 -.public ov29_0234B034 .public ov29_0234B4CC .public ov29_0235175C .public ov29_02352A54 .public ov29_02352A6C .public PlayMoveAnimation .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper .public SinAbs4096 .public sub_02001980 diff --git a/asm/include/overlay_29_02324698.inc b/asm/include/overlay_29_02324698.inc index fc333ce5..a3ab5f14 100644 --- a/asm/include/overlay_29_02324698.inc +++ b/asm/include/overlay_29_02324698.inc @@ -46,11 +46,11 @@ .public ov29_02325644 .public ov29_02325D20 .public ov29_02325D7C -.public ov29_0234B09C .public ov29_02352AD8 .public ov29_02352B1C .public ov29_0237CA84 .public SetAndLoadCurrentAttackAnimation +.public SetMessageLogPreprocessorArgsNumberVal .public ShouldDisplayEntityAdvanced .public ShouldMovePlayAlternativeAnimation .public sub_0201CF90 diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index 1d0990d1..0162dbcb 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -41,6 +41,7 @@ .public GetApparentWeather .public GetDamageSourceWrapper .public GetEffectAnimation +.public GetMessageLogPreprocessorArgs .public GetMoveAnimation .public GetMoveCategory .public GetMoveType @@ -75,7 +76,6 @@ .public ov29_02318D58 .public ov29_02318D98 .public ov29_02332F18 -.public ov29_0234B034 .public ov29_0234BA54 .public ov29_02352AD8 .public POWDER_SNOW_FREEZE_CHANCE diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 10a0110b..5f008b44 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -31,6 +31,7 @@ .public GenerateStandardItem .public GetApparentWeather .public GetDamageSourceWrapper +.public GetMessageLogPreprocessorArgs .public GetMoveCategory .public GetMoveCritChance .public GetMovePower @@ -58,7 +59,6 @@ .public ov29_022EA370 .public ov29_022ECAFC .public ov29_022F9EA0 -.public ov29_0230040C .public ov29_0230D4A4 .public ov29_02318A90 .public ov29_02318AD4 @@ -66,7 +66,6 @@ .public ov29_02318BBC .public ov29_02318D58 .public ov29_0232A834 -.public ov29_0234B034 .public ov29_0234C738 .public ov29_02352B18 .public POISON_FANG_POISON_CHANCE @@ -75,6 +74,7 @@ .public RemoveEquivItemNoHole .public SACRED_FIRE_BURN_CHANCE .public SetPreprocessorArgsIdVal +.public SetPreprocessorArgsStringToName .public SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE .public ShouldDisplayEntityAdvanced .public SMOG_POISON_CHANCE diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 77dbf2df..e775b523 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -40,6 +40,7 @@ .public GetMoveType .public GetNameWithGender .public GetSize +.public GetSize0x80Buffer .public GetTileAtEntity .public GetTileSafe .public GetTrapInfo @@ -90,7 +91,6 @@ .public ov29_0231F6E4 .public ov29_02332F18 .public ov29_02336694 -.public ov29_0234B0B4 .public ov29_0234BA54 .public ov29_02352B38 .public ov29_02352B3C @@ -100,13 +100,13 @@ .public RevealStairs .public RevealWholeFloor .public ROOST_HP_RESTORATION_TABLE +.public SetMessageLogPreprocessorArgsString .public SetPreprocessorArgsIdVal .public SHADOW_FORCE_DAMAGE_MULTIPLIER .public SLEEP_TURN_RANGE .public SPATK_STAT_IDX .public SpawnDroppedItemWrapper .public StringFromId -.public sub_02024FB8 .public SubstitutePlaceholderStringTags .public THUNDER_FANG_CRINGE_CHANCE .public THUNDER_FANG_PARALYZE_CHANCE diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index 08767602..64f664f8 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -338,6 +338,7 @@ .public GetDirectionTowardsPosition .public GetEntityMoveTargetAndRange .public GetExclusiveItemWithEffectFromBag +.public GetMessageLogPreprocessorArgs .public GetMoveCritChance .public GetMovePower .public GetMoveTypeForMonster @@ -379,7 +380,6 @@ .public ov29_022EA370 .public ov29_022F9840 .public ov29_022FB1A8 -.public ov29_0230040C .public ov29_02300D50 .public ov29_02300DC0 .public ov29_02301C2C @@ -394,7 +394,6 @@ .public ov29_0232E744 .public ov29_02333044 .public ov29_023381C0 -.public ov29_0234B034 .public ov29_02353718 .public ov29_0237CA68 .public ov29_0237CA74 @@ -403,6 +402,7 @@ .public PlayMoveAnimation .public PrepareItemForPrinting__02345728 .public ROLLOUT_ICE_BALL_MISSED +.public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper .public SPATK_STAT_IDX .public sub_02050FF8 diff --git a/asm/include/overlay_29_02332A0C.inc b/asm/include/overlay_29_02332A0C.inc index 654cf08b..3825ac7e 100644 --- a/asm/include/overlay_29_02332A0C.inc +++ b/asm/include/overlay_29_02332A0C.inc @@ -15,6 +15,7 @@ .public GetApparentWeather .public GetDamageSourceWrapper .public GetDirectionTowardsPosition +.public GetMessageLogPreprocessorArgs .public GetMoveCategory .public GetMoveCritChance .public GetMovePower @@ -32,8 +33,7 @@ .public MoveHitCheck .public ov10_022C6322 .public ov29_022E576C -.public ov29_0230040C .public ov29_02304A48 .public ov29_0230D088 -.public ov29_0234B034 +.public SetPreprocessorArgsStringToName .public ShouldDisplayEntityWrapper diff --git a/asm/include/overlay_29_023383A8.inc b/asm/include/overlay_29_023383A8.inc index 62ff0369..566477bc 100644 --- a/asm/include/overlay_29_023383A8.inc +++ b/asm/include/overlay_29_023383A8.inc @@ -4,7 +4,7 @@ .public GetVictoriesOnOneFloor .public HiddenStairsTrigger .public LogMessageByIdWithPopupCheckUser -.public ov29_022EDEDC .public ov29_02306D54 .public PositionIsOnHiddenStairs .public SetVictoriesOnOneFloor +.public TryRevealAttackedTrap diff --git a/asm/include/overlay_29_02344178.inc b/asm/include/overlay_29_02344178.inc index 024d8aa9..882987a1 100644 --- a/asm/include/overlay_29_02344178.inc +++ b/asm/include/overlay_29_02344178.inc @@ -36,11 +36,11 @@ .public ov29_022F0848 .public ov29_02344B9C .public ov29_02345004 -.public ov29_0234B09C .public ov29_0234B1A4 .public ov29_0234C738 .public ov29_02353798 .public ov29_0237CFFC +.public SetMessageLogPreprocessorArgsNumberVal .public SpawnItem .public StartFadeDungeonWrapper .public sub_02056880 diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 09b2304a..5b8a196e 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -32,7 +32,6 @@ .public ov29_022E563C .public ov29_022EACBC .public ov29_022FB51C -.public ov29_02338430 .public ov29_02344BF8 .public ov29_02347378 .public ov29_023531BC @@ -40,6 +39,7 @@ .public ov29_023537BC .public ov29_0237C864 .public RetrieveFromItemList1 +.public RevealAttackedTile .public SECONDARY_TERRAIN_TYPES .public SetEntityPixelPosXY .public SetPreprocessorArgsIdVal diff --git a/asm/include/overlay_29_02348020.inc b/asm/include/overlay_29_02348020.inc index 4ac43daf..3fbdd04d 100644 --- a/asm/include/overlay_29_02348020.inc +++ b/asm/include/overlay_29_02348020.inc @@ -18,6 +18,7 @@ .public GetLeader .public GetMaxPp .public GetName +.public GetSize0x80Buffer .public GetSpriteFileSize .public InitPortraitDungeon .public IsItemInBag @@ -45,12 +46,12 @@ .public ov29_0234AA98 .public ov29_0234ABB0 .public ov29_0234AC8C -.public ov29_0234B06C -.public ov29_0234B0B4 .public ov29_0234C738 .public ov29_023537C4 .public ov29_0237C694 .public PrepareItemForPrinting__02345728 +.public SetMessageLogPreprocessorArgsFlagVal +.public SetMessageLogPreprocessorArgsString .public StartFadeDungeonWrapper .public strcpy .public sub_02011220 @@ -60,7 +61,6 @@ .public sub_020178A8 .public sub_02017A00 .public sub_02017A20 -.public sub_02024FB8 .public sub_02051DFC .public sub_02051EB8 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 1af20d8d..4333a1ba 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -27,6 +27,7 @@ .public GetName .public GetRandomSpawnMonsterID .public GetSecondFormIfValid +.public GetSize0x80Buffer .public GetSpecialTargetItem .public GetTargetMonsterNotFoundFlag .public HandleFaint @@ -46,6 +47,7 @@ .public MemAlloc .public MemFree .public MemZero +.public MESSAGE_LOG_INFO .public MusicTableIdxToMusicId .public ov10_022BFD20 .public ov29_022E09E8 @@ -79,7 +81,6 @@ .public ov29_0234D8A0 .public ov29_02353214 .public ov29_023537C8 -.public ov29_023537CC .public ov29_0237C694 .public PositionIsOnStairs .public PrepareItemForPrinting__02345728 @@ -95,7 +96,6 @@ .public strncpy .public sub_02001808 .public sub_02017C10 -.public sub_02024FB8 .public sub_0202836C .public sub_0203010C .public sub_02030214 diff --git a/asm/include/overlay_29_0234CA84.inc b/asm/include/overlay_29_0234CA84.inc index 6f8c6101..f607ee72 100644 --- a/asm/include/overlay_29_0234CA84.inc +++ b/asm/include/overlay_29_0234CA84.inc @@ -7,6 +7,7 @@ .public GetGameMode .public GetItemCategoryVeneer .public GetLeader +.public GetMessageLogPreprocessorArgs .public GetPerformanceFlagWithChecks .public GetPlayerGender .public GetRandomExplorerMazeMonster @@ -22,7 +23,6 @@ .public ov29_0231ADA8 .public ov29_02337EE8 .public ov29_0233804C -.public ov29_0234B034 .public ov29_0234BA54 .public ov29_0234D558 .public ov29_0234D5D0 diff --git a/asm/include/overlay_29_0234D484.inc b/asm/include/overlay_29_0234D484.inc index 41b2c7bc..fb69ef2d 100644 --- a/asm/include/overlay_29_0234D484.inc +++ b/asm/include/overlay_29_0234D484.inc @@ -6,6 +6,7 @@ .public CreateDialogueBox .public CreateParentMenuFromStringIds .public CreatePortraitBox +.public GetMessageLogPreprocessorArgs .public HidePortraitBox .public InitPreprocessorArgs .public IsDialogueBoxActive @@ -19,7 +20,6 @@ .public ov29_022EA428 .public ov29_022F2FE4 .public ov29_02339148 -.public ov29_0234B034 .public ov29_0234B1A4 .public ov29_0234B4CC .public ov29_0234B73C diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc index 3bf080a3..52384a0a 100644 --- a/asm/include/overlay_29_0234DDF4.inc +++ b/asm/include/overlay_29_0234DDF4.inc @@ -14,6 +14,7 @@ .public GetLeader .public GetLeaderAction .public GetLeaderMonster +.public GetMessageLogPreprocessorArgs .public GetTile .public HandleMovesMenuWrapper0 .public HideTileGrid @@ -38,7 +39,6 @@ .public ov29_0231DA80 .public ov29_0231DBF0 .public ov29_0231DD60 -.public ov29_0234B034 .public ov29_0234B1A4 .public ov29_0234EC38 .public ov29_0234ED30 diff --git a/asm/include/overlay_31_023838E4.inc b/asm/include/overlay_31_023838E4.inc index 3e958d72..de00f920 100644 --- a/asm/include/overlay_31_023838E4.inc +++ b/asm/include/overlay_31_023838E4.inc @@ -79,6 +79,7 @@ .public GetLeaderChangeFlag .public GetLeaderMonster .public GetMaxPp +.public GetMessageLogPreprocessorArgs .public GetMonsterIdFromSpawnEntry .public GetMonsterName .public GetNbItemsInBag @@ -164,7 +165,6 @@ .public ov29_02346E5C .public ov29_02347100 .public ov29_02348D00 -.public ov29_0234B034 .public ov29_0234E988 .public ov29_0234EA18 .public ov29_0234EBCC diff --git a/asm/main_02014D18.s b/asm/main_02014D18.s index 9dbda519..fe42ac24 100644 --- a/asm/main_02014D18.s +++ b/asm/main_02014D18.s @@ -19072,7 +19072,7 @@ _02023D0C: b _02023D44 _02023D14: mov r0, r4 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r1, r0 mov r0, r5 bl strcpy @@ -19747,7 +19747,7 @@ _0202455C: b _02024584 _02024564: mov r0, r4 - bl sub_02024FC8 + bl GetSize0x80Buffer2 mov r1, r0 mov r0, r5 bl strcpy @@ -20735,23 +20735,23 @@ _02024FB0: .word _02099E20 _02024FB4: .word _02099E40 arm_func_end sub_02024E34 - arm_func_start sub_02024FB8 -sub_02024FB8: ; 0x02024FB8 + arm_func_start GetSize0x80Buffer +GetSize0x80Buffer: ; 0x02024FB8 ldr r1, _02024FC4 ; =_022A5468 add r0, r1, r0, lsl #7 bx lr .align 2, 0 _02024FC4: .word _022A5468 - arm_func_end sub_02024FB8 + arm_func_end GetSize0x80Buffer - arm_func_start sub_02024FC8 -sub_02024FC8: ; 0x02024FC8 + arm_func_start GetSize0x80Buffer2 +GetSize0x80Buffer2: ; 0x02024FC8 ldr r1, _02024FD4 ; =_022A5068 add r0, r1, r0, lsl #7 bx lr .align 2, 0 _02024FD4: .word _022A5068 - arm_func_end sub_02024FC8 + arm_func_end GetSize0x80Buffer2 arm_func_start GetDungeonResultString GetDungeonResultString: ; 0x02024FD8 diff --git a/asm/overlay_29_022DEBA4.s b/asm/overlay_29_022DEBA4.s index 85eaed06..ef872b3b 100644 --- a/asm/overlay_29_022DEBA4.s +++ b/asm/overlay_29_022DEBA4.s @@ -390,7 +390,7 @@ _022DF0AC: bl ov29_02338F38 mov r0, #1 bl ov29_022E2B68 - bl ov29_0234AFA4 + bl InitAlertBoxInfo bl ov29_0234BB10 bl DungeonRngUnsetSecondary bl GetDungeonRngPreseed @@ -514,7 +514,7 @@ _022DF2D8: add r0, sb, #0x700 ldrsb r1, [r0, #0x9b] mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal add r0, sb, #0x700 ldrsb r0, [r0, #0x9b] mov r2, #1 @@ -587,7 +587,7 @@ _022DF3B0: beq _022DF408 add r1, r0, #1 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r1, _022DFF4C ; =0x00000B6D mov r0, #0 mov r2, #1 @@ -611,7 +611,7 @@ _022DF428: bl ov29_022F6EF4 bl ov29_022E8104 bl ov29_022E7F7C - bl ov29_0234B04C + bl InitMessageLogPreprocessorArgs bl ov29_0234BB2C bl ov29_022DE4FC cmp r5, #0 @@ -929,7 +929,7 @@ _022DF82C: bl SetForcedLossReason ldrsh r1, [sl, #0x20] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldr r1, _022DFF64 ; =0x00000B73 mov r0, #0 mov r2, #1 @@ -1649,7 +1649,7 @@ _022E02EC: _022E030C: bl ov10_022BDC0C bl FreeTopScreenStatus - bl ov29_0234AFD0 + bl FreeAlertBoxInfo bl ov29_0234BB20 bl ov29_02338D30 bl ov29_022ED0B0 diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 461e94e6..09fe9524 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -277,7 +277,7 @@ TryForcedLoss: ; 0x022E0620 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 mov r6, #0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs cmp r5, #0 bne _022E0648 bl IsFloorOver @@ -300,7 +300,7 @@ _022E0648: ldr r1, [r1] add r1, r1, #0x248 add r1, r1, #0x400 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString #ifdef JAPAN ldr r1, _022E1E90 ; =0x00000881 mov r0, #0 @@ -340,7 +340,7 @@ _022E06C8: ldr r1, [r1] add r1, r1, #0x248 add r1, r1, #0x400 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString ldr r1, _022E0808 ; =0x00000B71 mov r0, #0 mov r2, #1 @@ -376,7 +376,7 @@ _022E0774: add r0, r1, #0x248 add r1, r0, #0x400 mov r0, #0 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString ldr r1, _022E0810 ; =0x00000B72 mov r0, #0 mov r2, #1 diff --git a/asm/overlay_29_022E2810.s b/asm/overlay_29_022E2810.s index 931e8a34..aada78ca 100644 --- a/asm/overlay_29_022E2810.s +++ b/asm/overlay_29_022E2810.s @@ -242,7 +242,7 @@ SubstitutePlaceholderStringTags: ; 0x022E2AD8 mov r6, r1 mov r7, r0 mov r5, r2 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs ldr r1, [r6] mov r4, r0 cmp r1, #1 @@ -258,18 +258,18 @@ _022E2B10: ldr r2, [r6, #0xb4] mov r1, r7 mov r3, r5 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldmia sp!, {r3, r4, r5, r6, r7, pc} _022E2B2C: ldr r2, [r6, #0xb4] mov r1, r7 - bl ov29_02344BA8 + bl PrepareItemForPrinting2 ldmia sp!, {r3, r4, r5, r6, r7, pc} _022E2B3C: ldr r2, [r6, #0xb4] mov r1, r7 ldrb r2, [r2] - bl ov29_022EDF7C + bl SubstitutePlaceholderTrapTags ldmia sp!, {r3, r4, r5, r6, r7, pc} _022E2B50: ldr r0, _022E2B64 ; =0x00000A42 diff --git a/asm/overlay_29_022EDCBC.s b/asm/overlay_29_022EDCBC.s index 6c937c69..6ba06091 100644 --- a/asm/overlay_29_022EDCBC.s +++ b/asm/overlay_29_022EDCBC.s @@ -172,8 +172,8 @@ _022EDED4: ldmia sp!, {r4, pc} arm_func_end TryRemoveTrap - arm_func_start ov29_022EDEDC -ov29_022EDEDC: ; 0x022EDEDC + arm_func_start TryRevealAttackedTrap +TryRevealAttackedTrap: ; 0x022EDEDC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -211,32 +211,32 @@ _022EDF50: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022EDF58: .word DUNGEON_PTR - arm_func_end ov29_022EDEDC + arm_func_end TryRevealAttackedTrap arm_func_start ov29_022EDF5C ov29_022EDF5C: ; 0x022EDF5C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl sub_02024FC8 - bl ov29_0234B034 + bl GetSize0x80Buffer2 + bl GetMessageLogPreprocessorArgs add r0, r0, r5, lsl #2 str r4, [r0, #0x10] ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022EDF5C - arm_func_start ov29_022EDF7C -ov29_022EDF7C: ; 0x022EDF7C + arm_func_start SubstitutePlaceholderTrapTags +SubstitutePlaceholderTrapTags: ; 0x022EDF7C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 mov r0, r5 mov r4, r2 - bl sub_02024FC8 + bl GetSize0x80Buffer2 add r0, r6, r5, lsl #2 str r4, [r0, #0x10] ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_022EDF7C + arm_func_end SubstitutePlaceholderTrapTags arm_func_start TryTriggerTrap TryTriggerTrap: ; 0x022EDFA0 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index ed717333..9bcc809f 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -161,7 +161,7 @@ ov29_022F0780: ; 0x022F0780 sub sp, sp, #4 mov r4, r0 bl ov29_0234D668 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r2, #0 mov r1, r0 mov ip, #1 @@ -342,14 +342,14 @@ ov29_022F0984: ; 0x022F0984 mov r2, #0 bl SubstitutePlaceholderStringTags ldrsh r0, [r4, #0xc] - bl ov29_0234B118 + bl SetMessageLogPreprocessorArgsSpeakerId0x30000 b _022F09F4 _022F09E0: ldrsh r1, [r4, #2] mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldrsh r0, [r4, #2] - bl ov29_0234B104 + bl SetMessageLogPreprocessorArgsSpeakerId _022F09F4: cmp r5, #0 beq _022F0A6C @@ -367,7 +367,7 @@ _022F09F4: _022F0A28: add r0, sp, #0xc bl ov29_0234D65C - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov ip, #0 add r2, sp, #4 @@ -385,7 +385,7 @@ _022F0A28: _022F0A6C: add r0, sp, #0xc bl ov29_0234D65C - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r3, #1 mov r0, r7 @@ -3887,10 +3887,10 @@ ov29_022F3AFC: ; 0x022F3AFC arm_func_start ov29_022F3B8C ov29_022F3B8C: ; 0x022F3B8C - ldr ip, _022F3B94 ; =ov29_022FBAB4 + ldr ip, _022F3B94 ; =ResetTriggerFlags bx ip .align 2, 0 -_022F3B94: .word ov29_022FBAB4 +_022F3B94: .word ResetTriggerFlags arm_func_end ov29_022F3B8C arm_func_start ov29_022F3B98 diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index d173a36d..852c4fce 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -68,12 +68,12 @@ _022F5334: mov r1, r4 mov r0, #0 bl PrepareItemForPrinting__02345728 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r2, r5 mov r1, #0 str r1, [sp] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, r8 mov r1, r4 bl CanMonsterUseItem @@ -384,12 +384,12 @@ _022F57A4: add r1, sp, #0xc mov r0, #0 bl PrepareItemForPrinting__02345754 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r8 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldrsh r0, [sp, #0x10] bl GetItemCategoryVeneer cmp r0, #0 diff --git a/asm/overlay_29_022F59C4.s b/asm/overlay_29_022F59C4.s index 4b425bbc..935af739 100644 --- a/asm/overlay_29_022F59C4.s +++ b/asm/overlay_29_022F59C4.s @@ -112,19 +112,19 @@ _022F5A90: beq _022F5D84 _022F5ADC: ldr sb, [sl, #0xb4] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, sb mov r3, r1 str r1, [sp] - bl ov29_0230040C - bl ov29_0234B034 + bl SetPreprocessorArgsStringToName + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] mov r1, #1 mov r2, sb mov r3, #7 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, #3 bl ov29_02348C64 mov r0, r6 @@ -434,7 +434,7 @@ _022F5E84: mov r0, #0 bl ov29_0233A248 mov r0, #0 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r1, r0 add r0, sp, #4 mov r2, #0x40 @@ -452,7 +452,7 @@ _022F5E84: bl ov29_022E81F8 mov r0, #0 add r1, sp, #4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString mov r1, r6 mov r0, #0 mov r2, #1 @@ -694,7 +694,7 @@ _022F6198: ldrsh r1, [r1, r2] add r1, r3, r1 strh r1, [sp, #0xa] - bl ov29_02338430 + bl RevealAttackedTile _022F61E8: mov r0, sl bl EnemyEvolution diff --git a/asm/overlay_29_022F62CC.s b/asm/overlay_29_022F62CC.s index aa017c05..64f6372b 100644 --- a/asm/overlay_29_022F62CC.s +++ b/asm/overlay_29_022F62CC.s @@ -440,7 +440,7 @@ ov29_022F67D0: ; 0x022F67D0 _022F6870: mov r1, r4 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal mov r2, #0 ldr r1, _022F69FC ; =0x00000E4D add r0, sp, #0x14 @@ -606,7 +606,7 @@ _022F6A80: _022F6AAC: mov r1, r6 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal mov r2, #0 ldr r1, _022F6C98 ; =0x00000E4C add r0, sp, #4 diff --git a/asm/overlay_29_022F7768.s b/asm/overlay_29_022F7768.s index fa904891..5950df1e 100644 --- a/asm/overlay_29_022F7768.s +++ b/asm/overlay_29_022F7768.s @@ -173,7 +173,7 @@ _022F7958: beq _022F7AA0 ldrsh r1, [sl, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldr r1, _022F7BD4 ; =0x00000C0D mov r0, #0 mov r2, #1 @@ -234,7 +234,7 @@ _022F7A14: bl sub_020585B4 add r1, sp, #4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString mov r0, #0 mov r3, #1 ldr r1, _022F7BD8 ; =0x00000C0E @@ -262,7 +262,7 @@ _022F7AAC: bne _022F7AD8 ldrsh r1, [sl, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldr r1, _022F7BE0 ; =0x00000C0C mov r0, #0 mov r2, #1 @@ -318,7 +318,7 @@ _022F7B70: bl ItemZInit ldrsh r1, [sl, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal b _022F7BAC _022F7B98: add r0, r4, #1 @@ -330,7 +330,7 @@ _022F7BA4: _022F7BAC: ldrsh r1, [sl, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldr r1, _022F7BF0 ; =0x00000C12 mov r0, #0 mov r2, #1 @@ -386,7 +386,7 @@ ov29_022F7BF4: ; 0x022F7BF4 _022F7C5C: ldrsh r1, [r6, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldr r1, _022F7E1C ; =0x00000C0B mov r0, #0 mov r2, #1 @@ -399,7 +399,7 @@ _022F7C7C: beq _022F7CD4 ldrsh r1, [r6, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldrb r0, [r6, #2] cmp r0, #0xd9 blo _022F7CC0 @@ -470,7 +470,7 @@ _022F7D6C: bl ItemZInit ldrsh r1, [r6, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldrb r0, [r6, #2] cmp r0, #0xd9 blo _022F7DA4 @@ -496,7 +496,7 @@ _022F7DC4: blt _022F7CE4 ldrsh r1, [r6, #4] mov r0, #0 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal ldrb r0, [r6, #2] cmp r0, #0xd9 blo _022F7E00 diff --git a/asm/overlay_29_022F9744.s b/asm/overlay_29_022F9744.s index 565ffcb5..0d5497e2 100644 --- a/asm/overlay_29_022F9744.s +++ b/asm/overlay_29_022F9744.s @@ -770,12 +770,12 @@ ov29_022FA02C: ; 0x022FA02C add r0, sp, #0x49 bl GetLearnableIqSkills mov r7, r0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, sl mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r8, #1 add r5, sp, #4 mov r4, r8 diff --git a/asm/overlay_29_022FACBC.s b/asm/overlay_29_022FACBC.s index 32957fa5..179a24d4 100644 --- a/asm/overlay_29_022FACBC.s +++ b/asm/overlay_29_022FACBC.s @@ -241,7 +241,7 @@ _022FAF7C: cmp r6, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r1, _022FAFD0 ; =0x00000C22 mov r0, r4 bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_022FB678.s b/asm/overlay_29_022FB678.s index 33a973ab..a4269d19 100644 --- a/asm/overlay_29_022FB678.s +++ b/asm/overlay_29_022FB678.s @@ -386,8 +386,8 @@ _022FBAAC: ldmia sp!, {r4, pc} arm_func_end IsSpecialStoryAllyOrClient - arm_func_start ov29_022FBAB4 -ov29_022FBAB4: ; 0x022FBAB4 + arm_func_start ResetTriggerFlags +ResetTriggerFlags: ; 0x022FBAB4 ldr r2, [r0, #0xb4] cmp r2, #0 addne r0, r2, #0x100 @@ -400,4 +400,4 @@ ov29_022FBAB4: ; 0x022FBAB4 strne r1, [r2, #0x18c] #endif bx lr - arm_func_end ov29_022FBAB4 + arm_func_end ResetTriggerFlags diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index b258c5d8..12a08f6e 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -20,7 +20,7 @@ ExecuteMonsterAction: ; 0x022FE4BC bl AnimationDelayOrSomething bl ov29_022FBD08 mov r0, #1 - bl ov29_0234B024 + bl SetMessageLogGroupStartFlag ldr r5, [r6, #0xb4] mov r1, #0 strb r1, [r5, #0x109] @@ -651,7 +651,7 @@ _022FF7B4: bl ov29_022FBD08 #endif mov r0, #1 - bl ov29_0234B024 + bl SetMessageLogGroupStartFlag ldr r6, [sb, #0xb4] mov r1, #0 #ifdef JAPAN diff --git a/asm/overlay_29_0230027C.s b/asm/overlay_29_0230027C.s index 506bfe09..162beb2a 100644 --- a/asm/overlay_29_0230027C.s +++ b/asm/overlay_29_0230027C.s @@ -149,14 +149,14 @@ _02300408: .word 0x00000C33 #endif arm_func_end ov29_02300358 - arm_func_start ov29_0230040C -ov29_0230040C: ; 0x0230040C + arm_func_start SetPreprocessorArgsStringToName +SetPreprocessorArgsStringToName: ; 0x0230040C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 mov r7, r0 mov r0, r6 mov r5, r2 - bl sub_02024FB8 + bl GetSize0x80Buffer ldrsh r1, [sp, #0x18] mov r4, r0 cmp r1, #0 @@ -201,6 +201,6 @@ _02300490: ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6 mov r1, r4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_0230040C + arm_func_end SetPreprocessorArgsStringToName diff --git a/asm/overlay_29_023026FC.s b/asm/overlay_29_023026FC.s index 03b1b1c4..a9f1d494 100644 --- a/asm/overlay_29_023026FC.s +++ b/asm/overlay_29_023026FC.s @@ -115,13 +115,13 @@ _02302818: add r2, r0, fp mov r0, #0 str r2, [sb, #0x20] - bl ov29_0234B09C - bl ov29_0234B034 + bl SetMessageLogPreprocessorArgsNumberVal + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] mov r2, sb mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, sl ldr r1, _02302A34 ; =0x00000F1F bl LogMessageByIdWithPopup diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index a67c4830..5f1e3cb8 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -505,13 +505,13 @@ _0230309C: _023030F0: mov r0, #0 mov r1, r5 - bl ov29_0234B09C - bl ov29_0234B034 + bl SetMessageLogPreprocessorArgsNumberVal + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName #ifdef JAPAN ldr r1, _023047C0 ; =0x00002487 mov r0, sl @@ -528,13 +528,13 @@ _02303124: _02303130: mov r0, #0 mov r1, r5 - bl ov29_0234B09C - bl ov29_0234B034 + bl SetMessageLogPreprocessorArgsNumberVal + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName #ifdef JAPAN ldr r1, _023047C0 ; =0x00002487 mov r0, sl @@ -754,12 +754,12 @@ _0230344C: _02303450: cmp sb, r4 bgt _02303314 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldrb r1, [r7, #0xa] cmp r1, r6 bne _02303494 @@ -771,7 +771,7 @@ _02303450: b _023034BC _02303494: mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal mov r0, sl mov r1, #0x204 bl ov29_022E56A0 @@ -967,12 +967,12 @@ _02303718: cmp sl, #0 cmpne r8, #0 beq _02303818 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r5 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r1, r4 mov r0, #0 bl SetPreprocessorArgsIdVal @@ -1389,15 +1389,15 @@ EvolveMonster: ; 0x02303C7C ldr r6, [r7, #0xb4] mov r8, r0 mov r5, r2 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r6 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r1, r5 mov r0, #1 - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal mov r0, r5 bl DungeonGetSpriteIndex strh r5, [r6, #4] diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index 452f8ce1..27ba993a 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -525,7 +525,7 @@ _0230A160: b _0230A234 _0230A16C: mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r1, [r5, #4] ldr r2, [r7, #0xb8] cmp r1, #0x1b @@ -1629,7 +1629,7 @@ _02309734: b _02309808 _02309740: mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r1, [r6, #4] ldr r2, [r4, #0xb8] cmp r1, #0x1b diff --git a/asm/overlay_29_0230AA0C.s b/asm/overlay_29_0230AA0C.s index 123fce70..3e445b8a 100644 --- a/asm/overlay_29_0230AA0C.s +++ b/asm/overlay_29_0230AA0C.s @@ -1105,7 +1105,7 @@ _0230B8E0: mov r1, sb mov r2, r8 bl ScrappyShouldActivate - ldr r1, _0230BBA0 ; =ov29_02352884 + ldr r1, _0230BBA0 ; =WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS str r0, [sp] add ip, sp, #4 ldmia r1, {r0, r1, r2, r3} @@ -1302,7 +1302,7 @@ _0230BB98: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230BBA0: .word ov29_02352884 +_0230BBA0: .word WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS _0230BBA4: .word DUNGEON_PTR _0230BBA8: .word 0x000003E7 arm_func_end WeightWeakTypePicker @@ -3999,23 +3999,23 @@ TryRecruit: ; 0x0230E064 bl IsMonsterOnTeam cmp r0, #0 beq _0230E0FC - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #1 str r1, [sp] mov r1, r5 ldr r2, [sb, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName b _0230E114 _0230E0FC: - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r5 str r1, [sp] ldr r2, [sb, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName _0230E114: - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r3, #1 mov r2, #0 @@ -4115,7 +4115,7 @@ _0230E218: bl StrncpySimpleNoPad #endif bl ov29_022EACAC - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r0, #1 str r0, [sp] @@ -4141,7 +4141,7 @@ _0230E2D4: bl sub_020585B4 mov r1, r4 mov r0, #0 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString mov r0, #1 mov r1, #0 bl SetPreprocessorArgsIdVal @@ -4188,12 +4188,12 @@ _0230E380: _0230E38C: mov r0, #0 add r1, sp, #0x58 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString mov r0, #1 mov r1, sl mov r2, #0 bl SubstitutePlaceholderStringTags - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #1 mov r2, #0 str r1, [sp] diff --git a/asm/overlay_29_0230E5A8.s b/asm/overlay_29_0230E5A8.s index 19aec5ea..bd155164 100644 --- a/asm/overlay_29_0230E5A8.s +++ b/asm/overlay_29_0230E5A8.s @@ -66,7 +66,7 @@ ov29_0230E658: ; 0x0230E658 mov r0, r4 bl StringFromId mov r4, r0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r2, r4 str r0, [sp] mov r0, r5 @@ -75,7 +75,7 @@ ov29_0230E658: ; 0x0230E658 bl PreprocessString mov r0, r5 bl ov29_0234BB50 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r0, r5 mov r2, #1 diff --git a/asm/overlay_29_02311C28.s b/asm/overlay_29_02311C28.s index b40174fc..0196fd16 100644 --- a/asm/overlay_29_02311C28.s +++ b/asm/overlay_29_02311C28.s @@ -393,12 +393,12 @@ _023120BC: cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r4 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldrb r0, [r4, #0xd0] cmp r0, #3 beq _02312160 @@ -519,12 +519,12 @@ _02312260: cmp r7, #0 movne r0, #1 bne _0231231C - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r6 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldrb r0, [r6, #0xd0] cmp r0, #7 beq _02312300 @@ -598,12 +598,12 @@ TryInflictBurnStatus: ; 0x02312338 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r7, [sb, #0xb4] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, sl mov r1, sb mov r2, #0x42 @@ -736,12 +736,12 @@ _02312534: cmp r5, #0 bne _023125AC mov r5, #1 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _02312614 ; =0x00000DC5 mov r0, sl mov r1, sb @@ -845,12 +845,12 @@ TryInflictPoisonedStatus: ; 0x02312664 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r7, [sb, #0xb4] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, sb mov r1, #0x1b bl ItemIsActive__02311BF8 @@ -982,12 +982,12 @@ _02312868: cmp r5, #0 bne _023128E0 mov r5, #1 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _02312938 ; =0x00000DC5 mov r0, sl mov r1, sb @@ -1053,12 +1053,12 @@ TryInflictBadlyPoisonedStatus: ; 0x0231293C movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r7, [sb, #0xb4] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, sb mov r1, #0x1b bl ItemIsActive__02311BF8 @@ -1182,12 +1182,12 @@ _02312B24: cmp r5, #0 bne _02312B9C mov r5, #1 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _02312BF4 ; =0x00000DC5 mov r0, sl mov r1, sb @@ -2006,7 +2006,7 @@ LowerOffensiveStat: ; 0x023135FC bl CopyStringFromId mov r1, r6 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313678 _02313660: ldr r1, _023137F8 ; =0x00000DCA @@ -2014,7 +2014,7 @@ _02313660: bl CopyStringFromId mov r1, r6 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313678: ldrb r0, [sp, #0x28] cmp r0, #0 @@ -2084,7 +2084,7 @@ _02313720: bl CopyStringFromId mov r1, r4 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313798 _02313780: ldr r1, _02313808 ; =0x00000DCC @@ -2092,7 +2092,7 @@ _02313780: bl CopyStringFromId mov r1, r4 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313798: ldr r1, [sp, #0x20] add r0, r6, r1, lsl #1 @@ -2166,7 +2166,7 @@ LowerDefensiveStat: ; 0x02313814 bl CopyStringFromId mov r1, r6 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313890 _02313878: ldr r1, _0231398C ; =0x00000DC8 @@ -2174,7 +2174,7 @@ _02313878: bl CopyStringFromId mov r1, r6 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313890: ldrb r0, [sp, #0x28] cmp r0, #0 @@ -2208,7 +2208,7 @@ _023138B4: bl CopyStringFromId mov r1, r4 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _0231392C _02313914: ldr r1, _02313994 ; =0x00000DCC @@ -2216,7 +2216,7 @@ _02313914: bl CopyStringFromId mov r1, r4 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _0231392C: ldr r1, [sp, #0x20] add r0, r6, r1, lsl #1 @@ -2286,7 +2286,7 @@ BoostOffensiveStat: ; 0x0231399C bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313A3C _02313A24: ldr r1, _02313AF4 ; =0x00000DCA @@ -2294,7 +2294,7 @@ _02313A24: bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313A3C: mov r0, r8 mov r1, #0x61 @@ -2309,7 +2309,7 @@ _02313A3C: bl CopyStringFromId mov r1, r5 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313A90 _02313A78: ldr r1, _02313AFC ; =0x00000DCC @@ -2317,7 +2317,7 @@ _02313A78: bl CopyStringFromId mov r1, r5 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313A90: ldr r1, [sp, #0x28] add r0, r7, r1, lsl #1 @@ -2395,7 +2395,7 @@ BoostDefensiveStat: ; 0x02313B08 bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313BA8 _02313B90: ldr r1, _02313C60 ; =0x00000DC8 @@ -2403,7 +2403,7 @@ _02313B90: bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313BA8: mov r0, r8 mov r1, #0x61 @@ -2418,7 +2418,7 @@ _02313BA8: bl CopyStringFromId mov r1, r5 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313BFC _02313BE4: ldr r1, _02313C68 ; =0x00000DCC @@ -2426,7 +2426,7 @@ _02313BE4: bl CopyStringFromId mov r1, r5 mov r0, #2 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313BFC: ldr r1, [sp, #0x28] add r0, r7, r1, lsl #1 @@ -2557,7 +2557,7 @@ ApplyOffensiveStatMultiplier: ; 0x02313D40 bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313DAC _02313D94: ldr r1, _02313F4C ; =0x00000DCA @@ -2565,7 +2565,7 @@ _02313D94: bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313DAC: cmp r7, #0x100 bge _02313DCC @@ -2712,7 +2712,7 @@ ApplyDefensiveStatMultiplier: ; 0x02313F64 bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02313FD0 _02313FB8: ldr r1, _023140D0 ; =0x00000DC8 @@ -2720,7 +2720,7 @@ _02313FB8: bl CopyStringFromId mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02313FD0: cmp r7, #0x100 bge _02313FF0 @@ -2836,7 +2836,7 @@ BoostHitChanceStat: ; 0x023140E4 bl CopyStringFromId mov r1, r8 mov r0, r4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02314174 _0231415C: ldr r1, _0231421C ; =0x00000DC6 @@ -2844,7 +2844,7 @@ _0231415C: bl CopyStringFromId mov r1, r8 mov r0, r4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _02314174: mov r0, r6 mov r1, #0x61 @@ -2926,7 +2926,7 @@ LowerHitChanceStat: ; 0x0231422C bl CopyStringFromId mov r1, r5 mov r0, r4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _0231429C _02314284: ldr r1, _023143D4 ; =0x00000DC6 @@ -2934,7 +2934,7 @@ _02314284: bl CopyStringFromId mov r1, r5 mov r0, r4 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString _0231429C: mov r0, r7 mov r1, r6 @@ -3290,12 +3290,12 @@ _02314718: cmp r5, #0 bne _02314790 mov r5, #1 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r7 mov r3, r1 str r1, [sp] - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _023147E8 ; =0x00000DC5 mov r0, sl mov r1, sb diff --git a/asm/overlay_29_0231516C.s b/asm/overlay_29_0231516C.s index dbb791a5..cdf4c78f 100644 --- a/asm/overlay_29_0231516C.s +++ b/asm/overlay_29_0231516C.s @@ -233,10 +233,10 @@ _02315464: bl UpdateStatusIconFlags mov r1, sl mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal mov r0, #1 mov r1, r8 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal mov r0, #0 mov r1, r6 mov r2, r0 @@ -1542,7 +1542,7 @@ TryInflictStockpileStatus: ; 0x023164D8 bl ov29_022E46D4 ldrb r1, [r5, #0x11e + TRY_INFLICT_STOCKPILE_STATUS_OFFSET] mov r0, r4 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r2, _02316574 ; =0x00000D4B mov r0, r7 mov r1, r6 @@ -2537,7 +2537,7 @@ _02317260: b _023173F4 _02317298: mov r0, #0 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r1, r0 add r0, sp, #0 bl strcpy @@ -2612,17 +2612,17 @@ _02317350: add r0, r0, #1 strb r0, [r8, #0xf0] mov r0, #1 - bl sub_02024FB8 + bl GetSize0x80Buffer ldrsh r1, [r8, #4] mov r2, #0x4e mov r4, r0 bl GetNameWithGender mov r0, #0 add r1, sp, #0 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString mov r1, r4 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString ldr r2, _02317408 ; =0x00000D6D mov r0, sl mov r1, sb diff --git a/asm/overlay_29_0231A9F8.s b/asm/overlay_29_0231A9F8.s index ca163f26..0e5d7a7a 100644 --- a/asm/overlay_29_0231A9F8.s +++ b/asm/overlay_29_0231A9F8.s @@ -33,7 +33,7 @@ ov29_0231A9F8: ; 0x0231A9F8 b _0231AC88 _0231AA60: mov r0, r7 - bl ov29_022FBAB4 + bl ResetTriggerFlags add r2, sp, #0x1e add r3, r5, #0x4a mov r1, #0xa diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index fb79beec..07da5620 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -638,7 +638,7 @@ _0231D3BC: ble _0231D3E8 sub r1, r1, r0 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r2, _0231D494 ; =0x00000BF7 mov r0, sl mov r1, sb @@ -649,7 +649,7 @@ _0231D3E8: ble _0231D410 sub r1, r0, fp mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r2, _0231D498 ; =0x00000BF8 mov r0, sl mov r1, sb @@ -660,7 +660,7 @@ _0231D410: ble _0231D438 sub r1, r0, r6 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r2, _0231D49C ; =0x00000BF9 mov r0, sl mov r1, sb @@ -671,7 +671,7 @@ _0231D438: ble _0231D460 sub r1, r0, r7 mov r0, #0 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r2, _0231D4A0 ; =0x00000BFA mov r0, sl mov r1, sb diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 20ac1bdd..30965885 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -22,7 +22,7 @@ ov29_0232145C: ; 0x0232145C ldr r5, [sl, #0xb4] movge r0, #0 bge _02321A40 - bl ov29_022FBAB4 + bl ResetTriggerFlags mov r0, #0 strb r0, [r5, #0x163 + OV29_0232145C_OFFSET] ldrb r1, [r5, #0xd0] @@ -205,7 +205,7 @@ _02321700: mov r0, sl bl ov29_02324698 strh r0, [sp, #0x30] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 add r2, sp, #0x2c mov r3, r1 @@ -344,7 +344,7 @@ _023218EC: mov r0, sl bl ov29_02324698 strh r0, [sp, #0x20] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 add r2, sp, #0x1c mov r3, r1 @@ -1246,13 +1246,13 @@ _023224C4: mov r2, #1 bl GetMoveRangeDistance and fp, r0, #0xff - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] ldr r2, [r6, #0xb4] mov r3, r1 - bl ov29_0230040C - bl ov29_0234B034 + bl SetPreprocessorArgsStringToName + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r8 mov r3, r1 @@ -1341,15 +1341,15 @@ _023225D4: _02322630: cmp sb, #0 bne _023226D0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] ldr r2, [r6, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName cmp r5, #0 bne _02322694 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r8 mov r3, r1 diff --git a/asm/overlay_29_02322DDC.s b/asm/overlay_29_02322DDC.s index d4831d0b..b0a7fd1a 100644 --- a/asm/overlay_29_02322DDC.s +++ b/asm/overlay_29_02322DDC.s @@ -35,15 +35,15 @@ _02322E38: _02322E40: cmp r5, #0 beq _02322E94 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] ldr r2, [sl, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName cmp r7, #0 bne _02322E80 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, sb mov r3, r1 diff --git a/asm/overlay_29_02324698.s b/asm/overlay_29_02324698.s index fd4cd224..f3a5ec85 100644 --- a/asm/overlay_29_02324698.s +++ b/asm/overlay_29_02324698.s @@ -957,7 +957,7 @@ _02325228: str r3, [r1, #0x238 + OV29_023250D4_OFFSET] ldr r1, [r2] add r1, r1, #4 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r1, _02325618 ; =0x00000EAA mov r0, r5 bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index 501b65a6..33c3a00b 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -1138,7 +1138,7 @@ _0232642C: bne _02326494 tst r0, #0x10 beq _023264A0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 add r2, r5, r4 mov r3, r1 @@ -1172,7 +1172,7 @@ _023264A0: mov r7, #1 orr r0, r0, #0x20 strb r0, [r8, #0x144 + DO_MOVE_TORMENT_OFFSET] - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 add r2, sp, #0 mov r3, r1 diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index ae3685d7..f4ee9fab 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -2108,12 +2108,12 @@ _023299A8: mov r0, r7 mov r1, r6 bl CalcDamage - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] ldr r2, [r7, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _02329A94 ; =0x00000EDB mov r1, r6 mov r0, r7 @@ -2257,12 +2257,12 @@ _02329BA0: mov r0, r7 mov r1, r6 bl CalcDamage - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 str r1, [sp] ldr r2, [r7, #0xb4] mov r3, r1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName ldr r2, _02329C8C ; =0x00000EDB mov r1, r6 mov r0, r7 diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index 5b0f9d71..9fdcab20 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -369,14 +369,14 @@ _0232C978: b _0232CA04 _0232C99C: mov r0, #1 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r5, r0 mov r1, r4 mov r2, #0x4e bl GetNameWithGender mov r1, r5 mov r0, #1 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString ldr r2, _0232CA10 ; =0x00000F01 mov r0, sb mov r1, r8 diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index dbeb8a63..7df8cafd 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -898,12 +898,12 @@ _0232F4EC: ldr r1, _0232F840 ; =0x00001306 bl ov29_022E56A0 _0232F4F4: - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r3, #0 str r3, [sp] ldr r2, [r4, #0xb4] mov r1, #1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName cmp sb, r4 mov r0, sb mov r1, r4 diff --git a/asm/overlay_29_02332A0C.s b/asm/overlay_29_02332A0C.s index ee6f0f31..d507e705 100644 --- a/asm/overlay_29_02332A0C.s +++ b/asm/overlay_29_02332A0C.s @@ -318,12 +318,12 @@ _02332DFC: strb r0, [r4, #0x167 + PERFORM_DAMAGE_SEQUENCE_OFFSET] b _02332ED0 _02332E3C: - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r3, #0 str r3, [sp] ldr r2, [r7, #0xb4] mov r1, #1 - bl ov29_0230040C + bl SetPreprocessorArgsStringToName mov r0, r8 bl ShouldDisplayEntityWrapper cmp r0, #0 diff --git a/asm/overlay_29_023383A8.s b/asm/overlay_29_023383A8.s index 6deaaf18..9f41cad3 100644 --- a/asm/overlay_29_023383A8.s +++ b/asm/overlay_29_023383A8.s @@ -65,12 +65,12 @@ _0233842C: .word 0x00000C05 #endif arm_func_end TryActivateGravity - arm_func_start ov29_02338430 -ov29_02338430: ; 0x02338430 + arm_func_start RevealAttackedTile +RevealAttackedTile: ; 0x02338430 stmdb sp!, {r4, lr} mov r4, r0 mov r1, #1 - bl ov29_022EDEDC + bl TryRevealAttackedTrap mov r0, r4 bl PositionIsOnHiddenStairs cmp r0, #0 @@ -78,7 +78,7 @@ ov29_02338430: ; 0x02338430 mov r0, #1 bl HiddenStairsTrigger ldmia sp!, {r4, pc} - arm_func_end ov29_02338430 + arm_func_end RevealAttackedTile arm_func_start ov29_0233845C ov29_0233845C: ; 0x0233845C diff --git a/asm/overlay_29_02344178.s b/asm/overlay_29_02344178.s index f09b4ff9..42aad0c4 100644 --- a/asm/overlay_29_02344178.s +++ b/asm/overlay_29_02344178.s @@ -376,7 +376,7 @@ _023445E0: _02344620: mov r0, #0 mov r1, #0x64 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r0, _02344A70 ; =0x00000F4A mov r1, r4 mov r2, #0 @@ -452,7 +452,7 @@ _0234471C: bl ov29_022F0654 mov r0, #0 mov r1, #0x64 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r0, _02344A90 ; =0x00000F33 mov r1, r4 mov r2, #0 @@ -541,7 +541,7 @@ _0234485C: bl ov29_022F0654 mov r0, #0 mov r1, #0x64 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r0, _02344AB8 ; =0x00000F54 mov r1, r4 mov r2, #0 @@ -611,7 +611,7 @@ _02344950: bl ov29_022F0654 mov r0, #0 mov r1, #0x64 - bl ov29_0234B09C + bl SetMessageLogPreprocessorArgsNumberVal ldr r0, _02344ADC ; =0x00000F3F mov r1, r4 mov r2, #0 diff --git a/asm/overlay_29_02344B1C.s b/asm/overlay_29_02344B1C.s index f1179462..cb619b3e 100644 --- a/asm/overlay_29_02344B1C.s +++ b/asm/overlay_29_02344B1C.s @@ -63,8 +63,8 @@ ov29_02344B9C: ; 0x02344B9C _02344BA4: .word SetPreprocessorArgsIdVal arm_func_end ov29_02344B9C - arm_func_start ov29_02344BA8 -ov29_02344BA8: ; 0x02344BA8 + arm_func_start PrepareItemForPrinting2 +PrepareItemForPrinting2: ; 0x02344BA8 stmdb sp!, {r3, lr} add r3, r0, r1, lsl #2 orr ip, r1, #0x40000 @@ -76,7 +76,7 @@ ov29_02344BA8: ; 0x02344BA8 ldmia sp!, {r3, pc} .align 2, 0 _02344BCC: .word ov29_023531BC - arm_func_end ov29_02344BA8 + arm_func_end PrepareItemForPrinting2 arm_func_start GenerateStandardItem GenerateStandardItem: ; 0x02344BD0 diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 427ec1ef..dd309877 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -328,7 +328,7 @@ SpawnDroppedItem: ; 0x02345AD8 add r1, r8, #4 bl ov29_02347378 add r0, r8, #4 - bl ov29_02338430 + bl RevealAttackedTile ldr r1, _02345D64 ; =0x00000BD8 mov r0, sb bl LogMessageByIdWithPopupCheckUser diff --git a/asm/overlay_29_02348020.s b/asm/overlay_29_02348020.s index c3fbf720..bda0f805 100644 --- a/asm/overlay_29_02348020.s +++ b/asm/overlay_29_02348020.s @@ -884,7 +884,7 @@ ov29_02348B28: ; 0x02348B28 mov r0, #0 add r1, r1, #0x700 ldrsh r1, [r1, #0x6a] - bl ov29_0234B06C + bl SetMessageLogPreprocessorArgsFlagVal mov r1, r4 mov r0, #1 bl PrepareItemForPrinting__02345728 @@ -1008,14 +1008,14 @@ _02348C84: mov r2, #0x4e bl GetName mov r0, r5 - bl sub_02024FB8 + bl GetSize0x80Buffer add r1, sp, #0 bl strcpy mov r0, r5 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r1, r0 mov r0, r5 - bl ov29_0234B0B4 + bl SetMessageLogPreprocessorArgsString b _02348CF4 _02348CE8: add r4, r4, #1 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index c29370df..b0028fdb 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -375,7 +375,7 @@ _02349D38: bl InitPortraitDungeon mov r1, r5 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A210 ; =0x00000E35 add r0, sp, #0x10 mov r2, #1 @@ -409,7 +409,7 @@ _02349DC8: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A214 ; =0x00000E31 add r0, sp, #0 mov r2, #1 @@ -459,7 +459,7 @@ _02349E6C: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A214 ; =0x00000E31 add r0, sp, #0x20 mov r2, #1 @@ -491,7 +491,7 @@ _02349F1C: bl GetMissionTargetEnemy mov r1, r0 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName mov r0, #0 ldr r1, _0234A224 ; =0x00000E0A mov r2, #1 @@ -510,7 +510,7 @@ _02349F1C: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A228 ; =0x00000E0B add r0, sp, #0x80 mov r2, #1 @@ -530,7 +530,7 @@ _02349FA4: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A22C ; =0x00000E0C add r0, sp, #0x70 mov r2, #1 @@ -550,7 +550,7 @@ _02349FF0: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A230 ; =0x00000E0D add r0, sp, #0x60 mov r2, #1 @@ -570,7 +570,7 @@ _0234A03C: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A234 ; =0x00000E0E add r0, sp, #0x50 mov r2, #1 @@ -590,7 +590,7 @@ _0234A088: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName #ifdef JAPAN add r0, sp, #0x40 mov r1, #0xb50 @@ -615,7 +615,7 @@ _0234A0D4: bl SetPortraitLayout mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName #ifdef JAPAN ldr r1, _0234B4DC_2 ; =0x00000B51 add r0, sp, #0x30 @@ -651,7 +651,7 @@ _0234A148: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A240 ; =0x00000E07 add r0, sp, #0x90 mov r2, #1 @@ -921,7 +921,7 @@ _0234A47C: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A5C8 ; =0x00000E1E add r0, sp, #0x14 mov r2, #1 @@ -960,7 +960,7 @@ _0234A504: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A5D8 ; =0x00000E1B add r0, sp, #4 mov r2, #1 @@ -1087,7 +1087,7 @@ _0234A6B8: bl InitPortraitDungeon mov r1, r5 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A754 ; =0x00000E29 add r0, sp, #0 mov r2, #1 @@ -1180,7 +1180,7 @@ _0234A7CC: bl SubstitutePlaceholderStringTags mov r1, r7 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A8AC ; =0x00000E14 mov r0, #0 mov r2, #1 @@ -1191,7 +1191,7 @@ _0234A7CC: ldr r1, [r5, #0xb4] mov r0, #1 ldrsh r1, [r1, #2] - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, [r5, #0xb4] add r0, sp, #0 ldrsh r6, [r1, #2] @@ -1200,7 +1200,7 @@ _0234A7CC: bl InitPortraitDungeon mov r1, r6 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A8B0 ; =0x00000E18 add r0, sp, #0 mov r2, #1 @@ -1208,7 +1208,7 @@ _0234A7CC: _0234A84C: mov r1, r7 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName mov r0, r7 mov r1, #0 bl ov29_02348888 @@ -1270,7 +1270,7 @@ ov29_0234A8BC: ; 0x0234A8BC bl ov29_02344B9C mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A978 ; =0x00000E16 mov r0, #0 mov r2, #1 @@ -1289,7 +1289,7 @@ _0234A928: bl SubstitutePlaceholderStringTags mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234A97C ; =0x00000E15 mov r0, #0 mov r2, #1 @@ -1355,7 +1355,7 @@ _0234A9DC: bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234AA88 ; =0x00000E37 add r0, sp, #0 mov r2, #1 @@ -1439,7 +1439,7 @@ _0234AAC4: bl InitPortraitDungeon mov r1, r5 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName #ifdef JAPAN ldr r1, _0234BE10 ; =0x00000B81 add r0, sp, #0 @@ -1511,7 +1511,7 @@ ov29_0234ABB0: ; 0x0234ABB0 bl SubstitutePlaceholderStringTags mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234AC80 ; =0x00000E13 mov r0, #0 mov r2, #1 @@ -1579,7 +1579,7 @@ ov29_0234AC8C: ; 0x0234AC8C mov r0, #0 bl ov29_02348888 bl ov29_0234D630 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r0, #1 str r0, [sp] @@ -1657,7 +1657,7 @@ _0234AD44: bl HandleFaint mov r1, r5 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234ADC8 ; =0x00000E19 mov r0, #0 mov r2, #1 @@ -1729,7 +1729,7 @@ ov29_0234AE40: ; 0x0234AE40 bl InitPortraitDungeon mov r1, r4 mov r0, #1 - bl ov29_0234B0CC + bl SetMessageLogPreprocessorArgsStringToName ldr r1, _0234AE98 ; =0x00000E06 add r0, sp, #0 mov r2, #1 @@ -1834,180 +1834,180 @@ _0234AF8C: _0234AFA0: .word 0x0000025B arm_func_end ov29_0234AF34 - arm_func_start ov29_0234AFA4 -ov29_0234AFA4: ; 0x0234AFA4 + arm_func_start InitAlertBoxInfo +InitAlertBoxInfo: ; 0x0234AFA4 stmdb sp!, {r3, lr} mov r0, #0xcf0 mov r1, #0 bl MemAlloc - ldr r2, _0234AFCC ; =ov29_023537CC + ldr r2, _0234AFCC ; =MESSAGE_LOG_INFO mov r1, #0xcf0 str r0, [r2, #4] bl MemZero bl ov29_0234B130 ldmia sp!, {r3, pc} .align 2, 0 -_0234AFCC: .word ov29_023537CC - arm_func_end ov29_0234AFA4 +_0234AFCC: .word MESSAGE_LOG_INFO + arm_func_end InitAlertBoxInfo - arm_func_start ov29_0234AFD0 -ov29_0234AFD0: ; 0x0234AFD0 + arm_func_start FreeAlertBoxInfo +FreeAlertBoxInfo: ; 0x0234AFD0 stmdb sp!, {r3, lr} - ldr r0, _0234AFF8 ; =ov29_023537CC + ldr r0, _0234AFF8 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0234AFF8 ; =ov29_023537CC + ldr r0, _0234AFF8 ; =MESSAGE_LOG_INFO mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0234AFF8: .word ov29_023537CC - arm_func_end ov29_0234AFD0 +_0234AFF8: .word MESSAGE_LOG_INFO + arm_func_end FreeAlertBoxInfo arm_func_start ov29_0234AFFC ov29_0234AFFC: ; 0x0234AFFC - ldr r1, _0234B00C ; =ov29_023537CC + ldr r1, _0234B00C ; =MESSAGE_LOG_INFO ldr r1, [r1, #4] strb r0, [r1, #0xced] bx lr .align 2, 0 -_0234B00C: .word ov29_023537CC +_0234B00C: .word MESSAGE_LOG_INFO arm_func_end ov29_0234AFFC arm_func_start ov29_0234B010 ov29_0234B010: ; 0x0234B010 - ldr r1, _0234B020 ; =ov29_023537CC + ldr r1, _0234B020 ; =MESSAGE_LOG_INFO ldr r1, [r1, #4] strb r0, [r1, #0xcee] bx lr .align 2, 0 -_0234B020: .word ov29_023537CC +_0234B020: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B010 - arm_func_start ov29_0234B024 -ov29_0234B024: ; 0x0234B024 - ldr r1, _0234B030 ; =ov29_023537CC + arm_func_start SetMessageLogGroupStartFlag +SetMessageLogGroupStartFlag: ; 0x0234B024 + ldr r1, _0234B030 ; =MESSAGE_LOG_INFO strb r0, [r1] bx lr .align 2, 0 -_0234B030: .word ov29_023537CC - arm_func_end ov29_0234B024 +_0234B030: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogGroupStartFlag - arm_func_start ov29_0234B034 -ov29_0234B034: ; 0x0234B034 - ldr r0, _0234B048 ; =ov29_023537CC + arm_func_start GetMessageLogPreprocessorArgs +GetMessageLogPreprocessorArgs: ; 0x0234B034 + ldr r0, _0234B048 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bx lr .align 2, 0 -_0234B048: .word ov29_023537CC - arm_func_end ov29_0234B034 +_0234B048: .word MESSAGE_LOG_INFO + arm_func_end GetMessageLogPreprocessorArgs - arm_func_start ov29_0234B04C -ov29_0234B04C: ; 0x0234B04C - ldr r0, _0234B064 ; =ov29_023537CC + arm_func_start InitMessageLogPreprocessorArgs +InitMessageLogPreprocessorArgs: ; 0x0234B04C + ldr r0, _0234B064 ; =MESSAGE_LOG_INFO ldr ip, _0234B068 ; =InitPreprocessorArgs ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bx ip .align 2, 0 -_0234B064: .word ov29_023537CC +_0234B064: .word MESSAGE_LOG_INFO _0234B068: .word InitPreprocessorArgs - arm_func_end ov29_0234B04C + arm_func_end InitMessageLogPreprocessorArgs - arm_func_start ov29_0234B06C -ov29_0234B06C: ; 0x0234B06C - ldr r2, _0234B080 ; =ov29_023537CC + arm_func_start SetMessageLogPreprocessorArgsFlagVal +SetMessageLogPreprocessorArgsFlagVal: ; 0x0234B06C + ldr r2, _0234B080 ; =MESSAGE_LOG_INFO ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xc9c] bx lr .align 2, 0 -_0234B080: .word ov29_023537CC - arm_func_end ov29_0234B06C +_0234B080: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsFlagVal arm_func_start SetPreprocessorArgsIdVal SetPreprocessorArgsIdVal: ; 0x0234B084 - ldr r2, _0234B098 ; =ov29_023537CC + ldr r2, _0234B098 ; =MESSAGE_LOG_INFO ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcac] bx lr .align 2, 0 -_0234B098: .word ov29_023537CC +_0234B098: .word MESSAGE_LOG_INFO arm_func_end SetPreprocessorArgsIdVal - arm_func_start ov29_0234B09C -ov29_0234B09C: ; 0x0234B09C - ldr r2, _0234B0B0 ; =ov29_023537CC + arm_func_start SetMessageLogPreprocessorArgsNumberVal +SetMessageLogPreprocessorArgsNumberVal: ; 0x0234B09C + ldr r2, _0234B0B0 ; =MESSAGE_LOG_INFO ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcc0] bx lr .align 2, 0 -_0234B0B0: .word ov29_023537CC - arm_func_end ov29_0234B09C +_0234B0B0: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsNumberVal - arm_func_start ov29_0234B0B4 -ov29_0234B0B4: ; 0x0234B0B4 - ldr r2, _0234B0C8 ; =ov29_023537CC + arm_func_start SetMessageLogPreprocessorArgsString +SetMessageLogPreprocessorArgsString: ; 0x0234B0B4 + ldr r2, _0234B0C8 ; =MESSAGE_LOG_INFO ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcd4] bx lr .align 2, 0 -_0234B0C8: .word ov29_023537CC - arm_func_end ov29_0234B0B4 +_0234B0C8: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsString - arm_func_start ov29_0234B0CC -ov29_0234B0CC: ; 0x0234B0CC + arm_func_start SetMessageLogPreprocessorArgsStringToName +SetMessageLogPreprocessorArgsStringToName: ; 0x0234B0CC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - bl sub_02024FB8 + bl GetSize0x80Buffer mov r1, r4 mov r2, #0x4e mov r4, r0 bl GetName - ldr r0, _0234B100 ; =ov29_023537CC + ldr r0, _0234B100 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] add r0, r0, r5, lsl #2 str r4, [r0, #0xcd4] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234B100: .word ov29_023537CC - arm_func_end ov29_0234B0CC +_0234B100: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsStringToName - arm_func_start ov29_0234B104 -ov29_0234B104: ; 0x0234B104 - ldr r1, _0234B114 ; =ov29_023537CC + arm_func_start SetMessageLogPreprocessorArgsSpeakerId +SetMessageLogPreprocessorArgsSpeakerId: ; 0x0234B104 + ldr r1, _0234B114 ; =MESSAGE_LOG_INFO ldr r1, [r1, #4] str r0, [r1, #0xce8] bx lr .align 2, 0 -_0234B114: .word ov29_023537CC - arm_func_end ov29_0234B104 +_0234B114: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsSpeakerId - arm_func_start ov29_0234B118 -ov29_0234B118: ; 0x0234B118 - ldr r1, _0234B12C ; =ov29_023537CC + arm_func_start SetMessageLogPreprocessorArgsSpeakerId0x30000 +SetMessageLogPreprocessorArgsSpeakerId0x30000: ; 0x0234B118 + ldr r1, _0234B12C ; =MESSAGE_LOG_INFO orr r2, r0, #0x30000 ldr r0, [r1, #4] str r2, [r0, #0xce8] bx lr .align 2, 0 -_0234B12C: .word ov29_023537CC - arm_func_end ov29_0234B118 +_0234B12C: .word MESSAGE_LOG_INFO + arm_func_end SetMessageLogPreprocessorArgsSpeakerId0x30000 arm_func_start ov29_0234B130 ov29_0234B130: ; 0x0234B130 stmdb sp!, {r3, lr} mov r3, #0 - ldr r1, _0234B1A0 ; =ov29_023537CC + ldr r1, _0234B1A0 ; =MESSAGE_LOG_INFO mov r0, r3 _0234B140: ldr r2, [r1, #4] @@ -2016,7 +2016,7 @@ _0234B140: strb r0, [r2, #0xc80] cmp r3, #0xa blt _0234B140 - ldr r1, _0234B1A0 ; =ov29_023537CC + ldr r1, _0234B1A0 ; =MESSAGE_LOG_INFO mvn ip, #1 ldr r3, [r1, #4] mov r2, #1 @@ -2028,14 +2028,14 @@ _0234B140: str r0, [r1, #8] strb r2, [r1] bl ov29_0234B1A4 - ldr r0, _0234B1A0 ; =ov29_023537CC + ldr r0, _0234B1A0 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bl InitPreprocessorArgs ldmia sp!, {r3, pc} .align 2, 0 -_0234B1A0: .word ov29_023537CC +_0234B1A0: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B130 arm_func_start ov29_0234B1A4 @@ -2046,7 +2046,7 @@ ov29_0234B1A4: ; 0x0234B1A4 cmp r0, #0 ldmeqia sp!, {r4, pc} mov ip, #0 - ldr r2, _0234B24C ; =ov29_023537CC + ldr r2, _0234B24C ; =MESSAGE_LOG_INFO mov r0, ip _0234B1C4: ldr r3, [r2, #4] @@ -2055,7 +2055,7 @@ _0234B1C4: strb r0, [r3, r1, lsl #6] cmp ip, #0xa blt _0234B1C4 - ldr r2, _0234B24C ; =ov29_023537CC + ldr r2, _0234B24C ; =MESSAGE_LOG_INFO mov r3, #4 ldr r1, [r2, #4] strb r0, [r1, #0xc8b] @@ -2084,13 +2084,13 @@ _0234B1C4: bl AdvanceFrame ldmia sp!, {r4, pc} .align 2, 0 -_0234B24C: .word ov29_023537CC +_0234B24C: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B1A4 arm_func_start LogMessageByIdWithPopupCheckParticipants LogMessageByIdWithPopupCheckParticipants: ; 0x0234B250 stmdb sp!, {r3, lr} - ldr ip, _0234B290 ; =ov29_023537CC + ldr ip, _0234B290 ; =MESSAGE_LOG_INFO cmp r1, #0 ldr ip, [ip, #4] ldrsh lr, [sp, #8] @@ -2107,7 +2107,7 @@ _0234B27C: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} .align 2, 0 -_0234B290: .word ov29_023537CC +_0234B290: .word MESSAGE_LOG_INFO arm_func_end LogMessageByIdWithPopupCheckParticipants arm_func_start ov29_0234B294 @@ -2301,32 +2301,32 @@ _0234B4C8: .word LogMessage arm_func_start ov29_0234B4CC ov29_0234B4CC: ; 0x0234B4CC - ldr r1, _0234B4DC ; =ov29_023537CC + ldr r1, _0234B4DC ; =MESSAGE_LOG_INFO ldr r1, [r1, #4] strb r0, [r1, #0xc8a] bx lr .align 2, 0 -_0234B4DC: .word ov29_023537CC +_0234B4DC: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B4CC arm_func_start ov29_0234B4E0 ov29_0234B4E0: ; 0x0234B4E0 - ldr r0, _0234B4F0 ; =ov29_023537CC + ldr r0, _0234B4F0 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] ldrb r0, [r0, #0xc8b] bx lr .align 2, 0 -_0234B4F0: .word ov29_023537CC +_0234B4F0: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B4E0 arm_func_start ov29_0234B4F4 ov29_0234B4F4: ; 0x0234B4F4 - ldr r0, _0234B504 ; =ov29_023537CC + ldr r0, _0234B504 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] ldr r0, [r0, #0xc98] bx lr .align 2, 0 -_0234B504: .word ov29_023537CC +_0234B504: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B4F4 arm_func_start LogMessage @@ -2338,7 +2338,7 @@ LogMessage: ; 0x0234B508 #endif stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x284 + LOG_MESSAGE_STACK_OFFSET - ldr r4, _0234B708 ; =ov29_023537CC + ldr r4, _0234B708 ; =MESSAGE_LOG_INFO mov fp, r2 ldr r3, [r4, #4] ldrb r2, [r3, #0xced] @@ -2361,7 +2361,7 @@ LogMessage: ; 0x0234B508 cmp r2, r0 movne sl, #1 ldreqb sl, [r4] - ldr r2, _0234B708 ; =ov29_023537CC + ldr r2, _0234B708 ; =MESSAGE_LOG_INFO mov r6, #1 str r0, [r2, #8] strb r7, [r2] @@ -2373,7 +2373,7 @@ LogMessage: ; 0x0234B508 mov r1, #0x140 + LOG_MESSAGE_STACK_OFFSET str r4, [sp] bl PreprocessString - ldr r4, _0234B708 ; =ov29_023537CC + ldr r4, _0234B708 ; =MESSAGE_LOG_INFO add r5, sp, #0x144 _0234B5A4: ldr r0, [r4, #4] @@ -2458,7 +2458,7 @@ _0234B660: _0234B6D4: cmp r7, #0 beq _0234B700 - ldr r0, _0234B708 ; =ov29_023537CC + ldr r0, _0234B708 ; =MESSAGE_LOG_INFO mov r2, #0xf0 strh r2, [r1, #0x90] ldr r1, [r0, #4] @@ -2471,7 +2471,7 @@ _0234B700: add sp, sp, #0x284 + LOG_MESSAGE_STACK_OFFSET ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234B708: .word ov29_023537CC +_0234B708: .word MESSAGE_LOG_INFO _0234B70C: .word DUNGEON_PTR _0234B710: .word ov29_02353214 arm_func_end LogMessage @@ -2492,7 +2492,7 @@ LogMessageById: ; 0x0234B714 arm_func_start ov29_0234B73C ov29_0234B73C: ; 0x0234B73C - ldr r0, _0234B764 ; =ov29_023537CC + ldr r0, _0234B764 ; =MESSAGE_LOG_INFO mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2503,13 +2503,13 @@ ov29_0234B73C: ; 0x0234B73C and r0, r0, #0xff bx lr .align 2, 0 -_0234B764: .word ov29_023537CC +_0234B764: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B73C arm_func_start ov29_0234B768 ov29_0234B768: ; 0x0234B768 stmdb sp!, {r3, lr} - ldr r0, _0234B7E8 ; =ov29_023537CC + ldr r0, _0234B7E8 ; =MESSAGE_LOG_INFO mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2521,17 +2521,17 @@ ov29_0234B768: ; 0x0234B768 moveq r0, #0 ldmeqia sp!, {r3, pc} bl sub_0202836C - ldr r0, _0234B7E8 ; =ov29_023537CC + ldr r0, _0234B7E8 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] add r0, r0, #0xc00 ldrsb r0, [r0, #0xec] bl sub_02030214 - ldr r0, _0234B7E8 ; =ov29_023537CC + ldr r0, _0234B7E8 ; =MESSAGE_LOG_INFO ldr r0, [r0, #4] add r0, r0, #0xc00 ldrsb r0, [r0, #0xec] bl CloseAlertBox - ldr r0, _0234B7E8 ; =ov29_023537CC + ldr r0, _0234B7E8 ; =MESSAGE_LOG_INFO mvn r3, #1 ldr r1, [r0, #4] mov r2, #0 @@ -2541,13 +2541,13 @@ ov29_0234B768: ; 0x0234B768 str r2, [r1, #0xc98] ldmia sp!, {r3, pc} .align 2, 0 -_0234B7E8: .word ov29_023537CC +_0234B7E8: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B768 arm_func_start ov29_0234B7EC ov29_0234B7EC: ; 0x0234B7EC stmdb sp!, {r3, lr} - ldr r0, _0234B850 ; =ov29_023537CC + ldr r0, _0234B850 ; =MESSAGE_LOG_INFO mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2558,7 +2558,7 @@ ov29_0234B7EC: ; 0x0234B7EC tst r1, #0xff moveq r0, #0 ldmeqia sp!, {r3, pc} - ldr r1, _0234B850 ; =ov29_023537CC + ldr r1, _0234B850 ; =MESSAGE_LOG_INFO ldr r1, [r1, #4] add r1, r1, #0xc00 ldrsh r2, [r1, #0x8c] @@ -2573,13 +2573,13 @@ _0234B848: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0234B850: .word ov29_023537CC +_0234B850: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B7EC arm_func_start ov29_0234B854 ov29_0234B854: ; 0x0234B854 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0234BA14 ; =ov29_023537CC + ldr r0, _0234BA14 ; =MESSAGE_LOG_INFO ldr r1, [r0, #4] cmp r1, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -2587,7 +2587,7 @@ ov29_0234B854: ; 0x0234B854 cmp r0, #0 movne r0, #0 strne r0, [r1, #0xc98] - ldr r0, _0234BA14 ; =ov29_023537CC + ldr r0, _0234BA14 ; =MESSAGE_LOG_INFO ldr r4, [r0, #4] ldr r0, [r4, #0xc98] cmp r0, #0 @@ -2606,7 +2606,7 @@ _0234B8A0: cmp r0, #0x3000 blt _0234B9C8 #endif - ldr r0, _0234BA14 ; =ov29_023537CC + ldr r0, _0234BA14 ; =MESSAGE_LOG_INFO mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2618,7 +2618,7 @@ _0234B8A0: bne _0234B900 mov r0, #0 bl CreateAlertBox - ldr r1, _0234BA14 ; =ov29_023537CC + ldr r1, _0234BA14 ; =MESSAGE_LOG_INFO mov r2, #0 ldr r3, [r1, #4] strb r0, [r3, #0xcec] @@ -2628,7 +2628,7 @@ _0234B900: mov r0, #2 str r0, [r4, #0xc98] _0234B908: - ldr r0, _0234BA14 ; =ov29_023537CC + ldr r0, _0234BA14 ; =MESSAGE_LOG_INFO mvn r2, #1 ldr r1, [r0, #4] add r0, r1, #0xc00 @@ -2639,7 +2639,7 @@ _0234B908: tst r2, #0xff moveq r0, #1 beq _0234B9BC - ldr r3, _0234BA14 ; =ov29_023537CC + ldr r3, _0234BA14 ; =MESSAGE_LOG_INFO mov r2, #0x140 ldr r5, [r3, #4] add r3, r5, #0xc00 @@ -2700,13 +2700,13 @@ _0234B9C8: bl ov29_022EA428 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234BA14: .word ov29_023537CC +_0234BA14: .word MESSAGE_LOG_INFO arm_func_end ov29_0234B854 arm_func_start ov29_0234BA18 ov29_0234BA18: ; 0x0234BA18 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0234BA50 ; =ov29_023537CC + ldr r1, _0234BA50 ; =MESSAGE_LOG_INFO mov r5, r0 ldr r4, [r1, #4] _0234BA28: @@ -2723,13 +2723,13 @@ _0234BA40: _0234BA4C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234BA50: .word ov29_023537CC +_0234BA50: .word MESSAGE_LOG_INFO arm_func_end ov29_0234BA18 arm_func_start ov29_0234BA54 ov29_0234BA54: ; 0x0234BA54 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _0234BAB8 ; =ov29_023537CC + ldr r1, _0234BAB8 ; =MESSAGE_LOG_INFO mov r5, r0 ldr r6, [r1, #4] bl ov29_0234BA18 @@ -2756,7 +2756,7 @@ _0234BAAC: blt _0234BA78 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234BAB8: .word ov29_023537CC +_0234BAB8: .word MESSAGE_LOG_INFO _0234BABC: .word ov29_0237C694 arm_func_end ov29_0234BA54 diff --git a/asm/overlay_29_0234CA84.s b/asm/overlay_29_0234CA84.s index 8f4229af..547c3e68 100644 --- a/asm/overlay_29_0234CA84.s +++ b/asm/overlay_29_0234CA84.s @@ -630,7 +630,7 @@ DisplayMessage: ; 0x0234D258 mov r0, #0xa bl ov29_0234BA54 bl ov29_0234D558 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r4 mov r2, r6 str r0, [sp] @@ -655,7 +655,7 @@ DisplayMessage2: ; 0x0234D2AC mov r0, #0xa bl ov29_0234BA54 bl ov29_0234D558 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r4 mov r2, r6 str r0, [sp] @@ -749,7 +749,7 @@ _0234D3F8: bl ov29_0234D5D0 b _0234D440 _0234D41C: - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs str r0, [sp] mov r4, #1 mov r0, r6 diff --git a/asm/overlay_29_0234D484.s b/asm/overlay_29_0234D484.s index 7bb6ab80..3e9ade1a 100644 --- a/asm/overlay_29_0234D484.s +++ b/asm/overlay_29_0234D484.s @@ -30,7 +30,7 @@ ov29_0234D4BC: ; 0x0234D4BC mov r4, r3 bl ov29_0234D558 bl ov29_0234D630 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r0 mov r2, r7 mov r3, r5 diff --git a/asm/overlay_29_0234DDF4.s b/asm/overlay_29_0234DDF4.s index 23e6d945..922829f2 100644 --- a/asm/overlay_29_0234DDF4.s +++ b/asm/overlay_29_0234DDF4.s @@ -708,7 +708,7 @@ _0234E7C0: mov r7, r0 bl AllocateTemp1024ByteBufferFromPool mov r5, r0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, r7 str r5, [r0, #0x38] mov r0, r5 diff --git a/asm/overlay_29_data_02353700.s b/asm/overlay_29_data_02353700.s index f75b4116..06289683 100644 --- a/asm/overlay_29_data_02353700.s +++ b/asm/overlay_29_data_02353700.s @@ -90,8 +90,8 @@ ov29_023537C4: .global ov29_023537C8 ov29_023537C8: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_023537CC -ov29_023537CC: + .global MESSAGE_LOG_INFO +MESSAGE_LOG_INFO: .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov29_023537D8 ov29_023537D8: diff --git a/asm/overlay_29_rodata_023527C0.s b/asm/overlay_29_rodata_023527C0.s index 37c8093d..426501a8 100644 --- a/asm/overlay_29_rodata_023527C0.s +++ b/asm/overlay_29_rodata_023527C0.s @@ -62,8 +62,8 @@ DAMAGE_FORMULA_MAX_BASE: .global DAMAGE_FORMULA_MIN_BASE DAMAGE_FORMULA_MIN_BASE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 - .global ov29_02352884 -ov29_02352884: + .global WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS +WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS: .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .global ov29_02352894 diff --git a/asm/overlay_31_023838E4.s b/asm/overlay_31_023838E4.s index a51b1449..af3751ea 100644 --- a/asm/overlay_31_023838E4.s +++ b/asm/overlay_31_023838E4.s @@ -3098,7 +3098,7 @@ _023860F0: strneb r0, [r1, #0x124 + OV31_023860A4_OFFSET] cmp ip, #4 blt _023860F0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs ldrh r1, [r5, #4] cmp r6, #0 str r1, [r0, #0x10] @@ -3157,7 +3157,7 @@ ov31_0238619C: ; 0x0238619C add r5, r7, #0x124 #endif add r6, r5, r4, lsl #3 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs mov r1, #0 mov r2, r6 mov r3, r1 @@ -3280,7 +3280,7 @@ ov31_02386308: ; 0x02386308 mov r8, r1 ldr r6, [r4, #0xb4] mov r5, #0 - bl ov29_0234B034 + bl GetMessageLogPreprocessorArgs add r1, r6, r7, lsl #3 add r1, r1, #0x100 ldrh r2, [r1, #0x28 + OV31_02386308_OFFSET]