diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 28180b85..c32d7eff 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -14,7 +14,7 @@ .public ov29_02300DCC .public ov29_02301594 .public GetEntityMoveTargetAndRange -.public Abs +.public abs .public ov29_022EBC74 .public sub_0202760C .public DungeonRandOutcome__022EAB20 @@ -31,10 +31,10 @@ .public GetTileSafe .public sub_020275F8 .public sub_0207A244 -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public ov29_022FBE04 .public IqSkillIsEnabled -.public ov29_022E333C +.public GetVisibilityRange .public SetMonsterActionFields .public sub_0207A324 .public GetDirectionTowardsPosition @@ -44,11 +44,11 @@ .public GetChebyshevDistance .public ov29_022FBDF0 .public GetTile -.public ov29_022E1610 +.public GetItemInfo .public sub_020777A8 -.public ov29_022E274C -.public ov29_023245A4 -.public sub_0201E494 +.public CanSeeTarget +.public IsChargingTwoTurnMove +.public GeomSetTexImageParam .public UpdateAiTargetPos .public TryAddTargetToAiTargetList .public HasDropeyeStatus @@ -56,7 +56,7 @@ .public InitMove .public ov29_0231A460 .public SetActionRegularAttack -.public ov29_02344160 +.public AreMovesEnabled .public ov29_0231B008 .public SetActionPassTurnOrWalk .public CanTargetEntity @@ -72,7 +72,7 @@ .public ov29_0230175C .public ov29_02348D00 .public dtcm_bss -.public sub_0201E4D4 -.public sub_02004FCC +.public GeomSetVertexCoord16 +.public Rgb8ToBgr5 .public sub_0201BD50 .public sub_0201BD80 diff --git a/asm/include/main_02000C6C.inc b/asm/include/main_02000C6C.inc index 59e4c503..c5efe657 100644 --- a/asm/include/main_02000C6C.inc +++ b/asm/include/main_02000C6C.inc @@ -1,20 +1,20 @@ #pragma once -.public Abs -.public AddFloat +.public abs +.public __addsf3 .public ClearIrqFlag .public DecompressAtFromMemoryPointer -.public DivideInt +.public __divsi3 .public FileInit -.public IntToFloat -.public MultiplyFloat -.public Sprintf -.public Sqrtf -.public Strcat -.public Strcmp -.public Strcpy -.public Strlen -.public Strncpy -.public Vsprintf +.public __floatsisf +.public __mulsf3 +.public sprintf +.public sqrtf +.public strcat +.public strcmp +.public strcpy +.public strlen +.public strncpy +.public vsprintf .public WaitForInterrupt .public _0200A314 .public _0200A344 @@ -31,7 +31,7 @@ .public sub_020184A8 .public sub_02019304 .public sub_0204A5D0 -.public sub_02065D1C +.public MainLoop .public sub_02076070 .public sub_02076074 .public sub_020761E8 diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc index 0bdd8514..8c64ab39 100644 --- a/asm/include/main_0200C4CC.inc +++ b/asm/include/main_0200C4CC.inc @@ -3,7 +3,7 @@ .public CanMonsterUseMove .public CardBackupError .public CardPullOutWithStatus -.public CheckEndDungeon +.public MainGame .public DataTransferInit .public DataTransferStop .public DebugPrint @@ -16,8 +16,8 @@ .public FileOpen .public FileRead .public FileSeek -.public GetDebugFlag1 -.public GetDebugFlag2 +.public GetDebugFlag +.public GetDebugLogFlag .public GetFileLengthInPackWithPackNb .public GetHeldButtons .public GetKeyM2NSwitch @@ -26,8 +26,8 @@ .public GetReleasedStylus .public GetRngSeed .public GetTime -.public KeyWaitInit__02006DA4 -.public LoadFileFromRom__02008C3C +.public KeyWaitInit +.public LoadFileFromRom .public LoadFileInPackWithPackId .public LoadOverlay .public MIi_UncompressBackward @@ -53,8 +53,8 @@ .public RandIntSafe .public RandRange .public RandRangeSafe -.public SetDebugFlag1 -.public SetDebugFlag2 +.public SetDebugFlag +.public SetDebugLogFlag .public SetRngSeed .public UnloadFile .public UnloadOverlay @@ -99,7 +99,7 @@ .public ov11_02306C64 .public ov11_02306C9C .public ov11_02310BDC -.public ov29_02300164 +.public GetMonsterName .public sub_01FF8000 .public sub_01FF80B0 .public sub_01FF8CAC @@ -108,7 +108,7 @@ .public sub_01FF8D3C .public sub_01FF8D6C .public sub_01FF8D9C -.public sub_01FF8DCC +.public Render3dStack .public sub_01FF8F04 .public sub_01FF8F28 .public sub_01FF905C @@ -148,7 +148,7 @@ .public sub_02003BC8 .public sub_02004F74 .public sub_02004F80 -.public sub_02004FCC +.public Rgb8ToBgr5 .public sub_02006220 .public sub_020063A0 .public sub_020063D4 diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 30970e52..c50aec25 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -6,7 +6,7 @@ .public sub_020778D0 .public MemZero .public sub_0207B9EC -.public Abs +.public abs .public sub_02006E14 .public sub_0205B80C .public sub_0208E1E0 @@ -16,15 +16,15 @@ .public sub_02003990 .public sub_0207C314 .public sub_020852F8 -.public GetDebugFlag1 -.public Strlen +.public GetDebugFlag +.public strlen .public sub_0201BF4C .public sub_02079800 .public sub_02051B44 .public sub_0201BE28 .public sub_0207AE44 .public sub_0200BD14 -.public DivideInt +.public __divsi3 .public sub_0208E3EC .public sub_0200B8B8 .public ov00_0232ED5C @@ -34,7 +34,7 @@ .public sub_02046804 .public sub_0208E904 .public sub_02008F84 -.public Sprintf +.public sprintf .public sub_02079990 .public sub_02002448 .public sub_02079560 @@ -54,10 +54,10 @@ .public sub_02079DE0 .public sub_02080204 .public sub_0208B360 -.public Wcslen +.public wcslen .public sub_02085074 .public OSi_ReferSymbol -.public Strcpy +.public strcpy .public sub_0207C2B8 .public sub_02008F64 .public ov00_0232E768 @@ -78,11 +78,11 @@ .public sub_02079B14 .public SVC_WaitByLoop .public sub_0201BE84 -.public Memset +.public memset .public sub_020024B0 .public sub_0200BB74 .public sub_0207F828 -.public Strncmp +.public strncmp .public sub_02085130 .public sub_0201DE10 .public sub_020184B4 @@ -93,13 +93,13 @@ .public sub_0207B854 .public ov01_0232F3F4 .public sub_02079888 -.public Strcat +.public strcat .public sub_02051C24 .public sub_0201DDFC .public sub_020038E8 .public SetIrqFlag .public sub_020828A8 -.public Memcpy +.public memcpy .public MemcpySimple .public sub_0208DEB0 .public sub_020519D0 @@ -126,7 +126,7 @@ .public ov00_0233AE64 .public sub_02028E88 .public sub_0207F818 -.public Snprintf +.public snprintf .public sub_0207A048 .public sub_02084FB8 .public sub_02017B58 @@ -155,10 +155,10 @@ .public sub_0207C3B4 .public sub_0207C358 .public sub_0205B77C -.public Strcmp +.public strcmp .public ov00_0232E7C0 .public sub_020024C0 -.public Strstr +.public strstr .public sub_0207BC4C .public sub_02086B08 .public sub_02034A80 @@ -183,18 +183,18 @@ .public sub_0207C330 .public sub_02087198 .public sub_02052060 -.public Memcmp +.public memcmp .public sub_02028E40 .public sub_02085180 -.public Strncpy -.public DivideUInt +.public strncpy +.public __udivsi3 .public sub_020895E4 .public ov00_02329520 .public sub_020790DC .public sub_020827F4 .public sub_020850B4 .public sub_02075720 -.public Memmove +.public memmove .public sub_0207B848 .public ov00_0232C244 .public sub_02008F3C @@ -206,13 +206,13 @@ .public sub_0207BA08 .public sub_020852A4 .public sub_0200BD2C -.public Strcspn +.public strcspn .public sub_0201BF64 .public sub_0200B894 .public sub_0207C40C .public sub_020799AC .public sub_0204A1CC -.public Strchr +.public strchr .public sub_0207F70C .public sub_020798D8 .public ov01_0232EA30 diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 41e73ee7..5a973e94 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -22,7 +22,7 @@ .public RandInt .public sub_0204a1cc .public ov00_022C0068 -.public sub_0201C050 +.public InitAnimationControl .public ov00_022BD5C8 .public GetPerformanceFlagWithChecks .public sub_020515C4 @@ -59,12 +59,12 @@ .public sub_0208FE48 .public ov00_022C0498 .public GetLanguageType -.public sub_0201C2CC +.public SetAnimationForAnimationControl .public ov00_022BD0A0 .public ov00_022BD274 .public sub_02026214 .public sub_020062FC -.public DivideUInt +.public __udivsi3 .public ov00_022BE630 .public ov00_022BFA94 .public ov00_022BD1A0 @@ -85,7 +85,7 @@ .public sub_02048480 .public ov00_022C2FF0 .public ov00_022C2D3C -.public Strcpy +.public strcpy .public ov00_022BD170 .public ov00_022BF640 .public ov00_022C2F68 @@ -98,7 +98,7 @@ .public GetReleasedStylus .public ov00_022BF660 .public sub_0204E530 -.public Vsprintf +.public vsprintf .public ov00_022BF9E0 .public sub_020348E4 .public ov00_022BD5EC @@ -207,13 +207,13 @@ .public sub_02059AF8 .public sub_0204C918 .public sub_0202F8C4 -.public sub_0201C0E8 +.public SetSpriteIdForAnimationControl .public ov00_022C0430 .public ov00_022BFAD4 .public sub_0201D110 .public ov00_022BDA94 .public sub_02050990 -.public sub_0201D484 +.public LoadWanTableEntryFromPack .public GetSpecialEpisodeType .public CreateNormalMenu .public FemaleToMaleForm @@ -224,7 +224,7 @@ .public sub_02046BB4 .public sub_0205B554 .public GetAdventureLogCompleted -.public Strcmp +.public strcmp .public sub_020308A0 .public sub_0201D12C .public sub_0200DFBC @@ -237,7 +237,7 @@ .public sub_0207A2A4 .public sub_02025D50 .public sub_02046C78 -.public DivideInt +.public __divsi3 .public sub_02008F64 .public ov00_022BD21C .public sub_0202A5CC @@ -283,7 +283,7 @@ .public GetSpriteIndex__020526EC .public ov00_022BCCC8 .public sub_0202065C -.public Sprintf +.public sprintf .public GetNbEvolutions .public sub_0204E464 .public sub_0201C138 @@ -349,7 +349,7 @@ .public sub_0202B0A4 .public ov00_022BE6C0 .public ov00_022BE094 -.public sub_0202A3E4 +.public PrintClearMark .public StrncpySimpleNoPadSafe .public ShowKeyboard .public StrncmpSimple diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index f8038ac1..cfcc0531 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -43,7 +43,7 @@ .public ov00_022CF284 .public ov00_022CF338 .public sub_02082654 -.public DivideUInt +.public __udivsi3 .public ov00_022ED7C0 .public sub_0207F338 .public sub_0207B030 @@ -78,7 +78,7 @@ .public sub_02076FC8 .public sub_0207AE44 .public ov00_022D6C88 -.public Memcpy +.public memcpy .public sub_02082420 .public ov00_022D5110 .public sub_0208FE84 @@ -90,7 +90,7 @@ .public ov00_022BF3E0 .public ov00_022BF814 .public EnableIrqFlag -.public Memcmp +.public memcmp .public sub_0207F894 .public ov00_022CF918 .public ov00_022ED85C @@ -109,7 +109,7 @@ .public SetIrqFlag .public sub_0207BA08 .public sub_0207C4C8 -.public Strncpy +.public strncpy .public ov00_022ED8C0 .public ov00_022C4718 .public ClearIrqFlag @@ -165,7 +165,7 @@ .public ov00_022C74A0 .public sub_0207EF9C .public ov00_022BFB14 -.public DivideInt +.public __divsi3 .public sub_02077598 .public sub_02078CC8 .public ov00_022BF640 @@ -175,14 +175,14 @@ .public sub_020772C4 .public sub_0207C3B4 .public sub_0207EF2C -.public Strlen +.public strlen .public sub_0207A0CC .public sub_0207C7DC .public ov00_022D7AB0 .public sub_020812F8 .public sub_0207ADCC .public ov00_022D7864 -.public Memset +.public memset .public ov00_022C6EFC .public ov00_022D4DE4 .public sub_0207D13C @@ -256,4 +256,4 @@ .public sub_02079DE0 .public ov00_022D4B88 .public ov00_022CF8F8 -.public Strcpy +.public strcpy diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index d692b0ca..07f2f5d3 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -138,7 +138,7 @@ .public ov01_0232CB1C .public GetMaxItemsAllowed .public MemcpySimple -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public IsItemValidVeneer .public sub_0205B6EC .public sub_02042CF0 diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc index affc9313..cb7f49ca 100644 --- a/asm/include/overlay_04.inc +++ b/asm/include/overlay_04.inc @@ -73,7 +73,7 @@ .public ov01_02337DD0 .public sub_02043320 .public ov01_02337D00 -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public sub_020434FC .public GetLanguageType .public RandInt diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc index 52d81c68..1324e055 100644 --- a/asm/include/overlay_07.inc +++ b/asm/include/overlay_07.inc @@ -33,7 +33,7 @@ .public ov00_022BCCF4 .public sub_02003BC8 .public ov00_022BD758 -.public Strcat +.public strcat .public ov00_022BCFD0 .public sub_0203931C .public ov00_022BD398 @@ -123,7 +123,7 @@ .public ov00_022BCD4C .public ov01_02338BEC .public ov00_022BD6E0 -.public DivideInt +.public __divsi3 .public sub_0202D07C .public ov00_022BD71C .public sub_0202C3A8 diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc index 11373560..d7430828 100644 --- a/asm/include/overlay_10.inc +++ b/asm/include/overlay_10.inc @@ -18,13 +18,13 @@ .public DoesNotSaveWhenEntering .public GetDungeonGroup .public sub_02017ACC -.public Vsprintf +.public vsprintf .public sub_02052334 .public UnloadFile .public sub_0204F244 .public ShowPortraitBox .public sub_020263C8 -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public sub_02033350 .public sub_02001808 .public Rand16Bit @@ -32,7 +32,7 @@ .public ov29_022DD83C .public sub_02001AB0 .public sub_02033064 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_0204F55C .public sub_0201CF5C .public sub_020333D8 @@ -47,7 +47,7 @@ .public sub_02017A68 .public sub_0204E8EC .public sub_02027B1C -.public Strcmp +.public strcmp .public InitPortraitBox .public sub_0204AFD0 .public GetGold @@ -58,12 +58,12 @@ .public GetNbFloors .public sub_0202A0B0 .public sub_0201D034 -.public sub_0201C458 +.public SwitchAnimationControlToNextFrame .public RemoveEmptyItemsInBag .public MemFree .public DecompressAtNormalVeneer .public ItemZInit -.public Strcpy +.public strcpy .public sub_02026214 .public sub_02033F30 .public sub_02063A0C @@ -78,12 +78,12 @@ .public sub_0201D1B0 .public DeleteWanTableEntryVeneer .public sub_0201D9C8 -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_0204E760 .public GetDungeonModeSpecial .public IncrementNbFriendRescues -.public Abs -.public ov11_022E8774 +.public abs +.public GroundMainLoop .public sub_020265A8 .public sub_0205BBFC .public sub_020640DC @@ -92,7 +92,7 @@ .public sub_02063FF4 .public sub_02048CB8 .public LoadScriptVariableValue -.public sub_0201C2CC +.public SetAnimationForAnimationControl .public sub_0202830C .public sub_0205F504 .public ov29_0234C668 @@ -105,26 +105,26 @@ .public HandleSir0Translation .public sub_0202F8C4 .public sub_0205BA70 -.public sub_0200CC38 +.public IsLosableItem .public sub_02051DFC .public ov29_0234C584 .public sub_02027B58 .public sub_02017C80 .public GetFileLengthInPackWithPackNb -.public sub_0201C418 +.public SetAndPlayAnimationForAnimationControl .public DecompressAtFromMemoryPointerVeneer .public sub_0201B43C .public sub_020642A8 .public HidePortraitBox .public sub_020639E8 .public sub_0205BC94 -.public GetDebugFlag1 +.public GetDebugFlag .public sub_0202812C .public sub_020329E4 .public sub_0204E790 .public ProcessWte .public GetMonsterGenderVeneer -.public SetPortraitAttrStruct +.public SetPortraitOffset .public sub_020333FC .public sub_0202810C .public LoadWteFromFileDirectory @@ -137,7 +137,7 @@ .public GetBodySize .public sub_02064014 .public sub_02028770 -.public DivideInt +.public __divsi3 .public sub_0200B330 .public Memcpy32 .public sub_02028284 @@ -160,7 +160,7 @@ .public sub_0200A590 .public sub_020330EC .public sub_0201D0F8 -.public sub_0201C0E8 +.public SetSpriteIdForAnimationControl .public sub_0204E7B8 .public sub_0201CF80 .public sub_0200FB54 @@ -183,7 +183,7 @@ .public sub_0206395C .public IsNoLossPenaltyDungeon .public sub_0204E770 -.public sub_0201D484 +.public LoadWanTableEntryFromPack .public AllocAndLoadFileInPack .public InitPreprocessorArgs .public sub_0204E6FC @@ -191,7 +191,7 @@ .public sub_0205B7C8 .public sub_02057CE8 .public sub_02063FC8 -.public sub_0201E730 +.public InitRender3dElement .public sub_020562B8 .public sub_020534BC .public sub_02055CCC diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index f5893157..97a23d33 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -38,7 +38,7 @@ .public sub_0206351C .public ov10_022BF864 .public sub_02065CB0 -.public SetPortraitAttrStruct +.public SetPortraitOffset .public sub_02027648 .public sub_02041094 .public sub_02016468 @@ -88,12 +88,12 @@ .public ov10_022BF444 .public ov10_022BCCCC .public GetDexNumber -.public sub_02050C74 +.public GetRank .public sub_0203D438 .public sub_02041484 .public sub_02011420 -.public KeyWaitInit__02006DA4 -.public sub_02017BE0 +.public KeyWaitInit +.public SendAudioCommandWrapperVeneer .public ov10_022C09E8 .public sub_02003990 .public IsNormalMenuActive @@ -104,8 +104,8 @@ .public sub_0202A954 .public sub_02063734 .public sub_0200CF78 -.public GetDebugFlag2 -.public GetScenarioBalance__0204CB94 +.public GetDebugLogFlag +.public GetScenarioBalance .public sub_0204F158 .public sub_0204BED8 .public sub_02055474 @@ -118,7 +118,7 @@ .public sub_0203F974 .public sub_02035098 .public GetMainCharacter2MemberIdx -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_0206C164 .public sub_0200383C .public EuclideanNorm__02005050 @@ -152,10 +152,10 @@ .public sub_02016300 .public sub_0200A180 .public GetKecleonItems1 -.public Strcpy +.public strcpy .public sub_02053A0C .public IncrementNbDungeonsCleared -.public Sprintf +.public sprintf .public sub_02002878 .public ov10_022BCDBC .public GetGameMode @@ -168,7 +168,7 @@ .public SetDungeonConquest .public sub_0204F024 .public sub_0204E8EC -.public GetDebugFlag1 +.public GetDebugFlag .public sub_020407EC .public ov10_022BF35C .public sub_0205F2B8 @@ -226,7 +226,7 @@ .public sub_020163E4 .public GetKecleonItems2 .public sub_0201E7D8 -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_0200B330 .public sub_02041A18 .public sub_0202C75C @@ -243,7 +243,7 @@ .public sub_0204B3D0 .public sub_02017C74 .public DungeonRequestsDoneWrapper -.public DivideInt +.public __divsi3 .public sub_020415BC .public sub_0203FD80 .public DecompressAtNormalVeneer @@ -267,7 +267,7 @@ .public sub_02063830 .public StrncpySimple .public ov13_0238A468 -.public sub_02050BB8 +.public GetRankupPoints .public sub_020055C8 .public CheckMissionRestrictions .public ov10_022BCD88 @@ -319,7 +319,7 @@ .public sub_0202F8FC .public GetActorMatchingStorageId .public sub_0203FD2C -.public sub_0201D484 +.public LoadWanTableEntryFromPack .public sub_0204019C .public sub_02017BD4 .public sub_0204C808 @@ -338,7 +338,7 @@ .public SetTeamSetupHeroOnly .public sub_02063628 .public sub_0201F1D4 -.public sub_0201C0E8 +.public SetSpriteIdForAnimationControl .public sub_0204F1B4 .public MemcpySimple .public sub_02048794 @@ -403,7 +403,7 @@ .public sub_0200B918 .public ov10_022BD474 .public GetSpriteIndex__02052724 -.public sub_0201D170 +.public AnimationControlGetAllocForMaxFrame .public sub_0202F334 .public GetKeyboardStringResult .public ScriptSpecialProcess0x3 @@ -422,7 +422,7 @@ .public sub_0200FC24 .public sub_02055894 .public sub_0200A4C4 -.public Vsprintf +.public vsprintf .public sub_0205B028 .public sub_0200B2C4 .public sub_020039E4 @@ -438,7 +438,7 @@ .public InitStandardItem .public sub_02047150 .public sub_02034E70 -.public IntToFloat +.public __floatsisf .public LoadScriptVariableValueSum .public ov10_022BCCB0 .public CountItemTypeInStorage @@ -460,7 +460,7 @@ .public sub_020236FC .public sub_02034DA8 .public sub_0202FED4 -.public Strcat +.public strcat .public IsGummi .public sub_02009120 .public ov10_022BDE50 @@ -480,7 +480,7 @@ .public sub_0206AB98 .public sub_02044688 .public ScriptSpecialProcess0x3E -.public sub_0201E730 +.public InitRender3dElement .public GetNameRaw .public ItemAtTableIdx .public CreatePortraitBox @@ -569,14 +569,14 @@ .public sub_020586F0 .public RandInt .public sub_0202B1AC -.public FloatToInt +.public __fixsfsi .public SaveScriptVariableValueAtIndex .public sub_0201C108 .public sub_02017C80 .public sub_0202836C .public sub_02017B64 .public sub_02015328 -.public sub_0201C458 +.public SwitchAnimationControlToNextFrame .public ov10_022C34F0 .public GetAtSize .public sub_0202B030 @@ -584,7 +584,7 @@ .public sub_0203A638 .public sub_0200B33C .public sub_0204CDE8 -.public DivideFloat +.public __divsf3 .public sub_0202C620 .public sub_02025314 .public ov10_022BF964 @@ -599,7 +599,7 @@ .public GetNormalMenuResult .public sub_02034F20 .public MemArenaAlloc -.public Abs +.public abs .public GetMainCharacter1MemberIdx .public sub_0202D07C .public GetReleasedStylus @@ -614,7 +614,7 @@ .public sub_0201F348 .public sub_0200A124 .public AnyDungeonRequestsDone -.public Memcpy +.public memcpy .public sub_0205F0B8 .public ov10_022BD374 .public sub_02006BFC @@ -681,7 +681,7 @@ .public GetActiveRosterIndex .public sub_0200B8B8 .public sub_0204F488 -.public sub_0201C2CC +.public SetAnimationForAnimationControl .public sub_02056410 .public AddItemToStorage .public sub_02017BEC @@ -713,7 +713,7 @@ .public ClampComponentAbs .public sub_020420F4 .public sub_02003A40 -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public ov17_0238A140 .public ov15_0238AE98 .public ov16_0238C1CC diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc index f52f71ac..79d5d1f2 100644 --- a/asm/include/overlay_13.inc +++ b/asm/include/overlay_13.inc @@ -31,10 +31,10 @@ .public ov00_0230D71C .public GetType .public SpecialStrcpy -.public SetPortraitExpressionId +.public SetPortraitEmotion .public StrncpySimpleNoPadSafe .public FemaleToMaleForm -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public FreePortraitBox .public sub_020348E4 .public sub_02004F74 @@ -46,8 +46,8 @@ .public sub_0204A198 .public IsDBoxActive .public SaveScriptVariableValue -.public GetDebugFlag1 -.public DivideInt +.public GetDebugFlag +.public __divsi3 .public ov11_022E6EC8 .public GetMonsterGenderVeneer .public sub_0203909C @@ -67,7 +67,7 @@ .public SetBothScreensWindowsColor .public FreeAdvancedMenu .public GetPressedButtons -.public SetPortraitAttrStruct +.public SetPortraitOffset .public IsAdvancedMenuActive .public ov00_022E6E68 .public GetNormalMenuResult diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index 732f3d2d..29697f7f 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -1,5 +1,5 @@ #pragma once -.public ov11_022F7064 +.public AnimRelatedFunction__022F7064 .public ov11_022F6F08 .public GetPartner .public IsNormalMenuActive @@ -15,29 +15,29 @@ .public ShowMessageInDBox .public RandRange .public ov11_022F5BBC -.public Strlen +.public strlen .public ov11_022F7058 .public ShowDBox .public InitPortraitBox .public CreatePortraitBox .public ov11_022F6FE0 -.public ov11_022F6F14 +.public AnimRelatedFunction__022F6F14 .public sub_0202BCBC .public sub_02026214 .public MemFree .public FemaleToMaleForm .public sub_0202BC60 .public ShowPortraitBox -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_02017B58 .public InitPreprocessorArgs -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_0202F8C4 -.public DivideInt +.public __divsi3 .public ov11_022F6EFC .public GetPressedButtons -.public ov11_022F495C -.public ov11_022F52E8 +.public SetAnimDataFieldsWrapper +.public SetAnimDataFields2 .public FreePortraitBox .public sub_02017B7C .public FreeDBox @@ -56,7 +56,7 @@ .public CreateAdvancedMenu .public sub_0202F8FC .public CreateDBox -.public ov11_022F6E60 +.public LoadObjectAnimData .public GetSentryDutyGamePoints .public PreprocessString .public GetHero @@ -66,4 +66,4 @@ .public StringFromMessageId .public HidePortraitBox .public DebugPrint0__0200C1FC -.public SetPortraitAttrStruct +.public SetPortraitOffset diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 932061c2..f5bb8372 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -12,7 +12,7 @@ .public sub_02027B1C .public ShowPortraitBox .public sub_02017C80 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_020305B4 .public sub_02026214 .public MemAlloc @@ -25,7 +25,7 @@ .public sub_0202F954 .public sub_020288DC .public MemFree -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_020308A0 .public ShowMessageInDBox .public sub_02027AF0 diff --git a/asm/include/overlay_16.inc b/asm/include/overlay_16.inc index 7579a168..2bf49d1b 100644 --- a/asm/include/overlay_16.inc +++ b/asm/include/overlay_16.inc @@ -10,7 +10,7 @@ .public GetMainCharacter1MemberIdx .public sub_020572EC .public ov11_02310BDC -.public SetPortraitExpressionId +.public SetPortraitEmotion .public MemFree .public sub_0205A288 .public IsMonsterOnTeam @@ -36,7 +36,7 @@ .public FreeNormalMenu .public CreateDBox .public sub_02017C50 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_02025314 .public GetTeamMember .public StrncpySimpleNoPadSafe diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index 2bd5d00c..7bf694eb 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -63,7 +63,7 @@ .public GetActiveRosterIndex .public ShowPortraitBox .public sub_0203C940 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public ShowMessageInDBox .public ov00_022E6E68 .public sub_0203C9E4 @@ -85,5 +85,5 @@ .public InitPortraitBoxWithMonsterId .public CreateDBox .public sub_020564B0 -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_02056F60 diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 2421036d..9d739c6d 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -21,7 +21,7 @@ .public sub_0203A618 .public MemFree .public sub_0203A9EC -.public sub_0205384C +.public GetEncodedHalfword .public GetAdvancedMenuResult .public GetNormalMenuResult .public sub_020407EC @@ -34,7 +34,7 @@ .public sub_0204159C .public GetMovesetLevelUpPtr .public sub_02017CCC -.public Vsprintf +.public vsprintf .public sub_02041614 .public sub_0203A5A8 .public sub_0203088C @@ -79,7 +79,7 @@ .public IsNormalMenuActive .public sub_0203AA20 .public sub_020416BC -.public Memcpy +.public memcpy .public sub_020307EC .public sub_020415BC .public sub_0203FD14 @@ -88,10 +88,10 @@ .public sub_02041B7C .public sub_02041A18 .public sub_020564B0 -.public SetPortraitExpressionId +.public SetPortraitEmotion .public CreateNormalMenu .public sub_0203F150 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_0204018C .public sub_02041860 .public sub_020420F4 diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index c39fc174..35388601 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -24,7 +24,7 @@ .public RemoveItemNoHole .public sub_02065BAC .public sub_02011528 -.public GetScenarioBalance__0204CB94 +.public GetScenarioBalance .public PreprocessString .public sub_02055474 .public sub_0202E6C8 @@ -65,8 +65,8 @@ .public ShowPortraitBox .public sub_02039C2C .public sub_0203D538 -.public Strcat -.public SetPortraitAttrStruct +.public strcat +.public SetPortraitOffset .public sub_020417A8 .public sub_0201170C .public ov10_022BCDA8 @@ -88,7 +88,7 @@ .public InitPortraitBoxWithMonsterId .public sub_0203A51C .public ov10_022BD394 -.public SetPortraitExpressionId +.public SetPortraitEmotion .public GetItemAtIdx .public sub_0203A5F0 .public GetStringFromFileVeneer @@ -105,7 +105,7 @@ .public sub_02011580 .public sub_02055020 .public CanMonsterBeUsedForMissionWrapper -.public Abs +.public abs .public sub_02011784 .public sub_0203A9EC .public GetMaxReachedFloor @@ -122,13 +122,13 @@ .public GetDungeonMode .public sub_020420F4 .public sub_02065B70 -.public ov11_022E8124 +.public InitRandomNpcJobs .public FemaleToMaleForm .public DungeonSwapIdToIdx .public sub_02041A00 .public sub_02057AC4 .public GetFirstEmptyMemberIdx -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_02056E04 .public sub_020407C0 .public sub_02046D20 diff --git a/asm/include/overlay_20.inc b/asm/include/overlay_20.inc index 7d31873d..09752787 100644 --- a/asm/include/overlay_20.inc +++ b/asm/include/overlay_20.inc @@ -38,7 +38,7 @@ .public ov00_0230D71C .public sub_02027AF0 .public sub_0202C3A8 -.public DivideInt +.public __divsi3 .public MemFree .public sub_02046D20 .public sub_02011EC4 @@ -67,7 +67,7 @@ .public GetItemAtIdx .public ShowPortraitBox .public sub_020327CC -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_02011E18 .public HidePortraitBox .public sub_0202B568 @@ -77,7 +77,7 @@ .public sub_02011DB8 .public sub_0202D16C .public sub_02011E24 -.public sub_0200CE74 +.public IsTicketItem .public sub_0201227C .public IsBagFull .public sub_0202B558 @@ -90,7 +90,7 @@ .public sub_0201255C .public sub_0202C7BC .public ov11_0230DB58 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_020037A4 .public ov11_022E6E8C .public ov00_022E6E68 diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc index 43a93267..1164c619 100644 --- a/asm/include/overlay_21.inc +++ b/asm/include/overlay_21.inc @@ -1,6 +1,6 @@ #pragma once .public MemAlloc -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public ov11_0230C910 .public ShowMessageInDBox .public PrintIqSkillsMenu @@ -21,7 +21,7 @@ .public sub_02027AF0 .public ov11_0230B20C .public sub_0202E3CC -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_0202F8FC .public sub_0200D0A0 .public sub_02013150 @@ -89,7 +89,7 @@ .public sub_020407EC .public ov11_0230BA64 .public ov00_0230D220 -.public ov11_022E8124 +.public InitRandomNpcJobs .public sub_0203FD38 .public sub_0202E6C8 .public ov11_0230C050 diff --git a/asm/include/overlay_22.inc b/asm/include/overlay_22.inc index 44d375d3..b0e28518 100644 --- a/asm/include/overlay_22.inc +++ b/asm/include/overlay_22.inc @@ -3,19 +3,19 @@ .public GetNbItemsInBag .public MemFree .public sub_02010B3C -.public sub_0200CCE0 +.public IsShoppableItem .public SpecialProcAddItemToBag .public CreatePortraitBox .public InitPortraitBoxWithMonsterId .public sub_0202C3A8 .public sub_0200D65C .public sub_0202D16C -.public Strcpy +.public strcpy .public sub_0202C75C .public sub_02010BC0 .public GetGold .public sub_0202E3CC -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_02010B78 .public PreprocessString .public sub_0202C728 @@ -39,7 +39,7 @@ .public sub_0202C7D0 .public DebugPrint0__0200C1FC .public ShowMessageInDBox -.public Strcat +.public strcat .public sub_02042BBC .public Arm9StoreUnkFieldNa0x2029ED8 .public sub_02042258 @@ -52,7 +52,7 @@ .public sub_02010898 .public InitPreprocessorArgs .public ShowPortraitBox -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_0201086C .public AddMoneyCarried .public HidePortraitBox diff --git a/asm/include/overlay_23.inc b/asm/include/overlay_23.inc index 0ed2e145..879440e8 100644 --- a/asm/include/overlay_23.inc +++ b/asm/include/overlay_23.inc @@ -10,7 +10,7 @@ .public sub_02034A38 .public sub_02042CF0 .public ShowPortraitBox -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public RemoveItem .public RemoveEmptyItemsInBag .public sub_02043218 @@ -18,7 +18,7 @@ .public CreatePortraitBox .public ShowDBox .public FreeNormalMenu -.public SetPortraitExpressionId +.public SetPortraitEmotion .public ShowMessageInDBox .public sub_0202F2C4 .public sub_020440DC @@ -50,7 +50,7 @@ .public sub_020582E0 .public InitPortraitBoxWithMonsterId .public sub_020101A0 -.public sub_0200CCA8 +.public IsStorableItem .public GetPressedButtons .public sub_02042744 .public sub_02043400 diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc index 32234fac..ca9d5215 100644 --- a/asm/include/overlay_24.inc +++ b/asm/include/overlay_24.inc @@ -3,7 +3,7 @@ .public Rand16Bit .public StrncpySimple .public SpecialProcAddItemToBag -.public Strcpy +.public strcpy .public ov11_02306C9C .public sub_02052F8C .public ov11_022DC504 @@ -45,16 +45,16 @@ .public sub_0203D538 .public sub_0206351C .public sub_0202C70C -.public SetPortraitExpressionId +.public SetPortraitEmotion .public sub_0201077C .public GetNameWithGender .public GetFirstEmptyMemberIdx .public HidePortraitBox -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public sub_0200D670 .public ov11_023061E4 .public ShowMessageInDBox -.public DivideInt +.public __divsi3 .public InitPreprocessorArgs .public sub_020107C4 .public sub_02017CB4 diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 8c12b254..158dd867 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -11,7 +11,7 @@ .public sub_0202F8FC .public sub_02027B1C .public PreprocessString -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public GetPressedButtons .public HidePortraitBox .public ov11_0230B8C0 @@ -32,7 +32,7 @@ .public InitPortraitBoxWithMonsterId .public ov11_0230BD28 .public GetNormalMenuResult -.public SetPortraitExpressionId +.public SetPortraitEmotion .public ShowDBox .public sub_0202F8C4 .public sub_02026268 diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index fc0a24b5..3f1a6c1c 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -4,7 +4,7 @@ .public GetGold .public sub_02044094 .public sub_02050CE4 -.public sub_0200CCA8 +.public IsStorableItem .public CreateNormalMenu .public RemoveItem .public sub_0202E3CC @@ -31,7 +31,7 @@ .public sub_020434D4 .public sub_02042AF8 .public InitPortraitBoxWithMonsterId -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public IsDBoxActive .public sub_020103AC .public sub_02043320 diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index 9b96e4fa..61b347e3 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -1,6 +1,6 @@ #pragma once .public sub_020276C0 -.public Strcpy +.public strcpy .public sub_02028EE8 .public sub_020348E4 .public sub_02026214 diff --git a/asm/include/overlay_29.inc b/asm/include/overlay_29.inc index b7f1920d..0c4622e6 100644 --- a/asm/include/overlay_29.inc +++ b/asm/include/overlay_29.inc @@ -6,7 +6,7 @@ .public ov10_022C22A0 .public sub_02052EFC .public sub_02003990 -.public Strlen +.public strlen .public sub_020091B0 .public sub_020091CC .public FemaleToMaleForm @@ -70,7 +70,7 @@ .public sub_0201BE84 .public ov10_022C159C .public ov10_022C0F6C -.public Memset +.public memset .public sub_0205349C .public ov10_022C14D0 .public ov10_022BDB54 @@ -89,7 +89,7 @@ .public sub_020038E8 .public sub_020585B4 .public ov31_02388114 -.public sub_0201C418 +.public SetAndPlayAnimationForAnimationControl .public sub_0200FA68 .public ov10_022BDC0C .public sub_020519D0 @@ -122,10 +122,10 @@ .public GetEffectAnimationField0x19 .public GetMoveNbStrikes .public sub_0202AB94 -.public ov31_0238878C +.public RestMenu .public sub_0205B77C .public sub_0202715C -.public ov10_022C2574 +.public IsBackgroundTileset .public GetCanMoveFlag .public sub_0204AEE0 .public sub_0201CF90 @@ -140,7 +140,7 @@ .public sub_02028E40 .public IsFutureDungeon .public ov10_022C2638 -.public Strncpy +.public strncpy .public ov10_022BF01C .public sub_0201D7E0 .public Arm9StoreUnkFieldNa0x2029ED8 @@ -166,8 +166,8 @@ .public ov00_0233103C .public sub_020483B8 .public RemoveEquivItemNoHole -.public ov31_0238704C -.public sub_0201D590 +.public TeamMenu +.public LoadWanTableEntryFromPackUseProvidedMemory .public sub_0201CF5C .public MemZero .public sub_0204F610 @@ -176,10 +176,10 @@ .public GetShadowSize .public HidePortraitBox .public CreatePortraitBox -.public sub_0200CC38 +.public IsLosableItem .public sub_0201BF4C .public SetScreenWindowsColor -.public DivideInt +.public __divsi3 .public sub_02047FFC .public sub_02001AB0 .public sub_02025784 @@ -209,7 +209,7 @@ .public sub_02048DC4 .public sub_02051D8C .public sub_02053D1C -.public sub_0204D894 +.public AllowPortraitDefault .public sub_0202F334 .public sub_02017D80 .public StrncpySimpleNoPad @@ -249,7 +249,7 @@ .public sub_020018A4 .public GetCurrentBagCapacity .public sub_0204AE80 -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public GetPerformanceFlagWithChecks .public MemFree .public SetItemAcquired @@ -257,7 +257,7 @@ .public HandleSir0Translation .public IsIqEnabled .public sub_0203931C -.public sub_0201D484 +.public LoadWanTableEntryFromPack .public IsItemWithFlagsInBag .public AnimationHasMoreFrames .public GetMoveMaxGinsengBoost @@ -279,9 +279,9 @@ .public sub_02054EC8 .public ov31_02387688 .public IsMoveRangeString19 -.public ov01_023310E4 +.public CreateMainMenus .public sub_02017BEC -.public Vsprintf +.public vsprintf .public sub_0202AAE8 .public ov10_022BFB6C .public GetMaxReachedFloor @@ -297,8 +297,8 @@ .public GetNameRaw .public RetrieveFromItemList1 .public sub_02024FE8 -.public Abs -.public sub_0201C458 +.public abs +.public SwitchAnimationControlToNextFrame .public sub_02050964 .public ov30_023829A0 .public sub_0202AABC @@ -366,10 +366,10 @@ .public sub_02027148 .public sub_02055020 .public ov31_023877EC -.public sub_0201C0E8 +.public SetSpriteIdForAnimationControl .public GetMonsterPreEvolution .public sub_0201CF80 -.public sub_0200CCE0 +.public IsShoppableItem .public IsSkyExclusiveDungeon .public SetPokemonBattled .public InitPortraitBox @@ -380,13 +380,13 @@ .public sub_0202AB40 .public sub_020090A0 .public GetLanguage -.public sub_0205384C +.public GetEncodedHalfword .public ov10_022BF764 .public sub_02028848 .public sub_02053038 .public sub_02003A40 .public FixedPoint64CmpLt -.public Strncmp +.public strncmp .public GetReleasedStylus .public IsExpEnabledInDungeon .public GetOutlawLevel @@ -417,10 +417,10 @@ .public UnloadCurrentWazaP .public GetName .public DungeonRequestsDoneWrapper -.public sub_0201E730 +.public InitRender3dElement .public sub_020483D8 .public ov10_022C1E80 -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public ov30_02382E08 .public UnloadWte .public sub_02058C3C @@ -438,7 +438,7 @@ .public ov10_022BF0F4 .public ov31_02386308 .public sub_02017C10 -.public Strcmp +.public strcmp .public ov10_022C0814 .public ov10_022C1E50 .public sub_020305E4 @@ -462,7 +462,7 @@ .public GetTalkLine .public GetSpawnThreshold .public sub_0202ABB0 -.public sub_0201DA80 +.public WanTableSpriteHasAnimationGroup .public ov30_02382A34 .public SetMonsterLevelAndId .public ov31_02386204 @@ -534,7 +534,7 @@ .public sub_02015328 .public IsThawingMove .public sub_0200F9B4 -.public Strcpy +.public strcpy .public GetMissionRank .public EnableIqSkill .public CanLearnIqSkill @@ -558,7 +558,7 @@ .public ZInit8 .public sub_020039E4 .public JoinedAtRangeCheck -.public Strcat +.public strcat .public AddFixedPoint64 .public sub_02051C24 .public sub_020017EC @@ -566,7 +566,7 @@ .public GetExplorerMazeMonster .public ov10_022BDAB0 .public sub_0202FFB0 -.public GetLvlStats +.public GetLvlUpEntry .public sub_0200D8AC .public RemoveAllItems .public IsDBoxActive @@ -623,7 +623,7 @@ .public StringFromMessageId .public ov10_022BF8E8 .public IsSpecialEpisodeDungeon -.public GetInfoMoveCheckId +.public InitMoveCheckId .public GetChanceAsleep .public ov10_022BFD8C .public sub_0200C008 @@ -657,7 +657,7 @@ .public sub_01FFB62C .public sub_01FF8C60 .public sub_01FF8130 -.public GetScenarioBalance__0204CB94 -.public CheckTeamMemberIdx__02056228 +.public GetScenarioBalance +.public CheckTeamMemberIdx .public ov01_0233103C -.public IsMonsterIdInNormalRange__02056294 +.public IsMonsterIdInNormalRange diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc index 087a4975..50292187 100644 --- a/asm/include/overlay_29_022DC240.inc +++ b/asm/include/overlay_29_022DC240.inc @@ -21,7 +21,7 @@ .public TryActivateArtificialWeatherAbilities .public ov29_022E081C .public ov29_0231B460 -.public ov29_022FBF58 +.public InitEnemySpawnStats .public ov29_023359F8 .public ov29_0234C738 .public ov10_022C14D0 @@ -33,9 +33,9 @@ .public ov29_022E8104 .public ov29_022E6E40 .public ov29_0234BB10 -.public InitTeam +.public SpawnTeam .public sub_020275DC -.public ov29_022F7804 +.public DeleteAllMonsterSpriteFiles .public ov29_02349C84 .public sub_01FF81CC .public sub_0201B9F8 @@ -43,11 +43,11 @@ .public InitDungeonRng .public ov10_022C16D8 .public ov29_022E7F7C -.public ov29_022FCD78 -.public ov29_022E6FBC +.public SpawnInitialMonsters +.public LoadMappaFileAttributes .public ov29_022ECFB8 .public ov29_022E1304 -.public ov29_023384F0 +.public UpdateShouldBoostKecleonShopSpawnChance .public ov29_022E12F8 .public RefillTeam .public ov29_02343980 @@ -55,7 +55,7 @@ .public ov10_022C0998 .public ov29_022E7F44 .public sub_0200B330 -.public ov29_02339CE8 +.public UpdateMinimap .public ov10_022BFE6C .public sub_02051C24 .public sub_02051DD0 @@ -65,16 +65,16 @@ .public SetDungeonRngPreseed .public sub_02063504 .public sub_0201F598 -.public ov29_022EFA74 +.public TryActivateIqBooster .public ov29_02349658 .public ov29_0233845C -.public ov10_022C2574 +.public IsBackgroundTileset .public ov29_022E34B0 -.public ov29_02344054 +.public OpenFixedBin .public ov10_022BDB80 .public TryInflictBurnStatusWholeTeam .public ov29_022E0E44 -.public ov29_02344088 +.public CloseFixedBin .public ov29_02338F48 .public sub_0205B77C .public ov29_022F6EF4 @@ -101,7 +101,7 @@ .public ov29_0234CB34 .public MemAlloc .public ov29_022EAD68 -.public ov29_023354C4 +.public TryActivateWeather .public sub_02058644 .public ov29_022E8708 .public ov29_022FE4A8 @@ -120,7 +120,7 @@ .public ov29_0234C654 .public ov29_022FAD4C .public EntityIsValid__022E0354 -.public ov29_02336F4C +.public UpdateTrapsVisibility .public ov29_0234BB20 .public ov29_0234CB54 .public GetMaxRescueAttempts @@ -134,7 +134,7 @@ .public ov29_02338868 .public sub_02051D68 .public sub_0201BAC8 -.public ov29_02336260 +.public CountItemsOnFloorForAcuteSniffer .public ov29_022FAF08 .public ov29_022EF9B8 .public sub_02001808 @@ -143,14 +143,14 @@ .public SetMinimapDataE447 .public ov29_022E6F94 .public Rand16Bit -.public ov29_02336A4C +.public DetermineAllTilesWalkableNeighbors .public ov29_02338F10 .public ov29_022ED888 .public IncrementNbSteals .public SetBothScreensWindowColorToDefault -.public ov29_022FE24C +.public SpawnShopkeepers .public ov29_0234B1A4 -.public DivideInt +.public __divsi3 .public ov29_02348894 .public sub_01FF8130 .public ov29_022E1640 @@ -173,7 +173,7 @@ .public sub_02051EF0 .public sub_02063830 .public ov29_022FA750 -.public ov29_0233836C +.public ResetGravity .public ov29_022F7EAC .public ov29_022ECDE4 .public sub_02057E90 @@ -183,7 +183,7 @@ .public ov29_0233665C .public ov29_023350FC .public ov29_022E9FC0 -.public ov29_022F6F10 +.public FreeLoadedAttackSpriteAndMore .public ov29_02346A64 .public LoadScriptVariableValue .public ov29_02338A4C @@ -198,7 +198,7 @@ .public ov29_02338F38 .public ov29_022EAF48 .public ov29_022FC9C0 -.public ov29_02344178 +.public IsRoomIlluminated .public ov29_022F7E34 .public ov29_023534E0 .public sub_02063770 @@ -231,7 +231,7 @@ .public ov29_023389C4 .public sub_0201BCCC .public ov29_02353860 -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public ov29_02304B64 .public ov10_022C0CE0 .public sub_020634F4 @@ -245,7 +245,7 @@ .public ov29_022FACBC .public ov29_022FA418 .public ov29_022E0434 -.public ov29_02338560 +.public TrySpawnDoughSeedPoke .public ov29_02345D84 .public ov29_0234AFA4 .public GetForcedLossReason @@ -268,7 +268,7 @@ .public ov29_022F7130 .public MemZero .public DungeonRngUnsetSecondary -.public ov29_0233AE94 +.public ClearHiddenStairs .public ov10_022BDC0C .public ov10_022C159C .public HandleSir0Translation @@ -277,12 +277,12 @@ .public ov29_0234AFD0 .public ov29_022F7BF4 .public ov29_0233873C -.public ov29_022E0864 -.public ov29_0233861C +.public IsBossFight +.public UpdateShouldBoostHiddenStairsSpawnChance .public ov29_0234C668 .public ov29_02334DA8 .public ov29_022F7308 -.public ov29_022EA968 +.public SetDungeonRngPreseed23Bit .public sub_0201E050 .public ov29_022E5F20 .public ChangeGiratinaFormIfSkyDungeon @@ -295,5 +295,5 @@ .public sub_020510E8 .public ov29_02338898 .public sub_0204AEA0 -.public ov29_02336450 +.public GetDefaultTileTextureId .public ov29_022EA3F8 diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index f0ba2af0..2c5d1c4f 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -13,7 +13,7 @@ .public GetMaxPpWrapper .public GetPressedButtons .public GetReleasedStylus -.public GetScenarioBalance__0204CB94 +.public GetScenarioBalance .public GetTileSafe .public HandleFaint .public HandleSir0Translation @@ -33,7 +33,7 @@ .public ov29_022DE15C .public ov29_022DE854 .public ov29_022E34B0 -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022E3A40 .public ov29_022E68BC .public ov29_022E8270 @@ -42,14 +42,14 @@ .public ov29_022E9FD0 .public ov29_022EA370 .public ov29_022ED9D0 -.public ov29_022FDDC0 +.public SubInitMonster .public ov29_02303F18 .public ov29_023046E8 -.public ov29_023356C0 +.public LoadTextureUi .public ov29_02335760 .public ov29_02335774 .public ov29_02335804 -.public ov29_02336204 +.public IsCurrentTilesetBackground .public ov29_0233A248 .public ov29_023457C8 .public ov29_0234B034 diff --git a/asm/include/overlay_29_022E1A40.inc b/asm/include/overlay_29_022E1A40.inc index 1d84dd06..517ebf26 100644 --- a/asm/include/overlay_29_022E1A40.inc +++ b/asm/include/overlay_29_022E1A40.inc @@ -1,17 +1,17 @@ #pragma once -.public Abs +.public abs .public CanSeeInvisibleMonsters .public EntityIsValid__022E1A1C .public EntityIsValid__022E32E8 .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetSpriteSize .public GetTileSafe .public HasDropeyeStatus .public IsBlinded .public IsPositionInSight .public ItemIsActive__022E330C -.public Strcpy +.public strcpy .public StringFromMessageId .public TeamMemberHasEnabledIqSkill .public ov29_022DE954 @@ -21,21 +21,21 @@ .public ov29_022E34C8 .public ov29_022E3534 .public ov29_022E3A58 -.public ov29_022E90CC +.public IsPositionActuallyInSight .public ov29_022ED82C .public ov29_022EDF7C -.public ov29_022F9408 -.public ov29_02300164 +.public GetMonsterApparentId +.public GetMonsterName .public ov29_0230040C .public ov29_023047DC .public ov29_02304830 .public ov29_02304954 -.public ov29_02336F4C +.public UpdateTrapsVisibility .public ov29_0233711C .public ov29_023372A4 -.public ov29_023386D8 -.public ov29_023391EC -.public ov29_02339CE8 +.public HiddenStairsPresent +.public DrawMinimapTile +.public UpdateMinimap .public ov29_02344BA8 .public ov29_0234B034 .public sub_02009194 diff --git a/asm/include/overlay_29_022E330C.inc b/asm/include/overlay_29_022E330C.inc index f8d432b3..dcb4561e 100644 --- a/asm/include/overlay_29_022E330C.inc +++ b/asm/include/overlay_29_022E330C.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationHasMoreFrames .public EntityIsValid__022E37B8 @@ -12,11 +12,11 @@ .public ov10_022BF8E8 .public ov10_022BFD20 .public ov29_022E2C6C -.public ov29_022E2EC4 -.public ov29_022E38E0 +.public UpdateCamera +.public AnimationDelayOrSomething .public ov29_022E5ED0 -.public ov29_02335A10 -.public ov29_02336F4C -.public ov29_02339CE8 +.public DisplayUi +.public UpdateTrapsVisibility +.public UpdateMinimap .public sub_0201C000 .public sub_0201CF90 diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index 41ec146c..cc098b00 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -1,5 +1,5 @@ #pragma once -.public Abs +.public abs .public AdvanceFrame .public AnimationHasMoreFrames .public CanMonsterSpawn @@ -24,7 +24,7 @@ .public GetSecondFormIfValid .public GetSleepAnimationId .public GetSpriteFileSize -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetSpriteSize .public GetTile .public HandleSir0Translation @@ -34,7 +34,7 @@ .public IsDestinationFloorWithMonster .public IsDojoDungeon .public IsItemForSpecialSpawnInBag -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public LogMessageByIdWithPopup .public MemAlloc .public MemFree @@ -76,34 +76,34 @@ .public ov29_022DC77C .public ov29_022DE5D8 .public ov29_022DE5F0 -.public ov29_022E0864 -.public ov29_022E0880 -.public ov29_022E272C +.public IsBossFight +.public IsCurrentFixedRoomBossFight +.public ShouldDisplayEntityWrapper .public ov29_022E2CA0 -.public ov29_022E333C -.public ov29_022E35E4 +.public GetVisibilityRange +.public PlayEffectAnimationEntity .public ov29_022EA370 .public ov29_022EA718 .public ov29_022EACCC .public ov29_022EACE4 -.public ov29_022EAE14 +.public ChangeDungeonMusic .public ov29_022ED0F4 .public ov29_022F42D8 -.public ov29_022F7068 -.public ov29_022FB5EC +.public DungeonGetTotalSpriteFileSize +.public CheckSpawnThreshold .public ov29_0230027C .public ov29_023049A8 .public ov29_0230D618 -.public ov29_0231B3FC -.public ov29_023361D4 +.public IsInSpawnList +.public IsFullFloorFixedRoom .public ov29_02339138 .public ov29_02339148 -.public ov29_02339CE8 +.public UpdateMinimap .public ov29_02339D7C .public ov29_0233A0E8 .public ov29_0233A1BC -.public ov29_02343E20 -.public ov29_0234914C +.public LoadFixedRoom +.public CheckActiveChallengeRequest .public ov29_02349378 .public ov29_0234B1A4 .public ov29_0234B4E0 diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index 66c55e9e..f6bbab69 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -1,6 +1,6 @@ #pragma once -.public Abs -.public DivideInt +.public abs +.public __divsi3 .public EntityIsValid__022E95F4 .public GetLeader .public GetTile @@ -12,7 +12,7 @@ .public ov29_022DE134 .public ov29_022DE638 .public ov29_022E1854 -.public ov29_022E2EC4 +.public UpdateCamera .public ov29_022E335C .public ov29_022E886C .public ov29_022E8C10 @@ -20,14 +20,14 @@ .public ov29_02300818 .public ov29_0230175C .public ov29_0230473C -.public ov29_02335A10 +.public DisplayUi .public ov29_02335F40 .public ov29_02338AC4 .public ov29_02339A24 -.public ov29_02339CE8 +.public UpdateMinimap .public ov29_02339FF4 .public ov29_0233A248 -.public ov29_0233A290 +.public InitWeirdMinimapMatrix .public ov29_0234B1A4 .public ov29_0234B4F4 .public ov29_0234B854 diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index 784e11c7..0e5c2114 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -1,11 +1,11 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AdvanceFrame .public CalcSpeedStageWrapper .public DecrementWindCounter .public DisplayActions -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandRange .public EnemyEvolution @@ -28,31 +28,31 @@ .public RoundUpDiv256 .public RunMonsterAi .public SetItemAcquired -.public Strcmp +.public strcmp .public StringFromMessageId .public SubstitutePlaceholderStringTags .public TickStatusAndHealthRegen .public TryActivateArtificialWeatherAbilities .public TryForcedLoss .public TrySpawnMonsterAndActivatePlusMinus -.public ov29_022E0880 -.public ov29_022E1610 -.public ov29_022E1A40 -.public ov29_022E272C +.public IsCurrentFixedRoomBossFight +.public GetItemInfo +.public UpdateEntityPixelPos +.public ShouldDisplayEntityWrapper .public ov29_022E555C .public ov29_022E81F8 -.public ov29_022E9618 +.public GetLeaderMonster .public ov29_022EF9C8 -.public ov29_022F0EDC -.public ov29_022F3934 -.public ov29_022F85F0 -.public ov29_02307D54 +.public SetLeaderAction +.public ChangeLeader +.public MoveMonsterToPos +.public TryRestoreRoostTyping .public ov29_0230FC24 .public ov29_02321260 -.public ov29_023354C4 -.public ov29_02345538 -.public ov29_023456BC -.public ov29_02347030 +.public TryActivateWeather +.public SpawnItem +.public RemoveGroundItem +.public RemoveEmptyItemsInBagWrapper .public ov29_02347040 .public ov29_02348FD8 .public sub_01FFBDF4 diff --git a/asm/include/overlay_29_022EC62C.inc b/asm/include/overlay_29_022EC62C.inc index 63ed13de..2f6eb3f4 100644 --- a/asm/include/overlay_29_022EC62C.inc +++ b/asm/include/overlay_29_022EC62C.inc @@ -1,8 +1,8 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public DisplayActions -.public DivideInt +.public __divsi3 .public EntityIsValid__022EC608 .public EntityIsValid__022ECDC0 .public ExecuteMonsterAction @@ -14,9 +14,9 @@ .public TryForcedLoss .public TrySpawnMonsterAndTickSpawnCounter .public ov29_022E5DBC -.public ov29_022EAE14 +.public ChangeDungeonMusic .public ov29_022EAEF0 .public ov29_022EF9C8 .public ov29_022F2FE4 -.public ov29_022F98B4 -.public ov29_02300164 +.public TryPointCameraToMonster +.public GetMonsterName diff --git a/asm/include/overlay_29_022ECDE4.inc b/asm/include/overlay_29_022ECDE4.inc index 98978986..6172e249 100644 --- a/asm/include/overlay_29_022ECDE4.inc +++ b/asm/include/overlay_29_022ECDE4.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -16,29 +16,29 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LogMessageByIdWithPopupCheckUserUnknown .public MemZero -.public Memset +.public memset .public ProcessWte -.public Strcpy +.public strcpy .public StringFromMessageId .public SubstitutePlaceholderStringTags -.public ov29_022E1608 -.public ov29_022E2260 +.public GetTrapInfo +.public SpawnTrap .public ov29_022E2CA0 .public ov29_022E56A0 .public ov29_022E58B0 .public ov29_022E7A30 -.public ov29_022EF154 +.public ApplyTrapEffect .public ov29_022F89CC .public ov29_022F9840 -.public ov29_02300164 -.public ov29_0230D47C -.public ov29_023361D4 -.public ov29_02336F4C -.public ov29_023391EC -.public ov29_02344148 +.public GetMonsterName +.public UpdateShopkeeperModeAfterTrap +.public IsFullFloorFixedRoom +.public UpdateTrapsVisibility +.public DrawMinimapTile +.public AreLateGameTrapsEnabled .public ov29_0234B034 .public sub_0201B9F8 .public sub_0201E080 -.public sub_0201E730 +.public InitRender3dElement .public sub_0201F2A0 .public sub_02024FC8 diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 22cc7117..76858d58 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public CalcStatusDuration .public DungeonRandInt .public EntityIsValid__022EE348 @@ -31,11 +31,11 @@ .public TryInflictSleepStatus .public TrySealMove .public TryWarp -.public ov29_022E1608 -.public ov29_022E1610 -.public ov29_022E272C -.public ov29_022E333C -.public ov29_022E38E0 +.public GetTrapInfo +.public GetItemInfo +.public ShouldDisplayEntityWrapper +.public GetVisibilityRange +.public AnimationDelayOrSomething .public ov29_022E56A0 .public ov29_022E56D4 .public ov29_022E58B0 @@ -46,23 +46,23 @@ .public ov29_022FA574 .public ov29_022FB920 .public ov29_022FBD80 -.public ov29_02301EAC +.public HasTypeAffectedByGravity .public ov29_023049A8 .public ov29_02304A48 -.public ov29_0230D11C -.public ov29_02314EB8 -.public ov29_02319624 -.public ov29_02320448 -.public ov29_023361D4 -.public ov29_02336F4C -.public ov29_023391EC -.public ov29_02339CE8 -.public ov29_02344148 +.public ApplyDamageAndEffectsWrapper +.public TryInflictGrudgeStatus +.public TryResetStatChanges +.public TryExplosion +.public IsFullFloorFixedRoom +.public UpdateTrapsVisibility +.public DrawMinimapTile +.public UpdateMinimap +.public AreLateGameTrapsEnabled .public ov29_02344B44 -.public ov29_02344BD0 -.public ov29_023456BC +.public GenerateStandardItem +.public RemoveGroundItem .public ov29_02346344 -.public ov29_02347030 +.public RemoveEmptyItemsInBagWrapper .public ov29_0234B084 .public sub_02001888 .public sub_0200FA68 diff --git a/asm/include/overlay_29_022EF7C4.inc b/asm/include/overlay_29_022EF7C4.inc index 2193f526..c68732a3 100644 --- a/asm/include/overlay_29_022EF7C4.inc +++ b/asm/include/overlay_29_022EF7C4.inc @@ -3,13 +3,13 @@ .public EntityIsValid__022F0590 .public IsFloorOver .public ov29_022DE5F0 -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022EA370 -.public ov29_022EAE14 -.public ov29_022F85F0 -.public ov29_022FA144 +.public ChangeDungeonMusic +.public MoveMonsterToPos +.public BoostIQ .public ov29_022FA360 -.public ov29_0230F798 +.public TeamMemberHasItemActive .public ov29_023444D4 .public ov29_02348F20 .public ov29_0234B1A4 diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 0dcbaac8..7c8d4bc3 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -1,12 +1,12 @@ #pragma once -.public Abs +.public abs .public AddItemToBag .public AddItemToBagNoHeld .public AddMoneyCarried .public AdvanceFrame .public CeilFixedPoint .public CheckTeamMemberIdx__022F9C34 -.public DivideInt +.public __divsi3 .public DungeonRandInt .public EntityIsValid__022F0590 .public ExecuteMoveEffect @@ -55,34 +55,34 @@ .public ov29_022E0C64 .public ov29_022E0C80 .public ov29_022E0C9C -.public ov29_022E0CB8 +.public CheckTouchscreenArea .public ov29_022E0DD8 .public ov29_022E0DF0 -.public ov29_022E1608 -.public ov29_022E1610 -.public ov29_022E274C +.public GetTrapInfo +.public GetItemInfo +.public CanSeeTarget .public ov29_022E28D4 -.public ov29_022E2A38 +.public GetTeamMemberIndex .public ov29_022E2CA0 -.public ov29_022E2E54 -.public ov29_022E38E0 +.public PointCameraToMonster +.public AnimationDelayOrSomething .public ov29_022E3DD8 .public ov29_022E3E24 .public ov29_022E8104 .public ov29_022E81F8 -.public ov29_022E9618 +.public GetLeaderMonster .public ov29_022EA370 .public ov29_022EA3B4 .public ov29_022EA428 .public ov29_022EACCC .public ov29_022EB398 -.public ov29_022EB3C8 -.public ov29_022EB54C +.public SetLeaderActionFields +.public GetItemToUse .public ov29_022EB568 .public ov29_022EB594 .public ov29_022EB944 -.public ov29_022EBC98 -.public ov29_022EDFA0 +.public SetActionUseMovePlayer +.public TryTriggerTrap .public ov29_022F04F0 .public ov29_022F0518 .public ov29_022F59C4 @@ -90,7 +90,7 @@ .public ov29_022F670C .public ov29_022F87C0 .public ov29_022F89AC -.public ov29_022F98B4 +.public TryPointCameraToMonster .public ov29_022F9C4C .public ov29_022F9EA0 .public ov29_022FA2F0 @@ -105,40 +105,40 @@ .public ov29_023009CC .public ov29_02300E78 .public ov29_02300FCC -.public ov29_0230105C +.public CanMonsterMoveInDirection .public ov29_02301158 .public ov29_0230175C .public ov29_023049A8 .public ov29_023055B0 -.public ov29_02307F4C -.public ov29_023186CC -.public ov29_02318700 +.public TryTriggerMonsterHouse +.public MonsterHasEmbargoStatus +.public LogItemBlockedByEmbargo .public ov29_02321164 .public ov29_02322DDC .public ov29_0232461C -.public ov29_02336F4C -.public ov29_02337428 -.public ov29_0233779C -.public ov29_02337B68 +.public UpdateTrapsVisibility +.public DrawTileGrid +.public HideTileGrid +.public PositionHasMonster .public ov29_02337D68 -.public ov29_02338794 +.public HiddenStairsTrigger .public ov29_02338F58 .public ov29_02339190 .public ov29_023391C0 .public ov29_02339CD4 -.public ov29_02339CE8 +.public UpdateMinimap .public ov29_02339D7C .public ov29_0233A0E8 .public ov29_0233A248 .public ov29_02344B44 -.public ov29_02345058 -.public ov29_02345538 -.public ov29_023456BC -.public ov29_02346BD8 +.public TryLeaderItemPickUp +.public SpawnItem +.public RemoveGroundItem +.public CheckTeamItemsFlags .public ov29_02346E5C -.public ov29_02346F14 +.public AddHeldItemToBag .public ov29_02346FB8 -.public ov29_02347030 +.public RemoveEmptyItemsInBagWrapper .public ov29_02348D3C .public ov29_02348ECC .public ov29_023491B8 @@ -150,9 +150,9 @@ .public ov29_0234B1A4 .public ov29_0234B4CC .public ov29_0234BA54 -.public ov29_0234BAC0 +.public InitPortraitDungeon .public ov29_0234BB38 -.public ov29_0234D518 +.public YesNoMenu .public ov29_0234D650 .public ov29_0234D65C .public ov29_0234D668 @@ -161,7 +161,7 @@ .public ov29_0234D860 .public ov29_0234D878 .public ov29_0234D88C -.public ov29_0234DDF4 +.public OpenMenu .public ov29_0234E8F8 .public ov29_0234FC50 .public ov29_0234FCA8 diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc index fa92a59c..8330d72e 100644 --- a/asm/include/overlay_29_022F52B0.inc +++ b/asm/include/overlay_29_022F52B0.inc @@ -1,10 +1,10 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public ApplyItemEffect .public DecrementStackItem .public DisplayMessage .public DisplayMessage2 -.public DivideInt +.public __divsi3 .public DungeonRandInt .public EnemyEvolution .public EntityIsValid__022F528C @@ -28,14 +28,14 @@ .public LogMessageByIdWithPopupCheckUser .public RemoveEquivItemNoHole .public ShouldMonsterRunAwayVariation -.public Strcpy -.public Strncpy +.public strcpy +.public strncpy .public SubstitutePlaceholderStringTags .public TryActivateTruant .public UpdateMapSurveyorFlag .public UpdateMovePp -.public ov29_022E08A0 -.public ov29_022E272C +.public IsMarowakTrainingMaze +.public ShouldDisplayEntityWrapper .public ov29_022E56A0 .public ov29_022E5728 .public ov29_022E690C @@ -44,9 +44,9 @@ .public ov29_022E9A9C .public ov29_022EA370 .public ov29_022EB378 -.public ov29_022EB54C -.public ov29_022EB60C -.public ov29_022EFB04 +.public GetItemToUse +.public RemoveUsedItem +.public IsSecretBazaarNpcBehavior .public ov29_022F3B8C .public ov29_022F6748 .public ov29_022F87C0 @@ -60,40 +60,40 @@ .public ov29_02304A48 .public ov29_02304AFC .public ov29_02307BDC -.public ov29_02307F4C +.public TryTriggerMonsterHouse .public ov29_0230F9A4 -.public ov29_023186CC -.public ov29_02318700 -.public ov29_0231A7A0 +.public MonsterHasEmbargoStatus +.public LogItemBlockedByEmbargo +.public ShouldUsePp .public ov29_0231AE3C -.public ov29_0231D4A4 +.public CanMonsterUseItem .public ov29_0232145C .public ov29_02322374 .public ov29_02338430 .public ov29_0233A248 .public ov29_02343D30 -.public ov29_02344160 +.public AreMovesEnabled .public ov29_02344544 .public ov29_02344B44 .public ov29_02344B70 -.public ov29_02345538 -.public ov29_023456BC +.public SpawnItem +.public RemoveGroundItem .public ov29_02346FB8 .public ov29_02347000 -.public ov29_02347030 +.public RemoveEmptyItemsInBagWrapper .public ov29_02347518 .public ov29_02347BC8 .public ov29_02348C64 -.public ov29_023491A4 +.public GetMissionDestination .public ov29_0234A2D4 .public ov29_0234A5E4 .public ov29_0234B034 .public ov29_0234B0B4 -.public ov29_0234BAC0 +.public InitPortraitDungeon .public ov29_0234CFA0 -.public ov29_0234CFEC +.public GetPersonalityIndex .public ov29_0234D304 -.public ov29_0234D518 +.public YesNoMenu .public sub_02020880 .public sub_02024FB8 .public sub_02025888 diff --git a/asm/include/overlay_29_022F62CC.inc b/asm/include/overlay_29_022F62CC.inc index 65867204..85728a7e 100644 --- a/asm/include/overlay_29_022F62CC.inc +++ b/asm/include/overlay_29_022F62CC.inc @@ -1,5 +1,5 @@ #pragma once -.public Abs +.public abs .public AddMoneyCarried .public CalcSpeedStageWrapper .public DeleteWanTableEntryVeneer @@ -28,22 +28,22 @@ .public MemZero .public TeamLeaderIqSkillIsEnabled .public TryWarp -.public ov29_022E1610 -.public ov29_022E38E0 +.public GetItemInfo +.public AnimationDelayOrSomething .public ov29_022EACCC .public ov29_022F6210 -.public ov29_022FF764 +.public CannotStandOnTile .public ov29_023009CC .public ov29_02304A00 .public ov29_02304A48 .public ov29_0231B490 .public ov29_0231B4AC -.public ov29_02345538 -.public ov29_023456BC +.public SpawnItem +.public RemoveGroundItem .public ov29_0234B09C -.public ov29_0234BAC0 -.public ov29_0234D518 +.public InitPortraitDungeon +.public YesNoMenu .public sub_020018A4 -.public sub_0200CCE0 -.public sub_0201D590 +.public IsShoppableItem +.public LoadWanTableEntryFromPackUseProvidedMemory .public sub_0208FC8C diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 6aa05a22..948d5150 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -1,17 +1,17 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public AiMovement .public ApplyItemEffect .public CanAttackInDirection .public CanMonsterSpawn .public CeilFixedPoint -.public CheckTeamMemberIdx__02056228 +.public CheckTeamMemberIdx .public Conversion2IsActive .public DeleteWanTableEntryVeneer .public DisplayMessage .public DisplayMessage2 -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRngSetPrimary .public DungeonRngSetSecondary @@ -34,10 +34,10 @@ .public GetFileLengthInPackWithPackNb .public GetFloorType .public GetForcedLossReason -.public GetInfoMoveCheckId +.public InitMoveCheckId .public GetLeader .public GetLearnableIqSkills -.public GetLvlStats +.public GetLvlUpEntry .public GetMaxPp .public GetMaxPpWrapper .public GetMobilityType @@ -50,8 +50,8 @@ .public GetMoveTypeForMonster .public GetNbItemsInBag .public GetNumberOfAttacks -.public GetScenarioBalance__0204CB94 -.public GetScenarioBalance__022E095C +.public GetScenarioBalance +.public GetScenarioBalanceVeneer .public GetSleepAnimationId .public GetSpawnThreshold .public GetSpriteFileSize @@ -70,7 +70,7 @@ .public IsDestinationFloorWithFixedRoom .public IsDestinationFloorWithMonster .public IsLevelResetDungeon -.public IsMonsterIdInNormalRange__02056294 +.public IsMonsterIdInNormalRange .public IsOneHitKoMove .public IsOutlawOrChallengeRequestFloor .public IsRecruitingAllowed @@ -91,7 +91,7 @@ .public RandInt .public RemoveEquivItem .public ReplaceWanFromBinFile -.public RestoreMovePP +.public RestoreAllMovePP .public SetActionPassTurnOrWalk .public SetForcedLossReason .public SetMissionTargetEnemyDefeated @@ -107,19 +107,19 @@ .public UpdateStatusIconFlags .public ov29_022DDA54 .public ov29_022DDB68 -.public ov29_022E0880 +.public IsCurrentFixedRoomBossFight .public ov29_022E0A04 .public ov29_022E1C0C .public ov29_022E2470 -.public ov29_022E272C -.public ov29_022E274C +.public ShouldDisplayEntityWrapper +.public CanSeeTarget .public ov29_022E2978 .public ov29_022E2A78 -.public ov29_022E2E54 -.public ov29_022E2EC4 -.public ov29_022E38E0 +.public PointCameraToMonster +.public UpdateCamera +.public AnimationDelayOrSomething .public ov29_022E4160 -.public ov29_022E4964 +.public ShowPpRestoreEffect .public ov29_022E576C .public ov29_022E6260 .public ov29_022E647C @@ -135,47 +135,47 @@ .public ov29_022EF7C4 .public ov29_022EF938 .public ov29_022EFAE8 -.public ov29_022EFB04 +.public IsSecretBazaarNpcBehavior .public ov29_022FCD04 .public ov29_022FE048 -.public ov29_022FE2FC -.public ov29_022FE350 -.public ov29_022FE3B8 -.public ov29_022FE420 -.public ov29_022FF6C4 +.public GetMaxHpAtLevel +.public GetOffensiveStatAtLevel +.public GetDefensiveStatAtLevel +.public GetOutlawSpawnData +.public IsInvalidSpawnTile .public ov29_022FFB90 -.public ov29_02300164 +.public GetMonsterName .public ov29_0230040C -.public ov29_023007A8 +.public IsMonsterSleeping .public ov29_02300818 .public ov29_02300CB0 .public ov29_0230175C .public ov29_023018AC .public ov29_023021F0 -.public ov29_02303B18 +.public GetMonsterMoves .public ov29_02304830 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02304BAC -.public ov29_02305FDC -.public ov29_023061A8 -.public ov29_023064F4 +.public EndSleepClassStatus +.public EndBurnClassStatus +.public EndReflectClassStatus .public ov29_02307CE0 .public ov29_02307DD0 -.public ov29_0230AA8C +.public GetTypeMatchupBothTypes .public ov29_0230F654 .public ov29_0230F9A4 .public ov29_023159D4 -.public ov29_0231D4A4 -.public ov29_0231E990 -.public ov29_02324798 -.public ov29_023361D4 -.public ov29_023363C0 -.public ov29_02337A3C +.public CanMonsterUseItem +.public ShouldTryEatItem +.public HasMaxGinsengBoost99 +.public IsFullFloorFixedRoom +.public GetStairsSpawnPosition +.public DiscoverMinimap .public ov29_02337EC0 .public ov29_02338F24 -.public ov29_023391EC -.public ov29_02339CE8 +.public DrawMinimapTile +.public UpdateMinimap .public ov29_02344B44 .public ov29_02348100 .public ov29_02349688 @@ -186,16 +186,16 @@ .public ov29_0234B09C .public ov29_0234B0B4 .public ov29_0234B1A4 -.public ov29_0234D518 +.public YesNoMenu .public ov29_0234EF24 .public sub_0200F9B4 .public sub_0200FB54 .public sub_0201405C .public sub_02017C50 .public sub_0201C0CC -.public sub_0201C0E8 -.public sub_0201D484 -.public sub_0201D590 +.public SetSpriteIdForAnimationControl +.public LoadWanTableEntryFromPack +.public LoadWanTableEntryFromPackUseProvidedMemory .public sub_0204AEF0 .public sub_02050964 .public sub_02050FF8 diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index c313b0c0..6733ff05 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public CalcSpeedStageWrapper .public DisplayActions @@ -23,11 +23,11 @@ .public GetCurrentBagCapacity .public GetItemToRetrieve .public GetLeader -.public GetLvlStats +.public GetLvlUpEntry .public GetMissionRank .public GetMonsterIdToSpawn .public GetMonsterLevelToSpawn -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetTile .public GetType .public HasHeldItem @@ -54,8 +54,8 @@ .public ov29_022DDA54 .public ov29_022DDB68 .public ov29_022DEA10 -.public ov29_022E0880 -.public ov29_022E1A40 +.public IsCurrentFixedRoomBossFight +.public UpdateEntityPixelPos .public ov29_022E1AAC .public ov29_022E1AD4 .public ov29_022E1C0C @@ -64,24 +64,24 @@ .public ov29_022E1EC4 .public ov29_022E1F34 .public ov29_022E2018 -.public ov29_022E20C0 +.public CreateEnemyEntity .public ov29_022E2DFC -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022E3A58 .public ov29_022E5D68 .public ov29_022E6644 -.public ov29_022E7AC4 +.public GetItemIdToSpawn .public ov29_022E81F8 .public ov29_022E9628 -.public ov29_022E99F0 -.public ov29_022E9A0C +.public FindClosestUnoccupiedTileWithin2 +.public FindFarthestUnoccupiedTileWithin2 .public ov29_022EB944 .public ov29_022EC85C -.public ov29_022EDDD4 -.public ov29_022EDFA0 +.public TrySpawnTrapperTrap +.public TryTriggerTrap .public ov29_022EF9BC .public ov29_022EFAE8 -.public ov29_022EFB04 +.public IsSecretBazaarNpcBehavior .public ov29_022F3890 .public ov29_022F4350 .public ov29_022F4370 @@ -94,13 +94,13 @@ .public ov29_022F4DAC .public ov29_022F505C .public ov29_022F52B0 -.public ov29_022F52CC -.public ov29_022F54BC +.public UseSingleUseItemWrapper +.public UseThrowableItem .public ov29_022F59C4 .public ov29_022F5F18 .public ov29_022F6058 -.public ov29_022F85F0 -.public ov29_022F9408 +.public MoveMonsterToPos +.public GetMonsterApparentId .public ov29_022F9840 .public ov29_022F996C .public ov29_022F9EA0 @@ -111,12 +111,12 @@ .public ov29_022FBD08 .public ov29_022FBF08 .public ov29_022FBF30 -.public ov29_022FC234 +.public InitEnemyStatsAndMoves .public ov29_022FC468 .public ov29_022FEDBC .public ov29_022FEFC8 -.public ov29_022FF168 -.public ov29_022FF6C4 +.public TryActivateFlashFireOnAllMonsters +.public IsInvalidSpawnTile .public ov29_022FFC9C .public ov29_02300DCC .public ov29_02300E78 @@ -133,15 +133,15 @@ .public ov29_02318D58 .public ov29_0231A8A0 .public ov29_0231A9F8 -.public ov29_02321104 +.public EnsureCanStandCurrentTile .public ov29_0232461C .public ov29_02337CCC .public ov29_02338708 .public ov29_02338850 .public ov29_02338898 .public ov29_02346888 -.public ov29_02346F14 -.public ov29_023491A4 +.public AddHeldItemToBag +.public GetMissionDestination .public ov29_0234B024 .public ov29_0234BA54 .public sub_02050FF8 diff --git a/asm/include/overlay_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc index 43710b3d..29491b71 100644 --- a/asm/include/overlay_29_022FEDBC.inc +++ b/asm/include/overlay_29_022FEDBC.inc @@ -10,7 +10,7 @@ .public GetMobilityType .public GetSpeedStatus .public GetTile -.public HasConditionalGroundImmunity +.public IsFloating .public HasHeldItem .public IqSkillIsEnabled .public IsBlinded @@ -22,16 +22,16 @@ .public TickStatusTurnCounter .public ov29_022E56A0 .public ov29_022E655C -.public ov29_022EBC98 +.public SetActionUseMovePlayer .public ov29_022FAA04 -.public ov29_023007A8 +.public IsMonsterSleeping .public ov29_02300DCC .public ov29_02300E78 -.public ov29_023023C0 +.public UpdateStateFlags .public ov29_0230F654 -.public ov29_02313CE4 +.public ActivateFlashFire .public ov29_02318D58 .public ov29_02322374 -.public ov29_023245A4 -.public ov29_02336204 +.public IsChargingTwoTurnMove +.public IsCurrentTilesetBackground .public ov29_02344B44 diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index 2d3cb14d..c7f368f1 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -2,7 +2,7 @@ .public CanLearnIqSkill .public CanThrowItems .public DisableIqSkill -.public DivideInt +.public __divsi3 .public DungeonRandInt .public EnableIqSkill .public EntityIsValid__023000E4 @@ -22,7 +22,7 @@ .public GetNameWithGender .public GetPerformanceFlagWithChecks .public GetSpeciesIqSkill -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetTile .public GravityIsActive .public HasHeldItem @@ -36,27 +36,27 @@ .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUserTarget .public MultiplyByFixedPoint -.public Strcpy +.public strcpy .public StringFromMessageId .public SubstitutePlaceholderStringTags -.public Vsprintf +.public vsprintf .public ov29_022E2470 -.public ov29_022E274C +.public CanSeeTarget .public ov29_022E62A8 .public ov29_022FAFD4 .public ov29_022FBDE0 -.public ov29_022FF674 +.public GetMobilityTypeCheckSlipAndFloating .public ov29_02302C04 .public ov29_02302CC8 -.public ov29_0230303C +.public LevelUp .public ov29_0230F654 .public ov29_02314DC4 -.public ov29_023197CC -.public ov29_0231AE90 -.public ov29_0231AF0C +.public MistIsActive +.public GetEntityNaturalGiftInfo +.public GetEntityWeatherBallType .public ov29_0232461C .public ov29_02324BE8 -.public ov29_02336204 +.public IsCurrentTilesetBackground .public ov29_02344B44 .public ov29_0234B034 .public ov29_0234B09C diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 6dc31b17..765721c7 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -6,10 +6,10 @@ .public EntityIsValid__023047B8 .public FormatMoveString .public GetLeader -.public GetLvlStats +.public GetLvlUpEntry .public GetMovesetLevelUpPtr .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetStringFromFileVeneer .public GetTalkLine .public GetTile @@ -21,8 +21,8 @@ .public NeedsItemToSpawn .public Rand16Bit .public SpawnMonster -.public Strcat -.public Strcpy +.public strcat +.public strcpy .public StringFromMessageId .public SubstitutePlaceholderStringTags .public ov29_022DD7D8 @@ -39,13 +39,13 @@ .public ov29_022EAC9C .public ov29_022EBCE8 .public ov29_022ECB38 -.public ov29_022F7050 -.public ov29_022F9194 -.public ov29_022F98B4 +.public GetLoadedAttackSpriteId +.public SetMonsterTypeAndAbility +.public TryPointCameraToMonster .public ov29_022FB6E4 -.public ov29_022FDDC0 -.public ov29_022FF6C4 -.public ov29_02300164 +.public SubInitMonster +.public IsInvalidSpawnTile +.public GetMonsterName .public ov29_0230040C .public ov29_023009CC .public ov29_023021F0 @@ -59,18 +59,18 @@ .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B4E0 -.public ov29_0234BAC0 +.public InitPortraitDungeon .public ov29_0234CFA0 -.public ov29_0234CFEC +.public GetPersonalityIndex .public ov29_0234D234 .public ov29_0234D304 .public ov29_0234D484 .public ov29_0234FAEC .public sub_020149C0 .public sub_0201B9F8 -.public sub_0201C0E8 -.public sub_0201C418 -.public sub_0201C458 +.public SetSpriteIdForAnimationControl +.public SetAndPlayAnimationForAnimationControl +.public SwitchAnimationControlToNextFrame .public sub_0201CF5C .public sub_0201D034 .public sub_0201D110 @@ -78,7 +78,7 @@ .public sub_0201D1B0 .public sub_02025888 .public sub_0204F610 -.public sub_0205384C +.public GetEncodedHalfword .public sub_02053904 .public sub_02054FB8 .public sub_02054FEC diff --git a/asm/include/overlay_29_023047DC.inc b/asm/include/overlay_29_023047DC.inc index f9fbe8c1..f7fbb30a 100644 --- a/asm/include/overlay_29_023047DC.inc +++ b/asm/include/overlay_29_023047DC.inc @@ -1,39 +1,39 @@ #pragma once .public AdvanceFrame -.public DivideInt +.public __divsi3 .public EnemyEvolution .public EntityIsValid__023047B8 .public EntityIsValid__0230558C .public GetDirectionTowardsPosition .public GetShadowSize -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetTileAtEntity .public IsFloorOver .public Rand16Bit .public TryForcedLoss -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022E1A90 -.public ov29_022E272C +.public ShouldDisplayEntityWrapper .public ov29_022E8104 .public ov29_022EA370 .public ov29_022EF9BC .public ov29_022EF9C8 -.public ov29_022F3634 +.public CheckLeaderTile .public ov29_022F62CC .public ov29_022F9C74 .public ov29_02300818 .public ov29_02300CB0 -.public ov29_02305694 +.public CheckNonLeaderTile .public ov29_02305814 .public ov29_02307DD0 .public ov29_0230FC24 -.public ov29_02321104 -.public ov29_02337A3C -.public ov29_02337E94 +.public EnsureCanStandCurrentTile +.public DiscoverMinimap +.public IsWaterTileset .public ov29_02346888 .public ov29_0234AD10 .public ov29_0234BA18 -.public sub_0201C0E8 -.public sub_0201C418 +.public SetSpriteIdForAnimationControl +.public SetAndPlayAnimationForAnimationControl .public sub_0204AEE0 .public sub_02053038 diff --git a/asm/include/overlay_29_023055B0.inc b/asm/include/overlay_29_023055B0.inc index 16422a0e..373425a0 100644 --- a/asm/include/overlay_29_023055B0.inc +++ b/asm/include/overlay_29_023055B0.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public CalcSpeedStageWrapper .public EndCringeClassStatus .public EndFrozenClassStatus @@ -16,35 +16,35 @@ .public LogMessageByIdWithPopupCheckUserTarget .public SubstitutePlaceholderStringTags .public UpdateStatusIconFlags -.public ov29_022E1608 +.public GetTrapInfo .public ov29_022E2CA0 .public ov29_022E3A58 .public ov29_022E543C .public ov29_022EA370 -.public ov29_022EDFA0 +.public TryTriggerTrap .public ov29_022FBE04 -.public ov29_023004B0 -.public ov29_023004E4 -.public ov29_02300500 -.public ov29_02300520 -.public ov29_0230053C -.public ov29_02300588 -.public ov29_023005A4 -.public ov29_023005C0 -.public ov29_023005FC -.public ov29_02300618 -.public ov29_02300634 +.public IsMonsterDrowsy +.public MonsterHasNonvolatileNonsleepStatus +.public MonsterHasImmobilizingStatus +.public MonsterHasAttackInterferingStatus +.public MonsterHasSkillInterferingStatus +.public MonsterHasLeechSeedStatus +.public MonsterHasWhifferStatus +.public IsMonsterVisuallyImpaired +.public IsMonsterMuzzled +.public MonsterHasMiracleEyeStatus +.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_023049A8 -.public ov29_02305FDC -.public ov29_023061A8 -.public ov29_02306728 -.public ov29_023068C4 -.public ov29_02306950 -.public ov29_02306B28 -.public ov29_02306BF8 -.public ov29_02306C64 -.public ov29_02307F4C -.public ov29_0230F164 -.public ov29_02336F4C +.public EndSleepClassStatus +.public EndBurnClassStatus +.public EndCurseClassStatus +.public EndLeechSeedClassStatus +.public EndSureShotClassStatus +.public EndBlinkerClassStatus +.public EndMuzzledStatus +.public EndMiracleEyeStatus +.public TryTriggerMonsterHouse +.public TryNonLeaderItemPickUp +.public UpdateTrapsVisibility .public ov29_02337D68 diff --git a/asm/include/overlay_29_02305C28.inc b/asm/include/overlay_29_02305C28.inc index dffb4782..53f1ff30 100644 --- a/asm/include/overlay_29_02305C28.inc +++ b/asm/include/overlay_29_02305C28.inc @@ -1,5 +1,5 @@ #pragma once -.public Abs +.public abs .public AdvanceFrame .public CalcSpeedStageWrapper .public CalcStatusDuration @@ -7,7 +7,7 @@ .public EntityIsValid__02307EF8 .public FreeOtherWrappedMonsters .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetType .public ItemIsActive__02307F1C .public LogMessageByIdWithPopupCheckUser @@ -32,33 +32,33 @@ .public ov29_022E65F4 .public ov29_022E6798 .public ov29_022F62CC -.public ov29_022F9408 +.public GetMonsterApparentId .public ov29_022FA1D8 .public ov29_022FB984 -.public ov29_022FDDC0 -.public ov29_02300634 -.public ov29_02301940 -.public ov29_02302430 +.public SubInitMonster +.public MonsterHasNegativeStatus +.public SafeguardIsActive +.public IsProtectedFromNegativeStatus .public ov29_02304830 .public ov29_02304A48 -.public ov29_023058C4 -.public ov29_0230D11C +.public EndNegativeStatusCondition +.public ApplyDamageAndEffectsWrapper .public ov29_02311C28 -.public ov29_02315C00 -.public ov29_02315E24 -.public ov29_023163A8 -.public ov29_0231662C -.public ov29_02316720 -.public ov29_02317124 -.public ov29_023174C8 -.public ov29_023176CC -.public ov29_02317844 -.public ov29_02317AF4 -.public ov29_0231827C -.public ov29_023185A8 -.public ov29_0231872C -.public ov29_02318850 -.public ov29_02321104 +.public TryInflictWhifferStatus +.public TryInflictDecoyStatus +.public TryInflictTauntStatus +.public TryInflictPerishSongStatus +.public TryInflictEncoreStatus +.public TryInflictMuzzledStatus +.public TryInflictExposedStatus +.public TryInflictBlinkerStatus +.public TryInflictCrossEyedStatus +.public TryInflictDropeyeStatus +.public TryInflictGastroAcidStatus +.public TryInflictHealBlockStatus +.public TryInflictEmbargoStatus +.public TryInflictMiracleEyeStatus +.public EnsureCanStandCurrentTile .public ov29_02321134 -.public ov29_02336F4C -.public ov29_02339CE8 +.public UpdateTrapsVisibility +.public UpdateMinimap diff --git a/asm/include/overlay_29_02307F1C.inc b/asm/include/overlay_29_02307F1C.inc index bab570d4..068a8c44 100644 --- a/asm/include/overlay_29_02307F1C.inc +++ b/asm/include/overlay_29_02307F1C.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public DungeonRandInt .public DungeonRandRange @@ -11,4 +11,4 @@ .public MewSpawnCheck .public MultiplyByFixedPoint .public SpawnMonster -.public ov29_022E38E0 +.public AnimationDelayOrSomething diff --git a/asm/include/overlay_29_023082A0.inc b/asm/include/overlay_29_023082A0.inc index 5aa614fe..73e08e4f 100644 --- a/asm/include/overlay_29_023082A0.inc +++ b/asm/include/overlay_29_023082A0.inc @@ -1,5 +1,5 @@ #pragma once -.public Abs +.public abs .public AiMovement .public ApplyDamage .public BoostOffensiveStat @@ -21,7 +21,7 @@ .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType -.public ResetDamageDesc +.public ResetDamageData .public SetActionPassTurnOrWalk .public SubstitutePlaceholderStringTags .public UpdateAiTargetPos @@ -30,17 +30,17 @@ .public ov29_022E45D0 .public ov29_022E57D4 .public ov29_022E5E84 -.public ov29_022EF9EC +.public ShouldRunMonsterAi .public ov29_022FB538 .public ov29_02300B40 .public ov29_02300D50 .public ov29_0230175C -.public ov29_02301EAC -.public ov29_0230D11C +.public HasTypeAffectedByGravity +.public ApplyDamageAndEffectsWrapper .public ov29_0230D654 .public ov29_0230E914 .public ov29_0230F728 -.public ov29_0231EA30 +.public CategoryIsNotPhysical .public ov29_0231EDFC .public ov29_023380FC .public sub_02054EC8 diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 63e02d87..2de73ea0 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -1,6 +1,6 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AddExpSpecial .public AddFixedPoint64 .public AdvanceFrame @@ -10,7 +10,7 @@ .public ClampedLn .public DebugPrint0__0200C1FC .public DivideFixedPoint64 -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__02308FBC @@ -46,7 +46,7 @@ .public GetTileAtEntity .public GravityIsActive .public HandleFaint -.public HasConditionalGroundImmunity +.public IsFloating .public HasHeldItem .public HasPlayedOldGame .public InitTeamMember @@ -77,7 +77,7 @@ .public MultiplyByFixedPoint .public MultiplyFixedPoint64 .public PreprocessString -.public ResetDamageDesc +.public ResetDamageData .public RestorePpAllMovesSetFlags .public RoundUpDiv256 .public SetItemAcquired @@ -94,27 +94,27 @@ .public ov10_022BDC68 .public ov10_022BDE50 .public ov10_022BF964 -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022E1B28 .public ov29_022E2470 -.public ov29_022E272C -.public ov29_022E274C -.public ov29_022E2E54 -.public ov29_022E35E4 -.public ov29_022E4018 -.public ov29_022E406C +.public ShouldDisplayEntityWrapper +.public CanSeeTarget +.public PointCameraToMonster +.public PlayEffectAnimationEntity +.public PlayEffectAnimation0x171Full +.public PlayEffectAnimation0x171 .public ov29_022E5478 .public ov29_022E550C .public ov29_022E576C .public ov29_022E57A0 -.public ov29_022E6130 -.public ov29_022E617C -.public ov29_022E61C8 -.public ov29_022E6214 +.public PlayEffectAnimation0x1A9__022E6130 +.public PlayEffectAnimation0x1A9__022E617C +.public PlayEffectAnimation0x1A9__022E61C8 +.public PlayEffectAnimation0x1A9__022E6214 .public ov29_022E62F0 -.public ov29_022E63D8 -.public ov29_022E64C4 -.public ov29_022E6510 +.public PlayEffectAnimation0x18E +.public PlayEffectAnimation0x1A9__022E64C4 +.public PlayEffectAnimation0x1A9__022E6510 .public ov29_022E66D8 .public ov29_022E68BC .public ov29_022E8104 @@ -123,13 +123,13 @@ .public ov29_022EA370 .public ov29_022EA718 .public ov29_022EACAC -.public ov29_022EAD00 -.public ov29_022EAE14 +.public MusicTableIdxToMusicId +.public ChangeDungeonMusic .public ov29_022EAF20 .public ov29_022EAF34 .public ov29_022ECD84 -.public ov29_022EFA6C -.public ov29_022EFB04 +.public DebugRecruitingEnabled +.public IsSecretBazaarNpcBehavior .public ov29_022EFB20 .public ov29_022EFB84 .public ov29_022F0518 @@ -137,7 +137,7 @@ .public ov29_022F05E4 .public ov29_022F0604 .public ov29_022F0780 -.public ov29_022F85F0 +.public MoveMonsterToPos .public ov29_022F9058 .public ov29_022F9AF4 .public ov29_022FB98C @@ -145,44 +145,44 @@ .public ov29_022FBD24 .public ov29_022FBDE0 .public ov29_022FD318 -.public ov29_022FDDC0 +.public SubInitMonster .public ov29_0230040C -.public ov29_02300634 -.public ov29_02301D84 -.public ov29_023023C0 +.public MonsterHasNegativeStatus +.public OtherMonsterAbilityIsActive +.public UpdateStateFlags .public ov29_02303E0C .public ov29_02304830 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02305F60 -.public ov29_02306728 -.public ov29_02306A00 +.public EndCurseClassStatus +.public EndInvisibleClassStatus .public ov29_02307BDC .public ov29_02307C48 -.public ov29_0230863C -.public ov29_0230F9D8 -.public ov29_02313C74 -.public ov29_02314D40 +.public ApplyDamageAndEffects +.public TrySpawnEnemyItemDrop +.public FlashFireShouldActivate +.public ExclusiveItemEffectIsActiveWithLogging .public ov29_023159D4 -.public ov29_02317E88 -.public ov29_0231B060 -.public ov29_02320788 -.public ov29_02321104 -.public ov29_023361D4 -.public ov29_02336F4C +.public RestoreRandomMovePP +.public ActivateMotorDrive +.public TryAftermathExplosion +.public EnsureCanStandCurrentTile +.public IsFullFloorFixedRoom +.public UpdateTrapsVisibility .public ov29_02337EC0 -.public ov29_02338288 +.public NearbyAllyIqSkillIsEnabled .public ov29_0233847C .public ov29_02344B9C -.public ov29_02344BD0 -.public ov29_02345A3C +.public GenerateStandardItem +.public SpawnDroppedItemWrapper .public ov29_0234969C .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B0B4 .public ov29_0234B1A4 -.public ov29_0234B250 +.public LogMessageByIdWithPopupCheckParticipants .public ov29_0234BA54 .public ov29_0234BB50 .public ov29_0234D630 diff --git a/asm/include/overlay_29_0230E914.inc b/asm/include/overlay_29_0230E914.inc index b757ea53..29f0a4cc 100644 --- a/asm/include/overlay_29_0230E914.inc +++ b/asm/include/overlay_29_0230E914.inc @@ -1,5 +1,5 @@ #pragma once -.public Abs +.public abs .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__0230F008 @@ -10,8 +10,8 @@ .public IsTargetInRange .public SetMonsterActionFields .public TestItemAiFlag -.public ov29_022E1610 -.public ov29_022E274C +.public GetItemInfo +.public CanSeeTarget .public ov29_02300B40 .public ov29_0230175C .public ov29_02302368 diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index 6d06a0f3..a6ffbe8d 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -1,6 +1,6 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AddMoneyCarried .public BinToDecFixedPoint .public BoostSpeedOneStage @@ -18,7 +18,7 @@ .public GetTile .public GetTileAtEntity .public GravityIsActive -.public HasConditionalGroundImmunity +.public IsFloating .public HasHeldItem .public InitMove .public IqSkillIsEnabled @@ -38,8 +38,8 @@ .public TryIncreaseHp .public TryWarp .public TryWeatherFormChange -.public ov29_022E1610 -.public ov29_022E274C +.public GetItemInfo +.public CanSeeTarget .public ov29_022E42E8 .public ov29_022E53F0 .public ov29_022E543C @@ -49,33 +49,33 @@ .public ov29_022F2FE4 .public ov29_022F42F8 .public ov29_022F52BC -.public ov29_022F54BC +.public UseThrowableItem .public ov29_022F9EA0 .public ov29_022FB718 -.public ov29_02300634 +.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_02300CB0 .public ov29_02300DCC .public ov29_0230175C -.public ov29_023058C4 -.public ov29_02305C28 -.public ov29_023061A8 -.public ov29_02306CD0 +.public EndNegativeStatusCondition +.public EndNegativeStatusConditionWrapper +.public EndBurnClassStatus +.public EndMagnetRiseStatus .public ov29_02307BDC -.public ov29_0230D11C -.public ov29_02314D40 -.public ov29_0231B1B8 +.public ApplyDamageAndEffectsWrapper +.public ExclusiveItemEffectIsActiveWithLogging +.public TryActivateBadDreams .public ov29_0231E05C -.public ov29_02321104 +.public EnsureCanStandCurrentTile .public ov29_02322374 .public ov29_02337E2C .public ov29_02344B44 .public ov29_02344B9C -.public ov29_02344BD0 +.public GenerateStandardItem .public ov29_02345004 -.public ov29_023456BC -.public ov29_02345A3C -.public ov29_02346060 +.public RemoveGroundItem +.public SpawnDroppedItemWrapper +.public TryGenerateUnownStoneDrop .public ov29_023460DC .public ov29_02347040 .public ov29_02347184 diff --git a/asm/include/overlay_29_02311034.inc b/asm/include/overlay_29_02311034.inc index 67e0f905..492046e2 100644 --- a/asm/include/overlay_29_02311034.inc +++ b/asm/include/overlay_29_02311034.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public CalcSpeedStageWrapper .public DisplayActions .public EndCringeClassStatus @@ -16,16 +16,16 @@ .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter .public UpdateStatusIconFlags -.public ov29_02305FDC -.public ov29_023061A8 -.public ov29_023064F4 -.public ov29_02306728 -.public ov29_023068C4 -.public ov29_02306950 -.public ov29_02306A00 -.public ov29_02306B28 -.public ov29_02306BF8 -.public ov29_02306C64 -.public ov29_02306CD0 -.public ov29_023183E8 +.public EndSleepClassStatus +.public EndBurnClassStatus +.public EndReflectClassStatus +.public EndCurseClassStatus +.public EndLeechSeedClassStatus +.public EndSureShotClassStatus +.public EndInvisibleClassStatus +.public EndBlinkerClassStatus +.public EndMuzzledStatus +.public EndMiracleEyeStatus +.public EndMagnetRiseStatus +.public ApplyAquaRingHealing .public ov29_0234B294 diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index 728ddcab..a4b568cf 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public CalcSpeedStage .public CalcSpeedStageWrapper .public CalcStatusDuration @@ -55,14 +55,14 @@ .public ov29_022E60E4 .public ov29_0230040C .public ov29_023018AC -.public ov29_02301940 -.public ov29_02301B2C -.public ov29_02302430 +.public SafeguardIsActive +.public IsProtectedFromStatDrops +.public IsProtectedFromNegativeStatus .public ov29_02304A48 .public ov29_02304A84 .public ov29_0230F654 -.public ov29_0231B364 -.public ov29_0231B4EC +.public TryActivateSteadfast +.public ChangeShayminForme .public ov29_02344B44 .public ov29_0234B034 .public ov29_0234B084 diff --git a/asm/include/overlay_29_0231513C.inc b/asm/include/overlay_29_0231513C.inc index 1485ee77..d2c26d53 100644 --- a/asm/include/overlay_29_0231513C.inc +++ b/asm/include/overlay_29_0231513C.inc @@ -1,12 +1,12 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public AiMovement .public BoostDefensiveStat .public BoostOffensiveStat .public CalcStatusDuration .public CeilFixedPoint -.public DivideInt +.public __divsi3 .public DungeonRandInt .public EntityIsValid__02315118 .public EntityIsValid__02318D34 @@ -17,7 +17,7 @@ .public GetMonsterIdFromSpawnEntry .public GetNameWithGender .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GravityIsActive .public HasHeldItem .public IqSkillIsEnabled @@ -28,14 +28,14 @@ .public MewSpawnCheck .public MonsterIsType .public MultiplyByFixedPoint -.public Strcpy +.public strcpy .public SubFixedPoint .public SubstitutePlaceholderStringTags .public TryActivateQuickFeet .public UpdateStatusIconFlags -.public ov29_022E272C -.public ov29_022E2EC4 -.public ov29_022E38E0 +.public ShouldDisplayEntityWrapper +.public UpdateCamera +.public AnimationDelayOrSomething .public ov29_022E41B0 .public ov29_022E41DC .public ov29_022E442C @@ -69,32 +69,32 @@ .public ov29_022E486C .public ov29_022E48B8 .public ov29_022E4914 -.public ov29_022E4964 +.public ShowPpRestoreEffect .public ov29_022E49B4 .public ov29_022E4A04 .public ov29_022E4A54 .public ov29_022E4AA4 .public ov29_022E4AF0 .public ov29_022E4B3C -.public ov29_022E7C60 +.public MonsterSpawnListPartialCopy .public ov29_022E81F8 .public ov29_022EA718 .public ov29_022EACCC -.public ov29_022F9408 +.public GetMonsterApparentId .public ov29_022FB984 -.public ov29_02301940 -.public ov29_02301EAC -.public ov29_02302430 +.public SafeguardIsActive +.public HasTypeAffectedByGravity +.public IsProtectedFromNegativeStatus .public ov29_02304830 .public ov29_02304BAC -.public ov29_023066D8 -.public ov29_02306728 -.public ov29_02306A00 -.public ov29_02314D40 -.public ov29_0231B364 -.public ov29_02336F4C -.public ov29_02338794 -.public ov29_02339CE8 +.public TryRemoveSnatchedMonsterFromDungeonStruct +.public EndCurseClassStatus +.public EndInvisibleClassStatus +.public ExclusiveItemEffectIsActiveWithLogging +.public TryActivateSteadfast +.public UpdateTrapsVisibility +.public HiddenStairsTrigger +.public UpdateMinimap .public ov29_0234B09C .public ov29_0234B0B4 .public sub_01FFB62C diff --git a/asm/include/overlay_29_02318E70.inc b/asm/include/overlay_29_02318E70.inc index 1f5e9fe5..d77bb0e2 100644 --- a/asm/include/overlay_29_02318E70.inc +++ b/asm/include/overlay_29_02318E70.inc @@ -1,6 +1,6 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public CalcStatusDuration .public CanAttackInDirection .public DungeonRandInt @@ -23,7 +23,7 @@ .public SubstitutePlaceholderStringTags .public TryAddTargetToAiTargetList .public UpdateStatusIconFlags -.public ov29_022E274C +.public CanSeeTarget .public ov29_022E3F74 .public ov29_022E3F78 .public ov29_022E3F7C diff --git a/asm/include/overlay_29_02319FB0.inc b/asm/include/overlay_29_02319FB0.inc index cc83244a..fc5451bb 100644 --- a/asm/include/overlay_29_02319FB0.inc +++ b/asm/include/overlay_29_02319FB0.inc @@ -1,10 +1,10 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AiConsiderMove .public BoostSpeedOneStage .public CanAttackInDirection -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EnemyEvolution @@ -37,13 +37,13 @@ .public ov29_022E3ED0 .public ov29_022E4110 .public ov29_022EB4E8 -.public ov29_022EB54C -.public ov29_022EB60C +.public GetItemToUse +.public RemoveUsedItem .public ov29_022FA574 .public ov29_022FB9E0 .public ov29_022FBAB4 -.public ov29_02300634 -.public ov29_023007A8 +.public MonsterHasNegativeStatus +.public IsMonsterSleeping .public ov29_023007DC .public ov29_0230175C .public ov29_0230B7D4 @@ -53,7 +53,7 @@ .public ov29_02322374 .public ov29_0232E80C .public ov29_02333FD0 -.public ov29_023440AC -.public ov29_02344160 +.public AreOrbsAllowed +.public AreMovesEnabled .public ov29_02344B44 -.public ov29_0234B250 +.public LogMessageByIdWithPopupCheckParticipants diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index 8384d4ad..8c569f76 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/asm/include/overlay_29_0231B1B8.inc @@ -1,9 +1,9 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public ApplyGummiBoostsDungeonMode .public BoostSpeedOneStage .public CalcDamageFixedNoCategory -.public CalcDamageProjectile +.public DealDamageProjectile .public CalcStatusDuration .public EnemyEvolution .public EntityIsValid__0231B194 @@ -13,14 +13,14 @@ .public GetActiveTeamMember .public GetItemCategoryVeneer .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public InitMove .public IqSkillIsEnabled .public IsBagFull .public IsShaymin .public IsSkyExclusiveDungeon .public LogMessageByIdWithPopupCheckUserTarget -.public RestoreMovePP +.public RestoreAllMovePP .public SubstitutePlaceholderStringTags .public TryIncreaseHp .public TryInflictConfusedStatus @@ -28,10 +28,10 @@ .public TryInflictSleepStatus .public TryInflictSleeplessStatus .public TryWarp -.public ViolentSeedBoost +.public ApplyViolentSeedEffect .public ov29_022E28D4 .public ov29_022E3590 -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022E5A00 .public ov29_022E5AE4 .public ov29_022E60E4 @@ -41,51 +41,51 @@ .public ov29_022EACCC .public ov29_022F04F0 .public ov29_022F0518 -.public ov29_022F75D4 -.public ov29_022F9194 +.public SwapMonsterWanFileIndex +.public SetMonsterTypeAndAbility .public ov29_022F9EA0 -.public ov29_022FA144 +.public BoostIQ .public ov29_022FB9BC -.public ov29_023007A8 +.public IsMonsterSleeping .public ov29_02300B40 -.public ov29_02302A5C -.public ov29_02302F88 +.public LevelUpItemEffect +.public TryDecreaseLevel .public ov29_02304830 .public ov29_02304BAC -.public ov29_02305C28 +.public EndNegativeStatusConditionWrapper .public ov29_02307BDC -.public ov29_0230D11C -.public ov29_0230D440 +.public ApplyDamageAndEffectsWrapper +.public UpdateShopkeeperModeAfterAttack .public ov29_0230F9A4 -.public ov29_0231657C -.public ov29_02316BB0 -.public ov29_023176CC -.public ov29_02317844 -.public ov29_0231795C -.public ov29_02317A0C -.public ov29_02317AF4 -.public ov29_02317F50 -.public ov29_02317FE4 -.public ov29_02318078 -.public ov29_0231810C -.public ov29_0231CBEC -.public ov29_0231CC18 -.public ov29_0231CC4C -.public ov29_0231CC94 -.public ov29_0231CD80 -.public ov29_0231CE68 -.public ov29_0231CF84 -.public ov29_0231D534 -.public ov29_0231D680 -.public ov29_0231D6E0 -.public ov29_0231D74C -.public ov29_0231D7C0 -.public ov29_0231D838 -.public ov29_0231D9C0 -.public ov29_02343CD8 +.public TryInflictInvisibleStatus +.public TryIncreaseBelly +.public TryInflictBlinkerStatus +.public TryInflictCrossEyedStatus +.public TryInflictEyedropStatus +.public TryInflictSlipStatus +.public TryInflictDropeyeStatus +.public ApplyProteinEffect +.public ApplyCalciumEffect +.public ApplyIronEffect +.public ApplyZincEffect +.public ApplyCheriBerryEffect +.public ApplyPechaBerryEffect +.public ApplyRawstBerryEffect +.public ApplyHungerSeedEffect +.public ApplyVileSeedEffect +.public ApplyGinsengEffect +.public ApplyBlastSeedEffect +.public ApplyGrimyFoodEffect +.public ApplyMixElixirEffect +.public ApplyDoughSeedEffect +.public ApplyViaSeedEffect +.public ApplyGravelyrockEffect +.public ApplyGonePebbleEffect +.public ApplyGracideaEffect +.public ApplyKeyEffect .public ov29_02344B44 -.public ov29_02345A3C -.public ov29_02346F14 +.public SpawnDroppedItemWrapper +.public AddHeldItemToBag .public ov29_0234B084 .public ov29_0234BA54 .public sub_020017EC diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 4213107d..94141e19 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AllocAndLoadFileInPack .public BoostOffensiveStat .public CalcDamageFixedNoCategory @@ -38,7 +38,7 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerOffensiveStat -.public RestoreMovePP +.public RestoreAllMovePP .public SetMonsterActionFields .public StairsAlwaysReachable .public SubstitutePlaceholderStringTags @@ -51,20 +51,20 @@ .public ov29_022DD828 .public ov29_022DE47C .public ov29_022DE608 -.public ov29_022DE620 +.public GetWeatherColorTable .public ov29_022E0378 -.public ov29_022E0880 -.public ov29_022E272C +.public IsCurrentFixedRoomBossFight +.public ShouldDisplayEntityWrapper .public ov29_022E5AE4 .public ov29_022E5BD8 .public ov29_022EA370 .public ov29_022EA428 -.public ov29_022EAD00 -.public ov29_022EAE14 +.public MusicTableIdxToMusicId +.public ChangeDungeonMusic .public ov29_022EAF20 .public ov29_022EAF34 .public ov29_022EB398 -.public ov29_022EB60C +.public RemoveUsedItem .public ov29_022EB668 .public ov29_022EFB20 .public ov29_022EFB84 @@ -76,9 +76,9 @@ .public ov29_022F8830 .public ov29_022F9C74 .public ov29_022FA02C -.public ov29_022FA144 +.public BoostIQ .public ov29_022FBA54 -.public ov29_02300634 +.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_023008DC .public ov29_023009A0 @@ -87,27 +87,27 @@ .public ov29_023038D4 .public ov29_02304B64 .public ov29_02305814 -.public ov29_023061A8 -.public ov29_023168D8 -.public ov29_02316BB0 -.public ov29_02319378 -.public ov29_0231B4EC -.public ov29_02321104 -.public ov29_023361D4 +.public EndBurnClassStatus +.public TryDecreaseBelly +.public TryIncreaseBelly +.public TryInflictEndureStatus +.public ChangeShayminForme +.public EnsureCanStandCurrentTile +.public IsFullFloorFixedRoom .public ov29_0233665C -.public ov29_02336A84 -.public ov29_02336F4C +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility .public ov29_0233785C .public ov29_02338530 -.public ov29_02338548 -.public ov29_02339CE8 +.public SetDoughSeedFlag +.public UpdateMinimap .public ov29_02339FF4 .public ov29_0233FB1C .public ov29_02344B44 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234BA54 -.public ov29_0234D518 +.public YesNoMenu .public ov30_023853BC .public ov30_023853E0 .public ov30_02385FE0 diff --git a/asm/include/overlay_29_0231EDFC.inc b/asm/include/overlay_29_0231EDFC.inc index f46c7530..298897be 100644 --- a/asm/include/overlay_29_0231EDFC.inc +++ b/asm/include/overlay_29_0231EDFC.inc @@ -1,8 +1,8 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public CalcDamageFixedNoCategory -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandRange .public EntityIsValid__0231F570 @@ -13,18 +13,18 @@ .public LogMessageByIdWithPopupCheckUserTarget .public SubstitutePlaceholderStringTags .public TryWarp -.public ov29_022E1A40 -.public ov29_022E272C -.public ov29_022E274C +.public UpdateEntityPixelPos +.public ShouldDisplayEntityWrapper +.public CanSeeTarget .public ov29_022E9298 .public ov29_022EA370 .public ov29_022EACCC -.public ov29_022F85F0 -.public ov29_022FF764 +.public MoveMonsterToPos +.public CannotStandOnTile .public ov29_0230175C .public ov29_023049A8 .public ov29_02304A48 .public ov29_0232033C .public ov29_02321238 -.public ov29_02324854 +.public TwoTurnMoveForcedMiss .public sub_020018D0 diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index 97a37a91..100265dd 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/asm/include/overlay_29_0231F594.inc @@ -1,28 +1,28 @@ #pragma once -.public Abs +.public abs .public AdvanceFrame -.public DivideInt +.public __divsi3 .public EntityIsValid__0231FBFC .public GetTile .public GetTileSafe .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree -.public ov29_022E1610 +.public GetItemInfo .public ov29_022E1A84 .public ov29_022E1A90 .public ov29_022E56A0 .public ov29_022F62CC .public ov29_02304B64 .public ov29_02336694 -.public ov29_02336A84 -.public ov29_02336F4C -.public ov29_02337E94 -.public ov29_023391EC -.public ov29_02339CE8 -.public ov29_0234410C -.public ov29_0234413C -.public ov29_02345538 -.public ov29_023456BC +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility +.public IsWaterTileset +.public DrawMinimapTile +.public UpdateMinimap +.public AreTrawlOrbsAllowed +.public AreOrbsAllowedVeneer +.public SpawnItem +.public RemoveGroundItem .public ov29_023457C8 .public sub_020018D0 diff --git a/asm/include/overlay_29_0231FC20.inc b/asm/include/overlay_29_0231FC20.inc index 3faa2614..7c331507 100644 --- a/asm/include/overlay_29_0231FC20.inc +++ b/asm/include/overlay_29_0231FC20.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public CalcDamageFixedNoCategory .public EntityIsValid__0232017C @@ -8,18 +8,18 @@ .public IsFloorOver .public LogMessageByIdWithPopupCheckUserTarget .public SubstitutePlaceholderStringTags -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022E1A90 -.public ov29_022E272C +.public ShouldDisplayEntityWrapper .public ov29_022E56A0 -.public ov29_022F85F0 +.public MoveMonsterToPos .public ov29_022F9C74 .public ov29_022FFB90 .public ov29_023049A8 .public ov29_02307BDC .public ov29_0232033C -.public ov29_02321104 +.public EnsureCanStandCurrentTile .public ov29_02321238 .public ov29_0232124C -.public ov29_02324854 -.public ov29_023440DC +.public TwoTurnMoveForcedMiss +.public AreTileJumpsAllowed diff --git a/asm/include/overlay_29_023201A0.inc b/asm/include/overlay_29_023201A0.inc index ba45ee26..fc17e369 100644 --- a/asm/include/overlay_29_023201A0.inc +++ b/asm/include/overlay_29_023201A0.inc @@ -1,8 +1,8 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AdvanceFrame -.public DivideInt +.public __divsi3 .public EntityIsValid__0232017C .public EntityIsValid__02320764 .public GetApparentWeather @@ -12,21 +12,21 @@ .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public SubstitutePlaceholderStringTags -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022E1A90 -.public ov29_022E272C +.public ShouldDisplayEntityWrapper .public ov29_022E5560 .public ov29_022E55F0 .public ov29_022E56A0 -.public ov29_022F85F0 +.public MoveMonsterToPos .public ov29_022F9C74 .public ov29_022FFB90 .public ov29_02320AA4 -.public ov29_02321104 +.public EnsureCanStandCurrentTile .public ov29_02321238 .public ov29_02336694 -.public ov29_02336A84 -.public ov29_02336F4C -.public ov29_02339CE8 -.public ov29_023456BC +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility +.public UpdateMinimap +.public RemoveGroundItem .public sub_020018D0 diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index 0ba7b8f1..66e42531 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public CalcDamageFixedNoCategory .public CanMonsterUseMove @@ -15,20 +15,20 @@ .public SubstitutePlaceholderStringTags .public TryInflictPetrifiedStatus .public UpdateMovePp -.public ov29_022E1A40 -.public ov29_022E272C -.public ov29_022E2EC4 +.public UpdateEntityPixelPos +.public ShouldDisplayEntityWrapper +.public UpdateCamera .public ov29_022E4C84 .public ov29_022E4CD4 .public ov29_022E5560 .public ov29_022E55F0 .public ov29_022E5650 .public ov29_022E9628 -.public ov29_022E99F0 -.public ov29_022E9A28 +.public FindClosestUnoccupiedTileWithin2 +.public FindUnoccupiedTileWithin3 .public ov29_022F42F8 .public ov29_022F62CC -.public ov29_022F85F0 +.public MoveMonsterToPos .public ov29_022F87C0 .public ov29_022F9C74 .public ov29_022FAA04 @@ -37,15 +37,15 @@ .public ov29_02304A48 .public ov29_02305814 .public ov29_02307BDC -.public ov29_02314D40 +.public ExclusiveItemEffectIsActiveWithLogging .public ov29_02322374 .public ov29_023247B4 -.public ov29_02324854 +.public TwoTurnMoveForcedMiss .public ov29_02336694 -.public ov29_02336A84 -.public ov29_02336F4C -.public ov29_02337A3C -.public ov29_02339CE8 -.public ov29_023440DC -.public ov29_023456BC +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility +.public DiscoverMinimap +.public UpdateMinimap +.public AreTileJumpsAllowed +.public RemoveGroundItem .public sub_01FFB62C diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index da692a16..a2b75cfb 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -1,10 +1,10 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationHasMoreFrames .public BoostSpeedOneStage .public CalcStatusDuration -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandOutcome__022EAB50 .public DungeonRandRange @@ -20,7 +20,7 @@ .public GetBodySize .public GetDamageSource .public GetEntityMoveTargetAndRange -.public GetInfoMoveCheckId +.public InitMoveCheckId .public GetMonsterGenderVeneer .public GetMoveAccuracyOrAiChance .public GetMoveAnimation @@ -80,11 +80,11 @@ .public ov10_022BFDCC .public ov29_022DE5D8 .public ov29_022DE5F0 -.public ov29_022E272C +.public ShouldDisplayEntityWrapper .public ov29_022E28D4 .public ov29_022E2CA0 .public ov29_022E3560 -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022E56A0 .public ov29_022E5864 .public ov29_022E5ED0 @@ -95,36 +95,36 @@ .public ov29_022ED0C4 .public ov29_022ED0D4 .public ov29_022ED868 -.public ov29_022F6F68 +.public SetAndLoadCurrentAttackAnimation .public ov29_022F87C0 .public ov29_022F8830 .public ov29_022F88C0 .public ov29_022F9840 .public ov29_022FAA04 .public ov29_022FAFD4 -.public ov29_022FB678 +.public AreEntitiesAdjacent .public ov29_022FBAB4 .public ov29_0230040C -.public ov29_023007A8 +.public IsMonsterSleeping .public ov29_02300DCC .public ov29_0230175C .public ov29_023024E0 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02304B14 -.public ov29_023068C4 -.public ov29_0231657C -.public ov29_0231662C -.public ov29_023176CC +.public EndLeechSeedClassStatus +.public TryInflictInvisibleStatus +.public TryInflictPerishSongStatus +.public TryInflictBlinkerStatus .public ov29_02318D58 -.public ov29_0231B33C +.public ActivateStench .public ov29_02321288 .public ov29_02325644 -.public ov29_023256B4 +.public PlayMoveAnimation .public ov29_02325D20 .public ov29_02325D7C -.public ov29_023280D4 -.public ov29_02337B68 +.public GetNaturePowerVariant +.public PositionHasMonster .public ov29_023383A8 .public ov29_02344B9C .public ov29_0234B034 @@ -136,4 +136,4 @@ .public sub_0201CF90 .public sub_0201D1B0 .public sub_0201D1D4 -.public sub_0201DA80 +.public WanTableSpriteHasAnimationGroup diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index 273de9ea..a915110a 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationHasMoreFrames .public ApplyDefensiveStatMultiplier @@ -16,7 +16,7 @@ .public DungeonRandOutcomeUserTargetInteraction .public DungeonRandRange .public EntityIsValid__02325620 -.public EntityIsValid__0232800C +.public EntityIsValidMoveEffects__0232800C .public ExclusiveItemEffectFlagTest .public FormatMoveStringMore .public GetApparentWeather @@ -54,32 +54,32 @@ .public ov29_022E5ED0 .public ov29_022E6D68 .public ov29_022EA428 -.public ov29_023007A8 -.public ov29_02305C28 -.public ov29_023061A8 -.public ov29_023064F4 -.public ov29_02307C78 -.public ov29_0230D11C -.public ov29_02313C74 -.public ov29_02314EB8 -.public ov29_02315B70 -.public ov29_02315C00 -.public ov29_02315D84 -.public ov29_02316720 -.public ov29_023174C8 +.public IsMonsterSleeping +.public EndNegativeStatusConditionWrapper +.public EndBurnClassStatus +.public EndReflectClassStatus +.public EndFrozenStatus +.public ApplyDamageAndEffectsWrapper +.public FlashFireShouldActivate +.public TryInflictGrudgeStatus +.public TryInflictSureShotStatus +.public TryInflictWhifferStatus +.public TryInflictFocusEnergyStatus +.public TryInflictEncoreStatus +.public TryInflictExposedStatus .public ov29_02318BBC .public ov29_02318D58 .public ov29_02318D98 -.public ov29_02319378 -.public ov29_02319418 -.public ov29_02319584 -.public ov29_02319624 -.public ov29_02319748 -.public ov29_023245A4 -.public ov29_02324E44 -.public ov29_02332CDC +.public TryInflictEndureStatus +.public TryInflictMirrorMoveStatus +.public TryInflictVitalThrowStatus +.public TryResetStatChanges +.public MirrorMoveIsActive +.public IsChargingTwoTurnMove +.public GetDamageSourceWrapper +.public DealDamageWithType .public ov29_02332F18 -.public ov29_023354C4 +.public TryActivateWeather .public ov29_02337E2C .public ov29_0234B034 .public ov29_0234BA54 diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 93ca442f..f24ed6a5 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat @@ -10,8 +10,8 @@ .public DungeonRandInt .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction -.public EntityIsValid__0232800C -.public EntityIsValid__0232A3D8 +.public EntityIsValidMoveEffects__0232800C +.public EntityIsValidMoveEffects__0232A3D8 .public ExclusiveItemEffectFlagTest .public GetApparentWeather .public GetMoveCategory @@ -45,35 +45,35 @@ .public ov29_022EA370 .public ov29_022ECAFC .public ov29_022F9EA0 -.public ov29_022FA7DC +.public TryEndStatusWithAbility .public ov29_0230040C .public ov29_023049A8 -.public ov29_02307C78 -.public ov29_0230D11C +.public EndFrozenStatus +.public ApplyDamageAndEffectsWrapper .public ov29_0230D4A4 -.public ov29_023163A8 -.public ov29_023164D8 +.public TryInflictTauntStatus +.public TryInflictStockpileStatus .public ov29_02318A90 .public ov29_02318AD4 .public ov29_02318B48 .public ov29_02318BBC .public ov29_02318D58 -.public ov29_02318E70 -.public ov29_02318F10 -.public ov29_02318FAC -.public ov29_023194B8 -.public ov29_0231B060 -.public ov29_02320448 -.public ov29_023245A4 -.public ov29_02324E44 +.public TryInflictSafeguardStatus +.public TryInflictMistStatus +.public TryInflictWishStatus +.public TryInflictConversion2Status +.public ActivateMotorDrive +.public TryExplosion +.public IsChargingTwoTurnMove +.public GetDamageSourceWrapper .public ov29_0232A834 -.public ov29_0232C310 -.public ov29_0233544C -.public ov29_023354C4 +.public DoMoveTakeaway +.public ActivateSportCondition +.public TryActivateWeather .public ov29_02337E2C -.public ov29_02344BD0 -.public ov29_02346F14 -.public ov29_02347030 +.public GenerateStandardItem +.public AddHeldItemToBag +.public RemoveEmptyItemsInBagWrapper .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234C668 diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index c0e2974c..9461c13c 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public AdvanceFrame .public BoostDefensiveStat .public BoostOffensiveStat @@ -8,14 +8,14 @@ .public CalcStatusDuration .public CeilFixedPoint .public DealDamage -.public DefenderAbilityIsActive__02329F14 -.public DivideInt +.public DefenderAbilityIsActiveMoveEffects__02329F14 +.public __divsi3 .public DungeonRandInt .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public DungeonRandOutcome__022EAB20 -.public EntityIsValid__0232A3D8 -.public EntityIsValid__0232C500 +.public EntityIsValidMoveEffects__0232A3D8 +.public EntityIsValidMoveEffects__0232C500 .public GetMoveCategory .public GetMoveType .public GetTileSafe @@ -39,7 +39,7 @@ .public TryInflictConfusedStatus .public TryInflictConstrictionStatus .public TryInflictCringeStatus -.public TryInflictDestinyBond +.public TryInflictDestinyBondStatus .public TryInflictFrozenStatus .public TryInflictInfatuatedStatus .public TryInflictIngrainStatus @@ -51,48 +51,48 @@ .public TryInflictSleepStatus .public TryInflictWrappedStatus .public TryWarp -.public ov29_022E1A40 +.public UpdateEntityPixelPos .public ov29_022E1A84 .public ov29_022E1A90 .public ov29_022E2CA0 -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022ED868 -.public ov29_022EDCBC -.public ov29_022EF5D8 -.public ov29_022F85F0 +.public TrySpawnTrap +.public RevealTrapsNearby +.public MoveMonsterToPos .public ov29_022F8FF8 .public ov29_022F9EA0 .public ov29_022FFB90 -.public ov29_023007A8 +.public IsMonsterSleeping .public ov29_0230175C .public ov29_023049A8 -.public ov29_02307C78 -.public ov29_0230D11C -.public ov29_02315CE8 -.public ov29_02315E24 -.public ov29_023160DC -.public ov29_02316280 -.public ov29_0231662C -.public ov29_0231721C +.public EndFrozenStatus +.public ApplyDamageAndEffectsWrapper +.public TryInflictSetDamageStatus +.public TryInflictDecoyStatus +.public TryInflictCurseStatus +.public TryInflictSnatchStatus +.public TryInflictPerishSongStatus +.public TryTransform .public ov29_02318BBC .public ov29_02318D58 -.public ov29_0231904C -.public ov29_023190EC -.public ov29_0231918C -.public ov29_0231922C -.public ov29_023192DC +.public TryInflictMagicCoatStatus +.public TryInflictLightScreenStatus +.public TryInflictReflectStatus +.public TryInflictProtectStatus +.public TryInflictMirrorCoatStatus .public ov29_02321164 .public ov29_02321260 -.public ov29_023245A4 -.public ov29_02324854 +.public IsChargingTwoTurnMove +.public TwoTurnMoveForcedMiss .public ov29_02324D60 -.public ov29_02324E44 +.public GetDamageSourceWrapper .public ov29_02332F18 -.public ov29_023361D4 -.public ov29_02336F4C -.public ov29_02337B9C -.public ov29_02345AD8 -.public ov29_02346F14 +.public IsFullFloorFixedRoom +.public UpdateTrapsVisibility +.public TrySmashWall +.public SpawnDroppedItem +.public AddHeldItemToBag .public ov29_0234B084 .public sub_02025888 .public sub_02050FF8 diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 2bc874b6..c18d2ef9 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -1,5 +1,5 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public BoostDefensiveStat .public BoostOffensiveStat .public BoostOrLowerSpeed @@ -7,11 +7,11 @@ .public CalcRecoilDamageFixed .public CalcStatusDuration .public DealDamage -.public DivideInt +.public __divsi3 .public DungeonRandInt .public DungeonRandOutcomeUserTargetInteraction -.public EntityIsValid__0232C500 -.public EntityIsValid__0232E250 +.public EntityIsValidMoveEffects__0232C500 +.public EntityIsValidMoveEffects__0232E250 .public FixedRoomIsSubstituteRoom .public GetApparentWeather .public GetBodySize @@ -45,79 +45,79 @@ .public TryPounce .public TrySwitchPlace .public TryWarp -.public ov29_022E0880 +.public IsCurrentFixedRoomBossFight .public ov29_022E09E8 -.public ov29_022E1608 +.public GetTrapInfo .public ov29_022E1AAC .public ov29_022E1AD4 .public ov29_022E1EF8 -.public ov29_022E333C +.public GetVisibilityRange .public ov29_022E3430 .public ov29_022E6770 .public ov29_022E6784 -.public ov29_022E7AC4 +.public GetItemIdToSpawn .public ov29_022E8104 .public ov29_022E81F8 .public ov29_022ED868 -.public ov29_022EDBD4 -.public ov29_022EDCBC +.public PrepareTrapperTrap +.public TrySpawnTrap .public ov29_022EDE7C -.public ov29_022FB0A8 -.public ov29_022FB214 +.public CountMovesOutOfPp +.public TryEatItem .public ov29_022FBDE0 .public ov29_022FBDF0 .public ov29_022FD7A0 .public ov29_0230175C .public ov29_02304B64 -.public ov29_02305C28 -.public ov29_02305C3C -.public ov29_023064F4 -.public ov29_02307C78 -.public ov29_02307D18 +.public EndNegativeStatusConditionWrapper +.public TransferNegativeStatusCondition +.public EndReflectClassStatus +.public EndFrozenStatus +.public EndProtectStatus .public ov29_0230D874 .public ov29_0230D8E8 .public ov29_0230D95C .public ov29_0230D9D0 .public ov29_0230DA44 .public ov29_0230DAB8 -.public ov29_02315610 -.public ov29_023156A0 -.public ov29_0231575C -.public ov29_0231657C -.public ov29_023168D8 -.public ov29_02317124 -.public ov29_0231740C -.public ov29_02317648 -.public ov29_023181A0 -.public ov29_02318210 -.public ov29_0231827C -.public ov29_0231845C -.public ov29_02318508 -.public ov29_023185A8 -.public ov29_0231872C -.public ov29_02318984 +.public RevealItems +.public RevealStairs +.public RevealEnemies +.public TryInflictInvisibleStatus +.public TryDecreaseBelly +.public TryInflictMuzzledStatus +.public TryInflictMobileStatus +.public TryActivateIdentifyCondition +.public TryInflictLongTossStatus +.public TryInflictPierceStatus +.public TryInflictGastroAcidStatus +.public TryInflictAquaRingStatus +.public TryInflictLuckyChantStatus +.public TryInflictHealBlockStatus +.public TryInflictEmbargoStatus +.public TryInflictMagnetRiseStatus .public ov29_02318BBC .public ov29_02318D58 .public ov29_02318D98 -.public ov29_023197CC -.public ov29_0231AE90 +.public MistIsActive +.public GetEntityNaturalGiftInfo .public ov29_0231EA40 .public ov29_0231EDFC -.public ov29_0231F594 +.public TryDrought .public ov29_0231F6E4 -.public ov29_023245A4 -.public ov29_02324E44 -.public ov29_02332BB8 +.public IsChargingTwoTurnMove +.public GetDamageSourceWrapper +.public DealDamageWithTypeAndPowerBoost .public ov29_02332F18 -.public ov29_023354C4 -.public ov29_023361D4 +.public TryActivateWeather +.public IsFullFloorFixedRoom .public ov29_02336694 -.public ov29_02336A84 -.public ov29_02336F4C +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility .public ov29_023383BC -.public ov29_02339CE8 -.public ov29_02344BD0 -.public ov29_02345A3C +.public UpdateMinimap +.public GenerateStandardItem +.public SpawnDroppedItemWrapper .public ov29_0234B084 .public ov29_0234B0B4 .public ov29_0234BA54 diff --git a/asm/include/overlay_29_0232E274.inc b/asm/include/overlay_29_0232E274.inc index 7d580b9f..024dc2cb 100644 --- a/asm/include/overlay_29_0232E274.inc +++ b/asm/include/overlay_29_0232E274.inc @@ -1,30 +1,30 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage .public CalcRecoilDamageFixed .public DealDamage -.public DefenderAbilityIsActive__0232DE20 +.public DefenderAbilityIsActiveMoveEffects__0232DE20 .public DungeonRandOutcomeUserTargetInteraction -.public EntityIsValid__0232E250 +.public EntityIsValidMoveEffects__0232E250 .public EntityIsValid__0232E840 .public LogMessageByIdWithPopupCheckUserTarget .public LowerOffensiveStat .public ResetHitChanceStat -.public RestoreMovePP +.public RestoreAllMovePP .public SubstitutePlaceholderStringTags .public TryIncreaseHp .public TryInflictBurnStatus .public TryInflictCringeStatus -.public ov29_02305C28 -.public ov29_02305FDC -.public ov29_02307C78 -.public ov29_02314E60 -.public ov29_0231526C -.public ov29_02318850 +.public EndNegativeStatusConditionWrapper +.public EndSleepClassStatus +.public EndFrozenStatus +.public TryInflictTerrifiedStatus +.public TryRestoreHp +.public TryInflictMiracleEyeStatus .public ov29_02318D98 -.public ov29_0232C578 -.public ov29_0232CA70 +.public DoMoveCleanse +.public DoMoveEscape .public ov29_0234AFFC .public sub_02054EC8 diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index f528685b..dc1c7eb7 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -1,12 +1,12 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public CalcDamage .public CanAttackInDirection .public CanBeSnatched .public CeilFixedPoint .public Conversion2IsActive -.public DealDamageWithRecoil +.public DoMoveDamageWithRecoil .public DungeonRandInt .public DungeonRandOutcomeUserAction .public DungeonRandOutcome__022EAB20 @@ -38,15 +38,15 @@ .public SubFixedPoint .public SubstitutePlaceholderStringTags .public TryWarp -.public ov01_0232A078 +.public DoMoveNightShade .public ov01_0233103C -.public ov01_023310E4 +.public CreateMainMenus .public ov01_023315F4 .public ov10_022BFD6C -.public ov29_022E0880 -.public ov29_022E272C -.public ov29_022E274C -.public ov29_022E38E0 +.public IsCurrentFixedRoomBossFight +.public ShouldDisplayEntityWrapper +.public CanSeeTarget +.public AnimationDelayOrSomething .public ov29_022E3FCC .public ov29_022E4110 .public ov29_022E56A0 @@ -57,14 +57,14 @@ .public ov29_022EA370 .public ov29_022EA718 .public ov29_022EDC30 -.public ov29_022F94F0 -.public ov29_022F9744 +.public TryActivateTraceAndColorChange +.public TryActivateConversion2 .public ov29_022F9840 -.public ov29_022FB10C +.public HasSuperEffectiveMoveAgainstUser .public ov29_022FB1A8 -.public ov29_022FB678 +.public AreEntitiesAdjacent .public ov29_0230040C -.public ov29_02300634 +.public MonsterHasNegativeStatus .public ov29_023007DC .public ov29_02300D50 .public ov29_02300DC0 @@ -74,346 +74,346 @@ .public ov29_02304A48 .public ov29_02304C3C .public ov29_02307BDC -.public ov29_0230863C +.public ApplyDamageAndEffects .public ov29_0230D088 -.public ov29_0230D11C -.public ov29_0230D440 +.public ApplyDamageAndEffectsWrapper +.public UpdateShopkeeperModeAfterAttack .public ov29_0230F654 .public ov29_02314DC4 -.public ov29_02319748 -.public ov29_023197CC +.public MirrorMoveIsActive +.public MistIsActive .public ov29_0231AD38 -.public ov29_0231B0A4 +.public TryActivateFrisk .public ov29_023201D0 -.public ov29_02321A78 -.public ov29_02321CF0 +.public TryActivateNondamagingDefenderAbility +.public TryActivateNondamagingDefenderExclusiveItem .public ov29_0232393C -.public ov29_02324534 -.public ov29_023245A4 +.public IsHyperBeamVariant +.public IsChargingTwoTurnMove .public ov29_0232461C -.public ov29_02324854 +.public TwoTurnMoveForcedMiss .public ov29_02324D60 -.public ov29_02324E44 -.public ov29_023256B4 +.public GetDamageSourceWrapper +.public PlayMoveAnimation .public ov29_023258EC -.public ov29_02325DC0 -.public ov29_02325DE4 -.public ov29_02325E64 -.public ov29_02325EC4 -.public ov29_02325F00 -.public ov29_02325F3C -.public ov29_02325F74 -.public ov29_02325FB4 -.public ov29_02325FC4 -.public ov29_02326088 -.public ov29_023260A8 -.public ov29_023260D0 -.public ov29_0232612C -.public ov29_02326188 -.public ov29_023261A0 -.public ov29_0232620C -.public ov29_02326220 -.public ov29_02326264 -.public ov29_0232631C -.public ov29_02326408 -.public ov29_02326550 -.public ov29_02326568 -.public ov29_023265A4 -.public ov29_02326648 -.public ov29_02326670 -.public ov29_023266DC -.public ov29_02326750 -.public ov29_023267D8 -.public ov29_0232680C -.public ov29_023268BC -.public ov29_023268CC -.public ov29_02326908 -.public ov29_0232692C -.public ov29_02326990 -.public ov29_02326A0C -.public ov29_02326A74 -.public ov29_02326AE8 -.public ov29_02326B24 -.public ov29_02326BC0 -.public ov29_02326CA4 -.public ov29_02326CB4 -.public ov29_02326CC8 -.public ov29_02326D50 -.public ov29_02326DD8 -.public ov29_02326E04 -.public ov29_02326E20 -.public ov29_02326E60 -.public ov29_02326E80 -.public ov29_02326E98 -.public ov29_02326EB8 -.public ov29_02326F48 -.public ov29_02326F8C -.public ov29_02327034 -.public ov29_023270B4 -.public ov29_02327120 -.public ov29_0232718C -.public ov29_0232724C -.public ov29_0232728C -.public ov29_023272F8 -.public ov29_02327368 -.public ov29_023273CC -.public ov29_02327458 -.public ov29_02327598 -.public ov29_0232764C -.public ov29_023276B4 -.public ov29_023276E8 -.public ov29_02327744 -.public ov29_02327758 -.public ov29_0232776C -.public ov29_023277B8 -.public ov29_02327804 -.public ov29_023278E8 -.public ov29_02327928 -.public ov29_02327940 -.public ov29_023279AC -.public ov29_023279E4 -.public ov29_02327A28 -.public ov29_02327AF4 -.public ov29_02327B5C -.public ov29_02327BE0 -.public ov29_02327BF0 -.public ov29_02327C08 -.public ov29_02327C74 -.public ov29_02327CD8 -.public ov29_02327D60 -.public ov29_02327DD0 -.public ov29_02327DE0 -.public ov29_02327E94 -.public ov29_02328030 -.public ov29_02328074 -.public ov29_02328110 -.public ov29_0232816C -.public ov29_023281D8 -.public ov29_02328230 -.public ov29_02328248 -.public ov29_023282C8 -.public ov29_02328328 -.public ov29_02328394 -.public ov29_023283A4 -.public ov29_023284BC -.public ov29_02328528 -.public ov29_02328538 -.public ov29_02328698 -.public ov29_02328794 -.public ov29_023288C4 -.public ov29_02328930 -.public ov29_023289F8 -.public ov29_02328A54 -.public ov29_02328A74 -.public ov29_02328AE0 -.public ov29_02328B00 -.public ov29_02328B88 -.public ov29_02328C74 -.public ov29_02328D44 -.public ov29_02328DE4 -.public ov29_02328E74 -.public ov29_02328ECC -.public ov29_02328F94 -.public ov29_02329000 -.public ov29_02329074 -.public ov29_023290CC -.public ov29_0232915C -.public ov29_023291F4 -.public ov29_0232923C -.public ov29_02329258 -.public ov29_023293CC -.public ov29_023293E4 -.public ov29_023293F8 -.public ov29_02329438 -.public ov29_02329534 -.public ov29_02329554 -.public ov29_02329664 -.public ov29_02329674 -.public ov29_023296D8 -.public ov29_023296F8 -.public ov29_02329710 -.public ov29_0232977C -.public ov29_023297F0 -.public ov29_02329854 -.public ov29_02329868 -.public ov29_02329880 -.public ov29_02329898 -.public ov29_02329904 -.public ov29_02329970 -.public ov29_02329A9C -.public ov29_02329B68 -.public ov29_02329C94 -.public ov29_02329D50 -.public ov29_02329F78 -.public ov29_02329FB4 -.public ov29_02329FE0 -.public ov29_0232A04C -.public ov29_0232A058 -.public ov29_0232A118 -.public ov29_0232A148 -.public ov29_0232A188 -.public ov29_0232A220 -.public ov29_0232A27C -.public ov29_0232A2AC -.public ov29_0232A2BC -.public ov29_0232A328 -.public ov29_0232A340 -.public ov29_0232A3FC -.public ov29_0232A414 -.public ov29_0232A480 -.public ov29_0232A490 -.public ov29_0232A4E8 -.public ov29_0232A500 -.public ov29_0232A524 -.public ov29_0232A5AC -.public ov29_0232A640 -.public ov29_0232A688 -.public ov29_0232A6EC -.public ov29_0232A8EC -.public ov29_0232AC44 -.public ov29_0232AC54 -.public ov29_0232AD08 -.public ov29_0232AD18 -.public ov29_0232AEF0 -.public ov29_0232AF5C -.public ov29_0232AFA0 -.public ov29_0232AFF0 -.public ov29_0232B024 -.public ov29_0232B118 -.public ov29_0232B164 -.public ov29_0232B1E4 -.public ov29_0232B26C -.public ov29_0232B368 -.public ov29_0232B434 -.public ov29_0232B44C -.public ov29_0232B494 -.public ov29_0232B500 -.public ov29_0232B518 -.public ov29_0232B5C8 -.public ov29_0232B5E8 -.public ov29_0232B6A4 -.public ov29_0232B6B8 -.public ov29_0232B6C8 -.public ov29_0232B738 -.public ov29_0232B7C0 -.public ov29_0232B7D0 -.public ov29_0232B7E0 -.public ov29_0232B800 -.public ov29_0232B820 -.public ov29_0232B8A0 -.public ov29_0232B8B0 -.public ov29_0232B8D4 -.public ov29_0232B8E4 -.public ov29_0232B928 -.public ov29_0232B940 -.public ov29_0232B9D0 -.public ov29_0232BA44 -.public ov29_0232BB4C -.public ov29_0232BC34 -.public ov29_0232BC64 -.public ov29_0232BCC4 -.public ov29_0232BE34 -.public ov29_0232BE44 -.public ov29_0232BF78 -.public ov29_0232BF88 -.public ov29_0232C028 -.public ov29_0232C064 -.public ov29_0232C0F4 -.public ov29_0232C1A4 -.public ov29_0232C27C -.public ov29_0232C300 -.public ov29_0232C310 -.public ov29_0232C524 -.public ov29_0232C538 -.public ov29_0232C560 -.public ov29_0232C578 -.public ov29_0232C6B4 -.public ov29_0232C6F0 -.public ov29_0232C818 -.public ov29_0232C82C -.public ov29_0232C83C -.public ov29_0232C84C -.public ov29_0232CA14 -.public ov29_0232CA2C -.public ov29_0232CA3C -.public ov29_0232CA4C -.public ov29_0232CA60 -.public ov29_0232CA70 -.public ov29_0232CB08 -.public ov29_0232CB18 -.public ov29_0232CCC4 -.public ov29_0232CD90 -.public ov29_0232CDA4 -.public ov29_0232CE40 -.public ov29_0232CE50 -.public ov29_0232CE7C -.public ov29_0232CE94 -.public ov29_0232CEAC -.public ov29_0232CF54 -.public ov29_0232CF74 -.public ov29_0232CF84 -.public ov29_0232D0F0 -.public ov29_0232D148 -.public ov29_0232D1DC -.public ov29_0232D1EC -.public ov29_0232D1FC -.public ov29_0232D20C -.public ov29_0232D21C -.public ov29_0232D22C -.public ov29_0232D270 -.public ov29_0232D280 -.public ov29_0232D298 -.public ov29_0232D2E8 -.public ov29_0232D368 -.public ov29_0232D378 -.public ov29_0232D3D8 -.public ov29_0232D400 -.public ov29_0232D418 -.public ov29_0232D4AC -.public ov29_0232D560 -.public ov29_0232D620 -.public ov29_0232D6B0 -.public ov29_0232D6D0 -.public ov29_0232D6E8 -.public ov29_0232D738 -.public ov29_0232D7F8 -.public ov29_0232D860 -.public ov29_0232D8FC -.public ov29_0232D90C -.public ov29_0232D97C -.public ov29_0232D9E4 -.public ov29_0232DAD0 -.public ov29_0232DC54 -.public ov29_0232DC64 -.public ov29_0232DCD4 -.public ov29_0232DD78 -.public ov29_0232DDAC -.public ov29_0232DE84 -.public ov29_0232DF38 -.public ov29_0232DFC8 -.public ov29_0232E084 -.public ov29_0232E0E4 -.public ov29_0232E0F8 -.public ov29_0232E130 -.public ov29_0232E274 -.public ov29_0232E2B8 -.public ov29_0232E368 -.public ov29_0232E3D0 -.public ov29_0232E400 -.public ov29_0232E48C -.public ov29_0232E4A0 -.public ov29_0232E560 -.public ov29_0232E624 -.public ov29_0232E67C -.public ov29_0232E6E0 -.public ov29_0232E714 -.public ov29_0232E734 +.public DoMoveDamage__02325DC0 +.public DoMoveIronTail +.public DoMoveDamageMultihitUntilMiss +.public DoMoveYawn +.public DoMoveSleep +.public DoMoveNightmare +.public DoMoveMorningSun +.public DoMoveVitalThrow +.public DoMoveDig +.public DoMoveSweetScent +.public DoMoveCharm +.public DoMoveRainDance +.public DoMoveHail +.public DoMoveHealStatus +.public DoMoveBubble +.public DoMoveEncore +.public DoMoveRage +.public DoMoveSuperFang +.public DoMovePainSplit +.public DoMoveTorment +.public DoMoveStringShot +.public DoMoveSwagger +.public DoMoveSnore +.public DoMoveScreech +.public DoMoveDamageCringe30 +.public DoMoveWeatherBall +.public DoMoveWhirlpool +.public DoMoveFakeTears +.public DoMoveSpite +.public DoMoveFocusEnergy +.public DoMoveSmokescreen +.public DoMoveMirrorMove +.public DoMoveOverheat +.public DoMoveAuroraBeam +.public DoMoveMemento +.public DoMoveOctazooka +.public DoMoveFlatter +.public DoMoveWillOWisp +.public DoMoveReturn +.public DoMoveGrudge +.public DoMoveCounter +.public DoMoveDamageBurn10FlameWheel +.public DoMoveDamageBurn10 +.public DoMoveExpose +.public DoMoveDoubleTeam +.public DoMoveGust +.public DoMoveBoostDefense1 +.public DoMoveParalyze__02326E80 +.public DoMoveBoostAttack1 +.public DoMoveRazorWind +.public DoMoveBide +.public DoMoveBideUnleash +.public DoMoveCrunch +.public DoMoveDamageCringe20 +.public DoMoveDamageParalyze20 +.public DoMoveEndeavor +.public DoMoveFacade +.public DoMoveDamageLowerSpeed20 +.public DoMoveBrickBreak +.public DoMoveDamageLowerSpeed100 +.public DoMoveFocusPunch +.public DoMoveDamageDrain +.public DoMoveReversal +.public DoMoveSmellingSalt +.public DoMoveMetalSound +.public DoMoveTickle +.public DoMoveShadowHold +.public DoMoveHaze +.public DoMoveDamageMultihitFatigue +.public DoMoveDamageWeightDependent +.public DoMoveDamageBoostAllStats +.public DoMoveSynthesis +.public DoMoveBoostSpeed1 +.public DoMoveRapidSpin +.public DoMoveSureShot +.public DoMoveCosmicPower +.public DoMoveSkyAttack +.public DoMoveDamageFreeze15 +.public DoMoveMeteorMash +.public DoMoveEndure +.public DoMoveLowerSpeed1 +.public DoMoveDamageConfuse10 +.public DoMovePsywave +.public DoMoveDamageLowerDefensiveStatVariable +.public DoMovePsychoBoost +.public DoMoveUproar +.public DoMoveWaterSpout +.public DoMovePsychUp +.public DoMoveRecoverHp +.public DoMoveEarthquake +.public DoMoveNaturePower +.public DoMoveDamageParalyze10 +.public DoMoveSelfdestruct +.public DoMoveParalyze__02328230 +.public DoMoveShadowBall +.public DoMoveCharge +.public DoMoveThunderbolt +.public DoMoveMist +.public DoMoveFissure +.public DoMoveDamageCringe10 +.public DoMoveSafeguard +.public DoMoveAbsorb +.public DoMoveSkillSwap +.public DoMoveSketch +.public DoMoveHeadbutt +.public DoMoveDoubleEdge +.public DoMoveSandstorm +.public DoMoveLowerAccuracy1 +.public DoMoveDamagePoison40 +.public DoMoveGrowth +.public DoMoveSacredFire +.public DoMoveOhko +.public DoMoveSolarBeam +.public DoMoveSonicBoom +.public DoMoveFly +.public DoMoveExplosion +.public DoMoveDive +.public DoMoveWaterfall +.public DoMoveDamageLowerAccuracy40 +.public DoMoveStockpile +.public DoMoveTwister +.public DoMoveTwineedle +.public DoMoveRecoverHpTeam +.public DoMoveMinimize +.public DoMoveSeismicToss +.public DoMoveConfuse +.public DoMoveTaunt +.public DoMoveMoonlight +.public DoMoveHornDrill +.public DoMoveSwordsDance +.public DoMoveConversion +.public DoMoveConversion2 +.public DoMoveHelpingHand +.public DoMoveBoostDefense2 +.public DoMoveWarp +.public DoMoveThundershock +.public DoMoveThunderWave +.public DoMoveZapCannon +.public DoMoveBlock +.public DoMovePoison +.public DoMoveToxic +.public DoMovePoisonFang +.public DoMoveDamagePoison18 +.public DoMoveJumpKick +.public DoMoveBounce +.public DoMoveHiJumpKick +.public DoMoveTriAttack +.public DoMoveSwapItems +.public DoMoveTripleKick +.public DoMoveSport +.public DoMoveMudSlap +.public DoMoveDamageStealItem +.public DoMoveAmnesia +.public DoMoveGrowl +.public DoMoveSurf +.public DoMoveRolePlay +.public DoMoveSunnyDay +.public DoMoveLowerDefense1 +.public DoMoveWish +.public DoMoveFakeOut +.public DoMoveSleepTalk +.public DoMovePayDay +.public DoMoveAssist +.public DoMoveRest +.public DoMoveIngrain +.public DoMoveSwallow +.public DoMoveCurse +.public DoMoveDamage__0232A500 +.public DoMoveSuperpower +.public DoMoveSteelWing +.public DoMoveSpitUp +.public DoMoveDynamicPunch +.public DoMoveKnockOff +.public DoMoveSplash +.public DoMoveSetDamage +.public DoMoveBellyDrum +.public DoMoveLightScreen +.public DoMoveSecretPower +.public DoMoveDamageConfuse30 +.public DoMoveBulkUp +.public DoMovePause +.public DoMoveFeatherDance +.public DoMoveBeatUp +.public DoMoveBlastBurn +.public DoMoveCrushClaw +.public DoMoveBlazeKick +.public DoMovePresent +.public DoMoveEruption +.public DoMoveParalyze__0232B434 +.public DoMoveTransform +.public DoMovePoisonTail +.public DoMoveBlowback +.public DoMoveCamouflage +.public DoMoveTailGlow +.public DoMoveDamageConstrict10 +.public DoMovePerishSong +.public DoMoveWrap +.public DoMoveSpikes +.public DoMoveMagnitude +.public DoMoveMagicCoat +.public DoMoveProtect +.public DoMoveDefenseCurl +.public DoMoveDecoy +.public DoMoveMistBall +.public DoMoveDestinyBond +.public DoMoveDamage__0232B8B0 +.public DoMoveMirrorCoat +.public DoMoveCalmMind +.public DoMoveHiddenPower +.public DoMoveMetalClaw +.public DoMoveAttract +.public DoMoveCopycat +.public DoMoveFrustration +.public DoMoveLeechSeed +.public DoMoveMetronome +.public DoMoveDreamEater +.public DoMoveSnatch +.public DoMoveRecycle +.public DoMoveReflect +.public DoMoveDragonRage +.public DoMoveDragonDance +.public DoMoveSkullBash +.public DoMoveDamageLowerSpecialDefense50 +.public DoMoveStruggle +.public DoMoveRockSmash +.public DoMoveSeeTrap +.public DoMoveTakeaway +.public DoMoveRebound +.public DoMoveSwitchPositions +.public DoMoveStayAway +.public DoMoveCleanse +.public DoMoveSiesta +.public DoMoveTwoEdge +.public DoMoveNoMove +.public DoMoveScan +.public DoMovePowerEars +.public DoMoveTransfer +.public DoMoveSlowDown +.public DoMoveSearchlight +.public DoMovePetrify +.public DoMovePounce +.public DoMoveTrawl +.public DoMoveEscape +.public DoMoveDrought +.public DoMoveTrapBuster +.public DoMoveWildCall +.public DoMoveInvisify +.public DoMoveOneShot +.public DoMoveHpGauge +.public DoMoveVacuumCut +.public DoMoveReviver +.public DoMoveShocker +.public DoMoveEcho +.public DoMoveFamish +.public DoMoveOneRoom +.public DoMoveFillIn +.public DoMoveTrapper +.public DoMoveItemize +.public DoMoveHurl +.public DoMoveMobile +.public DoMoveSeeStairs +.public DoMoveLongToss +.public DoMovePierce +.public DoMoveHammerArm +.public DoMoveAquaRing +.public DoMoveGastroAcid +.public DoMoveHealingWish +.public DoMoveCloseCombat +.public DoMoveLuckyChant +.public DoMoveGuardSwap +.public DoMoveHealOrder +.public DoMoveHealBlock +.public DoMoveThunderFang +.public DoMoveDefog +.public DoMoveTrumpCard +.public DoMoveIceFang +.public DoMovePsychoShift +.public DoMoveEmbargo +.public DoMoveBrine +.public DoMoveNaturalGift +.public DoMoveGyroBall +.public DoMoveShadowForce +.public DoMoveGravity +.public DoMoveStealthRock +.public DoMoveChargeBeam +.public DoMoveDamageEatItem +.public DoMoveAcupressure +.public DoMoveMagnetRise +.public DoMoveToxicSpikes +.public DoMoveLastResort +.public DoMoveTrickRoom +.public DoMoveWorrySeed +.public DoMoveDamageHpDependent +.public DoMoveHeartSwap +.public DoMoveRoost +.public DoMovePowerSwap +.public DoMovePowerTrick +.public DoMoveFeint +.public DoMoveFlareBlitz +.public DoMoveDefendOrder +.public DoMoveFireFang +.public DoMoveLunarDance +.public DoMoveMiracleEye +.public DoMoveWakeUpSlap +.public DoMoveMetalBurst +.public DoMoveHeadSmash +.public DoMoveCaptivate +.public DoMoveLeafStorm +.public DoMoveDracoMeteor +.public DoMoveRockPolish +.public DoMoveNastyPlot +.public DoMoveTag0x1AB .public ov29_0232E744 -.public ov29_0232E750 -.public ov29_0232E794 +.public DoMoveTag0x1A6 +.public DoMoveTag0x1A7 .public ov29_02337E2C .public ov29_023381C0 .public ov29_02344B44 .public ov29_0234B034 -.public ov29_0234B250 +.public LogMessageByIdWithPopupCheckParticipants .public sub_02050FF8 diff --git a/asm/include/overlay_29_02333FD0.inc b/asm/include/overlay_29_02333FD0.inc index baae1973..c0451fb3 100644 --- a/asm/include/overlay_29_02333FD0.inc +++ b/asm/include/overlay_29_02333FD0.inc @@ -1,6 +1,6 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AdvanceFrame .public DungeonRandInt .public EntityIsValid__023350D8 @@ -15,9 +15,9 @@ .public TryActivateArtificialWeatherAbilities .public TryWeatherFormChange .public ov29_022DE608 -.public ov29_022DE620 -.public ov29_022E38E0 +.public GetWeatherColorTable +.public AnimationDelayOrSomething .public ov29_022E5FE8 -.public ov29_023007A8 -.public ov29_023354C4 +.public IsMonsterSleeping +.public TryActivateWeather .public ov29_02338A4C diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 2b51e611..10d93358 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -1,11 +1,11 @@ #pragma once -.public AbilityIsActive2 +.public AbilityIsActiveVeneer .public CalcSpeedStageWrapper .public CalcStatusDuration .public CeilFixedPoint .public Conversion2IsActive .public DebugPrint0__0200C1FC -.public DivideInt +.public __divsi3 .public DungeonGoesUp .public EntityIsValid__023350D8 .public EntityIsValid__02337CA8 @@ -14,11 +14,11 @@ .public GetLanguage .public GetLeader .public GetSleepAnimationId -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public GetType .public HasLowHealth .public IsGoldenChamber -.public IsSecretBazaar__023385C4 +.public IsSecretBazaar .public LoadWteFromFileDirectory .public LoadWtuFromBin .public LogMessageByIdWithPopupCheckUser @@ -27,7 +27,7 @@ .public SetBothScreensWindowColorToDefault .public SetScreenWindowsColor .public TickStatusTurnCounter -.public ov10_022C2574 +.public IsBackgroundTileset .public ov10_022C2588 .public ov10_022C25EC .public ov10_022C2638 @@ -37,24 +37,24 @@ .public ov10_022C2720 .public ov29_022DE0EC .public ov29_022DE608 -.public ov29_022DE620 +.public GetWeatherColorTable .public ov29_022E0378 -.public ov29_022E0880 +.public IsCurrentFixedRoomBossFight .public ov29_022E2930 -.public ov29_022E333C +.public GetVisibilityRange .public ov29_022E65F4 .public ov29_022E66C4 .public ov29_022E9A6C .public ov29_022E9F80 -.public ov29_022F9408 +.public GetMonsterApparentId .public ov29_022FF958 .public ov29_02304830 .public ov29_02304BAC .public ov29_02334E70 -.public ov29_023391EC +.public DrawMinimapTile .public sub_0201E020 .public sub_0201E080 -.public sub_0201E730 +.public InitRender3dElement .public sub_0201F2A0 .public sub_0204AED0 .public sub_02051D8C diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index 69e1fee0..ce282848 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -1,7 +1,7 @@ #pragma once -.public Abs +.public abs .public AllocAndLoadFileInPack -.public DivideInt +.public __divsi3 .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -42,7 +42,7 @@ .public IsItemInBag .public IsOutlawMonsterHouseFloor .public IsTreasureBox -.public LoadFileFromRom__02008C3C +.public LoadFileFromRom .public LoadScriptVariableValue .public LoadWteFromFileDirectory .public LogMessageByIdWithPopupCheckUser @@ -62,11 +62,11 @@ .public ZInit8 .public ov10_022BFD20 .public ov29_022DE288 -.public ov29_022E1608 +.public GetTrapInfo .public ov29_022E2418 -.public ov29_022E2498 +.public ShouldMinimapDisplayEntity .public ov29_022E3580 -.public ov29_022E37DC +.public PlayEffectAnimationPos .public ov29_022E6694 .public ov29_022E66C4 .public ov29_022E7BB8 @@ -74,7 +74,7 @@ .public ov29_022E7F7C .public ov29_022EA370 .public ov29_022EA408 -.public ov29_022ED970 +.public SpawnEnemyTrapAtPos .public ov29_022EDEDC .public ov29_022EFAE8 .public ov29_022EFB20 @@ -91,26 +91,26 @@ .public ov29_022F07D8 .public ov29_022F0848 .public ov29_022FAFD4 -.public ov29_022FBE58 -.public ov29_022FE198 +.public InitOtherMonsterData +.public MarkShopkeeperSpawn .public ov29_02304BAC .public ov29_02306D54 -.public ov29_0230F840 -.public ov29_023361D4 -.public ov29_02336204 +.public TeamMemberHasExclusiveItemEffectActive +.public IsFullFloorFixedRoom +.public IsCurrentTilesetBackground .public ov29_023365E8 .public ov29_02336694 -.public ov29_02336A4C -.public ov29_02336A84 -.public ov29_02336F4C +.public DetermineAllTilesWalkableNeighbors +.public DetermineTileWalkableNeighbors +.public UpdateTrapsVisibility .public ov29_02344B9C -.public ov29_02344BD0 -.public ov29_02344BE4 +.public GenerateStandardItem +.public GenerateCleanItem .public ov29_02344E88 .public ov29_02345004 -.public ov29_02345538 +.public SpawnItem .public ov29_02348BE8 -.public ov29_02349208 +.public IsDestinationFloor .public ov29_0234B09C .public ov29_0234B1A4 .public ov29_0234C668 @@ -123,7 +123,7 @@ .public sub_0200F940 .public sub_0201B9F8 .public sub_0201E13C -.public sub_0201E730 +.public InitRender3dElement .public sub_0201F2A0 .public sub_0204AEA0 .public sub_0204AEC0 diff --git a/asm/include/overlay_29_02344B1C.inc b/asm/include/overlay_29_02344B1C.inc index 4fc4728a..85a292d4 100644 --- a/asm/include/overlay_29_02344B1C.inc +++ b/asm/include/overlay_29_02344B1C.inc @@ -2,7 +2,7 @@ .public AddItemToBagNoHeld .public AddMoneyCarried .public AdvanceFrame -.public DivideInt +.public __divsi3 .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -27,19 +27,19 @@ .public RemoveEquivItemNoHole .public ShouldMonsterRunAwayVariation .public SubstitutePlaceholderStringTags -.public ov29_022E1610 -.public ov29_022E2314 -.public ov29_022E7AC4 +.public GetItemInfo +.public SpawnItemEntity +.public GetItemIdToSpawn .public ov29_022EACCC .public ov29_022FB920 -.public ov29_023456BC +.public RemoveGroundItem .public ov29_02347040 -.public ov29_023472C4 +.public GenerateItem .public ov29_02348D3C .public ov29_02348DD8 .public ov29_02348ECC .public ov29_0234B084 .public ov29_0234CCB4 -.public sub_0200CCE0 +.public IsShoppableItem .public sub_0200D8AC .public sub_02024FE8 diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 81d18671..c362b86f 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -1,12 +1,12 @@ #pragma once -.public AbilityIsActive2 -.public Abs +.public AbilityIsActiveVeneer +.public abs .public AddMoneyCarried .public AdvanceFrame .public ApplyItemEffect .public ClearItem .public DisplayMessage2 -.public DivideInt +.public __divsi3 .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -31,7 +31,7 @@ .public IqSkillIsEnabled .public IsCurrentMissionType .public IsHM -.public IsMonsterIdInNormalRange__02056294 +.public IsMonsterIdInNormalRange .public IsNotMoney .public IsUnown .public ItemZInit @@ -44,19 +44,19 @@ .public SetItemAcquired .public SubstitutePlaceholderStringTags .public TestItemAiFlag -.public ov29_022E0880 -.public ov29_022E08A0 +.public IsCurrentFixedRoomBossFight +.public IsMarowakTrainingMaze .public ov29_022E09E8 -.public ov29_022E1610 -.public ov29_022E1A40 +.public GetItemInfo +.public UpdateEntityPixelPos .public ov29_022E1A84 .public ov29_022E1A90 -.public ov29_022E272C +.public ShouldDisplayEntityWrapper .public ov29_022E563C .public ov29_022E9488 .public ov29_022EACBC -.public ov29_022EB44C -.public ov29_022EB5D8 +.public GetItemToUseByIndex +.public GetItemAction .public ov29_022EBB8C .public ov29_022EBB98 .public ov29_022FAFD4 @@ -66,22 +66,22 @@ .public ov29_022FBA70 .public ov29_023009A0 .public ov29_02307BDC -.public ov29_023186CC -.public ov29_02324854 -.public ov29_02337E94 +.public MonsterHasEmbargoStatus +.public TwoTurnMoveForcedMiss +.public IsWaterTileset .public ov29_02338430 -.public ov29_023391EC +.public DrawMinimapTile .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344BF8 -.public ov29_02345538 +.public SpawnItem .public ov29_02348020 .public ov29_0234B084 .public ov29_0234B4CC -.public ov29_0234D518 +.public YesNoMenu .public sub_020018D0 -.public sub_0200CC38 -.public sub_0200CCE0 +.public IsLosableItem +.public IsShoppableItem .public sub_0200CF6C .public sub_0200D1FC .public sub_0200D894 diff --git a/asm/include/overlay_29_02347BC8.inc b/asm/include/overlay_29_02347BC8.inc index 04b25bc9..8392f068 100644 --- a/asm/include/overlay_29_02347BC8.inc +++ b/asm/include/overlay_29_02347BC8.inc @@ -1,11 +1,11 @@ #pragma once -.public Abs +.public abs .public AdvanceFrame .public ApplyItemEffect .public CheckAcceptedMissionByTypeAndDungeon .public DisplayMessage .public DisplayMessage2 -.public DivideInt +.public __divsi3 .public DungeonRandInt .public EntityIsValid__0234987C .public ExclusiveItemEffectFlagTest @@ -28,7 +28,7 @@ .public MemAlloc .public MemFree .public MemZero -.public Strcpy +.public strcpy .public SubstitutePlaceholderStringTags .public ov29_022E09E8 .public ov29_022E0DD8 @@ -36,23 +36,23 @@ .public ov29_022E0DFC .public ov29_022E0E44 .public ov29_022E1A84 -.public ov29_022E274C +.public CanSeeTarget .public ov29_022E2CA0 .public ov29_022E9488 .public ov29_022FB9BC .public ov29_023009CC .public ov29_02304A84 .public ov29_02307BDC -.public ov29_02324854 -.public ov29_02336224 -.public ov29_02337E94 +.public TwoTurnMoveForcedMiss +.public TrySpawnGoldenChamber +.public IsWaterTileset .public ov29_023386B0 .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344B9C .public ov29_023457C8 -.public ov29_02345AD8 -.public ov29_023498A0 +.public SpawnDroppedItem +.public GenerateMissionEggMonster .public ov29_02349A70 .public ov29_02349AD4 .public ov29_0234A244 @@ -64,10 +64,10 @@ .public ov29_0234B06C .public ov29_0234B0B4 .public ov29_0234B4CC -.public ov29_0234BAC0 +.public InitPortraitDungeon .public ov29_0234C668 .public ov29_0234C738 -.public ov29_0234D518 +.public YesNoMenu .public sub_020018D0 .public sub_02011220 .public sub_02015328 diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index b1a4c914..60925b31 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -57,13 +57,13 @@ .public SetAdventureLogDungeonFloor .public SetBothScreensWindowsColor .public SetDungeonTipShown -.public SetPortraitUnknownAttr +.public SetPortraitLayout .public ShouldMonsterHeadToStairs .public ShowPortraitBox .public StringFromMessageId -.public Strlen -.public Strncmp -.public Strncpy +.public strlen +.public strncmp +.public strncpy .public SubstitutePlaceholderStringTags .public UnloadOverlay .public ov10_022BF764 @@ -96,10 +96,10 @@ .public ov29_022E0CFC .public ov29_022E0E8C .public ov29_022E0F14 -.public ov29_022E272C -.public ov29_022E274C +.public ShouldDisplayEntityWrapper +.public CanSeeTarget .public ov29_022E2CA0 -.public ov29_022E38E0 +.public AnimationDelayOrSomething .public ov29_022E550C .public ov29_022E68F0 .public ov29_022E6DD0 @@ -112,8 +112,8 @@ .public ov29_022EAC8C .public ov29_022EACBC .public ov29_022EACE4 -.public ov29_022EAD00 -.public ov29_022EAE14 +.public MusicTableIdxToMusicId +.public ChangeDungeonMusic .public ov29_022EAEFC .public ov29_022EAF34 .public ov29_022EAFB0 @@ -125,26 +125,26 @@ .public ov29_022FBBEC .public ov29_023009CC .public ov29_02300B04 -.public ov29_02305C28 +.public EndNegativeStatusConditionWrapper .public ov29_0231ADA8 .public ov29_0231AF24 -.public ov29_023361D4 -.public ov29_023363EC +.public IsFullFloorFixedRoom +.public PositionIsOnStairs .public ov29_02337EE8 -.public ov29_02337F98 +.public GetRandomSpawnMonsterID .public ov29_0233804C .public ov29_02339148 .public ov29_0233992C .public ov29_0233A248 .public ov29_02344B44 .public ov29_02344B9C -.public ov29_023456BC -.public ov29_02347030 +.public RemoveGroundItem +.public RemoveEmptyItemsInBagWrapper .public ov29_02348888 .public ov29_02348A18 -.public ov29_023491A4 +.public GetMissionDestination .public ov29_023491B8 -.public ov29_02349208 +.public IsDestinationFloor .public ov29_023496B0 .public ov30_02382820 .public ov30_02382874 @@ -191,7 +191,7 @@ .public sub_0201D804 .public sub_0201DDFC .public sub_0201DE10 -.public sub_0201E730 +.public InitRender3dElement .public sub_0201F2A0 .public sub_0201F464 .public sub_02024FB8 @@ -229,7 +229,7 @@ .public sub_02048360 .public sub_02048DC4 .public sub_0204AFF8 -.public sub_0204D894 +.public AllowPortraitDefault .public sub_0204F9CC .public sub_02051DD0 .public sub_02051E60 diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc index f8c7f4bc..8214ec04 100644 --- a/asm/include/overlay_29_0234DDF4.inc +++ b/asm/include/overlay_29_0234DDF4.inc @@ -14,12 +14,12 @@ .public UnloadOverlay .public ov29_022E0B44 .public ov29_022E2A78 -.public ov29_022E9618 +.public GetLeaderMonster .public ov29_022EA370 .public ov29_022EA428 .public ov29_022EB398 -.public ov29_022EB54C -.public ov29_022F0B8C +.public GetItemToUse +.public GetLeaderAction .public ov29_022F0B9C .public ov29_022F0C1C .public ov29_022F0C3C @@ -27,19 +27,19 @@ .public ov29_022F44F0 .public ov29_022F5A0C .public ov29_022F5DC0 -.public ov29_022F98B4 +.public TryPointCameraToMonster .public ov29_022FB920 .public ov29_02302388 .public ov29_0231DA80 .public ov29_0231DBF0 .public ov29_0231DD60 -.public ov29_02337428 -.public ov29_0233779C +.public DrawTileGrid +.public HideTileGrid .public ov29_0234B034 .public ov29_0234B1A4 .public ov29_0234EC38 .public ov29_0234ED30 -.public ov29_0234FA24 +.public OthersMenu .public ov30_02382820 .public ov30_02382E08 .public ov30_02382E18 @@ -51,10 +51,10 @@ .public ov31_023860A4 .public ov31_0238619C .public ov31_02386C6C -.public ov31_0238704C +.public TeamMenu .public ov31_02387660 .public ov31_02387688 -.public ov31_0238878C +.public RestMenu .public sub_0200B330 .public sub_0200B3D4 .public sub_02025888 diff --git a/asm/include/overlay_29_0234EC38.inc b/asm/include/overlay_29_0234EC38.inc index 83e8f709..f8a2bd68 100644 --- a/asm/include/overlay_29_0234EC38.inc +++ b/asm/include/overlay_29_0234EC38.inc @@ -37,7 +37,7 @@ .public ov29_022EA428 .public ov29_022F0C98 .public ov29_02300818 -.public ov29_023361D4 +.public IsFullFloorFixedRoom .public ov29_02347100 .public ov29_0234DD90 .public ov29_0234DDA0 diff --git a/asm/include/overlay_30.inc b/asm/include/overlay_30.inc index f5965f5e..44418961 100644 --- a/asm/include/overlay_30.inc +++ b/asm/include/overlay_30.inc @@ -2,19 +2,19 @@ .public ov29_022DEA10 .public sub_02029FBC .public ov29_023021F0 -.public ov29_022ED858 +.public BindTrapToTile .public MemAlloc .public sub_02029F88 .public ov29_02338F24 .public sub_02003BC8 .public ReadQuickSaveInfo -.public ov29_022E2260 +.public SpawnTrap .public MemFree -.public Memset +.public memset .public ov29_02344B30 -.public ov29_022E1608 -.public ov29_02345538 -.public ov29_022E1A40 +.public GetTrapInfo +.public SpawnItem +.public UpdateEntityPixelPos .public sub_02048DC4 .public ov29_022E2018 .public NoteSaveBase @@ -26,11 +26,11 @@ .public ov29_022E2978 .public ov29_02338768 .public ov29_02344B1C -.public GetSpriteIndex__022F7388 +.public DungeonGetSpriteIndex .public ov29_022FB920 .public sub_02034EB4 .public sub_02034D0C -.public ov29_022E1610 +.public GetItemInfo .public sub_02003B94 .public ov29_022E1AF4 .public ov29_022E1EC4 diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 9ef3e8ac..5a701670 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -7,17 +7,17 @@ .public IsBlinded .public sub_020585B4 .public CheckTeamMemberIdx__022F9C34 -.public ov29_022EB8F4 +.public DisableDungeonSubMenuOption .public sub_020348E4 .public sub_0203083C .public ov29_023468FC -.public ov29_022E1610 +.public GetItemInfo .public ov29_0234EBCC .public UpdateMapSurveyorFlag .public ov00_022BCCF4 .public Arm9LoadUnkFieldNa0x2029EC8 .public GetMaxPp -.public ov29_0230DB14 +.public SpecificRecruitCheck .public sub_02041178 .public ov10_022BCE58 .public sub_020265A8 @@ -40,7 +40,7 @@ .public ov29_0234B084 .public GetPressedButtons .public sub_0204F10C -.public ov29_02337B2C +.public PositionHasItem .public GetCurrentBagCapacity .public sub_02041094 .public ov29_022EB398 @@ -78,7 +78,7 @@ .public ItemZInit .public CanAiUseMove .public sub_020282F4 -.public ov29_022E1608 +.public GetTrapInfo .public sub_0202F9B8 .public sub_02017CCC .public ov29_02302388 @@ -97,17 +97,17 @@ .public sub_02030850 .public GetDexNumber .public ov10_022BCE44 -.public ov29_022E2A38 +.public GetTeamMemberIndex .public ov29_0233A0E8 -.public ov29_023186CC -.public ov29_022EB44C +.public MonsterHasEmbargoStatus +.public GetItemToUseByIndex .public sub_0202F474 .public ov29_023021F0 .public ov29_02347100 .public ov29_022EBBE8 .public sub_02041484 .public PrintIqSkillsMenu -.public ov29_022EB5D8 +.public GetItemAction .public StringFromMessageId .public ov29_0234B034 .public sub_02041364 @@ -117,18 +117,18 @@ .public sub_0202A5CC .public GetLeaderChangeFlag .public ov29_022EBA94 -.public Memcpy +.public memcpy .public ov00_023002F0 .public GetFloorType .public sub_02041A18 .public sub_0202A98C .public ov00_022BCA80 -.public ov29_0234D518 +.public YesNoMenu .public sub_02026214 .public sub_0202AB94 -.public ov29_022E9618 +.public GetLeaderMonster .public GetLeader -.public ov29_0233779C +.public HideTileGrid .public sub_0202812C .public ov29_02300818 .public sub_020416BC @@ -141,13 +141,13 @@ .public GetItemCategoryVeneer .public sub_02030A18 .public GetNbItemsInBag -.public Memset +.public memset .public sub_0202AABC .public ov29_0234FB50 .public sub_02054F44 .public LogMessageByIdWithPopupCheckUser .public sub_0202F8FC -.public Strcpy +.public strcpy .public sub_0200D310 .public PreprocessStringFromMessageId .public ov29_022EB8B0 @@ -183,11 +183,11 @@ .public ov10_022BCDA8 .public sub_0200FC24 .public IsBagFull -.public sub_0200CDF8 +.public IsItemUsableNow .public ov29_0234EA18 .public ov29_022EB2C8 .public PreprocessString -.public ov29_022F0B8C +.public GetLeaderAction .public sub_0204AEA0 .public ov00_022F98B4 .public sub_020407C0 @@ -201,10 +201,10 @@ .public sub_0202E3CC .public sub_0202A730 .public sub_0203F990 -.public ov29_02300164 +.public GetMonsterName .public sub_0202A954 .public ov29_022EBB8C -.public ov29_022EB54C +.public GetItemToUse .public ov10_022BD474 .public ov29_022EA370 .public ov29_022ECDE4 @@ -214,7 +214,7 @@ .public FormatMoveString .public JoinedAtRangeCheck2Veneer .public GetMonsterIdFromSpawnEntry -.public ov29_022EB81C +.public AddDungeonSubMenuOption .public sub_02025888 .public CreateDBox .public sub_02053CA0 @@ -231,11 +231,11 @@ .public ov29_022F9C40 .public sub_02017C74 .public sub_0204019C -.public CheckTeamMemberIdx__02056228 +.public CheckTeamMemberIdx .public ShouldMonsterRunAwayVariation .public sub_020307A4 .public IsRecruitingAllowed .public ov29_0234F77C .public GetSpeciesString -.public Vsprintf +.public vsprintf .public sub_02028354 \ No newline at end of file diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 30161016..a8d4a8eb 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -11,7 +11,7 @@ .public sub_0200B8B8 .public sub_0200BD14 .public sub_0201DE10 -.public GetDebugFlag1 +.public GetDebugFlag .public sub_020519D0 .public sub_02028E2C .public sub_0201BE28 diff --git a/asm/itcm.s b/asm/itcm.s index 6a96d038..106734b8 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -124,7 +124,7 @@ sub_01FF8130: ; 0x01FF8130 ldr r0, [r5, r6, lsl #2] ldr r2, [r2, lr, lsl #2] ldr r3, [r3, ip, lsl #2] - bl sub_0201E494 + bl GeomSetTexImageParam ldr r0, _01FF81B8 ; =0x020AFC80 str r4, [r0, #8] _01FF81B0: @@ -216,7 +216,7 @@ sub_01FF8224: ; 0x01FF8224 mov r2, r0 mov r3, r0 str r0, [sp, #0xc] - bl sub_0201E494 + bl GeomSetTexImageParam ldr r0, _01FF846C ; =0x020AFC80 mvn r2, #0 str r2, [r0, #8] @@ -379,7 +379,7 @@ sub_01FF849C: ; 0x01FF849C mov r2, r0 mov r3, r0 str r0, [sp, #0xc] - bl sub_0201E494 + bl GeomSetTexImageParam ldr r1, _01FF8714 ; =0x020AFC80 mvn r3, #0 str r3, [r1, #8] @@ -642,7 +642,7 @@ sub_01FF8728: ; 0x01FF8728 str r3, [r2] mov r0, r0, asr #0x10 mov r2, #0x1000 - bl sub_0201E4D4 + bl GeomSetVertexCoord16 ldrb r0, [sl, #0x32] ldr r2, _01FF8A04 ; =0x04000488 cmp r0, #0 @@ -661,7 +661,7 @@ sub_01FF8728: ; 0x01FF8728 mov r0, r0, asr #0x10 mov r1, r1, asr #0x10 mov r2, #0x1000 - bl sub_0201E4D4 + bl GeomSetVertexCoord16 ldrb r0, [sl, #0x32] ldr r3, _01FF8A04 ; =0x04000488 orr r4, r4, r6, lsl #16 @@ -676,7 +676,7 @@ sub_01FF8728: ; 0x01FF8728 mov r0, r0, asr #0x10 mov r1, r1, asr #0x10 str r4, [r3] - bl sub_0201E4D4 + bl GeomSetVertexCoord16 ldr r1, _01FF8A0C ; =0x04000504 mov r0, #0 str r0, [r1] @@ -862,8 +862,8 @@ sub_01FF8C60: ; 0x01FF8C60 ldmia sp!, {r3, pc} arm_func_end sub_01FF8C60 - arm_func_start sub_01FF8C78 -sub_01FF8C78: ; 0x01FF8C78 + arm_func_start AllocateRender3dElement +AllocateRender3dElement: ; 0x01FF8C78 ldr r0, _01FF8CA8 ; =0x020AFC80 ldrsh r2, [r0] ldrsh r1, [r0, #2] @@ -878,13 +878,13 @@ sub_01FF8C78: ; 0x01FF8C78 bx lr .align 2, 0 _01FF8CA8: .word 0x020AFC80 - arm_func_end sub_01FF8C78 + arm_func_end AllocateRender3dElement arm_func_start sub_01FF8CAC sub_01FF8CAC: ; 0x01FF8CAC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -900,7 +900,7 @@ sub_01FF8CAC: ; 0x01FF8CAC sub_01FF8CDC: ; 0x01FF8CDC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -915,7 +915,7 @@ sub_01FF8CDC: ; 0x01FF8CDC arm_func_start sub_01FF8D0C sub_01FF8D0C: ; 0x01FF8D0C stmdb sp!, {r4, lr} - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -931,7 +931,7 @@ sub_01FF8D0C: ; 0x01FF8D0C arm_func_start sub_01FF8D3C sub_01FF8D3C: ; 0x01FF8D3C stmdb sp!, {r4, lr} - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -947,7 +947,7 @@ sub_01FF8D3C: ; 0x01FF8D3C arm_func_start sub_01FF8D6C sub_01FF8D6C: ; 0x01FF8D6C stmdb sp!, {r4, lr} - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -963,7 +963,7 @@ sub_01FF8D6C: ; 0x01FF8D6C arm_func_start sub_01FF8D9C sub_01FF8D9C: ; 0x01FF8D9C stmdb sp!, {r4, lr} - bl sub_01FF8C78 + bl AllocateRender3dElement movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -976,8 +976,8 @@ sub_01FF8D9C: ; 0x01FF8D9C ldmia sp!, {r4, pc} arm_func_end sub_01FF8D9C - arm_func_start sub_01FF8DCC -sub_01FF8DCC: ; 0x01FF8DCC + arm_func_start Render3dStack +Render3dStack: ; 0x01FF8DCC stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x200 ldr r0, _01FF8EFC ; =0x020AFC80 @@ -1069,7 +1069,7 @@ _01FF8EF4: .align 2, 0 _01FF8EFC: .word 0x020AFC80 _01FF8F00: .word 0x01FF8120 - arm_func_end sub_01FF8DCC + arm_func_end Render3dStack arm_func_start sub_01FF8F04 sub_01FF8F04: ; 0x01FF8F04 @@ -2140,7 +2140,7 @@ _01FF9CD8: mov r0, r3 ldr r1, [r1] add r1, r1, #0x4c - bl sub_02004FCC + bl Rgb8ToBgr5 ldmia sp!, {r3, r4, r5, r6, r7, pc} _01FF9CFC: mov r0, #0 @@ -2215,7 +2215,7 @@ _01FF9DF0: mov r0, r3 ldr r1, [r1] add r1, r1, #0x4c - bl sub_02004FCC + bl Rgb8ToBgr5 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _01FF9E10: .word 0x02353530 @@ -2775,7 +2775,7 @@ _01FFA5E0: beq _01FFA688 mov r0, r4 mov r1, r6 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _01FFA688 ldr r0, _01FFB2B4 ; =0x02353538 @@ -2912,12 +2912,12 @@ _01FFA7C0: str r1, [sp, #0x38] mov r1, #0 str r1, [sp, #0x34] - bl Abs + bl abs ldrsh fp, [r4, #4] ldrsh r1, [r7, #4] mov r5, r0 sub r0, r1, fp - bl Abs + bl abs str r0, [sp, #8] cmp r0, r5 mvn r0, #0 @@ -2932,7 +2932,7 @@ _01FFA834: str r0, [sp, #0x10] sub r0, r1, r0 str r1, [sp, #0xc] - bl Abs + bl abs str r0, [sp, #0x40] mov r0, r5, lsl #2 ldrsh r0, [r6, r0] @@ -2940,7 +2940,7 @@ _01FFA834: str r0, [sp, #0x18] sub r0, r1, r0 str r1, [sp, #0x14] - bl Abs + bl abs ldr r1, [sp, #0x40] str r0, [sp, #4] cmp r0, r1 @@ -2967,13 +2967,13 @@ _01FFA834: add r1, sl, r0 ldr r0, [sp, #0xc] sub r0, r0, r1 - bl Abs + bl abs ldr r1, [sp, #0x3c] str r0, [sp, #0x48] ldr r0, [sp, #0x14] add r1, fp, r1 sub r0, r0, r1 - bl Abs + bl abs ldr r1, [sp, #0x48] cmp r0, r1 movle r0, r1 @@ -3084,13 +3084,13 @@ _01FFAA58: b _01FFAAB8 _01FFAA84: mov r0, r6 - bl ov29_022E1610 + bl GetItemInfo bl ov29_02348D00 cmp r0, #0 movne r0, #0 bne _01FFAAB8 mov r0, r6 - bl ov29_022E1610 + bl GetItemInfo ldrb r0, [r0] tst r0, #2 moveq r0, #1 @@ -3179,13 +3179,13 @@ _01FFABC0: ldrsh r1, [r4, #4] ldrsh r0, [r5, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #5 bgt _01FFAC0C ldrsh r1, [r4, #6] ldrsh r0, [r5, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #5 ble _01FFAC38 _01FFAC0C: @@ -3248,13 +3248,13 @@ _01FFAC6C: ldrsh r1, [r4, #4] ldrsh r0, [r5, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _01FFAD0C ldrsh r1, [r4, #6] ldrsh r0, [r5, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 movle r0, #1 strleb r0, [sl, #0x7f] @@ -3292,7 +3292,7 @@ _01FFAD7C: ldrb r0, [sl, #7] cmp r0, #0 beq _01FFAE68 - bl ov29_022E333C + bl GetVisibilityRange ldrsh r0, [r4, #4] ldrsh r1, [r4, #6] bl GetTile @@ -3540,12 +3540,12 @@ _01FFB0DC: ldrsh r1, [r4, #4] ldrsh r0, [sb, #0x8c] sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [r4, #6] ldrsh r1, [sb, #0x8e] mov r5, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r5, #2 cmple r0, #2 bgt _01FFB16C @@ -3928,7 +3928,7 @@ ChooseAiMove: ; 0x01FFB658 ldr r7, [sl, #0xb4] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344160 + bl AreMovesEnabled cmp r0, #0 beq _01FFBD0C mov r0, sl @@ -3982,7 +3982,7 @@ _01FFB720: beq _01FFB79C mov r0, sl add r1, r6, r1 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _01FFB79C ldrb r0, [r7, #0xd4] @@ -4295,7 +4295,7 @@ _01FFBB80: mov r0, sl mov r1, #0x4e mov r6, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _01FFBBD8 mov r0, sl @@ -4432,7 +4432,7 @@ _01FFBD60: add r2, r2, #0xe4 add r2, r2, #0x19800 add r4, r2, r3, lsl #4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _01FFBDB0 ldr r0, [r4] @@ -4448,7 +4448,7 @@ _01FFBD60: _01FFBDB0: mov r0, r6 mov r1, #0x7a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r4, #8] @@ -4517,7 +4517,7 @@ _01FFBE80: add r1, r1, #0x19800 add r6, r1, r5, lsl #4 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _01FFBF5C mov r0, sl @@ -4591,7 +4591,7 @@ sub_01FFBF78: ; 0x01FFBF78 bl ov29_0231985C mov r0, r6 mov r1, r5 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _01FFBFD8 add r0, sp, #8 diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index 33ffe798..c476e7cb 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -3491,7 +3491,7 @@ _020036E0: bl Rand16Bit b _020036EC _020036E8: - bl KeyWaitInit__02006DA4 + bl KeyWaitInit _020036EC: mov r0, fp bl sub_020029B8 @@ -3551,7 +3551,7 @@ sub_02003780: ; 0x02003780 ldr r0, _020037A0 ; =0x020AEF7C mov r1, #1 strb r1, [r0] - bl sub_02065D1C + bl MainLoop bl WaitForever ldmia sp!, {r3, pc} .align 2, 0 @@ -3584,16 +3584,16 @@ _020037D8: ldrh r5, [r1] bl EnableAllInterrupts mov r0, r4 - bl IntToFloat + bl __floatsisf mov r4, r0 mov r0, r5 - bl IntToFloat + bl __floatsisf mov r1, r0 ldr r0, _02003820 ; =0x3B792FB2 - bl MultiplyFloat + bl __mulsf3 mov r1, r0 mov r0, r4 - bl AddFloat + bl __addsf3 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02003818: .word 0x020AEF7C @@ -5381,8 +5381,8 @@ sub_02004F80: ; 0x02004F80 _02004FC8: .word 0xEDB88320 arm_func_end sub_02004F80 - arm_func_start sub_02004FCC -sub_02004FCC: ; 0x02004FCC + arm_func_start Rgb8ToBgr5 +Rgb8ToBgr5: ; 0x02004FCC ldrb r2, [r1, #1] ldrb r3, [r1, #2] ldrb ip, [r1] @@ -5394,7 +5394,7 @@ sub_02004FCC: ; 0x02004FCC orr r1, r1, r3, asr #3 strh r1, [r0] bx lr - arm_func_end sub_02004FCC + arm_func_end Rgb8ToBgr5 arm_func_start sub_02004FF8 sub_02004FF8: ; 0x02004FF8 @@ -5427,26 +5427,26 @@ EuclideanNorm__02005050: ; 0x02005050 stmdb sp!, {r4, r5, r6, lr} ldmia r0, {r5, r6} mov r0, r5 - bl IntToFloat + bl __floatsisf mov r4, r0 mov r0, r5 - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl MultiplyFloat + bl __mulsf3 mov r5, r0 mov r0, r6 - bl IntToFloat + bl __floatsisf mov r4, r0 mov r0, r6 - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl MultiplyFloat + bl __mulsf3 mov r1, r0 mov r0, r5 - bl AddFloat - bl Sqrtf + bl __addsf3 + bl sqrtf ldmia sp!, {r4, r5, r6, pc} arm_func_end EuclideanNorm__02005050 @@ -5455,26 +5455,26 @@ EuclideanNorm__020050B0: ; 0x020050B0 stmdb sp!, {r4, r5, r6, lr} ldmia r0, {r5, r6} mov r0, r5 - bl IntToFloat + bl __floatsisf mov r4, r0 mov r0, r5 - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl MultiplyFloat + bl __mulsf3 mov r5, r0 mov r0, r6 - bl IntToFloat + bl __floatsisf mov r4, r0 mov r0, r6 - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl MultiplyFloat + bl __mulsf3 mov r1, r0 mov r0, r5 - bl AddFloat - bl Sqrtf + bl __addsf3 + bl sqrtf ldmia sp!, {r4, r5, r6, pc} arm_func_end EuclideanNorm__020050B0 @@ -5511,14 +5511,14 @@ sub_0200514C: ; 0x0200514C mov r8, r0 mla r0, r2, r5, r1 add r1, r5, r4 - bl DivideInt + bl __divsi3 str r0, [r8] ldr r0, [r6, #4] ldr r2, [r7, #4] mul r1, r0, r4 mla r0, r2, r5, r1 add r1, r5, r4 - bl DivideInt + bl __divsi3 str r0, [r8, #4] ldmia sp!, {r4, r5, r6, r7, r8, pc} arm_func_end sub_0200514C @@ -5774,11 +5774,11 @@ sub_020054C0: ; 0x020054C0 mov r0, r4 str r2, [sp] str r1, [sp, #4] - bl Abs + bl abs ldr r5, [r5, #4] str r0, [sp] mov r0, r5 - bl Abs + bl abs str r0, [sp, #4] cmp r4, #0 bge _02005550 @@ -5850,11 +5850,11 @@ sub_020055C8: ; 0x020055C8 mov r0, r4 str r2, [sp] str r1, [sp, #4] - bl Abs + bl abs ldr r5, [r5, #4] str r0, [sp] mov r0, r5 - bl Abs + bl abs str r0, [sp, #4] cmp r4, #0 bge _02005658 @@ -5926,11 +5926,11 @@ sub_020056D0: ; 0x020056D0 mov r0, r4 str r2, [sp] str r1, [sp, #4] - bl Abs + bl abs ldr r5, [r5, #4] str r0, [sp] mov r0, r5 - bl Abs + bl abs str r0, [sp, #4] cmp r4, #0 bge _02005748 @@ -7245,11 +7245,11 @@ _020067FC: sub r1, r2, r1 str r0, [sp] str r1, [sp, #4] - bl Abs + bl abs cmp r0, #8 bge _02006874 ldr r0, [sp, #4] - bl Abs + bl abs cmp r0, #8 ldrlt r0, _02006B44 ; =0x022A35DC ldrlth r1, [r0, #0xe] @@ -7288,11 +7288,11 @@ _020068B0: str r0, [sp, #8] str r3, [sp, #0xc] str r2, [r1, #0x14] - bl Abs + bl abs cmp r0, #8 bge _02006934 ldr r0, [sp, #0xc] - bl Abs + bl abs cmp r0, #8 bge _02006934 ldr r0, _02006B44 ; =0x022A35DC @@ -7350,11 +7350,11 @@ _02006988: sub r1, r2, r1 str r0, [sp, #0x10] str r1, [sp, #0x14] - bl Abs + bl abs cmp r0, #8 bge _02006A00 ldr r0, [sp, #0x14] - bl Abs + bl abs cmp r0, #8 ldrlt r0, _02006B44 ; =0x022A35DC ldrlth r1, [r0, #0xe] @@ -7381,11 +7381,11 @@ _02006A1C: str r0, [sp, #0x18] str r3, [sp, #0x1c] str r2, [r1, #0x14] - bl Abs + bl abs cmp r0, #8 bge _02006A74 ldr r0, [sp, #0x1c] - bl Abs + bl abs cmp r0, #8 ldrlt r0, _02006B44 ; =0x022A35DC ldrlth r1, [r0, #0xe] @@ -7642,8 +7642,8 @@ _02006D9C: .word 0x022A3644 _02006DA0: .word 0x022A3644 arm_func_end sub_02006D4C - arm_func_start KeyWaitInit__02006DA4 -KeyWaitInit__02006DA4: ; 0x02006DA4 + arm_func_start KeyWaitInit +KeyWaitInit: ; 0x02006DA4 stmdb sp!, {r3, lr} mov r0, #0 bl sub_02006220 @@ -7653,7 +7653,7 @@ KeyWaitInit__02006DA4: ; 0x02006DA4 bl sub_020063D4 bl sub_02006B70 ldmia sp!, {r3, pc} - arm_func_end KeyWaitInit__02006DA4 + arm_func_end KeyWaitInit arm_func_start sub_02006DC8 sub_02006DC8: ; 0x02006DC8 @@ -7838,7 +7838,7 @@ sub_02006FB8: ; 0x02006FB8 str r2, [sp, #0xc] ldr r2, [r3, #0x18] ldr r3, [r3, #0x14] - bl Sprintf + bl sprintf add sp, sp, #0x10 ldmia sp!, {r3, pc} .align 2, 0 @@ -7858,7 +7858,7 @@ sub_02007004: ; 0x02007004 ldr r0, _02007074 ; =0x020AF2B8 mov r1, r6 mov r2, r5 - bl Strncpy + bl strncpy ldr r0, _02007074 ; =0x020AF2B8 mov r1, #0 strb r1, [r0, r5] @@ -7870,7 +7870,7 @@ _02007044: ldr r0, _02007078 ; =0x020AF2C4 ldr r1, _0200707C ; =0x020927B8 mov r2, r6 - bl Sprintf + bl sprintf _02007060: ldr r0, _02007080 ; =0x020927BC ldr r1, _02007074 ; =0x020AF2B8 @@ -7914,7 +7914,7 @@ sub_0200709C: ; 0x0200709C subne r5, r0, r6 bne _020070D8 mov r0, r6 - bl Strlen + bl strlen mov r5, r0 add r4, r6, r5 _020070D8: @@ -7934,7 +7934,7 @@ _02007104: mov r0, r8 mov r1, r6 mov r2, r5 - bl Strncpy + bl strncpy mov r1, #0 mov r0, r4 strb r1, [r8, r5] @@ -7956,11 +7956,11 @@ sub_02007124: ; 0x02007124 ldr r1, _0200724C ; =0x020927E4 ldr r2, _02007250 ; =0x020AF2B8 mov r3, r4 - bl Sprintf + bl sprintf b _02007168 _02007160: mov r1, r4 - bl Strcpy + bl strcpy _02007168: add r0, sp, #0x80 mov r1, #0x3a @@ -7978,7 +7978,7 @@ _02007168: mov r1, r8 str r0, [sl] add r0, sl, #0x6c - bl Strcpy + bl strcpy mov sb, #0 strb sb, [sl, #0x5c] add r4, sl, #0x1c @@ -8001,7 +8001,7 @@ _020071C8: bne _02007204 add r1, sp, #0 add r0, sl, #0x5c - bl Strcat + bl strcat b _02007240 _02007204: cmp r0, #0x2e @@ -8017,7 +8017,7 @@ _02007220: add r0, r4, sb, lsl #4 mov r1, r7 add sb, sb, #1 - bl Strcpy + bl strcpy _02007238: add r8, r8, #1 b _020071C4 @@ -8080,7 +8080,7 @@ sub_020072CC: ; 0x020072CC ble _0200732C mov r0, r7 add r1, r8, #0x1c - bl Strcpy + bl strcpy mov r6, #1 add r4, r8, #0x1c ldr r5, _02007338 ; =0x020927EC @@ -8088,10 +8088,10 @@ sub_020072CC: ; 0x020072CC _02007300: mov r0, r7 mov r1, r5 - bl Strcat + bl strcat mov r0, r7 add r1, r4, r6, lsl #4 - bl Strcat + bl strcat add r6, r6, #1 _0200731C: ldr r0, [r8, #8] @@ -8113,7 +8113,7 @@ sub_0200733C: ; 0x0200733C mov r5, r0 bl sub_020072CC mov r0, r4 - bl Strlen + bl strlen mov r1, r0 cmp r0, #0 movgt r1, #0x2f @@ -8217,7 +8217,7 @@ sub_0200746C: ; 0x0200746C _0200747C: ldr r1, [r5, #8] mov r0, r6 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, r5 ldmeqia sp!, {r4, r5, r6, pc} @@ -8263,7 +8263,7 @@ sub_020074DC: ; 0x020074DC _02007504: ldr r1, [r6, #8] mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, r6 beq _02007534 @@ -9067,7 +9067,7 @@ _02007F64: add r1, r4, #0x5c sub r2, r3, r2 str r2, [r5, #0x34] - bl Strcpy + bl strcpy mov r2, #0 str r2, [r5, #0x88] ldr r1, [r5, #0x30] @@ -9122,7 +9122,7 @@ _02008020: add r1, r4, #0x5c sub r2, r3, r2 str r2, [r5, #0x34] - bl Strcpy + bl strcpy mov r2, #0 str r2, [r5, #0x88] ldr r1, [r5, #0x30] @@ -9861,7 +9861,7 @@ sub_02008980: ; 0x02008980 beq _020089AC mov r1, r3 add r0, r4, #0x28 - bl Strcpy + bl strcpy _020089AC: mov r0, #0 strb r0, [r4, #9] @@ -10070,8 +10070,8 @@ sub_02008C18: ; 0x02008C18 ldmia sp!, {r3, pc} arm_func_end sub_02008C18 - arm_func_start LoadFileFromRom__02008C3C -LoadFileFromRom__02008C3C: ; 0x02008C3C + arm_func_start LoadFileFromRom +LoadFileFromRom: ; 0x02008C3C stmdb sp!, {r3, lr} sub sp, sp, #0x28 mov lr, r0 @@ -10083,7 +10083,7 @@ LoadFileFromRom__02008C3C: ; 0x02008C3C bl sub_02008D60 add sp, sp, #0x28 ldmia sp!, {r3, pc} - arm_func_end LoadFileFromRom__02008C3C + arm_func_end LoadFileFromRom arm_func_start sub_02008C68 sub_02008C68: ; 0x02008C68 @@ -11818,12 +11818,12 @@ _0200A28C: arm_func_start sub_0200A29C sub_0200A29C: ; 0x0200A29C ldr r0, [r0, #0x10] - ldr ip, _0200A2B0 ; =sub_02004FCC + ldr ip, _0200A2B0 ; =Rgb8ToBgr5 add r0, r0, r1, lsl #1 mov r1, r2 bx ip .align 2, 0 -_0200A2B0: .word sub_02004FCC +_0200A2B0: .word Rgb8ToBgr5 arm_func_end sub_0200A29C arm_func_start sub_0200A2B4 @@ -12820,17 +12820,17 @@ _0200AF34: mov r1, #0xff mul r0, r2, r8 add r5, r5, #2 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #2] str r0, [sp, #4] mov r1, #0xff mul r0, r2, r7 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #1] str r0, [sp, #8] mov r1, #0xff mul r0, r2, r6 - bl DivideInt + bl __divsi3 ldr r1, [sp, #4] mov r0, r0, lsl #0x10 mov r1, r1, lsl #0x10 @@ -12879,17 +12879,17 @@ _0200B014: mov r1, #0xff mul r0, r2, r8 add r5, r5, #2 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #2] str r0, [sp, #0xc] mov r1, #0xff mul r0, r2, r7 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #1] str r0, [sp, #0x10] mov r1, #0xff mul r0, r2, r6 - bl DivideInt + bl __divsi3 ldr r1, [sp, #0xc] mov r0, r0, lsl #0x10 mov r1, r1, lsl #0x10 @@ -12966,17 +12966,17 @@ _0200B14C: mov r1, #0xff mul r0, r2, sb add r6, r6, #2 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #2] str r0, [sp, #4] mov r1, #0xff mul r0, r2, r8 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #1] str r0, [sp, #8] mov r1, #0xff mul r0, r2, r7 - bl DivideInt + bl __divsi3 ldr r1, [sp, #4] mov r0, r0, lsl #0x10 mov r1, r1, lsl #0x10 @@ -13025,17 +13025,17 @@ _0200B22C: mov r1, #0xff mul r0, r2, sb add r6, r6, #2 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #2] str r0, [sp, #0xc] mov r1, #0xff mul r0, r2, r8 - bl DivideInt + bl __divsi3 ldrb r2, [r4, #1] str r0, [sp, #0x10] mov r1, #0xff mul r0, r2, r7 - bl DivideInt + bl __divsi3 ldr r1, [sp, #0xc] mov r0, r0, lsl #0x10 mov r1, r1, lsl #0x10 @@ -13681,7 +13681,7 @@ _0200BA38: ldrsh r0, [r4, #0x12] ldr r1, [r4, #0xc] mul r0, r2, r0 - bl DivideInt + bl __divsi3 ldrsh r1, [r4, #0x10] sub r0, r1, r0 strh r0, [r4, #0x14] @@ -13701,7 +13701,7 @@ _0200BA80: ldrsh r0, [r4, #0x12] ldr r1, [r4, #0xc] mul r0, r2, r0 - bl DivideInt + bl __divsi3 ldrsh r1, [r4, #0x10] add r0, r1, r0 strh r0, [r4, #0x14] @@ -13718,7 +13718,7 @@ _0200BAC8: ldrsh r0, [r4, #0x12] ldr r1, [r4, #0xc] mul r0, r2, r0 - bl DivideInt + bl __divsi3 ldrsh r1, [r4, #0x10] sub r0, r1, r0 _0200BAF8: @@ -13735,7 +13735,7 @@ _0200BB04: ldrsh r0, [r4, #0x12] ldr r1, [r4, #0xc] mul r0, r2, r0 - bl DivideInt + bl __divsi3 ldrsh r1, [r4, #0x10] add r0, r1, r0 _0200BB34: @@ -14210,16 +14210,16 @@ sub_0200C10C: ; 0x0200C10C bx lr arm_func_end sub_0200C10C - arm_func_start GetDebugFlag1 -GetDebugFlag1: ; 0x0200C110 + arm_func_start GetDebugFlag +GetDebugFlag: ; 0x0200C110 mov r0, #0 bx lr - arm_func_end GetDebugFlag1 + arm_func_end GetDebugFlag - arm_func_start SetDebugFlag1 -SetDebugFlag1: ; 0x0200C118 + arm_func_start SetDebugFlag +SetDebugFlag: ; 0x0200C118 bx lr - arm_func_end SetDebugFlag1 + arm_func_end SetDebugFlag arm_func_start sub_0200C11C sub_0200C11C: ; 0x0200C11C @@ -14238,11 +14238,11 @@ AppendProgPos: ; 0x0200C120 ldr r1, _0200C160 ; =0x02094B00 str r3, [sp] ldr r3, [ip] - bl Sprintf + bl sprintf ldmia sp!, {r3, pc} _0200C150: ldr r1, _0200C164 ; =0x02094B1C - bl Sprintf + bl sprintf ldmia sp!, {r3, pc} .align 2, 0 _0200C15C: .word 0x02094AFC @@ -14275,11 +14275,11 @@ _0200C1A0: cmp r2, #0 beq _0200C1B4 mov r1, r2 - bl Strcpy + bl strcpy b _0200C1BC _0200C1B4: ldr r1, _0200C1C4 ; =0x02094B34 - bl Strcpy + bl strcpy _0200C1BC: add sp, sp, #0x100 ldmia sp!, {r3, pc} @@ -14297,7 +14297,7 @@ DebugPrint0__0200C1C8: ; 0x0200C1C8 ldr r1, [sp, #0x108] add r0, sp, #0 add r2, r2, #4 - bl Vsprintf + bl vsprintf add sp, sp, #0x100 ldmia sp!, {r3, lr} add sp, sp, #0x10 @@ -14314,7 +14314,7 @@ DebugPrint0__0200C1FC: ; 0x0200C1FC ldr r1, [sp, #0x108] add r0, sp, #0 add r2, r2, #4 - bl Vsprintf + bl vsprintf add sp, sp, #0x100 ldmia sp!, {r3, lr} add sp, sp, #0x10 @@ -14326,16 +14326,16 @@ sub_0200C230: ; 0x0200C230 bx lr arm_func_end sub_0200C230 - arm_func_start GetDebugFlag2 -GetDebugFlag2: ; 0x0200C234 + arm_func_start GetDebugLogFlag +GetDebugLogFlag: ; 0x0200C234 mov r0, #0 bx lr - arm_func_end GetDebugFlag2 + arm_func_end GetDebugLogFlag - arm_func_start SetDebugFlag2 -SetDebugFlag2: ; 0x0200C23C + arm_func_start SetDebugLogFlag +SetDebugLogFlag: ; 0x0200C23C bx lr - arm_func_end SetDebugFlag2 + arm_func_end SetDebugLogFlag arm_func_start DebugPrint DebugPrint: ; 0x0200C240 @@ -14379,14 +14379,14 @@ FatalError: ; 0x0200C25C add r2, sp, #0x10c bic r2, r2, #3 add r2, r2, #4 - bl Vsprintf + bl vsprintf ldr r1, _0200C2D0 ; =0x02094B54 add r0, sp, #0 - bl Strcat + bl strcat b _0200C2AC _0200C2A4: ldr r1, _0200C2D4 ; =0x02094B58 - bl Strcpy + bl strcpy _0200C2AC: ldr r0, _0200C2D8 ; =0x02094B60 add r1, sp, #0 diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index bee1d488..deb91d3d 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -34,7 +34,7 @@ GetDungeonResultMsg: ; 0x0200C4FC mov r1, r0, lsl #0x10 add r0, sp, #4 mov r1, r1, lsr #0x10 - bl GetInfoMoveCheckId + bl InitMoveCheckId mov r0, #0 bl GetDungeonResultString add r1, sp, #4 @@ -573,8 +573,8 @@ _0200CC2C: _0200CC34: .word 0x000001BB arm_func_end IsAuraBow - arm_func_start sub_0200CC38 -sub_0200CC38: ; 0x0200CC38 + arm_func_start IsLosableItem +IsLosableItem: ; 0x0200CC38 stmdb sp!, {r4, lr} mov r4, r0 ldrb r0, [r4] @@ -596,7 +596,7 @@ _0200CC74: _0200CC7C: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end sub_0200CC38 + arm_func_end IsLosableItem arm_func_start IsTreasureBox IsTreasureBox: ; 0x0200CC84 @@ -611,8 +611,8 @@ IsTreasureBox: ; 0x0200CC84 ldmia sp!, {r3, pc} arm_func_end IsTreasureBox - arm_func_start sub_0200CCA8 -sub_0200CCA8: ; 0x0200CCA8 + arm_func_start IsStorableItem +IsStorableItem: ; 0x0200CCA8 cmp r0, #0 moveq r0, #0 bxeq lr @@ -627,10 +627,10 @@ sub_0200CCA8: ; 0x0200CCA8 moveq r0, #0 and r0, r0, #0xff bx lr - arm_func_end sub_0200CCA8 + arm_func_end IsStorableItem - arm_func_start sub_0200CCE0 -sub_0200CCE0: ; 0x0200CCE0 + arm_func_start IsShoppableItem +IsShoppableItem: ; 0x0200CCE0 stmdb sp!, {r4, lr} movs r4, r0 moveq r0, #0 @@ -682,10 +682,10 @@ sub_0200CCE0: ; 0x0200CCE0 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r4, pc} - arm_func_end sub_0200CCE0 + arm_func_end IsShoppableItem - arm_func_start sub_0200CDAC -sub_0200CDAC: ; 0x0200CDAC + arm_func_start IsValidTargetItem +IsValidTargetItem: ; 0x0200CDAC cmp r0, #0x16c movge r0, #1 bxge lr @@ -708,10 +708,10 @@ _0200CDD8: .align 2, 0 _0200CDF0: .word 0x020A18BC _0200CDF4: .word 0x00000578 - arm_func_end sub_0200CDAC + arm_func_end IsValidTargetItem - arm_func_start sub_0200CDF8 -sub_0200CDF8: ; 0x0200CDF8 + arm_func_start IsItemUsableNow +IsItemUsableNow: ; 0x0200CDF8 stmdb sp!, {r4, lr} mov r4, r0 ldrb r0, [r4] @@ -745,10 +745,10 @@ _0200CE64: _0200CE6C: mov r0, #1 ldmia sp!, {r4, pc} - arm_func_end sub_0200CDF8 + arm_func_end IsItemUsableNow - arm_func_start sub_0200CE74 -sub_0200CE74: ; 0x0200CE74 + arm_func_start IsTicketItem +IsTicketItem: ; 0x0200CE74 sub r0, r0, #0xa9 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -759,7 +759,7 @@ sub_0200CE74: ; 0x0200CE74 movhi r0, #0 and r0, r0, #0xff bx lr - arm_func_end sub_0200CE74 + arm_func_end IsTicketItem arm_func_start InitItem InitItem: ; 0x0200CE9C @@ -991,7 +991,7 @@ GetActualBuyPrice: ; 0x0200D160 stmdb sp!, {r4, lr} mov r4, r0 ldrsh r0, [r4, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -1014,7 +1014,7 @@ GetActualSellPrice: ; 0x0200D1A8 stmdb sp!, {r4, lr} mov r4, r0 ldrsh r0, [r4, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -1068,7 +1068,7 @@ sub_0200D214: ; 0x0200D214 mov r1, r0 add r0, sp, #6 mov r2, #0x50 - bl Strncpy + bl strncpy mov r2, #0 mov r1, r5 add r0, sp, #0 @@ -1218,7 +1218,7 @@ _0200D40C: b _0200D4F8 _0200D434: mov r1, r2 - bl Strcpy + bl strcpy b _0200D4F8 _0200D440: ldrsh r0, [sb, #4] @@ -1262,7 +1262,7 @@ _0200D4AC: b _0200D4F8 _0200D4CC: mov r1, r2 - bl Strcpy + bl strcpy b _0200D4F8 _0200D4D8: cmp r7, #0 @@ -1273,7 +1273,7 @@ _0200D4D8: _0200D4EC: mov r1, r2 mov r2, #0x50 - bl Strncpy + bl strncpy _0200D4F8: ldrb r0, [sb] tst r0, #8 @@ -1288,7 +1288,7 @@ _0200D4F8: add r0, sp, #0x50 mov r1, sl mov r2, #0x50 - bl Strncpy + bl strncpy mov fp, #1 b _0200D564 _0200D538: @@ -1302,14 +1302,14 @@ _0200D538: add r0, sp, #0x50 mov r1, sl mov r2, #0x50 - bl Strncpy + bl strncpy _0200D564: cmp r8, #0 bne _0200D580 add r1, sp, #0x50 mov r0, sl mov r2, #0x50 - bl Strncpy + bl strncpy b _0200D600 _0200D580: ldrb r0, [r8, #4] @@ -1340,7 +1340,7 @@ _0200D5AC: b _0200D600 _0200D5E4: mov r2, #0x50 - bl Strncpy + bl strncpy b _0200D600 _0200D5F0: mov r0, sl @@ -1372,7 +1372,7 @@ SprintfStatic__0200D634: ; 0x0200D634 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -1406,7 +1406,7 @@ sub_0200D688: ; 0x0200D688 mov r5, r1 bne _0200D6AC mov r2, #0x50 - bl Strncpy + bl strncpy b _0200D75C _0200D6AC: ldr r0, [r4] @@ -1435,7 +1435,7 @@ _0200D6EC: mov r0, r6 mov r1, r5 mov r2, #0x50 - bl Strncpy + bl strncpy b _0200D75C _0200D708: ldrsh r1, [r4, #6] @@ -2600,14 +2600,14 @@ LoadItemPspi2n: ; 0x0200E6D8 ldr r1, _0200E748 ; =0x02098038 add r0, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp] ldr r0, _0200E74C ; =0x020AF6C4 bl HandleSir0Translation ldr r1, _0200E750 ; =0x02098054 add r0, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp] ldr r0, _0200E754 ; =0x020AF6C0 bl HandleSir0Translation @@ -2620,7 +2620,7 @@ LoadItemPspi2n: ; 0x0200E6D8 ldr r0, _0200E758 ; =0x020AF6C8 ldr r1, _0200E75C ; =0x02098070 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom _0200E740: add sp, sp, #8 ldmia sp!, {r3, pc} @@ -2782,7 +2782,7 @@ _0200E8E8: _0200E904: mov r0, r8 mov r1, r4 - bl Strcpy + bl strcpy ldmia sp!, {r4, r5, r6, r7, r8, pc} _0200E914: cmp r1, #0xf @@ -2830,7 +2830,7 @@ SprintfStatic__0200E990: ; 0x0200E990 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -3200,7 +3200,7 @@ GetCurrentBagCapacity: ; 0x0200ED84 cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance bl GetBagCapacity ldmia sp!, {r3, pc} _0200EDB8: @@ -3490,7 +3490,7 @@ _0200F104: tst r0, #0xff beq _0200F130 ldrsh r0, [r6, #4] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -7290,7 +7290,7 @@ sub_02011FA0: ; 0x02011FA0 ldr r1, [r1] add r1, r1, #0x1000 str r0, [r1, #0x3ac] - bl sub_02050C74 + bl GetRank ldr r2, _02012214 ; =0x020AF6B8 ldr r1, [r2] add r1, r1, #0x1000 @@ -7335,7 +7335,7 @@ _0201207C: ldr r0, [r0, #0x3ac] cmp r0, r1 blt _02012104 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, _0201221C ; =0x020988A8 mov r2, r4, lsl #3 ldrsh r1, [r1, r2] @@ -7387,7 +7387,7 @@ _0201213C: _02012184: bl Rand16Bit ldr r1, [r4, #4] - bl DivideInt + bl __divsi3 mov r0, #0x18 mul r0, r1, r0 ldr r1, [r4] @@ -7766,7 +7766,7 @@ sub_02012630: ; 0x02012630 mov r4, r0 cmp r1, #0 beq _02012650 - bl sub_0200CE74 + bl IsTicketItem cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, pc} @@ -7896,7 +7896,7 @@ _020127CC: cmp r0, r1 bne _02012834 ldrsh r0, [r6] - bl sub_0200CE74 + bl IsTicketItem cmp r0, #0 beq _02012810 mov r0, #1 @@ -8069,7 +8069,7 @@ _020129F0: cmp r0, r4 bne _02012A68 ldrsh r0, [r1] - bl sub_0200CE74 + bl IsTicketItem cmp r0, #0 beq _02012A44 mov r0, r6 @@ -8149,7 +8149,7 @@ LoadSynthBin: ; 0x02012AE0 ldr r0, _02012B2C ; =0x020AF6D4 ldr r1, _02012B30 ; =0x02098CB4 mov r2, #0xe - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _02012B28 ; =0x020AF6D0 mov r0, #1 ldr r2, [r1, #4] @@ -8188,7 +8188,7 @@ _02012B78: .word 0x020AF6D4 sub_02012B7C: ; 0x02012B7C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x160 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, _02013098 ; =0x020AF6D0 str r0, [sp, #8] ldr r0, [r1, #4] @@ -8736,7 +8736,7 @@ sub_020132A4: ; 0x020132A4 mov sl, r0 mov sb, r1 mov r8, r2 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance mov r5, #0 str r5, [sb] mov r7, r0 @@ -9084,7 +9084,7 @@ SprintfStatic__02013758: ; 0x02013758 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -9124,8 +9124,8 @@ InitMove: ; 0x020137B8 ldmia sp!, {r4, pc} arm_func_end InitMove - arm_func_start GetInfoMoveCheckId -GetInfoMoveCheckId: ; 0x020137E8 + arm_func_start InitMoveCheckId +InitMoveCheckId: ; 0x020137E8 stmdb sp!, {r4, lr} mov r4, r0 cmp r1, #0 @@ -9142,7 +9142,7 @@ GetInfoMoveCheckId: ; 0x020137E8 mov r0, #0 strb r0, [r4, #7] ldmia sp!, {r4, pc} - arm_func_end GetInfoMoveCheckId + arm_func_end InitMoveCheckId arm_func_start GetInfoMoveGround GetInfoMoveGround: ; 0x02013828 @@ -9482,7 +9482,7 @@ GetMoveActualAccuracy: ; 0x02013B90 ldmeqia sp!, {r3, pc} mul r0, r2, r0 mov r1, #0x64 - bl DivideInt + bl __divsi3 ldmia sp!, {r3, pc} _02013BDC: mov r0, #0 @@ -9560,8 +9560,8 @@ _02013C7C: ldmia sp!, {r4, pc} arm_func_end GetNbMoves - arm_func_start GETMOVESETIDX__02013CAC -GETMOVESETIDX__02013CAC: ; 0x02013CAC + arm_func_start GetMovesetIdx__02013CAC +GetMovesetIdx__02013CAC: ; 0x02013CAC stmdb sp!, {r3, r4, r5, lr} mov r5, #0 mov ip, r5 @@ -9588,7 +9588,7 @@ _02013CF8: blt _02013CC4 mvn r0, #0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end GETMOVESETIDX__02013CAC + arm_func_end GetMovesetIdx__02013CAC arm_func_start IsReflectedByMagicCoat IsReflectedByMagicCoat: ; 0x02013D08 @@ -10451,8 +10451,8 @@ _020147F4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end GetInfoGroundMoveset - arm_func_start GETMOVESETIDX__02014804 -GETMOVESETIDX__02014804: ; 0x02014804 + arm_func_start GetMovesetIdx__02014804 +GetMovesetIdx__02014804: ; 0x02014804 stmdb sp!, {r3, r4, r5, lr} mov r5, #0 mov ip, r5 @@ -10479,7 +10479,7 @@ _02014850: blt _0201481C mvn r0, #0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end GETMOVESETIDX__02014804 + arm_func_end GetMovesetIdx__02014804 arm_func_start FindFirstFreeMovesetIdx FindFirstFreeMovesetIdx: ; 0x02014860 @@ -10528,7 +10528,7 @@ _020148DC: beq _020149B8 mov r0, r8 mov r1, r4 - bl GETMOVESETIDX__02014804 + bl GetMovesetIdx__02014804 mvn r1, #0 cmp r0, r1 addne r1, sp, #0 @@ -10554,7 +10554,7 @@ _02014934: blt _02014934 bl Rand16Bit mov r1, r5 - bl DivideInt + bl __divsi3 add r2, sp, #4 ldr r5, [r2, r1, lsl #2] mov r0, #6 @@ -10755,7 +10755,7 @@ sub_02014BB0: ; 0x02014BB0 mov r0, r4 mov r1, #0 mov r2, #8 - bl Memset + bl memset mov r0, r5 mov r1, r4 mov r2, #4 @@ -11170,7 +11170,7 @@ _020150E0: blt _020150B4 bl Rand16Bit mov r1, r4 - bl DivideInt + bl __divsi3 mov r0, #6 mla r0, r1, r0, r6 ldrh r0, [r0, #2] @@ -11305,7 +11305,7 @@ OpenWaza: ; 0x02015294 ldr r1, [r1, r4, lsl #2] add r0, r0, r4, lsl #3 mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _020152F0 ; =0x020AF700 add r0, sp, #0 ldr r1, [r1, r4, lsl #3] @@ -11364,7 +11364,7 @@ sub_02015328: ; 0x02015328 ldr r1, [r1, r2, lsl #2] add r0, r0, #0x1c mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02015500 ; =0x020AF710 ldr r1, [r0] add r0, r1, #0x10 @@ -11388,7 +11388,7 @@ sub_02015328: ; 0x02015328 bne _02015454 ldr r1, _02015508 ; =0x02098F60 add r0, sp, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02015500 ; =0x020AF710 ldr r1, [sp] ldr r0, [r0] @@ -11405,7 +11405,7 @@ sub_02015328: ; 0x02015328 ldr r1, _0201550C ; =0x02098F78 add r0, sp, #0 mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02015500 ; =0x020AF710 ldr r1, [sp] ldr r0, [r0] @@ -11425,12 +11425,12 @@ _02015454: bne _02015470 ldr r1, _02015510 ; =0x02098F90 add r0, r0, #0x24 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom b _0201547C _02015470: ldr r1, _02015514 ; =0x02098FA8 add r0, r0, #0x24 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom _0201547C: ldr r0, _02015500 ; =0x020AF710 ldr r0, [r0] @@ -11579,11 +11579,11 @@ _02015624: ldr r1, _020156A8 ; =0x02098FBC mov r2, #3 add r0, r7, r8 - bl Strncmp + bl strncmp cmp r0, #0 bne _02015684 ldr r0, _020156A8 ; =0x02098FBC - bl Strlen + bl strlen add r8, r8, r0 b _02015690 _02015684: @@ -11706,11 +11706,11 @@ _020157B8: ldr r1, _02015D08 ; =0x02098FBC add r0, r0, r4 mov r2, #3 - bl Strncmp + bl strncmp cmp r0, #0 bne _02015838 ldr r0, _02015D08 ; =0x02098FBC - bl Strlen + bl strlen add r4, r4, r0 b _02015844 _02015838: @@ -12098,7 +12098,7 @@ _02015D60: add r0, r3, r0, lsr #29 mov r0, r0, asr #3 mov sb, r2, asr #3 - bl DivideInt + bl __divsi3 ldr fp, _02015E40 ; =0x020AF710 mov sl, r1 ldr r0, [fp] @@ -12643,7 +12643,7 @@ sub_02016468: ; 0x02016468 bl sub_02015570 add r0, sp, #0 mov r1, r4 - bl Strcpy + bl strcpy mov r1, r5 mov r0, #0 add r2, sp, #0 @@ -12724,7 +12724,7 @@ sub_02016548: ; 0x02016548 bl sub_020156AC mov r1, r7 add r0, sp, #4 - bl Strcpy + bl strcpy mov r0, #0 mov r1, #0x52 add r2, sp, #4 @@ -12876,7 +12876,7 @@ sub_02016788: ; 0x02016788 bl sub_020156AC mov r1, r5 add r0, sp, #0 - bl Strcpy + bl strcpy mov r0, #0 mov r1, #0x52 add r2, sp, #0 @@ -13402,7 +13402,7 @@ sub_02016EAC: ; 0x02016EAC ldr r1, [r0, #8] add r0, r1, #0x98 ldrsh r1, [r1, #0x94] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #1 str r0, [sp] mov r2, #0 @@ -13414,7 +13414,7 @@ sub_02016EAC: ; 0x02016EAC mov r1, #0xc mov r3, #0x100 add r0, r0, #0x98 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _0201712C ; =0x020AF760 mov r4, #0xd0 ldr r2, [r0, #8] @@ -13439,7 +13439,7 @@ _02016FB0: bl sub_0201C0B0 ldrsh r1, [r7, #0x94] mov r0, r8 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #0xc mul r4, sb, r0 add sl, r5, r4 @@ -13455,7 +13455,7 @@ _02016FB0: mov r0, r8 mov r2, #0 mov r3, #0x100 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, [sl, #4] mov r0, r8 strh r1, [r8, #0x1c] @@ -13481,7 +13481,7 @@ _02017054: bl sub_0201C0B0 ldrsh r1, [r7, #0x96] mov r0, r8 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl strh r5, [r8, #0x38] mov r0, #0 str r0, [sp] @@ -13494,7 +13494,7 @@ _02017054: add sl, r4, r0 mov r0, r8 mov r3, r2 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, [sl, #4] cmp sb, #6 strh r0, [r8, #0x1c] @@ -13819,7 +13819,7 @@ _020174EC: mov r2, fp mov r3, fp str fp, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl _02017554: mov r0, sb bl sub_0201CF5C @@ -13890,15 +13890,15 @@ sub_020175F8: ; 0x020175F8 mov r0, sb mov r1, #0x64 add r4, sp, #0 - bl DivideUInt + bl __udivsi3 and r8, r0, #0xff mov r0, sb mov r1, #0xa - bl DivideUInt + bl __udivsi3 and r7, r0, #0xff mov r0, sb mov r1, #0xa - bl DivideUInt + bl __udivsi3 cmp r8, #0 addne r0, r8, #0x30 strneb r0, [r4], #1 @@ -13950,7 +13950,7 @@ SprintfStatic__020176E4: ; 0x020176E4 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -14104,11 +14104,11 @@ _020178DC: blo _02017954 mov r0, r4 mov r1, #0xa - bl DivideInt + bl __divsi3 mov r6, r0 mov r0, r4 mov r1, #0xa - bl DivideInt + bl __divsi3 add r1, r1, #0x30 ldr r0, _020179FC ; =0x020AF76C str r1, [sp] @@ -14202,7 +14202,7 @@ SprintfStatic__02017A40: ; 0x02017A40 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -14314,10 +14314,10 @@ _02017B60: .word sub_02017DF4 arm_func_start sub_02017B64 sub_02017B64: ; 0x02017B64 - ldr ip, _02017B6C ; =sub_02017E70 + ldr ip, _02017B6C ; =SendAudioCommandWrapper bx ip .align 2, 0 -_02017B6C: .word sub_02017E70 +_02017B6C: .word SendAudioCommandWrapper arm_func_end sub_02017B64 arm_func_start sub_02017B70 @@ -14375,13 +14375,13 @@ sub_02017BD4: ; 0x02017BD4 _02017BDC: .word sub_02018024 arm_func_end sub_02017BD4 - arm_func_start sub_02017BE0 -sub_02017BE0: ; 0x02017BE0 + arm_func_start SendAudioCommandWrapperVeneer +SendAudioCommandWrapperVeneer: ; 0x02017BE0 ldr ip, _02017BE8 ; =sub_020180A0 bx ip .align 2, 0 _02017BE8: .word sub_020180A0 - arm_func_end sub_02017BE0 + arm_func_end SendAudioCommandWrapperVeneer arm_func_start sub_02017BEC sub_02017BEC: ; 0x02017BEC @@ -14632,11 +14632,11 @@ sub_02017DF4: ; 0x02017DF4 strh r5, [r1, #2] mov r0, #3 strh r2, [r1, #4] - bl sub_02018B6C + bl AllocAudioCommand mov r4, r0 mov r0, #3 strh r5, [r4, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r1, #0 moveq r1, #0x100 @@ -14644,15 +14644,15 @@ sub_02017DF4: ; 0x02017DF4 mov r1, #0 mov r0, r4 strh r1, [r4, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02017E68: .word 0x000003E7 _02017E6C: .word 0x022A4BEC arm_func_end sub_02017DF4 - arm_func_start sub_02017E70 -sub_02017E70: ; 0x02017E70 + arm_func_start SendAudioCommandWrapper +SendAudioCommandWrapper: ; 0x02017E70 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r3, _02017EE0 ; =0x000003E7 mov r6, r0 @@ -14669,22 +14669,22 @@ sub_02017E70: ; 0x02017E70 strh r6, [r1] strh r6, [r1, #2] strh r4, [r1, #4] - bl sub_02018B6C + bl AllocAudioCommand mov r7, r0 mov r0, #3 strh r6, [r7, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r4, #0 strh r4, [r7, #6] mov r0, r7 strh r5, [r7, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02017EE0: .word 0x000003E7 _02017EE4: .word 0x022A4BEC - arm_func_end sub_02017E70 + arm_func_end SendAudioCommandWrapper arm_func_start sub_02017EE8 sub_02017EE8: ; 0x02017EE8 @@ -14697,10 +14697,10 @@ sub_02017EE8: ; 0x02017EE8 strh r0, [r1, #2] mov r0, #5 strh r2, [r1, #4] - bl sub_02018B6C + bl AllocAudioCommand mov r1, #0 strh r1, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, pc} .align 2, 0 _02017F20: .word 0x000003E7 @@ -14718,9 +14718,9 @@ sub_02017F28: ; 0x02017F28 strh r2, [r0, #2] strh r1, [r0, #4] mov r0, #5 - bl sub_02018B6C + bl AllocAudioCommand strh r4, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r4, pc} .align 2, 0 _02017F5C: .word 0x000003E7 @@ -14741,10 +14741,10 @@ sub_02017F64: ; 0x02017F64 ldr r1, _02017FA8 ; =0x022A4BEC mov r0, #6 strh r4, [r1, #4] - bl sub_02018B6C + bl AllocAudioCommand strh r4, [r0, #6] strh r5, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02017FA8: .word 0x022A4BEC @@ -14812,11 +14812,11 @@ sub_02018024: ; 0x02018024 strh r5, [r1, #8] mov r0, #7 strh r2, [r1, #0xa] - bl sub_02018B6C + bl AllocAudioCommand mov r4, r0 mov r0, #3 strh r5, [r4, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r1, #0 moveq r1, #0x100 @@ -14824,7 +14824,7 @@ sub_02018024: ; 0x02018024 mov r1, #0 mov r0, r4 strh r1, [r4, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02018098: .word 0x000003E7 @@ -14849,17 +14849,17 @@ sub_020180A0: ; 0x020180A0 strh r6, [r1, #6] strh r6, [r1, #8] strh r4, [r1, #0xa] - bl sub_02018B6C + bl AllocAudioCommand mov r7, r0 mov r0, #3 strh r6, [r7, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r4, #0 strh r4, [r7, #6] mov r0, r7 strh r5, [r7, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02018110: .word 0x000003E7 @@ -14877,10 +14877,10 @@ sub_02018118: ; 0x02018118 strh r0, [r1, #8] mov r0, #9 strh r2, [r1, #0xa] - bl sub_02018B6C + bl AllocAudioCommand mov r1, #0 strh r1, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, pc} .align 2, 0 _02018150: .word 0x000003E7 @@ -14898,9 +14898,9 @@ sub_02018158: ; 0x02018158 strh r2, [r0, #8] strh r1, [r0, #0xa] mov r0, #9 - bl sub_02018B6C + bl AllocAudioCommand strh r4, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r4, pc} .align 2, 0 _0201818C: .word 0x000003E7 @@ -14921,10 +14921,10 @@ sub_02018194: ; 0x02018194 ldr r1, _020181D8 ; =0x022A4BEC mov r0, #0xa strh r4, [r1, #0xa] - bl sub_02018B6C + bl AllocAudioCommand strh r4, [r0, #6] strh r5, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _020181D8: .word 0x022A4BEC @@ -14960,11 +14960,11 @@ sub_0201820C: ; 0x0201820C ldr r1, _02018274 ; =0x022A4BEC mov r0, #0xb strh r5, [r1, #0xc] - bl sub_02018B6C + bl AllocAudioCommand mov r4, r0 mov r0, #3 strh r5, [r4, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r1, #0 moveq r1, #0x100 @@ -14972,7 +14972,7 @@ sub_0201820C: ; 0x0201820C mov r1, #0 mov r0, r4 strh r1, [r4, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02018270: .word 0x000003E6 @@ -14987,10 +14987,10 @@ sub_02018278: ; 0x02018278 ldr r1, _020182A8 ; =0x022A4BEC mov r0, #0xc strh r2, [r1, #0xc] - bl sub_02018B6C + bl AllocAudioCommand mov r1, #0 strh r1, [r0, #8] - bl sub_02018BA8 + bl SendAudioCommand ldmia sp!, {r3, pc} .align 2, 0 _020182A4: .word 0x000003E6 @@ -15024,7 +15024,7 @@ sub_020182B8: ; 0x020182B8 mov r4, r0 mov r0, #4 strh r6, [r4, #4] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r5, #0 mov r0, r4 @@ -15060,7 +15060,7 @@ sub_0201831C: ; 0x0201831C strh r8, [r4, #4] mov r0, #4 strh r7, [r4, #6] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r6, #0 strh r6, [r4, #8] @@ -15192,7 +15192,7 @@ _020184C8: .word sub_020192D0 arm_func_start sub_020184CC sub_020184CC: ; 0x020184CC stmdb sp!, {r3, lr} - bl sub_02018C28 + bl InitSoundSystem ldr r0, _020185CC ; =0x020AF7C0 bl sub_02002C40 ldr r0, _020185D0 ; =0x022A4C00 @@ -15311,7 +15311,7 @@ _02018650: ldreqb r0, [r4, #1] beq _02018650 mov r0, r6 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 bne _020187D0 ldr r1, [sp] @@ -15698,8 +15698,8 @@ _02018B64: .word 0x020AF7C0 _02018B68: .word 0x020AF7E4 arm_func_end sub_02018B50 - arm_func_start sub_02018B6C -sub_02018B6C: ; 0x02018B6C + arm_func_start AllocAudioCommand +AllocAudioCommand: ; 0x02018B6C mov r3, #0 ldr r2, _02018BA4 ; =0x022A4C50 b _02018B94 @@ -15718,10 +15718,10 @@ _02018B94: bx lr .align 2, 0 _02018BA4: .word 0x022A4C50 - arm_func_end sub_02018B6C + arm_func_end AllocAudioCommand - arm_func_start sub_02018BA8 -sub_02018BA8: ; 0x02018BA8 + arm_func_start SendAudioCommand +SendAudioCommand: ; 0x02018BA8 stmdb sp!, {r4, lr} ldr r1, _02018BF8 ; =0x022A4C00 mov r4, r0 @@ -15749,7 +15749,7 @@ _02018BFC: .word 0x022A4C00 _02018C00: .word 0x02099240 _02018C04: .word 0x020AF780 _02018C08: .word 0x020AF7C0 - arm_func_end sub_02018BA8 + arm_func_end SendAudioCommand arm_func_start sub_02018C0C sub_02018C0C: ; 0x02018C0C @@ -15763,8 +15763,8 @@ _02018C20: .word 0x020AF7C0 _02018C24: .word 0x020AF7E4 arm_func_end sub_02018C0C - arm_func_start sub_02018C28 -sub_02018C28: ; 0x02018C28 + arm_func_start InitSoundSystem +InitSoundSystem: ; 0x02018C28 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x50 ldr r0, _02018E44 ; =0x020AFB28 @@ -15926,7 +15926,7 @@ _02018E94: .word 0x022A4ECC _02018E98: .word 0x022A4EF4 _02018E9C: .word 0x022A4EFC _02018EA0: .word 0x020AFB4C - arm_func_end sub_02018C28 + arm_func_end InitSoundSystem arm_func_start ManipBgmPlayback ManipBgmPlayback: ; 0x02018EA4 @@ -16474,7 +16474,7 @@ _020195C8: ldr r2, [r1, r4, lsl #2] ldr r1, _02019768 ; =0x020994B0 add r0, sp, #0xc - bl Sprintf + bl sprintf ldr r1, _0201976C ; =0x020994C0 add r3, sp, #0xc mov r2, r6 @@ -16524,7 +16524,7 @@ _02019684: ldr r1, _02019784 ; =0x02099514 mov r2, sl add r0, sp, #0xc - bl Sprintf + bl sprintf ldr r1, _02019788 ; =0x02099528 mov r0, #8 mov r2, r8 @@ -16744,14 +16744,14 @@ _02019970: ldr r1, _02019B10 ; =0x02099554 add r0, sp, #0x18 mov r2, r6 - bl Sprintf + bl sprintf ldr r0, _02019B14 ; =0x022A4E8C add r1, sp, #0x18 bl sub_02019314 ldr r1, _02019B18 ; =0x0209956C add r0, sp, #0x18 mov r2, r6 - bl Sprintf + bl sprintf ldr r0, _02019B1C ; =0x022A4E7C add r1, sp, #0x18 bl sub_02019314 @@ -16808,7 +16808,7 @@ _02019A5C: str r1, [sp, #4] mul r0, r5, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 rsb r1, r4, r4, lsl #7 @@ -16876,7 +16876,7 @@ _02019B78: mov r0, #0x3e8 mul r0, r4, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r1, r0, lsl #0x10 ldr r2, _02019C44 ; =0x022A4E58 mov r1, r1, lsr #0x10 @@ -16954,7 +16954,7 @@ ChangeBgm: ; 0x02019C50 mov r2, #4 mov r1, #0x3c str r2, [sp] - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 mov r2, #4 @@ -17090,14 +17090,14 @@ _02019E3C: ldr r1, _02019FD0 ; =0x02099554 add r0, sp, #0x18 mov r2, r6 - bl Sprintf + bl sprintf ldr r0, _02019FD4 ; =0x022A4EB4 add r1, sp, #0x18 bl LoadDseFile ldr r1, _02019FD8 ; =0x0209956C add r0, sp, #0x18 mov r2, r6 - bl Sprintf + bl sprintf ldr r0, _02019FDC ; =0x022A4EA4 add r1, sp, #0x18 bl LoadDseFile @@ -17154,7 +17154,7 @@ _02019F1C: str r1, [sp, #4] mul r0, r5, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 rsb r1, r4, r4, lsl #7 @@ -17221,7 +17221,7 @@ _0201A034: mov r0, #0x3e8 mul r0, r4, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r1, r0, lsl #0x10 ldr r2, _0201A0E0 ; =0x022A4E58 mov r1, r1, lsr #0x10 @@ -17290,7 +17290,7 @@ ChangeBgm2: ; 0x0201A0E8 mov r2, #4 mov r1, #0x3c str r2, [sp] - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 mov r2, #4 @@ -17433,13 +17433,13 @@ _0201A304: ldr r1, _0201A3FC ; =0x02099620 add r0, sp, #0x18 mov r2, r6 - bl Sprintf + bl sprintf ldr r0, _0201A400 ; =0x022A4ECC add r1, sp, #0x18 bl sub_02019314 ldr r1, _0201A404 ; =0x02099634 add r0, sp, #0x18 - bl Sprintf + bl sprintf ldr r0, _0201A408 ; =0x022A4EC4 add r1, sp, #0x18 bl sub_02019314 @@ -17461,7 +17461,7 @@ _0201A304: mul r0, r5, r0 mov r1, #0x3c str r2, [sp, #4] - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 rsb r1, r4, r4, lsl #7 @@ -17511,7 +17511,7 @@ StopME: ; 0x0201A40C mov r0, #0x3e8 mul r0, r4, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r1, r0, lsl #0x10 ldr r2, _0201A47C ; =0x022A4E58 mov r1, r1, lsr #0x10 @@ -17693,7 +17693,7 @@ PlaySeFullSpec: ; 0x0201A66C mov r0, #0x3e8 mul r0, r8, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 rsb r2, r7, r7, lsl #7 rsb r1, r6, r6, lsl #6 mov r0, r0, lsl #0x10 @@ -17813,7 +17813,7 @@ SeChangeVolume: ; 0x0201A828 mov r1, #4 str r1, [sp, #4] mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r1, r0, lsr #0x10 mov r0, #4 @@ -17874,7 +17874,7 @@ SeChangePan: ; 0x0201A900 mov r1, #4 str r1, [sp, #4] mov r1, #0x3c - bl DivideInt + bl __divsi3 rsb r2, r6, r6, lsl #6 mov r1, r2, asr #7 add r1, r2, r1, lsr #24 @@ -17954,7 +17954,7 @@ _0201AA64: mov r0, #0x3e8 mul r0, r5, r0 mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r1, r0, lsl #0x10 mov r2, r1, lsr #0x10 mov r0, r4 @@ -19680,8 +19680,8 @@ sub_0201C028: ; 0x0201C028 bx lr arm_func_end sub_0201C028 - arm_func_start sub_0201C050 -sub_0201C050: ; 0x0201C050 + arm_func_start InitAnimationControl +InitAnimationControl: ; 0x0201C050 stmdb sp!, {r4, lr} mov r1, #0x7c mov r4, r0 @@ -19706,13 +19706,13 @@ sub_0201C050: ; 0x0201C050 orr r0, r0, #0x200 strh r0, [r4, #2] ldmia sp!, {r4, pc} - arm_func_end sub_0201C050 + arm_func_end InitAnimationControl arm_func_start sub_0201C0B0 sub_0201C0B0: ; 0x0201C0B0 stmdb sp!, {r4, lr} mov r4, r0 - bl sub_0201C050 + bl InitAnimationControl ldrh r0, [r4, #2] orr r0, r0, #1 strh r0, [r4, #2] @@ -19723,15 +19723,15 @@ sub_0201C0B0: ; 0x0201C0B0 sub_0201C0CC: ; 0x0201C0CC stmdb sp!, {r4, lr} mov r4, r0 - bl sub_0201C050 + bl InitAnimationControl ldrh r0, [r4, #2] orr r0, r0, #1 strh r0, [r4, #2] ldmia sp!, {r4, pc} arm_func_end sub_0201C0CC - arm_func_start sub_0201C0E8 -sub_0201C0E8: ; 0x0201C0E8 + arm_func_start SetSpriteIdForAnimationControl +SetSpriteIdForAnimationControl: ; 0x0201C0E8 strh r1, [r0, #0x70] ldrsh r2, [r0, #0x70] ldrsh r1, [r0, #0x72] @@ -19740,7 +19740,7 @@ sub_0201C0E8: ; 0x0201C0E8 movne r1, #0xff strneb r1, [r0, #0x43] bx lr - arm_func_end sub_0201C0E8 + arm_func_end SetSpriteIdForAnimationControl arm_func_start sub_0201C108 sub_0201C108: ; 0x0201C108 @@ -19762,10 +19762,10 @@ _0201C134: .word 0x020996E0 arm_func_start sub_0201C138 sub_0201C138: ; 0x0201C138 - ldr ip, _0201C140 ; =sub_0201C050 + ldr ip, _0201C140 ; =InitAnimationControl bx ip .align 2, 0 -_0201C140: .word sub_0201C050 +_0201C140: .word InitAnimationControl arm_func_end sub_0201C138 arm_func_start sub_0201C144 @@ -19779,7 +19779,7 @@ sub_0201C144: ; 0x0201C144 mov r0, r0, lsl #0x10 mov r1, r1, asr #0x10 mov r0, r0, asr #0x10 - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r3, pc} @@ -19787,8 +19787,8 @@ sub_0201C144: ; 0x0201C144 _0201C178: .word 0x020AFC3C arm_func_end sub_0201C144 - arm_func_start sub_0201C17C -sub_0201C17C: ; 0x0201C17C + arm_func_start SetAnimationForAnimationControlInternal +SetAnimationForAnimationControlInternal: ; 0x0201C17C stmdb sp!, {r3, r4, r5, lr} ldr r4, [sp, #0x18] ldmia r1, {ip, lr} @@ -19875,10 +19875,10 @@ _0201C2C0: ldrh r1, [r1, #6] strh r1, [r0, #0x62] ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0201C17C + arm_func_end SetAnimationForAnimationControlInternal - arm_func_start sub_0201C2CC -sub_0201C2CC: ; 0x0201C2CC + arm_func_start SetAnimationForAnimationControl +SetAnimationForAnimationControl: ; 0x0201C2CC stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 mov r7, r0 @@ -19886,7 +19886,7 @@ sub_0201C2CC: ; 0x0201C2CC mov r6, r1 mov r5, r2 mov r4, r3 - bl sub_0201DC70 + bl SpriteTypeInWanTable cmp r0, #0 beq _0201C304 add r0, r0, #0xfe @@ -19895,7 +19895,7 @@ sub_0201C2CC: ; 0x0201C2CC bhi _0201C348 _0201C304: mov r0, r7 - bl sub_0201C3E8 + bl GetWanForAnimationControl ldrb r3, [sp, #0x28] str r4, [sp] mov r1, r0 @@ -19909,17 +19909,17 @@ _0201C304: mov r3, r6 mov r2, #0 str r4, [sp, #0x10] - bl sub_0201C17C + bl SetAnimationForAnimationControlInternal b _0201C3E0 _0201C348: ldrsh r0, [r7, #0x70] mov r1, r6, lsl #0x10 mov r1, r1, asr #0x10 - bl sub_0201DA80 + bl WanTableSpriteHasAnimationGroup cmp r0, #0 mov r0, r7 beq _0201C3A4 - bl sub_0201C3E8 + bl GetWanForAnimationControl str r4, [sp] ldrb r3, [sp, #0x28] mov r1, r0 @@ -19933,10 +19933,10 @@ _0201C348: mov r0, r7 mov r3, r5 str r4, [sp, #0x10] - bl sub_0201C17C + bl SetAnimationForAnimationControlInternal b _0201C3E0 _0201C3A4: - bl sub_0201C3E8 + bl GetWanForAnimationControl str r4, [sp] ldrb r3, [sp, #0x28] mov r1, r0 @@ -19950,14 +19950,14 @@ _0201C3A4: mov r0, r7 mov r2, #0 str r4, [sp, #0x10] - bl sub_0201C17C + bl SetAnimationForAnimationControlInternal _0201C3E0: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, pc} - arm_func_end sub_0201C2CC + arm_func_end SetAnimationForAnimationControl - arm_func_start sub_0201C3E8 -sub_0201C3E8: ; 0x0201C3E8 + arm_func_start GetWanForAnimationControl +GetWanForAnimationControl: ; 0x0201C3E8 ldr r1, [r0, #0x68] cmp r1, #0 ldrne r0, [r1, #4] @@ -19971,10 +19971,10 @@ sub_0201C3E8: ; 0x0201C3E8 bx lr .align 2, 0 _0201C414: .word 0x020AFC68 - arm_func_end sub_0201C3E8 + arm_func_end GetWanForAnimationControl - arm_func_start sub_0201C418 -sub_0201C418: ; 0x0201C418 + arm_func_start SetAndPlayAnimationForAnimationControl +SetAndPlayAnimationForAnimationControl: ; 0x0201C418 stmdb sp!, {r4, lr} sub sp, sp, #0x10 ldrb r4, [sp, #0x18] @@ -19985,16 +19985,16 @@ sub_0201C418: ; 0x0201C418 str lr, [sp, #8] mov r4, r0 str ip, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, [r4, #0x4c] mov r0, r4 - bl sub_0201C560 + bl LoadAnimationFrameAndIncrementInAnimationControl add sp, sp, #0x10 ldmia sp!, {r4, pc} - arm_func_end sub_0201C418 + arm_func_end SetAndPlayAnimationForAnimationControl - arm_func_start sub_0201C458 -sub_0201C458: ; 0x0201C458 + arm_func_start SwitchAnimationControlToNextFrame +SwitchAnimationControlToNextFrame: ; 0x0201C458 stmdb sp!, {r4, lr} mov r4, r0 bl sub_0201D1B0 @@ -20064,12 +20064,12 @@ _0201C544: _0201C550: ldr r1, [r4, #0x4c] mov r0, r4 - bl sub_0201C560 + bl LoadAnimationFrameAndIncrementInAnimationControl ldmia sp!, {r4, pc} - arm_func_end sub_0201C458 + arm_func_end SwitchAnimationControlToNextFrame - arm_func_start sub_0201C560 -sub_0201C560: ; 0x0201C560 + arm_func_start LoadAnimationFrameAndIncrementInAnimationControl +LoadAnimationFrameAndIncrementInAnimationControl: ; 0x0201C560 ldrh r2, [r0] orr r2, r2, #0x800 strh r2, [r0] @@ -20095,7 +20095,7 @@ sub_0201C560: ; 0x0201C560 add r1, r1, #0xc str r1, [r0, #0x4c] bx lr - arm_func_end sub_0201C560 + arm_func_end LoadAnimationFrameAndIncrementInAnimationControl arm_func_start sub_0201C5C4 sub_0201C5C4: ; 0x0201C5C4 @@ -20113,7 +20113,7 @@ sub_0201C5C4: ; 0x0201C5C4 cmp r0, #0 bge _0201C618 mov r0, r8 - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame ldrh r0, [r8] tst r0, #0x8000 movne r0, #1 @@ -20136,11 +20136,11 @@ _0201C640: cmp r0, #4 bhs _0201CEC8 ldrsh r0, [r8, #0x70] - bl sub_0201DC70 + bl SpriteTypeInWanTable cmp r0, #3 bne _0201C928 mov r0, r8 - bl sub_0201C3E8 + bl GetWanForAnimationControl ldr r6, [r0] ldr r5, [r0, #4] ldr sl, [r6, #0x10] @@ -20162,7 +20162,7 @@ _0201C640: ldrh r0, [r8, #0xc] add r1, sl, r1, lsl #3 ldr r1, [r1, #4] - bl DivideInt + bl __divsi3 ldr r0, [sp, #0x20] ldr r0, [sl, r0, lsl #3] ldrb r0, [r0, r1] @@ -20306,14 +20306,14 @@ _0201C860: and r2, r2, #0xf8 mov r2, r2, asr #3 strb r2, [sp, #0x83] - bl sub_02004FCC + bl Rgb8ToBgr5 ldr r0, [r6, #0x10] mov r1, #0x3f cmp r0, #0 ldrne r0, [sp, #0x24] strneb r0, [sp, #0x83] mov r0, r7 - bl DivideInt + bl __divsi3 ldrh r0, [r8, #2] and r7, r1, #0xff tst r0, #2 @@ -20333,7 +20333,7 @@ _0201C928: mov r0, r8 ldr r1, [r1, r2, lsl #2] str r1, [sp, #0x40] - bl sub_0201C3E8 + bl GetWanForAnimationControl mov r1, #0 ldrh r3, [r8, #0x60] str r1, [sp, #0x2c] @@ -20768,7 +20768,7 @@ sub_0201CF5C: ; 0x0201CF5C tst r0, #0x10 ldmneia sp!, {r4, pc} mov r0, r4 - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame ldmia sp!, {r4, pc} arm_func_end sub_0201CF5C @@ -20934,16 +20934,16 @@ sub_0201D12C: ; 0x0201D12C _0201D16C: .word 0x0000F3FF arm_func_end sub_0201D12C - arm_func_start sub_0201D170 -sub_0201D170: ; 0x0201D170 + arm_func_start AnimationControlGetAllocForMaxFrame +AnimationControlGetAllocForMaxFrame: ; 0x0201D170 stmdb sp!, {r3, lr} - bl sub_0201C3E8 + bl GetWanForAnimationControl cmp r0, #0 ldrne r0, [r0] ldrnesh r0, [r0, #0xe] moveq r0, #0 ldmia sp!, {r3, pc} - arm_func_end sub_0201D170 + arm_func_end AnimationControlGetAllocForMaxFrame arm_func_start sub_0201D18C sub_0201D18C: ; 0x0201D18C @@ -21012,8 +21012,8 @@ _0201D204: ldmia sp!, {r4, pc} arm_func_end DeleteWanTableEntry - arm_func_start sub_0201D244 -sub_0201D244: ; 0x0201D244 + arm_func_start AllocateWanTableEntry +AllocateWanTableEntry: ; 0x0201D244 stmdb sp!, {r3, r4, r5, lr} add r1, r0, #0x1500 mov lr, #1 @@ -21053,7 +21053,7 @@ _0201D2C4: blt _0201D264 mvn r0, #0 ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0201D244 + arm_func_end AllocateWanTableEntry arm_func_start FindWanTableEntry FindWanTableEntry: ; 0x0201D2D4 @@ -21071,7 +21071,7 @@ _0201D2F4: cmp r1, #1 bne _0201D318 mov r1, r5 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, r8 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -21131,8 +21131,8 @@ sub_0201D38C: ; 0x0201D38C _0201D3B8: .word 0x00001510 arm_func_end sub_0201D38C - arm_func_start sub_0201D3BC -sub_0201D3BC: ; 0x0201D3BC + arm_func_start InitWanTable +InitWanTable: ; 0x0201D3BC stmdb sp!, {r4, lr} mov r1, #0x1500 mov r4, r0 @@ -21141,7 +21141,7 @@ sub_0201D3BC: ; 0x0201D3BC mov r1, #0x60 strh r1, [r0, #8] ldmia sp!, {r4, pc} - arm_func_end sub_0201D3BC + arm_func_end InitWanTable arm_func_start LoadWanTableEntry LoadWanTableEntry: ; 0x0201D3DC @@ -21162,7 +21162,7 @@ LoadWanTableEntry: ; 0x0201D3DC b _0201D47C _0201D418: mov r0, r5 - bl sub_0201D244 + bl AllocateWanTableEntry mov r4, r0 mov r0, #0x38 smlabb r5, r4, r0, r5 @@ -21171,14 +21171,14 @@ _0201D418: mov r1, r6 mov r2, r7 strb r3, [r5, #0x21] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp] mov r0, r5 str r1, [r5, #0x34] ldr r2, [sp, #4] mov r1, r6 str r2, [r5, #0x28] - bl Strcpy + bl strcpy ldrsh r1, [r5, #0x2c] add r0, r5, #0x30 add r1, r1, #1 @@ -21191,8 +21191,8 @@ _0201D47C: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end LoadWanTableEntry - arm_func_start sub_0201D484 -sub_0201D484: ; 0x0201D484 + arm_func_start LoadWanTableEntryFromPack +LoadWanTableEntryFromPack: ; 0x0201D484 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -21210,7 +21210,7 @@ sub_0201D484: ; 0x0201D484 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0201D4C0: mov r0, sb - bl sub_0201D244 + bl AllocateWanTableEntry mov r5, r0 mov r0, #0x38 smlabb r4, r5, r0, sb @@ -21263,10 +21263,10 @@ _0201D56C: bl HandleSir0TranslationVeneer mov r0, r5 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end sub_0201D484 + arm_func_end LoadWanTableEntryFromPack - arm_func_start sub_0201D590 -sub_0201D590: ; 0x0201D590 + arm_func_start LoadWanTableEntryFromPackUseProvidedMemory +LoadWanTableEntryFromPackUseProvidedMemory: ; 0x0201D590 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -21284,7 +21284,7 @@ sub_0201D590: ; 0x0201D590 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0201D5CC: mov r0, sb - bl sub_0201D244 + bl AllocateWanTableEntry ldrb r1, [sp, #0x20] mov r5, r0 mov r0, #0x38 @@ -21331,7 +21331,7 @@ _0201D648: mov r0, r5 strb r1, [r4, #0x20] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end sub_0201D590 + arm_func_end LoadWanTableEntryFromPackUseProvidedMemory arm_func_start ReplaceWanFromBinFile ReplaceWanFromBinFile: ; 0x0201D684 @@ -21587,7 +21587,7 @@ sub_0201D990: ; 0x0201D990 mov r0, r0, lsl #0x10 mov r1, r1, asr #0x10 mov r0, r0, asr #0x10 - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r3, pc} @@ -21640,8 +21640,8 @@ _0201DA3C: .word 0x020AFC64 _0201DA40: .word sub_0201DA00 arm_func_end sub_0201DA20 - arm_func_start sub_0201DA44 -sub_0201DA44: ; 0x0201DA44 + arm_func_start WanHasAnimationGroup +WanHasAnimationGroup: ; 0x0201DA44 ldr r2, [r0] ldrsh r0, [r2, #0xc] cmp r1, r0 @@ -21659,21 +21659,21 @@ _0201DA70: _0201DA78: mov r0, #1 bx lr - arm_func_end sub_0201DA44 + arm_func_end WanHasAnimationGroup - arm_func_start sub_0201DA80 -sub_0201DA80: ; 0x0201DA80 + arm_func_start WanTableSpriteHasAnimationGroup +WanTableSpriteHasAnimationGroup: ; 0x0201DA80 ldr r3, _0201DA9C ; =0x020AFC64 mov r2, #0x38 ldr r3, [r3, #4] - ldr ip, _0201DAA0 ; =sub_0201DA44 + ldr ip, _0201DAA0 ; =WanHasAnimationGroup smlabb r0, r0, r2, r3 ldr r0, [r0, #0x30] bx ip .align 2, 0 _0201DA9C: .word 0x020AFC64 -_0201DAA0: .word sub_0201DA44 - arm_func_end sub_0201DA80 +_0201DAA0: .word WanHasAnimationGroup + arm_func_end WanTableSpriteHasAnimationGroup arm_func_start sub_0201DAA4 sub_0201DAA4: ; 0x0201DAA4 @@ -21816,8 +21816,8 @@ _0201DC68: .word 0x020AFC64 _0201DC6C: .word sub_0201DBDC arm_func_end sub_0201DC4C - arm_func_start sub_0201DC70 -sub_0201DC70: ; 0x0201DC70 + arm_func_start SpriteTypeInWanTable +SpriteTypeInWanTable: ; 0x0201DC70 ldr r2, _0201DC8C ; =0x020AFC64 mov r1, #0x38 ldr r2, [r2, #4] @@ -21827,7 +21827,7 @@ sub_0201DC70: ; 0x0201DC70 bx lr .align 2, 0 _0201DC8C: .word 0x020AFC64 - arm_func_end sub_0201DC70 + arm_func_end SpriteTypeInWanTable arm_func_start sub_0201DC90 sub_0201DC90: ; 0x0201DC90 @@ -21953,7 +21953,7 @@ _0201DDF8: .word 0x06890000 sub_0201DDFC: ; 0x0201DDFC stmdb sp!, {r3, lr} bl sub_0201E5B0 - bl sub_0201E71C + bl GeomSwapBuffers bl sub_0201E544 ldmia sp!, {r3, pc} arm_func_end sub_0201DDFC @@ -21987,21 +21987,21 @@ LoadWteFromRom: ; 0x0201DE4C ldr r1, _0201DEBC ; =0x02099714 add r0, sp, #0xc mov r4, r2 - bl Strcpy + bl strcpy add r0, sp, #0xc mov r1, r5 - bl Strcat + bl strcat add r0, sp, #4 add r1, sp, #0xc mov r2, r4 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp, #4] add r0, sp, #0 bl HandleSir0Translation ldr r0, [sp] ldr r1, _0201DEC0 ; =0x0209971C mov r2, #4 - bl Strncmp + bl strncmp ldr r0, [sp, #4] str r0, [r6] ldr r0, [sp] @@ -22028,7 +22028,7 @@ LoadWteFromFileDirectory: ; 0x0201DEC4 ldr r0, [sp, #8] ldr r1, _0201DF14 ; =0x0209971C mov r2, #4 - bl Strncmp + bl strncmp ldr r0, [sp] str r0, [r4] ldr r0, [sp, #8] @@ -22062,20 +22062,20 @@ sub_0201DF38: ; 0x0201DF38 mov r4, r0 ldr r1, _0201DFAC ; =0x02099714 add r0, sp, #8 - bl Strcpy + bl strcpy add r0, sp, #8 mov r1, r6 - bl Strcat + bl strcat add r0, sp, #0 add r1, sp, #8 mov r2, r5 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r5, [sp] ldr r1, _0201DFB0 ; =0x02099720 str r5, [r4] mov r0, r5 mov r2, #4 - bl Strncmp + bl strncmp ldr r1, [r5, #0xc] mov r0, r4 add r1, r5, r1 @@ -22108,7 +22108,7 @@ LoadWtuFromBin: ; 0x0201DFB4 str r5, [r4] mov r0, r5 mov r2, #4 - bl Strncmp + bl strncmp ldr r1, [r5, #0xc] mov r0, r4 add r1, r5, r1 @@ -22406,7 +22406,7 @@ sub_0201E380: ; 0x0201E380 ldr r2, [r5, #0x18] add r0, r3, r4, lsl #8 add r0, r2, r0, lsl #1 - bl sub_02004FCC + bl Rgb8ToBgr5 ldr r0, [r5, #0x1c] mov r1, #1 strb r1, [r0, r4] @@ -22430,7 +22430,7 @@ _0201E3D4: add r0, r5, r6 add r0, r1, r0, lsl #1 add r1, sb, r5, lsl #2 - bl sub_02004FCC + bl Rgb8ToBgr5 add r0, r5, #1 ldr r1, [sl, #0x1c] mov r0, r0, lsl #0x10 @@ -22488,8 +22488,8 @@ _0201E480: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end sub_0201E424 - arm_func_start sub_0201E494 -sub_0201E494: ; 0x0201E494 + arm_func_start GeomSetTexImageParam +GeomSetTexImageParam: ; 0x0201E494 ldr ip, [sp, #0xc] mov r0, r0, lsl #0x1a orr r0, r0, ip, lsr #3 @@ -22507,10 +22507,10 @@ sub_0201E494: ; 0x0201E494 bx lr .align 2, 0 _0201E4D0: .word 0x040004A8 - arm_func_end sub_0201E494 + arm_func_end GeomSetTexImageParam - arm_func_start sub_0201E4D4 -sub_0201E4D4: ; 0x0201E4D4 + arm_func_start GeomSetVertexCoord16 +GeomSetVertexCoord16: ; 0x0201E4D4 mov r1, r1, lsl #0x10 mov r1, r1, lsr #0x10 mov r0, r0, lsl #0x10 @@ -22524,10 +22524,10 @@ sub_0201E4D4: ; 0x0201E4D4 bx lr .align 2, 0 _0201E500: .word 0x0400048C - arm_func_end sub_0201E4D4 + arm_func_end GeomSetVertexCoord16 - arm_func_start sub_0201E504 -sub_0201E504: ; 0x0201E504 + arm_func_start InitRender3dData +InitRender3dData: ; 0x0201E504 stmdb sp!, {r3, lr} ldr r0, _0201E540 ; =0x020AFC80 ldr r0, [r0, #0x40] @@ -22545,7 +22545,7 @@ sub_0201E504: ; 0x0201E504 ldmia sp!, {r3, pc} .align 2, 0 _0201E540: .word 0x020AFC80 - arm_func_end sub_0201E504 + arm_func_end InitRender3dData arm_func_start sub_0201E544 sub_0201E544: ; 0x0201E544 @@ -22560,7 +22560,7 @@ sub_0201E544: ; 0x0201E544 mov r2, r0 mov r3, r0 str r0, [sp, #0xc] - bl sub_0201E494 + bl GeomSetTexImageParam ldr r0, _0201E5A4 ; =0x020AFC80 mvn r1, #0 str r1, [r0, #8] @@ -22583,7 +22583,7 @@ _0201E5AC: .word 0x040004A4 sub_0201E5B0: ; 0x0201E5B0 stmdb sp!, {r3, lr} sub sp, sp, #0x10 - bl sub_01FF8DCC + bl Render3dStack mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -22593,7 +22593,7 @@ sub_0201E5B0: ; 0x0201E5B0 mov r2, r0 mov r3, r0 str r0, [sp, #0xc] - bl sub_0201E494 + bl GeomSetTexImageParam ldr r0, _0201E608 ; =0x020AFC80 mvn r1, #0 str r1, [r0, #8] @@ -22615,7 +22615,7 @@ sub_0201E614: ; 0x0201E614 mov r4, r0 mov r1, #0xbc bl MemZero - bl sub_0201E504 + bl InitRender3dData mov r0, r4 bl sub_0201E634 ldmia sp!, {r4, pc} @@ -22684,18 +22684,18 @@ _0201E714: .word 0x04000580 _0201E718: .word 0x0400044C arm_func_end sub_0201E634 - arm_func_start sub_0201E71C -sub_0201E71C: ; 0x0201E71C + arm_func_start GeomSwapBuffers +GeomSwapBuffers: ; 0x0201E71C ldr r0, _0201E72C ; =0x04000540 mov r1, #1 str r1, [r0] bx lr .align 2, 0 _0201E72C: .word 0x04000540 - arm_func_end sub_0201E71C + arm_func_end GeomSwapBuffers - arm_func_start sub_0201E730 -sub_0201E730: ; 0x0201E730 + arm_func_start InitRender3dElement +InitRender3dElement: ; 0x0201E730 stmdb sp!, {r4, lr} mov r1, #0x40 mov r4, r0 @@ -22713,7 +22713,7 @@ sub_0201E730: ; 0x0201E730 mov r0, #0 strb r0, [r4, #0x3e] ldmia sp!, {r4, pc} - arm_func_end sub_0201E730 + arm_func_end InitRender3dElement arm_func_start sub_0201E774 sub_0201E774: ; 0x0201E774 @@ -22894,8 +22894,8 @@ _0201E9C0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end sub_0201E844 - arm_func_start sub_0201E9EC -sub_0201E9EC: ; 0x0201E9EC + arm_func_start Generate3dCanvasBorder +Generate3dCanvasBorder: ; 0x0201E9EC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x4c mov sl, r0 @@ -23069,7 +23069,7 @@ _0201EA04: bl sub_0201EC9C add sp, sp, #0x4c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end sub_0201E9EC + arm_func_end Generate3dCanvasBorder arm_func_start sub_0201EC9C sub_0201EC9C: ; 0x0201EC9C @@ -23524,7 +23524,7 @@ sub_0201F2AC: ; 0x0201F2AC smulbb r4, r0, r1 ldr r0, [r2] add r0, r0, r4 - bl sub_0201E730 + bl InitRender3dElement ldr r0, _0201F2E0 ; =0x020AFCE4 mov r1, #0 ldr r0, [r0] @@ -23641,7 +23641,7 @@ _0201F410: smulbb r5, r4, r0 ldr r0, [r1] add r0, r0, r5 - bl sub_0201E730 + bl InitRender3dElement ldr r1, _0201F460 ; =0x020AFCE4 mov r3, #1 ldr r2, [r1] @@ -25159,10 +25159,10 @@ _02020870: arm_func_start sub_02020880 sub_02020880: ; 0x02020880 - ldr ip, _02020888 ; =Strstr + ldr ip, _02020888 ; =strstr bx ip .align 2, 0 -_02020888: .word Strstr +_02020888: .word strstr arm_func_end sub_02020880 arm_func_start sub_0202088C @@ -25190,8 +25190,8 @@ _020208C0: bx lr arm_func_end sub_02020890 - arm_func_start StrcmpTag__020208C8 -StrcmpTag__020208C8: ; 0x020208C8 + arm_func_start StrcmpTag +StrcmpTag: ; 0x020208C8 ldrb r2, [r1], #1 ldrb r3, [r0], #1 cmp r2, #0 @@ -25207,13 +25207,13 @@ _020208F0: moveq r0, #0 bxeq lr cmp r3, r2 - beq StrcmpTag__020208C8 + beq StrcmpTag mov r0, #0 bx lr - arm_func_end StrcmpTag__020208C8 + arm_func_end StrcmpTag - arm_func_start StoiTag__0202090C -StoiTag__0202090C: ; 0x0202090C + arm_func_start StoiTag +StoiTag: ; 0x0202090C mov r3, #0 mov r1, #0xa _02020914: @@ -25229,7 +25229,7 @@ _02020914: mlals r2, r3, r1, r2 subls r3, r2, #0x30 b _02020914 - arm_func_end StoiTag__0202090C + arm_func_end StoiTag arm_func_start sub_02020944 sub_02020944: ; 0x02020944 @@ -25245,7 +25245,7 @@ sub_02020948: ; 0x02020948 cmp r4, #0x5a bhi _02020A24 add r0, r0, #1 - bl StoiTag__0202090C + bl StoiTag mov r0, r0, lsl #0x10 cmp r4, #0x49 mov r0, r0, asr #0x10 @@ -25307,7 +25307,7 @@ _02020A24: blo _02020A44 cmp r4, #0x39 bhi _02020A44 - bl StoiTag__0202090C + bl StoiTag mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r4, pc} @@ -25327,7 +25327,7 @@ sub_02020A4C: ; 0x02020A4C b _02020A80 _02020A68: mov r0, r5 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 ldrneh r0, [r4, #4] ldmneia sp!, {r3, r4, r5, pc} @@ -25504,7 +25504,7 @@ _02020C70: mov r1, #0x44 strb r1, [r4, #0x98] str r0, [r4, #0xa0] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 movne r0, #4 moveq r0, #1 @@ -25758,7 +25758,7 @@ _02020F7C: ; jump table b _020219AC ; case 21 _02020FD4: ldr r1, _02021ED0 ; =0x020999AC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021018 ldr r1, [r4, #8] @@ -25788,7 +25788,7 @@ _02021018: _02021040: ldr r0, [sp, #0x70] ldr r1, _02021EDC ; =0x020999C8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021104 cmp r6, #2 @@ -25812,7 +25812,7 @@ _02021098: cmp r6, #3 bne _020210F0 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldrb r2, [r4, #0x9c] cmp r2, #0 cmpne r0, #3 @@ -25841,7 +25841,7 @@ _020210F0: _02021104: ldr r0, [sp, #0x70] ldr r1, _02021EE0 ; =0x020999CC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020211C4 cmp r6, #1 @@ -25864,7 +25864,7 @@ _02021158: cmp r6, #2 bne _020211B0 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldrb r1, [r4, #0x9c] cmp r1, #0 cmpne r0, #3 @@ -25893,7 +25893,7 @@ _020211B0: _020211C4: ldr r0, [sp, #0x70] ldr r1, _02021EE4 ; =0x020999D0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021200 ldr r0, [r4, #0x88] @@ -25909,7 +25909,7 @@ _020211C4: _02021200: ldr r0, [sp, #0x70] ldr r1, _02021EE8 ; =0x020999D4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021278 ldr r0, [r4, #0xc] @@ -25941,21 +25941,21 @@ _02021260: _02021278: ldr r0, [sp, #0x70] ldr r1, _02021EEC ; =0x020999D8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202129C ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag str r0, [r4, #0x90] b _02021AA0 _0202129C: ldr r0, [sp, #0x70] ldr r1, _02021EF0 ; =0x020999E4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020212C8 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldr r1, [r4, #0x90] add r0, r1, r0 str r0, [r4, #0x90] @@ -25974,7 +25974,7 @@ _020212C8: _020212F0: ldr r0, [sp, #0x70] ldr r1, _02021EF4 ; =0x020999F0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021324 ldr r0, [r4] @@ -25999,7 +25999,7 @@ _02021324: _0202134C: ldr r0, [sp, #0x70] ldr r1, _02021EF8 ; =0x020999F4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020213A8 ldr r0, [sp, #0x74] @@ -26023,11 +26023,11 @@ _0202134C: _020213A8: ldr r0, [sp, #0x70] ldr r1, _02021EFC ; =0x020999F8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020213CC ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag str r0, [r4, #0x58] b _020213F4 _020213CC: @@ -26048,7 +26048,7 @@ _020213F4: b _02021AA0 _02021404: ldr r1, _02021F00 ; =0x020999FC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021434 ldrh r0, [r4, #0x60] @@ -26073,11 +26073,11 @@ _02021434: _0202145C: ldr r0, [sp, #0x70] ldr r1, _02021F04 ; =0x02099A00 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020214E8 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldr r2, [r4, #0xa4] mov r1, #0x18 mul r3, r2, r1 @@ -26109,7 +26109,7 @@ _0202145C: _020214E8: ldr r0, [sp, #0x70] ldr r1, _02021F08 ; =0x02099A04 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021588 ldr r3, [r4, #0xa4] @@ -26151,14 +26151,14 @@ _0202156C: _02021588: ldr r0, [sp, #0x70] ldr r1, _02021F0C ; =0x02099A08 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202166C ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag mov r5, r0 ldr r0, [sp, #0x78] - bl StoiTag__0202090C + bl StoiTag mov r6, r0 ldr r0, _02021F10 ; =0x020997E4 mov r1, r5, lsl #1 @@ -26224,7 +26224,7 @@ _0202166C: _02021694: ldr r0, [sp, #0x70] ldr r1, _02021F14 ; =0x02099A10 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020216F8 ldr r0, [sp, #0x74] @@ -26250,11 +26250,11 @@ _02021694: _020216F8: ldr r0, [sp, #0x70] ldr r1, _02021F18 ; =0x02099A14 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021728 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldr r2, [r4, #0x90] mov r1, #6 mla r1, r0, r1, r2 @@ -26263,7 +26263,7 @@ _020216F8: _02021728: ldr r0, [sp, #0x70] ldr r1, _02021F1C ; =0x02099A18 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021764 ldr r0, [r4, #0x54] @@ -26279,14 +26279,14 @@ _02021728: _02021764: ldr r0, [sp, #0x70] ldr r1, _02021F20 ; =0x02099A1C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202179C ldrh r0, [r4, #0x60] tst r0, #1 bne _02021AA0 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C50 @@ -26305,7 +26305,7 @@ _0202179C: _020217C4: ldr r0, [sp, #0x70] ldr r1, _02021F24 ; =0x02099A24 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021840 ldr r1, [r4, #0xc] @@ -26349,7 +26349,7 @@ _02021840: _02021868: ldr r0, [sp, #0x70] ldr r1, _02021F28 ; =0x02099A28 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020218B0 ldr r0, [r4] @@ -26379,11 +26379,11 @@ _020218B0: _020218D8: ldr r0, [sp, #0x70] ldr r1, _02021F2C ; =0x02099A2C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021904 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag ldr r1, [r4, #0x90] add r0, r1, r0 str r0, [r4, #0x90] @@ -26391,14 +26391,14 @@ _020218D8: _02021904: ldr r0, [sp, #0x70] ldr r1, _02021F30 ; =0x02099A30 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 movne r0, #0x400 strne r0, [r4, #0x80] bne _02021AA0 ldr r0, [sp, #0x70] ldr r1, _02021F34 ; =0x02099A34 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202194C ldrb r0, [r4, #0x62] @@ -26410,14 +26410,14 @@ _02021904: _0202194C: ldr r0, [sp, #0x70] ldr r1, _02021F38 ; =0x02099A38 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021984 ldrh r0, [r4, #0x60] tst r0, #1 bne _02021AA0 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C80 @@ -26436,14 +26436,14 @@ _02021984: _020219AC: ldr r0, [sp, #0x70] ldr r1, _02021F3C ; =0x02099A40 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020219E8 ldrh r0, [r4, #0x60] tst r0, #1 bne _02021AA0 ldr r0, [sp, #0x74] - bl StoiTag__0202090C + bl StoiTag str r0, [r4, #0x7c] mov r0, #6 str r0, [r4, #0x5c] @@ -26863,12 +26863,12 @@ _02021F8C: bne _02021F8C mov r0, r8 mov r1, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _02021FCC mov r0, r8 mov r1, r5 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02021FF0 _02021FCC: @@ -26884,7 +26884,7 @@ _02021FCC: _02021FF0: mov r0, r8 mov r1, r4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 ldrne r0, [sb] addne r0, r0, #1 @@ -26929,12 +26929,12 @@ _02022068: bne _02022068 ldr r1, _02022110 ; =0x02099A04 mov r0, r4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020220F4 ldr r1, _02022114 ; =0x02099A00 mov r0, r4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _02022040 ldr r2, [sp, #0x10] @@ -26994,32 +26994,32 @@ _0202212C: mov r0, r6 str r2, [sp, #0x18] mov r5, #0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020221D8 ldr r1, _020223C8 ; =0x020999F4 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020221D8 ldr r1, _020223CC ; =0x02099A2C mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020221D8 ldr r1, _020223D0 ; =0x02099A14 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020221D8 ldr r1, _020223D4 ; =0x02099A18 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020221D8 ldr r1, _020223D8 ; =0x02099A08 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022324 _020221D8: @@ -27046,7 +27046,7 @@ _02022214: _0202221C: ldr r1, _020223C4 ; =0x02099A10 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022250 mov r0, r5 @@ -27060,7 +27060,7 @@ _0202221C: _02022250: ldr r1, _020223C8 ; =0x020999F4 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022280 mov r0, r5 @@ -27073,28 +27073,28 @@ _02022250: _02022280: ldr r1, _020223CC ; =0x02099A2C mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020222A4 mov r0, r5 - bl StoiTag__0202090C + bl StoiTag add r4, r4, r0 b _0202212C _020222A4: ldr r1, _020223D0 ; =0x02099A14 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020222CC mov r0, r5 - bl StoiTag__0202090C + bl StoiTag mov r1, #6 mla r4, r0, r1, r4 b _0202212C _020222CC: ldr r1, _020223D4 ; =0x02099A18 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 addne r4, r4, #6 bne _0202212C @@ -27104,10 +27104,10 @@ _020222E8: cmp r0, #0x3a bne _020222E8 mov r0, r5 - bl StoiTag__0202090C + bl StoiTag mov r5, r0 mov r0, r6 - bl StoiTag__0202090C + bl StoiTag ldr r1, _020223DC ; =0x020997E4 mov r2, r5, lsl #1 mov r5, r0 @@ -27131,22 +27131,22 @@ _02022328: bhi _0202212C ldr r1, _020223E0 ; =0x02099A24 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020223B4 ldr r1, _020223E4 ; =0x020999D4 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020223B4 ldr r1, _020223E8 ; =0x02099A28 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020223B4 ldr r1, _020223EC ; =0x020999F0 mov r0, r6 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _020223B4 b _0202212C @@ -27326,11 +27326,11 @@ _020225CC: ; jump table b _0202323C ; case 22 _02022628: ldr r1, _02023478 ; =0x02099A74 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022658 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27340,11 +27340,11 @@ _02022628: _02022658: ldr r0, [sp, #0xb4] ldr r1, _0202347C ; =0x02099A7C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022694 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r2, r8, r0, lsl #2 ldr r1, [r2, #0x10] ldr r2, [r2, #0x24] @@ -27367,11 +27367,11 @@ _02022694: _020226BC: ldr r0, [sp, #0xb4] ldr r1, _02023488 ; =0x02099A84 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020226F0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27381,11 +27381,11 @@ _020226BC: _020226F0: ldr r0, [sp, #0xb4] ldr r1, _0202348C ; =0x02099A8C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022724 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27406,7 +27406,7 @@ _02022724: _0202274C: ldr r0, [sp, #0xb4] ldr r1, _02023490 ; =0x02099A98 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022774 ldr r1, [sp, #0xb8] @@ -27417,11 +27417,11 @@ _0202274C: _02022774: ldr r0, [sp, #0xb4] ldr r1, _02023494 ; =0x02099AA0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020227A8 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27431,7 +27431,7 @@ _02022774: _020227A8: ldr r0, [sp, #0xb4] ldr r1, _02023498 ; =0x02099AA4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020227D0 ldr r1, [sp, #0xb8] @@ -27442,7 +27442,7 @@ _020227A8: _020227D0: ldr r0, [sp, #0xb4] ldr r1, _0202349C ; =0x02099AAC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020227F8 ldr r1, [sp, #0xb8] @@ -27453,7 +27453,7 @@ _020227D0: _020227F8: ldr r0, [sp, #0xb4] ldr r1, _020234A0 ; =0x02099AB8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 ldrne r7, _020234A4 ; =0x02099AC0 bne _020232F0 @@ -27470,11 +27470,11 @@ _020227F8: _02022838: ldr r0, [sp, #0xb4] ldr r1, _020234A8 ; =0x02099AC8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022870 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r2, [r0, #0x24] ldr r1, _020234AC ; =0x02099AD0 @@ -27485,11 +27485,11 @@ _02022838: _02022870: ldr r0, [sp, #0xb4] ldr r1, _020234B0 ; =0x02099AD4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020228A8 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r2, [r0, #0x24] ldr r1, _020234B4 ; =0x02099AE0 @@ -27500,11 +27500,11 @@ _02022870: _020228A8: ldr r0, [sp, #0xb4] ldr r1, _020234B8 ; =0x02099AF0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020228E0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] ldr r2, [r0, #0x24] @@ -27526,7 +27526,7 @@ _020228E0: _02022908: ldr r0, [sp, #0xb4] ldr r1, _020234BC ; =0x02099AF8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022938 ldr r1, [r8, #0x34] @@ -27539,11 +27539,11 @@ _02022908: _02022938: ldr r0, [sp, #0xb4] ldr r1, _020234C0 ; =0x02099B04 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202296C ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27564,11 +27564,11 @@ _0202296C: _02022994: ldr r0, [sp, #0xb4] ldr r1, _020234C4 ; =0x02099B10 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020229C8 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27589,21 +27589,21 @@ _020229C8: _020229F0: ldr r0, [sp, #0xb4] ldr r1, _020234C8 ; =0x02099B18 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022A14 add r0, sp, #0x1c8 - bl sub_02024DFC + bl GetBagNameString mov r7, r0 b _020232F0 _02022A14: ldr r0, [sp, #0xb4] ldr r1, _020234CC ; =0x02099B24 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022A48 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27613,11 +27613,11 @@ _02022A14: _02022A48: ldr r0, [sp, #0xb4] ldr r1, _020234D0 ; =0x02099B2C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022A7C ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27627,11 +27627,11 @@ _02022A48: _02022A7C: ldr r0, [sp, #0xb4] ldr r1, _020234D4 ; =0x02099B34 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022AB0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x24] add r0, sp, #0x1c8 @@ -27652,7 +27652,7 @@ _02022AB0: _02022AD8: ldr r0, [sp, #0xb4] ldr r1, _020234D8 ; =0x02099B40 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022B00 add r0, sp, #0x1c8 @@ -27674,11 +27674,11 @@ _02022B00: _02022B28: ldr r0, [sp, #0xb4] ldr r1, _020234DC ; =0x02099B48 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022B64 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r3, r8, r0, lsl #2 ldr r1, [r3, #0x10] ldr r2, [r3, #0x24] @@ -27701,11 +27701,11 @@ _02022B64: _02022B8C: ldr r0, [sp, #0xb4] ldr r1, _020234E0 ; =0x02099B50 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022BBC ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag ldr r1, [r8, r0, lsl #2] add r0, sp, #0x1c8 bl sub_02023920 @@ -27725,11 +27725,11 @@ _02022BBC: _02022BE4: ldr r0, [sp, #0xb4] ldr r1, _020234E4 ; =0x02099B58 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022C14 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag ldr r1, [r8, r0, lsl #2] add r0, sp, #0x1c8 bl sub_02023B68 @@ -27738,7 +27738,7 @@ _02022BE4: _02022C14: ldr r0, [sp, #0xb4] ldr r1, _020234E8 ; =0x02099B60 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022C3C add r0, sp, #0x1c8 @@ -27760,11 +27760,11 @@ _02022C3C: _02022C64: ldr r0, [sp, #0xb4] ldr r1, _020234EC ; =0x02099B6C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022C9C ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] ldr r2, [r0, #0x24] @@ -27775,11 +27775,11 @@ _02022C64: _02022C9C: ldr r0, [sp, #0xb4] ldr r1, _020234F0 ; =0x02099B74 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022CD4 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r2, [r0, #0x24] ldr r1, _020234F4 ; =0x02099B7C @@ -27790,7 +27790,7 @@ _02022C9C: _02022CD4: ldr r0, [sp, #0xb4] ldr r1, _020234F8 ; =0x02099B8C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022D04 ldr r1, [r8, #0x34] @@ -27803,7 +27803,7 @@ _02022CD4: _02022D04: ldr r0, [sp, #0xb4] ldr r1, _020234FC ; =0x02099B9C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022D34 ldr r1, [r8, #0x34] @@ -27827,7 +27827,7 @@ _02022D34: _02022D5C: ldr r0, [sp, #0xb4] ldr r1, _02023500 ; =0x02099BA8 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022D84 add r0, sp, #0x1c8 @@ -27838,7 +27838,7 @@ _02022D5C: _02022D84: ldr r0, [sp, #0xb4] ldr r1, _02023504 ; =0x02099BB0 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022DAC add r0, sp, #0x1c8 @@ -27849,7 +27849,7 @@ _02022D84: _02022DAC: ldr r0, [sp, #0xb4] ldr r1, _02023508 ; =0x02099BBC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022DD4 add r0, sp, #0x1c8 @@ -27860,11 +27860,11 @@ _02022DAC: _02022DD4: ldr r0, [sp, #0xb4] ldr r1, _0202350C ; =0x02099BC4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022E08 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27885,11 +27885,11 @@ _02022E08: _02022E30: ldr r0, [sp, #0xb4] ldr r1, _02023510 ; =0x02099BCC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022E64 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27899,11 +27899,11 @@ _02022E30: _02022E64: ldr r0, [sp, #0xb4] ldr r1, _02023514 ; =0x02099BD4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022E98 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27924,11 +27924,11 @@ _02022E98: _02022EC0: ldr r0, [sp, #0xb4] ldr r1, _02023518 ; =0x02099BDC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022EF8 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag mov r2, #0 orr r1, r0, #0x50000 add r0, sp, #0x1c8 @@ -27939,30 +27939,30 @@ _02022EC0: _02022EF8: ldr r0, [sp, #0xb4] ldr r1, _0202351C ; =0x02099BE4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 ldrne r7, [r8, #0x38] bne _020232F0 ldr r0, [sp, #0xb4] ldr r1, _02023520 ; =0x02099BEC - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022F40 cmp r6, #2 bne _020232F0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r7, [r0, #0x38] b _020232F0 _02022F40: ldr r0, [sp, #0xb4] ldr r1, _02023524 ; =0x02099BF4 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022F78 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r2, [r0, #0x24] ldr r1, _02023528 ; =0x02099BFC @@ -27984,11 +27984,11 @@ _02022F78: _02022FA0: ldr r0, [sp, #0xb4] ldr r1, _0202352C ; =0x02099C0C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02022FD4 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -27998,11 +27998,11 @@ _02022FA0: _02022FD4: ldr r0, [sp, #0xb4] ldr r1, _02023530 ; =0x02099C14 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023008 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -28012,11 +28012,11 @@ _02022FD4: _02023008: ldr r0, [sp, #0xb4] ldr r1, _02023534 ; =0x02099C1C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202303C ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -28026,7 +28026,7 @@ _02023008: _0202303C: ldr r0, [sp, #0xb4] ldr r1, _02023538 ; =0x02099C24 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023094 cmp r6, #1 @@ -28040,7 +28040,7 @@ _0202306C: cmp r6, #2 bne _020232F0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -28050,28 +28050,28 @@ _0202306C: _02023094: ldr r0, [sp, #0xb4] ldr r1, _0202353C ; =0x02099C2C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023114 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r5, [r0, #0x24] mov r1, #0xe10 mov r0, r5 - bl DivideUInt + bl __udivsi3 mov r6, r0 mov r0, r5 mov r1, #0xe10 - bl DivideUInt + bl __udivsi3 mov r5, r1 mov r0, r5 mov r1, #0x3c - bl DivideUInt + bl __udivsi3 mov r7, r0 mov r0, r5 mov r1, #0x3c - bl DivideUInt + bl __udivsi3 str r1, [sp] ldr r1, _02023540 ; =0x02099C34 mov r2, r6 @@ -28094,14 +28094,14 @@ _02023114: _0202313C: ldr r0, [sp, #0xb4] ldr r1, _02023544 ; =0x02099C44 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023180 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag mov r5, r0 ldr r0, [sp, #0xbc] - bl StoiTag__0202090C + bl StoiTag add r1, r8, r5, lsl #2 mov r2, r0 ldr r1, [r1, #0x24] @@ -28112,14 +28112,14 @@ _0202313C: _02023180: ldr r0, [sp, #0xb4] ldr r1, _02023548 ; =0x02099C4C - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020231D8 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag mov r5, r0 ldr r0, [sp, #0xbc] - bl StoiTag__0202090C + bl StoiTag add r1, r8, r5, lsl #2 ldr r3, [r1, #0x24] mov r2, r0 @@ -28135,11 +28135,11 @@ _02023180: _020231D8: ldr r0, [sp, #0xb4] ldr r1, _02023554 ; =0x02099C68 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023214 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r2, r8, r0, lsl #2 ldr r1, [r2, #0x10] ldr r2, [r2, #0x24] @@ -28162,11 +28162,11 @@ _02023214: _0202323C: ldr r0, [sp, #0xb4] ldr r1, _02023558 ; =0x02099C70 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _0202326C ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag ldr r1, [r8, r0, lsl #2] add r0, sp, #0x1c8 bl sub_02024AA8 @@ -28175,11 +28175,11 @@ _0202323C: _0202326C: ldr r0, [sp, #0xb4] ldr r1, _0202355C ; =0x02099C78 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020232A0 ldr r0, [sp, #0xb8] - bl StoiTag__0202090C + bl StoiTag add r0, r8, r0, lsl #2 ldr r1, [r0, #0x10] add r0, sp, #0x1c8 @@ -28232,12 +28232,12 @@ _0202332C: bhi _0202342C ldr r1, _02023560 ; =0x02099A24 add r0, r5, #1 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 bne _02023364 ldr r1, _02023564 ; =0x020999D4 add r0, r5, #1 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _02023390 _02023364: @@ -28255,7 +28255,7 @@ _02023364: _02023390: ldr r1, _02023568 ; =0x02099A28 add r0, r5, #1 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 beq _020233BC ldr r0, [sp, #8] @@ -28267,7 +28267,7 @@ _02023390: _020233BC: ldr r1, _0202356C ; =0x02099A04 add r0, r5, #1 - bl StrcmpTag__020208C8 + bl StrcmpTag cmp r0, #0 ldrne r0, [sp, #4] cmpne r0, #0 @@ -28399,7 +28399,7 @@ SprintfStatic__02023590: ; 0x02023590 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -28427,18 +28427,18 @@ PreprocessStringFromMessageId: ; 0x020235B8 arm_func_start StrcmpTag__020235F8 StrcmpTag__020235F8: ; 0x020235F8 - ldr ip, _02023600 ; =StrcmpTag__020208C8 + ldr ip, _02023600 ; =StrcmpTag bx ip .align 2, 0 -_02023600: .word StrcmpTag__020208C8 +_02023600: .word StrcmpTag arm_func_end StrcmpTag__020235F8 arm_func_start StoiTag__02023604 StoiTag__02023604: ; 0x02023604 - ldr ip, _0202360C ; =StoiTag__0202090C + ldr ip, _0202360C ; =StoiTag bx ip .align 2, 0 -_0202360C: .word StoiTag__0202090C +_0202360C: .word StoiTag arm_func_end StoiTag__02023604 arm_func_start sub_02023610 @@ -28546,7 +28546,7 @@ sub_0202372C: ; 0x0202372C mov r2, r3 bl SprintfStatic__0202378C add r0, sp, #0 - bl Strlen + bl strlen mov r2, r0 cmp r2, r4 movgt r4, r2 @@ -28571,7 +28571,7 @@ SprintfStatic__0202378C: ; 0x0202378C bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -28589,11 +28589,11 @@ sub_020237B4: ; 0x020237B4 mov r2, r3 bl SprintfStatic__0202378C add r0, sp, #0 - bl Strlen + bl strlen mov r5, r0 sub r0, r5, #1 mov r1, #3 - bl DivideInt + bl __divsi3 mov r4, r0 cmp r6, #0 ble _02023810 @@ -28601,7 +28601,7 @@ sub_020237B4: ; 0x020237B4 movgt r6, r5 sub r0, r6, #1 mov r1, #3 - bl DivideInt + bl __divsi3 _02023810: cmp r4, #0 ble _02023888 @@ -28650,7 +28650,7 @@ _02023888: _020238B0: add r1, sp, #0 mov r0, r7 - bl Strcpy + bl strcpy _020238BC: mov r0, r7 add sp, sp, #0x100 @@ -28776,12 +28776,12 @@ _020239D0: _02023A0C: ldr r1, _02023B50 ; =0x022A5048 mov r0, r5 - bl Strcat + bl strcat b _02023A28 _02023A1C: ldr r1, _02023B54 ; =0x022A504C mov r0, r5 - bl Strcat + bl strcat _02023A28: mov r0, r5 ldmia sp!, {r3, r4, r5, pc} @@ -28999,7 +28999,7 @@ _02023D14: bl sub_02024FB8 mov r1, r0 mov r0, r5 - bl Strcpy + bl strcpy mov r0, r5 b _02023D44 _02023D30: @@ -29165,7 +29165,7 @@ _02023F48: bl GetNameString mov r1, r0 add r0, sp, #0x42 - bl Strcpy + bl strcpy _02023F5C: ldrsh r0, [sp, #0x94] cmp r0, #0 @@ -29476,7 +29476,7 @@ _02024338: bl GetDungeonResultString mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} _02024350: @@ -29530,7 +29530,7 @@ _020243D8: _020243E8: mov r0, r4 mov r1, r5 - bl Strcat + bl strcat add r7, r7, #1 _020243F8: cmp r7, r6 @@ -29594,7 +29594,7 @@ _020244A0: _020244B4: mov r0, r4 mov r1, r6 - bl Strcat + bl strcat add r7, r7, #1 _020244C4: cmp r7, r5 @@ -29652,7 +29652,7 @@ _02024564: bl sub_02024FC8 mov r1, r0 mov r0, r5 - bl Strcpy + bl strcpy mov r0, r5 b _02024584 _02024580: @@ -30066,7 +30066,7 @@ sub_02024AA8: ; 0x02024AA8 bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} _02024AE8: @@ -30118,7 +30118,7 @@ sub_02024B48: ; 0x02024B48 bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} _02024B88: @@ -30141,7 +30141,7 @@ sub_02024B94: ; 0x02024B94 bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} _02024BCC: @@ -30318,7 +30318,7 @@ _02024DD4: ldr r1, _02024DF4 ; =0x022A5048 mov r0, r4 add r1, r1, r2, lsl #2 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} _02024DEC: @@ -30329,8 +30329,8 @@ _02024DF4: .word 0x022A5048 _02024DF8: .word 0x02099D50 arm_func_end sub_02024D7C - arm_func_start sub_02024DFC -sub_02024DFC: ; 0x02024DFC + arm_func_start GetBagNameString +GetBagNameString: ; 0x02024DFC stmdb sp!, {r4, lr} mov r4, r0 bl GetCurrentBagCapacity @@ -30346,7 +30346,7 @@ sub_02024DFC: ; 0x02024DFC .align 2, 0 _02024E2C: .word 0x000008E1 _02024E30: .word 0x000008E2 - arm_func_end sub_02024DFC + arm_func_end GetBagNameString arm_func_start sub_02024E34 sub_02024E34: ; 0x02024E34 @@ -30382,7 +30382,7 @@ _02024E98: bl GetStringFromFileVeneer ldr r1, _02024FA4 ; =0x02099E18 mov r0, sl - bl Strcat + bl strcat cmp r5, #0 beq _02024F78 bl GetGameMode @@ -30400,7 +30400,7 @@ _02024ED0: bne _02024EF4 ldr r1, _02024FA4 ; =0x02099E18 mov r0, sl - bl Strcat + bl strcat _02024EF4: cmp r7, r4 beq _02024F6C @@ -30432,7 +30432,7 @@ _02024F2C: bl SprintfStatic__0202378C mov r0, sl add r1, sp, #0x44 - bl Strcat + bl strcat _02024F6C: ldrsh r0, [sb] cmp r0, r4 @@ -30440,7 +30440,7 @@ _02024F6C: _02024F78: ldr r1, _02024FB4 ; =0x02099E40 mov r0, sl - bl Strcat + bl strcat mov r0, sl add sp, sp, #0x44 add sp, sp, #0x400 @@ -31251,7 +31251,7 @@ sub_020258E4: ; 0x020258E4 bl GetStringFromFile add r1, sp, #0 mov r0, r4 - bl Strcpy + bl strcpy add sp, sp, #0x400 ldmia sp!, {r4, pc} arm_func_end sub_020258E4 @@ -31267,7 +31267,7 @@ CopyStringFromMessageId: ; 0x0202590C add r1, sp, #0 mov r0, r5 mov r2, r4 - bl Strncpy + bl strncpy add sp, sp, #0x400 ldmia sp!, {r3, r4, r5, pc} arm_func_end CopyStringFromMessageId @@ -31398,7 +31398,7 @@ sub_02025AD8: ; 0x02025AD8 ldr r1, _02025B6C ; =0x0209ABF0 add r0, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, [sp] ldr r2, _02025B70 ; =0x022A7A54 add r3, r0, #4 @@ -31407,7 +31407,7 @@ sub_02025AD8: ; 0x02025AD8 ldr r1, _02025B74 ; =0x0209AC04 add r0, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, [sp] ldr r2, _02025B70 ; =0x022A7A54 add r3, r0, #4 @@ -31416,7 +31416,7 @@ sub_02025AD8: ; 0x02025AD8 ldr r1, _02025B78 ; =0x0209AC18 add r0, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, [sp] ldr r1, _02025B7C ; =0x020AFD04 mov r2, #0 @@ -31456,7 +31456,7 @@ sub_02025B90: ; 0x02025B90 ldr r2, [r1, r4, lsl #2] ldr r1, _02025C04 ; =0x0209AC2C add r0, sp, #0 - bl Sprintf + bl sprintf add r0, sp, #0 bl sub_02027274 ldr r0, _02025C08 ; =0x020AFD04 @@ -31467,11 +31467,11 @@ sub_02025B90: ; 0x02025B90 add r0, sp, #0 ldr r2, [r1, r4, lsl #2] ldr r1, _02025C04 ; =0x0209AC2C - bl Sprintf + bl sprintf ldr r0, _02025C10 ; =0x020AFD14 add r1, sp, #0 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02025C08 ; =0x020AFD04 ldr r1, [r0, #0x10] str r1, [r0, #0xc] @@ -33000,7 +33000,7 @@ sub_02026E78: ; 0x02026E78 mov r1, #0 mov r2, #0x1180 strb r4, [r3, #2] - bl Memset + bl memset mov r7, #0 ldr r0, _02026FF4 ; =0x022A7A6C mvn r5, #1 @@ -33077,8 +33077,8 @@ _02026EB0: strh r2, [r0, #8] strh r2, [r0, #0xa] strb r1, [r0, #3] - bl sub_0202950C - bl sub_02029EE8 + bl LoadCursors + bl LoadAlert bl sub_0202A124 mov r2, #0 ldr r1, _02026FF4 ; =0x022A7A6C @@ -33273,7 +33273,7 @@ sub_02027228: ; 0x02027228 add r0, sp, #0 ldr r1, [r1, r2] mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp] ldr r2, [sp, #4] ldr r0, _02027270 ; =0x0620C000 @@ -33294,7 +33294,7 @@ sub_02027274: ; 0x02027274 mov r1, r0 add r0, sp, #0xc mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r7, [sp, #0xc] ldr r3, _0202736C ; =0x0209AC50 add r2, sp, #0 @@ -33380,7 +33380,7 @@ sub_02027390: ; 0x02027390 mov sl, r0 add r0, sp, #0x10 mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r8, [sp, #0x10] ldr r3, _020275A0 ; =0x0209AC54 add r2, sp, #0 @@ -33445,7 +33445,7 @@ _02027428: add r0, sp, #0x10 ldr r1, [r1, r2] mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom mov r5, #0 ldr r6, [sp, #0x10] ldr r3, _020275B4 ; =0x0209AC4C @@ -33698,7 +33698,7 @@ _02027704: mvn r1, #0 add r0, r5, #0x34 str r1, [r5, #0xb8] - bl sub_0201E730 + bl InitRender3dElement mov r1, #2 strb r1, [r5, #0x70] mov r0, #9 @@ -33711,7 +33711,7 @@ _02027704: mov r1, #0x90 add r0, r5, #0x74 strb r1, [r5, #0x63] - bl sub_0201E730 + bl InitRender3dElement ldr r0, _020278A4 ; =0x022A7A6C mov r1, #0 ldrh r3, [r0, #0x48] @@ -33967,7 +33967,7 @@ sub_02027B1C: ; 0x02027B1C ldr r0, [r0, r2] ldr r2, [r1, r2] mov r1, #0 - bl Memset + bl memset mov r0, r4 bl sub_02027AF0 ldmia sp!, {r4, pc} @@ -33984,13 +33984,13 @@ sub_02027B58: ; 0x02027B58 ldr r1, _02027B80 ; =0x022A88F8 ldr r0, [r0, r2] ldr r2, [r1, r2] - ldr ip, _02027B84 ; =Memset + ldr ip, _02027B84 ; =memset mov r1, #0 bx ip .align 2, 0 _02027B7C: .word 0x022A88F0 _02027B80: .word 0x022A88F8 -_02027B84: .word Memset +_02027B84: .word memset arm_func_end sub_02027B58 arm_func_start sub_02027B88 @@ -35948,7 +35948,7 @@ sub_02029478: ; 0x02029478 mov r2, #0 mov r3, #0x3f8 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl b _020294FC _020294D0: mov r0, #0xe @@ -35961,7 +35961,7 @@ _020294D0: mov r2, #0 mov r3, #0x7c str ip, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl _020294FC: add sp, sp, #0x10 ldmia sp!, {r3, pc} @@ -35970,14 +35970,14 @@ _02029504: .word 0x022AAC80 _02029508: .word 0x022AACFC arm_func_end sub_02029478 - arm_func_start sub_0202950C -sub_0202950C: ; 0x0202950C + arm_func_start LoadCursors +LoadCursors: ; 0x0202950C stmdb sp!, {r3, lr} sub sp, sp, #0x10 ldr r0, _02029654 ; =0x022AAC68 mov r1, #0 mov r2, #0x15 - bl Memset + bl memset ldr r0, _02029658 ; =0x020AFC68 ldr r1, _0202965C ; =0x0209ADF0 ldr r0, [r0] @@ -36013,7 +36013,7 @@ sub_0202950C: ; 0x0202950C ldr r0, _02029668 ; =0x022AAC80 ldr r1, _02029660 ; =0x022AAC64 ldrsh r1, [r1, #2] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #0xf str r0, [sp] mov r0, #4 @@ -36025,7 +36025,7 @@ sub_0202950C: ; 0x0202950C ldr r0, _02029668 ; =0x022AAC80 mov r2, r1 mov r3, #0x3f8 - bl sub_0201C2CC + bl SetAnimationForAnimationControl mov r1, #0 ldr r0, _02029668 ; =0x022AAC80 strh r1, [r0, #0x38] @@ -36035,7 +36035,7 @@ sub_0202950C: ; 0x0202950C ldr r0, _0202966C ; =0x022AACFC ldr r1, _02029660 ; =0x022AAC64 ldrsh r1, [r1] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #0xe str r0, [sp] mov r0, #4 @@ -36047,7 +36047,7 @@ sub_0202950C: ; 0x0202950C mov r1, #0 mov r2, r1 mov r3, #0x7c - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _0202966C ; =0x022AACFC mov r1, #0 strh r1, [r0, #0x38] @@ -36062,7 +36062,7 @@ _02029660: .word 0x022AAC64 _02029664: .word 0x0209AE08 _02029668: .word 0x022AAC80 _0202966C: .word 0x022AACFC - arm_func_end sub_0202950C + arm_func_end LoadCursors arm_func_start sub_02029670 sub_02029670: ; 0x02029670 @@ -36689,8 +36689,8 @@ Arm9StoreUnkFieldNa0x2029ED8: ; 0x02029ED8 _02029EE4: .word 0x022AAC68 arm_func_end Arm9StoreUnkFieldNa0x2029ED8 - arm_func_start sub_02029EE8 -sub_02029EE8: ; 0x02029EE8 + arm_func_start LoadAlert +LoadAlert: ; 0x02029EE8 stmdb sp!, {r3, lr} sub sp, sp, #0x10 ldr r0, _02029F74 ; =0x020AFC68 @@ -36705,7 +36705,7 @@ sub_02029EE8: ; 0x02029EE8 ldr r1, _02029F7C ; =0x022AAD78 ldr r0, _02029F80 ; =0x022AAD7C ldrsh r1, [r1] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r1, #0 mov r0, #0xd stmia sp, {r0, r1} @@ -36715,7 +36715,7 @@ sub_02029EE8: ; 0x02029EE8 mov r2, r1 mov r3, #0x3e4 str r1, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _02029F80 ; =0x022AAD7C mov r1, #0 strh r1, [r0, #0x38] @@ -36732,7 +36732,7 @@ _02029F78: .word 0x0209AE20 _02029F7C: .word 0x022AAD78 _02029F80: .word 0x022AAD7C _02029F84: .word 0x020AFDA0 - arm_func_end sub_02029EE8 + arm_func_end LoadAlert arm_func_start sub_02029F88 sub_02029F88: ; 0x02029F88 @@ -36890,7 +36890,7 @@ _0202A160: ldr r0, [r8] add r0, r0, r6 add r0, r0, #4 - bl sub_0201E730 + bl InitRender3dElement ldr r0, [r8] mov ip, #4 strb r4, [r0, r6] @@ -36949,7 +36949,7 @@ sub_0202A1D4: ; 0x0202A1D4 add r4, r3, r1 add r0, r4, #4 strb r2, [r3, r1] - bl sub_0201E730 + bl InitRender3dElement mov r0, #2 mov r3, r5 strb r0, [r4, #0x40] @@ -37076,8 +37076,8 @@ _0202A3C8: _0202A3E0: .word 0x020AFDA8 arm_func_end sub_0202A388 - arm_func_start sub_0202A3E4 -sub_0202A3E4: ; 0x0202A3E4 + arm_func_start PrintClearMark +PrintClearMark: ; 0x0202A3E4 stmdb sp!, {r3, lr} mov lr, r1 mov ip, r2 @@ -37088,7 +37088,7 @@ sub_0202A3E4: ; 0x0202A3E4 mov r0, #0 bl sub_0202A45C ldmia sp!, {r3, pc} - arm_func_end sub_0202A3E4 + arm_func_end PrintClearMark arm_func_start sub_0202A40C sub_0202A40C: ; 0x0202A40C @@ -37306,7 +37306,7 @@ _0202A6B8: b _0202A6FC _0202A6E4: mov r0, r5 - bl Strcpy + bl strcpy ldr r0, [r6, #4] add r6, r6, #8 str r0, [r5, #0x100] @@ -37536,7 +37536,7 @@ _0202A9D8: b _0202AA10 _0202A9F8: mov r0, r6 - bl Strcpy + bl strcpy ldr r0, [sb, #4] add sb, sb, #8 str r0, [r6, #0x100] @@ -42202,7 +42202,7 @@ _0202E80C: _0202E850: add r0, r3, #0x1400 add r1, r6, #0xc - bl Strcpy + bl strcpy _0202E85C: ldr r0, [r5, #0xfc] ldr r1, _0202EE80 ; =0x000001AF @@ -43344,7 +43344,7 @@ _0202F778: cmp r0, #0 bne _0202F86C mov r0, ip - bl sub_0204D89C + bl IsValidPortrait cmp r0, #0 beq _0202F854 add r0, r4, #8 @@ -44305,7 +44305,7 @@ _020303C4: add r2, r1, r8 mov r1, r8 sub r0, r2, r0 - bl DivideInt + bl __divsi3 add r1, r6, #0x600 strh r0, [r1, #0x4a] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -45915,10 +45915,10 @@ sub_020318D0: ; 0x020318D0 arm_func_start sub_02031908 sub_02031908: ; 0x02031908 - ldr ip, _02031910 ; =KeyWaitInit__02006DA4 + ldr ip, _02031910 ; =KeyWaitInit bx ip .align 2, 0 -_02031910: .word KeyWaitInit__02006DA4 +_02031910: .word KeyWaitInit arm_func_end sub_02031908 arm_func_start sub_02031914 @@ -46992,11 +46992,11 @@ sub_02032684: ; 0x02032684 cmp r4, r0 subge r4, r0, #1 mov r0, r4 - bl DivideInt + bl __divsi3 str r0, [r5, #0xc8] ldr r1, [r5, #0xc4] mov r0, r4 - bl DivideInt + bl __divsi3 mov r0, r5 str r1, [r5, #0xbc] bl sub_02032754 @@ -47052,7 +47052,7 @@ sub_02032754: ; 0x02032754 ldr r0, [r4, #0xd0] add r0, r0, r1 sub r0, r0, #1 - bl DivideInt + bl __divsi3 str r0, [r4, #0xcc] ldr r1, [r4, #0xc8] sub r0, r0, #1 @@ -47159,7 +47159,7 @@ sub_02032894: ; 0x02032894 ble _020328B4 mov r0, r1, lsl #8 ldr r1, [r4, #0xc4] - bl DivideInt + bl __divsi3 b _020328D0 _020328B4: ldr r0, [r4, #0xb4] @@ -47168,7 +47168,7 @@ _020328B4: sub r0, r1, r0 ldr r1, [r4, #0xc4] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 _020328D0: str r0, [r4, #0xb8] ldmia sp!, {r4, pc} @@ -47832,21 +47832,21 @@ _02033140: sub r5, r1, #1 ldr r1, [r4, #0xc4] mov r0, r5 - bl DivideInt + bl __divsi3 str r0, [r4, #0xc8] ldr r1, [r4, #0xc4] mov r0, r5 - bl DivideInt + bl __divsi3 str r1, [r4, #0xbc] b _02033188 _02033168: ldr r1, [r4, #0xc4] mov r0, r5 - bl DivideInt + bl __divsi3 str r0, [r4, #0xc8] ldr r1, [r4, #0xc4] mov r0, r5 - bl DivideInt + bl __divsi3 str r1, [r4, #0xbc] _02033188: mov r0, r4 @@ -47886,7 +47886,7 @@ sub_020331D4: ; 0x020331D4 ldr r0, [r4, #0xd0] add r0, r0, r1 sub r0, r0, #1 - bl DivideInt + bl __divsi3 str r0, [r4, #0xcc] ldrb r0, [r4, #0xd5] cmp r0, #0 @@ -47985,7 +47985,7 @@ sub_0203330C: ; 0x0203330C ble _0203332C mov r0, r1, lsl #8 ldr r1, [r4, #0xc4] - bl DivideInt + bl __divsi3 b _02033348 _0203332C: ldr r0, [r4, #0xb4] @@ -47994,7 +47994,7 @@ _0203332C: sub r0, r1, r0 ldr r1, [r4, #0xc4] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 _02033348: str r0, [r4, #0xb8] ldmia sp!, {r4, pc} @@ -50062,7 +50062,7 @@ sub_02034F20: ; 0x02034F20 strh r6, [r2, #0x14] ldr r0, [r0, #0xc] add r0, r0, #0x68 - bl Strcpy + bl strcpy ldr r0, _02034F90 ; =0x020AFDBC mov r1, r4 ldr r0, [r0, #0xc] @@ -50487,7 +50487,7 @@ _020354F8: beq _0203558C ldr r0, _02035598 ; =0x020AFDBC ldr r0, [r0, #0xc] - bl sub_0204D89C + bl IsValidPortrait cmp r0, #0 beq _02035544 ldr r0, _02035598 ; =0x020AFDBC @@ -51521,7 +51521,7 @@ sub_02036358: ; 0x02036358 str r0, [r1, #8] _0203638C: and r0, r5, #0xff - bl GetDebugFlag1 + bl GetDebugFlag ldr r1, [r4, #4] add r1, r1, r5 add r5, r5, #1 @@ -51636,7 +51636,7 @@ _02036514: and r0, r5, #0xff add r1, r1, r5 ldrb r1, [r1, #0xa4] - bl SetDebugFlag1 + bl SetDebugFlag add r5, r5, #1 cmp r5, #0xc blt _02036514 @@ -51695,7 +51695,7 @@ sub_020365A0: ; 0x020365A0 str r0, [r1, #8] _020365D4: and r0, r5, #0xff - bl GetDebugFlag2 + bl GetDebugLogFlag ldr r1, [r4, #4] add r1, r1, r5 add r5, r5, #1 @@ -51810,7 +51810,7 @@ _0203675C: and r0, r5, #0xff add r1, r1, r5 ldrb r1, [r1, #0xa4] - bl SetDebugFlag2 + bl SetDebugLogFlag add r5, r5, #1 cmp r5, #0x10 blt _0203675C @@ -52244,7 +52244,7 @@ _02036D70: ldrb r5, [r4, #0x1c] mov r1, #0x12 mov r0, r5 - bl DivideInt + bl __divsi3 mov r1, #0x12 mul r1, r0, r1 ldr r0, _02037448 ; =0x0209B3B4 @@ -53542,7 +53542,7 @@ SprintfStatic__02037F30: ; 0x02037F30 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -53642,7 +53642,7 @@ _02038090: ; jump table _020380A8: mov r0, r6 mov r1, #0x12 - bl DivideInt + bl __divsi3 cmp r1, #5 ble _020380D0 cmp r1, #0xc @@ -53688,7 +53688,7 @@ _02038148: cmp r5, #0x20 mov r1, #0x11 moveq r5, #0 - bl DivideInt + bl __divsi3 cmp r1, #5 blt _02038178 cmp r1, #0xc @@ -53744,7 +53744,7 @@ _020381FC: mov r5, r0 mov r0, r6 mov r1, #0x12 - bl DivideInt + bl __divsi3 mov r1, #0x44 str r1, [sp] mov r1, #0x12 @@ -53811,7 +53811,7 @@ _02038314: mov r2, r0 ldr r1, _020383F8 ; =0x0209B4C0 add r0, sp, #0x12 - bl Sprintf + bl sprintf _02038328: ldr r1, [fp] ldr r3, _020383EC ; =0x0209B2C4 @@ -54502,7 +54502,7 @@ _02038C5C: movge sb, #0xe9 mov r0, sb mov r1, #0xd - bl DivideInt + bl __divsi3 add r1, r5, #0x1e mov r6, r0 cmp r8, r1 @@ -54526,7 +54526,7 @@ _02038CA0: _02038CCC: mov r0, sb mov r1, #0xd - bl DivideInt + bl __divsi3 add r1, r5, #0x24 mov r6, r0 cmp r8, r1 @@ -54747,11 +54747,11 @@ _02038FB8: movge r8, #0xb0 sub r0, r8, #0x63 mov r1, #0xd - bl DivideInt + bl __divsi3 mov r4, r0 sub r0, sb, #0x23 mov r1, #0xf - bl DivideInt + bl __divsi3 mov r1, #6 ldr r2, _02039068 ; =0x020AFDF0 mla r0, r1, r0, r4 @@ -55068,7 +55068,7 @@ SprintfStatic__02039438: ; 0x02039438 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -55255,11 +55255,11 @@ sub_02039680: ; 0x02039680 _020396B0: mov r0, sb mov r1, r5 - bl DivideInt + bl __divsi3 str r1, [sl, r7, lsl #2] mov r0, sb mov r1, r4 - bl DivideInt + bl __divsi3 mov sb, r0 add r7, r7, #1 _020396D4: @@ -55560,7 +55560,7 @@ sub_020399FC: ; 0x020399FC subge r5, r8, #1 sub r0, r8, r5 mov r1, #0xc - bl DivideInt + bl __divsi3 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _02039B08: .word 0x0000FFFF @@ -56625,7 +56625,7 @@ SprintfStatic__0203A970: ; 0x0203A970 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -59438,13 +59438,13 @@ _0203CD8C: bl InitPortraitBoxWithMonsterId add r0, sp, #0 mov r1, #2 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r1, _0203CE18 ; =0x0209C7CC add r0, sp, #0 - bl SetPortraitAttrStruct + bl SetPortraitOffset add r0, sp, #0 mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0203CE04 ; =0x020AFE70 add r1, sp, #0 ldr r0, [r0] @@ -59584,7 +59584,7 @@ SprintfStatic__0203CFA4: ; 0x0203CFA4 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -59805,7 +59805,7 @@ _0203D098: ldrsh r0, [sp, #0x42] mov r1, #0xa str r0, [sp, #0xa0] - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 movs r0, r0, asr #0x10 movmi r0, #0 @@ -60905,7 +60905,7 @@ _0203E2C4: mov r1, #0 strh r0, [sp, #0x20] strb r1, [sp, #0x1c] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _0203E44C ldrsh r0, [sp, #0x20] @@ -61517,7 +61517,7 @@ _0203EBB4: beq _0203EF9C add r0, sp, #0xcc bl InitPreprocessorArgs - bl sub_02050C74 + bl GetRank ldr r1, _0203E4B0 ; =0x020AFE74 ldr r2, [r1] strb r0, [r2, #0xc] @@ -61545,7 +61545,7 @@ _0203EC28: beq _0203EF9C ldr r0, _0203E4B0 ; =0x020AFE74 ldr r4, [r0] - bl sub_02050C74 + bl GetRank ldrb r1, [r4, #0xc] cmp r1, r0 movne r0, #0x42 @@ -61562,7 +61562,7 @@ _0203EC5C: ldr r0, [r0] ldrb r0, [r0, #0xc] str r0, [sp, #0x94] - bl sub_02050C74 + bl GetRank str r0, [sp, #0x98] ldr r0, _0203E4B8 ; =0x0000101C ldr r1, _0203EFCC ; =0x000002A2 @@ -61590,7 +61590,7 @@ _0203ECC4: bl GetRankUpEntry ldr r0, [r0, #8] str r0, [sp, #0x50] - bl sub_02050C74 + bl GetRank bl GetRankUpEntry ldr r1, [r0, #8] ldr r0, [sp, #0x50] @@ -61619,7 +61619,7 @@ _0203ED34: strne r1, [r0] b _0203EF9C _0203ED50: - bl sub_02050C74 + bl GetRank bl GetRankUpEntry ldrsh r0, [r0, #0xc] strh r0, [r4, #0x88] @@ -61632,7 +61632,7 @@ _0203ED50: str r1, [r0] b _0203EF9C _0203ED80: - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _0203EDFC ldrsh r0, [r4, #0x88] @@ -61981,7 +61981,7 @@ _0203F1FC: str ip, [r3, #8] ldr r0, [r0] add r0, r0, #0x64 - bl Memcpy + bl memcpy ldr r0, _0203F340 ; =0x020AFE78 ldr r1, _0203F348 ; =0x00000975 ldr r3, [r0] @@ -62540,11 +62540,11 @@ sub_0203F9CC: ; 0x0203F9CC ldr r4, [r5, #0xb4] ldr r0, _0203FA54 ; =0x022AAE00 mov r1, r4 - bl ov29_02300164 + bl GetMonsterName ldr r0, _0203FA58 ; =0x022AAE2A add r1, r4, #0x124 mov r2, #0x22 - bl Memcpy + bl memcpy ldrb r2, [r4, #7] ldr r1, _0203FA50 ; =0x022AADFC mov r0, #0 @@ -62795,7 +62795,7 @@ sub_0203FD44: ; 0x0203FD44 ldr r1, _0203FD74 ; =0x022AAE2A add r0, r4, #0x124 mov r2, #0x22 - bl Memcpy + bl memcpy ldr r1, _0203FD78 ; =0x022AADFC ldr r0, _0203FD7C ; =0x020AFE7C ldrb r1, [r1, #0x2c] @@ -63424,7 +63424,7 @@ _020405D8: ldr r0, [r4, #8] add r0, r0, #0xe0 add r0, r0, r8, lsl #7 - bl Strcpy + bl strcpy ldr r3, [r4, #8] add r0, r8, #1 add r1, r3, #0xe0 @@ -63479,7 +63479,7 @@ _02040634: ldr r0, [r2, #8] add r0, r0, #0xe0 add r0, r0, r8, lsl #7 - bl Strcpy + bl strcpy ldr r1, _020407AC ; =0x020AFE7C add r0, r8, #1 ldr r4, [r1, #8] @@ -64777,7 +64777,7 @@ SprintfStatic__0204174C: ; 0x0204174C bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -64821,7 +64821,7 @@ sub_020417A8: ; 0x020417A8 ldr r0, [r0] mov r2, #8 add r0, r0, #8 - bl Memcpy + bl memcpy add r5, r4, #1 mov r4, #1 mov sb, #8 @@ -64839,7 +64839,7 @@ _02041808: add r0, r0, #8 add r0, r0, r4, lsl #3 add r1, r7, r1 - bl Memcpy + bl memcpy add r4, r4, #1 _0204183C: add r5, r5, #1 @@ -64867,7 +64867,7 @@ sub_02041860: ; 0x02041860 ldr r0, [r0] mov r2, #8 add r0, r0, #8 - bl Memcpy + bl memcpy ldr r0, _020418A0 ; =0x020AFE8C mov r1, #1 ldr r0, [r0] @@ -65530,17 +65530,17 @@ _020421B4: _020421BC: ldr r1, _0204224C ; =0x0209C9CC add r0, sp, #0x44 - bl Strcpy + bl strcpy b _020421E8 _020421CC: ldr r1, _02042250 ; =0x0209C9D4 add r0, sp, #0x44 - bl Strcpy + bl strcpy b _020421E8 _020421DC: ldr r1, _02042254 ; =0x0209C9DC add r0, sp, #0x44 - bl Strcpy + bl strcpy _020421E8: ldr r1, _02042248 ; =0x020AFE90 mov r0, r5 @@ -65553,7 +65553,7 @@ _020421E8: bl CopyStringFromMessageId add r0, sp, #0x44 add r1, sp, #4 - bl Strcat + bl strcat ldr r1, _02042248 ; =0x020AFE90 mov r0, r4 ldr r2, [r1, #4] @@ -65712,7 +65712,7 @@ _0204243C: mov r0, r0, asr #0x10 bl GetItemAtIdx ldrsh r0, [r0, #4] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 ldrne r0, [r4, #8] movne r5, r6 @@ -65751,7 +65751,7 @@ _020424CC: mov r0, r0, asr #0x10 bl GetItemAtIdx ldrsh r0, [r0, #4] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _02042560 ldr r0, _02042618 ; =0x020AFEA8 @@ -65796,7 +65796,7 @@ _02042570: mov r0, r0, asr #0x10 bl GetItemAtIdx ldrsh r0, [r0, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _020425CC ldr r0, _02042618 ; =0x020AFEA8 @@ -66020,7 +66020,7 @@ _02042808: mov r0, r0, asr #0x10 bl GetItemAtIdx ldrsh r0, [r0, #4] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _02042890 _0204284C: @@ -66063,7 +66063,7 @@ _020428C0: b _02042A3C _020428D4: ldrsh r0, [sp, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _020429A4 mov r7, #3 @@ -66189,7 +66189,7 @@ SprintfStatic__02042A84: ; 0x02042A84 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -68986,7 +68986,7 @@ _02044EC4: bne _02044EE8 ldr r1, _020451A8 ; =0x0209CBA8 mov r0, r4 - bl Strcpy + bl strcpy b _020450A8 _02044EE8: ldr r0, _020451A0 ; =0x02353538 @@ -69011,7 +69011,7 @@ _02044EE8: mov r0, #0x68 smlabb r0, r1, r0, r2 ldrsh r0, [r0, #8] - bl CheckTeamMemberIdx__02056228 + bl CheckTeamMemberIdx cmp r0, #0 ldrsh r1, [r8, #0x12] ldrsh r0, [r8, #0x16] @@ -69028,7 +69028,7 @@ _02044EE8: bgt _02044F8C ldr r1, _020451B0 ; =0x0209CBB0 mov r0, r4 - bl Strcpy + bl strcpy b _020450A8 _02044F8C: ldr r2, _020451A4 ; =0x000003E7 @@ -69042,7 +69042,7 @@ _02044F8C: bgt _02044FC0 ldr r1, _020451B4 ; =0x0209CBB8 mov r0, r4 - bl Strcpy + bl strcpy b _020450A8 _02044FC0: ldr r2, _020451A4 ; =0x000003E7 @@ -69056,11 +69056,11 @@ _02044FC0: mov r0, r4 bgt _02044FF4 ldr r1, _020451B8 ; =0x0209CBC0 - bl Strcpy + bl strcpy b _020450A8 _02044FF4: ldr r1, _020451BC ; =0x0209CBC8 - bl Strcpy + bl strcpy b _020450A8 _02045000: add r1, r1, r0 @@ -69075,7 +69075,7 @@ _02045000: bgt _02045038 ldr r1, _020451C0 ; =0x0209CBD0 mov r0, r4 - bl Strcpy + bl strcpy b _020450A8 _02045038: ldr r2, _020451A4 ; =0x000003E7 @@ -69089,7 +69089,7 @@ _02045038: bgt _0204506C ldr r1, _020451C4 ; =0x0209CBD8 mov r0, r4 - bl Strcpy + bl strcpy b _020450A8 _0204506C: ldr r2, _020451A4 ; =0x000003E7 @@ -69103,11 +69103,11 @@ _0204506C: mov r0, r4 bgt _020450A0 ldr r1, _020451C8 ; =0x0209CBE0 - bl Strcpy + bl strcpy b _020450A8 _020450A0: ldr r1, _020451A8 ; =0x0209CBA8 - bl Strcpy + bl strcpy _020450A8: str r4, [sl, #0x578] ldr r0, [r5] @@ -72256,7 +72256,7 @@ sub_02047A10: ; 0x02047A10 mov r1, r6 add r0, r0, r0, lsl #7 add r0, r2, r0 - bl Strcpy + bl strcpy str r5, [sp] add r0, r4, #0x1f00 ldrsh r1, [r0, #0x70] @@ -72624,7 +72624,7 @@ sub_02047F38: ; 0x02047F38 mov r1, #0x3c mov r8, r2 mov r7, r3 - bl DivideInt + bl __divsi3 mov r1, r1, lsl #0x10 mov r2, #0 mov r0, r6 @@ -72653,7 +72653,7 @@ _02047FB4: mov r0, r0, lsl #0x10 mov r1, fp mov r0, r0, asr #0x10 - bl DivideInt + bl __divsi3 add r0, r5, #1 mov r2, r0, lsl #0x10 mov r0, r1, lsl #0x10 @@ -72865,7 +72865,7 @@ sub_02048240: ; 0x02048240 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} add r0, r0, #0x31c0 mov r8, #0 - bl Strcpy + bl strcpy ldr r4, _02048334 ; =0x020AFEF4 mov r7, r8 mov r6, #0x400 @@ -72900,11 +72900,11 @@ _02048284: ldr r1, _02048338 ; =0x0209CCE0 mov r2, #3 add r0, r0, r8 - bl Strncmp + bl strncmp cmp r0, #0 bne _02048310 ldr r0, _02048338 ; =0x0209CCE0 - bl Strlen + bl strlen add r8, r8, r0 b _0204831C _02048310: @@ -73280,7 +73280,7 @@ _02048720: arm_func_start sub_0204872C sub_0204872C: ; 0x0204872C stmdb sp!, {r3, lr} - bl EventFlagBackup__0204C1E4 + bl EventFlagBackup mov r0, #2 bl SetBothScreensWindowsColor mov r0, #0 @@ -73294,10 +73294,10 @@ sub_0204872C: ; 0x0204872C arm_func_start EventFlagBackup__02048758 EventFlagBackup__02048758: ; 0x02048758 - ldr ip, _02048760 ; =EventFlagBackup__0204C1E4 + ldr ip, _02048760 ; =EventFlagBackup bx ip .align 2, 0 -_02048760: .word EventFlagBackup__0204C1E4 +_02048760: .word EventFlagBackup arm_func_end EventFlagBackup__02048758 arm_func_start sub_02048764 @@ -73641,13 +73641,13 @@ _02048BB0: .word 0x022AAE70 arm_func_start ReadStringSave ReadStringSave: ; 0x02048BB4 ldr r1, _02048BC8 ; =0x020AFF38 - ldr ip, _02048BCC ; =Strncpy + ldr ip, _02048BCC ; =strncpy mov r2, #0x20 ldr r1, [r1] bx ip .align 2, 0 _02048BC8: .word 0x020AFF38 -_02048BCC: .word Strncpy +_02048BCC: .word strncpy arm_func_end ReadStringSave arm_func_start CheckStringSave @@ -73656,7 +73656,7 @@ CheckStringSave: ; 0x02048BD0 ldr r1, _02048BF8 ; =0x020AFF38 mov r2, #0x20 ldr r1, [r1] - bl Strncmp + bl strncmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -73742,7 +73742,7 @@ _02048CB4: .word 0x000F1206 sub_02048CB8: ; 0x02048CB8 stmdb sp!, {r3, lr} mov r0, #9 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _02048CE4 ldr r1, _02048CF0 ; =0x022AAE74 @@ -73915,7 +73915,7 @@ ReadSaveFile: ; 0x02048ED0 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, r4 - bl CheckChecksum + bl CheckChecksumInvalid cmp r0, #0 movne r0, #2 moveq r0, #0 @@ -73938,8 +73938,8 @@ _02048F3C: bx lr arm_func_end CalcChecksum - arm_func_start CheckChecksum -CheckChecksum: ; 0x02048F4C + arm_func_start CheckChecksumInvalid +CheckChecksumInvalid: ; 0x02048F4C mov r3, #0 mov ip, #1 b _02048F64 @@ -73956,7 +73956,7 @@ _02048F64: moveq r0, #0 and r0, r0, #0xff bx lr - arm_func_end CheckChecksum + arm_func_end CheckChecksumInvalid arm_func_start NoteSaveBase NoteSaveBase: ; 0x02048F84 @@ -74056,8 +74056,8 @@ _0204900C: bl GetTime mov r1, r7 mov r7, r0 - bl SubtractFloat - bl FloatToDouble + bl __subsf3 + bl __extendsfdf2 mov r3, r0 mov r2, r1 ldr r0, _0204923C ; =0x0209CD84 @@ -74114,8 +74114,8 @@ _020491A8: _020491C4: bl GetTime mov r1, r7 - bl SubtractFloat - bl FloatToDouble + bl __subsf3 + bl __extendsfdf2 mov r3, r0 mov r2, r1 ldr r0, _02049244 ; =0x0209CD94 @@ -77455,10 +77455,10 @@ _0204BD08: mov r0, r1 b _0204BD88 _0204BD14: - bl DivideInt + bl __divsi3 b _0204BD88 _0204BD1C: - bl DivideInt + bl __divsi3 mov r0, r1 b _0204BD88 _0204BD28: @@ -77825,8 +77825,8 @@ sub_0204BFC0: ; 0x0204BFC0 _0204C1E0: .word 0x0209CF64 arm_func_end sub_0204BFC0 - arm_func_start EventFlagBackup__0204C1E4 -EventFlagBackup__0204C1E4: ; 0x0204C1E4 + arm_func_start EventFlagBackup +EventFlagBackup: ; 0x0204C1E4 stmdb sp!, {r4, lr} bl GetGameMode cmp r0, #1 @@ -77965,13 +77965,13 @@ EventFlagBackup__0204C1E4: ; 0x0204C1E4 ldmia sp!, {r4, pc} .align 2, 0 _0204C404: .word 0x0209CF84 - arm_func_end EventFlagBackup__0204C1E4 + arm_func_end EventFlagBackup arm_func_start DumpScriptVariableValues DumpScriptVariableValues: ; 0x0204C408 stmdb sp!, {r4, lr} mov r4, r0 - bl EventFlagBackup__0204C1E4 + bl EventFlagBackup ldr r1, _0204C42C ; =0x022AB0AC mov r0, r4 mov r2, #0x400 @@ -78578,8 +78578,8 @@ _0204CB70: ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0204CB2C - arm_func_start GetScenarioBalance__0204CB94 -GetScenarioBalance__0204CB94: ; 0x0204CB94 + arm_func_start GetScenarioBalance +GetScenarioBalance: ; 0x0204CB94 stmdb sp!, {r3, lr} mov r0, #0 mov r1, #0x49 @@ -78603,7 +78603,7 @@ _0204CBD8: moveq r0, #1 movne r0, #3 ldmia sp!, {r3, pc} - arm_func_end GetScenarioBalance__0204CB94 + arm_func_end GetScenarioBalance arm_func_start sub_0204CBE8 sub_0204CBE8: ; 0x0204CBE8 @@ -79524,8 +79524,8 @@ CopyProgressInfoFromScratchFrom: ; 0x0204D748 ldmia sp!, {r3, pc} arm_func_end CopyProgressInfoFromScratchFrom - arm_func_start sub_0204D780 -sub_0204D780: ; 0x0204D780 + arm_func_start InitKaomadoStream +InitKaomadoStream: ; 0x0204D780 stmdb sp!, {r3, lr} bl DataTransferInit ldr r0, _0204D798 ; =0x022AB4B0 @@ -79534,7 +79534,7 @@ sub_0204D780: ; 0x0204D780 ldmia sp!, {r3, pc} .align 2, 0 _0204D798: .word 0x022AB4B0 - arm_func_end sub_0204D780 + arm_func_end InitKaomadoStream arm_func_start InitPortraitBox InitPortraitBox: ; 0x0204D79C @@ -79566,16 +79566,16 @@ InitPortraitBoxWithMonsterId: ; 0x0204D7D4 ldmia sp!, {r3, r4, r5, pc} arm_func_end InitPortraitBoxWithMonsterId - arm_func_start SetPortraitExpressionId -SetPortraitExpressionId: ; 0x0204D7F4 + arm_func_start SetPortraitEmotion +SetPortraitEmotion: ; 0x0204D7F4 ldrsh r2, [r0] cmp r2, #0 strneb r1, [r0, #2] bx lr - arm_func_end SetPortraitExpressionId + arm_func_end SetPortraitEmotion - arm_func_start SetPortraitUnknownAttr -SetPortraitUnknownAttr: ; 0x0204D804 + arm_func_start SetPortraitLayout +SetPortraitLayout: ; 0x0204D804 ldrsh r2, [r0] cmp r2, #0 cmpne r1, #0x20 @@ -79594,10 +79594,10 @@ SetPortraitUnknownAttr: ; 0x0204D804 bx lr .align 2, 0 _0204D844: .word 0x0209E014 - arm_func_end SetPortraitUnknownAttr + arm_func_end SetPortraitLayout - arm_func_start SetPortraitAttrStruct -SetPortraitAttrStruct: ; 0x0204D848 + arm_func_start SetPortraitOffset +SetPortraitOffset: ; 0x0204D848 stmdb sp!, {r3, lr} ldrsh r2, [r0] cmp r2, #0 @@ -79618,16 +79618,16 @@ SetPortraitAttrStruct: ; 0x0204D848 ldmia sp!, {r3, pc} .align 2, 0 _0204D890: .word 0x0209E014 - arm_func_end SetPortraitAttrStruct + arm_func_end SetPortraitOffset - arm_func_start sub_0204D894 -sub_0204D894: ; 0x0204D894 + arm_func_start AllowPortraitDefault +AllowPortraitDefault: ; 0x0204D894 strb r1, [r0, #0xf] bx lr - arm_func_end sub_0204D894 + arm_func_end AllowPortraitDefault - arm_func_start sub_0204D89C -sub_0204D89C: ; 0x0204D89C + arm_func_start IsValidPortrait +IsValidPortrait: ; 0x0204D89C ldrsh r1, [r0] cmp r1, #0 ldrnesb r1, [r0, #2] @@ -79636,7 +79636,7 @@ sub_0204D89C: ; 0x0204D89C movne r0, #1 moveq r0, #0 bx lr - arm_func_end sub_0204D89C + arm_func_end IsValidPortrait arm_func_start LoadPortrait LoadPortrait: ; 0x0204D8BC @@ -80232,7 +80232,7 @@ _0204E068: mov r1, r6 add r2, r3, r2 strb r2, [sb, r5] - bl DivideInt + bl __divsi3 add r5, r5, #1 _0204E090: cmp r5, r8 @@ -80268,7 +80268,7 @@ _0204E0DC: mov r1, r6 sub r2, r3, r2 strb r2, [sb, r5] - bl DivideInt + bl __divsi3 add r5, r5, #1 _0204E104: cmp r5, r8 @@ -83726,10 +83726,10 @@ _02050B9C: _02050BB4: .word 0x022AB918 arm_func_end SetTeamName - arm_func_start sub_02050BB8 -sub_02050BB8: ; 0x02050BB8 + arm_func_start GetRankupPoints +GetRankupPoints: ; 0x02050BB8 stmdb sp!, {r4, lr} - bl sub_02050C74 + bl GetRank mov r4, r0 mov r0, #0x16 bl GetPerformanceFlagWithChecks @@ -83753,7 +83753,7 @@ _02050BF0: ldmia sp!, {r4, pc} .align 2, 0 _02050C0C: .word 0x022AB918 - arm_func_end sub_02050BB8 + arm_func_end GetRankupPoints arm_func_start sub_02050C10 sub_02050C10: ; 0x02050C10 @@ -83786,8 +83786,8 @@ _02050C6C: .word 0x022AB918 _02050C70: .word 0x05F5E0FF arm_func_end sub_02050C10 - arm_func_start sub_02050C74 -sub_02050C74: ; 0x02050C74 + arm_func_start GetRank +GetRank: ; 0x02050C74 stmdb sp!, {r3, r4, r5, lr} mov r5, #0 ldr r4, _02050CCC ; =0x022AB918 @@ -83816,12 +83816,12 @@ _02050CC4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02050CCC: .word 0x022AB918 - arm_func_end sub_02050C74 + arm_func_end GetRank arm_func_start sub_02050CD0 sub_02050CD0: ; 0x02050CD0 stmdb sp!, {r3, lr} - bl sub_02050C74 + bl GetRank cmp r0, #8 movhi r0, #8 ldmia sp!, {r3, pc} @@ -83830,7 +83830,7 @@ sub_02050CD0: ; 0x02050CD0 arm_func_start sub_02050CE4 sub_02050CE4: ; 0x02050CE4 stmdb sp!, {r3, lr} - bl sub_02050C74 + bl GetRank bl GetRankUpEntry ldr r0, [r0, #8] ldmia sp!, {r3, pc} @@ -85419,7 +85419,7 @@ sub_02051FF0: ; 0x02051FF0 mov r5, r1 add r0, sp, #0 mov r1, r3 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, [sp] bl GetAtSize mov r4, r0 @@ -85662,7 +85662,7 @@ LoadMonsterMd: ; 0x02052358 ldr r0, _02052388 ; =0x020B09C0 ldr r1, _0205238C ; =0x020A31B8 mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom bl LoadM2nAndN2m ldr r0, _02052390 ; =0x020B09B4 ldr r1, [r0, #0xc] @@ -85682,7 +85682,7 @@ GetNameRaw: ; 0x02052394 mov r4, r0 mov r0, r1 mov r1, #0x258 - bl DivideInt + bl __divsi3 add r0, r1, #0x1f add r0, r0, #0x2200 mov r0, r0, lsl #0x10 @@ -85691,7 +85691,7 @@ GetNameRaw: ; 0x02052394 mov r1, r0 mov r0, r4 mov r2, #0x14 - bl Strncpy + bl strncpy ldmia sp!, {r4, pc} arm_func_end GetNameRaw @@ -85702,7 +85702,7 @@ GetName: ; 0x020523D0 mov r0, r1 mov r1, #0x258 mov r4, r2 - bl DivideInt + bl __divsi3 add r0, r1, #0x1f add r0, r0, #0x2200 mov r0, r0, lsl #0x10 @@ -85726,7 +85726,7 @@ SprintfStatic__02052418: ; 0x02052418 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -85741,7 +85741,7 @@ GetNameWithGender: ; 0x02052440 mov r0, r5 mov r1, #0x258 mov r4, r2 - bl DivideInt + bl __divsi3 add r0, r1, #0x1f add r0, r0, #0x2200 mov r0, r0, lsl #0x10 @@ -85891,7 +85891,7 @@ _02052660: _02052684: mov r0, r4 mov r1, #0x258 - bl DivideInt + bl __divsi3 add r0, r1, #0x1f add r0, r0, #0x2200 mov r0, r0, lsl #0x10 @@ -85913,7 +85913,7 @@ _020526C4: .word 0x020A31FC GetNameString: ; 0x020526C8 stmdb sp!, {r3, lr} mov r1, #0x258 - bl DivideInt + bl __divsi3 add r0, r1, #0x1f add r0, r0, #0x2200 mov r0, r0, lsl #0x10 @@ -85978,7 +85978,7 @@ GetCategoryString: ; 0x0205275C mov r4, r0 mov r0, r5 mov r1, #0x258 - bl DivideInt + bl __divsi3 add r0, r1, #0x77 add r0, r0, #0x2400 mov r0, r0, lsl #0x10 @@ -86022,7 +86022,7 @@ _020527DC: .word 0x020B09B4 GetSpriteSize: ; 0x020527E0 stmdb sp!, {r3, lr} mov r1, #0x258 - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 ldr r2, _02052818 ; =0x020A2D08 mov r0, r0, asr #0x10 @@ -86042,7 +86042,7 @@ _02052818: .word 0x020A2D08 GetSpriteFileSize: ; 0x0205281C stmdb sp!, {r3, lr} mov r1, #0x258 - bl DivideInt + bl __divsi3 ldr r0, _02052838 ; =0x020A2D09 ldrb r0, [r0, r1, lsl #1] mov r0, r0, lsl #9 @@ -86296,7 +86296,7 @@ GetExp: ; 0x02052A7C ldrsh r4, [r0, #0x1c] mov r1, #0xa mul r0, r4, r3 - bl DivideInt + bl __divsi3 add r0, r4, r0 ldmia sp!, {r4, pc} .align 2, 0 @@ -86425,7 +86425,7 @@ LoadM2nAndN2m: ; 0x02052BD4 ldr r0, _02052C2C ; =0x020B09C8 ldr r1, _02052C30 ; =0x020A3210 mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom _02052C00: ldr r0, _02052C34 ; =0x020B09D0 bl PointsToZero @@ -86436,7 +86436,7 @@ _02052C00: ldr r0, _02052C34 ; =0x020B09D0 ldr r1, _02052C38 ; =0x020A322C mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldmia sp!, {r3, pc} .align 2, 0 _02052C2C: .word 0x020B09C8 @@ -87165,7 +87165,7 @@ _02053598: ldmneia sp!, {r3, r4, r5, pc} ldr r1, _02053620 ; =0x0000013B add r0, r5, #0x22 - bl GETMOVESETIDX__02013CAC + bl GetMovesetIdx__02013CAC mvn r1, #0 cmp r0, r1 ldmeqia sp!, {r3, r4, r5, pc} @@ -87234,7 +87234,7 @@ _02053688: _0205369C: mov r1, r8 add r0, r6, #0x22 - bl GETMOVESETIDX__02013CAC + bl GetMovesetIdx__02013CAC mvn r1, #0 cmp r0, r1 bne _02053758 @@ -87257,7 +87257,7 @@ _020536D4: beq _02053774 bl Rand16Bit mov r1, r7 - bl DivideInt + bl __divsi3 mov r7, r1 mov r0, #6 mul ip, r7, r0 @@ -87304,8 +87304,8 @@ _02053780: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end sub_02053660 - arm_func_start GetLvlStats -GetLvlStats: ; 0x0205379C + arm_func_start GetLvlUpEntry +GetLvlUpEntry: ; 0x0205379C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc mov r6, r1 @@ -87313,14 +87313,14 @@ GetLvlStats: ; 0x0205379C mov r0, r6 mov r1, #0x258 mov r4, r2 - bl DivideInt + bl __divsi3 ldr r0, _02053844 ; =0x022AB92C ldrsh r0, [r0] cmp r0, r1 beq _02053820 mov r0, r6 mov r1, #0x258 - bl DivideInt + bl __divsi3 sub r0, r1, #1 ldr r2, _02053844 ; =0x022AB92C mov r0, r0, lsl #0x10 @@ -87352,10 +87352,10 @@ _02053820: .align 2, 0 _02053844: .word 0x022AB92C _02053848: .word 0x022AB930 - arm_func_end GetLvlStats + arm_func_end GetLvlUpEntry - arm_func_start sub_0205384C -sub_0205384C: ; 0x0205384C + arm_func_start GetEncodedHalfword +GetEncodedHalfword: ; 0x0205384C ldrb ip, [r0] add r2, r0, #1 mov r0, r2 @@ -87369,7 +87369,7 @@ sub_0205384C: ; 0x0205384C orr r2, r3, r2, lsr #18 strh r2, [r1] bx lr - arm_func_end sub_0205384C + arm_func_end GetEncodedHalfword arm_func_start sub_02053880 sub_02053880: ; 0x02053880 @@ -87443,7 +87443,7 @@ _02053950: _02053960: mov r0, r4 add r1, sp, #0 - bl sub_0205384C + bl GetEncodedHalfword ldrb r1, [r0] add r4, r0, #1 cmp r1, sb @@ -87541,7 +87541,7 @@ _02053AA4: mov r0, r4 add r1, sp, #0 mov r6, fp - bl sub_0205384C + bl GetEncodedHalfword mov r4, r0 ldrh r0, [sp] mov r1, r7 @@ -87757,7 +87757,7 @@ sub_02053D1C: ; 0x02053D1C b _02053D80 _02053D64: mov r1, r5 - bl sub_0205384C + bl GetEncodedHalfword ldrh r1, [sp, #2] add r0, r0, #1 cmp r4, r1 @@ -87773,7 +87773,7 @@ _02053D80: b _02053DB4 _02053D9C: mov r1, r5 - bl sub_0205384C + bl GetEncodedHalfword ldrh r1, [sp] cmp r1, r4 moveq r0, #1 @@ -88281,7 +88281,7 @@ GetMonsterIdFromSpawnEntry: ; 0x02054480 stmdb sp!, {r3, lr} ldrsh r0, [r0, #6] ldr r1, _0205449C ; =0x00000483 - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 mov r0, r0, asr #0x10 ldmia sp!, {r3, pc} @@ -88480,7 +88480,7 @@ sub_020546E8: ; 0x020546E8 ldrsh r1, [r4, #4] add r0, sp, #0 add r2, r2, #1 - bl GetLvlStats + bl GetLvlUpEntry ldrb r1, [r4, #1] add r0, r4, #0xa add r1, r1, #1 @@ -88750,7 +88750,7 @@ SprintfStatic__02054A60: ; 0x02054A60 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -90658,8 +90658,8 @@ _020561D8: _02056224: .word 0x020B0A48 arm_func_end sub_020561C0 - arm_func_start CheckTeamMemberIdx__02056228 -CheckTeamMemberIdx__02056228: ; 0x02056228 + arm_func_start CheckTeamMemberIdx +CheckTeamMemberIdx: ; 0x02056228 ldr r1, _0205625C ; =0x000055AA cmp r0, r1 moveq r0, #1 @@ -90676,7 +90676,7 @@ CheckTeamMemberIdx__02056228: ; 0x02056228 .align 2, 0 _0205625C: .word 0x000055AA _02056260: .word 0x00005AA5 - arm_func_end CheckTeamMemberIdx__02056228 + arm_func_end CheckTeamMemberIdx arm_func_start sub_02056264 sub_02056264: ; 0x02056264 @@ -90695,8 +90695,8 @@ _0205628C: .word 0x000055AA _02056290: .word 0x00005AA5 arm_func_end sub_02056264 - arm_func_start IsMonsterIdInNormalRange__02056294 -IsMonsterIdInNormalRange__02056294: ; 0x02056294 + arm_func_start IsMonsterIdInNormalRange +IsMonsterIdInNormalRange: ; 0x02056294 cmp r0, #0 blt _020562AC ldr r1, _020562B4 ; =0x0000022B @@ -90708,7 +90708,7 @@ _020562AC: bx lr .align 2, 0 _020562B4: .word 0x0000022B - arm_func_end IsMonsterIdInNormalRange__02056294 + arm_func_end IsMonsterIdInNormalRange arm_func_start sub_020562B8 sub_020562B8: ; 0x020562B8 @@ -91604,7 +91604,7 @@ _02056DA0: beq _02056DE4 ldrsh r8, [r7, #8] mov r0, r8 - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02056DE4 mov r0, r8 @@ -91648,7 +91648,7 @@ _02056E34: beq _02056E98 ldrsh r8, [r7, #8] mov r0, r8 - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02056E98 mov r0, r8 @@ -91970,7 +91970,7 @@ _0205724C: cmp r1, r4 streqb r6, [r8] beq _020572B0 - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 ldrnesh r0, [r8, #8] movne r0, r0, lsl #1 @@ -92030,7 +92030,7 @@ _02057338: tst r0, #0xff beq _02057388 ldrsh r0, [r7, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02057388 ldrsh r0, [r7, #8] @@ -92086,7 +92086,7 @@ _020573E8: tst r0, #0xff beq _0205742C ldrsh r0, [r7, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _0205742C ldrsh r0, [r7, #8] @@ -92154,7 +92154,7 @@ _020574C0: tst r0, #0xff beq _02057514 ldrsh r0, [sb, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02057514 ldrsh r0, [sb, #8] @@ -92629,7 +92629,7 @@ _02057B50: bl GetBaseFormCastformCherrimDeoxys strh r0, [r8, #0xc] ldrsh r0, [r8, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02057C14 ldrb r0, [r8, #1] @@ -93480,7 +93480,7 @@ sub_02058674: ; 0x02058674 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl CheckTeamMemberIdx__02056228 + bl CheckTeamMemberIdx cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -94554,7 +94554,7 @@ ReadMonsterFromSave: ; 0x02059444 mov r0, r4 mov r1, #0 mov r2, #0x44 - bl Memset + bl memset mov r0, r5 mov r1, r4 mov r2, #1 @@ -94861,7 +94861,7 @@ _020598C0: mla r7, sb, fp, r0 mov r0, r7 mov r2, #0x68 - bl Memset + bl memset mov r0, sl mov r1, r7 mov r2, #4 @@ -95297,7 +95297,7 @@ _02059EE4: ldrsh r0, [sp, #0x2c] mov r1, #0x258 mov r6, r4 - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 mov r0, r0, asr #0x10 mov r1, r4 @@ -95306,7 +95306,7 @@ _02059EE4: ldrsh r0, [sp, #0x2c] mov r1, #0x258 addne r6, r6, #1 - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 mov r0, r0, asr #0x10 add r0, r0, #0x258 @@ -95639,7 +95639,7 @@ _0205A35C: ldrb r2, [sp, #0x4d] mov r1, r5 ldrsh r4, [sp, #0x50] - bl GetLvlStats + bl GetLvlUpEntry ldrb r0, [sp, #0x52] ldr r1, [sp, #0x40] strh r5, [sp, #0x50] @@ -95783,7 +95783,7 @@ _0205A4F0: ldrsh r1, [r6] add r0, sp, #0x18 add r2, r2, #1 - bl GetLvlStats + bl GetLvlUpEntry ldr r1, [sp, #0x18] ldr r0, [r6, #0x30] ldr r2, _0205ADA8 ; =0x00000953 @@ -95976,7 +95976,7 @@ _0205A83C: mov r1, #0xa str r0, [sp, #0x90] ldrsh r0, [r6, #0x3e] - bl DivideInt + bl __divsi3 movs r1, r0 movmi r1, #0 cmp r1, #0x63 @@ -96183,7 +96183,7 @@ _0205AB08: bl sub_02025888 ldr r1, _0205ADF8 ; =0x020A3514 str r0, [sp, #0x10] - bl Strcpy + bl strcpy ldr r0, [sp, #0x10] str r0, [sp, #0xa4] b _0205AB98 @@ -96191,7 +96191,7 @@ _0205AB80: bl sub_02025888 ldr r1, _0205ADFC ; =0x020A351C str r0, [sp, #0x14] - bl Strcpy + bl strcpy ldr r0, [sp, #0x14] str r0, [sp, #0xa4] _0205AB98: @@ -96288,7 +96288,7 @@ _0205AC5C: bl GetCategoryString mov r1, r0 mov r0, r5 - bl Strcpy + bl strcpy mov r0, #0x44 strb r0, [r5, #4] str r5, [sp, #0xa4] @@ -96790,7 +96790,7 @@ _0205B3CC: _0205B3E8: mov r0, r7 mov r1, r5 - bl Strcat + bl strcat add r6, r6, #1 _0205B3F8: ldrsb r1, [r4, #1] @@ -96801,12 +96801,12 @@ _0205B3F8: beq _0205B42C ldr r1, _0205B438 ; =0x020A3544 mov r0, r7 - bl Strcat + bl strcat b _0205B42C _0205B420: ldr r1, _0205B43C ; =0x020A354C mov r0, r7 - bl Strcat + bl strcat _0205B42C: mov r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -97640,7 +97640,7 @@ _0205BDD8: ldr r4, [r0, #8] mov r2, #0x44 mov r0, r4 - bl Memset + bl memset add r0, sp, #0 mov r1, r4 mov r2, #4 @@ -97710,7 +97710,7 @@ _0205BDD8: ldr r4, [r0, #8] mov r2, #6 add r0, r4, #0x44 - bl Memset + bl memset add r0, sp, #0 add r1, r4, #0x46 mov r2, #0xb @@ -98743,7 +98743,7 @@ _0205CD54: ldmia sp!, {r3, r4, r5, pc} _0205CD78: ldrsh r0, [r4, #0x18] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 bne _0205CE24 ldrsh r1, [r4, #0x18] @@ -99022,7 +99022,7 @@ sub_0205D11C: ; 0x0205D11C ldmia sp!, {r3, r4, r5, pc} _0205D140: mov r0, r4 - bl sub_0200CDAC + bl IsValidTargetItem cmp r0, #0 beq _0205D164 ldr r0, _0205D1E8 ; =0x020A3AD4 @@ -99057,7 +99057,7 @@ _0205D188: ldmia sp!, {r3, r4, r5, pc} _0205D1C0: mov r0, r4 - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, pc} @@ -99867,7 +99867,7 @@ _0205DD04: cmp r0, #0 bne _0205DD04 ldrsh r0, [r8, #0x14] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _0205DD04 _0205DD34: @@ -102653,7 +102653,7 @@ _0206009C: _020600B8: bl Rand16Bit mov r1, r4 - bl DivideInt + bl __divsi3 ldrb r0, [r5, r1] ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_02060084 @@ -102668,7 +102668,7 @@ sub_020600CC: ; 0x020600CC ldr r0, _02060148 ; =0x020B0AFC ldr r1, _0206014C ; =0x020A462C mov r2, #1 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02060144 ; =0x020B0AD8 ldr r2, [r0, #0x24] ldr r1, [r2] @@ -103365,7 +103365,7 @@ SprintfStatic__020609E8: ; 0x020609E8 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -103392,7 +103392,7 @@ sub_02060A10: ; 0x02060A10 str r2, [sp, #4] ldr r2, [r7, #0x60] ldrh sl, [r2] - bl Strcat + bl strcat ldr fp, _02060AF0 ; =0x00000FFF ldr sb, _02060AF4 ; =0x020A3EA4 add r7, fp, #0xf000 @@ -103419,7 +103419,7 @@ _02060A74: bl PreprocessStringFromMessageId mov r0, r6 mov r1, r5 - bl Strcat + bl strcat ldr r1, [r8, #0x14] mov r0, sl, lsl #1 ldrh sl, [r1, r0] @@ -103450,18 +103450,18 @@ sub_02060AFC: ; 0x02060AFC mov r4, r0 ldr r1, _02060DF4 ; =0x020A4654 mov r0, r6 - bl Strcpy + bl strcpy ldr r1, _02060DF8 ; =0x020A4664 mov r0, r6 ldrb r7, [r5, #0x47] - bl Strcat + bl strcat ldr r1, _02060DFC ; =0x020B0A7C mov r0, r4 ldr r1, [r1, r7, lsl #2] bl SprintfStatic__020609E8 mov r0, r6 mov r1, r4 - bl Strcat + bl strcat add r0, sp, #0x30 bl InitPreprocessorArgs ldrb r0, [r5, #0x44] @@ -103527,10 +103527,10 @@ _02060C14: bl PreprocessStringFromMessageId ldr r1, _02060E10 ; =0x020A4644 mov r0, r6 - bl Strcat + bl strcat mov r0, r6 mov r1, r4 - bl Strcat + bl strcat b _02060D18 _02060C48: add r2, sp, #0x30 @@ -103586,24 +103586,24 @@ _02060CE4: strb r1, [r0] ldr r1, _02060E10 ; =0x020A4644 mov r0, r6 - bl Strcat + bl strcat mov r0, r6 mov r1, r4 - bl Strcat + bl strcat _02060D18: ldr r1, _02060E14 ; =0x020A4674 mov r0, r6 - bl Strcat + bl strcat mov r0, r5 mov r1, r4 mov r2, #0x100 bl sub_02061FDC ldr r1, _02060E10 ; =0x020A4644 mov r0, r6 - bl Strcat + bl strcat mov r0, r6 mov r1, r4 - bl Strcat + bl strcat ldr r1, [r5, #0x5c] cmp r1, #0 beq _02060D9C @@ -103619,10 +103619,10 @@ _02060D18: bl PreprocessStringFromMessageId ldr r1, _02060E1C ; =0x020A4678 mov r0, r6 - bl Strcat + bl strcat mov r0, r6 mov r1, r4 - bl Strcat + bl strcat b _02060DE4 _02060D9C: ldrb r0, [r5, #0x46] @@ -103641,10 +103641,10 @@ _02060DC4: ldr r1, _02060E1C ; =0x020A4678 ldr r5, [r2, r0, lsl #2] mov r0, r6 - bl Strcat + bl strcat mov r0, r6 mov r1, r5 - bl Strcat + bl strcat _02060DE4: mov r0, r4 bl MemFree @@ -103675,26 +103675,26 @@ sub_02060E24: ; 0x02060E24 mov r4, r0 ldr r1, _02060EA0 ; =0x020A4654 mov r0, r5 - bl Strcpy + bl strcpy ldr r1, _02060EA4 ; =0x020A4664 mov r0, r5 - bl Strcat + bl strcat ldr r1, _02060EA8 ; =0x020B0A7C mov r0, r4 ldr r1, [r1, #8] bl SprintfStatic__020609E8 mov r0, r5 mov r1, r4 - bl Strcat + bl strcat ldr r1, _02060EAC ; =0x020A4644 mov r0, r5 - bl Strcat + bl strcat mov r0, r4 ldr r1, _02060EB0 ; =0x00003C4D bl GetStringFromFileVeneer mov r0, r5 mov r1, r4 - bl Strcat + bl strcat mov r0, r4 bl MemFree ldmia sp!, {r3, r4, r5, pc} @@ -103767,7 +103767,7 @@ _02060F60: mov r0, r7 mov r1, r6 mov r2, #0x400 - bl Strncat + bl strncat ldr r1, [sb, #0x14] mov r0, sl, lsl #1 ldrh r1, [r1, r0] @@ -104731,7 +104731,7 @@ _02061D60: mov r5, r0 mov r0, r7 mov r1, #0x11 - bl DivideInt + bl __divsi3 mul r2, r1, r4 and r0, r8, #0xff str r0, [sp] @@ -104742,7 +104742,7 @@ _02061D60: bl sub_020264F8 add r0, r7, #1 mov r1, #0x11 - bl DivideInt + bl __divsi3 cmp r1, #0 addeq sb, sb, #0xd add r7, r7, #1 @@ -105136,9 +105136,9 @@ _020622B8: ; jump table b _020623F8 ; case 2 b _02062490 ; case 3 _020622C8: - bl sub_02050C74 + bl GetRank mov r8, r0 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r4, _02062544 ; =0x020B0AD8 mov sb, r0 mov sl, r6 @@ -105179,9 +105179,9 @@ _02062344: blt _020622E8 b _02062524 _02062360: - bl sub_02050C74 + bl GetRank mov r8, r0 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r4, _02062544 ; =0x020B0AD8 mov sb, r0 mov sl, r6 @@ -105222,9 +105222,9 @@ _020623DC: blt _02062380 b _02062524 _020623F8: - bl sub_02050C74 + bl GetRank mov r8, r0 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r4, _02062544 ; =0x020B0AD8 mov sb, r0 mov sl, r6 @@ -105265,9 +105265,9 @@ _02062474: blt _02062418 b _02062524 _02062490: - bl sub_02050C74 + bl GetRank mov r8, r0 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r4, _02062544 ; =0x020B0AD8 mov sb, r0 mov sl, r6 @@ -105562,7 +105562,7 @@ _02062840: bl GetDungeonMode cmp r0, #0 bne _020628E8 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance add r1, r4, r8, lsl #1 ldrb r1, [r1, #1] mov r2, r8, lsl #1 @@ -105653,7 +105653,7 @@ sub_02062944: ; 0x02062944 mov r0, r0, lsl #1 ldrsh r7, [r8, r0] _02062984: - bl sub_02050C74 + bl GetRank cmp r0, #3 movhs r0, #1 movlo r0, #0 @@ -105661,7 +105661,7 @@ _02062984: cmpne r6, #0 moveq r0, #0 streqh r0, [r4, #2] - bl sub_02050C74 + bl GetRank cmp r0, #4 movhs r0, #1 movlo r0, #0 @@ -106458,7 +106458,7 @@ _020633B0: ldrb r0, [r1, r4, lsl #1] cmp r6, r0 bne _02063408 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, _02063420 ; =0x020A3CAD ldrb r1, [r1, r4, lsl #1] cmp r1, r0 @@ -107756,14 +107756,14 @@ _020642DC: cmp r1, #0 ldr r0, _02064660 ; =0x00000C1C ble _02064394 - bl DivideInt + bl __divsi3 str r0, [r5, #0x24] str r0, [r5, #0x20] b _020643A4 _02064394: str r0, [r5, #0x20] ldrsh r1, [sp, #0xe] - bl DivideInt + bl __divsi3 str r0, [r5, #0x24] _020643A4: ldrb r0, [r5, #0x1c] @@ -107774,7 +107774,7 @@ _020643A4: ldr r2, [r1, #0x10] mov r1, #0x64 add sb, r2, #0x380 - bl DivideInt + bl __divsi3 mov r8, #0 mov r7, r0 mov r6, r8 @@ -108577,19 +108577,19 @@ _02064DEC: mov r0, #0x100 strb r2, [sp, #0x41] ldrsh r7, [sp, #0x22] - bl DivideInt + bl __divsi3 cmp r1, #0 movne r5, #1 moveq r5, #0 mov r1, r6 mov r0, #0x100 - bl DivideInt + bl __divsi3 add r0, r0, r5 mov r2, r0, lsl #0x10 mov r1, r7 mov r0, #0xc0 mov r5, r2, asr #0x10 - bl DivideInt + bl __divsi3 add r2, r5, #1 cmp r1, #0 str r2, [sp] @@ -108601,7 +108601,7 @@ _02064DEC: ldrsh r5, [sl, #0x12] str r2, [sp, #4] mvn r8, #0 - bl DivideInt + bl __divsi3 add r0, r0, sb mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -108669,11 +108669,11 @@ _02064F2C: add r0, r2, r0 strh r0, [sl, #0x14] ldrsh r0, [sl, #0x12] - bl DivideInt + bl __divsi3 strh r1, [sl, #0x12] ldrsh r0, [sl, #0x14] mov r1, r7 - bl DivideInt + bl __divsi3 strh r1, [sl, #0x14] _02064F80: mov r0, #1 @@ -108983,7 +108983,7 @@ _02065330: bne _0206548C _0206536C: mov r0, #5 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _02065390 ldrsh r0, [r5] @@ -109014,7 +109014,7 @@ _020653A8: bne _0206548C _020653DC: mov r0, #5 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _02065400 ldrsh r0, [r5] @@ -109114,7 +109114,7 @@ sub_0206549C: ; 0x0206549C b _0206595C _02065540: mov r0, #5 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _02065580 ldrsh r0, [r6] @@ -109169,7 +109169,7 @@ _020655BC: b _0206595C _02065610: mov r0, #5 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _0206566C ldrsh r0, [r6] @@ -109769,8 +109769,8 @@ ItemAtTableIdx: ; 0x02065CF8 _02065D18: .word 0x022B7320 arm_func_end ItemAtTableIdx - arm_func_start sub_02065D1C -sub_02065D1C: ; 0x02065D1C + arm_func_start MainLoop +MainLoop: ; 0x02065D1C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 bl sub_020024A0 @@ -109785,11 +109785,11 @@ sub_02065D1C: ; 0x02065D1C ldr r0, _02066374 ; =0x020AFC68 mov r1, #0x80 ldr r0, [r0] - bl sub_0201D3BC + bl InitWanTable bl sub_0201F208 bl OpenAllPackFiles bl sub_0204AB18 - bl sub_0204D780 + bl InitKaomadoStream bl sub_02025AD8 bl sub_02026E78 bl sub_020346C0 @@ -109799,7 +109799,7 @@ sub_02065D1C: ; 0x02065D1C bl SetBothScreensWindowsColor bl sub_0204A1A4 bl sub_02048420 - bl KeyWaitInit__02006DA4 + bl KeyWaitInit add r0, sp, #4 bl ReadSaveHeader cmp r0, #1 @@ -109860,7 +109860,7 @@ _02065E54: bl sub_0200CA8C bl sub_0205C73C bl sub_0205B44C - bl KeyWaitInit__02006DA4 + bl KeyWaitInit bl InitScriptVariableValues cmp r4, #0 beq _02065EE0 @@ -110089,7 +110089,7 @@ _0206617C: mov r0, #2 bl LoadOverlay mov r0, #0 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110109,7 +110109,7 @@ _020661B0: mov r0, #2 bl LoadOverlay mov r0, #0 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110122,7 +110122,7 @@ _020661FC: mov r0, #2 bl LoadOverlay mov r0, #1 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110135,7 +110135,7 @@ _0206622C: mov r0, #2 bl LoadOverlay mov r0, #1 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110148,7 +110148,7 @@ _0206625C: mov r0, #2 bl LoadOverlay mov r0, #2 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110161,7 +110161,7 @@ _0206628C: mov r0, #2 bl LoadOverlay mov r0, #3 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110179,7 +110179,7 @@ _020662BC: mov r0, #2 bl LoadOverlay mov r0, #1 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110192,7 +110192,7 @@ _02066300: mov r0, #2 bl LoadOverlay mov r0, #1 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110210,7 +110210,7 @@ _02066330: mov r0, #2 bl LoadOverlay mov r0, #1 - bl CheckEndDungeon + bl MainGame mov r8, r0 mov r0, #2 bl UnloadOverlay @@ -110219,7 +110219,7 @@ _02066330: .align 2, 0 _02066374: .word 0x020AFC68 _02066378: .word 0x020A9208 - arm_func_end sub_02065D1C + arm_func_end MainLoop arm_func_start sub_0206637C sub_0206637C: ; 0x0206637C @@ -112123,11 +112123,11 @@ sub_02067C8C: ; 0x02067C8C ldreqb r0, [r4, #2] cmpeq r0, #1 bne _02067E70 - bl sub_02050C74 + bl GetRank ldrb r1, [sp, #4] cmp r1, r0 bhi _02067D3C - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, [sp, #0xc] cmp r1, r0 bgt _02067D3C @@ -112366,11 +112366,11 @@ _02067FE0: str r2, [r1] b _020682D8 _02068054: - bl sub_02050C74 + bl GetRank ldrb r1, [sp, #4] cmp r1, r0 bhi _02068090 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, [sp, #0xc] cmp r1, r0 bgt _02068090 @@ -112443,11 +112443,11 @@ _02068158: ldrb r0, [r4, #4] bl sub_02063394 mov r6, r0 - bl sub_02050C74 + bl GetRank ldrb r1, [sp, #4] cmp r1, r0 bhi _020681BC - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance ldr r1, [sp, #0xc] cmp r1, r0 bgt _020681BC @@ -115781,7 +115781,7 @@ _0206AE48: mov r0, #0xc0 ldr fp, [r7, #0x2d8] mov r6, #0 - bl DivideInt + bl __divsi3 mov sb, r0, lsl #8 mov r0, #0x14000 rsb r0, r0, #0 @@ -115796,7 +115796,7 @@ _0206AE70: str r0, [sp, #0x18] ldr r1, [r1, #4] rsb r0, r4, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x1c] str r0, [sp] mov r0, #0 @@ -116006,7 +116006,7 @@ _0206B0E8: strh r5, [r4, #0x10] strh r5, [r4, #0x12] str r1, [r3, #0xbd4] - bl DivideInt + bl __divsi3 add r1, sb, #0x1b00 strh r0, [r1, #0xcc] ldr r0, [r7, #0xc] @@ -116043,7 +116043,7 @@ _0206B1D4: bne _0206B278 ldr r1, [r6, #0x50] mov r0, #0xc00 - bl DivideInt + bl __divsi3 strh r0, [r6, #0x48] add r0, sb, #0x1000 mov r1, #1 @@ -116060,7 +116060,7 @@ _0206B278: bne _0206B290 ldr r1, [r6, #0x50] mov r0, #0xc00 - bl DivideInt + bl __divsi3 strh r0, [r6, #0x48] _0206B290: mov r0, #0 @@ -116112,7 +116112,7 @@ _0206B328: bl sub_0201C0B0 ldrsh r1, [r4, #0x18] mov r0, r6 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -116128,7 +116128,7 @@ _0206B328: ldr r1, [r0, r1] mov r0, r6 mov r3, #0x2c0 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, [sl, #4] mov r0, r6 strh r1, [r6, #0x1c] @@ -116182,13 +116182,13 @@ _0206B408: ldr r1, [r1] ldr r1, [r1, #4] sub r1, r1, #1 - bl DivideInt + bl __divsi3 add r0, r1, #1 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 bl Rand16Bit mov r1, #0xd0 - bl DivideInt + bl __divsi3 add sl, r1, #0x10 bl Rand16Bit str sl, [sp] @@ -116268,13 +116268,13 @@ _0206B580: ldr r1, [r1] ldr r1, [r1, #4] sub r1, r1, #1 - bl DivideInt + bl __divsi3 add r0, r1, #1 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 bl Rand16Bit mov r1, #0xd0 - bl DivideInt + bl __divsi3 add sl, r1, #0x10 bl Rand16Bit str sl, [sp] @@ -116375,7 +116375,7 @@ _0206B6D8: ldr r1, [r1, #4] moveq sl, #0x14000 rsb r0, sl, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x28] mov r0, #0x58 mul r7, r6, r0 @@ -119174,7 +119174,7 @@ sub_0206DB7C: ; 0x0206DB7C mov r0, #0x3e8 ldrsh r1, [r1, #0x28] smulbb r0, r2, r0 - bl DivideInt + bl __divsi3 _0206DBB4: strh r0, [r4, #0x1a] mov r2, #0 @@ -119269,7 +119269,7 @@ _0206DCC8: ldr r0, _0206DD6C ; =0x022B7330 ldrsh r1, [r0, #0x28] mov r0, r7 - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r6, r0, lsr #0x10 moveq r6, #1 @@ -119285,7 +119285,7 @@ _0206DCF4: moveq r5, #0 beq _0206DD28 mov r1, r6 - bl DivideInt + bl __divsi3 str r0, [sl, #0x6c] _0206DD28: strh r5, [sl, #0x74] @@ -119331,7 +119331,7 @@ sub_0206DD70: ; 0x0206DD70 mul r0, r1, r0 ldr r1, _0206E05C ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r5, r0, lsr #0x10 moveq r5, #1 @@ -119347,7 +119347,7 @@ _0206DDC4: moveq r4, #0 beq _0206DDF8 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r7, #0x4c] _0206DDF8: strh r4, [r7, #0x54] @@ -119360,7 +119360,7 @@ _0206DDF8: movs r1, r0, lsr #8 ldr r0, _0206E060 ; =0x03938700 moveq r1, #1 - bl DivideUInt + bl __udivsi3 str r0, [r7, #0x44] b _0206DE38 _0206DE2C: @@ -119380,7 +119380,7 @@ _0206DE38: mul r0, r1, r0 ldr r1, _0206E05C ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r5, r0, lsr #0x10 moveq r5, #1 @@ -119396,7 +119396,7 @@ _0206DE78: moveq r4, #0 beq _0206DEAC mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r7, #0x5c] _0206DEAC: strh r4, [r7, #0x64] @@ -119430,7 +119430,7 @@ _0206DEDC: mul r0, r1, r0 ldr r1, _0206E05C ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r5, r0, lsr #0x10 moveq r5, #1 @@ -119448,7 +119448,7 @@ _0206DF34: moveq r8, #0 beq _0206DF70 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r7, #0x6c] _0206DF70: strh r8, [r7, #0x74] @@ -119476,7 +119476,7 @@ _0206DF98: mul r0, r1, r0 ldr r1, _0206E05C ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r5, r0, lsr #0x10 moveq r5, #1 @@ -119492,7 +119492,7 @@ _0206DFE0: moveq r4, #0 beq _0206E014 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r7, #0x7c] _0206E014: strh r4, [r7, #0x84] @@ -119581,7 +119581,7 @@ _0206E114: ldr r2, [r4, #0x34] ldr r1, [r1, #0x30] mul r0, r2, r0 - bl DivideUInt + bl __udivsi3 str r0, [r6, #4] ldr r1, [r4, #0x38] mov r0, r4 @@ -119615,7 +119615,7 @@ _0206E1A4: mul r0, r1, r0 ldr r1, _0206E214 ; =0x022B7330 ldr r1, [r1, #0x30] - bl DivideUInt + bl __udivsi3 str r0, [r6] b _0206E20C _0206E1C4: @@ -119799,7 +119799,7 @@ sub_0206E3C4: ; 0x0206E3C4 mul r0, r1, r0 ldr r1, _0206E4E0 ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r6, r0, lsr #0x10 moveq r6, #1 @@ -119815,7 +119815,7 @@ _0206E43C: moveq r4, r1 beq _0206E470 mov r1, r6 - bl DivideInt + bl __divsi3 str r0, [r5, #0x6c] _0206E470: strh r4, [r5, #0x74] @@ -121501,7 +121501,7 @@ _0206FA30: mul r0, r6, r0 ldr r1, _0206FAE4 ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r5, r0, lsr #0x10 moveq r5, #1 @@ -121534,7 +121534,7 @@ _0206FAA4: moveq r5, r1 beq _0206FAD4 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r4, #0x30] _0206FAD4: strh r5, [r4, #0x38] @@ -121555,7 +121555,7 @@ sub_0206FAE8: ; 0x0206FAE8 ldr r2, _0206FBC4 ; =0x022B7330 mov r5, r1 ldrsh r1, [r2, #0x28] - bl DivideInt + bl __divsi3 ldrsb r1, [r4, #0x13] cmp r1, #1 moveq r0, #0 @@ -121590,7 +121590,7 @@ _0206FB58: moveq r5, r1 beq _0206FB94 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r4, #0x30] _0206FB94: strh r5, [r4, #0x38] @@ -121841,7 +121841,7 @@ _0206FEB0: strb r0, [r5, #0x2c] ldr r1, [sl, #0x3c] ldr r0, _02070080 ; =0x00FFB0FF - bl DivideUInt + bl __udivsi3 mov r4, r0 ldr r1, [r5, #8] ldr r0, _02070084 ; =0x022B9208 @@ -123151,16 +123151,16 @@ _02071030: addlo r1, r1, #0x10000 str r0, [r8, #0xec8] mov r0, r1 - bl UIntToFloat + bl __floatunsisf mov sb, r0 mov r0, sl - bl UIntToFloat + bl __floatunsisf mov r1, r0 mov r0, sb - bl DivideFloat + bl __divsf3 mov r1, r0 ldr r0, _02071158 ; =0x42C80000 - bl MultiplyFloat + bl __mulsf3 mov sb, r0 ldrsh r0, [r7, #0xc4] mov r1, sb @@ -123186,9 +123186,9 @@ _020710D0: add r0, r0, #1 str r0, [r6, #0x2c] ldr r0, [r6, #0x664] - bl sub_020713E8 + bl UpdateSequencerTracks ldr r0, [r6, #0x668] - bl sub_020713E8 + bl UpdateSequencerTracks bl sub_0206FBC8 ldr r0, _0207115C ; =0x022B9584 ldr r0, [r0] @@ -123276,8 +123276,8 @@ _02071200: _02071220: .word 0x022B7330 arm_func_end sub_02071160 - arm_func_start sub_02071224 -sub_02071224: ; 0x02071224 + arm_func_start ParseDseEvents +ParseDseEvents: ; 0x02071224 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 mov r6, r1 @@ -123402,10 +123402,10 @@ _020713C4: _020713DC: .word 0x020B0B90 _020713E0: .word 0x020B0B7C _020713E4: .word 0x02040811 - arm_func_end sub_02071224 + arm_func_end ParseDseEvents - arm_func_start sub_020713E8 -sub_020713E8: ; 0x020713E8 + arm_func_start UpdateSequencerTracks +UpdateSequencerTracks: ; 0x020713E8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} movs sl, r0 cmpne sl, #0 @@ -123582,7 +123582,7 @@ _02071648: bne _02071674 mov r0, sl mov r1, r8 - bl sub_02071224 + bl ParseDseEvents ldrsb r0, [r8, #2] cmp r0, #1 ldreqb r0, [sl, #0xd] @@ -123663,7 +123663,7 @@ _0207176C: .align 2, 0 _0207177C: .word 0x04000208 _02071780: .word 0x82061029 - arm_func_end sub_020713E8 + arm_func_end UpdateSequencerTracks arm_func_start sub_02071784 sub_02071784: ; 0x02071784 @@ -123690,7 +123690,7 @@ _020717BC: movs r1, r0, lsr #8 ldr r0, _02071918 ; =0x03938700 moveq r1, #1 - bl DivideUInt + bl __udivsi3 str r0, [r4, #0x44] ldrh r0, [r4, #0x54] cmp r0, #0 @@ -123962,7 +123962,7 @@ sub_02071AE0: ; 0x02071AE0 movs r1, r1, lsr #8 ldr r0, _02071B1C ; =0x03938700 moveq r1, #1 - bl DivideUInt + bl __udivsi3 str r0, [r5, #0x44] strb r4, [r5, #0x17] add r0, r6, #1 @@ -123983,7 +123983,7 @@ sub_02071B20: ; 0x02071B20 movs r1, r1, lsr #8 ldr r0, _02071B5C ; =0x03938700 moveq r1, #1 - bl DivideUInt + bl __udivsi3 str r0, [r5, #0x44] strb r4, [r5, #0x17] add r0, r6, #1 @@ -124084,7 +124084,7 @@ sub_02071C3C: ; 0x02071C3C mul r0, r1, r0 ldr r1, _02071CC4 ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 mov r0, r0, lsl #0x10 movs r6, r0, lsr #0x10 moveq r6, #1 @@ -124100,7 +124100,7 @@ _02071C84: moveq r6, #0 beq _02071CB8 mov r1, r6 - bl DivideInt + bl __divsi3 str r0, [r4, #0x6c] _02071CB8: strh r6, [r4, #0x74] @@ -124450,7 +124450,7 @@ sub_02072054: ; 0x02072054 moveq r5, #0 beq _020720D4 mov r1, r5 - bl DivideInt + bl __divsi3 str r0, [r6, #0x20] _020720D4: strh r5, [r6, #0x28] @@ -124712,7 +124712,7 @@ sub_020723C0: ; 0x020723C0 moveq r6, #0 beq _02072410 mov r1, r6 - bl DivideInt + bl __divsi3 str r0, [r4, #0x30] _02072410: strh r6, [r4, #0x38] @@ -124921,7 +124921,7 @@ sub_02072668: ; 0x02072668 moveq r6, #0 beq _020726B8 mov r1, r6 - bl DivideInt + bl __divsi3 str r0, [r4, #0x40] _020726B8: strh r6, [r4, #0x48] @@ -127159,11 +127159,11 @@ _020741BC: mov r2, r1, asr #3 add r1, r1, r2, lsr #28 mov r1, r1, asr #4 - bl DivideInt + bl __divsi3 str r0, [r7, #0x13c] b _02074264 _0207425C: - bl DivideInt + bl __divsi3 str r0, [r7, #0x13c] _02074264: tst sl, #0x20 @@ -127561,7 +127561,7 @@ sub_02074780: ; 0x02074780 mov r5, r0 str r1, [r4, #0x14c] add r0, r4, #0x3c - bl sub_02074E0C + bl UpdateTrackVolumeEnvelopes ldr r0, [r4, #0x158] cmp r0, r5 ldmeqia sp!, {r3, r4, r5, pc} @@ -128016,7 +128016,7 @@ _02074D80: mov r0, #0x3e8 mul r0, r2, r0 ldrsh r1, [r1, #0x28] - bl DivideUInt + bl __udivsi3 b _02074DD4 _02074DB0: ldr r0, _02074E08 ; =0x020B0F50 @@ -128027,7 +128027,7 @@ _02074DB0: mul r2, r3, r2 mul r0, r2, r0 ldrsh r1, [r1, #0x28] - bl DivideInt + bl __divsi3 _02074DD4: str r0, [r5, #0x18] ldr r1, [r5, #0x18] @@ -128037,7 +128037,7 @@ _02074DD4: ldmeqia sp!, {r3, r4, r5, pc} ldr r0, [r5, #0x10] rsb r0, r0, r4, lsl #23 - bl DivideInt + bl __divsi3 str r0, [r5, #0x14] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -128046,8 +128046,8 @@ _02074E04: .word 0x022B7330 _02074E08: .word 0x020B0F50 arm_func_end sub_02074D58 - arm_func_start sub_02074E0C -sub_02074E0C: ; 0x02074E0C + arm_func_start UpdateTrackVolumeEnvelopes +UpdateTrackVolumeEnvelopes: ; 0x02074E0C stmdb sp!, {r4, lr} mov r4, r0 ldrb r1, [r4] @@ -128104,7 +128104,7 @@ _02074EB8: mov r0, #0x3f800000 str r0, [r4, #0x10] ldmia sp!, {r4, pc} - arm_func_end sub_02074E0C + arm_func_end UpdateTrackVolumeEnvelopes arm_func_start sub_02074ED8 sub_02074ED8: ; 0x02074ED8 @@ -128314,21 +128314,21 @@ _02075130: ldr r1, _020752A4 ; =0x022B7330 mul r0, r2, r0 ldrsh r1, [r1, #0x28] - bl DivideInt + bl __divsi3 strh r0, [r5, #0x1a] ldr r1, _020752A4 ; =0x022B7330 ldrh r2, [r8, #0xc] mov r0, #0x3e8 ldrsh r1, [r1, #0x28] mul r0, r2, r0 - bl DivideInt + bl __divsi3 movs r1, r0 strh r1, [r5, #0x1e] beq _020751C4 mov r0, #0 str r0, [r5, #0x20] mov r0, #0x1000000 - bl DivideInt + bl __divsi3 str r0, [r5, #0x24] b _020751E4 _020751C4: @@ -128354,7 +128354,7 @@ _020751E4: mul r0, r1, r0 ldr r1, _020752A4 ; =0x022B7330 ldrsh r1, [r1, #0x28] - bl DivideInt + bl __divsi3 movs r1, r0 addeq r1, r1, #1 strh r1, [r5, #4] @@ -128363,7 +128363,7 @@ _020751E4: ldr r0, [r8, #4] mov r0, r0, lsl #0xa str r0, [r5, #0xc] - bl DivideInt + bl __divsi3 str r0, [r5, #0x14] _02075240: ldrb r2, [r8, #3] @@ -129724,8 +129724,8 @@ _020763A4: .word 0x022B958C _020763A8: .word 0x04000240 arm_func_end sub_0207634C - arm_func_start sub_020763AC -sub_020763AC: ; 0x020763AC + arm_func_start EnableVramBanksInSetDontSave +EnableVramBanksInSetDontSave: ; 0x020763AC tst r0, #1 ldrne r1, _02076440 ; =0x04000240 movne r2, #0x80 @@ -129773,7 +129773,7 @@ _02076454: .word 0x04000245 _02076458: .word 0x04000246 _0207645C: .word 0x04000248 _02076460: .word 0x04000249 - arm_func_end sub_020763AC + arm_func_end EnableVramBanksInSetDontSave arm_func_start sub_02076464 sub_02076464: ; 0x02076464 @@ -129958,7 +129958,7 @@ _020766B8: _020766C4: ldr r0, _020766D4 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _020766D4: .word 0x022B958C @@ -130064,7 +130064,7 @@ _02076810: _0207681C: ldr r0, _0207682C ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _0207682C: .word 0x022B958C @@ -130145,7 +130145,7 @@ _02076918: _02076928: ldr r0, _02076938 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076938: .word 0x022B958C @@ -130197,7 +130197,7 @@ _020769C4: _020769D4: ldr r0, _020769E4 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _020769E4: .word 0x022B958C @@ -130334,7 +130334,7 @@ _02076B90: _02076B9C: ldr r0, _02076BAC ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076BAC: .word 0x022B958C @@ -130410,7 +130410,7 @@ _02076C84: _02076C90: ldr r0, _02076CA0 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076CA0: .word 0x022B958C @@ -130499,7 +130499,7 @@ _02076DA0: _02076DBC: ldr r0, _02076DCC ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076DCC: .word 0x022B958C @@ -130554,7 +130554,7 @@ _02076E68: _02076E74: ldr r0, _02076E84 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076E84: .word 0x022B958C @@ -130565,14 +130565,14 @@ _02076E8C: .word 0x04000242 arm_func_start sub_02076E90 sub_02076E90: ; 0x02076E90 ldr r1, _02076EA8 ; =0x022B958C - ldr ip, _02076EAC ; =sub_020763AC + ldr ip, _02076EAC ; =EnableVramBanksInSetDontSave ldrh r2, [r1] orr r2, r2, r0 strh r2, [r1] bx ip .align 2, 0 _02076EA8: .word 0x022B958C -_02076EAC: .word sub_020763AC +_02076EAC: .word EnableVramBanksInSetDontSave arm_func_end sub_02076E90 arm_func_start sub_02076EB0 @@ -130618,7 +130618,7 @@ _02076F2C: _02076F38: ldr r0, _02076F48 ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076F48: .word 0x022B958C @@ -130654,7 +130654,7 @@ _02076FA0: _02076FAC: ldr r0, _02076FBC ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _02076FBC: .word 0x022B958C @@ -130693,7 +130693,7 @@ _0207701C: _0207702C: ldr r0, _0207703C ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _0207703C: .word 0x022B958C @@ -130732,7 +130732,7 @@ _0207709C: _020770AC: ldr r0, _020770BC ; =0x022B958C ldrh r0, [r0] - bl sub_020763AC + bl EnableVramBanksInSetDontSave ldmia sp!, {r3, pc} .align 2, 0 _020770BC: .word 0x022B958C @@ -130740,8 +130740,8 @@ _020770C0: .word 0x04001000 _020770C4: .word 0x04000249 arm_func_end sub_02077048 - arm_func_start sub_020770C8 -sub_020770C8: ; 0x020770C8 + arm_func_start EnableVramBanksInSet +EnableVramBanksInSet: ; 0x020770C8 stmdb sp!, {r4, lr} ldrh r4, [r0] mov r2, #0 @@ -130751,24 +130751,24 @@ sub_020770C8: ; 0x020770C8 mov r0, r4 orr r2, r2, r4 strh r2, [r1] - bl sub_020763AC + bl EnableVramBanksInSetDontSave mov r0, r4 ldmia sp!, {r4, pc} .align 2, 0 _020770F8: .word 0x022B958C - arm_func_end sub_020770C8 + arm_func_end EnableVramBanksInSet arm_func_start sub_020770FC sub_020770FC: ; 0x020770FC mov r2, #0x4000000 ldr r1, [r2] - ldr ip, _02077118 ; =sub_020770C8 + ldr ip, _02077118 ; =EnableVramBanksInSet bic r1, r1, #0x40000000 ldr r0, _0207711C ; =0x022B959A str r1, [r2] bx ip .align 2, 0 -_02077118: .word sub_020770C8 +_02077118: .word EnableVramBanksInSet _0207711C: .word 0x022B959A arm_func_end sub_020770FC @@ -130776,40 +130776,40 @@ _0207711C: .word 0x022B959A sub_02077120: ; 0x02077120 mov r2, #0x4000000 ldr r1, [r2] - ldr ip, _0207713C ; =sub_020770C8 + ldr ip, _0207713C ; =EnableVramBanksInSet bic r1, r1, #0x80000000 ldr r0, _02077140 ; =0x022B959C str r1, [r2] bx ip .align 2, 0 -_0207713C: .word sub_020770C8 +_0207713C: .word EnableVramBanksInSet _02077140: .word 0x022B959C arm_func_end sub_02077120 arm_func_start sub_02077144 sub_02077144: ; 0x02077144 - ldr ip, _02077150 ; =sub_020770C8 + ldr ip, _02077150 ; =EnableVramBanksInSet ldr r0, _02077154 ; =0x022B9594 bx ip .align 2, 0 -_02077150: .word sub_020770C8 +_02077150: .word EnableVramBanksInSet _02077154: .word 0x022B9594 arm_func_end sub_02077144 arm_func_start sub_02077158 sub_02077158: ; 0x02077158 - ldr ip, _02077164 ; =sub_020770C8 + ldr ip, _02077164 ; =EnableVramBanksInSet ldr r0, _02077168 ; =0x022B9596 bx ip .align 2, 0 -_02077164: .word sub_020770C8 +_02077164: .word EnableVramBanksInSet _02077168: .word 0x022B9596 arm_func_end sub_02077158 arm_func_start sub_0207716C sub_0207716C: ; 0x0207716C ldr r2, _02077188 ; =0x04001000 - ldr ip, _0207718C ; =sub_020770C8 + ldr ip, _0207718C ; =EnableVramBanksInSet ldr r1, [r2] ldr r0, _02077190 ; =0x022B95A2 bic r1, r1, #0x40000000 @@ -130817,14 +130817,14 @@ sub_0207716C: ; 0x0207716C bx ip .align 2, 0 _02077188: .word 0x04001000 -_0207718C: .word sub_020770C8 +_0207718C: .word EnableVramBanksInSet _02077190: .word 0x022B95A2 arm_func_end sub_0207716C arm_func_start sub_02077194 sub_02077194: ; 0x02077194 ldr r2, _020771B0 ; =0x04001000 - ldr ip, _020771B4 ; =sub_020770C8 + ldr ip, _020771B4 ; =EnableVramBanksInSet ldr r1, [r2] ldr r0, _020771B8 ; =0x022B95A4 bic r1, r1, #0x80000000 @@ -130832,7 +130832,7 @@ sub_02077194: ; 0x02077194 bx ip .align 2, 0 _020771B0: .word 0x04001000 -_020771B4: .word sub_020770C8 +_020771B4: .word EnableVramBanksInSet _020771B8: .word 0x022B95A4 arm_func_end sub_02077194 @@ -134623,7 +134623,7 @@ _02079E24: _02079E3C: ldr r0, [r5, #0x18] add r0, r0, r2 - bl DivideInt + bl __divsi3 ldr r2, [r5, #0x10] add r0, r5, #8 str r4, [r2, r1, lsl #2] @@ -134673,7 +134673,7 @@ _02079EE0: ldr r0, [r6, #0x18] ldr r1, [r6, #0x14] add r0, r0, #1 - bl DivideInt + bl __divsi3 str r1, [r6, #0x18] ldr r1, [r6, #0x1c] mov r0, r6 @@ -134717,7 +134717,7 @@ _02079F74: ldr r0, [r6, #0x18] add r0, r0, r1 sub r0, r0, #1 - bl DivideInt + bl __divsi3 str r1, [r6, #0x18] ldr r0, [r6, #0x10] str r5, [r0, r1, lsl #2] @@ -150177,12 +150177,12 @@ _0208644C: .word 0xCCCCCCCD arm_func_start sub_02086450 sub_02086450: ; 0x02086450 ldr r0, _02086460 ; =0x020B2FBC - ldr ip, _02086464 ; =FloatToDouble + ldr ip, _02086464 ; =__extendsfdf2 ldr r0, [r0] bx ip .align 2, 0 _02086460: .word 0x020B2FBC -_02086464: .word FloatToDouble +_02086464: .word __extendsfdf2 arm_func_end sub_02086450 arm_func_start sub_02086468 @@ -150262,12 +150262,12 @@ _02086548: _02086558: .word 0x020B2ED4 arm_func_end sub_020864F4 - arm_func_start Abs -Abs: ; 0x0208655C + arm_func_start abs +abs: ; 0x0208655C cmp r0, #0 rsblt r0, r0, #0 bx lr - arm_func_end Abs + arm_func_end abs arm_func_start sub_02086568 sub_02086568: ; 0x02086568 @@ -150623,7 +150623,7 @@ _02086A14: ldr r1, [r7, #0x24] ldr r2, [sp] mov r0, sb - bl Memcpy + bl memcpy ldr r2, [sp] ldr r0, [r7, #0x24] subs r4, r4, r2 @@ -150678,7 +150678,7 @@ _02086AD4: _02086AF4: mov r0, r5 mov r1, r8 - bl DivideUInt + bl __udivsi3 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} arm_func_end sub_020867C0 @@ -151179,8 +151179,8 @@ sub_02087198: ; 0x02087198 ldmia sp!, {r4, pc} arm_func_end sub_02087198 - arm_func_start Mbtowc -Mbtowc: ; 0x020871BC + arm_func_start mbtowc +mbtowc: ; 0x020871BC cmp r1, #0 moveq r0, #0 bxeq lr @@ -151195,7 +151195,7 @@ Mbtowc: ; 0x020871BC moveq r0, #0 movne r0, #1 bx lr - arm_func_end Mbtowc + arm_func_end mbtowc arm_func_start TryAssignByte TryAssignByte: ; 0x020871F4 @@ -151218,8 +151218,8 @@ TryAssignByteWrapper: ; 0x02087208 _02087220: .word 0x020B301C arm_func_end TryAssignByteWrapper - arm_func_start Wcstombs -Wcstombs: ; 0x02087224 + arm_func_start wcstombs +wcstombs: ; 0x02087224 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} movs r4, r0 mov sb, r1 @@ -151245,17 +151245,17 @@ _02087248: mov r1, r6 mov r2, r5 add r0, r4, r7 - bl Strncpy + bl strncpy add r7, r7, r5 cmp r7, r8 bls _02087248 _02087294: mov r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end Wcstombs + arm_func_end wcstombs - arm_func_start Memcpy -Memcpy: ; 0x0208729C + arm_func_start memcpy +memcpy: ; 0x0208729C mov ip, r0 cmp r2, #0 bxeq lr @@ -151265,10 +151265,10 @@ _020872A8: strb r3, [ip], #1 bne _020872A8 bx lr - arm_func_end Memcpy + arm_func_end memcpy - arm_func_start Memmove -Memmove: ; 0x020872BC + arm_func_start memmove +memmove: ; 0x020872BC cmp r1, r0 blo _020872E4 mov ip, r0 @@ -151291,19 +151291,19 @@ _020872F4: strb r1, [ip, #-1]! bne _020872F4 bx lr - arm_func_end Memmove + arm_func_end memmove - arm_func_start Memset -Memset: ; 0x02087308 + arm_func_start memset +memset: ; 0x02087308 stmdb sp!, {r4, lr} mov r4, r0 - bl MemsetInternal + bl memset_internal mov r0, r4 ldmia sp!, {r4, pc} - arm_func_end Memset + arm_func_end memset - arm_func_start Memchr -Memchr: ; 0x0208731C + arm_func_start memchr +memchr: ; 0x0208731C cmp r2, #0 and r3, r1, #0xff beq _02087340 @@ -151317,10 +151317,10 @@ _02087328: _02087340: mov r0, #0 bx lr - arm_func_end Memchr + arm_func_end memchr - arm_func_start Memcmp -Memcmp: ; 0x02087348 + arm_func_start memcmp +memcmp: ; 0x02087348 cmp r2, #0 beq _02087380 _02087350: @@ -151340,10 +151340,10 @@ _02087378: _02087380: mov r0, #0 bx lr - arm_func_end Memcmp + arm_func_end memcmp - arm_func_start MemsetInternal -MemsetInternal: ; 0x02087388 + arm_func_start memset_internal +memset_internal: ; 0x02087388 cmp r2, #0x20 and r3, r1, #0xff blo _0208741C @@ -151397,7 +151397,7 @@ _02087428: subs r2, r2, #1 bne _02087428 bx lr - arm_func_end MemsetInternal + arm_func_end memset_internal arm_func_start sub_02087438 sub_02087438: ; 0x02087438 @@ -151891,11 +151891,11 @@ _02087AC4: _02087ACC: mov r0, sl mov r1, r4 - bl DivideUInt + bl __udivsi3 mov sb, r1 mov r0, sl mov r1, r4 - bl DivideUInt + bl __udivsi3 cmp sb, #0xa mov sl, r0 addlt sb, sb, #0x30 @@ -153147,8 +153147,8 @@ _02088C6C: .word 0x020B3218 _02088C70: .word 0x66666667 arm_func_end sub_02088510 - arm_func_start VsprintfInternalSlice -VsprintfInternalSlice: ; 0x02088C74 + arm_func_start __vsprintf_internal_slice +__vsprintf_internal_slice: ; 0x02088C74 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x22c @@ -153164,12 +153164,12 @@ VsprintfInternalSlice: ; 0x02088C74 _02088CA4: mov r0, fp mov r1, #0x25 - bl Strchr + bl strchr str r0, [sp, #0xc] cmp r0, #0 bne _02088CF8 mov r0, fp - bl Strlen + bl strlen movs r2, r0 add sl, sl, r2 beq _0208947C @@ -153509,7 +153509,7 @@ _02089160: add r0, sp, #0x2c cmp r1, #0 ldreq r1, _02089490 ; =0x020B321C - bl Wcstombs + bl wcstombs cmp r0, #0 blt _020892E0 add r7, sp, #0x2c @@ -153541,13 +153541,13 @@ _020891E4: mov r0, r7 mov r2, r6 mov r1, #0 - bl Memchr + bl memchr cmp r0, #0 subne r6, r0, r7 b _0208932C _02089210: mov r0, r7 - bl Strlen + bl strlen mov r6, r0 b _0208932C _02089220: @@ -153611,7 +153611,7 @@ _020892CC: b _0208932C _020892E0: ldr r0, [sp, #0xc] - bl Strlen + bl strlen movs r4, r0 beq _02089318 ldr r1, [sp, #0xc] @@ -153731,7 +153731,7 @@ _0208947C: .align 2, 0 _02089490: .word 0x020B321C _02089494: .word 0x020B3220 - arm_func_end VsprintfInternalSlice + arm_func_end __vsprintf_internal_slice arm_func_start TryAppendToSlice TryAppendToSlice: ; 0x02089498 @@ -153746,7 +153746,7 @@ TryAppendToSlice: ; 0x02089498 subhi r5, r2, r3 mov r2, r5 add r0, r0, r3 - bl Memcpy + bl memcpy ldr r1, [r4, #8] mov r0, #1 add r1, r1, r5 @@ -153754,8 +153754,8 @@ TryAppendToSlice: ; 0x02089498 ldmia sp!, {r3, r4, r5, pc} arm_func_end TryAppendToSlice - arm_func_start VsprintfInternal -VsprintfInternal: ; 0x020894DC + arm_func_start __vsprintf_internal +__vsprintf_internal: ; 0x020894DC stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r5, r0 @@ -153766,7 +153766,7 @@ VsprintfInternal: ; 0x020894DC str r5, [sp] str r4, [sp, #4] str ip, [sp, #8] - bl VsprintfInternalSlice + bl __vsprintf_internal_slice cmp r5, #0 addeq sp, sp, #0xc ldmeqia sp!, {r4, r5, pc} @@ -153783,35 +153783,35 @@ VsprintfInternal: ; 0x020894DC ldmia sp!, {r4, r5, pc} .align 2, 0 _02089540: .word TryAppendToSlice - arm_func_end VsprintfInternal + arm_func_end __vsprintf_internal - arm_func_start Vsprintf -Vsprintf: ; 0x02089544 - ldr ip, _02089558 ; =VsprintfInternal + arm_func_start vsprintf +vsprintf: ; 0x02089544 + ldr ip, _02089558 ; =__vsprintf_internal mov r3, r2 mov r2, r1 mvn r1, #0 bx ip .align 2, 0 -_02089558: .word VsprintfInternal - arm_func_end Vsprintf +_02089558: .word __vsprintf_internal + arm_func_end vsprintf - arm_func_start Snprintf -Snprintf: ; 0x0208955C + arm_func_start snprintf +snprintf: ; 0x0208955C stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, lr} add r3, sp, #0x10 bic r3, r3, #3 ldr r2, [sp, #0x10] add r3, r3, #4 - bl VsprintfInternal + bl __vsprintf_internal ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr - arm_func_end Snprintf + arm_func_end snprintf - arm_func_start Sprintf -Sprintf: ; 0x02089584 + arm_func_start sprintf +sprintf: ; 0x02089584 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, lr} add r1, sp, #0xc @@ -153819,11 +153819,11 @@ Sprintf: ; 0x02089584 add r3, r1, #4 ldr r2, [sp, #0xc] mvn r1, #0 - bl VsprintfInternal + bl __vsprintf_internal ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr - arm_func_end Sprintf + arm_func_end sprintf arm_func_start sub_020895B0 sub_020895B0: ; 0x020895B0 @@ -153895,8 +153895,8 @@ _02089670: bx lr arm_func_end sub_020895F4 - arm_func_start Strlen -Strlen: ; 0x02089678 + arm_func_start strlen +strlen: ; 0x02089678 mvn r2, #0 _0208967C: ldrsb r1, [r0], #1 @@ -153905,10 +153905,10 @@ _0208967C: bne _0208967C mov r0, r2 bx lr - arm_func_end Strlen + arm_func_end strlen - arm_func_start Strcpy -Strcpy: ; 0x02089694 + arm_func_start strcpy +strcpy: ; 0x02089694 stmdb sp!, {r3, r4, r5, lr} and r4, r1, #3 and r3, r0, #3 @@ -153966,10 +153966,10 @@ _02089740: .align 2, 0 _02089754: .word 0xFEFEFEFF _02089758: .word 0x80808080 - arm_func_end Strcpy + arm_func_end strcpy - arm_func_start Strncpy -Strncpy: ; 0x0208975C + arm_func_start strncpy +strncpy: ; 0x0208975C stmdb sp!, {r3, lr} mov lr, r0 cmp r2, #0 @@ -153993,10 +153993,10 @@ _020897A0: subs r2, r2, #1 bne _0208976C ldmia sp!, {r3, pc} - arm_func_end Strncpy + arm_func_end strncpy - arm_func_start Strcat -Strcat: ; 0x020897AC + arm_func_start strcat +strcat: ; 0x020897AC mov r3, r0 _020897B0: ldrsb r2, [r3], #1 @@ -154011,10 +154011,10 @@ _020897C0: cmp r2, #0 bne _020897C0 bx lr - arm_func_end Strcat + arm_func_end strcat - arm_func_start Strncat -Strncat: ; 0x020897DC + arm_func_start strncat +strncat: ; 0x020897DC stmdb sp!, {r3, lr} mov ip, r0 _020897E4: @@ -154038,10 +154038,10 @@ _02089820: mov r1, #0 strb r1, [ip] ldmia sp!, {r3, pc} - arm_func_end Strncat + arm_func_end strncat - arm_func_start Strcmp -Strcmp: ; 0x0208982C + arm_func_start strcmp +strcmp: ; 0x0208982C stmdb sp!, {r4, lr} ldrb r2, [r0] ldrb r3, [r1] @@ -154120,10 +154120,10 @@ _02089914: .align 2, 0 _02089938: .word 0xFEFEFEFF _0208993C: .word 0x80808080 - arm_func_end Strcmp + arm_func_end strcmp - arm_func_start Strncmp -Strncmp: ; 0x02089940 + arm_func_start strncmp +strncmp: ; 0x02089940 cmp r2, #0 beq _0208996C _02089948: @@ -154139,10 +154139,10 @@ _02089948: _0208996C: mov r0, #0 bx lr - arm_func_end Strncmp + arm_func_end strncmp - arm_func_start Strchr -Strchr: ; 0x02089974 + arm_func_start strchr +strchr: ; 0x02089974 ldrsb r2, [r0], #1 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 @@ -154160,10 +154160,10 @@ _020899A0: movne r0, #0 subeq r0, r0, #1 bx lr - arm_func_end Strchr + arm_func_end strchr - arm_func_start Strcspn -Strcspn: ; 0x020899B0 + arm_func_start strcspn +strcspn: ; 0x020899B0 stmdb sp!, {r4, lr} sub sp, sp, #0x20 add ip, sp, #0 @@ -154217,10 +154217,10 @@ _02089A60: sub r0, r0, #1 add sp, sp, #0x20 ldmia sp!, {r4, pc} - arm_func_end Strcspn + arm_func_end strcspn - arm_func_start Strstr -Strstr: ; 0x02089A70 + arm_func_start strstr +strstr: ; 0x02089A70 stmdb sp!, {r4, lr} cmp r1, #0 ldrneb r2, [r1] @@ -154253,7 +154253,7 @@ _02089AC8: _02089AD4: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end Strstr + arm_func_end strstr arm_func_start sub_02089ADC sub_02089ADC: ; 0x02089ADC @@ -154521,13 +154521,13 @@ _02089E54: ldr r1, _0208AACC ; =0x020B2FB8 mov r0, #0 ldr r1, [r1] - bl SubtractFloat - bl FloatToDouble + bl __subsf3 + bl __extendsfdf2 b _02089E90 _02089E84: ldr r0, _0208AACC ; =0x020B2FB8 ldr r0, [r0] - bl FloatToDouble + bl __extendsfdf2 _02089E90: ldr r2, [sp, #0x2c] add r3, r2, r5 @@ -155711,7 +155711,7 @@ _0208AEBC: beq _0208AED4 mov r1, sb mvn r0, #0 - bl DivideUInt + bl __udivsi3 str r0, [sp, #4] _0208AED4: mvn fp, #0 @@ -155838,7 +155838,7 @@ _0208B048: bne _0208B06C mov r0, fp mov r1, sb - bl DivideUInt + bl __udivsi3 str r0, [sp, #4] _0208B06C: cmp r6, #0 @@ -156114,8 +156114,8 @@ _0208B3E0: bx lr arm_func_end sub_0208B374 - arm_func_start Wcslen -Wcslen: ; 0x0208B3E8 + arm_func_start wcslen +wcslen: ; 0x0208B3E8 mvn r2, #0 _0208B3EC: ldrh r1, [r0], #2 @@ -156124,7 +156124,7 @@ _0208B3EC: bne _0208B3EC mov r0, r2 bx lr - arm_func_end Wcslen + arm_func_end wcslen arm_func_start sub_0208B404 sub_0208B404: ; 0x0208B404 @@ -156367,7 +156367,7 @@ _0208B760: ldr r0, [r0] mov r2, #0x21 str r2, [r1] - bl FloatToDouble + bl __extendsfdf2 add sp, sp, #0x80 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} add sp, sp, #0x10 @@ -158621,7 +158621,7 @@ _0208D768: ldr r0, _0208DCEC ; =0x020B2FB8 ldrne r4, _0208DCE8 ; =0xBFF00000 ldr r0, [r0] - bl FloatToDouble + bl __extendsfdf2 mov r2, r5 mov r3, r4 bl sub_0208C58C @@ -158696,7 +158696,7 @@ _0208D840: ldr r0, _0208DCEC ; =0x020B2FB8 ldrne r4, _0208DCE8 ; =0xBFF00000 ldr r0, [r0] - bl FloatToDouble + bl __extendsfdf2 mov r2, r5 mov r3, r4 bl sub_0208C58C @@ -160172,8 +160172,8 @@ _0208ECA4: _0208ECB4: .word 0x7FF00000 arm_func_end sub_0208E904 - arm_func_start AddFloat -AddFloat: ; 0x0208ECB8 + arm_func_start __addsf3 +__addsf3: ; 0x0208ECB8 eors r2, r0, r1 eormi r1, r1, #0x80000000 bmi _0208FA10 @@ -160326,7 +160326,7 @@ _0208EEC0: _0208EECC: mvn r0, #0x80000000 bx lr - arm_func_end AddFloat + arm_func_end __addsf3 arm_func_start sub_0208EED4 sub_0208EED4: ; 0x0208EED4 @@ -160600,8 +160600,8 @@ _0208F228: .byte 0x01, 0x00, 0x20, 0xE0, 0x01, 0x10, 0x20, 0xE0 .byte 0x01, 0x00, 0x20, 0xE0 - arm_func_start DivideFloat -DivideFloat: ; 0x0208F234 + arm_func_start __divsf3 +__divsf3: ; 0x0208F234 stmdb sp!, {lr} mov ip, #0xff ands r3, ip, r0, lsr #23 @@ -160814,10 +160814,10 @@ _0208F5E0: mov r0, lr ldmia sp!, {lr} bx lr - arm_func_end DivideFloat + arm_func_end __divsf3 - arm_func_start FloatToDouble -FloatToDouble: ; 0x0208F5EC + arm_func_start __extendsfdf2 +__extendsfdf2: ; 0x0208F5EC and r2, r0, #0x80000000 mov ip, r0, lsr #0x17 mov r3, r0, lsl #9 @@ -160857,10 +160857,10 @@ _0208F660: bx lr .align 2, 0 _0208F66C: .word 0x7FF00000 - arm_func_end FloatToDouble + arm_func_end __extendsfdf2 - arm_func_start FloatToInt -FloatToInt: ; 0x0208F670 + arm_func_start __fixsfsi +__fixsfsi: ; 0x0208F670 bic r1, r0, #0x80000000 mov r2, #0x9e subs r2, r2, r1, lsr #23 @@ -160875,10 +160875,10 @@ _0208F698: mvn r0, r0, asr #31 add r0, r0, #0x80000000 bx lr - arm_func_end FloatToInt + arm_func_end __fixsfsi - arm_func_start IntToFloat -IntToFloat: ; 0x0208F6A4 + arm_func_start __floatsisf +__floatsisf: ; 0x0208F6A4 ands r2, r0, #0x80000000 rsbmi r0, r0, #0 cmp r0, #0 @@ -160897,10 +160897,10 @@ IntToFloat: ; 0x0208F6A4 andeqs r3, r0, #1 addne r0, r0, #1 bx lr - arm_func_end IntToFloat + arm_func_end __floatsisf - arm_func_start UIntToFloat -UIntToFloat: ; 0x0208F6EC + arm_func_start __floatunsisf +__floatunsisf: ; 0x0208F6EC cmp r0, #0 bxeq lr mov r3, #0x9e @@ -160920,10 +160920,10 @@ _0208F708: andeqs r1, r0, #1 addne r0, r0, #1 bx lr - arm_func_end UIntToFloat + arm_func_end __floatunsisf - arm_func_start MultiplyFloat -MultiplyFloat: ; 0x0208F734 + arm_func_start __mulsf3 +__mulsf3: ; 0x0208F734 eor r2, r0, r1 and r2, r2, #0x80000000 mov ip, #0xff @@ -161061,10 +161061,10 @@ _0208F904: _0208F90C: mov r0, r2 bx lr - arm_func_end MultiplyFloat + arm_func_end __mulsf3 - arm_func_start Sqrtf -Sqrtf: ; 0x0208F914 + arm_func_start sqrtf +sqrtf: ; 0x0208F914 stmdb sp!, {lr} mov r2, #0xff cmp r0, r2, lsl #23 @@ -161129,13 +161129,13 @@ _0208F9D4: .align 2, 0 _0208F9F0: .word 0x7FC00000 _0208F9F4: .word 0x022BCA70 - arm_func_end Sqrtf + arm_func_end sqrtf _0208F9F8: .byte 0x01, 0x00, 0x20, 0xE0, 0x01, 0x10, 0x20, 0xE0 .byte 0x01, 0x00, 0x20, 0xE0 - arm_func_start SubtractFloat -SubtractFloat: ; 0x0208FA04 + arm_func_start __subsf3 +__subsf3: ; 0x0208FA04 eors r2, r0, r1 eormi r1, r1, #0x80000000 bmi _0208ECC4 @@ -161315,7 +161315,7 @@ _0208FC6C: _0208FC74: mvn r0, #0x80000000 bx lr - arm_func_end SubtractFloat + arm_func_end __subsf3 arm_func_start sub_0208FC7C sub_0208FC7C: ; 0x0208FC7C @@ -161344,7 +161344,7 @@ _0208FCAC: orrs r6, r5, r6 bne _0208FCE0 mov r1, r2 - bl DivideInt + bl __divsi3 ands r4, r4, #1 movne r0, r1 mov r1, r0, asr #0x1f @@ -161476,7 +161476,7 @@ _0208FE60: orrs r5, r1, r3 bne _0208FD00 mov r1, r2 - bl DivideUIntNoZeroCheck + bl __udivsi3_no_zero_check cmp r4, #0 movne r0, r1 mov r1, #0 @@ -161496,8 +161496,8 @@ sub_0208FE84: ; 0x0208FE84 bx lr arm_func_end sub_0208FE84 - arm_func_start DivideInt -DivideInt: ; 0x0208FEA4 + arm_func_start __divsi3 +__divsi3: ; 0x0208FEA4 eor ip, r0, r1 and ip, ip, #0x80000000 cmp r0, #0 @@ -161630,16 +161630,16 @@ _0209009C: ands r3, ip, #1 rsbne r1, r1, #0 bx lr - arm_func_end DivideInt + arm_func_end __divsi3 - arm_func_start DivideUInt -DivideUInt: ; 0x020900B0 + arm_func_start __udivsi3 +__udivsi3: ; 0x020900B0 cmp r1, #0 bxeq lr - arm_func_end DivideUInt + arm_func_end __udivsi3 - arm_func_start DivideUIntNoZeroCheck -DivideUIntNoZeroCheck: ; 0x020900B8 + arm_func_start __udivsi3_no_zero_check +__udivsi3_no_zero_check: ; 0x020900B8 cmp r0, r1 movlo r1, r0 movlo r0, #0 @@ -161759,7 +161759,7 @@ DivideUIntNoZeroCheck: ; 0x020900B8 adcs r0, r0, r0 mov r1, r3 bx lr - arm_func_end DivideUIntNoZeroCheck + arm_func_end __udivsi3_no_zero_check _02090294: .byte 0x03, 0x10, 0x21, 0xE0, 0x03, 0x30, 0x21, 0xE0, 0x03, 0x10, 0x21, 0xE0 .byte 0x02, 0x00, 0x20, 0xE0, 0x02, 0x20, 0x20, 0xE0, 0x02, 0x00, 0x20, 0xE0 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index 77af50eb..50ea5ad1 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -2621,7 +2621,7 @@ ov00_022BE868: ; 0x022BE868 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #0 beq _022BE890 @@ -2639,7 +2639,7 @@ ov00_022BE89C: ; 0x022BE89C stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #1 beq _022BE8C4 @@ -6059,7 +6059,7 @@ ov00_022C16D4: ; 0x022C16D4 stmia r6, {r5, ip} sub r0, r2, #1 mov r4, r3 - bl DivideInt + bl __divsi3 str r0, [r6, #0xc] mov r0, #0 str r0, [r6, #8] @@ -6438,7 +6438,7 @@ _022C1BF4: mov r8, #0 add r0, r0, r1 sub r0, r0, #1 - bl DivideInt + bl __divsi3 mov r2, r8 b _022C1C48 _022C1C38: @@ -7574,7 +7574,7 @@ ov00_022C2BB8: ; 0x022C2BB8 add r0, r1, r2 mov r1, r2 sub r0, r0, #1 - bl DivideInt + bl __divsi3 add r0, r0, #0x1f bic r0, r0, #0x1f mov r0, r0, lsl #2 @@ -10319,7 +10319,7 @@ _022C50D0: ldr r8, [r7, #8] add r0, r8, r1 sub r0, r0, #1 - bl DivideUInt + bl __udivsi3 mov r1, sb, lsl #1 ldrh r3, [r6, r1] mov r2, r0, lsl #0x10 @@ -13687,7 +13687,7 @@ ov00_022C7E20: ; 0x022C7E20 sub r1, r0, #2 mov r0, #0x1e str r1, [r2, #8] - bl DivideInt + bl __divsi3 ldr r1, _022C7E4C ; =0x02325064 mov r2, #0x1e str r0, [r1, #0xc] @@ -17846,7 +17846,7 @@ _022CB5E4: sub r2, r2, r7 add r1, r0, r7 str r2, [r4, #0x44] - bl Memmove + bl memmove _022CB608: mov r0, r5 bl SetIrqFlag @@ -18198,7 +18198,7 @@ ov00_022CBA58: ; 0x022CBA58 ldr r0, [r5, #0x5c] sub r2, r1, r4 add r1, r0, r4 - bl Memmove + bl memmove ldr r1, [r5, #0x60] mov r0, #0 sub r1, r1, r4 @@ -21535,7 +21535,7 @@ _022CE6F8: ble _022CE71C mov r0, r4 mov r1, r5 - bl DivideInt + bl __divsi3 cmp r0, #0 mulgt r0, r5, r0 ldmgtia sp!, {r3, r4, r5, pc} @@ -23141,7 +23141,7 @@ _022CFB0C: mov r0, r6 mov r2, r8 add r1, r7, #0x74 - bl Memcmp + bl memcmp cmp r0, #0 bne _022CFB60 mov r1, r7 @@ -23296,7 +23296,7 @@ _022CFD28: mov r0, r7 mov r2, r4 add r1, r8, #0x74 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #0 streqb r0, [r7, #0x5a] @@ -23417,7 +23417,7 @@ _022CFE80: ldr r7, [r5, r4, lsl #2] mov r1, r8 ldr r0, [r7] - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, r7 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -23696,11 +23696,11 @@ _022D0228: _022D0234: ldr r7, [sl, r5, lsl #2] mov r0, r7 - bl Strlen + bl strlen mov r2, r0 mov r0, r6 mov r1, r7 - bl Memcmp + bl memcmp cmp r0, #0 bne _022D02A4 cmp r5, #5 @@ -23986,7 +23986,7 @@ _022D061C: add r1, r6, r3 add r0, r0, #0x400 sub r1, r1, r2 - bl Memcmp + bl memcmp cmp r0, #0 beq _022D0660 _022D065C: @@ -24288,7 +24288,7 @@ ov00_022D0A1C: ; 0x022D0A1C mov r1, r5 add r0, r6, #0x74 mov r2, #0x20 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 streqb r0, [r6, #0x31] @@ -24648,7 +24648,7 @@ ov00_022D0F30: ; 0x022D0F30 add r0, r4, #0x348 bl ov00_022D397C mov r0, r5 - bl Strlen + bl strlen mov r2, r0 mov r1, r5 add r0, r4, #0x348 @@ -25002,7 +25002,7 @@ ov00_022D13EC: ; 0x022D13EC add r1, sp, #0 mov r0, r4 mov r2, #0x10 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #9 addne sp, sp, #0x14 @@ -25023,7 +25023,7 @@ ov00_022D13EC: ; 0x022D13EC add r1, sp, #0 add r0, r4, #0x10 mov r2, #0x14 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #9 strneb r0, [r5, #0x455] @@ -25193,7 +25193,7 @@ _022D16E4: add r1, sp, #0x30 mov r2, r5 add r0, r0, r4 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #9 strneb r0, [r7, #0x455] @@ -28379,7 +28379,7 @@ _022D42C4: ldr r2, [sp, #0x14] mov r1, r6 add r0, r6, #2 - bl Memmove + bl memmove add r0, r7, fp bl ov00_022D419C ldr r2, [sp, #0x18] @@ -28689,7 +28689,7 @@ _022D46D4: mov r2, r8 mov r0, r7 add r1, r7, r5, lsl #1 - bl Memmove + bl memmove add r0, r7, r6, lsl #1 sub r0, r0, r5, lsl #1 mov r2, r5, lsl #1 @@ -30676,7 +30676,7 @@ _022D611C: add r0, r0, #0x2000 ldr r6, [r0, #0x284] mov r0, r6 - bl DivideUInt + bl __udivsi3 cmp r1, #0 bne _022D6188 ldr r4, _022D62C8 ; =0x00000728 @@ -32184,7 +32184,7 @@ _022D7530: add r0, r0, r2 blt _022D7530 _022D7544: - bl DivideInt + bl __divsi3 _022D7548: and r0, r0, #0xff ldmia sp!, {r3, pc} @@ -32946,7 +32946,7 @@ _022D7EE4: ldrh r2, [r0, #0x7a] add r0, r5, r4 add r1, r5, r1 - bl Strncmp + bl strncmp cmp r0, #0 moveq r0, #2 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -33131,7 +33131,7 @@ _022D817C: mov r2, sb add r0, r6, #0xc add r1, r4, #4 - bl Strncmp + bl strncmp cmp r0, #0 ldreqb r0, [r4, #1] ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -33173,7 +33173,7 @@ _022D8200: mov r1, r6 mov r2, r7 add r0, sl, #0xc - bl Strncmp + bl strncmp cmp r0, #0 addeq r0, sb, r4, lsl #2 ldreqb r0, [r0, #0x445] @@ -33647,7 +33647,7 @@ _022D8864: bne _022D88BC mov r1, r8 add r0, r4, #0xc - bl Strncmp + bl strncmp cmp r0, #0 bne _022D88BC cmp r6, #0 @@ -34140,7 +34140,7 @@ ov00_022D8E60: ; 0x022D8E60 ldr r1, _022D8EA8 ; =0x02318188 add r0, r4, #0xc mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 moveq r0, #8 ldmeqia sp!, {r4, pc} @@ -35470,7 +35470,7 @@ ov00_022D9FC4: ; 0x022D9FC4 ldr r1, _022D9FF8 ; =0x02318B74 add r0, sp, #0 mov r2, #8 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -35504,7 +35504,7 @@ ov00_022DA024: ; 0x022DA024 ldr r1, _022DA06C ; =0x02318B74 add r0, sp, #0 mov r2, #8 - bl Memcmp + bl memcmp cmp r0, #0 addne sp, sp, #0x18 ldmneia sp!, {r4, pc} @@ -35523,7 +35523,7 @@ ov00_022DA070: ; 0x022DA070 stmdb sp!, {r3, lr} ldr r1, _022DA090 ; =0x02318B80 mov r2, #8 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -38083,7 +38083,7 @@ ov00_022DC06C: ; 0x022DC06C mov r4, r0 ldr r0, [r1] ldr r1, _022DC168 ; =0x02318C2C - bl Strcmp + bl strcmp cmp r0, #0 ldrne r0, _022DC164 ; =0x02318BC8 movne r1, #1 @@ -38559,7 +38559,7 @@ _022DC704: ldr r5, [r1, #8] add r0, r5, #0xc add r0, r0, #0x1000 - bl Strlen + bl strlen add r1, r5, #0xc add r1, r1, #0x1000 ldr r2, [sp] @@ -38681,7 +38681,7 @@ ov00_022DC8D0: ; 0x022DC8D0 cmpeq r3, #0 bne _022DC92C ldr r0, _022DCA50 ; =0x02318CBC - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DCA54 ; =0x02318CC8 ldr r2, _022DCA50 ; =0x02318CBC @@ -38694,7 +38694,7 @@ ov00_022DC8D0: ; 0x022DC8D0 ldmia sp!, {r3, r4, r5, r6, pc} _022DC92C: ldr r0, _022DCA58 ; =0x02318CD0 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DCA54 ; =0x02318CC8 ldr r2, _022DCA58 ; =0x02318CD0 @@ -38705,7 +38705,7 @@ _022DC92C: movne r0, #8 ldmneia sp!, {r3, r4, r5, r6, pc} mov r0, r6 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DCA5C ; =0x02318CD8 mov r0, r4 @@ -38737,7 +38737,7 @@ _022DC984: cmp r0, #1 bne _022DCA00 ldr r0, _022DCA68 ; =0x02318CE0 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DCA6C ; =0x02318CE4 ldr r2, _022DCA68 ; =0x02318CE0 @@ -38749,11 +38749,11 @@ _022DC984: ldmneia sp!, {r3, r4, r5, r6, pc} _022DCA00: mov r0, r5 - bl Wcslen + bl wcslen cmp r0, #0 beq _022DCA40 mov r0, r5 - bl Wcslen + bl wcslen mov r3, r0 ldr r1, _022DCA70 ; =0x02318CEC mov r0, r4 @@ -39019,7 +39019,7 @@ ov00_022DCD90: ; 0x022DCD90 str ip, [sp] bl sub_0207911C add r0, sp, #4 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD098 ; =0x02318D54 mov r0, r6 @@ -39030,7 +39030,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r5 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD09C ; =0x02318D5C mov r0, r6 @@ -39041,7 +39041,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0xe - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0A0 ; =0x02318D64 mov r0, r6 @@ -39052,7 +39052,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x41 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0A4 ; =0x02318D6C mov r0, r6 @@ -39063,7 +39063,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x6f - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0A8 ; =0x02318D74 mov r0, r6 @@ -39074,7 +39074,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x15 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0AC ; =0x02318D7C mov r0, r6 @@ -39085,7 +39085,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1a - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0B0 ; =0x02318D84 mov r0, r6 @@ -39096,7 +39096,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1d - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0B4 ; =0x02318D8C mov r0, r6 @@ -39107,7 +39107,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1f - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0B8 ; =0x02318D94 mov r0, r6 @@ -39118,7 +39118,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x2c - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0BC ; =0x02318D9C mov r0, r6 @@ -39129,7 +39129,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x2f - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0C0 ; =0x02318DA4 mov r0, r6 @@ -39140,7 +39140,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x34 - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0C4 ; =0x02318DAC mov r0, r6 @@ -39151,7 +39151,7 @@ ov00_022DCD90: ; 0x022DCD90 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x7e - bl Wcslen + bl wcslen mov r3, r0 ldr r1, _022DD0C8 ; =0x02318DB4 mov r0, r6 @@ -39165,7 +39165,7 @@ ov00_022DCD90: ; 0x022DCD90 cmp r4, #1 bne _022DD034 add r0, r5, #0x4e - bl Strlen + bl strlen mov r3, r0 ldr r1, _022DD0CC ; =0x02318DBC mov r0, r6 @@ -39314,9 +39314,9 @@ ov00_022DD1F8: ; 0x022DD1F8 add r0, r4, #0x1000 ldr r0, [r0, #0x9f8] ldr r1, _022DD284 ; =0x02318E6C - bl Strstr + bl strstr add r0, r0, #4 - bl Strlen + bl strlen movs r3, r0 beq _022DD270 ldr r2, _022DD288 ; =0x02318E74 @@ -39506,13 +39506,13 @@ ov00_022DD48C: ; 0x022DD48C ldr r1, _022DD568 ; =0x02318E6C mov r0, r6 add r4, r2, #0x1800 - bl Strstr + bl strstr cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r1, _022DD568 ; =0x02318E6C mov r0, r6 - bl Strstr + bl strstr add r1, r5, #0x218 add r6, r0, #4 add r0, r1, #0x1800 @@ -39526,16 +39526,16 @@ ov00_022DD48C: ; 0x022DD48C bl sub_0207A0CC ldr r0, [r4] ldr r1, _022DD56C ; =0x02318E88 - bl Strstr + bl strstr movs r8, r0 moveq r0, #1 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r0, _022DD56C ; =0x02318E88 - bl Strlen + bl strlen mov r7, r0 ldr r1, _022DD570 ; =0x02318E9C add r0, r8, r7 - bl Strstr + bl strstr mov r6, r0 add r0, r5, #0x218 ldrsb r4, [r6] @@ -39625,7 +39625,7 @@ _022DD628: _022DD664: ldr r4, [r0, #0x9f8] mov r0, r4 - bl Strlen + bl strlen mov r1, r0 mov r0, r4 bl ov00_022CBA58 @@ -39842,14 +39842,14 @@ ov00_022DD944: ; 0x022DD944 add r0, r7, #0x1000 ldrne r6, _022DDA00 ; =0x02318F24 ldr r0, [r0, #0x124] - bl Strlen + bl strlen mov r4, r0 mov r0, r6 - bl Strlen + bl strlen add r1, r7, #0x1000 mov r8, r0 ldr r0, [r1, #0x128] - bl Strlen + bl strlen sub r1, r8, #4 add r0, r1, r0 add r2, r4, r0 @@ -39890,13 +39890,13 @@ ov00_022DDA04: ; 0x022DDA04 mov r0, r6 mov r7, r1 add r5, r2, #0x1800 - bl Strlen + bl strlen mov r4, r0 ldr r0, _022DDAD8 ; =0x02318F44 - bl Strlen + bl strlen mov sb, r0 mov r0, r7 - bl Strlen + bl strlen sub r1, sb, #4 add r0, r1, r0 add r4, r4, r0 @@ -39916,15 +39916,15 @@ ov00_022DDA04: ; 0x022DDA04 _022DDA7C: ldr r0, [r5] ldr r1, _022DDADC ; =0x02318E6C - bl Strstr + bl strstr add sb, r0, #2 ldrsb r8, [r0, #2] mov r0, sb - bl Strlen + bl strlen add r2, r0, #1 add r0, sb, r4 mov r1, sb - bl Memmove + bl memmove ldr r2, _022DDAD8 ; =0x02318F44 str r6, [sp] mov r3, r7 @@ -39967,10 +39967,10 @@ ov00_022DDAE0: ; 0x022DDAE0 bl ov00_022DFF4C mov r5, r0 mov r0, r7 - bl Strlen + bl strlen mov r4, r0 mov r0, sb - bl Strlen + bl strlen sub r1, r4, #2 add r2, r1, r0 ldmib r6, {r0, r1} @@ -40023,7 +40023,7 @@ ov00_022DDBEC: ; 0x022DDBEC add r1, r7, #0x1f8 mov r0, r6 add r5, r1, #0x1800 - bl Strlen + bl strlen mov r4, r0 ldmib r5, {r0, r1} sub r1, r1, r0 @@ -40165,7 +40165,7 @@ ov00_022DDDC0: ; 0x022DDDC0 mov r5, r0 mov r0, r6 mov r4, #0 - bl Strlen + bl strlen cmp r0, #0x100 movhs r0, r4 ldmhsia sp!, {r4, r5, r6, pc} @@ -40173,20 +40173,20 @@ ov00_022DDDC0: ; 0x022DDDC0 mov r1, r6 add r0, r0, #0x1000 mov r2, #0x100 - bl Strncpy + bl strncpy mov r0, r6 - bl Strlen + bl strlen add r1, r5, #0x24 mov r6, r0 add r0, r1, #0x1000 - bl Strlen + bl strlen cmp r6, r0 movne r0, r4 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x24 ldr r1, _022DDF04 ; =0x02318F98 add r0, r0, #0x1000 - bl Strstr + bl strstr cmp r0, #0 beq _022DDE5C add r0, r5, #0x2b @@ -40203,7 +40203,7 @@ _022DDE5C: add r0, r5, #0x24 ldr r1, _022DDF08 ; =0x02318FA0 add r0, r0, #0x1000 - bl Strstr + bl strstr cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, r5, r6, pc} @@ -40219,7 +40219,7 @@ _022DDE98: add r0, r5, #0x1000 ldr r0, [r0, #0x124] ldr r1, _022DDF0C ; =0x02318FAC - bl Strstr + bl strstr cmp r0, #0 movne r1, #0 strneb r1, [r0] @@ -40227,7 +40227,7 @@ _022DDE98: add r0, r5, #0x1000 ldr r0, [r0, #0x124] ldr r1, _022DDF10 ; =0x02318FB0 - bl Strstr + bl strstr cmp r0, #0 mov r1, #0 addeq r0, r5, #0x1000 @@ -40265,7 +40265,7 @@ ov00_022DDF14: ; 0x022DDF14 movgt r0, #0 ldmgtia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r7 - bl Strlen + bl strlen mov r1, r0 ldr r0, _022DE058 ; =0x02318FB4 add r1, r1, #1 @@ -40279,7 +40279,7 @@ ov00_022DDF14: ; 0x022DDF14 cmp r0, #0 beq _022DDFF0 mov r0, r6 - bl Strlen + bl strlen mov r1, r0 ldr r0, _022DE05C ; =0x02318FD4 add r1, r1, #1 @@ -40296,13 +40296,13 @@ ov00_022DDF14: ; 0x022DDF14 beq _022DDFF0 ldr r0, [r2, r1, lsl #3] mov r1, r7 - bl Strcpy + bl strcpy ldr r2, [r8] ldr r0, [r8, #8] mov r1, r6 add r0, r2, r0, lsl #3 ldr r0, [r0, #4] - bl Strcpy + bl strcpy ldr r1, [r8, #8] mov r0, #1 add r1, r1, #1 @@ -40363,20 +40363,20 @@ ov00_022DE068: ; 0x022DE068 ldr r5, [r0, #0xa08] ldr r1, _022DE2E8 ; =0x02318E6C mov r0, r5 - bl Strstr + bl strstr str r0, [sp] cmp r0, #0 addeq sp, sp, #0x10 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} add r0, r0, #4 - bl Strlen + bl strlen ldr r1, [sp] add r1, r1, #4 add fp, r1, r0 ldr r1, _022DE2EC ; =0x0231902C mov r0, r5 - bl Strstr + bl strstr movs r7, r0 addeq sp, sp, #0x10 moveq r0, #0 @@ -40399,7 +40399,7 @@ ov00_022DE068: ; 0x022DE068 ldr r1, _022DE2F4 ; =0x0231903C add r0, r7, #1 mov r2, #3 - bl Strncmp + bl strncmp cmp r0, #0 beq _022DE154 _022DE148: @@ -40409,7 +40409,7 @@ _022DE148: _022DE154: ldr r1, _022DE2F8 ; =0x02318E9C add r0, r7, #5 - bl Strstr + bl strstr cmp r0, #0 addeq sp, sp, #0x10 moveq r0, r5 @@ -40419,7 +40419,7 @@ _022DE154: _022DE178: ldr r1, _022DE2FC ; =0x02319040 mov r0, sb - bl Strstr + bl strstr movs r6, r0 beq _022DE21C ldrsb r7, [r6] @@ -40428,7 +40428,7 @@ _022DE178: strb r1, [r6] ldr r1, _022DE2F8 ; =0x02318E9C mov r0, sl - bl Strstr + bl strstr movs r5, r0 streqb r7, [r6] beq _022DE21C @@ -40449,7 +40449,7 @@ _022DE178: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022DE1F0: mov r0, sl - bl Strlen + bl strlen strb r7, [r6] add r0, sl, r0 strb r8, [r5] @@ -40468,7 +40468,7 @@ _022DE21C: _022DE22C: ldr r1, _022DE300 ; =0x02319044 mov r0, r7 - bl Strstr + bl strstr movs r5, r0 beq _022DE2DC ldrsb sb, [r5] @@ -40477,12 +40477,12 @@ _022DE22C: strb r1, [r5] ldr r1, _022DE304 ; =0x02319048 mov r0, r6 - bl Strstr + bl strstr movs sl, r0 bne _022DE274 ldr r1, _022DE2F8 ; =0x02318E9C mov r0, r6 - bl Strstr + bl strstr mov sl, r0 _022DE274: cmp sl, #0 @@ -40504,7 +40504,7 @@ _022DE274: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022DE2B8: mov r0, r6 - bl Strlen + bl strlen add r0, r6, r0 strb sb, [r5] cmp sl, #0 @@ -40540,7 +40540,7 @@ _022DE318: cmp r1, #0 beq _022DE358 mov r0, r5 - bl Strcmp + bl strcmp cmp r0, #0 bne _022DE34C add r0, r6, r4, lsl #3 @@ -40565,7 +40565,7 @@ ov00_022DE360: ; 0x022DE360 movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - bl Strlen + bl strlen mov r1, r0 mov r0, r4 mov r2, r6 @@ -40590,13 +40590,13 @@ ov00_022DE3B4: ; 0x022DE3B4 movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - bl Strlen + bl strlen cmp r0, r5 movge r0, #0 ldmgeia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r4 - bl Strcpy + bl strcpy mov r0, #1 ldmia sp!, {r4, r5, r6, pc} arm_func_end ov00_022DE3B4 @@ -41043,7 +41043,7 @@ _022DE994: str r8, [r2, #0x28] ldr r1, _022DF650 ; =0x023191A4 str r3, [r2, #0x30] - bl Strcmp + bl strcmp cmp r0, #0 ldrne r0, _022DF628 ; =0x02326CD8 movne r1, #1 @@ -41093,7 +41093,7 @@ _022DEA80: add r0, r0, #0x1000 ldr r4, [r0, #0x118] mov r0, r4 - bl Strlen + bl strlen ldr r1, _022DF628 ; =0x02326CD8 mov r3, r0 ldr r0, [r1, #0x14] @@ -41189,7 +41189,7 @@ _022DEBE4: b _022DF5D4 _022DEC0C: mov r0, r1 - bl Strlen + bl strlen add r1, r0, #1 ldr r0, _022DF664 ; =0x02319130 blx r7 @@ -41210,12 +41210,12 @@ _022DEC0C: b _022DF5D4 _022DEC5C: ldr r0, [sp, #0x14] - bl Strlen + bl strlen mov r2, r0 ldr r1, [sp, #0x14] ldr r0, [sp, #4] add r2, r2, #1 - bl Strncpy + bl strncpy b _022DEC94 _022DEC7C: ldr r0, _022DF628 ; =0x02326CD8 @@ -41337,7 +41337,7 @@ _022DEDF4: ldr r2, _022DF62C ; =0x00009C40 str r8, [r5, #0x28] str r2, [r5, #0x30] - bl Strcmp + bl strcmp cmp r0, #0 movne r0, #1 strne r0, [r5, #0x2c] @@ -41382,7 +41382,7 @@ _022DEEB0: add r0, r0, #0x1000 ldr r6, [r0, #0x114] mov r0, r6 - bl Strlen + bl strlen mov r3, r0 ldr r0, [r5, #0x14] ldr r1, _022DF674 ; =0x023191EC @@ -41833,7 +41833,7 @@ _022DF530: b _022DF5D4 _022DF554: mov r0, r6 - bl Strlen + bl strlen add r1, r0, #1 ldr r0, _022DF6A0 ; =0x02319178 blx r7 @@ -41854,12 +41854,12 @@ _022DF554: b _022DF5D4 _022DF5A4: mov r0, r6 - bl Strlen + bl strlen mov r2, r0 ldr r0, [sp] mov r1, r6 add r2, r2, #1 - bl Strncpy + bl strncpy ldr r0, [r5, #0x14] bl ov00_022DD890 ldr r0, [sp, #8] @@ -41953,10 +41953,10 @@ ov00_022DF6F4: ; 0x022DF6F4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x3c mov r6, r0 - bl Strlen + bl strlen mov r4, r0 ldr r0, _022DF900 ; =0x02319298 - bl Strlen + bl strlen cmp r4, r0 ldreqsb r0, [r6, #7] cmpeq r0, #0x20 @@ -41987,7 +41987,7 @@ ov00_022DF6F4: ; 0x022DF6F4 beq _022DF8F4 add r0, sp, #0 mov r1, r6 - bl Strcpy + bl strcpy mov r2, #0 ldr r1, _022DF904 ; =0x022BCA70 add r0, sp, #0xc @@ -42014,7 +42014,7 @@ ov00_022DF6F4: ; 0x022DF6F4 _022DF7E8: ldr r0, [r7, r8, lsl #2] mov r1, r6 - bl Strcmp + bl strcmp cmp r0, #0 addeq r0, r8, #1 streq r0, [sp, #0x30] @@ -42199,7 +42199,7 @@ _022DFA4C: str r2, [sp, #0xc] ldr r2, [r4, #4] str r2, [sp, #0x10] - bl Strcmp + bl strcmp cmp r0, #0 movne r0, #1 strne r0, [sp, #0x14] @@ -43710,7 +43710,7 @@ ov00_022E0DBC: ; 0x022E0DBC moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 - bl Strlen + bl strlen cmp r0, #0 bne _022E0E00 ldr r0, _022E0E2C ; =0x0231A14C @@ -43885,10 +43885,10 @@ _022E0FD8: ldr r0, _022E1160 ; =0x02326D84 ldr r5, [r0] add r0, r5, #0x50 - bl Strlen + bl strlen mov r4, r0 ldr r0, _022E1164 ; =0x0231A154 - bl Strlen + bl strlen add r0, r4, r0 cmp r0, #0xff bls _022E1024 @@ -43907,7 +43907,7 @@ _022E1024: ldr r0, _022E1160 ; =0x02326D84 ldr r4, [r0] add r0, r4, #0x91 - bl Strlen + bl strlen mov r1, r0 add r2, sp, #0x10 add r0, r4, #0x91 @@ -44022,13 +44022,13 @@ ov00_022E1178: ; 0x022E1178 str r6, [r3] ldr r0, [r0] add r0, r0, #8 - bl Strncpy + bl strncpy ldr r0, _022E1284 ; =0x02326D84 mov r1, r4 ldr r0, [r0] mov r2, #0x1f add r0, r0, #0x28 - bl Strncpy + bl strncpy ldr r1, _022E1284 ; =0x02326D84 ldr r0, _022E1288 ; =0x0231A17C ldr r1, [r1] @@ -44188,7 +44188,7 @@ ov00_022E13D0: ; 0x022E13D0 mov r1, #0x1000 bl sub_0207911C mov r0, r4 - bl Strlen + bl strlen add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -44204,14 +44204,14 @@ ov00_022E1408: ; 0x022E1408 mov r4, r3 mov r0, r5 mov r1, #0 - bl Strchr + bl strchr mov r2, r0 mov r0, r7 mov r1, r6 mov r3, r4 bl ov00_022E13D0 mov r0, r5 - bl Strlen + bl strlen ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov00_022E1408 @@ -44225,21 +44225,21 @@ ov00_022E1448: ; 0x022E1448 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r2 mov r1, r6 - bl Strchr + bl strchr movs r5, r0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} _022E1478: mov r0, r7 - bl Strlen + bl strlen mov r2, r0 mov r1, r7 add r0, r5, #1 - bl Strncmp + bl strncmp cmp r0, #0 bne _022E14B0 mov r0, r7 - bl Strlen + bl strlen add r0, r0, r5 ldrsb r0, [r0, #1] cmp r6, r0 @@ -44247,13 +44247,13 @@ _022E1478: _022E14B0: mov r1, r6 add r0, r5, #1 - bl Strchr + bl strchr cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r1, r6 add r0, r0, #1 - bl Strchr + bl strchr movs r5, r0 bne _022E1478 mvn r0, #0 @@ -44261,25 +44261,25 @@ _022E14B0: _022E14E4: mov r1, r6 add r0, r5, #1 - bl Strchr + bl strchr movs r5, r0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r1, r6 add r0, r5, #1 - bl Strchr + bl strchr cmp r0, #0 addne r1, r5, #1 subne r6, r0, r1 bne _022E1524 add r0, r5, #1 - bl Strlen + bl strlen mov r6, r0 _022E1524: mov r0, r4 mov r2, r6 add r1, r5, #1 - bl Strncpy + bl strncpy mov r1, #0 mov r0, r6 strb r1, [r4, r6] @@ -44505,12 +44505,12 @@ ov00_022E1690: ; 0x022E1690 add r0, r0, #0x400 bl ov00_022EC69C mov r0, r4 - bl Strlen + bl strlen cmp r0, #0x100 movhs r5, #0xff bhs _022E1894 mov r0, r4 - bl Strlen + bl strlen mov r5, r0 _022E1894: ldr r1, _022E1908 ; =0x02328A18 @@ -44521,12 +44521,12 @@ _022E1894: ldr r1, _022E1908 ; =0x02328A18 mov r2, #0 strb r2, [r1, r5] - bl Strlen + bl strlen cmp r0, #0x100 movhs r4, #0xff bhs _022E18D0 ldr r0, [sp, #0x20] - bl Strlen + bl strlen mov r4, r0 _022E18D0: ldr r0, [sp, #0x20] @@ -45567,25 +45567,25 @@ ov00_022E2590: ; 0x022E2590 strb r2, [r3, #0xb] ldr r0, _022E26DC ; =0x0231A194 ldr r4, [r5, #8] - bl Strlen + bl strlen mov r2, r0 ldr r1, _022E26DC ; =0x0231A194 mov r0, r4 - bl Memcmp + bl memcmp cmp r0, #0 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, pc} ldr r0, _022E26DC ; =0x0231A194 - bl Strlen + bl strlen add r4, r4, r0 mov r0, r4 mov r1, #0x76 - bl Strchr + bl strchr sub r7, r0, r4 add r0, sp, #0 mov r1, r4 mov r2, r7 - bl Strncpy + bl strncpy cmp r7, #0xa addhi sp, sp, #0xc ldmhiia sp!, {r4, r5, r6, r7, pc} @@ -45599,11 +45599,11 @@ ov00_022E2590: ; 0x022E2590 ldr r0, _022E26E0 ; =0x0231A19C add r1, r7, #1 add r4, r4, r1 - bl Strlen + bl strlen mov r2, r0 ldr r1, _022E26E0 ; =0x0231A19C mov r0, r4 - bl Memcmp + bl memcmp cmp r0, #0 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, pc} @@ -45623,7 +45623,7 @@ ov00_022E2590: ; 0x022E2590 ldmneia sp!, {r4, r5, r6, r7, pc} _022E26B8: ldr r0, _022E26E0 ; =0x0231A19C - bl Strlen + bl strlen mov r2, r0 ldr r1, [r5] mov r0, r6 @@ -46274,12 +46274,12 @@ ov00_022E2F0C: ; 0x022E2F0C add r0, r4, #0x48 mov r5, r2 mov r4, r3 - bl Strcpy + bl strcpy ldr r0, _022E2FA4 ; =0x02326F28 mov r1, r6 ldr r0, [r0, #4] add r0, r0, #0x148 - bl Strcpy + bl strcpy ldr r0, _022E2FA4 ; =0x02326F28 ldr r6, [r0, #4] bl sub_0207AE44 @@ -46399,7 +46399,7 @@ _022E30BC: ldr r1, [r1, #4] add r1, r1, #0x51 add r1, r1, #0x200 - bl Strcpy + bl strcpy ldr r4, _022E3168 ; =ov00_022E03F0 ldr r3, _022E316C ; =ov00_022E0434 ldr r1, _022E3170 ; =0x00001C14 @@ -46446,13 +46446,13 @@ ov00_022E3174: ; 0x022E3174 ldr r0, [r0, #4] add r1, r1, #0x56 add r0, r0, #0x48 - bl Strcpy + bl strcpy ldr r0, _022E3364 ; =0x02326F28 add r1, sp, #0x300 ldr r0, [r0, #4] add r1, r1, #0x83 add r0, r0, #0x148 - bl Strcpy + bl strcpy bl ov00_022DBF08 ldr r1, _022E3364 ; =0x02326F28 mov r0, #0 @@ -46549,7 +46549,7 @@ _022E32E0: ldr r1, [r1, #4] add r1, r1, #0x51 add r1, r1, #0x200 - bl Strcpy + bl strcpy ldr r2, _022E3374 ; =ov00_022E03F0 ldr r0, _022E3364 ; =0x02326F28 str r2, [sp, #0x40] @@ -46638,7 +46638,7 @@ _022E3454: bl ov00_022DB528 add r1, sp, #0x1d add r0, r4, #0x8e - bl Strcmp + bl strcmp cmp r0, #0 bne _022E34E4 ldr r0, _022E3510 ; =0x02326F28 @@ -46771,7 +46771,7 @@ _022E3630: beq _022E3644 add r1, sp, #0x10c mov r0, r5 - bl Strcpy + bl strcpy _022E3644: ldr r0, [sp, #8] add sp, sp, #0x218 @@ -48264,7 +48264,7 @@ _022E4A1C: bl ov00_022DBAE0 mov r0, fp add r1, sb, #0x8e - bl Strcmp + bl strcmp cmp r0, #0 bne _022E4BBC ldr r1, [sb, #4] @@ -48335,7 +48335,7 @@ _022E4AF4: add r0, sp, #0xc add r1, sb, #0x97 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 bne _022E4BBC mov r1, r8 @@ -48418,7 +48418,7 @@ _022E4C50: bl ov00_022DBAE0 mov r0, r5 add r1, sl, #0x8e - bl Strcmp + bl strcmp cmp r0, #0 bne _022E4DA8 ldr r0, [r4, #0xc] @@ -49754,7 +49754,7 @@ _022E5FB4: ldr r1, _022E5FFC ; =0x0231BF24 mov r0, r4 mov r2, #6 - bl Memcmp + bl memcmp cmp r0, #0 bne _022E5FE0 ldr r1, [sp, #0x18] @@ -51767,7 +51767,7 @@ ov00_022E7B88: ; 0x022E7B88 add r6, r1, r4 beq _022E7C24 mov r0, r7 - bl Strlen + bl strlen mov r5, r0 add r0, r4, #2 add r0, r0, r5 @@ -51803,7 +51803,7 @@ ov00_022E7C4C: ; 0x022E7C4C mov r8, r2 mov r0, sb mov r1, #0 - bl Strchr + bl strchr mov r6, r0 cmp r8, #0 mov r7, #0 @@ -51812,7 +51812,7 @@ ov00_022E7C4C: ; 0x022E7C4C _022E7C7C: mov r0, sb mov r1, r5 - bl Strchr + bl strchr cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -51823,7 +51823,7 @@ _022E7C7C: _022E7CA4: mov r0, sb mov r1, #0x2f - bl Strchr + bl strchr cmp r0, #0 moveq r0, r6 cmp sb, r0 @@ -56475,7 +56475,7 @@ _022EBCC0: mov r0, r7 mov r1, r5 mov r2, fp - bl Strncmp + bl strncmp cmp r0, #0 ldreq r0, [sp, #0xc] cmpeq r0, #3 @@ -57177,7 +57177,7 @@ ov00_022EC610: ; 0x022EC610 ldr r1, _022EC63C ; =0x0231A2C0 add r0, r6, #6 mov r2, #2 - bl Strncpy + bl strncpy strh r5, [r6, #4] str r4, [r6] ldmia sp!, {r4, r5, r6, pc} @@ -57195,7 +57195,7 @@ ov00_022EC640: ; 0x022EC640 ldr r1, _022EC678 ; =0x0231A2C0 add r0, sp, #6 mov r2, #2 - bl Memcmp + bl memcmp cmp r0, #0 ldreqh r0, [sp, #4] movne r0, #0 @@ -59071,7 +59071,7 @@ ov00_022EDE64: ; 0x022EDE64 mov r0, r6 mov r1, r4 mov r2, r5 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -59425,7 +59425,7 @@ ov00_022EE320: ; 0x022EE320 ldr r1, _022EE41C ; =0x02318268 add r0, r4, #0xc0 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 beq _022EE3D0 add r0, r4, #0xc4 @@ -59452,7 +59452,7 @@ _022EE3D0: ldr r1, _022EE41C ; =0x02318268 add r0, r4, #0xc8 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 beq _022EE410 add r0, r4, #0xc8 @@ -60011,7 +60011,7 @@ ov00_022EEB50: ; 0x022EEB50 ldr r0, [r0] ldr r1, [r1, #0x50] mla r0, r2, r0, r3 - bl DivideUInt + bl __udivsi3 ldr r0, _022EEB8C ; =0x02327720 mov r2, r1, asr #0x10 str r1, [r0] @@ -60033,12 +60033,12 @@ ov00_022EEB90: ; 0x022EEB90 mov r7, r1 mov r6, r2 mov r5, r3 - bl Strlen + bl strlen cmp r0, #0x20 movhs r0, #0 ldmhsia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r7 - bl Strlen + bl strlen cmp r0, #0x14 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} @@ -60065,7 +60065,7 @@ _022EEBFC: ldr r0, _022EEC84 ; =0x0231A2D8 mov r1, r8 mov r2, #0x20 - bl Strncpy + bl strncpy ldr r3, _022EEC88 ; =0x0231A2F8 mov r2, #0xa _022EEC3C: @@ -60192,7 +60192,7 @@ _022EEDC0: add r0, r6, r0 mov r2, #0x28 strb r3, [sp, #0x4d] - bl Strncmp + bl strncmp cmp r0, #0 addne sp, sp, #0x50 movne r0, #0 @@ -60269,7 +60269,7 @@ _022EEEDC: add r0, sp, #0x25 mov r1, r5 mov r2, #0x20 - bl Memcpy + bl memcpy add r1, sp, #0x11 mov r0, r4 mov r2, #0x34 @@ -60295,7 +60295,7 @@ _022EEF2C: add r1, r1, #2 blt _022EEF2C ldr r0, _022EF0BC ; =0x0231A368 - bl Strlen + bl strlen ldr r1, _022EF0B0 ; =0x0231A2C4 mov r4, #0x26 ldr r3, [r1, #0x5c] @@ -60303,7 +60303,7 @@ _022EEF2C: strb r4, [r3, -r0] ldr r1, [r1, #0x5c] ldr r0, _022EF0C0 ; =0x0231A33C - bl Strncpy + bl strncpy ldr r0, _022EF0B0 ; =0x0231A2C4 mov r1, #6 str r1, [r0, #4] @@ -60318,11 +60318,11 @@ _022EEFA8: ldmia sp!, {r3, r4, r5, pc} _022EEFB8: ldr r0, _022EF0C4 ; =0x0231A370 - bl Strlen + bl strlen mov r2, r0 ldr r1, _022EF0C4 ; =0x0231A370 mov r0, r5 - bl Strncmp + bl strncmp cmp r0, #0 bne _022EEFF4 mov r0, r5 @@ -60531,13 +60531,13 @@ _022EF29C: add r0, sp, #0x11 mov r1, r4 mov r2, #0x14 - bl Strncpy + bl strncpy mov r3, #0 add r0, sp, #8 add r1, r4, #0x14 mov r2, #8 strb r3, [sp, #0x25] - bl Strncpy + bl strncpy mov r1, #0 mov r2, #0x10 bl sub_0208B200 @@ -60545,7 +60545,7 @@ _022EF29C: add r0, sp, #8 add r1, r4, #0x1c mov r2, #8 - bl Strncpy + bl strncpy mov r1, #0 mov r2, #0x10 bl sub_0208B200 @@ -60553,7 +60553,7 @@ _022EF29C: add r0, sp, #8 add r1, r4, #0x24 mov r2, #8 - bl Strncpy + bl strncpy mov r1, #0 mov r2, #0x10 bl sub_0208B200 @@ -60561,7 +60561,7 @@ _022EF29C: add r0, sp, #8 add r1, r4, #0x2c mov r2, #8 - bl Strncpy + bl strncpy mov r1, #0 mov r2, #0x10 bl sub_0208B200 @@ -60766,29 +60766,29 @@ _022EF5B4: bl ov00_022EEB04 mov r7, r0 ldr r0, _022EF788 ; =0x0231A3EC - bl Strlen + bl strlen mov r6, r0 ldr r0, _022EF78C ; =0x0231A368 - bl Strlen + bl strlen mov r5, r0 ldr r2, _022EF790 ; =0x0231A3F4 add r0, sp, #0x24 mov r1, #0x10 mov r3, sb - bl Snprintf + bl snprintf mov fp, r0 ldr r0, _022EF794 ; =0x0231A3F8 - bl Strlen + bl strlen str r0, [sp, #0x14] mov r0, sl - bl Strlen + bl strlen str r0, [sp, #0x18] ldr r0, _022EF784 ; =0x0231A2C4 ldr r0, [r0] - bl Strlen + bl strlen mov r4, r0 ldr r0, _022EF798 ; =0x0231A2D8 - bl Strlen + bl strlen add r1, r4, r0 ldr r0, [sp, #0x18] add r1, r0, r1 @@ -60816,16 +60816,16 @@ _022EF5B4: str r2, [sp, #0xc] ldr r2, [r1] ldr r1, _022EF7A4 ; =0x0231A400 - bl Sprintf + bl sprintf ldr r0, _022EF784 ; =0x0231A2C4 ldr r4, [r0, #0x58] mov r0, r4 - bl Strlen + bl strlen add r2, r4, r0 ldr r1, _022EF784 ; =0x0231A2C4 ldr r0, _022EF788 ; =0x0231A3EC str r2, [r1, #0x60] - bl Strlen + bl strlen ldr r4, _022EF784 ; =0x0231A2C4 ldr r3, [sp, #0x10] ldr r5, [r4, #0x60] @@ -60860,14 +60860,14 @@ _022EF71C: ldr r1, _022EF7A8 ; =0x0231A33C ldr r0, [r0, #0x5c] mov r2, #0x28 - bl Memcpy + bl memcpy mov r0, r4 mov r1, #6 str r1, [r0, #4] b _022EF76C _022EF74C: ldr r0, _022EF78C ; =0x0231A368 - bl Strlen + bl strlen mov r1, r4 ldr r3, [r1, #0x5c] mov r4, #0 @@ -66700,7 +66700,7 @@ _022F449C: blo _022F44D4 mov r0, sb mov r1, r8 - bl DivideUInt + bl __udivsi3 mul r2, r0, r8 cmp sl, #0 addne r0, r0, #0x30 @@ -66885,7 +66885,7 @@ ov00_022F46DC: ; 0x022F46DC bl ov00_022F47A8 ldr r2, [r5, #8] mov r1, r4 - bl Memcpy + bl memcpy ldmia sp!, {r3, r4, r5, pc} arm_func_end ov00_022F46DC @@ -67003,7 +67003,7 @@ _022F4810: sub r0, r8, r4 mul r2, r3, r0 mov r0, r7 - bl Memmove + bl memmove _022F485C: mov r0, r6 mov r1, r5 @@ -67028,7 +67028,7 @@ ov00_022F4870: ; 0x022F4870 ldr r2, [r5, #0x14] ldr r1, [r5, #8] sub r0, r0, r2 - bl DivideInt + bl __divsi3 mov r2, r0 mov r0, r5 mov r1, r4 @@ -67056,7 +67056,7 @@ ov00_022F48C4: ; 0x022F48C4 sub r0, r6, r7 mul r2, r3, r0 mov r0, r5 - bl Memmove + bl memmove _022F490C: ldr r0, [r4] sub r0, r0, #1 @@ -67138,7 +67138,7 @@ _022F49F0: ldr r2, [r7, #0x14] ldr r1, [r7, #8] sub r0, r0, r2 - bl DivideInt + bl __divsi3 add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end ov00_022F4968 @@ -68050,13 +68050,13 @@ ov00_022F5514: ; 0x022F5514 movs r5, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - bl Strlen + bl strlen add r0, r0, #1 bl ov00_022F5AE4 movs r4, r0 beq _022F5540 mov r1, r5 - bl Strcpy + bl strcpy _022F5540: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} @@ -68194,7 +68194,7 @@ ov00_022F5680: ; 0x022F5680 ldmeqia sp!, {r3, r4, r5, pc} bl ov00_022F5644 mov r1, r4 - bl DivideUInt + bl __udivsi3 add r0, r1, r5 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov00_022F5680 @@ -68402,7 +68402,7 @@ _022F592C: add r0, sp, #0 add r0, r0, r4 rsb r2, r4, #4 - bl Memset + bl memset add r0, sp, #0 mov r2, r4 add r1, sb, r6 @@ -68630,7 +68630,7 @@ ov00_022F5BF8: ; 0x022F5BF8 mov r4, r0 ldr r0, _022F5CD4 ; =0x02328804 mov r1, r4 - bl Strcpy + bl strcpy ldr r0, _022F5CD8 ; =0x02328884 mvn r1, #0 str r1, [r0] @@ -68666,12 +68666,12 @@ _022F5C40: mov r1, #9 mov r0, r4 strb r1, [r2, #0xc] - bl Strlen + bl strlen mov r5, r0 ldr r0, _022F5CEC ; =0x02328895 mov r1, r4 add r2, r5, #1 - bl Memcpy + bl memcpy ldr r0, _022F5CD8 ; =0x02328884 add r1, r5, #6 str r1, [r0, #0x4c] @@ -68703,7 +68703,7 @@ ov00_022F5CF0: ; 0x022F5CF0 ldr r1, _022F5D9C ; =0x0232888C add r0, r6, #4 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} @@ -68716,7 +68716,7 @@ ov00_022F5CF0: ; 0x022F5CF0 ldr r1, _022F5DA4 ; =0x0231A7E0 mov r0, r5 mov r2, #3 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} @@ -68896,7 +68896,7 @@ ov00_022F5F48: ; 0x022F5F48 mov r2, r7 add r0, r3, r0 strb r5, [r4, #2] - bl Memcpy + bl memcpy add r0, sp, #0 add r1, sp, #0x104 mov r2, #0x80 @@ -69119,7 +69119,7 @@ _022F6270: beq _022F6294 sub r2, r8, r6 mov r2, r2, lsl #2 - bl Memcpy + bl memcpy _022F6294: mov r6, r8 _022F6298: @@ -69335,7 +69335,7 @@ _022F6560: add r1, sp, #0x14 mov r2, r4, lsl #2 str r4, [r3] - bl Memcpy + bl memcpy mov r0, #0 bl ov00_022F6068 mov r0, #1 @@ -69412,7 +69412,7 @@ _022F665C: ldr r2, [sp, #8] add r0, sp, #0x10 mov r1, r4 - bl Memcpy + bl memcpy mov r0, #0 add ip, sp, #0x210 mov r1, r0 @@ -69460,7 +69460,7 @@ _022F66E8: add r1, sp, #0x10 add r0, fp, #4 str r6, [fp] - bl Memcpy + bl memcpy mov r0, #5 bl ov00_022F6068 add sp, sp, #0x314 @@ -69513,7 +69513,7 @@ _022F67C8: bne _022F6818 mov r2, r4, lsl #2 add r0, r0, r6, lsl #2 - bl Memset + bl memset add r0, sp, #0x210 add r2, r0, r6, lsl #2 ldr r0, [r2, #4] @@ -69591,7 +69591,7 @@ _022F68CC: add r0, fp, #4 add r1, r1, r6, lsl #2 mov r2, r4, lsl #2 - bl Memcpy + bl memcpy str r4, [fp] _022F6900: cmp r5, #0 @@ -69600,7 +69600,7 @@ _022F6900: add r1, sp, #0x214 add r0, r5, #4 mov r2, r2, lsl #2 - bl Memcpy + bl memcpy ldr r0, [sp, #0x210] str r0, [r5] _022F6924: @@ -69966,15 +69966,15 @@ _022F6E20: add r0, sp, #0x210 mov r1, r6 mov r2, #0x104 - bl Memcpy + bl memcpy add r0, sp, #0x10c mov r1, r5 mov r2, #0x104 - bl Memcpy + bl memcpy add r0, sp, #8 mov r1, r4 mov r2, #0x104 - bl Memcpy + bl memcpy add r0, sp, #0x210 bl ov00_022F614C add r0, sp, #0x10c @@ -70155,7 +70155,7 @@ _022F70F8: add r1, sp, #0x620 mov r0, r8 mov r2, #0x104 - bl Memcpy + bl memcpy subs r7, r4, #1 bmi _022F7170 add sb, sp, #0x314 @@ -70255,7 +70255,7 @@ _022F71F4: add r0, r2, r0, lsl #2 mov r2, r1, lsl #2 mov r1, #0 - bl Memset + bl memset ldr r0, [r4] mov r0, r0, lsl #1 str r0, [sp, #0x14] @@ -70363,7 +70363,7 @@ _022F73E0: ldr r0, [sp, #0x240] mov r1, #0 mov r2, #0x104 - bl Memset + bl memset add sp, sp, #0x218 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -70371,7 +70371,7 @@ _022F740C: ldr r0, [sp, #0x240] mov r1, #0 mov r2, #0x104 - bl Memset + bl memset ldr r1, [r4] ldr r0, [sp, #0x240] add r3, sp, #0x18 @@ -70381,7 +70381,7 @@ _022F740C: sub r2, r2, r1 add r1, r3, r1, lsl #2 mov r2, r2, lsl #2 - bl Memcpy + bl memcpy mov r0, #0 add r5, sp, #0x18 mov r1, r0 @@ -70473,7 +70473,7 @@ ov00_022F7540: ; 0x022F7540 and r0, r0, #3 add r0, r3, r0 str ip, [r4, #4] - bl Memcpy + bl memcpy add r0, r5, #3 mov r1, r0, lsr #2 mov r0, r4 @@ -70491,14 +70491,14 @@ ov00_022F7584: ; 0x022F7584 mov r1, r2 add r0, sp, #0 mov r2, #0x104 - bl Memcpy + bl memcpy add r0, sp, #0 bl ov00_022F74FC ldr r2, [sp] add r1, sp, #4 mov r0, r4 mov r2, r2, lsl #2 - bl Memcpy + bl memcpy mov r0, #1 add sp, sp, #0x104 ldmia sp!, {r3, r4, pc} @@ -70546,7 +70546,7 @@ _022F7628: bl ov00_022F75CC mov r1, r7 add r0, r5, #1 - bl DivideInt + bl __divsi3 add r6, r6, #1 cmp r6, #0x100 and r5, r1, #0xff @@ -70999,22 +70999,22 @@ _022F7C70: .word ov00_022F4758 arm_func_start ov00_022F7C74 ov00_022F7C74: ; 0x022F7C74 - ldr ip, _022F7C80 ; =Memcmp + ldr ip, _022F7C80 ; =memcmp mov r2, #0x10 bx ip .align 2, 0 -_022F7C80: .word Memcmp +_022F7C80: .word memcmp arm_func_end ov00_022F7C74 arm_func_start ov00_022F7C84 ov00_022F7C84: ; 0x022F7C84 - ldr ip, _022F7C98 ; =Memcmp + ldr ip, _022F7C98 ; =memcmp add r0, r0, #0x10 add r1, r1, #0x10 mov r2, #0x10 bx ip .align 2, 0 -_022F7C98: .word Memcmp +_022F7C98: .word memcmp arm_func_end ov00_022F7C84 arm_func_start ov00_022F7C9C @@ -71929,7 +71929,7 @@ _022F8920: ldr r2, [sp, #0x48] mov r1, r7 add r0, r5, #0x10 - bl Memcpy + bl memcpy ldr r0, [r4, #8] ldr r3, [sp, #0x4c] mov r1, r5 @@ -72335,7 +72335,7 @@ _022F8E88: mov r0, r4 mov r1, #0 mov r2, #0x24 - bl Memset + bl memset ldmia sp!, {r4, pc} arm_func_end ov00_022F8E64 @@ -72360,7 +72360,7 @@ ov00_022F8E9C: ; 0x022F8E9C cmp r5, #0 bne _022F8EF0 mov r0, r6 - bl Strlen + bl strlen mov r5, r0 _022F8EF0: ldr r1, [r7, #0xc] @@ -72403,7 +72403,7 @@ _022F8F6C: mov r1, r6 mov r2, r5 add r0, r3, r0 - bl Memcpy + bl memcpy str r4, [r7, #0xc] ldr r0, [r7, #4] mov r1, #0 @@ -72453,7 +72453,7 @@ _022F9028: cmp r8, #0 bne _022F903C mov r0, sb - bl Strlen + bl strlen mov r8, r0 _022F903C: cmp r8, #0 @@ -72723,7 +72723,7 @@ ov00_022F9398: ; 0x022F9398 ldr r3, [r5, #0x10] mov r0, r1 add r1, ip, r3 - bl Memcpy + bl memcpy ldr r1, [r5, #0x10] mov r0, #1 add r1, r1, r4 @@ -72904,7 +72904,7 @@ _022F9604: ldr r0, [r6, #0xc4] mov r2, r4 add r1, r0, r1 - bl Memmove + bl memmove mov r0, #0 str r0, [r6, #0xd0] str r4, [r6, #0xcc] @@ -73185,7 +73185,7 @@ _022F99B4: mov r2, #0x1b4 ldr r4, [r0, r5, lsl #2] mov r0, r4 - bl Memset + bl memset mov r0, #1 str r0, [r4] ldr r0, _022F9B3C ; =0x023289B0 @@ -73508,7 +73508,7 @@ _022F9E34: ldr r1, [r4, #0x14] ldr r0, _022F9E6C ; =0x0231A7F8 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 movne r0, #0 strne r0, [r4, #0x194] @@ -73581,7 +73581,7 @@ ov00_022F9EE8: ; 0x022F9EE8 ldr r0, [r4, #0x14] ldr r1, _022F9F9C ; =0x0231A804 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -73638,7 +73638,7 @@ ov00_022F9FB0: ; 0x022F9FB0 ldmhiia sp!, {r3, r4, pc} rsb r1, r2, #4 add r1, r3, r1 - bl Memcpy + bl memcpy add sp, sp, #4 ldmia sp!, {r3, r4, pc} arm_func_end ov00_022F9FB0 @@ -74106,7 +74106,7 @@ ov00_022FA6A8: ; 0x022FA6A8 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} ldr r2, _022FA8A8 ; =0x00000704 mov r1, #0 - bl Memset + bl memset ldr r4, [r5] mov r1, #1 add r0, r4, #0x1a4 @@ -74264,7 +74264,7 @@ ov00_022FA8E8: ; 0x022FA8E8 mov r0, r7 mov r1, sb mov r2, r8 - bl Memcpy + bl memcpy ldr r0, [r6] add r0, r0, r8 str r0, [r6] @@ -74400,7 +74400,7 @@ ov00_022FAAF8: ; 0x022FAAF8 ldr r2, [r7] ldr r0, [sp, #0x50] mov r1, r8 - bl Memcpy + bl memcpy ldr r1, [r7] mov r0, #0 str r1, [sl] @@ -74503,7 +74503,7 @@ _022FACA4: add r1, r8, r5 add r0, r0, r6 sub r2, r2, #0x10 - bl Memcpy + bl memcpy ldrh r0, [sp] sub r0, r0, #0x10 add r6, r6, r0 @@ -74906,7 +74906,7 @@ _022FAFA8: ldr r1, _022FBD14 ; =0x02318484 add r0, r2, r0 mov r2, #9 - bl Memcmp + bl memcmp cmp r0, #0 addne sp, sp, #0x50 movne r0, #3 @@ -76038,7 +76038,7 @@ _022FC298: cmp r0, #0 bne _022FC2D8 ldr r0, [r4, #4] - bl Strlen + bl strlen ldr r1, [r4, #0xc] add r2, r8, r0 ldr r0, [r4, #0x14] @@ -76084,7 +76084,7 @@ ov00_022FC304: ; 0x022FC304 b _022FC37C _022FC34C: ldr r0, _022FC610 ; =0x0231A968 - bl Strlen + bl strlen ldr r1, _022FC60C ; =0x023289C4 add r2, r0, #0x2f str r0, [r1, #0x10] @@ -76114,7 +76114,7 @@ _022FC398: ldr r1, [r4, #0xc] ldr r0, [r6, #4] add r8, r8, r1 - bl Strlen + bl strlen ldr r1, [r6, #0xc] add r0, r8, r0 add r8, r0, r1 @@ -76125,10 +76125,10 @@ _022FC3D4: ldr r1, [r4, #8] ldr r0, [r6, #4] add r8, r8, r1 - bl Strlen + bl strlen add r8, r8, r0 ldr r0, [r6, #0x10] - bl Strlen + bl strlen add r8, r8, r0 ldr r0, [sp] mov r1, r7 @@ -76140,13 +76140,13 @@ _022FC3D4: cmp sl, #0 bne _022FC42C ldr r0, [r6, #0xc] - bl Strlen + bl strlen add r8, r8, r0 _022FC42C: cmp sl, #0 beq _022FC5E8 ldr r0, [r6, #4] - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76154,7 +76154,7 @@ _022FC42C: cmp r0, #4 addne r8, r8, r0 ldr r0, [r6, #0x10] - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76175,11 +76175,11 @@ _022FC490: ldr r1, [r4, #8] str r0, [sp, #4] add r8, r8, r1 - bl Strlen + bl strlen ldr sl, [r6, #0x14] add r8, r8, r0 mov r0, sl - bl Strlen + bl strlen ldr sb, [r5, #0x14] ldr fp, [r6, #0xc] add r0, r8, r0 @@ -76187,13 +76187,13 @@ _022FC490: cmp sb, #0 bne _022FC4E0 ldr r0, [r6, #0x10] - bl Strlen + bl strlen add r8, r8, r0 _022FC4E0: cmp sb, #0 beq _022FC5E8 ldr r0, [sp, #4] - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76201,7 +76201,7 @@ _022FC4E0: cmp r0, #4 addne r8, r8, r0 mov r0, sl - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76232,10 +76232,10 @@ _022FC544: cmp r0, #4 addne r8, r8, r0 ldr r0, _022FC614 ; =0x0231A990 - bl Strlen + bl strlen add r8, r8, r0 ldr r0, _022FC614 ; =0x0231A990 - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76243,10 +76243,10 @@ _022FC544: cmp r0, #4 addne r8, r8, r0 ldr r0, _022FC618 ; =0x0231A998 - bl Strlen + bl strlen add r8, r8, r0 ldr r0, _022FC618 ; =0x0231A998 - bl Strlen + bl strlen mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -76524,7 +76524,7 @@ ov00_022FC8D4: ; 0x022FC8D4 _022FC968: mov r0, r5 mov r1, r7 - bl Strchr + bl strchr cmp r0, #0 beq _022FC98C mov r0, sb @@ -76976,10 +76976,10 @@ _022FCF78: mov r6, #0 strb r2, [sp, #0x15] strh r1, [sp, #0x16] - bl Strlen + bl strlen mov r4, r0 ldr r0, _022FD594 ; =0x0231A990 - bl Strlen + bl strlen mov r1, r0, lsl #0x10 mov r0, r4, lsl #0x10 mov r0, r0, asr #0x10 @@ -76994,10 +76994,10 @@ _022FCF78: orr r1, r1, r0 ldr r0, _022FD598 ; =0x0231A998 strh r1, [sp, #0x18] - bl Strlen + bl strlen mov r4, r0 ldr r0, _022FD598 ; =0x0231A998 - bl Strlen + bl strlen mov r1, r4, lsl #0x10 mov r2, r1, asr #0x10 mov r1, r0, lsl #0x10 @@ -77065,10 +77065,10 @@ _022FD104: subs r2, r2, #1 bne _022FD104 ldr r0, _022FD594 ; =0x0231A990 - bl Strlen + bl strlen add r6, r6, r0 ldr r0, _022FD594 ; =0x0231A990 - bl Strlen + bl strlen and r0, r0, #3 rsb r0, r0, #4 cmp r0, #4 @@ -77099,10 +77099,10 @@ _022FD180: subs r2, r2, #1 bne _022FD180 ldr r0, _022FD598 ; =0x0231A998 - bl Strlen + bl strlen add r6, r6, r0 ldr r0, _022FD598 ; =0x0231A998 - bl Strlen + bl strlen and r0, r0, #3 rsb r0, r0, #4 cmp r0, #4 @@ -77157,10 +77157,10 @@ _022FD228: mov r6, #0 ldr sl, [r0, #4] mov r0, sl - bl Strlen + bl strlen mov sb, r0 mov r0, sl - bl Strlen + bl strlen mov r1, r0, lsl #0x10 mov r0, sb, lsl #0x10 mov r0, r0, asr #0x10 @@ -77175,10 +77175,10 @@ _022FD228: orr r1, r1, r0 mov r0, r4 strh r1, [sp, #0xc] - bl Strlen + bl strlen mov sb, r0 mov r0, r4 - bl Strlen + bl strlen mov r1, sb, lsl #0x10 mov r2, r1, asr #0x10 mov r1, r0, lsl #0x10 @@ -77221,14 +77221,14 @@ _022FD344: add r6, r6, #0xc ldr r1, [r0, #4] add r0, r2, r6 - bl Strcpy + bl strcpy ldr r0, [r8] ldr r5, [r0, #4] mov r0, r5 - bl Strlen + bl strlen add r6, r6, r0 mov r0, r5 - bl Strlen + bl strlen and r0, r0, #3 rsb r0, r0, #4 cmp r0, #4 @@ -77248,12 +77248,12 @@ _022FD3D0: add r0, sp, #0x20 mov r1, r4 add r0, r0, r6 - bl Strcpy + bl strcpy mov r0, r4 - bl Strlen + bl strlen add r6, r6, r0 mov r0, r4 - bl Strlen + bl strlen and r0, r0, #3 rsb r0, r0, #4 cmp r0, #4 @@ -77286,7 +77286,7 @@ _022FD450: cmp r6, #0 bne _022FD470 add r0, sp, #0x20 - bl Strlen + bl strlen mov r6, r0 _022FD470: add r1, sp, #0x20 @@ -77308,7 +77308,7 @@ _022FD4AC: cmp r6, #0 bne _022FD4C0 add r0, sp, #0x20 - bl Strlen + bl strlen mov r6, r0 _022FD4C0: add r1, sp, #0x20 @@ -77416,7 +77416,7 @@ _022FD614: cmpeq r0, #0 beq _022FD67C ldr r0, _022FD79C ; =0x0231AABC - bl Strlen + bl strlen mov r2, r0 ldr r1, _022FD79C ; =0x0231AABC mov r0, sl @@ -77495,7 +77495,7 @@ _022FD744: cmp r0, #0 bne _022FD784 ldr r0, _022FD7A0 ; =0x0231AAC0 - bl Strlen + bl strlen mov r2, r0 ldr r1, _022FD7A0 ; =0x0231AAC0 mov r0, sl @@ -77528,7 +77528,7 @@ ov00_022FD7A4: ; 0x022FD7A4 ldr r1, _022FD910 ; =0x0231AAEC mov r0, r4 mov r2, #7 - bl Strncmp + bl strncmp cmp r0, #0 bne _022FD7EC mov r0, #0 @@ -77539,7 +77539,7 @@ _022FD7EC: ldr r1, _022FD914 ; =0x0231AAF4 mov r0, r4 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 bne _022FD814 mov r0, #1 @@ -77552,7 +77552,7 @@ _022FD814: _022FD81C: ldr r1, _022FD918 ; =0x0231AB00 mov r0, r4 - bl Strcspn + bl strcspn mov r6, r0 ldrsb r7, [r4, r6] mov r1, #0 @@ -77598,7 +77598,7 @@ _022FD8B0: mov r1, #0x20 mov r7, r0 str r0, [r5, #0x24] - bl Strchr + bl strchr cmp r0, #0 beq _022FD900 mov r6, #0x2b @@ -77608,7 +77608,7 @@ _022FD8E4: ldr r7, [r5, #0x24] mov r1, r4 mov r0, r7 - bl Strchr + bl strchr cmp r0, #0 bne _022FD8E4 _022FD900: @@ -78119,7 +78119,7 @@ _022FDFF8: cmp r0, #0 beq _022FE014 ldr r1, _022FE1A0 ; =0x0231AB40 - bl Strstr + bl strstr cmp r0, #0 bne _022FE024 _022FE014: @@ -78481,7 +78481,7 @@ _022FE4E8: _022FE504: ldr r0, [r4, #0xa0] ldr r1, _022FE5F0 ; =0x0231AB3C - bl Strstr + bl strstr cmp r0, #0 beq _022FE5B8 mov r1, #0 @@ -78632,7 +78632,7 @@ ov00_022FE6DC: ; 0x022FE6DC add r0, r5, #0x138 mov r2, r4 add r0, r0, r3 - bl Memcpy + bl memcpy ldr r0, [r5, #0x144] mov r1, #0 add r0, r0, r4 @@ -78663,7 +78663,7 @@ _022FE764: bne _022FE7F8 mov r0, r5 mov r1, #0xa - bl Strchr + bl strchr movs sl, r0 beq _022FE7E0 mov r0, r6 @@ -78723,7 +78723,7 @@ _022FE848: bne _022FE88C mov r0, r5 mov r1, #0xa - bl Strchr + bl strchr cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -78820,13 +78820,13 @@ _022FE980: ldr r1, _022FEDB4 ; =0x0231AB3C add r0, r5, r4 mov r2, #2 - bl Strncmp + bl strncmp cmp r0, #0 beq _022FE9D4 ldr r1, _022FEDB8 ; =0x0231ABB4 add r0, r5, r4 mov r2, #2 - bl Strncmp + bl strncmp cmp r0, #0 bne _022FE9E0 _022FE9D4: @@ -78836,13 +78836,13 @@ _022FE9D4: _022FE9E0: ldr r1, _022FEDBC ; =0x0231ABB8 add r0, r5, r4 - bl Strstr + bl strstr _022FE9EC: cmp r0, #0 bne _022FEA00 ldr r1, _022FEDB8 ; =0x0231ABB4 add r0, r5, r4 - bl Strstr + bl strstr _022FEA00: cmp r0, #0 beq _022FED7C @@ -78871,7 +78871,7 @@ _022FEA00: ldr r0, [sl, #0xa0] mov r1, r6 add r2, r7, #1 - bl Memmove + bl memmove str r7, [sl, #0xa8] b _022FEA80 _022FEA78: @@ -78910,7 +78910,7 @@ _022FEAC4: _022FEAEC: ldr r1, _022FEDC0 ; =0x0231ABC0 add r0, r5, r4 - bl Strstr + bl strstr cmp r0, #0 beq _022FEC14 add r4, r0, #9 @@ -78965,10 +78965,10 @@ _022FEB8C: cmp r0, #0x2f bne _022FEBF0 ldr r0, [sl, #0x18] - bl Strlen + bl strlen mov r5, r0 mov r0, r4 - bl Strlen + bl strlen add r1, r5, #0xe add r0, r1, r0 bl ov00_022F5AE4 @@ -78997,7 +78997,7 @@ _022FEBF0: _022FEC14: ldr r1, _022FEDCC ; =0x0231ABDC add r0, r5, r4 - bl Strstr + bl strstr movs fp, r0 beq _022FECEC ldr r8, _022FEDD0 ; =0x023184AC @@ -79017,7 +79017,7 @@ _022FEC34: add r0, sp, #0xc mov sb, r8 strb r2, [r1] - bl Strlen + bl strlen b _022FEC74 _022FEC70: add sb, sb, #1 @@ -79042,7 +79042,7 @@ _022FECB0: bne _022FECE0 add r1, sp, #0xc mov r0, r8 - bl Strncmp + bl strncmp cmp r0, #0 blt _022FECE0 mov r0, #1 @@ -79057,7 +79057,7 @@ _022FECE0: _022FECEC: ldr r1, _022FEDD4 ; =0x0231ABEC add r0, r5, r4 - bl Strstr + bl strstr cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -79739,7 +79739,7 @@ ov00_022FF5D8: ; 0x022FF5D8 mov r0, r5 mov r1, #0 mov r2, #0x214 - bl Memset + bl memset mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _022FF618: @@ -80028,13 +80028,13 @@ _022FF9EC: bne _022FFA2C add r0, sp, #0x100 add r1, r4, #0x3b8 - bl Strcmp + bl strcmp cmp r0, #0 bne _022FFA2C add r1, r4, #0xb8 add r0, sp, #0 add r1, r1, #0x400 - bl Strcmp + bl strcmp cmp r0, #0 addeq sp, sp, #0x200 moveq r0, #0 @@ -80215,7 +80215,7 @@ ov00_022FFC5C: ; 0x022FFC5C ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r2, _022FFD84 ; =0x00000634 mov r1, #0 - bl Memset + bl memset ldr r0, [sp] mov r3, #0 strb r3, [r0] @@ -80524,7 +80524,7 @@ _0230004C: _023000F8: ldr r0, [r8, #0x1f8] ldr r1, _0230038C ; =0x0231AD64 - bl Strstr + bl strstr movs sl, r0 beq ov00_023002F0 ldr fp, _02300390 ; =0x0231AD7C @@ -80563,7 +80563,7 @@ _02300180: ldr r0, [r8, #0x208] ldr r1, [r8, #0x1f8] add r2, r2, #1 - bl Memcpy + bl memcpy ldr r0, [r8, #0x1f8] add r1, sl, #7 ldr r2, [r8, #0x200] @@ -80572,11 +80572,11 @@ _02300180: str r0, [r8, #0x200] add r2, r0, #1 ldr r0, [r8, #0x1f8] - bl Memmove + bl memmove ldr sl, [r8, #0x208] mov r1, fp mov r0, sl - bl Strstr + bl strstr cmp r0, #0 beq _02300210 add r0, r0, #4 @@ -80608,7 +80608,7 @@ _02300210: ldr r1, _0230039C ; =0x0231AD84 mov r0, sl mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 bne _02300268 mov r1, sl @@ -80622,13 +80622,13 @@ _02300268: ldr r1, _023003A0 ; =0x0231AD8C mov r0, sl mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 beq _023002DC mov r0, sl mov r1, r5 mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 mov r0, sl bne _023002B0 @@ -80640,7 +80640,7 @@ _02300268: _023002B0: ldr r1, _023003A4 ; =0x0231AD9C mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 bne _023002DC mov r1, sl @@ -80652,7 +80652,7 @@ _023002B0: _023002DC: ldr r0, [r8, #0x1f8] ldr r1, _0230038C ; =0x0231AD64 - bl Strstr + bl strstr movs sl, r0 bne _0230011C arm_func_end ov00_0230002C @@ -81001,7 +81001,7 @@ _0230075C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023007A8: add r0, sp, #0x150 - bl Strlen + bl strlen add r0, r0, #1 bl ov00_022F5AE4 str r0, [r4, #8] @@ -81016,7 +81016,7 @@ _023007A8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023007E0: add r1, sp, #0x150 - bl Strcpy + bl strcpy str sb, [r4] str r5, [r4, #4] mov r2, #0 @@ -81073,7 +81073,7 @@ _0230086C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023008B8: add r0, sp, #0x150 - bl Strlen + bl strlen add r0, r0, #1 bl ov00_022F5AE4 str r0, [r4, #8] @@ -81088,7 +81088,7 @@ _023008B8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023008F0: add r1, sp, #0x150 - bl Strcpy + bl strcpy str sb, [r4] str r5, [r4, #4] mov r2, #0 @@ -81141,7 +81141,7 @@ _02300968: _023009B4: ldr r1, _023011D0 ; =0x0231AE6C add r0, sp, #0x150 - bl Strstr + bl strstr movs r7, r0 bne _023009F8 ldr r2, _023011BC ; =0x0231AE18 @@ -81160,7 +81160,7 @@ _023009F8: mov r1, #0 add r0, r7, #8 strb r1, [r7] - bl Strlen + bl strlen cmp r0, #0x20 beq _02300A40 ldr r2, _023011BC ; =0x0231AE18 @@ -81565,7 +81565,7 @@ _02300FAC: _02300FF8: ldr r1, _023011EC ; =0x0231AE94 add r0, sp, #0x150 - bl Strstr + bl strstr cmp r0, #0 bne _0230103C ldr r2, _023011BC ; =0x0231AE18 @@ -81602,7 +81602,7 @@ _02301078: mov r5, r0 ldr r1, _023011F4 ; =0x0231AEA0 add r0, sp, #0x150 - bl Strstr + bl strstr movs r1, r0 moveq r0, #0 streqb r0, [sp, #0x50] @@ -81634,7 +81634,7 @@ _023010F4: add r1, sp, #0x50 add r0, r4, #8 str r5, [r4, #4] - bl Strcpy + bl strcpy mov r2, #0 str r2, [sp] add r1, sp, #0x30 @@ -81767,7 +81767,7 @@ _023012A8: _023012E4: mov r1, #0 mov r2, #0x3c - bl Memset + bl memset ldr r0, [r8, #8] cmp r0, #0 beq _0230131C @@ -82459,7 +82459,7 @@ ov00_02301CB4: ; 0x02301CB4 ldr r4, [sp, #8] ldr r1, _02301D4C ; =0x0231AF50 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 beq _02301D40 mov r0, r4 @@ -82497,7 +82497,7 @@ ov00_02301D50: ; 0x02301D50 _02301D98: ldr r1, _02302194 ; =0x0231AF50 ldr r0, [sp, #0xc] - bl Strcmp + bl strcmp cmp r0, #0 bne _02301E58 ldr r0, [sp, #8] @@ -82562,7 +82562,7 @@ _02301E58: add r0, sp, #0x600 ldr r1, _02302198 ; =0x0231AF68 add r0, r0, #0x3c - bl Strcmp + bl strcmp cmp r0, #0 beq _02301ED4 ldr r2, _0230219C ; =0x0231AF70 @@ -82652,7 +82652,7 @@ _02301FD0: str r7, [sp] bl ov00_0230BB58 mov r0, r6 - bl Strlen + bl strlen mov r1, #2 str r1, [sp] mov r2, r0 @@ -82664,7 +82664,7 @@ _02301FD0: mov r1, #0 mov r0, r7 strb r1, [r5, r2] - bl Strlen + bl strlen mov r1, #2 str r1, [sp] mov r2, r0 @@ -83088,7 +83088,7 @@ _02302600: mov r1, r8 mov r2, r7 add r0, r6, r4 - bl Memcpy + bl memcpy add r1, r4, r7 mov r0, #0 strb r0, [r6, r1] @@ -83109,7 +83109,7 @@ ov00_02302638: ; 0x02302638 mov r6, r0 mov r5, r1 mov r0, r4 - bl Strlen + bl strlen mov r3, r0 mov r0, r6 mov r1, r5 @@ -83284,7 +83284,7 @@ ov00_02302884: ; 0x02302884 mov r6, r0 mov r5, r1 mov r0, r4 - bl Strlen + bl strlen mov r3, r0 mov r0, r6 mov r1, r5 @@ -83436,7 +83436,7 @@ _02302A44: mov r0, r6 add r1, r6, r4 add r2, r5, #1 - bl Memmove + bl memmove sub fp, fp, r4 b _02302AC8 _02302AC4: @@ -83523,7 +83523,7 @@ _02302BD4: mov r0, r5 add r1, r5, r7 add r2, r4, #1 - bl Memmove + bl memmove ldr r0, [sp, #0xc] sub r0, r0, r7 str r0, [sp, #0xc] @@ -83567,13 +83567,13 @@ ov00_02302C58: ; 0x02302C58 ldmltia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r6] mov r1, #0xa - bl Strchr + bl strchr movs r4, r0 beq _02302D7C ldr r1, _02302D88 ; =0x0231B018 sub r0, r4, #5 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 addne sp, sp, #0x10 movne r0, #3 @@ -83655,7 +83655,7 @@ ov00_02302D94: ; 0x02302D94 ldr r0, [r4] ldr r1, [r4, #0xc] add r1, r0, r1 - bl Memmove + bl memmove _02302DD4: ldr r2, [r4] ldr r1, [r4, #8] @@ -84051,7 +84051,7 @@ ov00_02303300: ; 0x02303300 ldr r1, _0230362C ; =0x0231B0BC add r0, r4, #0x220 mov r2, #0x10 - bl Strncpy + bl strncpy bl ov00_022F840C cmp r0, #0 bne _0230340C @@ -84338,7 +84338,7 @@ _023036C0: _02303740: mov r1, #0 mov r2, #0x308 - bl Memset + bl memset ldr r0, [sp, #0x3c] ldr r1, [sp, #0x2c] str r0, [r4, #0x304] @@ -84432,7 +84432,7 @@ ov00_02303860: ; 0x02303860 addeq r0, r4, #0x77 add r7, r0, #0x100 mov r0, r7 - bl Strlen + bl strlen mov r1, r0 mov r0, r7 add r2, r5, #0xa1 @@ -84485,7 +84485,7 @@ _02303934: str r2, [sp, #0xc] bl sub_020790DC add r0, sp, #0x92 - bl Strlen + bl strlen mov r1, r0 add r0, sp, #0x92 add r2, sp, #0x1f @@ -84779,7 +84779,7 @@ ov00_02303C98: ; 0x02303C98 beq _02303E5C add r0, sb, #0xc2 add r0, r0, #0x200 - bl Strlen + bl strlen mov r7, r0 ldr r0, _02303ECC ; =0x79707367 bl ov00_022F5664 @@ -84921,7 +84921,7 @@ _02303FC4: ldr r1, _02304564 ; =0x0231B364 mov r0, r6 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 beq _02304008 ldr r2, _02304568 ; =0x0231B36C @@ -84979,7 +84979,7 @@ _0230409C: ldr r1, _02304570 ; =0x0231B39C mov r0, r6 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 beq _023040E0 ldr r2, _02304568 ; =0x0231B36C @@ -85051,7 +85051,7 @@ _023041AC: ldr r1, _02304580 ; =0x0231B3D4 mov r0, r6 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 beq _023041F0 ldr r2, _02304568 ; =0x0231B36C @@ -85195,7 +85195,7 @@ _023043B0: str r2, [sp, #0xc] bl sub_020790DC add r0, sp, #0xab - bl Strlen + bl strlen mov r1, r0 add r0, sp, #0xab add r2, sp, #0x38 @@ -85222,7 +85222,7 @@ _02304434: add r0, sp, #0x38 add r1, sp, #0xab mov r2, #0x20 - bl Memcmp + bl memcmp cmp r0, #0 beq _02304478 ldr r2, _023045AC ; =0x0231B3F8 @@ -85269,7 +85269,7 @@ _023044A0: _023044E8: mov r1, #0 mov r2, #0x20 - bl Memset + bl memset ldr r0, [r5, #0x1a0] mov r3, #0 str r0, [r4, #4] @@ -85870,7 +85870,7 @@ ov00_02304D00: ; 0x02304D00 ldr r1, _0230546C ; =0x0231B468 mov r0, r4 mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 beq _02304D78 ldr r2, _02305470 ; =0x0231B470 @@ -87053,7 +87053,7 @@ _02305E0C: ldmia sp!, {r4, r5, r6, pc} _02305E3C: mov r0, r5 - bl Strlen + bl strlen cmp r0, #2 beq _02305E64 ldr r1, _023062A8 ; =0x0231B6D4 @@ -87714,12 +87714,12 @@ ov00_02306760: ; 0x02306760 arm_func_start ov00_02306784 ov00_02306784: ; 0x02306784 - ldr ip, _02306794 ; =Strcmp + ldr ip, _02306794 ; =strcmp ldr r0, [r0] ldr r1, [r1] bx ip .align 2, 0 -_02306794: .word Strcmp +_02306794: .word strcmp arm_func_end ov00_02306784 arm_func_start ov00_02306798 @@ -87881,7 +87881,7 @@ _0230699C: mov r7, r0 ldr sl, [r7] mov r0, sl - bl Strlen + bl strlen umull r1, r2, r0, r6 mov r2, r2, lsr #1 mov r1, #3 @@ -87889,10 +87889,10 @@ _0230699C: subs r2, r0, r2 mov r0, sl beq _02306A0C - bl Strlen + bl strlen mov r5, r0 mov r0, sl - bl Strlen + bl strlen mov r2, r0, lsl #2 umull r1, r0, r2, r6 umull r1, r2, r5, r6 @@ -87904,14 +87904,14 @@ _0230699C: add r5, r1, r0, lsr #1 b _02306A1C _02306A0C: - bl Strlen + bl strlen mov r1, r0, lsl #2 umull r0, r5, r1, r6 mov r5, r5, lsr #1 _02306A1C: ldr sl, [r7, #4] mov r0, sl - bl Strlen + bl strlen umull r1, r2, r0, r6 mov r2, r2, lsr #1 mov r1, #3 @@ -87919,10 +87919,10 @@ _02306A1C: subs r2, r0, r2 mov r0, sl beq _02306A7C - bl Strlen + bl strlen mov r7, r0 mov r0, sl - bl Strlen + bl strlen mov r2, r0, lsl #2 umull r1, r0, r2, r6 umull r1, r2, r7, r6 @@ -87934,7 +87934,7 @@ _02306A1C: add r2, r1, r0, lsr #1 b _02306A8C _02306A7C: - bl Strlen + bl strlen mov r1, r0, lsl #2 umull r0, r2, r1, r6 mov r2, r2, lsr #1 @@ -87947,7 +87947,7 @@ _02306A8C: blt _0230699C _02306AA4: add r0, sp, #8 - bl Strlen + bl strlen add r0, r8, r0 add r0, r0, #1 bl ov00_022F5AE4 @@ -87978,11 +87978,11 @@ _02306B04: mov r8, r0 ldr r1, _02306C80 ; =0x0231B784 mov r0, r7 - bl Strcat + bl strcat ldr r6, [r8] add r7, r7, #1 mov r0, r6 - bl Strlen + bl strlen mov r2, r0 mov r0, r6 mov r1, r7 @@ -87990,7 +87990,7 @@ _02306B04: bl ov00_022F598C ldr sb, [r8] mov r0, sb - bl Strlen + bl strlen umull r1, r2, r0, r5 mov r2, r2, lsr #1 mov r1, #3 @@ -87998,10 +87998,10 @@ _02306B04: subs r2, r0, r2 mov r0, sb beq _02306BA8 - bl Strlen + bl strlen mov r6, r0 mov r0, sb - bl Strlen + bl strlen mov r2, r0, lsl #2 umull r1, r0, r2, r5 umull r1, r2, r6, r5 @@ -88014,18 +88014,18 @@ _02306B04: add r7, r7, r0 b _02306BB8 _02306BA8: - bl Strlen + bl strlen mov r1, r0, lsl #2 umull r0, r2, r1, r5 add r7, r7, r2, lsr #1 _02306BB8: ldr r1, _02306C80 ; =0x0231B784 mov r0, r7 - bl Strcat + bl strcat ldr r6, [r8, #4] add r7, r7, #1 mov r0, r6 - bl Strlen + bl strlen mov r2, r0 mov r0, r6 mov r1, r7 @@ -88033,7 +88033,7 @@ _02306BB8: bl ov00_022F598C ldr r8, [r8, #4] mov r0, r8 - bl Strlen + bl strlen umull r1, r2, r0, r5 mov r2, r2, lsr #1 mov r1, #3 @@ -88041,10 +88041,10 @@ _02306BB8: subs r2, r0, r2 mov r0, r8 beq _02306C4C - bl Strlen + bl strlen mov r6, r0 mov r0, r8 - bl Strlen + bl strlen mov r1, r0, lsl #2 umull r0, r3, r1, r5 umull r0, r1, r6, r5 @@ -88057,7 +88057,7 @@ _02306BB8: add r7, r7, r0 b _02306C5C _02306C4C: - bl Strlen + bl strlen mov r1, r0, lsl #2 umull r0, r2, r1, r5 add r7, r7, r2, lsr #1 @@ -88115,7 +88115,7 @@ _02306CDC: _02306D04: mov r1, #0 mov r2, #0x20 - bl Memset + bl memset ldr r1, [r6, #0x1c] ldr r0, _02307038 ; =0x00000201 str r1, [r5] @@ -88219,7 +88219,7 @@ _02306E60: _02306E88: mov r1, #0 mov r2, #0x204 - bl Memset + bl memset ldr r0, [r6, #0x1c] add r1, sp, #8 str r0, [r4] @@ -88675,7 +88675,7 @@ _0230749C: cmp r0, #0 beq _023074B4 ldr r1, _023075CC ; =0x0231B7D4 - bl Strstr + bl strstr mov r3, r0 _023074B4: cmp r3, #0 @@ -88686,7 +88686,7 @@ _023074B4: ldr r1, _023075D0 ; =0x0231B7DC mov r0, r4 mov r2, #7 - bl Strncmp + bl strncmp cmp r0, #0 bne _02307528 ldr r0, [r6, #0x18] @@ -88712,7 +88712,7 @@ _02307528: ldr r1, _023075D8 ; =0x0231B808 mov r0, r4 mov r2, #6 - bl Strncmp + bl strncmp cmp r0, #0 beq _02307558 ldr r1, _023075DC ; =0x0231B810 @@ -88788,7 +88788,7 @@ ov00_023075E0: ; 0x023075E0 _02307638: ldr r0, [r4, #0x1c] ldr r1, _02307804 ; =0x0231B7D4 - bl Strstr + bl strstr cmp r0, #0 beq _023077F8 mov r1, #0 @@ -88797,7 +88797,7 @@ _02307638: ldr r1, _02307808 ; =0x0231B7B4 mov r0, r6 mov r2, #6 - bl Strncmp + bl strncmp cmp r0, #0 bne _023077DC ldr r1, _0230780C ; =0x0231B7BC @@ -88850,14 +88850,14 @@ _0230770C: add r2, r2, #0x100 bl sub_020790DC add r0, sp, #0x81 - bl Strlen + bl strlen mov r1, r0 add r0, sp, #0x81 add r2, sp, #0x10 bl ov00_022F4F3C add r0, sp, #0x31 add r1, sp, #0x10 - bl Strcmp + bl strcmp cmp r0, #0 beq _023077AC ldr r2, _0230781C ; =0x0231B7DC @@ -89518,7 +89518,7 @@ ov00_02307FF4: ; 0x02307FF4 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r1, #0 mov r2, #0x50 - bl Memset + bl memset mov r0, #0x64 stmia r4, {r0, r6} mov r0, #0 @@ -89662,7 +89662,7 @@ ov00_023081E4: ; 0x023081E4 moveq r0, #3 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r6 - bl Strlen + bl strlen mov r5, r0 add r1, sp, #0 mov r3, #0 @@ -89786,7 +89786,7 @@ ov00_023083A8: ; 0x023083A8 cmp r4, r0 bne _023083EC mov r0, r5 - bl Strlen + bl strlen mov r4, r0 _023083EC: ldr r1, _02308478 ; =0x0231B8B0 @@ -89898,7 +89898,7 @@ _02308564: mov r1, sl mov r2, sb add r0, r6, r7 - bl Memcpy + bl memcpy str r6, [r5, #0x1c] ldr r0, [r5, #0x24] mov r1, #0 @@ -90006,7 +90006,7 @@ _023086A0: ov00_023086AC: ; 0x023086AC stmdb sp!, {r3, lr} ldr r0, [r0] - bl DivideInt + bl __divsi3 mov r0, r1 ldmia sp!, {r3, pc} arm_func_end ov00_023086AC @@ -90139,7 +90139,7 @@ ov00_0230883C: ; 0x0230883C ldr r1, _0230898C ; =0x0231B8C0 mov r0, r6 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 beq _023088B0 ldr r2, _02308990 ; =0x0231B8C8 @@ -90304,7 +90304,7 @@ ov00_02308A88: ; 0x02308A88 ldr r1, _02308B8C ; =0x0231B914 mov r0, r7 mov r2, #5 - bl Strncmp + bl strncmp cmp r0, #0 beq _02308B00 ldr r2, _02308B90 ; =0x0231B8C8 @@ -90399,12 +90399,12 @@ ov00_02308BE0: ; 0x02308BE0 beq _02308C38 ldr r0, [r5] ldr r1, [r4] - bl Strcmp + bl strcmp cmp r0, #0 bne _02308C38 ldr r0, [r5, #4] ldr r1, [r4, #8] - bl Strcmp + bl strcmp cmp r0, #0 bne _02308C38 ldr r1, [r5, #8] @@ -90728,7 +90728,7 @@ ov00_0230901C: ; 0x0230901C _02309050: mov r1, #0 mov r2, #0x154 - bl Memset + bl memset str r5, [r4] mvn r0, #0 str r0, [r4, #4] @@ -91618,7 +91618,7 @@ _02309D00: _02309D60: ldr r0, [r6, #8] ldr r1, _0230A1D4 ; =0x0231BBC4 - bl Strstr + bl strstr cmp r0, #0 beq _0230B46C mov r0, #0 @@ -91666,7 +91666,7 @@ _02309DF0: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230A1E0 ; =0x0231BBF8 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309E8C str r5, [sp] @@ -91681,12 +91681,12 @@ _02309DF0: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230A1E4 ; =0x0231BC00 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309E80 ldr r1, _0230A1E8 ; =0x0231BC08 mov r0, r5 - bl Strcmp + bl strcmp cmp r0, #0 movne r0, #0x600 strne r0, [sp, #0x94] @@ -91697,7 +91697,7 @@ _02309E80: _02309E8C: ldr r1, _0230A1EC ; =0x0231BC0C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A048 ldr r1, [sp, #0x90] @@ -91726,7 +91726,7 @@ _02309EE4: add sb, r7, r8 mov r0, sb mov r2, #0xac - bl Memset + bl memset mov r0, r5 bl sub_0208B360 str r0, [r7, r8] @@ -91745,7 +91745,7 @@ _02309F18: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230A1F4 ; =0x0231BC10 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309F6C add r0, sb, #4 @@ -91756,7 +91756,7 @@ _02309F18: _02309F6C: ldr r1, _0230A1F8 ; =0x0231BC18 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309F94 add r0, sb, #0x23 @@ -91767,7 +91767,7 @@ _02309F6C: _02309F94: ldr r1, _0230A1FC ; =0x0231BC24 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309FBC add r0, sb, #0x38 @@ -91778,7 +91778,7 @@ _02309F94: _02309FBC: ldr r1, _0230A200 ; =0x0231BC30 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _02309FE4 add r0, sb, #0x57 @@ -91789,7 +91789,7 @@ _02309FBC: _02309FE4: ldr r1, _0230A204 ; =0x0231BC3C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A00C add r0, sb, #0x76 @@ -91800,12 +91800,12 @@ _02309FE4: _0230A00C: ldr r1, _0230A1EC ; =0x0231BC0C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230A034 ldr r1, _0230A1E0 ; =0x0231BBF8 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A03C _0230A034: @@ -91960,7 +91960,7 @@ _0230A214: add r0, sp, #0x200 ldr r1, _0230A20C ; =0x0231BC6C add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230A2B0 ldr r2, _0230A208 ; =0x0231BC44 @@ -92039,7 +92039,7 @@ _0230A390: add r0, r8, #4 add r1, r6, #0x5c str r2, [r8] - bl Strcpy + bl strcpy mov r1, #0 str r1, [r8, #0x38] str r1, [r8, #0x3c] @@ -92059,7 +92059,7 @@ _0230A390: add r0, sp, #0x200 ldr r1, _0230A210 ; =0x0231BC70 add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230A42C ldr r2, _0230A208 ; =0x0231BC44 @@ -92094,7 +92094,7 @@ _0230A444: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, r4 mov r1, fp - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A51C ldr r0, [r8, #0x3c] @@ -92141,7 +92141,7 @@ _0230A4E8: _0230A51C: ldr r1, _0230A1F8 ; =0x0231BC18 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A5CC ldr r0, [r8, #0x38] @@ -92188,7 +92188,7 @@ _0230A59C: _0230A5CC: ldr r1, _0230B494 ; =0x0231BC74 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 moveq sb, #1 beq _0230A614 @@ -92265,14 +92265,14 @@ _0230A6C8: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B498 ; =0x0231BC7C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x20] beq _0230A8A8 ldr r1, _0230B49C ; =0x0231BC84 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A878 ldr r0, [fp, #8] @@ -92301,7 +92301,7 @@ _0230A764: add r7, r8, sb mov r0, r7 mov r2, #0x128 - bl Memset + bl memset mov r0, #1 str r0, [r7, #0x24] mov r0, r5 @@ -92322,7 +92322,7 @@ _0230A7A0: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B4A0 ; =0x0231BC88 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A7F4 add r0, r7, #0x28 @@ -92333,7 +92333,7 @@ _0230A7A0: _0230A7F4: ldr r1, _0230A1F4 ; =0x0231BC10 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A818 add r0, r7, #4 @@ -92343,7 +92343,7 @@ _0230A7F4: _0230A818: ldr r1, _0230B4A4 ; =0x0231BC90 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A83C mov r0, r5 @@ -92353,12 +92353,12 @@ _0230A818: _0230A83C: ldr r1, _0230B49C ; =0x0231BC84 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230A864 ldr r1, _0230B498 ; =0x0231BC7C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230A86C _0230A864: @@ -92424,7 +92424,7 @@ _0230A8EC: add r0, sp, #0x200 ldr r1, _0230B4A8 ; =0x0231BC9C add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230A988 ldr r2, _0230A208 ; =0x0231BC44 @@ -92524,7 +92524,7 @@ _0230AA64: add r0, sp, #0x200 ldr r1, _0230B4B0 ; =0x0231BCA8 add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230AB00 ldr r2, _0230A208 ; =0x0231BC44 @@ -92641,7 +92641,7 @@ _0230AC30: add r0, sp, #0x200 ldr r1, _0230B4B4 ; =0x0231BCAC add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230ACB8 ldr r2, _0230A208 ; =0x0231BC44 @@ -92675,14 +92675,14 @@ _0230ACCC: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B4B8 ; =0x0231BCB4 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x24] beq _0230AF04 ldr r1, _0230B4BC ; =0x0231BCBC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AED4 ldr r1, [fp, #4] @@ -92710,7 +92710,7 @@ _0230AD60: mov r1, #0 mov r0, r7 mov r2, #0xac - bl Memset + bl memset ldr r1, [fp, #4] mov r0, r5 add r1, r1, #1 @@ -92732,7 +92732,7 @@ _0230ADA4: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230A1F4 ; =0x0231BC10 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230ADF8 add r0, r7, #4 @@ -92743,7 +92743,7 @@ _0230ADA4: _0230ADF8: ldr r1, _0230A1F8 ; =0x0231BC18 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AE20 add r0, r7, #0x23 @@ -92754,7 +92754,7 @@ _0230ADF8: _0230AE20: ldr r1, _0230B4C0 ; =0x0231BCC0 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AE48 add r0, r7, #0x38 @@ -92765,7 +92765,7 @@ _0230AE20: _0230AE48: ldr r1, _0230B4C4 ; =0x0231BCC8 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AE70 add r0, r7, #0x57 @@ -92776,7 +92776,7 @@ _0230AE48: _0230AE70: ldr r1, _0230A204 ; =0x0231BC3C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AE98 add r0, r7, #0x76 @@ -92787,12 +92787,12 @@ _0230AE70: _0230AE98: ldr r1, _0230B4BC ; =0x0231BCBC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230AEC0 ldr r1, _0230B4B8 ; =0x0231BCB4 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230AEC8 _0230AEC0: @@ -92874,7 +92874,7 @@ _0230AF98: add r0, sp, #0x200 ldr r1, _0230B4C8 ; =0x0231BCD0 add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230B020 ldr r2, _0230A208 ; =0x0231BC44 @@ -92908,14 +92908,14 @@ _0230B034: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B4CC ; =0x0231BCDC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x28] beq _0230B1DC ldr r1, _0230B4BC ; =0x0231BCBC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230B1AC ldr r1, [fp, #4] @@ -92970,7 +92970,7 @@ _0230B11C: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B4D4 ; =0x0231BC18 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230B170 add r0, r7, #4 @@ -92981,12 +92981,12 @@ _0230B11C: _0230B170: ldr r1, _0230B4BC ; =0x0231BCBC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230B198 ldr r1, _0230B4CC ; =0x0231BCDC mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230B1A0 _0230B198: @@ -93069,7 +93069,7 @@ _0230B274: add r0, sp, #0x200 ldr r1, _0230B4DC ; =0x0231BCE4 add r0, r0, #0xc9 - bl Strcmp + bl strcmp cmp r0, #0 beq _0230B2FC ldr r2, _0230B4D8 ; =0x0231BC44 @@ -93119,7 +93119,7 @@ _0230B34C: ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0230B4E0 ; =0x0231BC10 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0230B3D8 mov r0, #0x15 @@ -93146,7 +93146,7 @@ _0230B3C4: _0230B3D8: ldr r1, _0230B4E4 ; =0x0231BCE8 mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 streq r7, [r8, #4] moveq sb, #1 @@ -93405,7 +93405,7 @@ ov00_0230B728: ; 0x0230B728 ldr r1, _0230B820 ; =0x0231BD20 mov r0, r4 mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 beq _0230B79C ldr r2, _0230B824 ; =0x0231BD28 @@ -93478,7 +93478,7 @@ ov00_0230B82C: ; 0x0230B82C ldr r1, _0230B924 ; =0x0231BD68 mov r0, r4 mov r2, #4 - bl Strncmp + bl strncmp cmp r0, #0 beq _0230B8A0 ldr r2, _0230B928 ; =0x0231BD28 @@ -93539,7 +93539,7 @@ ov00_0230B930: ; 0x0230B930 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r2 - bl Strncpy + bl strncpy add r0, r5, r4 mov r1, #0 strb r1, [r0, #-1] @@ -93557,7 +93557,7 @@ ov00_0230B950: ; 0x0230B950 mov r0, r6 mov r2, #7 ldr r4, [r7] - bl Strncmp + bl strncmp cmp r0, #0 bne _0230BA0C ldr r1, _0230BA1C ; =0x0231BD78 @@ -93583,7 +93583,7 @@ _0230B9A8: beq _0230BA00 ldr r1, _0230BA24 ; =0x0231BD8C mov r0, r6 - bl Strstr + bl strstr cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -93615,12 +93615,12 @@ ov00_0230BA28: ; 0x0230BA28 ldrsb r6, [r8] mov r4, r2 mov r7, r3 - bl Strstr + bl strstr movs r5, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r8 - bl Strlen + bl strlen add r1, r5, r0 mov r3, #0 sub r0, r7, #1 @@ -93825,7 +93825,7 @@ ov00_0230BCE0: ; 0x0230BCE0 sub sp, sp, #0x20 mov sl, r0 mov sb, r1 - bl Strlen + bl strlen mov r7, r0 ldr r0, _0230BD64 ; =0x79707367 bl ov00_022F5664 @@ -94043,7 +94043,7 @@ ov00_0230BFA0: ; 0x0230BFA0 bl ov00_0230C24C ldr r0, [r0] ldr r1, [r5] - bl DivideInt + bl __divsi3 bl ov00_0230C16C mov r1, r0 mov r0, r4 @@ -94078,19 +94078,19 @@ ov00_0230C024: ; 0x0230C024 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} bl ov00_0230C24C mov r5, r0 - bl Strlen + bl strlen mov r4, r0 mov r0, r7 - bl Strlen + bl strlen add r0, r4, r0 add r0, r0, #1 bl ov00_022F5AE4 mov r4, r0 mov r1, r5 - bl Strcpy + bl strcpy mov r0, r4 mov r1, r7 - bl Strcat + bl strcat mov r0, r6 mov r1, r4 bl ov00_0230C1D0 @@ -94119,7 +94119,7 @@ ov00_0230C098: ; 0x0230C098 ldr r2, [r7] ldr r0, [r0] mla r0, r1, r0, r2 - bl DivideInt + bl __divsi3 bl ov00_0230C16C mov r1, r0 mov r0, r4 @@ -94388,7 +94388,7 @@ _0230C3F8: ldr r0, [sl, #0x28] sub r2, r1, r5 add r1, r0, r5 - bl Memmove + bl memmove ldr r0, [sl, #8] sub r0, r0, r5 str r0, [sl, #8] @@ -94456,19 +94456,19 @@ _0230C4DC: ldr r3, [r2, #0x20] eor r3, r3, #1 str r3, [r2, #0x20] - bl Strcat + bl strcat ldr r1, _0230C590 ; =0x0231BE4C add r0, sp, #0 - bl Strcat + bl strcat add r1, sp, #0 mov r0, r4 - bl Strstr + bl strstr movs r4, r0 addeq sp, sp, #0x100 moveq r0, #0 ldmeqia sp!, {r4, pc} add r0, sp, #0 - bl Strlen + bl strlen ldr r1, _0230C58C ; =0x023289E8 ldr r2, _0230C594 ; =0x02328C18 ldr r1, [r1, #0x20] @@ -94715,7 +94715,7 @@ ov00_0230C7E4: ; 0x0230C7E4 mov r6, r0 ldr r1, _0230C8C0 ; =0x0231BE84 mov r0, r4 - bl Strstr + bl strstr cmp r0, #0 ldreq r3, _0230C8C4 ; =0x0231BE48 moveq r6, #0 @@ -94789,7 +94789,7 @@ ov00_0230C960: ; 0x0230C960 mov r3, #0 mov r2, #8 strb r3, [r5, r4] - bl Strncmp + bl strncmp cmp r0, #0 bne _0230C998 mov r0, r5 @@ -94800,7 +94800,7 @@ _0230C998: ldr r1, _0230CA3C ; =0x0231BEA0 mov r0, r5 mov r2, #9 - bl Strncmp + bl strncmp cmp r0, #0 bne _0230C9C0 mov r0, r5 @@ -94811,7 +94811,7 @@ _0230C9C0: ldr r1, _0230CA3C ; =0x0231BEA0 mov r0, r5 mov r2, #9 - bl Strncmp + bl strncmp cmp r0, #0 bne _0230C9E8 mov r0, r5 @@ -94822,7 +94822,7 @@ _0230C9E8: ldr r1, _0230CA40 ; =0x0231BEAC mov r0, r5 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 bne _0230CA10 mov r0, r5 @@ -94833,7 +94833,7 @@ _0230CA10: ldr r1, _0230CA44 ; =0x0231BEB8 mov r0, r5 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -95461,7 +95461,7 @@ ov00_0230D220: ; 0x0230D220 mov r5, r0 ldr r0, _0230D320 ; =0x0231BED4 mov r4, r1 - bl Strlen + bl strlen mov r7, r0 mov r0, r4 bl ov00_0230D08C @@ -95492,11 +95492,11 @@ _0230D284: ldrnesb r6, [r0, #-1] mov r1, r7 add r0, sl, sb - bl DivideInt + bl __divsi3 mul r0, r6, r8 mov r6, r1 mov r1, r7 - bl DivideInt + bl __divsi3 ldr r0, _0230D320 ; =0x0231BED4 ldrsb r3, [r0, r6] ldrsb r2, [r0, r1] @@ -95506,7 +95506,7 @@ _0230D284: add r0, r1, r0, ror #27 ldrb r0, [r4, r0] eor r0, r0, r2 - bl Abs + bl abs ldr r1, _0230D324 ; =0x2C0B02C1 smull r2, r3, r1, r0 mov r1, r0, lsr #0x1f @@ -95608,7 +95608,7 @@ ov00_0230D3E0: ; 0x0230D3E0 cmp r5, r0 bne _0230D410 mov r0, r6 - bl Strlen + bl strlen mov r5, r0 _0230D410: ldr r3, [r4] @@ -95616,7 +95616,7 @@ _0230D410: mov r1, r6 mov r2, r5 add r0, r3, r0 - bl Memcpy + bl memcpy ldr r0, [r4, #8] add r0, r0, r5 str r0, [r4, #8] @@ -95638,7 +95638,7 @@ ov00_0230D438: ; 0x0230D438 add r0, r0, r1 add r1, r0, r4 sub r2, r2, r4 - bl Memmove + bl memmove ldr r0, [r5, #8] sub r0, r0, r4 str r0, [r5, #8] @@ -96192,7 +96192,7 @@ ov00_0230DBB8: ; 0x0230DBB8 bxeq lr ldr r1, [sp, #0x34] ldr r2, [sp, #0x38] - bl Memcpy + bl memcpy ldr r0, [sp, #0x38] str r0, [r5, #0x3c] _0230DC18: @@ -97941,7 +97941,7 @@ ov00_0230F210: ; 0x0230F210 ldr r1, _0230F2A0 ; =0x0231BEF8 mov r0, r5 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, pc} @@ -98082,7 +98082,7 @@ _0230F418: ldr r1, _0230F698 ; =0x0231BF00 mov r0, r4 mov r2, #2 - bl Memcmp + bl memcmp cmp r0, #0 moveq r5, #1 beq _0230F440 @@ -98187,7 +98187,7 @@ _0230F588: ldr r1, _0230F698 ; =0x0231BF00 add r0, r4, #2 mov r2, #2 - bl Memcmp + bl memcmp cmp r0, #0 bne _0230F5D0 ldrb r0, [sb, #1] @@ -98883,7 +98883,7 @@ ov00_0230FF0C: ; 0x0230FF0C ldr r0, [r0, #0x44] mov r2, #2 add r0, r8, r0 - bl Memcmp + bl memcmp cmp r0, #0 beq _0230FF64 _0230FF44: @@ -99162,7 +99162,7 @@ ov00_023102C8: ; 0x023102C8 ldrh r0, [r2, #4] ldr r2, [r2] mul r0, r2, r0 - bl DivideUInt + bl __udivsi3 mov r0, r1 ldmia sp!, {r3, pc} arm_func_end ov00_023102C8 @@ -99241,7 +99241,7 @@ ov00_02310364: ; 0x02310364 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, pc} mov r1, #0 mov r2, #0x4c - bl Memset + bl memset mvn r0, #0 str r0, [r4] str r7, [r4, #0x3c] @@ -99422,7 +99422,7 @@ ov00_02310604: ; 0x02310604 beq _02310794 mov r1, #0 mov r2, #0xa0 - bl Memset + bl memset ldr r0, [sp] str r5, [r0] ldr r0, [sp] @@ -99898,7 +99898,7 @@ ov00_02310CA4: ; 0x02310CA4 moveq r5, r4 beq _02310DDC mov r1, #0x3a - bl Strchr + bl strchr movs r5, r0 moveq r5, r4 beq _02310D98 @@ -99909,7 +99909,7 @@ ov00_02310CA4: ; 0x02310CA4 add r0, sp, #0 mov r1, r8 mov r2, sb - bl Memcpy + bl memcpy add r8, sp, #0 mov r0, r4 strb r0, [r8, sb] @@ -100004,7 +100004,7 @@ _02310E28: cmp r1, r0 ldmneia sp!, {r4, pc} mov r0, r2 - bl Strlen + bl strlen add r0, r0, #1 str r0, [r4] ldmia sp!, {r4, pc} @@ -100117,7 +100117,7 @@ _02310F68: ldr r0, _02311224 ; =0x02328E98 ldr r1, _02311228 ; =0x0231BF24 mov r2, #6 - bl Memcmp + bl memcmp cmp r0, #0 addne sp, sp, #0x68 movne r0, #1 @@ -100342,7 +100342,7 @@ ov00_02311238: ; 0x02311238 ldrh r1, [r6, #0xc0] ldrh r0, [r6, #0xb0] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 blt _023112EC mov r0, #5 @@ -100358,7 +100358,7 @@ _023112EC: ldrh r1, [r6, #0xc0] ldrh r0, [r6, #0xb0] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 blt _02311328 mov r0, #5 @@ -100374,7 +100374,7 @@ _02311328: ldrh r1, [r6, #0xc0] ldrh r0, [r6, #0xb0] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 blt _02311364 mov r0, #5 @@ -100389,7 +100389,7 @@ _02311364: ldrh r1, [r6, #0xc0] ldrh r0, [r6, #0xb0] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 blt _0231139C mov r0, #5 @@ -100589,7 +100589,7 @@ ov00_0231160C: ; 0x0231160C stmdb sp!, {r3, lr} ldr r1, _0231162C ; =0x0231BF24 mov r2, #6 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -100737,13 +100737,13 @@ ov00_0231171C: ; 0x0231171C strb sb, [r1, #1] strb r8, [r1, #2] strb r7, [r1, #3] - bl Strlen + bl strlen cmp r0, #0 beq _02311830 ldr r1, _02311864 ; =0x02328804 add r0, sp, #0x1b mov r2, #0x32 - bl Memcpy + bl memcpy _02311830: mov r0, #0x49 str r0, [sp] @@ -100886,9 +100886,9 @@ ov00_02311918: ; 0x02311918 strb r3, [sp, #0x16] strb r2, [sp, #0x17] strb r2, [sp, #0x18] - bl Strcpy + bl strcpy ldr r0, _02311B84 ; =0x02328804 - bl Strlen + bl strlen ldrb r1, [r5, #0xe] add r4, r0, #0x16 cmp r1, #0 @@ -101894,10 +101894,10 @@ _0231281C: bl sub_020895E4 mov r1, r7 add r0, r6, #4 - bl Strcpy + bl strcpy ldr r1, [sp, #0x58] add r0, r6, #0x44 - bl Strcpy + bl strcpy str r4, [r6, #0xc0] mov r5, #0 str r5, [r6, #0xac] @@ -101960,7 +101960,7 @@ _02312908: add r0, r6, #0x114 mov r2, #0xc80 str r1, [r6, #0x100] - bl Memset + bl memset bl ov00_02312DB0 ldr r0, [sp, #0x5c] cmp r0, #0 @@ -102296,7 +102296,7 @@ ov00_02312D44: ; 0x02312D44 mov r6, r1 mov r4, r0 mov r0, r6 - bl Strlen + bl strlen ldr r3, [r4, #0x578] ldr r1, _02312DAC ; =0x00000578 add r5, r0, #1 @@ -102309,7 +102309,7 @@ ov00_02312D44: ; 0x02312D44 mov r1, r6 mov r2, r5 add r0, r4, r3 - bl Memcpy + bl memcpy ldr r0, [r4, #0x578] mov r1, #0 add r0, r0, r5 @@ -102385,7 +102385,7 @@ _02312E70: bne _02312EB8 ldr r1, _02312EC8 ; =0x0231CD7C mov r0, r7 - bl Strcmp + bl strcmp cmp r0, #0 beq _02312EB8 mov r0, r7 @@ -102527,7 +102527,7 @@ _02313038: rsb r2, r3, r2, lsl #24 add r2, r3, r2, ror #24 and r5, r2, #0xff - bl DivideInt + bl __divsi3 and r4, r1, #0xff mov r0, r6 add r1, fp, r5 @@ -102618,9 +102618,9 @@ ov00_02313160: ; 0x02313160 ldmneia sp!, {r3, r4, r5, r6, pc} add r0, sp, #0 mov r1, r2 - bl Strcpy + bl strcpy add r0, r6, #0x44 - bl Strlen + bl strlen mov r1, r0 add r2, sp, #0 add r0, r6, #0x44 @@ -102633,7 +102633,7 @@ ov00_02313160: ; 0x02313160 bl ov00_02312F28 ldr r0, [r4, #0x578] add r0, r4, r0 - bl Strlen + bl strlen ldr r1, [r4, #0x578] add r0, r0, #1 add r0, r1, r0 @@ -103614,7 +103614,7 @@ _02313F8C: mov r2, r7 add r0, r3, r0 strb r4, [sp, #0x10] - bl Memcpy + bl memcpy ldr r0, [sp, #0x588] add r0, r0, r7 str r0, [sp, #0x588] @@ -103849,7 +103849,7 @@ _023142FC: ldr r2, [sp, #0xb18] add r0, sp, #0x24 add r1, sp, #0x5a0 - bl Memcpy + bl memcpy ldr r0, [sp, #0xb18] mov r2, #0xff str r0, [sp, #0x59c] @@ -103881,7 +103881,7 @@ _02314380: ldr r2, [sp, #0x59c] add r0, sp, #0x5a0 add r1, sp, #0x24 - bl Memcpy + bl memcpy ldr r0, [sp, #0x59c] str r0, [sp, #0xb18] b _023143C4 @@ -103936,13 +103936,13 @@ ov00_0231443C: ; 0x0231443C ldr r1, _02314480 ; =0x0231CF68 mov r4, r0 ldr r1, [r1, #0x7c] - bl Strcmp + bl strcmp cmp r0, #0 beq _02314470 ldr r1, _02314480 ; =0x0231CF68 mov r0, r4 ldr r1, [r1, #0x80] - bl Strcmp + bl strcmp cmp r0, #0 bne _02314478 _02314470: @@ -103999,7 +103999,7 @@ _02314508: and r0, r5, r0 bls _02314528 mov r1, sb - bl DivideUInt + bl __udivsi3 mov r0, r1 _02314528: cmp r0, sb @@ -104543,7 +104543,7 @@ _02314C54: ldr r0, _02314D08 ; =0x0231D37C mov r1, r8 mov r2, #8 - bl Strncmp + bl strncmp cmp r0, #0 bne _02314CA4 mov r0, sb @@ -104596,7 +104596,7 @@ ov00_02314D0C: ; 0x02314D0C mov r5, r0 ldr r1, _02314DA0 ; =0x0231D388 mov r0, r7 - bl Strstr + bl strstr cmp r0, #0 movne r6, #1 moveq r6, #0 @@ -105006,7 +105006,7 @@ ov00_02315204: ; 0x02315204 beq _0231524C ldr r4, [r0, #4] mov r0, r4 - bl Strlen + bl strlen cmp r0, #0 bne _02315258 _0231524C: @@ -105029,7 +105029,7 @@ ov00_02315264: ; 0x02315264 ldmeqia sp!, {r4, r5, r6, pc} ldr r1, _02315304 ; =0x0231D3A4 mov r0, r5 - bl Strcmp + bl strcmp cmp r0, #0 mov r0, r6 bne _0231529C @@ -105151,7 +105151,7 @@ ov00_02315394: ; 0x02315394 _023153BC: ldr r1, [r4, r5, lsl #2] mov r0, r6 - bl Strcmp + bl strcmp cmp r0, #0 addeq sp, sp, #8 moveq r0, #0 @@ -105356,7 +105356,7 @@ _02315644: mov r0, r8 add sl, sl, r4 sub sb, sb, r4 - bl Strlen + bl strlen add r0, r0, #1 add r7, r7, #1 add r8, r8, r0 @@ -105401,7 +105401,7 @@ ov00_023156D4: ; 0x023156D4 add sb, sb, r0 sub r8, r8, r0 ldr r0, _02315924 ; =0x0231D3B8 - bl Strlen + bl strlen mov r2, r0 ldr r0, _02315924 ; =0x0231D3B8 mov r1, r4 @@ -105565,7 +105565,7 @@ _0231595C: bne _02315948 _0231596C: mov r0, ip - bl DivideUInt + bl __udivsi3 mov r0, r1 ldmia sp!, {r3, pc} .align 2, 0 @@ -105750,7 +105750,7 @@ _02315B5C: ldrb r0, [sb, r6] ldr r7, [r4, r0, lsl #2] mov r0, r7 - bl Strlen + bl strlen add r0, r5, r0 add r0, r0, #1 cmp r0, #0x100 @@ -106180,22 +106180,22 @@ ov00_0231607C: ; 0x0231607C ldr r0, _02316130 ; =0x0231D3C8 ldr r6, [r0] mov r0, r6 - bl Strlen + bl strlen cmp r5, r0 bls _02316108 ldr r0, _02316130 ; =0x0231D3C8 ldr r5, [r4, #0x7c] ldr r7, [r0] mov r0, r7 - bl Strlen + bl strlen mov r2, r0 mov r0, r5 mov r1, r7 - bl Strncmp + bl strncmp cmp r0, #0 bne _02316108 mov r0, r6 - bl Strlen + bl strlen mov r1, r0 mov r0, r4 add r1, r5, r1 @@ -106245,7 +106245,7 @@ _02316168: bne _02316154 _02316178: mov r0, ip - bl DivideUInt + bl __udivsi3 mov r0, r1 ldmia sp!, {r3, pc} .align 2, 0 @@ -106267,7 +106267,7 @@ ov00_02316190: ; 0x02316190 add r0, sp, #8 cmp r1, #0 beq _023161C8 - bl Strcpy + bl strcpy b _023161D4 _023161C8: ldr r1, _023162B4 ; =0x0231D3E0 @@ -106345,12 +106345,12 @@ ov00_023162BC: ; 0x023162BC mov r4, r0 mov r0, r7 mov r6, r2 - bl Strlen + bl strlen add r5, r0, #1 ldr r0, [r4] mov r1, r7 mov r2, r5 - bl Memcpy + bl memcpy ldr r0, [r6] add r0, r0, r5 str r0, [r6] @@ -106433,7 +106433,7 @@ ov00_023163DC: ; 0x023163DC ldr r0, [r6] mov r4, r3 mov r5, r2 - bl Memcpy + bl memcpy ldr r0, [r4] add r0, r0, r5 str r0, [r4] @@ -106571,13 +106571,13 @@ ov00_023165A0: ; 0x023165A0 ldreq r6, _023167D8 ; =0x0231D3DC mov r0, r7 mov r4, r3 - bl Strlen + bl strlen cmp r0, #0x100 addhi sp, sp, #0x30c movhi r0, #6 ldmhiia sp!, {r4, r5, r6, r7, pc} mov r0, r6 - bl Strlen + bl strlen cmp r0, #0x100 addhi sp, sp, #0x30c movhi r0, #6 @@ -106822,7 +106822,7 @@ ov00_02316920: ; 0x02316920 mov r7, r2 add r0, sb, #0x54 mov r8, r1 - bl Strlen + bl strlen mov r5, r0 cmp r7, #0 add r6, sb, #0x54 @@ -106831,7 +106831,7 @@ ov00_02316920: ; 0x02316920 _0231694C: mov r0, r4 mov r1, r5 - bl DivideInt + bl __divsi3 ldrsb r1, [r6, r1] mov r2, r4, lsr #0x1f rsb r0, r2, r4, lsl #29 @@ -107141,7 +107141,7 @@ _02316D64: mov r2, r8 bl ov00_0231518C mov r0, r8 - bl Strlen + bl strlen add r0, r0, #1 add r8, r8, r0 sub r7, r7, r0 @@ -107170,7 +107170,7 @@ _02316DDC: _02316DE8: mov r0, r8 mov r4, r8 - bl Strlen + bl strlen add r3, r0, #1 add r8, r8, r3 mov r0, sb @@ -107179,7 +107179,7 @@ _02316DE8: sub r7, r7, r3 bl ov00_0231518C mov r0, r8 - bl Strlen + bl strlen add r0, r0, #1 add r8, r8, r0 sub r7, r7, r0 @@ -107258,7 +107258,7 @@ _02316F1C: ldr r1, _02316FB8 ; =0x0231D3FC add r0, r5, #1 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 addeq sp, sp, #0xc mvneq r0, #0 @@ -107584,7 +107584,7 @@ _023173B0: beq _023173D8 mov r1, r5 mov r2, r6 - bl Memmove + bl memmove _023173D8: str r6, [r7, #0x80] mov r0, #0 @@ -108082,7 +108082,7 @@ _02317AC0: cmpne r0, #0 beq _02317AE4 add r1, r0, r1 - bl Memmove + bl memmove _02317AE4: cmp r6, #0 bne _02317AF8 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 58de5d82..c2ef2f69 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -924,8 +924,8 @@ ov01_0232A048: ; 0x0232A048 _0232A074: .word ov01_0233C240 arm_func_end ov01_0232A048 - arm_func_start ov01_0232A078 -ov01_0232A078: ; 0x0232A078 + arm_func_start DoMoveNightShade +DoMoveNightShade: ; 0x0232A078 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl EnableIrqFlag @@ -1006,7 +1006,7 @@ _0232A180: .align 2, 0 _0232A18C: .word ov01_0233C240 _0232A190: .word ov01_0233C0C0 - arm_func_end ov01_0232A078 + arm_func_end DoMoveNightShade arm_func_start ov01_0232A194 ov01_0232A194: ; 0x0232A194 @@ -1807,7 +1807,7 @@ _0232ABBC: cmpne r1, #2 movne r1, #3 strne r1, [r0, #0x7c] - ldr r0, _0232ABFC ; =ov01_0232A078 + ldr r0, _0232ABFC ; =DoMoveNightShade bl ov00_022BFB9C cmp r0, #2 ldrne r0, _0232ABF8 ; =ov01_0233C240 @@ -1818,7 +1818,7 @@ _0232ABBC: ldmia sp!, {r3, pc} .align 2, 0 _0232ABF8: .word ov01_0233C240 -_0232ABFC: .word ov01_0232A078 +_0232ABFC: .word DoMoveNightShade arm_func_end ov01_0232AB88 arm_func_start ov01_0232AC00 @@ -3501,7 +3501,7 @@ ov01_0232C148: ; 0x0232C148 ldr r1, _0232C1D0 ; =0x0233C780 ldr r0, _0232C1CC ; =0x0233C800 ldrsh r1, [r1] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r1, r6 mov r0, #0xc str r0, [sp] @@ -3512,7 +3512,7 @@ ov01_0232C148: ; 0x0232C148 str r2, [sp, #0xc] ldr r0, _0232C1CC ; =0x0233C800 mov r3, r2 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, _0232C1CC ; =0x0233C800 mov r0, #0 strh r0, [r1, #0x38] @@ -3551,7 +3551,7 @@ ov01_0232C1D8: ; 0x0232C1D8 str r3, [sp, #8] mov r3, r2 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _0232C23C ; =0x0233C140 mov r1, #1 strb r1, [r0] @@ -3633,7 +3633,7 @@ ov01_0232C2E4: ; 0x0232C2E4 mov r2, r0 ldr r0, [r1] mov r1, #2 - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldr r1, _0232C368 ; =0x0233C87C b _0232C358 _0232C330: @@ -3645,7 +3645,7 @@ _0232C330: mov r2, r0 ldr r0, [r1] mov r1, #2 - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldr r1, _0232C368 ; =0x0233C87C _0232C358: strh r0, [r1] @@ -3689,7 +3689,7 @@ ov01_0232C3AC: ; 0x0232C3AC ldr r1, _0232C44C ; =0x0233C87C ldr r0, _0232C448 ; =0x0233C8FC ldrsh r1, [r1] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #0xd str r0, [sp] mov r1, #0 @@ -3702,7 +3702,7 @@ ov01_0232C3AC: ; 0x0232C3AC rsb r2, r3, r6, lsl #29 add r2, r3, r2, ror #29 mov r3, #0x20 - bl sub_0201C2CC + bl SetAnimationForAnimationControl mov r1, #0 ldr r0, _0232C448 ; =0x0233C8FC strh r1, [r0, #0x38] @@ -3751,7 +3751,7 @@ ov01_0232C454: ; 0x0232C454 add r2, r3, r2, ror #29 mov r3, #0x20 str ip, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _0232C4D0 ; =0x0233C144 mov r1, #1 strb r1, [r0] @@ -7567,13 +7567,13 @@ ov01_0232F830: ; 0x0232F830 bl InitPreprocessorArgs ldr r1, _0232F904 ; =0x00002710 mov r0, r4 - bl DivideUInt + bl __udivsi3 ldr r1, _0232F904 ; =0x00002710 - bl DivideUInt + bl __udivsi3 str r1, [sp, #0x28] ldr r1, _0232F904 ; =0x00002710 mov r0, r4 - bl DivideUInt + bl __udivsi3 mov r0, r5 str r1, [sp, #0x2c] bl sub_02027B1C @@ -8409,7 +8409,7 @@ ov01_02330224: ; 0x02330224 ldr r1, [r0] add r0, r1, #0x94 ldrsh r1, [r1, #0x90] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r1, #4 str r1, [sp] mov r2, #0 @@ -8421,7 +8421,7 @@ ov01_02330224: ; 0x02330224 mov r3, r2 ldr r0, [r0] add r0, r0, #0x94 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _02330584 ; =0x0233C164 mov r2, #0x78 ldr r1, [r0] @@ -8449,7 +8449,7 @@ ov01_02330224: ; 0x02330224 ldr r0, [r0] ldrsh r1, [r0, #0x90] add r0, r0, #0x110 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #5 str r0, [sp] mov r2, #0 @@ -8462,7 +8462,7 @@ ov01_02330224: ; 0x02330224 mov r1, #8 add r0, r0, #0x110 mov r3, #0x100 - bl sub_0201C2CC + bl SetAnimationForAnimationControl mov ip, #0x78 ldr r1, _02330584 ; =0x0233C164 mov r3, #0x64 @@ -8493,7 +8493,7 @@ ov01_02330224: ; 0x02330224 ldr r1, [r0] add r0, r1, #0x18c ldrsh r1, [r1, #0x90] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #6 str r0, [sp] mov r2, #0 @@ -8506,7 +8506,7 @@ ov01_02330224: ; 0x02330224 ldr r0, [r0] mov r3, #0x200 add r0, r0, #0x18c - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, _02330584 ; =0x0233C164 mov r3, #0x78 ldr r0, [r1] @@ -8526,7 +8526,7 @@ ov01_02330224: ; 0x02330224 ldr r0, [r0] ldrsh r1, [r0, #0x92] add r0, r0, #0x208 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, #7 str r0, [sp] mov r2, #0 @@ -8538,7 +8538,7 @@ ov01_02330224: ; 0x02330224 ldr r0, [r0] mov r3, #0x300 add r0, r0, #0x208 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, _02330584 ; =0x0233C164 mov r2, #0x50 ldr r0, [r1] @@ -8982,7 +8982,7 @@ _02330B38: mov r3, r2 add r0, ip, #0x94 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _02330D54 ; =0x0233C164 ldr r2, [r0] ldr r1, [r2, #0x48] @@ -9032,7 +9032,7 @@ _02330BE8: add r0, r3, #0x110 mov r3, #0x100 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r1, _02330D54 ; =0x0233C164 ldr r2, [r1] ldr r0, [r2, #0x48] @@ -9075,7 +9075,7 @@ _02330C64: moveq r1, #0 mov r3, #0x200 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r2, _02330D54 ; =0x0233C164 mov ip, #0x9c ldr r1, [r2] @@ -9110,7 +9110,7 @@ _02330CEC: movne r1, #0 mov r3, #0x300 str r2, [sp, #0xc] - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _02330D54 ; =0x0233C164 mov r1, #0 ldr r0, [r0] @@ -9270,7 +9270,7 @@ _02330F18: add r0, sp, #0x10 ldr r2, [r1, r3, lsl #3] ldr r1, _02330FF0 ; =0x0233B504 - bl Sprintf + bl sprintf ldr r0, _02330FF4 ; =0x020AFC68 add r1, sp, #0x10 ldr r0, [r0] @@ -9287,7 +9287,7 @@ _02330F18: ldr r1, _02330FE4 ; =0x0233C174 ldr r0, _02330FF8 ; =0x0233C978 ldrsh r1, [r1, #2] - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r3, #0xa mov r1, #0 str r3, [sp] @@ -9297,7 +9297,7 @@ _02330F18: ldr r0, _02330FF8 ; =0x0233C978 str r2, [sp, #0xc] mov r2, r1 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r2, _02330FF8 ; =0x0233C978 mov r0, #0 strh r0, [r2, #0x38] @@ -9397,8 +9397,8 @@ _023310DC: .word 0x0233B558 _023310E0: .word 0x0233C178 arm_func_end ov01_023310B8 - arm_func_start ov01_023310E4 -ov01_023310E4: ; 0x023310E4 + arm_func_start CreateMainMenus +CreateMainMenus: ; 0x023310E4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r0, #0x184 mov r1, #8 @@ -9502,7 +9502,7 @@ _0233124C: beq _02331268 mov r0, #2 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption _02331268: bl sub_02048480 cmp r0, #0 @@ -9516,7 +9516,7 @@ _02331268: beq _023312A0 mov r0, #0xa mov r1, r4 - bl ov01_02331558 + bl AddMainMenuOption b _0233131C _023312A0: bl sub_0204E210 @@ -9524,7 +9524,7 @@ _023312A0: bne _023312BC mov r0, #0xd mov r1, r4 - bl ov01_02331558 + bl AddMainMenuOption b _0233131C _023312BC: mvn r1, #0 @@ -9532,27 +9532,27 @@ _023312BC: beq _023312D8 mov r0, #0x1b mov r1, r4 - bl ov01_02331558 + bl AddMainMenuOption b _0233131C _023312D8: mov r1, r4 mov r0, #0x1a mov r4, #0 - bl ov01_02331558 + bl AddMainMenuOption bl sub_0204E644 cmp r0, #0 beq _0233131C mov r0, #0xc mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption b _0233131C _02331304: mov r1, r4 mov r0, #0xb - bl ov01_02331558 + bl AddMainMenuOption mov r0, #0xe mov r1, r4 - bl ov01_02331558 + bl AddMainMenuOption _0233131C: mov r0, #4 bl GetPerformanceFlagWithChecks @@ -9560,7 +9560,7 @@ _0233131C: beq _02331338 mov r0, #0xf mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _02331338: mov r0, #3 bl GetPerformanceFlagWithChecks @@ -9568,7 +9568,7 @@ _02331338: beq _02331354 mov r0, #0x12 mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _02331354: mov r0, #4 bl GetPerformanceFlagWithChecks @@ -9576,7 +9576,7 @@ _02331354: beq _02331370 mov r0, #0x11 mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _02331370: mov r0, #8 bl GetPerformanceFlagWithChecks @@ -9584,7 +9584,7 @@ _02331370: beq _0233138C mov r0, #0x13 mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _0233138C: mov r0, #0x1a bl GetPerformanceFlagWithChecks @@ -9592,37 +9592,37 @@ _0233138C: beq _023313A8 mov r0, #0x14 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption _023313A8: mov r0, #1 bl GetPerformanceFlagWithChecks mov r1, r0 mov r0, #8 - bl ov01_02331630 + bl AddSubMenuOption mov r0, #9 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption mov r0, #0x18 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption mov r0, #7 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption b _023313FC _023313E4: mov r0, #0x18 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption mov r0, #3 mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _023313FC: mov r0, #0x19 mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption mov r0, #0x10 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption ldr r0, _0233154C ; =0x0233C178 ldr r0, [r0] ldr r0, [r0, #0x114] @@ -9635,28 +9635,28 @@ _023313FC: beq _0233144C mov r0, #0x1f mov r1, #0 - bl ov01_02331558 + bl AddMainMenuOption b _02331480 _0233144C: mov r0, #0x1d mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption b _02331480 _0233145C: cmp r4, #0 beq _02331474 mov r0, #0x1e mov r1, #0 - bl ov01_02331558 + bl AddMainMenuOption b _02331480 _02331474: mov r0, #0x1c mov r1, #1 - bl ov01_02331558 + bl AddMainMenuOption _02331480: mov r0, #0x21 mov r1, #1 - bl ov01_02331630 + bl AddSubMenuOption ldr r2, _0233154C ; =0x0233C178 mov r1, #0 ldr r4, [r2] @@ -9709,10 +9709,10 @@ _02331480: _0233154C: .word 0x0233C178 _02331550: .word 0x000001E6 _02331554: .word 0x000001EA - arm_func_end ov01_023310E4 + arm_func_end CreateMainMenus - arm_func_start ov01_02331558 -ov01_02331558: ; 0x02331558 + arm_func_start AddMainMenuOption +AddMainMenuOption: ; 0x02331558 ldr r2, _023315EC ; =0x0233B5D0 b _023315DC _02331560: @@ -9756,7 +9756,7 @@ _023315DC: .align 2, 0 _023315EC: .word 0x0233B5D0 _023315F0: .word 0x0233C178 - arm_func_end ov01_02331558 + arm_func_end AddMainMenuOption arm_func_start ov01_023315F4 ov01_023315F4: ; 0x023315F4 @@ -9780,8 +9780,8 @@ _0233161C: _0233162C: .word 0x0233C178 arm_func_end ov01_023315F4 - arm_func_start ov01_02331630 -ov01_02331630: ; 0x02331630 + arm_func_start AddSubMenuOption +AddSubMenuOption: ; 0x02331630 ldr r2, _023316C4 ; =0x0233B588 b _023316B4 _02331638: @@ -9825,7 +9825,7 @@ _023316B4: .align 2, 0 _023316C4: .word 0x0233B588 _023316C8: .word 0x0233C178 - arm_func_end ov01_02331630 + arm_func_end AddSubMenuOption arm_func_start ov01_023316CC ov01_023316CC: ; 0x023316CC @@ -12005,7 +12005,7 @@ _02333580: mov r1, r8 mov r2, r5 mov r3, r4 - bl sub_0202A3E4 + bl PrintClearMark ldr r1, [sb] add r8, r8, #2 add r1, r1, r7 @@ -13707,7 +13707,7 @@ _02334C9C: _02334CA0: mov r0, r5 mov r1, r6 - bl Strcpy + bl strcpy ldr r2, [r7, #0xc] cmp r2, r4 beq _02334CD8 @@ -14048,11 +14048,11 @@ _023350EC: bge _0233513C mov r0, r5 mov r1, #0x12 - bl DivideInt + bl __divsi3 mov r6, r1 mov r0, r5 mov r1, #0x12 - bl DivideInt + bl __divsi3 mov r1, #0xc mul r2, r6, r1 mov r1, r0, lsl #4 @@ -14180,13 +14180,13 @@ ov01_02335280: ; 0x02335280 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 mov r0, r4 - bl DivideInt + bl __divsi3 movs r6, r1 movne r5, #2 mov r0, r4 mov r1, #6 moveq r5, #0 - bl DivideInt + bl __divsi3 add r0, r6, r0, lsl #3 add r0, r0, r5 mov r0, r0, lsl #0x10 @@ -14450,7 +14450,7 @@ ov01_0233562C: ; 0x0233562C bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -14466,12 +14466,12 @@ ov01_02335654: ; 0x02335654 cmp r1, #0x5b bne _0233569C ldr r1, _02335720 ; =0x0233BB04 - bl Strcmp + bl strcmp cmp r0, #0 beq _02335694 ldr r1, _02335724 ; =0x0233BB0C mov r0, r4 - bl Strcmp + bl strcmp cmp r0, #0 bne _0233569C _02335694: @@ -17944,7 +17944,7 @@ _02338438: _02338474: ldr r0, [sb, #0x58] mov r1, #0xa - bl DivideInt + bl __divsi3 cmp r1, #0 bne _023384B8 ldr r0, _02338844 ; =0x0233C210 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index 1ec20e3d..215d9aec 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -5549,7 +5549,7 @@ ov02_0232DD08: ; 0x0232DD08 ldr r0, [r0, #4] sub r0, r0, r4 mul r0, r2, r0 - bl DivideInt + bl __divsi3 add r0, r4, r0 ldmia sp!, {r4, pc} arm_func_end ov02_0232DD08 @@ -6097,12 +6097,12 @@ _0232E17A: str r0, [sp, #0x60] ldr r0, [sp, #0xc] lsl r1, r1, #2 - bl DivideInt + bl __divsi3 str r0, [sp, #0x14] mov r1, #0xfa ldr r0, [sp, #0xc] lsl r1, r1, #2 - bl DivideInt + bl __divsi3 mov r0, #0xfa lsl r0, r0, #2 mul r0, r1 @@ -9345,7 +9345,7 @@ _0232FAF0: ldr r1, [sp] add r0, r7, r0 ldr r1, [r1, #0xc] - bl DivideUInt + bl __udivsi3 ldrb r0, [r4, r1] add r6, r6, #1 strb r7, [r4, r1] @@ -9401,14 +9401,14 @@ ov02_0232FB4C: ; 0x0232FB4C ldr r0, [r5] ldr r1, [sp] add r0, r0, #1 - bl DivideUInt + bl __udivsi3 lsl r0, r1, #0x18 lsr r7, r0, #0x18 ldrb r6, [r4, r7] ldr r0, [r5, #4] ldr r1, [sp] add r0, r6, r0 - bl DivideUInt + bl __udivsi3 lsl r0, r1, #0x18 lsr r1, r0, #0x18 ldrb r0, [r4, r1] @@ -9418,7 +9418,7 @@ ov02_0232FB4C: ; 0x0232FB4C strb r0, [r4, r7] ldr r1, [r5, #0xc] add r0, r6, r0 - bl DivideUInt + bl __udivsi3 ldrb r0, [r4, r1] pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -9586,7 +9586,7 @@ ov02_0232FCA0: ; 0x0232FCA0 asr r4, r1, #1 add r1, r6, #0 add r7, r3, #0 - bl DivideInt + bl __divsi3 mov r0, #0 cmp r4, #0 ble _0232FCD2 @@ -13093,7 +13093,7 @@ _02331614: add r0, #2 add r1, r6, #4 mov r2, #0x20 - bl Memcpy + bl memcpy add r0, sp, #0x48 ldr r1, [r6] mov r7, #0 @@ -13124,19 +13124,19 @@ _02331646: _0233165C: add r0, sp, #0x48 add r0, #2 - bl Strlen + bl strlen add r2, r0, #0 add r0, sp, #0x48 add r0, #2 add r1, r4, #4 - bl Memcmp + bl memcmp cmp r0, #0 bne _02331696 add r1, r4, #0 ldr r0, [sp, #0x24] add r1, #0x28 mov r2, #6 - bl Memcmp + bl memcmp cmp r0, #0 bne _02331696 ldrh r1, [r6, #0x2e] @@ -13197,16 +13197,16 @@ _023316E8: add r0, r7, #0 add r1, r5, #4 mov r2, #0x20 - bl Memcpy + bl memcpy ldr r1, [r5] mov r0, #0 strb r0, [r7, r1] ldr r0, _023317B0 ; =0x02353074 - bl Strlen + bl strlen add r2, r0, #0 ldr r1, _023317B0 ; =0x02353074 add r0, r7, #0 - bl Memcmp + bl memcmp cmp r0, #0 bne _02331718 ldrh r0, [r5, #0x2e] @@ -13235,23 +13235,23 @@ _02331734: add r0, r5, #0 add r1, r4, #4 mov r2, #0x20 - bl Memcpy + bl memcpy ldr r1, [r4] mov r0, #0 strb r0, [r5, r1] add r0, r5, #0 - bl Strlen + bl strlen add r6, r0, #0 add r0, r7, #0 - bl Strlen + bl strlen cmp r6, r0 bne _02331776 add r0, r7, #0 - bl Strlen + bl strlen add r2, r0, #0 add r0, r5, #0 add r1, r7, #0 - bl Memcmp + bl memcmp cmp r0, #0 bne _02331776 ldrh r0, [r4, #0x2e] @@ -13477,7 +13477,7 @@ _0233190A: ldr r0, [sp, #4] add r1, #0xc mov r2, #0x20 - bl Memcpy + bl memcpy ldrh r0, [r5, #0xa] str r0, [r7, #4] ldrh r0, [r5, #0xa] @@ -13543,7 +13543,7 @@ _02331966: add r1, r4, #4 str r2, [r0, #0x18] ldr r0, _02331A40 ; =0x023599E0 - bl Strcpy + bl strcpy add r0, r4, #0 add r4, #0x28 ldrb r2, [r4] @@ -13567,7 +13567,7 @@ _023319C0: ldr r0, [sp, #8] ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] - bl Memcpy + bl memcpy ldr r0, _02331A2C ; =0x023594D0 mov r1, #2 str r1, [r0, #0x38] @@ -13869,7 +13869,7 @@ ov02_02331B9C: ; 0x02331B9C _02331BEC: add r0, r6, #6 add r2, r7, #0 - bl Memcpy + bl memcpy _02331BF4: mov r0, #0 strb r0, [r6] @@ -13969,11 +13969,11 @@ ov02_02331C60: ; 0x02331C60 add r0, r5, #0 add r1, r3, #0 add r2, r6, #0 - bl Memset + bl memset add r0, r5, #0 add r1, r7, #0 add r2, r4, #0 - bl Memcpy + bl memcpy add r0, r5, r6 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14159,7 +14159,7 @@ _02331DE4: _02331DFE: ldr r2, [sp, #4] add r0, r6, #0 - bl Memcpy + bl memcpy _02331E06: ldr r0, [sp, #4] add sp, #0xc @@ -14305,7 +14305,7 @@ ov02_02331EB4: ; 0x02331EB4 add r0, sp, #4 add r0, #2 mov r2, #6 - bl Memcmp + bl memcmp cmp r0, #0 bgt _02331F48 add r1, sp, #0 @@ -14443,7 +14443,7 @@ _0233201A: ldr r2, [sp, #0xc] add r0, r3, #0 add r1, r5, #0 - bl Memcpy + bl memcpy mov r0, #1 str r0, [sp] b _0233214A @@ -14533,7 +14533,7 @@ _023320C6: mov r2, #0x20 add r0, r1, r0 mov r1, #0 - bl Memset + bl memset ldr r0, _02332170 ; =0x02359850 ldr r1, _0233217C ; =0x00000206 ldr r0, [r0, #0x30] @@ -14570,7 +14570,7 @@ _02332110: add r0, r0, r1 ldr r2, [sp, #0xc] add r1, r5, #0 - bl Memcpy + bl memcpy b _0233214A _02332126: ldr r3, _02332180 ; =0x02359920 @@ -14589,7 +14589,7 @@ _02332126: ldr r2, [sp, #0xc] add r0, r3, #0 add r1, r5, #0 - bl Memcpy + bl memcpy _0233214A: ldr r2, [sp, #4] ldr r1, [sp, #8] @@ -14730,7 +14730,7 @@ ov02_02332238: ; 0x02332238 str r0, [sp] ldr r0, _023323A0 ; =0x0235963C ldr r1, _023323A4 ; =0x02359824 - bl Strcpy + bl strcpy ldr r1, _023323A8 ; =0x02359850 ldr r0, [r1] cmp r0, #3 @@ -14772,12 +14772,12 @@ _02332288: add r0, sp, #4 add r1, r6, #0 mov r2, #0x20 - bl Memcpy + bl memcpy mov r1, #0 add r0, sp, #0x24 strb r1, [r0] add r0, sp, #4 - bl Strlen + bl strlen cmp r0, #0x10 bhi _023322C0 cmp r0, #0xa @@ -15479,7 +15479,7 @@ _0233280E: add r1, r5, #0 add r0, #8 add r2, r4, #0 - bl Memcpy + bl memcpy add r3, sp, #0x58 add r2, sp, #0x48 mov r1, #8 @@ -15722,7 +15722,7 @@ _023329DE: ldr r0, [sp] add r1, r5, #0 sub r2, r4, #1 - bl Memcpy + bl memcpy mov r0, #5 str r0, [sp, #0x24] ldr r0, [sp, #0x14] @@ -15886,7 +15886,7 @@ _02332B2E: add r0, sp, #0x48 add r1, sp, #0x58 mov r2, #8 - bl Memcmp + bl memcmp cmp r0, #0 beq _02332B40 mov r0, #0 @@ -18732,7 +18732,7 @@ ov02_0233415C: ; 0x0233415C beq _02334176 mov r1, #0 add r2, r4, #0 - bl Memset + bl memset _02334176: add r0, r5, #0 pop {r3, r4, r5, pc} @@ -19041,7 +19041,7 @@ ov02_023343AC: ; 0x023343AC push {r3, lr} ldr r1, _023343BC ; =0x0235963C mov r2, #0xe8 - bl Memcpy + bl memcpy mov r0, #1 pop {r3, pc} nop @@ -19790,7 +19790,7 @@ ov02_02334D48: ; 0x02334D48 ldr r0, _02334DA0 ; =0x0235AA10 mov r1, r4 mov r2, #0x3f - bl Strncpy + bl strncpy ldrb r0, [r4, #5] cmp r0, #0x78 ldreq r0, _02334DA0 ; =0x0235AA10 @@ -32474,7 +32474,7 @@ ov02_0233EFC8: ; 0x0233EFC8 ldr r4, [r0] mov r2, #3 add r0, r4, #8 - bl Memcmp + bl memcmp cmp r0, #0 movne r0, #3 strneb r0, [r4, #0x14] @@ -35129,7 +35129,7 @@ _023413F0: add r0, sp, #0 mov r2, r4 mov r1, #0x2a - bl Memset + bl memset add r0, sp, #0 mov r1, r5 bl ov02_023417DC @@ -42562,7 +42562,7 @@ _02347250: mov r1, r5 mov r2, r4 add r0, r8, #0x20 - bl Memcmp + bl memcmp cmp r0, #0 add r7, r7, #1 addne r6, r6, #1 @@ -42641,7 +42641,7 @@ _02347354: mov r2, r6 add r0, r4, #4 add r1, r7, #0x20 - bl Memcmp + bl memcmp cmp r0, #0 beq _0234737C add r5, r5, #1 @@ -42659,7 +42659,7 @@ _02347394: mov r1, r7 mov r2, r6 add r0, r8, #0x20 - bl Memcmp + bl memcmp cmp r0, #0 beq _023473BC add r5, r5, #1 @@ -42717,7 +42717,7 @@ _02347444: ldr r0, [r1, #8] mov r1, r5 mov r2, r4 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #2 streqb r0, [sb, #0x28] @@ -43155,7 +43155,7 @@ _02347958: strb r0, [r5, #0x4f4] add r0, r4, #0xc0 mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 ldrne r0, _02347A14 ; =0x0235AB48 movne r1, #0 @@ -43166,13 +43166,13 @@ _02347958: strb r1, [r0, #0x4f5] ldr r1, _02347A18 ; =0x02352DC4 add r0, r4, #0xc8 - bl Memcmp + bl memcmp cmp r0, #0 bne _023479D8 ldr r1, _02347A18 ; =0x02352DC4 add r0, r4, #0xcc mov r2, #4 - bl Memcmp + bl memcmp cmp r0, #0 beq _023479EC _023479D8: @@ -44871,7 +44871,7 @@ _0234900C: ldr r1, _02349140 ; =0x02352E04 add r0, r6, #0xc mov r2, #8 - bl Memcmp + bl memcmp cmp r0, #0 bne _0234912C ldr r0, _02349144 ; =0x0235AB58 @@ -44883,7 +44883,7 @@ _0234904C: mov r1, r8 mov r2, r4 add r0, r6, #4 - bl Memcmp + bl memcmp cmp r0, #0 bne _023490A4 rsb r0, r5, r5, lsl #3 @@ -44915,7 +44915,7 @@ _023490C4: mov r0, r8 mov r1, r5 mov r2, r4 - bl Memcmp + bl memcmp cmp r0, #0 bne _0234911C rsb r4, sl, sl, lsl #3 @@ -44983,7 +44983,7 @@ _023491A8: ldr r1, _02349254 ; =0x02352E04 mov r2, #8 add r0, r5, #0xc - bl Memcmp + bl memcmp cmp r0, #0 bne _02349240 ldrb r0, [r5, #0x15] @@ -44995,7 +44995,7 @@ _023491DC: mov r1, r8 mov r2, r4 add r0, r5, #4 - bl Memcmp + bl memcmp cmp r0, #0 bne _02349230 rsb r0, r7, r7, lsl #3 @@ -45055,7 +45055,7 @@ _023492AC: mov r0, r8 mov r1, r4 mov r2, fp - bl Memcmp + bl memcmp cmp r0, #0 beq _023492D8 add r0, sb, #0x1000 @@ -49688,10 +49688,10 @@ ov02_0234CFAC: ; 0x0234CFAC mov r6, r1 mov r7, r0 mov r5, r2 - bl Strlen + bl strlen mov r4, r0 mov r0, r6 - bl Strlen + bl strlen cmp r4, r5 cmpge r0, r5 movlt r0, #0 @@ -49701,7 +49701,7 @@ ov02_0234CFAC: ; 0x0234CFAC mov r2, r5 add r0, r7, r3 add r1, r6, r1 - bl Memcmp + bl memcmp cmp r0, #0 moveq r0, #1 movne r0, #0 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index d481d58a..92282aa8 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -10510,7 +10510,7 @@ _02345E2C: ldr r3, [r2, #4] ldr r2, _02346670 ; =0x0000030F ldrb r8, [r3, #0xae] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom mov r5, #0 mov fp, r5 mov r4, #1 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index 0fdb81e6..3176b61e 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -646,7 +646,7 @@ ov04_0233D1D8: ; 0x0233D1D8 ldr r2, _0233D2B0 ; =0x0000030F add r0, sp, #0 strb ip, [r3, #0x92d] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _0233D2A8 ; =0x0233F644 ldr r2, [sp] ldr r0, [r0] diff --git a/asm/overlay_07.s b/asm/overlay_07.s index 7d840b1a..212097f8 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -1199,13 +1199,13 @@ ov07_0233D9DC: ; 0x0233D9DC bl PreprocessStringFromMessageId ldr r1, _0233DAA4 ; =0x02341ACC mov r0, r5 - bl Strcat + bl strcat ldrh r1, [r7, r6] add r0, sp, #0x54 bl ov07_0233DC48 mov r0, r5 add r1, sp, #0x54 - bl Strcat + bl strcat ldrb r0, [r8, #2] cmp r0, #0 movne r0, #1 @@ -1314,13 +1314,13 @@ ov07_0233DB50: ; 0x0233DB50 bl PreprocessStringFromMessageId ldr r1, _0233DC44 ; =0x02341ACC mov r0, r5 - bl Strcat + bl strcat ldrh r1, [r8, r7] mov r0, r6 bl ov07_0233DC48 mov r0, r5 mov r1, r6 - bl Strcat + bl strcat mov r0, r4 mov r1, #4 mov r2, #2 @@ -5521,7 +5521,7 @@ _02341688: bge _023416F0 mov r0, r7 mov r1, #0x1b - bl DivideInt + bl __divsi3 cmp r1, #0 bne _023416E4 strb r6, [sl, r8] diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 131200a3..c8c3ec0b 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -738,7 +738,7 @@ _022BD414: _022BD428: ldr r1, _022BD448 ; =0x022C4404 mov r0, r4 - bl Strcpy + bl strcpy _022BD434: add sp, sp, #0x54 ldmia sp!, {r4, r5, r6, r7, pc} @@ -757,7 +757,7 @@ SprintfStatic__022BD44C: ; 0x022BD44C bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -1113,7 +1113,7 @@ _022BD888: ldr r0, [r0] mov r1, #3 mov r2, #0x124 - bl sub_0201D484 + bl LoadWanTableEntryFromPack mov r1, #0 mov r2, r1 mov r4, r0 @@ -1128,7 +1128,7 @@ _022BD888: ldr r0, [r0] mov r1, #3 mov r2, #1 - bl sub_0201D484 + bl LoadWanTableEntryFromPack mov r4, r0 mov r2, #0 str r2, [sp] @@ -1161,7 +1161,7 @@ _022BD9D0: ldr r0, [r0] mov r1, #3 mov r2, #0x124 - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldr r1, _022BDA78 ; =ov10_022DC1C0 mov r2, #0 ldr r1, [r1] @@ -1186,7 +1186,7 @@ _022BD9D0: mov r1, #3 ldr r0, [r0] mov r3, r2 - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldr r2, _022BDA78 ; =ov10_022DC1C0 mov r3, #0 ldr r1, [r2] @@ -1815,7 +1815,7 @@ _022BE21C: bl sub_0201C0B0 ldrsh r1, [r7, #0x64] add r0, r7, #0x68 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl add r0, r7, #0x68 bl sub_0201C108 ldr r0, [r7, #0x48] @@ -1830,7 +1830,7 @@ _022BE21C: ldr r1, [r7, #0x50] mov r3, r3, lsl #0x10 mov r3, r3, asr #0x10 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldrh r0, [r7, #0x6a] orr r0, r0, #0x30 orr r0, r0, #0x1000 @@ -1841,7 +1841,7 @@ _022BE280: bl sub_0201C0B0 ldrsh r1, [r7, #0x64] add r0, r7, #0x68 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl add r0, r7, #0x68 bl sub_0201C108 ldr r0, [r7, #0x48] @@ -1856,7 +1856,7 @@ _022BE280: ldr r1, [r7, #0x50] mov r3, r3, lsl #0x10 mov r3, r3, asr #0x10 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldr r0, _022BE448 ; =ov10_022DC1C0 ldr r0, [r0] add r0, r0, #0x2700 @@ -1874,7 +1874,7 @@ _022BE300: bl sub_0201C0B0 ldrsh r1, [r7, #0x64] add r0, r7, #0x68 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl ldr r0, [r7, #0x48] mov r2, #0 and r0, r0, #0xff @@ -1887,7 +1887,7 @@ _022BE300: ldr r1, [r7, #0x50] mov r3, r3, lsl #0x10 mov r3, r3, asr #0x10 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldrh r0, [r7, #0x6a] cmp r5, #0 orr r0, r0, #0x30 @@ -1902,7 +1902,7 @@ _022BE36C: bl sub_0201C0B0 ldrsh r1, [r7, #0x64] add r0, r7, #0x68 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl ldr r0, [r7, #0x48] mov r2, #0 and r0, r0, #0xff @@ -1915,7 +1915,7 @@ _022BE36C: ldr r1, [r7, #0x50] mov r3, r3, lsl #0x10 mov r3, r3, asr #0x10 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldrh r1, [r7, #0x6a] add r0, r7, #0x68 orr r1, r1, #0x10 @@ -2478,13 +2478,13 @@ ov10_022BEB2C: ; 0x022BEB2C ldrsh r1, [r0, #0x2e] ldrsh r0, [r0, #0x2a] sub r0, r1, r0 - bl Abs + bl abs add r1, r4, #0x100 ldrsh r2, [r1, #0x2c] ldrsh r1, [r1, #0x28] mov r6, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r0, r6 movle r0, r6 mov r1, r0, asr #1 @@ -2502,11 +2502,11 @@ ov10_022BEB2C: ; 0x022BEB2C mul r2, r0, r6 strh r2, [r4, #0x26] ldrsh r0, [r4, #0x24] - bl DivideInt + bl __divsi3 strh r0, [r4, #0x24] ldrsh r0, [r4, #0x26] add r1, r6, #1 - bl DivideInt + bl __divsi3 strh r0, [r4, #0x26] ldrsh r0, [r4, #0x26] sub r0, r0, #9 @@ -2832,7 +2832,7 @@ ov10_022BF01C: ; 0x022BF01C mov r5, r0 mov r0, r6 mov r1, #0x258 - bl DivideInt + bl __divsi3 mov r1, r1, lsl #0x10 ldrsh r3, [r4, #0x14] mov r2, #0 @@ -2865,7 +2865,7 @@ ov10_022BF088: ; 0x022BF088 mov r5, r0 mov r0, r6 mov r1, #0x258 - bl DivideInt + bl __divsi3 mov r1, r1, lsl #0x10 ldrsh r3, [r4, #0x14] mov r2, #0 @@ -2898,7 +2898,7 @@ ov10_022BF0F4: ; 0x022BF0F4 mov r5, r0 mov r0, r6 mov r1, #0x258 - bl DivideInt + bl __divsi3 mov r1, r1, lsl #0x10 ldrsh r3, [r4, #0x14] mov r2, #0 @@ -3249,7 +3249,7 @@ _022BF580: b _022BF6D4 _022BF598: add r0, r6, #0x68 - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame ldr r1, [r6, #0x10] mov r0, #0 mov r2, r1, lsr #0x1f @@ -3622,7 +3622,7 @@ ov10_022BFA3C: ; 0x022BFA3C mov r5, r0 mov r0, r6 mov r1, #0x258 - bl DivideInt + bl __divsi3 mov r1, r1, lsl #0x10 ldrsh r3, [r4, #0x14] mov r2, #0 @@ -4441,7 +4441,7 @@ _022C042C: ldr r0, [r0] mov r1, #3 mov r3, #0xf - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldmia sp!, {r3, pc} .align 2, 0 _022C044C: .word 0x020AFC68 @@ -4916,7 +4916,7 @@ ov10_022C09E8: ; 0x022C09E8 ldr r0, [r0] add r2, r1, #0x400 mov r3, #0xf - bl sub_0201D484 + bl LoadWanTableEntryFromPack ldr r1, _022C0CC0 ; =0x022DC1D0 ldr r2, [r1] strh r0, [r2, #4] @@ -4927,7 +4927,7 @@ ov10_022C09E8: ; 0x022C09E8 ldr r0, [r0] ldrsh r1, [r0, #4] add r0, r0, #8 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl ldr r0, _022C0CC0 ; =0x022DC1D0 mov r1, #0 ldr r3, [r0] @@ -4949,7 +4949,7 @@ ov10_022C09E8: ; 0x022C09E8 ldr r0, [r0] mov r3, #0x71 add r0, r0, #8 - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl mov r3, r4 ldr r0, _022C0CC0 ; =0x022DC1D0 mov r2, r5 @@ -5063,7 +5063,7 @@ _022C0C30: bl InitPortraitBoxWithMonsterId ldrb r1, [r8, sb] mov r0, fp - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r0, #1 ldr r1, [r7, sb, lsl #2] mov r2, r0 @@ -5202,21 +5202,21 @@ _022C0E48: _022C0E50: add r0, sp, #0x10 add r1, sp, #8 - bl SetPortraitAttrStruct + bl SetPortraitOffset ldr r1, _022C0F68 ; =0x022DC1CC add r0, sp, #0x10 ldrb r1, [r1, sl] - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldrb r0, [r7] cmp r0, #0 add r0, sp, #0x10 bne _022C0E88 mov r1, r4 - bl SetPortraitExpressionId + bl SetPortraitEmotion b _022C0E90 _022C0E88: mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion _022C0E90: ldr r0, [fp] add r1, sp, #0x10 @@ -5337,7 +5337,7 @@ _022C1010: _022C1030: mov r0, r4 mov r1, r7 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r1, r6 ldrsh r6, [sp, #0x50] @@ -5354,7 +5354,7 @@ _022C1030: mov r0, r4 mov r2, #7 mov r3, r3, asr #0x10 - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl ldr r0, _022C11CC ; =0x022DC1D0 mov r1, #0 ldr r0, [r0] @@ -5417,7 +5417,7 @@ _022C1104: b _022C1178 _022C1164: mov r0, r4 - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame add r0, r5, #1 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 @@ -5508,7 +5508,7 @@ _022C123C: beq _022C12EC ldrsh r1, [r7, #0x52] mov r0, r6 - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r3, #0x14 and r1, r0, #3 @@ -5521,7 +5521,7 @@ _022C123C: mov r0, r6 mov r2, #7 mov r3, r3, asr #0x10 - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl _022C12EC: mov r1, r8, lsr #0x1f rsb r0, r1, r8, lsl #31 @@ -5758,7 +5758,7 @@ _022C15F4: ldrsh r8, [r0, #0x48] add r1, r0, #1 add r0, sp, #0x54 - bl Strcpy + bl strcpy mov r0, sl mov r1, #0 mov r2, sb @@ -5922,7 +5922,7 @@ SprintfStatic__022C183C: ; 0x022C183C bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -6113,7 +6113,7 @@ _022C1AA4: strneb r1, [r0, r7] add r0, r5, #1 add r1, r6, #1 - bl Strcmp + bl strcmp cmp r0, #0 addne r0, sp, #8 movne r1, #1 @@ -6312,7 +6312,7 @@ ov10_022C1D78: ; 0x022C1D78 add r0, r4, #1 mov r5, r3 strb ip, [r4] - bl Strcpy + bl strcpy strh r5, [r4, #0x42] ldrsh r1, [sp, #0x10] str r6, [r4, #0x44] @@ -6342,7 +6342,7 @@ ov10_022C1DE0: ; 0x022C1DE0 add r0, r4, #1 mov r5, r3 strb ip, [r4] - bl Strcpy + bl strcpy strh r5, [r4, #0x42] ldrsh r1, [sp, #0x10] str r6, [r4, #0x44] @@ -6907,7 +6907,7 @@ ov10_022C2528: ; 0x022C2528 bl MultiplyByFixedPoint mov r4, r0 str r0, [r5] - bl Abs + bl abs ldr r1, [sp, #0x10] cmp r0, r1 bgt _022C256C @@ -6922,14 +6922,14 @@ _022C256C: ldmia sp!, {r3, r4, r5, pc} arm_func_end ov10_022C2528 - arm_func_start ov10_022C2574 -ov10_022C2574: ; 0x022C2574 + arm_func_start IsBackgroundTileset +IsBackgroundTileset: ; 0x022C2574 cmp r0, #0xaa movge r0, #1 movlt r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov10_022C2574 + arm_func_end IsBackgroundTileset arm_func_start ov10_022C2588 ov10_022C2588: ; 0x022C2588 @@ -7066,7 +7066,7 @@ ov10_022C2720: ; 0x022C2720 mov r6, r0 mov r0, r5 mov r4, r2 - bl ov10_022C2574 + bl IsBackgroundTileset cmp r0, #0 mov r0, r5 bne _022C2788 @@ -7170,8 +7170,8 @@ _022C2884: .word 0x022DC224 _022C2888: .word 0x00000FFF arm_func_end ov10_022C2838 - arm_func_start CheckEndDungeon -CheckEndDungeon: ; 0x022C288C + arm_func_start MainGame +MainGame: ; 0x022C288C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x29c mov r4, r0 @@ -7250,7 +7250,7 @@ _022C2984: mov r0, #0xd bl LoadOverlay mov r0, #0xf - bl ov11_022E8774 + bl GroundMainLoop mov r0, #0xd bl UnloadOverlay _022C29C0: @@ -7285,7 +7285,7 @@ _022C2A08: tst r0, #0xff beq _022C2A5C mov r0, r7 - bl sub_0200CC38 + bl IsLosableItem cmp r0, #0 beq _022C2A54 ldrb r0, [r7, #1] @@ -7407,7 +7407,7 @@ _022C2BA0: b _022C2C34 _022C2BF0: add r0, r1, r8 - bl sub_0200CC38 + bl IsLosableItem cmp r0, #0 beq _022C2C34 mov r0, #0x64 @@ -7441,7 +7441,7 @@ _022C2C64: mov r0, #0xd bl LoadOverlay mov r0, sb - bl ov11_022E8774 + bl GroundMainLoop mov r5, r0 mov r0, #0xd bl UnloadOverlay @@ -7454,7 +7454,7 @@ _022C2C94: mov r0, r8 bl LoadOverlay mov r0, r7 - bl ov11_022E8774 + bl GroundMainLoop mov r5, r0 mov r0, r4 bl UnloadOverlay @@ -7659,7 +7659,7 @@ _022C2F5C: bl UnloadOverlay _022C2F84: mov r0, #0xb - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _022C3014 mov r0, #0xf @@ -7787,7 +7787,7 @@ _022C3128: .word 0x000F1207 _022C312C: .word 0x020B0A5C _022C3130: .word 0x022DC0B8 _022C3134: .word 0x022DC0D4 - arm_func_end CheckEndDungeon + arm_func_end MainGame arm_func_start ov10_022C3138 ov10_022C3138: ; 0x022C3138 @@ -8174,7 +8174,7 @@ _022C3650: cmp r2, #4 blt _022C3650 add r0, sp, #0x20 - bl sub_0201E730 + bl InitRender3dElement mov r0, #5 strb r0, [sp, #0x5c] mov r2, #0 @@ -8380,7 +8380,7 @@ ov10_022C3938: ; 0x022C3938 ldr sl, [sp, #0x9c] ldr sb, [sp, #0xa0] ldr r8, [sp, #0xa4] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp, #0x64] add r0, sp, #0x60 bl HandleSir0Translation @@ -8734,7 +8734,7 @@ ov10_022C3E8C: ; 0x022C3E8C mov fp, r3 str r4, [sp, #0x10] ldr r5, [sp, #0x50] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp, #0x20] add r0, sp, #0x10 bl HandleSir0Translation @@ -8765,7 +8765,7 @@ ov10_022C3E8C: ; 0x022C3E8C str r2, [sp, #0x18] mov r2, #0xf str r3, [sp, #0x1c] - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp, #0x18] add r0, sp, #0x14 bl HandleSir0Translation diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 7a17d0e4..49a9da17 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -1198,8 +1198,8 @@ _022DD15C: .word ov11_02324E80 _022DD160: .word 0x02324F1C arm_func_end ov11_022DD130 - arm_func_start ov11_022DD164 -ov11_022DD164: ; 0x022DD164 + arm_func_start FuncThatCallsCommandParsing +FuncThatCallsCommandParsing: ; 0x022DD164 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r6, r0 ldrsh r0, [r6, #0xe] @@ -1226,7 +1226,7 @@ _022DD1A0: ; jump table b _022DD2A0 ; case 6 _022DD1BC: mov r0, r6 - bl ov11_022DDD64 + bl ScriptCommandParsing strh r0, [r6, #0xe] ldrsh r0, [r6, #0xe] cmp r0, #6 @@ -1304,7 +1304,7 @@ _022DD2B4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022DD2BC: .word ov11_02324E80 - arm_func_end ov11_022DD164 + arm_func_end FuncThatCallsCommandParsing arm_func_start ov11_022DD2C0 ov11_022DD2C0: ; 0x022DD2C0 @@ -1444,7 +1444,7 @@ _022DD468: mov r3, r5 mov r0, r4 and r1, r8, #0xff - bl ov11_022E7118 + bl ScriptSpecialProcessCall mov r2, r8 mov r5, r0 mov r0, #2 @@ -2006,11 +2006,11 @@ _022DDC6C: mov r2, r0 ldr r1, _022DDD5C ; =0x023193D4 add r0, sp, #0x20 - bl Sprintf + bl sprintf ldr r2, _022DDD60 ; =0x0000030F add r0, sp, #0x14 add r1, sp, #0x20 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sp, #0x14] mov r0, #0x400 add r6, r1, #2 @@ -2067,8 +2067,8 @@ _022DDD5C: .word 0x023193D4 _022DDD60: .word 0x0000030F arm_func_end ov11_022DD2C0 - arm_func_start ov11_022DDD64 -ov11_022DDD64: ; 0x022DDD64 + arm_func_start ScriptCommandParsing +ScriptCommandParsing: ; 0x022DDD64 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c8 mov r4, r0 @@ -2473,7 +2473,7 @@ _022DDDE0: ; jump table b ov11_022E03D0 ; case 368 b ov11_022E03D8 ; case 369 b ov11_022E03D0 ; case 370 - arm_func_end ov11_022DDD64 + arm_func_end ScriptCommandParsing arm_func_start ov11_022DE3AC ov11_022DE3AC: ; 0x022DE3AC @@ -2591,7 +2591,7 @@ _022DE500: ldrsh r2, [r1, #8] mov r0, #2 strh r2, [r1, #6] - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022DE554 ldr r3, _022DED18 ; =ov11_02324E80 @@ -2626,7 +2626,7 @@ _022DE554: mov r0, #0 bl ov11_022EAFF8 bl ov11_022FEA28 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList bl ov11_022FBE04 bl ov11_022FD66C bl ov11_022F1244 @@ -2648,7 +2648,7 @@ _022DE5D8: ldrsh r2, [r1, #2] mov r0, #2 strh r2, [r1, #4] - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022DE62C ldr r3, _022DED18 ; =ov11_02324E80 @@ -2680,7 +2680,7 @@ _022DE650: ldr r1, _022DED18 ; =ov11_02324E80 mov r0, #2 strh r4, [r1, #6] - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022DE6A4 ldr r3, _022DED18 ; =ov11_02324E80 @@ -3647,7 +3647,7 @@ _022DF348: bl ov11_022E48AC mov r5, r0 mov r0, #0xb - bl GetDebugFlag1 + bl GetDebugFlag cmp r5, r0 ldreqh r0, [r6, #2] ldreq r1, [r4, #0x14] @@ -3965,10 +3965,10 @@ ov11_022DF760: ; 0x022DF760 mov r1, r5, lsl #0x18 ldr r0, _022DFE1C ; =0x02324EA4 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _022DFE1C ; =0x02324EA4 and r1, r4, #0xff - bl SetPortraitUnknownAttr + bl SetPortraitLayout b _022E2474 arm_func_end ov11_022DF760 @@ -3995,10 +3995,10 @@ ov11_022DF7CC: ; 0x022DF7CC mov r1, r5, lsl #0x18 ldr r0, _022DFE1C ; =0x02324EA4 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _022DFE1C ; =0x02324EA4 and r1, r4, #0xff - bl SetPortraitUnknownAttr + bl SetPortraitLayout b _022E2474 arm_func_end ov11_022DF7CC @@ -4025,10 +4025,10 @@ ov11_022DF834: ; 0x022DF834 mov r1, r5, lsl #0x18 ldr r0, _022DFE1C ; =0x02324EA4 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _022DFE1C ; =0x02324EA4 and r1, r4, #0xff - bl SetPortraitUnknownAttr + bl SetPortraitLayout b _022E2474 arm_func_end ov11_022DF834 @@ -4039,7 +4039,7 @@ ov11_022DF89C: ; 0x022DF89C mov r1, r0 ldr r0, _022DFE1C ; =0x02324EA4 and r1, r1, #0xff - bl SetPortraitUnknownAttr + bl SetPortraitLayout b _022E2474 arm_func_end ov11_022DF89C @@ -4058,7 +4058,7 @@ ov11_022DF8B8: ; 0x022DF8B8 str r0, [sp, #0xd4] ldr r0, _022DFE1C ; =0x02324EA4 add r1, sp, #0xd0 - bl SetPortraitAttrStruct + bl SetPortraitOffset b _022E2474 arm_func_end ov11_022DF8B8 @@ -4328,7 +4328,7 @@ _022DFC64: mov r0, #0 bl ov11_022EAFF8 bl ov11_022FEA28 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList bl ov11_022FBE04 bl ov11_022FD66C bl ov11_022F1244 @@ -6783,7 +6783,7 @@ _022E1E28: _022E1E50: ldrh r0, [r5, #2] bl ov11_022E48AC - bl ov11_0230F004 + bl WorldMapSetMode b _022E2464 _022E1E60: ldrh r0, [r5, #2] @@ -6847,7 +6847,7 @@ _022E1F2C: bl ov11_022E48AC mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_0230F0C4 + bl WorldMapSetCamera b _022E2464 _022E1F44: ldrh r0, [r5, #2] @@ -7039,7 +7039,7 @@ _022E21A8: mov r2, r3, lsl #0x10 mov r1, r1, lsr #0x10 mov r2, r2, lsr #0x10 - bl sub_02017BE0 + bl SendAudioCommandWrapperVeneer b _022E2464 _022E21F8: bl sub_02017BEC @@ -7201,7 +7201,7 @@ _022E242C: mov r0, #0 bl ov11_022E9710 mov r0, #0 - bl ov11_022E96F4 + bl ScriptSpecialProcess0x16 b _022E2464 _022E2440: ldrh r0, [r5, #2] @@ -7212,7 +7212,7 @@ _022E2440: mov r0, #1 bl ov11_022E9710 mov r0, #1 - bl ov11_022E96F4 + bl ScriptSpecialProcess0x16 _022E2464: mov r0, #2 b _022E2478 @@ -8304,11 +8304,11 @@ _022E33C4: bl EuclideanNorm__02005050 mov r4, r0 ldr r0, [sb, #0x4c] - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl DivideFloat - bl FloatToInt + bl __divsf3 + bl __fixsfsi strh r0, [sb, #0x46] ldrsh r0, [sb, #0x46] cmp r0, #0 @@ -9677,24 +9677,24 @@ _022E46D0: arm_func_start LoadFileFromRom__022E46DC LoadFileFromRom__022E46DC: ; 0x022E46DC - ldr ip, _022E46E4 ; =LoadFileFromRom__02008C3C + ldr ip, _022E46E4 ; =LoadFileFromRom bx ip .align 2, 0 -_022E46E4: .word LoadFileFromRom__02008C3C +_022E46E4: .word LoadFileFromRom arm_func_end LoadFileFromRom__022E46DC arm_func_start ov11_022E46E8 ov11_022E46E8: ; 0x022E46E8 - ldr ip, _022E46F8 ; =ov11_022E46FC + ldr ip, _022E46F8 ; =SsbLoad2 mov r2, #0 str r2, [r0] bx ip .align 2, 0 -_022E46F8: .word ov11_022E46FC +_022E46F8: .word SsbLoad2 arm_func_end ov11_022E46E8 - arm_func_start ov11_022E46FC -ov11_022E46FC: ; 0x022E46FC + arm_func_start SsbLoad2 +SsbLoad2: ; 0x022E46FC stmdb sp!, {r4, r5, lr} sub sp, sp, #0x54 mov r4, r1 @@ -9809,7 +9809,7 @@ _022E488C: .align 2, 0 _022E48A4: .word 0x02319694 _022E48A8: .word 0x02324F70 - arm_func_end ov11_022E46FC + arm_func_end SsbLoad2 arm_func_start ov11_022E48AC ov11_022E48AC: ; 0x022E48AC @@ -10051,8 +10051,8 @@ _022E4BCC: .word 0x02324F82 _022E4BD0: .word 0x02324F8A arm_func_end ov11_022E4B88 - arm_func_start ov11_022E4BD4 -ov11_022E4BD4: ; 0x022E4BD4 + arm_func_start StationLoadHanger +StationLoadHanger: ; 0x022E4BD4 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x8c mov r5, r0 @@ -10068,7 +10068,7 @@ ov11_022E4BD4: ; 0x022E4BD4 ldr r1, _022E4CB8 ; =0x023196B0 add r0, sp, #9 add r3, sp, #0 - bl Sprintf + bl sprintf ldr r4, _022E4CBC ; =0x02324C8C b _022E4C84 _022E4C1C: @@ -10083,7 +10083,7 @@ _022E4C1C: ldr r1, _022E4CC0 ; =0x023196C4 add r0, sp, #9 add r3, sp, #0 - bl Sprintf + bl sprintf ldr r4, _022E4CC4 ; =0x02324C6C b _022E4C84 _022E4C54: @@ -10092,7 +10092,7 @@ _022E4C54: mov r2, r0 ldr r1, _022E4CC8 ; =0x023196D8 add r0, sp, #9 - bl Sprintf + bl sprintf add r0, sp, #9 bl sub_02008BA8 cmp r0, #0 @@ -10122,7 +10122,7 @@ _022E4CC4: .word 0x02324C6C _022E4CC8: .word 0x023196D8 _022E4CCC: .word 0x02324C94 _022E4CD0: .word 0x023196EC - arm_func_end ov11_022E4BD4 + arm_func_end StationLoadHanger arm_func_start ov11_022E4CD4 ov11_022E4CD4: ; 0x022E4CD4 @@ -10347,7 +10347,7 @@ ov11_022E4FCC: ; 0x022E4FCC ldr r1, _022E512C ; =0x02319730 add r0, sp, #0xd add r3, sp, #4 - bl Sprintf + bl sprintf ldr r0, _022E5130 ; =0x02324C84 b _022E511C _022E5014: @@ -10363,7 +10363,7 @@ _022E5014: add r0, sp, #0xd add r3, sp, #4 str r4, [sp] - bl Sprintf + bl sprintf ldr r0, _022E5130 ; =0x02324C84 b _022E511C _022E5050: @@ -10375,7 +10375,7 @@ _022E5050: ldr r1, _022E5138 ; =0x0231975C add r0, sp, #0xd mov r3, r4 - bl Sprintf + bl sprintf ldr r0, _022E5130 ; =0x02324C84 b _022E511C _022E507C: @@ -10387,7 +10387,7 @@ _022E507C: ldr r1, _022E513C ; =0x02319774 add r0, sp, #0xd add r2, sp, #4 - bl Sprintf + bl sprintf ldr r0, _022E5130 ; =0x02324C84 b _022E511C _022E50A8: @@ -10404,7 +10404,7 @@ _022E50A8: add r0, sp, #0xd add r3, sp, #4 str ip, [sp] - bl Sprintf + bl sprintf ldr r0, _022E5140 ; =0x02324C7C b _022E511C _022E50E8: @@ -10414,7 +10414,7 @@ _022E50E8: ldr r1, _022E5138 ; =0x0231975C add r0, sp, #0xd mov r3, #0 - bl Sprintf + bl sprintf add r0, sp, #0xd bl sub_02008BA8 cmp r0, #0 @@ -10423,7 +10423,7 @@ _022E50E8: ldr r0, _022E5144 ; =0x02324C74 _022E511C: add r1, sp, #0xd - bl ov11_022E5D50 + bl SsbLoad1 _022E5124: add sp, sp, #0x90 ldmia sp!, {r3, r4, r5, pc} @@ -10465,7 +10465,7 @@ ov11_022E5188: ; 0x022E5188 mov r5, r0 mov r0, #2 mov r4, r1 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E51C8 add r1, sp, #0 @@ -10525,7 +10525,7 @@ ov11_022E5258: ; 0x022E5258 mov r5, r0 mov r0, #2 mov r4, r1 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E5298 add r1, sp, #0 @@ -10580,7 +10580,7 @@ ov11_022E5314: ; 0x022E5314 mov r5, r0 mov r0, #2 mov r4, r1 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E5354 add r1, sp, #0 @@ -10633,8 +10633,8 @@ _022E53DC: .word 0x02324F74 _022E53E0: .word 0x02324F8A arm_func_end ov11_022E5314 - arm_func_start ov11_022E53E4 -ov11_022E53E4: ; 0x022E53E4 + arm_func_start ScriptStationLoadTalk +ScriptStationLoadTalk: ; 0x022E53E4 stmdb sp!, {r3, lr} ldr r1, _022E5444 ; =0x02319828 mov r2, r0 @@ -10662,7 +10662,7 @@ ov11_022E53E4: ; 0x022E53E4 .align 2, 0 _022E5444: .word 0x02319828 _022E5448: .word 0x02324F74 - arm_func_end ov11_022E53E4 + arm_func_end ScriptStationLoadTalk arm_func_start ov11_022E544C ov11_022E544C: ; 0x022E544C @@ -10698,7 +10698,7 @@ ov11_022E544C: ; 0x022E544C mov r1, r4 mov r0, #1 mov r2, #0 - bl ov11_022E4BD4 + bl StationLoadHanger cmp r0, #0 ldrne r0, _022E5510 ; =0x02324F74 mov r3, #0 @@ -10731,7 +10731,7 @@ ov11_022E551C: ; 0x022E551C mov r0, #2 mov r5, r1 mov r4, r2 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E5564 add r1, sp, #4 @@ -10793,7 +10793,7 @@ _022E5610: mov r1, r6 mov r2, r5 mov r0, #2 - bl ov11_022E4BD4 + bl StationLoadHanger cmp r0, #0 beq _022E5684 ldr r0, _022E56B0 ; =0x02324F74 @@ -10846,7 +10846,7 @@ ov11_022E56B8: ; 0x022E56B8 mov r0, #2 mov r4, r1 mov r6, r2 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E5700 add r1, sp, #0xd @@ -10904,7 +10904,7 @@ _022E579C: mov r1, r5 mov r2, r4 mov r0, #3 - bl ov11_022E4BD4 + bl StationLoadHanger cmp r0, #0 beq _022E5818 ldr r0, _022E583C ; =0x02324F74 @@ -10926,10 +10926,10 @@ _022E57C8: ldr r1, _022E5844 ; =0x02319730 add r0, sp, #0x16 add r3, sp, #4 - bl Sprintf + bl sprintf ldr r0, _022E5848 ; =0x02324C84 add r1, sp, #0x16 - bl ov11_022E5D50 + bl SsbLoad1 cmp r0, #0 movne r0, #1 bne _022E5830 @@ -10957,7 +10957,7 @@ ov11_022E584C: ; 0x022E584C sub sp, sp, #0x10 mov r4, r0 mov r0, #2 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022E5884 add r1, sp, #4 @@ -11126,7 +11126,7 @@ ov11_022E5A68: ; 0x022E5A68 mov r0, #0 bl ov11_022EAFF8 bl ov11_022FEA28 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList bl ov11_022FBE04 bl ov11_022FD66C ldmia sp!, {r3, pc} @@ -11348,8 +11348,8 @@ ov11_022E5D14: ; 0x022E5D14 ldmia sp!, {r4, pc} arm_func_end ov11_022E5D14 - arm_func_start ov11_022E5D50 -ov11_022E5D50: ; 0x022E5D50 + arm_func_start SsbLoad1 +SsbLoad1: ; 0x022E5D50 stmdb sp!, {r4, r5, lr} sub sp, sp, #0x54 mov r5, r1 @@ -11463,7 +11463,7 @@ _022E5EDC: .align 2, 0 _022E5EF4: .word 0x02319908 _022E5EF8: .word 0x02324F74 - arm_func_end ov11_022E5D50 + arm_func_end SsbLoad1 arm_func_start ov11_022E5EFC ov11_022E5EFC: ; 0x022E5EFC @@ -12132,7 +12132,7 @@ _022E67DC: bl ov11_0230CE44 b _022E68AC _022E67E4: - bl sub_02050C74 + bl GetRank mov r5, r0 mov r0, #0 mov r1, #0x6e @@ -12165,7 +12165,7 @@ _022E6844: cmp r0, #0 beq _022E6860 mov r0, #1 - bl ov11_022E96F4 + bl ScriptSpecialProcess0x16 _022E6860: mov r0, #0 str r0, [r4] @@ -12824,8 +12824,8 @@ ov11_022E7114: ; 0x022E7114 bx lr arm_func_end ov11_022E7114 - arm_func_start ov11_022E7118 -ov11_022E7118: ; 0x022E7118 + arm_func_start ScriptSpecialProcessCall +ScriptSpecialProcessCall: ; 0x022E7118 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x1b8 mov r5, r1 @@ -12904,7 +12904,7 @@ _022E714C: ; jump table b _022E7A94 ; case 61 b _022E7AA8 ; case 62 _022E7248: - bl ov11_022E9414 + bl GroundMainReturnDungeon mov r0, #0 b _022E7AC0 _022E7254: @@ -12920,7 +12920,7 @@ _022E726C: mov r0, #0 b _022E7AC0 _022E7278: - bl ov11_022E9438 + bl GroundMainNextDay mov r0, #0 b _022E7AC0 _022E7284: @@ -13017,24 +13017,24 @@ _022E73BC: mov r1, r6, lsl #0x10 mov r0, r0, asr #0x10 mov r1, r1, asr #0x10 - bl ov11_022E8124 + bl InitRandomNpcJobs mov r0, #0 b _022E7AC0 _022E73D8: - bl ov11_022E81BC + bl GetRandomNpcJobType b _022E7AC0 _022E73E0: - bl ov11_022E81D4 + bl GetRandomNpcJobSubtype and r1, r0, #0xff strb r0, [sp] mov r0, r1 strb r1, [sp, #1] b _022E7AC0 _022E73F8: - bl ov11_022E81F0 + bl GetRandomNpcJobStillAvailable b _022E7AC0 _022E7400: - bl ov11_022E8258 + bl AcceptRandomNpcJob b _022E7AC0 _022E7408: mov r0, #0 @@ -13115,11 +13115,11 @@ _022E7518: movne r0, #1 moveq r0, #0 and r0, r0, #0xff - bl ov11_022E96F4 + bl ScriptSpecialProcess0x16 mov r0, #0 b _022E7AC0 _022E7534: - bl KeyWaitInit__02006DA4 + bl KeyWaitInit ldr r1, _022E7AD4 ; =0x02324CA0 mov r0, #0 str r7, [r1] @@ -13170,23 +13170,23 @@ _022E75D0: b _022E7AC0 _022E75DC: mov r0, r7 - bl ov11_022E95DC + bl JumpToTitleScreen mov r0, #0 b _022E7AC0 _022E75EC: mvn r0, #0 - bl ov11_022E95DC + bl JumpToTitleScreen mov r0, #0 b _022E7AC0 _022E75FC: mov r0, r7 - bl ov11_022E9694 + bl ReturnToTitleScreen mov r0, #0 b _022E7AC0 _022E760C: mov r0, r7, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022E803C + bl GetSpecialRecruitmentSpecies mov r1, #0 bl IsMonsterOnTeam cmp r0, #0 @@ -13196,7 +13196,7 @@ _022E760C: _022E7630: mov r0, r7, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022E803C + bl GetSpecialRecruitmentSpecies mov r1, #0 bl sub_020555D0 mvn r1, #0 @@ -13209,7 +13209,7 @@ _022E7630: _022E7660: mov r0, r7, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022E803C + bl GetSpecialRecruitmentSpecies bl sub_02056EB8 cmp r0, #0 movne r0, #1 @@ -13218,7 +13218,7 @@ _022E7660: _022E7680: mov r0, r7, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022E8080 + bl PrepareMenuAcceptTeamMember add r0, sp, #0x174 bl ov11_022E8090 add r0, sp, #0x100 @@ -13369,7 +13369,7 @@ _022E7870: _022E7898: mov r0, r7, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022E8080 + bl PrepareMenuAcceptTeamMember mov r0, #0 b _022E7AC0 _022E78AC: @@ -13472,7 +13472,7 @@ _022E7A00: mov r0, #0 b _022E7AC0 _022E7A08: - bl ov11_02313A98 + bl StatusUpdate mov r0, #0 b _022E7AC0 _022E7A14: @@ -13537,7 +13537,7 @@ _022E7ACC: .word 0x02319A68 _022E7AD0: .word 0x02319A38 _022E7AD4: .word 0x02324CA0 _022E7AD8: .word 0x00000F0F - arm_func_end ov11_022E7118 + arm_func_end ScriptSpecialProcessCall arm_func_start ov11_022E7ADC ov11_022E7ADC: ; 0x022E7ADC @@ -13974,15 +13974,15 @@ ov11_022E8038: ; 0x022E8038 bx lr arm_func_end ov11_022E8038 - arm_func_start ov11_022E803C -ov11_022E803C: ; 0x022E803C + arm_func_start GetSpecialRecruitmentSpecies +GetSpecialRecruitmentSpecies: ; 0x022E803C ldr r1, _022E804C ; =0x023208D8 mov r0, r0, lsl #1 ldrsh r0, [r1, r0] bx lr .align 2, 0 _022E804C: .word 0x023208D8 - arm_func_end ov11_022E803C + arm_func_end GetSpecialRecruitmentSpecies arm_func_start ov11_022E8050 ov11_022E8050: ; 0x022E8050 @@ -14003,14 +14003,14 @@ _022E8068: _022E807C: .word 0x02320904 arm_func_end ov11_022E8050 - arm_func_start ov11_022E8080 -ov11_022E8080: ; 0x022E8080 + arm_func_start PrepareMenuAcceptTeamMember +PrepareMenuAcceptTeamMember: ; 0x022E8080 ldr r1, _022E808C ; =0x02324F98 strh r0, [r1] bx lr .align 2, 0 _022E808C: .word 0x02324F98 - arm_func_end ov11_022E8080 + arm_func_end PrepareMenuAcceptTeamMember arm_func_start ov11_022E8090 ov11_022E8090: ; 0x022E8090 @@ -14062,8 +14062,8 @@ ov11_022E8120: ; 0x022E8120 bx lr arm_func_end ov11_022E8120 - arm_func_start ov11_022E8124 -ov11_022E8124: ; 0x022E8124 + arm_func_start InitRandomNpcJobs +InitRandomNpcJobs: ; 0x022E8124 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _022E8164 ; =0x02324F9C @@ -14083,7 +14083,7 @@ _022E815C: ldmia sp!, {r3, pc} .align 2, 0 _022E8164: .word 0x02324F9C - arm_func_end ov11_022E8124 + arm_func_end InitRandomNpcJobs arm_func_start ov11_022E8168 ov11_022E8168: ; 0x022E8168 @@ -14114,18 +14114,18 @@ _022E81B0: _022E81B8: .word 0x02324F9C arm_func_end ov11_022E8168 - arm_func_start ov11_022E81BC -ov11_022E81BC: ; 0x022E81BC + arm_func_start GetRandomNpcJobType +GetRandomNpcJobType: ; 0x022E81BC stmdb sp!, {r3, lr} bl ov11_022E8168 cmp r0, #0 ldrneb r0, [r0, #1] moveq r0, #0xd ldmia sp!, {r3, pc} - arm_func_end ov11_022E81BC + arm_func_end GetRandomNpcJobType - arm_func_start ov11_022E81D4 -ov11_022E81D4: ; 0x022E81D4 + arm_func_start GetRandomNpcJobSubtype +GetRandomNpcJobSubtype: ; 0x022E81D4 stmdb sp!, {r3, lr} bl ov11_022E8168 cmp r0, #0 @@ -14133,10 +14133,10 @@ ov11_022E81D4: ; 0x022E81D4 moveq r0, #0 streqb r0, [sp] ldmia sp!, {r3, pc} - arm_func_end ov11_022E81D4 + arm_func_end GetRandomNpcJobSubtype - arm_func_start ov11_022E81F0 -ov11_022E81F0: ; 0x022E81F0 + arm_func_start GetRandomNpcJobStillAvailable +GetRandomNpcJobStillAvailable: ; 0x022E81F0 stmdb sp!, {r3, lr} ldr r0, _022E8254 ; =0x02324F9C ldrsh r1, [r0, #2] @@ -14167,10 +14167,10 @@ _022E824C: ldmia sp!, {r3, pc} .align 2, 0 _022E8254: .word 0x02324F9C - arm_func_end ov11_022E81F0 + arm_func_end GetRandomNpcJobStillAvailable - arm_func_start ov11_022E8258 -ov11_022E8258: ; 0x022E8258 + arm_func_start AcceptRandomNpcJob +AcceptRandomNpcJob: ; 0x022E8258 stmdb sp!, {r3, lr} bl ov11_022E8168 bl sub_0205F0B8 @@ -14204,7 +14204,7 @@ _022E82C0: ldmia sp!, {r3, pc} .align 2, 0 _022E82C8: .word 0x02324F9C - arm_func_end ov11_022E8258 + arm_func_end AcceptRandomNpcJob arm_func_start ov11_022E82CC ov11_022E82CC: ; 0x022E82CC @@ -14215,7 +14215,7 @@ ov11_022E82CC: ; 0x022E82CC cmp r4, #0xc bne _022E82F0 mov r0, #0x11 - bl ov11_022E8774 + bl GroundMainLoop mov r4, r0 _022E82F0: cmp r4, #0xc @@ -14224,7 +14224,7 @@ _022E82F0: mov r1, #0x5c bl ZinitScriptVariable mov r0, #0x12 - bl ov11_022E8774 + bl GroundMainLoop mov r4, r0 cmp r4, #0xd bne _022E832C @@ -14237,7 +14237,7 @@ _022E832C: cmp r4, #0xd ldmneia sp!, {r4, pc} mov r0, #0x14 - bl ov11_022E8774 + bl GroundMainLoop ldmia sp!, {r4, pc} arm_func_end ov11_022E82CC @@ -14276,7 +14276,7 @@ ov11_022E8340: ; 0x022E8340 mov r1, #0x12 ldr r0, [r0] add r0, r0, #8 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _022E83F0 ; =0x02324CAC ldr r0, [r0] add r0, r0, #6 @@ -14562,8 +14562,8 @@ ov11_022E8748: ; 0x022E8748 _022E8770: .word 0x02324CAC arm_func_end ov11_022E8748 - arm_func_start ov11_022E8774 -ov11_022E8774: ; 0x022E8774 + arm_func_start GroundMainLoop +GroundMainLoop: ; 0x022E8774 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x34 ldr r2, _022E91E8 ; =0x02324FA0 @@ -14598,7 +14598,7 @@ ov11_022E8774: ; 0x022E8774 str r2, [sp, #8] bl CreateMemArena ldr r2, _022E91F0 ; =0x02324CB0 - ldr r1, _022E91F8 ; =ov11_022E93C0 + ldr r1, _022E91F8 ; =GetFreeArenaGround str r0, [r2, #4] ldr r0, _022E91FC ; =0x022E935C bl SetMemAllocatorParams @@ -14665,7 +14665,7 @@ _022E88B0: bl ov11_022F11DC bl ov11_022EA908 bl ov11_022FE9E0 - bl ov11_022F7CBC + bl AllocAndInitPartnerFollowDataAndLiveActorList bl ov11_022FBDBC bl ov11_022FD624 bl ov11_0230CE78 @@ -14741,7 +14741,7 @@ _022E89FC: mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable - bl ov11_022E9438 + bl GroundMainNextDay ldr r0, _022E91E8 ; =0x02324FA0 mov r1, #1 str r1, [r0, #0x14] @@ -14805,7 +14805,7 @@ _022E8AE4: mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable - bl ov11_022E9438 + bl GroundMainNextDay mov r0, #0 mov r1, #0x2a mov r2, #1 @@ -14885,7 +14885,7 @@ _022E8C20: mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable - bl ov11_022E9438 + bl GroundMainNextDay ldr r1, _022E91E8 ; =0x02324FA0 mov r0, #0 ldr r2, [r1, #0x14] @@ -14993,7 +14993,7 @@ _022E8D78: mov r0, #0 bl ov11_022EAFF8 bl ov11_022FEA28 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList bl ov11_022FBE04 bl ov11_022FD66C bl ComputeSpecialCounters @@ -15135,7 +15135,7 @@ _022E8FB8: mov r0, #0 bl ov11_022EAFF8 bl ov11_022FEA28 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList bl ov11_022FBE04 bl ov11_022FD66C bl sub_020039E4 @@ -15289,7 +15289,7 @@ _022E91E8: .word 0x02324FA0 _022E91EC: .word 0x023209B0 _022E91F0: .word 0x02324CB0 _022E91F4: .word 0x02324FC0 -_022E91F8: .word ov11_022E93C0 +_022E91F8: .word GetFreeArenaGround _022E91FC: .word 0x022E935C _022E9200: .word ov11_022E9258 _022E9204: .word 0x023209CC @@ -15313,7 +15313,7 @@ _022E9248: .word 0x02320A94 _022E924C: .word 0x02320AAC _022E9250: .word 0x02320AB8 _022E9254: .word 0x02320AC8 - arm_func_end ov11_022E8774 + arm_func_end GroundMainLoop arm_func_start ov11_022E9258 ov11_022E9258: ; 0x022E9258 @@ -15389,8 +15389,8 @@ _022E930C: _022E9358: .word 0x02324CB0 arm_func_end ov11_022E9258 - arm_func_start ov11_022E935C -ov11_022E935C: ; 0x022E935C + arm_func_start GetAllocArenaGround +GetAllocArenaGround: ; 0x022E935C cmp r0, #0 bxne lr and r0, r1, #0xff @@ -15421,10 +15421,10 @@ _022E93B4: bx lr .align 2, 0 _022E93BC: .word 0x02324CB0 - arm_func_end ov11_022E935C + arm_func_end GetAllocArenaGround - arm_func_start ov11_022E93C0 -ov11_022E93C0: ; 0x022E93C0 + arm_func_start GetFreeArenaGround +GetFreeArenaGround: ; 0x022E93C0 stmdb sp!, {r4, lr} mov r4, r1 cmp r0, #0 @@ -15447,24 +15447,24 @@ ov11_022E93C0: ; 0x022E93C0 ldmia sp!, {r4, pc} .align 2, 0 _022E9410: .word 0x02324CB0 - arm_func_end ov11_022E93C0 + arm_func_end GetFreeArenaGround - arm_func_start ov11_022E9414 -ov11_022E9414: ; 0x022E9414 + arm_func_start GroundMainReturnDungeon +GroundMainReturnDungeon: ; 0x022E9414 stmdb sp!, {r3, lr} ldr r0, _022E9434 ; =0x023209EC bl DebugPrint0__0200C1FC mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable - bl ov11_022E9438 + bl GroundMainNextDay ldmia sp!, {r3, pc} .align 2, 0 _022E9434: .word 0x023209EC - arm_func_end ov11_022E9414 + arm_func_end GroundMainReturnDungeon - arm_func_start ov11_022E9438 -ov11_022E9438: ; 0x022E9438 + arm_func_start GroundMainNextDay +GroundMainNextDay: ; 0x022E9438 stmdb sp!, {r4, lr} bl GetGameMode mov r4, r0 @@ -15480,7 +15480,7 @@ ov11_022E9438: ; 0x022E9438 _022E9468: cmp r4, #2 ldmneia sp!, {r4, pc} - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance cmp r0, #6 movhs r4, #3 bhs _022E9498 @@ -15506,7 +15506,7 @@ _022E9498: .align 2, 0 _022E94C8: .word 0x02320AD4 _022E94CC: .word 0x02320AEC - arm_func_end ov11_022E9438 + arm_func_end GroundMainNextDay arm_func_start ov11_022E94D0 ov11_022E94D0: ; 0x022E94D0 @@ -15591,8 +15591,8 @@ _022E95D4: .word 0x02324FA0 _022E95D8: .word 0x02320B34 arm_func_end ov11_022E958C - arm_func_start ov11_022E95DC -ov11_022E95DC: ; 0x022E95DC + arm_func_start JumpToTitleScreen +JumpToTitleScreen: ; 0x022E95DC stmdb sp!, {r4, lr} ldr r1, _022E963C ; =0x02324FA0 mov r4, r0 @@ -15621,7 +15621,7 @@ _022E9634: .align 2, 0 _022E963C: .word 0x02324FA0 _022E9640: .word 0x02320B58 - arm_func_end ov11_022E95DC + arm_func_end JumpToTitleScreen arm_func_start ov11_022E9644 ov11_022E9644: ; 0x022E9644 @@ -15648,8 +15648,8 @@ _022E968C: .word 0x02324FA0 _022E9690: .word 0x02320B78 arm_func_end ov11_022E9644 - arm_func_start ov11_022E9694 -ov11_022E9694: ; 0x022E9694 + arm_func_start ReturnToTitleScreen +ReturnToTitleScreen: ; 0x022E9694 stmdb sp!, {r4, lr} ldr r1, _022E96DC ; =0x02324FA0 mov r4, r0 @@ -15671,7 +15671,7 @@ ov11_022E9694: ; 0x022E9694 .align 2, 0 _022E96DC: .word 0x02324FA0 _022E96E0: .word 0x02320B9C - arm_func_end ov11_022E9694 + arm_func_end ReturnToTitleScreen arm_func_start ov11_022E96E4 ov11_022E96E4: ; 0x022E96E4 @@ -15682,8 +15682,8 @@ ov11_022E96E4: ; 0x022E96E4 _022E96F0: .word 0x02324FA0 arm_func_end ov11_022E96E4 - arm_func_start ov11_022E96F4 -ov11_022E96F4: ; 0x022E96F4 + arm_func_start ScriptSpecialProcess0x16 +ScriptSpecialProcess0x16: ; 0x022E96F4 cmp r0, #0 moveq r1, #1 ldr r0, _022E970C ; =0x02324FA0 @@ -15692,7 +15692,7 @@ ov11_022E96F4: ; 0x022E96F4 bx lr .align 2, 0 _022E970C: .word 0x02324FA0 - arm_func_end ov11_022E96F4 + arm_func_end ScriptSpecialProcess0x16 arm_func_start ov11_022E9710 ov11_022E9710: ; 0x022E9710 @@ -15756,7 +15756,7 @@ _022E977C: bl ov11_022E98CC bl ov11_022E99E0 ldr r0, _022E9844 ; =0x02388FD8 - bl sub_0201E730 + bl InitRender3dElement mov r2, #0x100 ldr r0, _022E9844 ; =0x02388FD8 mov r1, #0xc0 @@ -17055,7 +17055,7 @@ ov11_022EA80C: ; 0x022EA80C stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 ldrne r0, _022EA89C ; =0x02388FD8 movne r1, #0 @@ -17098,7 +17098,7 @@ ov11_022EA8A0: ; 0x022EA8A0 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #0 beq _022EA8C8 @@ -17116,7 +17116,7 @@ ov11_022EA8D4: ; 0x022EA8D4 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #1 beq _022EA8FC @@ -17208,7 +17208,7 @@ _022EA9BC: str r0, [r4, #8] mov r0, #0 str r0, [r4, #0xc] - bl KeyWaitInit__02006DA4 + bl KeyWaitInit ldmia sp!, {r4, pc} arm_func_end ov11_022EA990 @@ -17552,7 +17552,7 @@ _022EAE9C: bl ov11_0230114C cmp r0, #0 beq _022EAF40 - bl KeyWaitInit__02006DA4 + bl KeyWaitInit mov r0, sb bl ov11_022EA978 mov r0, #1 @@ -18151,11 +18151,11 @@ _022EB5F4: bl EuclideanNorm__020050B0 str r0, [sp, #8] ldr r0, [r8, #0xc] - bl IntToFloat + bl __floatsisf mov r1, r0 ldr r0, [sp, #8] - bl DivideFloat - bl FloatToInt + bl __divsf3 + bl __fixsfsi str r0, [r8, #0x10] cmp r0, #0 movle r0, #1 @@ -18518,8 +18518,8 @@ ov11_022EBB14: ; 0x022EBB14 _022EBB3C: .word 0x02324CBC arm_func_end ov11_022EBB14 - arm_func_start ov11_022EBB40 -ov11_022EBB40: ; 0x022EBB40 + arm_func_start LoadBackgroundAttributes +LoadBackgroundAttributes: ; 0x022EBB40 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x48 mov sl, r0 @@ -18576,7 +18576,7 @@ _022EBBD8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EBC14: .word 0x02320C44 - arm_func_end ov11_022EBB40 + arm_func_end LoadBackgroundAttributes arm_func_start ov11_022EBC18 ov11_022EBC18: ; 0x022EBC18 @@ -19044,7 +19044,7 @@ ov11_022EC240: ; 0x022EC240 strh r4, [r0, #0xbe] ldrsh r1, [r0, #0xbe] add r0, sp, #0 - bl ov11_022EBB40 + bl LoadBackgroundAttributes _022EC274: add sp, sp, #0x70 ldmia sp!, {r3, r4, r5, pc} @@ -19078,31 +19078,31 @@ _022EC2BC: strh r4, [r0, #0xbe] ldrsh r1, [r0, #0xbe] add r0, sp, #0xcc - bl ov11_022EBB40 + bl LoadBackgroundAttributes ldr r1, _022ECCFC ; =0x02320C58 add r0, sp, #0x4c add r2, sp, #0xcc - bl Sprintf + bl sprintf ldr r2, [sp] add r1, sp, #0x4c add r0, sl, #0x174 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _022ECD00 ; =0x02320C6C add r0, sp, #0x4c add r2, sp, #0xd6 - bl Sprintf + bl sprintf ldr r2, _022ECD04 ; =0x0000030F add r0, sl, #0x184 add r1, sp, #0x4c - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _022ECD08 ; =0x02320C80 add r0, sp, #0x4c add r2, sp, #0xe0 - bl Sprintf + bl sprintf ldr r2, _022ECD04 ; =0x0000030F add r0, sl, #0x18c add r1, sp, #0x4c - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, [sl, #0x184] ldr r0, [sl, #0x174] ldrh r2, [r1] @@ -19720,11 +19720,11 @@ _022ECBA8: add r2, r1, r0 ldr r1, _022ECD20 ; =0x02320C94 add r0, sp, #0x4c - bl Sprintf + bl sprintf ldr r2, [sp] add r0, r4, #8 add r1, sp, #0x4c - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom mov r0, #1 strb r0, [r4] strb r0, [r4, #1] @@ -19807,8 +19807,8 @@ _022ECD1C: .word 0x0000FFFF _022ECD20: .word 0x02320C94 arm_func_end ov11_022EC27C - arm_func_start ov11_022ECD24 -ov11_022ECD24: ; 0x022ECD24 + arm_func_start LoadMapType10 +LoadMapType10: ; 0x022ECD24 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x128 mov r6, r1 @@ -19835,31 +19835,31 @@ _022ECD5C: strh r6, [r0, #0xbe] ldrsh r1, [r0, #0xbe] add r0, sp, #0xb8 - bl ov11_022EBB40 + bl LoadBackgroundAttributes ldr r1, _022ED21C ; =0x02320C58 add r0, sp, #0x38 add r2, sp, #0xb8 - bl Sprintf + bl sprintf add r0, sl, #0x174 add r1, sp, #0x38 mov r2, #6 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _022ED220 ; =0x02320C6C add r0, sp, #0x38 add r2, sp, #0xc2 - bl Sprintf + bl sprintf ldr r2, _022ED224 ; =0x0000030F add r0, sl, #0x184 add r1, sp, #0x38 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r1, _022ED228 ; =0x02320C80 add r0, sp, #0x38 add r2, sp, #0xcc - bl Sprintf + bl sprintf add r0, sl, #0x18c add r1, sp, #0x38 mov r2, #6 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom add r1, sl, #0xea ldr r0, [sl, #0x184] ldr sb, [sl, #0x174] @@ -20157,10 +20157,10 @@ _022ED234: .word 0x02324CBC _022ED238: .word 0x02320BE4 _022ED23C: .word 0x02320BF4 _022ED240: .word 0x02320BE8 - arm_func_end ov11_022ECD24 + arm_func_end LoadMapType10 - arm_func_start ov11_022ED244 -ov11_022ED244: ; 0x022ED244 + arm_func_start LoadMapType11 +LoadMapType11: ; 0x022ED244 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x38 mov r4, r1 @@ -20458,7 +20458,7 @@ _022ED68C: .word 0x02324CBC _022ED690: .word 0x02320BEC _022ED694: .word 0x02320BF4 _022ED698: .word 0x02320BE8 - arm_func_end ov11_022ED244 + arm_func_end LoadMapType11 arm_func_start ov11_022ED69C ov11_022ED69C: ; 0x022ED69C @@ -20490,7 +20490,7 @@ _022ED6CC: ldr r2, [sb, #0x1c4] str r2, [sl, #0x1c4] ldrsh r1, [r1, #0xbe] - bl ov11_022EBB40 + bl LoadBackgroundAttributes add r2, sb, #0x100 ldrsh r3, [r2, #0xea] add r1, sb, #0xea @@ -20938,15 +20938,15 @@ _022EDD48: strh r4, [r0, #0xbe] ldrsh r1, [r0, #0xbe] add r0, sp, #0x80 - bl ov11_022EBB40 + bl LoadBackgroundAttributes ldr r1, _022EDE5C ; =0x02320C80 add r0, sp, #0 add r2, sp, #0x94 - bl Sprintf + bl sprintf ldr r2, _022EDE60 ; =0x0000030F add r1, sp, #0 add r0, r5, #0x18c - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr lr, [r5, #0x18c] add r4, r5, #0x1e0 ldrb r2, [lr] @@ -21051,7 +21051,7 @@ _022EDECC: beq _022EE074 ldr r2, _022EE0BC ; =0x0000030F add r0, sp, #0x18 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, [sp, #0x18] bl GetAtSize mov r4, r0 @@ -21917,20 +21917,20 @@ _022EEA00: _022EEA18: ldr r0, [r4, #0x3c] mov r1, #3 - bl DivideInt + bl __divsi3 str r0, [r4, #0x44] ldr r0, [r4, #0x40] mov r1, #3 - bl DivideInt + bl __divsi3 str r0, [r4, #0x48] ldr r0, [r4, #0x34] mov r1, #0x18 - bl DivideInt + bl __divsi3 add r0, r1, #0x10 str r0, [r4, #0x4c] ldr r0, [r4, #0x38] mov r1, #0x18 - bl DivideInt + bl __divsi3 str r1, [r4, #0x50] ldmia sp!, {r4, pc} arm_func_end ov11_022EE9B0 @@ -24916,7 +24916,7 @@ _022F13CC: mov r0, r5 add r1, r6, #2 and r3, r3, #0xff - bl ov11_022F155C + bl GetSpecialLayoutBackground b _022F152C _022F1410: add r6, r6, #8 @@ -25013,8 +25013,8 @@ _022F1554: .word 0x02320FCC _022F1558: .word 0x02320CA8 arm_func_end ov11_022F12C0 - arm_func_start ov11_022F155C -ov11_022F155C: ; 0x022F155C + arm_func_start GetSpecialLayoutBackground +GetSpecialLayoutBackground: ; 0x022F155C stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r8, r0 @@ -25090,7 +25090,7 @@ _022F1644: ldr r0, [r0] mov r2, r7 mov r3, r6 - bl ov11_022ED244 + bl LoadMapType11 b _022F16A0 _022F1688: ldr r0, _022F16F4 ; =0x02324CC0 @@ -25098,7 +25098,7 @@ _022F1688: ldr r0, [r0] mov r2, r7 mov r3, r6 - bl ov11_022ECD24 + bl LoadMapType10 _022F16A0: ldr r0, _022F16F4 ; =0x02324CC0 ldmia r0, {r1, r2} @@ -25130,7 +25130,7 @@ _022F1700: .word 0x02320CA8 _022F1704: .word 0x02321004 _022F1708: .word 0x02320D10 _022F170C: .word 0x02320CB8 - arm_func_end ov11_022F155C + arm_func_end GetSpecialLayoutBackground arm_func_start ov11_022F1710 ov11_022F1710: ; 0x022F1710 @@ -26761,14 +26761,14 @@ _022F2B6C: ldr r0, [r5] mov r1, #0x480 add sl, sb, r8 - bl DivideInt + bl __divsi3 ldr r0, _022F2F10 ; =0x023210D4 ldr r0, [r0, r4, lsl #2] sub r0, r0, r1 str r0, [sb, r8] ldr r0, [r5, #4] ldr r1, _022F2F08 ; =0x0000049C - bl DivideInt + bl __divsi3 ldr r0, _022F2F10 ; =0x023210D4 add r0, r0, r4, lsl #2 ldr r0, [r0, #0x8c] @@ -26833,7 +26833,7 @@ _022F2C74: mov r0, sl mov r1, #5 add sb, r6, r8 - bl DivideInt + bl __divsi3 ldr r0, _022F2F14 ; =0x023210AC ldr r3, [r0, r1, lsl #2] ldr r1, [r5] @@ -26844,11 +26844,11 @@ _022F2C74: sub r1, r3, r1 str r1, [r6, r8] mov r1, #5 - bl DivideInt + bl __divsi3 mov fp, r0 ldr r0, [r5, #4] mov r1, #0x300 - bl DivideInt + bl __divsi3 ldr r0, _022F2F14 ; =0x023210AC add r0, r0, fp, lsl #2 ldr r0, [r0, #0x14] @@ -26911,7 +26911,7 @@ _022F2D7C: ldrsh r2, [r7, #2] mov r0, #0xa0 smulbb r0, r2, r0 - bl DivideInt + bl __divsi3 b _022F2DB8 _022F2DB4: mov r0, #0xa0 @@ -26926,22 +26926,22 @@ _022F2DC8: mov r0, sl mov r1, #5 add sb, fp, r8 - bl DivideInt + bl __divsi3 mov r7, r1 ldr r0, [r5] mov r1, #0xf0 - bl DivideInt + bl __divsi3 ldr r0, _022F2F18 ; =0x02321098 ldr r2, [r0, r7, lsl #2] mov r0, sl sub r1, r2, r1 str r1, [fp, r8] mov r1, #5 - bl DivideInt + bl __divsi3 mov r7, r0 ldr r0, [r5, #4] mov r1, #0x300 - bl DivideInt + bl __divsi3 ldr r0, _022F2F14 ; =0x023210AC add r0, r0, r7, lsl #2 ldr r0, [r0, #0x14] @@ -27025,7 +27025,7 @@ ov11_022F2F1C: ; 0x022F2F1C _022F2F2C: mla r7, r6, r4, r5 add r0, r7, #8 - bl sub_0201E730 + bl InitRender3dElement ldrb r0, [r7, #0x45] add r6, r6, #1 cmp r6, #0x30 @@ -27265,7 +27265,7 @@ _022F31A0: mov r1, #0x800 mov r2, r4 add r0, r0, #0x1a0 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, r6 ldr r3, [r0] mov r2, r4 @@ -27349,13 +27349,13 @@ _022F337C: add r0, r2, #0x1a0 mov r1, #0x800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, r6 ldr r0, [r0] mov r1, #0x800 mov r2, #0 add r0, r0, #0x264 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r7, r6 ldr r1, [r7] ldr r5, _022F37C8 ; =0x0000F3FF @@ -27434,7 +27434,7 @@ _022F349C: mov r2, sl add r0, r0, sb mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r8, r8, #1 cmp r8, #0x40 blt _022F349C @@ -27717,7 +27717,7 @@ _022F38AC: ldr r1, _022F3E4C ; =0x0000012D ldr r2, _022F3E50 ; =0x08080000 add r0, r3, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27742,7 +27742,7 @@ _022F38DC: ldr r0, [r0] mov r1, #0xbd add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27767,7 +27767,7 @@ _022F393C: ldr r0, [r0] mov r1, #0xbd add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27789,7 +27789,7 @@ _022F399C: ldr r0, [r0] mov r1, #0xb6 add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27811,7 +27811,7 @@ _022F39F0: ldr r0, [r0] mov r1, #0xbe add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27833,7 +27833,7 @@ _022F3A44: ldr r0, [r0] mov r2, #0x8000000 add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27877,7 +27877,7 @@ _022F3A98: ldr r0, [r0] mov r2, #4 add r0, r0, #0x18 - bl ov11_022F52E8 + bl SetAnimDataFields2 bl ov14_0238CCA8 bl FemaleToMaleForm ldr r1, _022F3E60 ; =0x00000807 @@ -27888,7 +27888,7 @@ _022F3A98: mov r2, #0 ldr r0, [r0] add r0, r0, #0xdc - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -27975,13 +27975,13 @@ _022F3C64: ldr r0, [r0] mov r1, #0xee add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 ldr r2, _022F3E68 ; =0x0C080000 ldr r0, [r0] mov r1, #0xef add r0, r0, #0x264 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -28008,13 +28008,13 @@ _022F3CD0: ldr r0, [r0] mov r1, #0xec add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 ldr r2, _022F3E68 ; =0x0C080000 ldr r0, [r0] mov r1, #0xed add r0, r0, #0x264 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -28041,7 +28041,7 @@ _022F3D50: ldr r0, [r0] ldr r2, _022F3E50 ; =0x08080000 add r0, r0, #0x1a0 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _022F3E48 ; =0x02324CE0 mov r3, #1 ldr r2, [r0] @@ -28159,7 +28159,7 @@ _022F3F18: ldr r1, _022F4350 ; =0x02324CE8 mov r2, #0 str r4, [r3, #0xc] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022F3F38: bl ov11_0231474C @@ -28200,13 +28200,13 @@ _022F3F60: mov r1, r1, lsl #0x10 mov r2, r7 mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F3FD0: ldr r0, [r4, #4] mov r1, r6 mla r0, r8, sb, r0 mov r2, r5 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _022F3FE4: add r8, r8, #1 cmp r8, #0x40 @@ -28249,7 +28249,7 @@ _022F4018: add r1, r1, #0x800 mov r1, r1, lsl #0x10 mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 strh r7, [r8, #0x16] _022F4088: ldr r0, [r8, #8] @@ -28265,7 +28265,7 @@ _022F4088: str r0, [r6, #0xc] ldr r0, [r6, #4] mla r0, sb, r4, r0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _022F40C0: add sb, sb, #1 cmp sb, #0x40 @@ -28302,7 +28302,7 @@ _022F40D0: add r0, r3, #0x18 mov r1, r1, asr #0x10 mov r2, r2, asr #0x18 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F414C: ldr r1, [r4, #8] ldr r0, _022F434C ; =0x02324CE0 @@ -28361,7 +28361,7 @@ _022F41D0: ldr r0, [r2] mov r2, #0 add r0, r0, #0x1a0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 mov r0, #1 bl ov11_0231598C ldr r1, [r0, #4] @@ -28377,7 +28377,7 @@ _022F41D0: ldr r0, [r2] mov r2, #0 add r0, r0, #0x264 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022F426C: bl ov11_0231474C @@ -28406,7 +28406,7 @@ _022F4290: mov r2, r7 add r0, r3, sl mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r1, r8, lsr #0x1f rsb r0, r1, r8, lsl #29 add r0, r1, r0, ror #29 @@ -28431,7 +28431,7 @@ _022F4300: str r0, [r6, #0xc] ldr r0, [r6, #4] mla r0, r8, r4, r0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _022F4334: add r8, r8, #1 cmp r8, #0x40 @@ -28818,8 +28818,8 @@ ov11_022F47F4: ; 0x022F47F4 _022F4818: .word 0x02324CF0 arm_func_end ov11_022F47F4 - arm_func_start ov11_022F481C -ov11_022F481C: ; 0x022F481C + arm_func_start SetAnimDataFields +SetAnimDataFields: ; 0x022F481C strh r1, [r0, #0x90] ldrh r1, [r0, #0x90] tst r1, #0x2000 @@ -28911,18 +28911,18 @@ _022F494C: .word 0x0238A040 _022F4950: .word 0x0238A068 _022F4954: .word 0x0238A05C _022F4958: .word 0x0000F3FF - arm_func_end ov11_022F481C + arm_func_end SetAnimDataFields - arm_func_start ov11_022F495C -ov11_022F495C: ; 0x022F495C + arm_func_start SetAnimDataFieldsWrapper +SetAnimDataFieldsWrapper: ; 0x022F495C mov r1, r1, lsr #0x10 mov r1, r1, lsl #0x10 - ldr ip, _022F4970 ; =ov11_022F481C + ldr ip, _022F4970 ; =SetAnimDataFields mov r1, r1, lsr #0x10 bx ip .align 2, 0 -_022F4970: .word ov11_022F481C - arm_func_end ov11_022F495C +_022F4970: .word SetAnimDataFields + arm_func_end SetAnimDataFieldsWrapper arm_func_start ov11_022F4974 ov11_022F4974: ; 0x022F4974 @@ -29037,7 +29037,7 @@ ov11_022F4AB8: ; 0x022F4AB8 mov r1, r3, lsr #0x10 mov r6, r0 mov r4, r2 - bl ov11_022F481C + bl SetAnimDataFields mov r1, #0 str r1, [r6, #0xb8] str r1, [r6, #0xbc] @@ -29075,9 +29075,9 @@ ov11_022F4AB8: ; 0x022F4AB8 cmp r1, #0 beq _022F4B88 add r0, r6, #0xc - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl add r0, r6, #0xc - bl sub_0201D170 + bl AnimationControlGetAllocForMaxFrame strh r0, [r6, #0x8c] add r0, r6, #0xc bl sub_0201D100 @@ -29149,8 +29149,8 @@ _022F4C54: _022F4C60: .word 0x020AFC68 arm_func_end ov11_022F4BE4 - arm_func_start ov11_022F4C64 -ov11_022F4C64: ; 0x022F4C64 + arm_func_start InitAnimDataFromOtherAnimData +InitAnimDataFromOtherAnimData: ; 0x022F4C64 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -29180,7 +29180,7 @@ _022F4C78: strh r1, [r5, #0xa2] strb r0, [r5, #0xa4] ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov11_022F4C64 + arm_func_end InitAnimDataFromOtherAnimData arm_func_start ov11_022F4CD4 ov11_022F4CD4: ; 0x022F4CD4 @@ -29631,8 +29631,8 @@ _022F52E0: .word 0x0238A04C _022F52E4: .word 0x0238A020 arm_func_end ov11_022F5274 - arm_func_start ov11_022F52E8 -ov11_022F52E8: ; 0x022F52E8 + arm_func_start SetAnimDataFields2 +SetAnimDataFields2: ; 0x022F52E8 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x10 mov r6, r0 @@ -29706,14 +29706,14 @@ _022F53A4: ldrsh r3, [r6, #0x92] add r0, r6, #0xc and r2, r4, #7 - bl sub_0201C2CC + bl SetAnimationForAnimationControl ldrh r0, [r6, #0xe] orr r0, r0, #0x10 strh r0, [r6, #0xe] _022F5400: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov11_022F52E8 + arm_func_end SetAnimDataFields2 arm_func_start ov11_022F5408 ov11_022F5408: ; 0x022F5408 @@ -30076,7 +30076,7 @@ ov11_022F5904: ; 0x022F5904 mov r1, #0 add r0, r4, #0xc strh r1, [r4, #0xae] - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame ldmia sp!, {r4, pc} _022F5928: ldrsh r1, [r4, #0xae] @@ -30089,7 +30089,7 @@ _022F593C: add r0, r4, #0xc sub r1, r1, #0x100 strh r1, [r4, #0xae] - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame _022F5950: ldrsh r0, [r4, #0xae] cmp r0, #0x100 @@ -30293,7 +30293,7 @@ ov11_022F5BBC: ; 0x022F5BBC ldr r0, [r1] mov r3, r4 mov r1, #2 - bl sub_0201D484 + bl LoadWanTableEntryFromPack mov r2, r0 mov r0, r6 mov r3, r5 @@ -30305,7 +30305,7 @@ ov11_022F5BBC: ; 0x022F5BBC mov r0, r6 mov r1, #0x300 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F5C30: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} @@ -31618,8 +31618,8 @@ _022F6E58: .word 0x00000807 _022F6E5C: .word 0x00000307 arm_func_end ov11_022F5D50 - arm_func_start ov11_022F6E60 -ov11_022F6E60: ; 0x022F6E60 + arm_func_start LoadObjectAnimData +LoadObjectAnimData: ; 0x022F6E60 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x80 mov r6, r2 @@ -31636,7 +31636,7 @@ ov11_022F6E60: ; 0x022F6E60 beq _022F6EBC ldr r1, _022F6EF4 ; =0x023213F0 add r0, sp, #0 - bl Sprintf + bl sprintf ldr r0, _022F6EF8 ; =0x020AFC68 add r1, sp, #0 ldr r0, [r0] @@ -31654,7 +31654,7 @@ _022F6EBC: mov r0, r4 mov r1, #0x800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F6EE8: add sp, sp, #0x80 ldmia sp!, {r4, r5, r6, pc} @@ -31662,7 +31662,7 @@ _022F6EE8: _022F6EF0: .word 0x0231EE54 _022F6EF4: .word 0x023213F0 _022F6EF8: .word 0x020AFC68 - arm_func_end ov11_022F6E60 + arm_func_end LoadObjectAnimData arm_func_start ov11_022F6EFC ov11_022F6EFC: ; 0x022F6EFC @@ -31674,14 +31674,14 @@ _022F6F04: .word ov11_022F4BE4 arm_func_start ov11_022F6F08 ov11_022F6F08: ; 0x022F6F08 - ldr ip, _022F6F10 ; =ov11_022F4C64 + ldr ip, _022F6F10 ; =InitAnimDataFromOtherAnimData bx ip .align 2, 0 -_022F6F10: .word ov11_022F4C64 +_022F6F10: .word InitAnimDataFromOtherAnimData arm_func_end ov11_022F6F08 - arm_func_start ov11_022F6F14 -ov11_022F6F14: ; 0x022F6F14 + arm_func_start AnimRelatedFunction__022F6F14 +AnimRelatedFunction__022F6F14: ; 0x022F6F14 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r4, r2 @@ -31696,7 +31696,7 @@ ov11_022F6F14: ; 0x022F6F14 mov r2, #0 bl ov11_022F5960 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov11_022F6F14 + arm_func_end AnimRelatedFunction__022F6F14 arm_func_start ov11_022F6F4C ov11_022F6F4C: ; 0x022F6F4C @@ -31717,7 +31717,7 @@ ov11_022F6F4C: ; 0x022F6F4C mov r0, r4 mov r1, #0x800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F6F94: add sp, sp, #8 ldmia sp!, {r4, pc} @@ -31759,7 +31759,7 @@ ov11_022F6FE0: ; 0x022F6FE0 ldr r1, _022F7050 ; =0x02321400 add r0, sp, #0 mov r2, r3 - bl Sprintf + bl sprintf ldr r0, _022F7054 ; =0x020AFC68 add r1, sp, #0 ldr r0, [r0] @@ -31776,7 +31776,7 @@ ov11_022F6FE0: ; 0x022F6FE0 mov r0, r5 mov r1, #0x800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022F7048: add sp, sp, #0x80 ldmia sp!, {r3, r4, r5, pc} @@ -31793,8 +31793,8 @@ ov11_022F7058: ; 0x022F7058 _022F7060: .word ov11_022F4BE4 arm_func_end ov11_022F7058 - arm_func_start ov11_022F7064 -ov11_022F7064: ; 0x022F7064 + arm_func_start AnimRelatedFunction__022F7064 +AnimRelatedFunction__022F7064: ; 0x022F7064 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r4, r2 @@ -31809,7 +31809,7 @@ ov11_022F7064: ; 0x022F7064 mov r2, #0 bl ov11_022F5960 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov11_022F7064 + arm_func_end AnimRelatedFunction__022F7064 arm_func_start ov11_022F709C ov11_022F709C: ; 0x022F709C @@ -31985,7 +31985,7 @@ ov11_022F72A0: ; 0x022F72A0 mov r6, r1 mov r5, r2 mov r4, r3 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022F72F0 add r1, sp, #8 @@ -32038,7 +32038,7 @@ ov11_022F7354: ; 0x022F7354 mov r6, r1 mov r5, r2 mov r4, r3 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022F73A4 add r1, sp, #8 @@ -32089,7 +32089,7 @@ ov11_022F7408: ; 0x022F7408 mov r5, r0 mov r0, #2 mov r4, r1 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022F7444 add r1, sp, #0 @@ -32164,7 +32164,7 @@ ov11_022F7500: ; 0x022F7500 mov r5, r0 mov r0, #2 mov r4, r1 - bl GetDebugFlag2 + bl GetDebugLogFlag cmp r0, #0 beq _022F7540 add r1, sp, #0 @@ -32602,7 +32602,7 @@ _022F7ADC: ldr r0, [r0] add r0, r0, #0x100 ldrsh r0, [r0, #6] - bl ov11_022E53E4 + bl ScriptStationLoadTalk b _022F7B80 _022F7B2C: mov r1, #0xb @@ -32618,7 +32618,7 @@ _022F7B2C: ldr r0, [r0] add r0, r0, #0x100 ldrsh r0, [r0, #6] - bl ov11_022E53E4 + bl ScriptStationLoadTalk b _022F7B80 _022F7B68: ldrsh r0, [r3, #0xfa] @@ -32634,7 +32634,7 @@ _022F7B80: ldr r1, [r0, #0xf0] cmp r1, #0 bne _022F7B98 - bl ov11_022DD164 + bl FuncThatCallsCommandParsing _022F7B98: ldr r0, _022F7BB8 ; =0x02324CF4 ldr r0, [r0] @@ -32727,8 +32727,8 @@ _022F7C9C: _022F7CB8: .word 0x02324CF4 arm_func_end ov11_022F7BC4 - arm_func_start ov11_022F7CBC -ov11_022F7CBC: ; 0x022F7CBC + arm_func_start AllocAndInitPartnerFollowDataAndLiveActorList +AllocAndInitPartnerFollowDataAndLiveActorList: ; 0x022F7CBC stmdb sp!, {r3, lr} mov r0, #0x330 mov r1, #6 @@ -32750,14 +32750,14 @@ _022F7CF0: cmp r3, #0x18 add r0, r0, #0x250 blt _022F7CF0 - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList ldmia sp!, {r3, pc} .align 2, 0 _022F7D14: .word 0x02324CF8 - arm_func_end ov11_022F7CBC + arm_func_end AllocAndInitPartnerFollowDataAndLiveActorList - arm_func_start ov11_022F7D18 -ov11_022F7D18: ; 0x022F7D18 + arm_func_start InitPartnerFollowDataAndLiveActorList +InitPartnerFollowDataAndLiveActorList: ; 0x022F7D18 stmdb sp!, {r4, r5, r6, lr} ldr r0, _022F7DD0 ; =0x02324CF8 mov r5, #0 @@ -32768,7 +32768,7 @@ _022F7D2C: cmp r0, r4 beq _022F7D40 mov r0, r5 - bl ov11_022F8578 + bl DeleteLiveActor _022F7D40: add r0, r5, #1 mov r0, r0, lsl #0x10 @@ -32810,12 +32810,12 @@ _022F7DA4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022F7DD0: .word 0x02324CF8 - arm_func_end ov11_022F7D18 + arm_func_end InitPartnerFollowDataAndLiveActorList arm_func_start ov11_022F7DD4 ov11_022F7DD4: ; 0x022F7DD4 stmdb sp!, {r3, lr} - bl ov11_022F7D18 + bl InitPartnerFollowDataAndLiveActorList ldr r0, _022F7E0C ; =0x02324CF8 ldr r0, [r0, #4] bl MemFree @@ -33307,7 +33307,7 @@ _022F8464: cmpne sb, r0 bne _022F84B4 mov r0, r8 - bl ov11_022F8578 + bl DeleteLiveActor _022F84B4: add r0, r8, #1 mov r0, r0, lsl #0x10 @@ -33341,14 +33341,14 @@ _022F84EC: cmpne sb, r0 bne _022F8548 mov r0, r8 - bl ov11_022F8578 + bl DeleteLiveActor b _022F8548 _022F8534: ldrsh r0, [sl, #6] cmp r0, r4 bne _022F8548 mov r0, r8 - bl ov11_022F8578 + bl DeleteLiveActor _022F8548: add r0, r8, #1 mov r0, r0, lsl #0x10 @@ -33366,8 +33366,8 @@ _022F8570: .word 0x02321A40 _022F8574: .word 0x02321A6C arm_func_end ov11_022F8408 - arm_func_start ov11_022F8578 -ov11_022F8578: ; 0x022F8578 + arm_func_start DeleteLiveActor +DeleteLiveActor: ; 0x022F8578 stmdb sp!, {r4, lr} ldr r1, _022F85B8 ; =0x02324CF8 mov r2, r0 @@ -33387,7 +33387,7 @@ ov11_022F8578: ; 0x022F8578 .align 2, 0 _022F85B8: .word 0x02324CF8 _022F85BC: .word 0x02321A8C - arm_func_end ov11_022F8578 + arm_func_end DeleteLiveActor arm_func_start ov11_022F85C0 ov11_022F85C0: ; 0x022F85C0 @@ -33509,7 +33509,7 @@ ov11_022F872C: ; 0x022F872C bne _022F8774 tst r5, #2 beq _022F879C - bl ov11_022FBA28 + bl InitPartnerFollowData b _022F879C _022F8774: tst r5, #2 @@ -33527,7 +33527,7 @@ _022F879C: add r0, r4, #0x18c orr r1, r1, r5 str r1, [r4, #0x128] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F87B4: .word 0x02324CF8 @@ -33551,14 +33551,14 @@ ov11_022F87B8: ; 0x022F87B8 bne _022F87FC tst r5, #2 beq _022F87FC - bl ov11_022FBA28 + bl InitPartnerFollowData _022F87FC: ldr r1, [r4, #0x128] mvn r0, r5 and r1, r1, r0 add r0, r4, #0x18c str r1, [r4, #0x128] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F8818: .word 0x02324CF8 @@ -33813,7 +33813,7 @@ ov11_022F8AF4: ; 0x022F8AF4 bl ov11_022F8A20 cmp r0, #0 beq _022F8B48 - bl KeyWaitInit__02006DA4 + bl KeyWaitInit mov r0, #1 ldmia sp!, {r4, pc} _022F8B48: @@ -33843,7 +33843,7 @@ ov11_022F8B54: ; 0x022F8B54 bl ov11_022FC83C cmp r0, #0 beq _022F8BA8 - bl KeyWaitInit__02006DA4 + bl KeyWaitInit mov r0, #1 ldmia sp!, {r4, pc} _022F8BA8: @@ -33871,7 +33871,7 @@ ov11_022F8BB4: ; 0x022F8BB4 bl ov11_022FED74 cmp r0, #0 beq _022F8C0C - bl KeyWaitInit__02006DA4 + bl KeyWaitInit ldrsh r0, [r4, #2] mvn r1, #0 bl sub_02065B3C @@ -35951,7 +35951,7 @@ _022FA8D8: bl DebugPrint0__0200C1FC b _022FA93C _022FA8F0: - bl KeyWaitInit__02006DA4 + bl KeyWaitInit mov r0, #4 bl sub_02017CCC bl sub_020676AC @@ -35987,7 +35987,7 @@ _022FA93C: strh r7, [r2, #0x80] ldrsh r1, [r2, #0x80] ldrsb r2, [r2, #0x75] - bl ov11_022F52E8 + bl SetAnimDataFields2 b _022FA9BC _022FA97C: ldrb r0, [r4, #0x174] @@ -36005,7 +36005,7 @@ _022FA97C: strb r1, [r4, #0x175] ldrsh r1, [r2, #0x80] ldrsb r2, [r2, #0x75] - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FA9BC: add sp, sp, #0x58 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -36440,7 +36440,7 @@ _022FAED4: cmpne r0, #0 beq _022FB894 add r0, r5, #0x38 - bl ov11_022DD164 + bl FuncThatCallsCommandParsing cmp r0, #0 beq _022FAF24 mov r1, #1 @@ -36451,7 +36451,7 @@ _022FAED4: cmp r0, #6 bne _022FB864 mov r0, r4 - bl ov11_022F8578 + bl DeleteLiveActor b _022FB894 _022FAF24: ldrsh r1, [r5, #6] @@ -36958,10 +36958,10 @@ _022FB608: str r0, [sp, #0x4c] str ip, [sp, #0x58] add r8, r2, r1 - bl Abs + bl abs str r0, [sp, #0x54] ldr r0, [sp, #0x50] - bl Abs + bl abs ldr r1, [sp, #0x54] str r0, [sp, #0x58] cmp r1, r0 @@ -37091,7 +37091,7 @@ _022FB818: strh r6, [r2, #0x80] ldrsh r1, [r2, #0x80] ldrsb r2, [r2, #0x75] - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FB864: ldrb r0, [r5, #0x174] cmp r0, #0 @@ -37104,7 +37104,7 @@ _022FB864: strb r1, [r5, #0x175] ldrsh r1, [r2, #0x80] ldrsb r2, [r2, #0x75] - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FB894: add r0, r4, #1 mov r0, r0, lsl #0x10 @@ -37122,7 +37122,7 @@ _022FB894: ldrsh r3, [r1, #2] cmp r3, r0 bne _022FB8DC - bl ov11_022FBA28 + bl InitPartnerFollowData b _022FBA10 _022FB8DC: ldr r0, [r1, #0x128] @@ -37188,10 +37188,10 @@ _022FB948: str r3, [sp, #0x64] str r0, [sp, #0x6c] str r1, [sp, #0x68] - bl Abs + bl abs str r0, [sp, #0x64] ldr r0, [sp, #0x70] - bl Abs + bl abs ldr r1, [sp, #0x64] str r0, [sp, #0x68] cmp r1, r0 @@ -37204,7 +37204,7 @@ _022FB948: strgt r1, [r5] b _022FBA10 _022FBA0C: - bl ov11_022FBA28 + bl InitPartnerFollowData _022FBA10: add sp, sp, #0x9c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -37215,8 +37215,8 @@ _022FBA20: .word 0x023217EC _022FBA24: .word 0x00000807 arm_func_end ov11_022FAE58 - arm_func_start ov11_022FBA28 -ov11_022FBA28: ; 0x022FBA28 + arm_func_start InitPartnerFollowData +InitPartnerFollowData: ; 0x022FBA28 ldr r0, _022FBA64 ; =0x02324CF8 mvn r2, #0 ldr r1, [r0] @@ -37235,7 +37235,7 @@ _022FBA44: bx lr .align 2, 0 _022FBA64: .word 0x02324CF8 - arm_func_end ov11_022FBA28 + arm_func_end InitPartnerFollowData arm_func_start ov11_022FBA68 ov11_022FBA68: ; 0x022FBA68 @@ -37303,7 +37303,7 @@ _022FBB20: ldrsh r1, [r0, #0x80] ldrsb r2, [r0, #0x75] add r0, sl, #0x18c - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FBB54: add r3, sl, #0x100 ldrsh r1, [r3, #0x82] @@ -37834,7 +37834,7 @@ _022FC1C8: ldrsh r1, [r6, #6] ldr r2, [r6, #0x12c] add r0, r6, #0x154 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r1, _022FC2D8 ; =0x02321DFC mov r2, r6 add r0, r6, #0x3c @@ -38107,7 +38107,7 @@ ov11_022FC5F8: ; 0x022FC5F8 add r0, ip, #0x154 orr r1, r2, r1 str r1, [ip, #0x12c] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, pc} .align 2, 0 _022FC634: .word 0x02324D00 @@ -38129,7 +38129,7 @@ ov11_022FC638: ; 0x022FC638 and r1, r2, r0 add r0, ip, #0x154 str r1, [ip, #0x12c] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, pc} .align 2, 0 _022FC678: .word 0x02324D00 @@ -39002,21 +39002,21 @@ ov11_022FD1A0: ; 0x022FD1A0 bx lr arm_func_end ov11_022FD1A0 - arm_func_start ov11_022FD1A8 -ov11_022FD1A8: ; 0x022FD1A8 + arm_func_start GetDirectionLiveActor +GetDirectionLiveActor: ; 0x022FD1A8 add r0, r0, #0x100 ldrsb r0, [r0, #0x30] strb r0, [r1] bx lr - arm_func_end ov11_022FD1A8 + arm_func_end GetDirectionLiveActor - arm_func_start ov11_022FD1B8 -ov11_022FD1B8: ; 0x022FD1B8 + arm_func_start SetDirectionLiveActor +SetDirectionLiveActor: ; 0x022FD1B8 mvn r2, #0 cmp r1, r2 strneb r1, [r0, #0x130] bx lr - arm_func_end ov11_022FD1B8 + arm_func_end SetDirectionLiveActor arm_func_start ov11_022FD1C8 ov11_022FD1C8: ; 0x022FD1C8 @@ -39256,7 +39256,7 @@ _022FD494: cmpne r0, #0 beq _022FD4F0 add r0, r5, #0x3c - bl ov11_022DD164 + bl FuncThatCallsCommandParsing cmp r0, #0 beq _022FD4CC cmp r0, #6 @@ -39273,7 +39273,7 @@ _022FD4CC: ldrsh r1, [r0, #0x4e] mov r2, r7 add r0, r5, #0x154 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FD4F0: add r0, r4, #1 mov r0, r0, lsl #0x10 @@ -39329,7 +39329,7 @@ _022FD540: ldrsh r1, [r0, #0x4e] mov r2, fp add r0, sl, #0x154 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FD5B4: add r3, sl, #0x100 ldrsh r1, [r3, #0x50] @@ -39349,7 +39349,7 @@ _022FD5EC: add r1, sp, #0xc add r0, sl, #0x154 add r2, r6, r5 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _022FD5FC: add r0, sb, #1 mov r0, r0, lsl #0x10 @@ -39934,7 +39934,7 @@ ov11_022FDD98: ; 0x022FDD98 add r0, ip, #0x150 orr r1, r2, r1 str r1, [ip, #0x128] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, pc} .align 2, 0 _022FDDD4: .word 0x02324D04 @@ -39956,7 +39956,7 @@ ov11_022FDDD8: ; 0x022FDDD8 and r1, r2, r0 add r0, ip, #0x150 str r1, [ip, #0x128] - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldmia sp!, {r3, pc} .align 2, 0 _022FDE18: .word 0x02324D04 @@ -40795,7 +40795,7 @@ _022FE850: cmpne r0, #0 beq _022FE8AC add r0, r5, #0x3c - bl ov11_022DD164 + bl FuncThatCallsCommandParsing cmp r0, #0 beq _022FE888 cmp r0, #6 @@ -40812,7 +40812,7 @@ _022FE888: ldrsh r1, [r0, #0x4a] mov r2, r7 add r0, r5, #0x150 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FE8AC: add r0, r4, #1 mov r0, r0, lsl #0x10 @@ -40868,7 +40868,7 @@ _022FE8FC: ldrsh r1, [r0, #0x4a] mov r2, fp add r0, sl, #0x150 - bl ov11_022F52E8 + bl SetAnimDataFields2 _022FE970: add r3, sl, #0x100 ldrsh r1, [r3, #0x4c] @@ -41399,9 +41399,9 @@ _022FEFFC: bl sub_02027B1C cmp r5, #3 beq _022FF118 - bl sub_02050C74 + bl GetRank str r0, [sp, #0x14] - bl sub_02050BB8 + bl GetRankupPoints cmp r0, #0 ldreq r7, _022FF1C0 ; =0x00000222 str r0, [sp, #0x28] @@ -41457,7 +41457,7 @@ _022FF0AC: mvn r0, #1 strb r0, [r6, #4] _022FF0F8: - bl sub_02050C74 + bl GetRank mov r1, #3 mov r3, r1 mov r2, #0x12 @@ -41952,7 +41952,7 @@ _022FF760: add r0, sp, #0x10 mov r3, r2 mov r5, #0 - bl Sprintf + bl sprintf add r0, sp, #0x10 bl sub_02008BA8 cmp r0, #0 @@ -42538,7 +42538,7 @@ _022FFF4C: cmp r0, #0 bne _02300570 mov r0, #2 - bl ov11_0230F004 + bl WorldMapSetMode bl ov11_0230E964 ldr r0, _0230057C ; =0x02324D1C mov r1, #1 @@ -42584,7 +42584,7 @@ _022FFFD8: ldr r0, _0230057C ; =0x02324D1C ldr r0, [r0, #4] ldrsh r0, [r0, #0xe] - bl ov11_0230F0C4 + bl WorldMapSetCamera ldr r0, _0230057C ; =0x02324D1C mov r1, #2 ldr r0, [r0, #4] @@ -42716,7 +42716,7 @@ _0230018C: ldr r0, _0230057C ; =0x02324D1C ldr r0, [r0, #4] ldrsh r0, [r0, #0xe] - bl ov11_0230F0C4 + bl WorldMapSetCamera _023001F4: ldr r0, _0230057C ; =0x02324D1C ldr r0, [r0, #4] @@ -43111,7 +43111,7 @@ ov11_02300728: ; 0x02300728 mov r1, r7 ldr r0, [r0, #4] add r0, r0, #0x58 - bl Strcpy + bl strcpy ldr r0, _023007A4 ; =0x02324D24 mov r1, r6 ldr r0, [r0, #4] @@ -43390,7 +43390,7 @@ ov11_02300ACC: ; 0x02300ACC mov r1, r7 ldr r0, [r0, #4] add r0, r0, #0x58 - bl Strcpy + bl strcpy ldr r0, _02300B48 ; =0x02324D2C mov r1, r6 ldr r0, [r0, #4] @@ -46636,7 +46636,7 @@ ov11_02303750: ; 0x02303750 add r2, r2, #0x24 add r2, r2, #0x400 add r1, r2, r1, lsl #6 - bl Strcpy + bl strcpy mov r0, r4 ldmia sp!, {r4, pc} .align 2, 0 @@ -51201,12 +51201,12 @@ _02307548: bl StringFromMessageId mov r1, r0 add r0, sp, #0x20 - bl Strcpy + bl strcpy b _023075F0 _023075E4: ldr r1, _023082C0 ; =0x02322DB0 add r0, sp, #0x20 - bl Strcpy + bl strcpy _023075F0: mov r1, #2 add r3, sp, #0x20 @@ -52000,7 +52000,7 @@ _02308124: mov r2, #0x20 add r0, r0, #0x56 add r0, r0, #0x200 - bl Memcpy + bl memcpy bl sub_02041094 ldr r1, _023082B4 ; =0x02324D8C ldr r1, [r1] @@ -52015,7 +52015,7 @@ _02308168: mov r2, #8 add r0, r0, #0x56 add r0, r0, #0x200 - bl Memcpy + bl memcpy ldr r0, _023082B4 ; =0x02324D8C mvn r1, #0 ldr r0, [r0] @@ -52133,7 +52133,7 @@ _0230831C: mov r2, #0x20 add r0, r0, #0x56 add r0, r0, #0x200 - bl Memcpy + bl memcpy bl sub_02041094 ldr r1, _023082B4 ; =0x02324D8C ldr r1, [r1] @@ -52148,7 +52148,7 @@ _02308360: mov r2, #8 add r0, r0, #0x56 add r0, r0, #0x200 - bl Memcpy + bl memcpy ldr r0, _023082B4 ; =0x02324D8C mvn r1, #0 ldr r0, [r0] @@ -52936,7 +52936,7 @@ ov11_02308EB4: ; 0x02308EB4 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -55047,11 +55047,11 @@ _0230ABD8: beq _0230AC04 ldr r1, _0230AD40 ; =0x02322F80 mov r0, r4 - bl Strcat + bl strcat _0230AC04: ldr r1, _0230AD44 ; =0x02322F84 mov r0, r4 - bl Strcat + bl strcat _0230AC10: add r0, sp, #0x24 ldr r2, _0230AD48 ; =0x02322F24 @@ -55068,7 +55068,7 @@ _0230AC10: bl PreprocessStringFromMessageId ldr r1, [sp, #0xc] mov r0, r4 - bl Strcat + bl strcat mov r7, #1 add r8, r8, #1 _0230AC58: @@ -55077,7 +55077,7 @@ _0230AC58: blt _0230ABD8 ldr r1, _0230AD44 ; =0x02322F84 mov r0, r4 - bl Strcat + bl strcat cmp r7, #0 beq _0230AC8C add r2, sp, #0x24 @@ -55303,8 +55303,8 @@ _0230AF30: .word 0x02324DA0 _0230AF34: .word sub_02047188 arm_func_end ov11_0230AF0C - arm_func_start ov11_0230AF38 -ov11_0230AF38: ; 0x0230AF38 + arm_func_start GetExclusiveItemRequirements +GetExclusiveItemRequirements: ; 0x0230AF38 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x15c ldr r1, _0230B1DC ; =0x02324DA0 @@ -55501,7 +55501,7 @@ _0230B1FC: .word 0x000004B5 _0230B200: .word 0x000004B4 _0230B204: .word 0x000004B6 _0230B208: .word 0x000004B7 - arm_func_end ov11_0230AF38 + arm_func_end GetExclusiveItemRequirements arm_func_start ov11_0230B20C ov11_0230B20C: ; 0x0230B20C @@ -56368,13 +56368,13 @@ ov11_0230BD5C: ; 0x0230BD5C bl sub_0200D65C ldr r1, _0230BE2C ; =0x02323004 mov r0, r6 - bl Strcpy + bl strcpy add r1, sp, #6 mov r0, r6 - bl Strcat + bl strcat ldr r1, _0230BE30 ; =0x0232300C mov r0, r6 - bl Strcat + bl strcat b _0230BDF4 _0230BDEC: mov r0, r6 @@ -56454,7 +56454,7 @@ _0230BEE8: mov r1, #0 _0230BEEC: mov r0, r6 - bl Strcat + bl strcat ldr r1, _0230BF28 ; =0x02324DA4 mov r0, #6 ldr r1, [r1, #4] @@ -57890,7 +57890,7 @@ _0230D048: cmp r0, #0 beq _0230D064 mov r0, #0 - bl ov11_0230F004 + bl WorldMapSetMode bl ov11_0230ED28 ldmia sp!, {r3, pc} _0230D064: @@ -57933,7 +57933,7 @@ _0230D0C0: cmp r0, #0 beq _0230D0DC mov r0, #0 - bl ov11_0230F004 + bl WorldMapSetMode bl ov11_0230E964 ldmia sp!, {r3, pc} _0230D0DC: @@ -59997,7 +59997,7 @@ _0230EA54: ldr r2, _0230EB5C ; =0xA0080000 add r0, r0, #0x1f8 add r0, r0, #0x400 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0230EB54 ; =0x02324DE4 mov r1, #8 ldr r0, [r0, #8] @@ -60158,8 +60158,8 @@ ov11_0230ED28: ; 0x0230ED28 _0230ED44: .word 0x02324DE4 arm_func_end ov11_0230ED28 - arm_func_start ov11_0230ED48 -ov11_0230ED48: ; 0x0230ED48 + arm_func_start GetDungeonMapPos +GetDungeonMapPos: ; 0x0230ED48 stmdb sp!, {r4, lr} sub sp, sp, #8 ldr r2, _0230EDAC ; =0x02324DE4 @@ -60189,7 +60189,7 @@ _0230EDA4: ldmia sp!, {r4, pc} .align 2, 0 _0230EDAC: .word 0x02324DE4 - arm_func_end ov11_0230ED48 + arm_func_end GetDungeonMapPos arm_func_start ov11_0230EDB0 ov11_0230EDB0: ; 0x0230EDB0 @@ -60220,7 +60220,7 @@ ov11_0230EDDC: ; 0x0230EDDC cmp r1, r2 beq _0230EE74 add r0, sp, #0 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _0230EE5C mov r0, #1 @@ -60258,7 +60258,7 @@ _0230EE74: cmp r1, r2 beq _0230EF3C add r0, sp, #0 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _0230EF24 mov r0, #1 @@ -60354,7 +60354,7 @@ _0230EF9C: ldrsh r1, [r0, r1] add r0, r6, r4 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0230EFF4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} @@ -60363,8 +60363,8 @@ _0230EFFC: .word 0x02324DE4 _0230F000: .word 0x02323310 arm_func_end ov11_0230EF48 - arm_func_start ov11_0230F004 -ov11_0230F004: ; 0x0230F004 + arm_func_start WorldMapSetMode +WorldMapSetMode: ; 0x0230F004 ldr r1, _0230F04C ; =0x02324DE4 str r0, [r1] ldr r3, [r1, #8] @@ -60385,7 +60385,7 @@ ov11_0230F004: ; 0x0230F004 bx lr .align 2, 0 _0230F04C: .word 0x02324DE4 - arm_func_end ov11_0230F004 + arm_func_end WorldMapSetMode arm_func_start ov11_0230F050 ov11_0230F050: ; 0x0230F050 @@ -60426,8 +60426,8 @@ ov11_0230F08C: ; 0x0230F08C _0230F0C0: .word 0x02324DE4 arm_func_end ov11_0230F08C - arm_func_start ov11_0230F0C4 -ov11_0230F0C4: ; 0x0230F0C4 + arm_func_start WorldMapSetCamera +WorldMapSetCamera: ; 0x0230F0C4 ldr r2, _0230F0E8 ; =0x02324DE4 ldr r1, [r2, #8] cmp r1, #0 @@ -60439,7 +60439,7 @@ ov11_0230F0C4: ; 0x0230F0C4 bx lr .align 2, 0 _0230F0E8: .word 0x02324DE4 - arm_func_end ov11_0230F0C4 + arm_func_end WorldMapSetCamera arm_func_start ov11_0230F0EC ov11_0230F0EC: ; 0x0230F0EC @@ -60892,7 +60892,7 @@ _0230F6BC: mov r4, r0, asr #0x10 add r0, sp, #0x44 mov r1, r4 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 ldreq r0, _02310050 ; =0x02324DE4 moveq r1, #0 @@ -60958,7 +60958,7 @@ _0230F7C4: _0230F7D0: add r0, sp, #0x3c mov r1, #0x3e8 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _0230F7F0 add r0, sp, #0x3c @@ -61002,7 +61002,7 @@ _0230F860: add r0, sp, #0x3c bne _0230F890 mov r1, #0xc1 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _0230F8A8 add r0, sp, #0x3c @@ -61010,7 +61010,7 @@ _0230F860: b _0230F8A8 _0230F890: mov r1, #0xb8 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _0230F8A8 add r0, sp, #0x3c @@ -61037,7 +61037,7 @@ _0230F8A8: ldrsb r2, [r0, #0x30] add r0, r3, #0x134 add r0, r0, #0x400 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0230F900: ldr r0, _02310050 ; =0x02324DE4 ldr r2, [r0, #8] @@ -61150,7 +61150,7 @@ _0230FA20: add r1, r1, #0xf000 ldr r1, [r1, #0x994] ldrsh r1, [r1, #0x14] - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r5, #0 mov r4, r5 ldr r7, _02310050 ; =0x02324DE4 @@ -61174,7 +61174,7 @@ _0230FABC: add r1, r1, #0xf000 ldr r1, [r1, #0x980] ldrsh r1, [r1, #0x14] - bl ov11_022F52E8 + bl SetAnimDataFields2 add r5, r5, #1 _0230FB08: ldr r0, [r7, #8] @@ -61308,7 +61308,7 @@ _0230FC7C: ldr r1, _02310070 ; =0x0000080D add r0, r4, #0xf400 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0230FCEC: ldr r2, _02310050 ; =0x02324DE4 mov r0, #0 @@ -61435,11 +61435,11 @@ _0230FE78: mov r4, r0 ldr r5, [r1, #8] ldr r0, [r5, #0x38] - bl IntToFloat + bl __floatsisf mov r1, r0 mov r0, r4 - bl DivideFloat - bl FloatToInt + bl __divsf3 + bl __fixsfsi ldr r1, _02310050 ; =0x02324DE4 str r0, [r5, #0x3c] ldr r1, [r1, #8] @@ -61528,7 +61528,7 @@ _0230FFC4: ldrsb r2, [r0, #0x30] add r0, r3, #0x134 add r0, r0, #0x400 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0231002C: ldr r0, _02310050 ; =0x02324DE4 ldr r1, [r0, #8] @@ -61665,7 +61665,7 @@ _023101EC: ldr r2, _0231033C ; =0xA4080000 add r0, r0, #0x6c0 mov r1, #0x9a - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0231031C ; =0x02324DE4 mov r1, #8 ldr r0, [r0, #8] @@ -61804,7 +61804,7 @@ ov11_02310344: ; 0x02310344 add r1, sp, #8 mov r2, #0 str r3, [sp, #0xc] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 mov r8, #0 add r7, sp, #8 mov r6, r8 @@ -61832,7 +61832,7 @@ _02310438: mul r3, sb, r3 add r3, r3, sl, lsl #8 str r3, [sp, #0xc] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r8, r8, #1 _02310490: ldr r0, [r5, #8] @@ -61871,7 +61871,7 @@ _023104F8: cmp r1, r2 beq _02310540 add r0, sp, #0 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _02310540 ldr r0, _02310624 ; =0x02324DE4 @@ -61880,7 +61880,7 @@ _023104F8: mov r2, #0 add r0, r0, #0xdc add r0, r0, #0xf400 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _02310540: mov sl, #0 add r8, sp, #0 @@ -61900,7 +61900,7 @@ _02310560: mov r1, sl, lsl #0x10 mov r0, r8 mov r1, r1, asr #0x10 - bl ov11_0230ED48 + bl GetDungeonMapPos cmp r0, #0 beq _023105B8 ldr r0, [r7, #8] @@ -61909,7 +61909,7 @@ _02310560: add r0, r0, #0x400 mla r0, sl, r5, r0 mov r2, fp - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add sb, sb, #1 cmp sb, #0x64 bgt _023105C4 @@ -62023,7 +62023,7 @@ _023106F8: mov r0, r8 mov r1, r7 mov r2, r6 - bl ov11_022F6E60 + bl LoadObjectAnimData mov r0, r8 mov r1, r5 bl ov11_022F4974 @@ -62208,7 +62208,7 @@ _02310958: ldrsh r1, [r6, #8] mov r0, r5 mov r2, r4 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r7, r7, #1 cmp r7, #9 add r5, r5, #0xc4 @@ -62338,7 +62338,7 @@ _02310B08: mov r2, r7 str ip, [sp] str r3, [sp, #4] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r6, r6, #1 cmp r6, #9 add r4, r4, #0xc4 @@ -64213,7 +64213,7 @@ ov11_02312264: ; 0x02312264 ldr r0, [r0, #4] mov r1, #0xa7 add r0, r0, #0x30 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0231233C ; =0x02324E18 mov r1, #8 ldr r0, [r0, #4] @@ -64224,13 +64224,13 @@ ov11_02312264: ; 0x02312264 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x30 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _0231233C ; =0x02324E18 ldr r1, _02312344 ; =0x00000179 ldr r0, [r0, #4] ldr r2, _02312340 ; =0xA0080000 add r0, r0, #0xf4 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0231233C ; =0x02324E18 mov r1, #0xa ldr r0, [r0, #4] @@ -64241,7 +64241,7 @@ ov11_02312264: ; 0x02312264 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xf4 - bl ov11_022F52E8 + bl SetAnimDataFields2 bl ov11_02312398 mov r0, #1 ldmia sp!, {r3, pc} @@ -64565,13 +64565,13 @@ ov11_02312730: ; 0x02312730 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x30 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 ldr r0, _023127F8 ; =0x02324E18 ldr r1, _02312800 ; =0x02323BD8 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xf4 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 ldr r0, _023127F8 ; =0x02324E18 add r1, sp, #0 ldr r0, [r0, #4] @@ -65053,20 +65053,20 @@ _02312DA4: ldr r0, [r2, #4] mov r2, #0 add r0, r0, #0x324 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _023130A8 ; =0x02324E28 mov r1, #0x800 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x324 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _023130A8 ; =0x02324E28 mov r1, #0x800 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xac add r0, r0, #0x400 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r4, #0 ldr r7, _023130A8 ; =0x02324E28 mov sb, #0x800 @@ -65082,7 +65082,7 @@ _02312E14: mov r1, sb mov r2, r8 add r0, r0, r5 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r4, r4, #1 cmp r4, #0x50 blt _02312E14 @@ -65114,7 +65114,7 @@ _02312E8C: ldr r0, [r2, #4] mov r2, #0 add r0, r0, #0x324 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r4, #0 ldr r7, _023130A8 ; =0x02324E28 mov sb, #0x800 @@ -65130,7 +65130,7 @@ _02312EC8: mov r1, sb mov r2, r8 add r0, r0, r5 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r4, r4, #1 cmp r4, #0x50 blt _02312EC8 @@ -65154,7 +65154,7 @@ _02312F24: ldr r0, [r2, #4] mov r2, #0 add r0, r0, #0x324 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r5, _023130A8 ; =0x02324E28 mov r6, #0 mov r4, #0xc4 @@ -65304,7 +65304,7 @@ _02313150: ldr r2, _02313468 ; =0x88080000 add r0, ip, #0x324 mov r1, #0xcd - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 ldr r2, _02313468 ; =0x88080000 ldr r0, [r0, #4] @@ -65317,7 +65317,7 @@ _02313150: mov r1, #0xad add r0, r0, #0xac add r0, r0, #0x400 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 ldrsh r1, [r5, #4] ldr r0, [r0, #4] @@ -65347,25 +65347,25 @@ _02313150: ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x14 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 ldr r1, _02313470 ; =0x00000807 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xd8 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 ldr r1, _02313470 ; =0x00000807 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x19c - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 ldr r1, _02313470 ; =0x00000807 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x260 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 mov r3, #1 ldr r1, [r0, #4] @@ -65433,25 +65433,25 @@ _023132EC: ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x14 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 ldr r1, _02313478 ; =0x00001013 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xd8 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 ldr r2, _0231347C ; =0x8C080000 ldr r0, [r0, #4] mov r1, #0xd0 add r0, r0, #0x324 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 ldr r1, _02313480 ; =0x00000801 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0x324 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _02313464 ; =0x02324E28 mov r3, #1 ldr r2, [r0, #4] @@ -65468,7 +65468,7 @@ _023133D4: ldr r2, _02313468 ; =0x88080000 add r0, ip, #0x324 mov r1, #0xb6 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 mov r3, #1 ldr r2, [r0, #4] @@ -65481,7 +65481,7 @@ _02313404: ldr r2, _02313468 ; =0x88080000 add r0, ip, #0x324 mov r1, #0xbe - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 mov r3, #1 ldr r2, [r0, #4] @@ -65494,7 +65494,7 @@ _02313434: ldr r1, _02313484 ; =0x00000223 ldr r2, _02313468 ; =0x88080000 add r0, ip, #0x324 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _02313464 ; =0x02324E28 mov r3, #1 ldr r2, [r0, #4] @@ -65604,7 +65604,7 @@ _0231353C: add r1, sp, #0 add r0, r0, #0x324 mov r2, #0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 b _02313784 _023135DC: bl ov11_02313DC4 @@ -65634,7 +65634,7 @@ _02313604: mov r1, r1, lsl #0x10 mov r2, r8 mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 _02313648: ldr r0, [sl, #8] ldr r3, [sl, #4] @@ -65656,7 +65656,7 @@ _02313648: mov r2, #0 str sl, [sp] str r3, [sp, #4] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _0231369C: add sb, sb, #1 cmp sb, #0x50 @@ -65699,7 +65699,7 @@ _023136D0: mov r1, r1, lsl #0x10 add r0, r0, sb mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 strh r7, [r8, #0x16] _02313740: ldr r0, [r8, #8] @@ -65715,7 +65715,7 @@ _02313740: sub r3, r2, #0x2000 mov r2, #0 str r3, [sp, #4] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _02313778: add sl, sl, #1 cmp sl, #0x50 @@ -65964,8 +65964,8 @@ ov11_02313A48: ; 0x02313A48 _02313A94: .word 0x02324E30 arm_func_end ov11_02313A48 - arm_func_start ov11_02313A98 -ov11_02313A98: ; 0x02313A98 + arm_func_start StatusUpdate +StatusUpdate: ; 0x02313A98 ldr r0, _02313AB4 ; =0x02324E30 ldr r1, [r0] cmp r1, #0 @@ -65975,7 +65975,7 @@ ov11_02313A98: ; 0x02313A98 bx lr .align 2, 0 _02313AB4: .word 0x02324E30 - arm_func_end ov11_02313A98 + arm_func_end StatusUpdate arm_func_start ov11_02313AB8 ov11_02313AB8: ; 0x02313AB8 @@ -66427,7 +66427,7 @@ _02314080: add r1, r1, r7 str r8, [r1, #0x38] mov r1, #0xf - bl DivideInt + bl __divsi3 ldr r3, [r4] ldr r1, _023145FC ; =0x02323DD0 add r3, r3, r7 @@ -66534,7 +66534,7 @@ _02314240: mul sb, sl, r5 mov r0, sl mov r1, fp - bl DivideInt + bl __divsi3 mov r0, sl, asr #2 add r0, sl, r0, lsr #29 mov r2, r0, asr #3 @@ -66646,7 +66646,7 @@ _02314374: ldr r2, [r7, #0x24] rsb r2, r2, #0x64 mul r0, r2, r0 - bl DivideInt + bl __divsi3 mov r1, r5, asr #4 add r2, r7, r4 strh r0, [r2, #0x40] @@ -66947,7 +66947,7 @@ _023147F4: ldr r1, [r4, #0x28] ldr r0, [r4, #4] add r1, r1, #8 - bl DivideInt + bl __divsi3 cmp r1, #1 bne _0231482C ldr r0, [r4, #8] @@ -66964,7 +66964,7 @@ _0231482C: ldr r1, [r4, #0x28] ldr r0, [r4, #4] add r1, r1, #8 - bl DivideInt + bl __divsi3 cmp r1, #0 bne _02314D24 ldr r1, [r4, #8] @@ -67003,7 +67003,7 @@ _023148CC: ldr r1, [r4, #0x28] ldr r0, [r4, #4] add r1, r1, #6 - bl DivideInt + bl __divsi3 cmp r1, #0 bne _02314D24 ldr r1, [r4, #8] @@ -67014,7 +67014,7 @@ _023148CC: mov r1, #3 ldr r4, [r0, #8] mov r0, r4 - bl DivideInt + bl __divsi3 cmp r1, #0 bne _0231493C add r0, r4, r4, lsr #31 @@ -67034,12 +67034,12 @@ _0231493C: ldr r0, [r0] ldr r4, [r0, #8] mov r0, r4 - bl DivideInt + bl __divsi3 cmp r1, #0 bne _02314988 mov r0, r4 mov r1, #3 - bl DivideInt + bl __divsi3 mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 add r0, r1, r0, ror #30 @@ -67054,12 +67054,12 @@ _02314988: ldr r0, [r0] ldr r4, [r0, #8] mov r0, r4 - bl DivideInt + bl __divsi3 cmp r1, #1 bne _02314D24 mov r0, r4 mov r1, #3 - bl DivideInt + bl __divsi3 mov r1, r0, lsr #0x1f rsb r0, r1, r0, lsl #30 ldr r2, _02314D3C ; =0x02324460 @@ -67117,7 +67117,7 @@ _02314A38: mov r0, #0xb7 mul r0, r2, r0 mov r1, #0x140 - bl DivideInt + bl __divsi3 ldr r0, [sb, #0xc] mov fp, r1 add r0, r0, #1 @@ -67127,7 +67127,7 @@ _02314A9C: ldr sb, [r4] mov r1, #3 ldr r0, [sb, #4] - bl DivideInt + bl __divsi3 cmp r1, #1 bne _02314CA0 ldr r0, [sb, #8] @@ -67144,7 +67144,7 @@ _02314A9C: mov r0, #0x9f mul r0, r2, r0 mov r1, #0x140 - bl DivideInt + bl __divsi3 ldr r0, [sb, #0x10] mov fp, r1 add r0, r0, #1 @@ -67172,7 +67172,7 @@ _02314B04: mov r0, #0x92 mul r0, r2, r0 mov r1, #0x140 - bl DivideInt + bl __divsi3 ldr r0, [sb, #0x14] mov fp, r1 add r0, r0, #1 @@ -67182,7 +67182,7 @@ _02314B70: ldr sb, [r4] mov r1, #5 ldr r0, [sb, #4] - bl DivideInt + bl __divsi3 cmp r1, #2 bne _02314CA0 ldr r0, [sb, #8] @@ -67199,7 +67199,7 @@ _02314B70: mov r0, #0x9b mul r0, r2, r0 mov r1, #0x140 - bl DivideInt + bl __divsi3 ldr r0, [sb, #0x18] mov fp, r1 add r0, r0, #1 @@ -67210,7 +67210,7 @@ _02314BD8: mov r1, #5 ldr sb, [r0, #8] mov r0, sb - bl DivideInt + bl __divsi3 cmp r1, #3 bne _02314CA0 mov r1, sb, lsr #0x1f @@ -67225,7 +67225,7 @@ _02314BD8: ldr r2, [sb, #0x1c] mov r1, #0x140 mul r0, r2, sl - bl DivideInt + bl __divsi3 ldr r0, [sb, #0x1c] mov fp, r1 add r0, r0, #1 @@ -67236,7 +67236,7 @@ _02314C3C: mov r1, #6 ldr sb, [r0, #8] mov r0, sb - bl DivideInt + bl __divsi3 cmp r1, #3 bne _02314CA0 mov r1, sb, lsr #0x1f @@ -67252,7 +67252,7 @@ _02314C3C: ldr r0, _02314D40 ; =0x000001BF mov r1, #0x140 mul r0, r2, r0 - bl DivideInt + bl __divsi3 ldr r0, [sb, #0x20] mov fp, r1 add r0, r0, #1 @@ -67276,7 +67276,7 @@ _02314CA0: mov r0, #0x3c00 mul r0, r2, r0 mov r1, r1, lsl #5 - bl DivideInt + bl __divsi3 ldrh r1, [r6, #0x12] rsb r0, r0, #0x200 mul r0, r1, r0 @@ -67831,18 +67831,18 @@ _02315440: mov r1, r4 ldrh r4, [r2, r0] mov r0, #0x1000 - bl DivideInt + bl __divsi3 mov r1, #0xa mul r7, r0, r1 mul r0, r5, r4 mov r1, r7 - bl DivideInt + bl __divsi3 ldr r2, [r8, #4] mov r1, r7 add r2, r2, r0 mul r0, r6, r4 str r2, [r8, #4] - bl DivideInt + bl __divsi3 ldr r1, [r8, #8] sub r0, r1, r0 str r0, [r8, #8] @@ -68531,7 +68531,7 @@ _02315E68: add r0, r1, r0, lsr #30 mov r0, r0, asr #2 mov r1, #3 - bl DivideInt + bl __divsi3 sub r1, r1, #0xc4 ldr r0, _02315ED4 ; =0x02324E34 str r1, [r4, #8] diff --git a/asm/overlay_13.s b/asm/overlay_13.s index 7b2e33e5..341bc142 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -520,7 +520,7 @@ _0238A830: ldr r1, [r0] mov r0, #0xb strb r2, [r1, #0x5d] - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 beq _0238BD74 ldr r0, _0238B504 ; =0x0238C054 @@ -846,12 +846,12 @@ _0238AD00: mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] @@ -1652,7 +1652,7 @@ _0238B8BC: _0238B910: mov r1, #0x15 add r0, r6, r7 - bl DivideInt + bl __divsi3 mov r0, r1, lsl #1 ldrsh sl, [fp, r0] mov r1, #0 @@ -1723,17 +1723,17 @@ _0238B9FC: mov r1, #0 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitAttrStruct + bl SetPortraitOffset ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] @@ -1764,17 +1764,17 @@ _0238BA70: mov r1, #0 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitAttrStruct + bl SetPortraitOffset ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] @@ -1800,17 +1800,17 @@ _0238BB10: mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitAttrStruct + bl SetPortraitOffset ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] @@ -1856,17 +1856,17 @@ _0238BB98: mov r1, #1 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B4F8 ; =ov13_0238CEA0 mov r1, #4 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, _0238BDA4 ; =0x0238C014 ldr r0, [r0] add r0, r0, #0x3b4 - bl SetPortraitAttrStruct + bl SetPortraitOffset ldr r0, _0238B4F8 ; =ov13_0238CEA0 ldr r1, [r0] ldrsb r0, [r1, #5] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index f56f842c..b72fe4e1 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -153,13 +153,13 @@ _0238A2BC: ldr r0, [r0] mov r2, #0x8100000 add r0, r0, #0x120 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0238A508 ; =ov14_0238DB80 ldr r2, _0238A50C ; =0x88080000 ldr r0, [r0] mov r1, #0xcd add r0, r0, #0x1e4 - bl ov11_022F6E60 + bl LoadObjectAnimData ldr r0, _0238A508 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x2a8 @@ -170,7 +170,7 @@ _0238A2BC: ldr r0, [r0] mov r2, #0 add r0, r0, #0x2a8 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov sb, #0 ldr r5, _0238A510 ; =0xC8100000 ldr r4, _0238A508 ; =ov14_0238DB80 @@ -189,7 +189,7 @@ _0238A3E8: add r0, r0, #0x36c mov r2, r6 add r0, r0, r8 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r1, [r4] add r0, r1, #0x3ac add r0, r0, #0xc00 @@ -201,7 +201,7 @@ _0238A3E8: add r0, r0, #0x3ac add r0, r0, #0xc00 add r0, r0, r8 - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldr r1, [r4] add r0, r1, #0x3ec add r0, r0, #0x1800 @@ -217,7 +217,7 @@ ov14_0238A468: ; 0x0238A468 add r0, r0, #0x3ec add r0, r0, #0x1800 add r0, r0, r8 - bl ov11_022F495C + bl SetAnimDataFieldsWrapper add sb, sb, #1 cmp sb, #0x10 blt _0238A3E8 @@ -238,7 +238,7 @@ _0238A494: add r0, r0, #0x2c add r0, r0, #0x2800 add r0, r0, r4 - bl ov11_022F495C + bl SetAnimDataFieldsWrapper add r5, r5, #1 cmp r5, #2 blt _0238A494 @@ -924,7 +924,7 @@ SentryUpdateDisplay: ; 0x0238ADFC beq _0238AECC ldr r0, [r0, #0x874] mov r1, #0x3c - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 cmp r0, #9 @@ -954,7 +954,7 @@ _0238AE88: mov r2, r8 str sl, [sp, #0x14] str r3, [sp, #0x18] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r5, r5, #1 cmp r5, #4 blt _0238AE88 @@ -999,7 +999,7 @@ _0238AF50: mla r0, sl, r6, r0 mov r1, sb mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 b _0238AFA0 _0238AF6C: add r0, r1, #0x188 @@ -1007,7 +1007,7 @@ _0238AF6C: mla r0, sl, r5, r0 ldr r1, _0238B6A0 ; =0x00001005 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 b _0238AFA0 _0238AF88: add r0, r1, #0x188 @@ -1015,7 +1015,7 @@ _0238AF88: mla r0, sl, r4, r0 ldr r1, _0238B69C ; =0x00000806 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0238AFA0: ldr r1, [r7] add r0, r1, sl, lsl #2 @@ -1028,7 +1028,7 @@ _0238AFA0: mla r0, sl, fp, r0 add r1, r8, sl, lsl #3 mov r2, #0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _0238AFD0: add sl, sl, #1 cmp sl, #4 @@ -1049,14 +1049,14 @@ _0238AFDC: add r0, r0, #0x3000 mov r2, #0 str r3, [sp, #0x18] - bl ov11_022F7064 + bl AnimRelatedFunction__022F7064 ldr r0, _0238B694 ; =ov14_0238DB80 add r1, sp, #0x14 ldr r0, [r0] mov r2, #0 add r0, r0, #0x6c add r0, r0, #0x3400 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _0238B038: ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, [r0] @@ -1094,7 +1094,7 @@ _0238B098: ldr r1, _0238B6A4 ; =0x00000801 add r0, r0, #0x2800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0238B0C4: ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 @@ -1111,7 +1111,7 @@ _0238B0EC: ldr r1, _0238B6A8 ; =0x00001002 add r0, r0, #0x2800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] @@ -1127,7 +1127,7 @@ _0238B128: ldr r1, _0238B6AC ; =0x00000802 add r0, r0, #0x2800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 ldr r0, [r1] @@ -1146,7 +1146,7 @@ _0238B164: add r0, r0, #0x2800 mov r1, #0x800 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 _0238B184: ldr r1, _0238B694 ; =ov14_0238DB80 mov r2, #0 @@ -1170,7 +1170,7 @@ _0238B1A8: add r0, r0, #0x2800 add r1, r2, r1, lsl #3 mov r2, #0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _0238B1DC: mov sl, #0 ldr r8, _0238B6B0 ; =0x0238DB84 @@ -1189,7 +1189,7 @@ _0238B1F8: mov r1, r0, lsl #0x10 add r0, r3, sb mov r1, r1, asr #0x10 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, sl, lsl #1 ldrsh r1, [r7, r0] ldr r0, [r5] @@ -1200,7 +1200,7 @@ _0238B1F8: add r0, r0, sb add r1, sp, #0x14 str r6, [sp, #0x18] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add sl, sl, #1 cmp sl, #0x10 blt _0238B1F8 @@ -1344,7 +1344,7 @@ _0238B460: mla r0, r8, r7, r0 mov r1, r6 mov r2, r5 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r8, r8, #1 _0238B47C: ldr r1, [r4] @@ -1363,7 +1363,7 @@ _0238B4A0: mla r0, r7, r8, r0 mov r1, r6 mov r2, r5 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r7, r7, #1 _0238B4BC: ldr r1, [r4] @@ -1396,7 +1396,7 @@ _0238B500: mov r1, r8 mov r2, r7 str r3, [sp, #0x14] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r4, r4, #1 cmp r4, #2 blt _0238B500 @@ -1422,7 +1422,7 @@ _0238B574: add r0, r0, #0x3000 mla r0, r4, r5, r0 mov r2, r7 - bl ov11_022F52E8 + bl SetAnimDataFields2 add r4, r4, #1 cmp r4, #4 blt _0238B574 @@ -1470,7 +1470,7 @@ _0238B610: mov r2, r7 str r3, [sp, #0x14] str ip, [sp, #0x18] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 b _0238B67C _0238B648: add r0, r1, #0x98 @@ -1485,7 +1485,7 @@ _0238B648: mov r2, fp str r3, [sp, #0x14] str ip, [sp, #0x18] - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 _0238B67C: add sl, sl, #1 cmp sl, #4 @@ -1514,8 +1514,8 @@ _0238B6D0: .word 0x00001003 _0238B6D4: .word 0x00002C05 arm_func_end SentryUpdateDisplay - arm_func_start SentrySetExitingState__0238B6D8 -SentrySetExitingState__0238B6D8: ; 0x0238B6D8 + arm_func_start SentrySetExitingState +SentrySetExitingState: ; 0x0238B6D8 stmdb sp!, {r3, lr} ldr r0, _0238B704 ; =ov14_0238DB80 mov r1, #0 @@ -1529,7 +1529,7 @@ SentrySetExitingState__0238B6D8: ; 0x0238B6D8 ldmia sp!, {r3, pc} .align 2, 0 _0238B704: .word ov14_0238DB80 - arm_func_end SentrySetExitingState__0238B6D8 + arm_func_end SentrySetExitingState arm_func_start ov14_0238B708 ov14_0238B708: ; 0x0238B708 @@ -2028,12 +2028,12 @@ _0238BDA4: mov r1, #0 ldr r0, [r0] add r0, r0, #0xf4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238C12C ; =ov14_0238DB80 mov r1, #0 ldr r0, [r0] add r0, r0, #0xf4 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C12C ; =ov14_0238DB80 ldr r1, [r0] ldrsb r0, [r1, #2] @@ -2443,7 +2443,7 @@ _0238C390: add r0, r0, #0x3000 str r1, [r0, #0x890] _0238C3A4: - bl SentrySetExitingState__0238B6D8 + bl SentrySetExitingState ldmia sp!, {r3, pc} .align 2, 0 _0238C3AC: .word ov14_0238DB80 @@ -2463,13 +2463,13 @@ SentryState4: ; 0x0238C3B0 _0238C3D0: .word ov14_0238DB80 arm_func_end SentryState4 - arm_func_start SentrySetExitingState__0238C3D4 -SentrySetExitingState__0238C3D4: ; 0x0238C3D4 - ldr ip, _0238C3DC ; =SentrySetExitingState__0238B6D8 + arm_func_start SentryStateExit +SentryStateExit: ; 0x0238C3D4 + ldr ip, _0238C3DC ; =SentrySetExitingState bx ip .align 2, 0 -_0238C3DC: .word SentrySetExitingState__0238B6D8 - arm_func_end SentrySetExitingState__0238C3D4 +_0238C3DC: .word SentrySetExitingState + arm_func_end SentryStateExit arm_func_start SentryState6 SentryState6: ; 0x0238C3E0 @@ -2760,7 +2760,7 @@ _0238C72C: mov r2, #0 add r0, r0, #0x3a8 add r0, r0, #0x3000 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r1, [r0] add r0, r1, #0x6c @@ -2773,7 +2773,7 @@ _0238C72C: mov r2, #0 add r0, r0, #0x6c add r0, r0, #0x3400 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r1, _0238CA54 ; =ov14_0238DB80 mov r2, #0x60 ldr r0, [r1] @@ -2789,14 +2789,14 @@ _0238C72C: ldr r0, [r0] add r0, r0, #0x1b4 add r0, r0, #0x2800 - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldr r0, _0238CA54 ; =ov14_0238DB80 mov r1, #0x800 ldr r0, [r0] mov r2, #0 add r0, r0, #0x1b4 add r0, r0, #0x2800 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r4, _0238CA54 ; =ov14_0238DB80 mov sb, #0 ldr r0, [r4] @@ -2830,7 +2830,7 @@ _0238C88C: add r0, r0, #0x2800 add r0, r0, r8 mov r2, #7 - bl ov11_022F52E8 + bl SetAnimDataFields2 ldr r1, [r4] add r0, r1, #0x188 add r0, r0, #0x2c00 @@ -2842,7 +2842,7 @@ _0238C88C: add r0, r0, #0x188 add r0, r0, #0x2c00 add r0, r0, r8 - bl ov11_022F495C + bl SetAnimDataFieldsWrapper ldr r0, [r4] add r0, r0, sb, lsl #2 add r0, r0, #0x3000 @@ -2889,10 +2889,10 @@ _0238C984: bl InitPortraitBox add r0, sp, #0x10 mov r1, #3 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, sp, #0x10 add r1, sp, #8 - bl SetPortraitAttrStruct + bl SetPortraitOffset mov r0, r7 add r1, sp, #0x10 bl ShowPortraitBox @@ -2973,7 +2973,7 @@ SentryStateGetUserChoice: ; 0x0238CA94 ldr r0, [r2] add r0, r0, #0x3000 ldr r0, [r0, #0x874] - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 mov r1, r8, lsr #0x1f @@ -2985,7 +2985,7 @@ SentryStateGetUserChoice: ; 0x0238CA94 ldr r4, [r0] add r0, r4, #0x3000 ldr r0, [r0, #0x874] - bl DivideInt + bl __divsi3 cmp r0, #0x10 bge _0238CDE0 mov r4, #0 @@ -3244,13 +3244,13 @@ _0238CE50: bl InitPortraitBoxWithMonsterId ldrb r1, [r6, sb] mov r0, r7 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r0, r7 add r1, r5, sb, lsl #3 - bl SetPortraitAttrStruct + bl SetPortraitOffset mov r0, r7 mov r1, sl - bl SetPortraitExpressionId + bl SetPortraitEmotion cmp sb, #3 addls pc, pc, sb, lsl #2 b _0238CEFC @@ -3446,10 +3446,10 @@ _0238D124: bl InitPortraitBox add r0, sp, #0x10 mov r1, #3 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, sp, #0x10 add r1, sp, #8 - bl SetPortraitAttrStruct + bl SetPortraitOffset mov r0, r8 add r1, sp, #0x10 bl ShowPortraitBox @@ -3946,7 +3946,7 @@ _0238D768: subgt r1, r1, #1 strgt r1, [r0, #0x8b4] ldmgtia sp!, {r3, pc} - bl SentrySetExitingState__0238B6D8 + bl SentrySetExitingState ldmia sp!, {r3, pc} .align 2, 0 _0238D790: .word ov14_0238DB80 @@ -3995,7 +3995,7 @@ _0238D7FC: subgt r1, r1, #1 strgt r1, [r0, #0x8b4] ldmgtia sp!, {r3, pc} - bl SentrySetExitingState__0238B6D8 + bl SentrySetExitingState ldmia sp!, {r3, pc} .align 2, 0 _0238D824: .word ov14_0238DB80 @@ -4010,7 +4010,7 @@ ov14_0238D828: ; 0x0238D828 mov r8, r2 mov r4, r3 ldr r7, [sb] - bl Strlen + bl strlen ldr r2, [sp, #0x30] mov r6, #0 cmp r0, r2 @@ -4042,11 +4042,11 @@ _0238D87C: add r2, r2, #8 str r2, [r8] mov r2, r6 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, r7 mov r1, r5 mov r2, r4 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r7, r7, #0xc4 b _0238D950 _0238D8DC: @@ -4058,11 +4058,11 @@ _0238D8DC: str r1, [r8] mov r1, fp mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, r7 mov r1, r5 mov r2, #0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r7, r7, #0xc4 b _0238D950 _0238D918: @@ -4074,11 +4074,11 @@ _0238D918: str r1, [r8] mov r1, #0x810 mov r2, #0 - bl ov11_022F52E8 + bl SetAnimDataFields2 mov r0, r7 mov r1, r5 mov r2, #0 - bl ov11_022F6F14 + bl AnimRelatedFunction__022F6F14 add r7, r7, #0xc4 _0238D950: ldrb r0, [sl] diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 8a629b90..02e22c9b 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -48,12 +48,12 @@ ov15_0238A140: ; 0x0238A140 mov r1, #0 ldr r0, [r0] add r0, r0, #0xdc - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238A228 ; =ov15_0238B180 mov r1, #0 ldr r0, [r0] add r0, r0, #0xdc - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238A228 ; =ov15_0238B180 ldr r1, [r0] ldrsb r0, [r1, #0x81] diff --git a/asm/overlay_16.s b/asm/overlay_16.s index 06a2b2cd..13286e55 100644 --- a/asm/overlay_16.s +++ b/asm/overlay_16.s @@ -976,12 +976,12 @@ _0238AED8: mov r1, #4 ldr r0, [r0] add r0, r0, #0xc8 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] add r0, r0, #0xc8 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsb r0, [r1, #0xc2] @@ -2070,12 +2070,12 @@ _0238BED8: mov r1, #4 ldr r0, [r0] add r0, r0, #0xc8 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238C0CC ; =ov16_0238CE40 mov r1, #0 ldr r0, [r0] add r0, r0, #0xc8 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C0CC ; =ov16_0238CE40 ldr r1, [r0] ldrsb r0, [r1, #0xc2] diff --git a/asm/overlay_17.s b/asm/overlay_17.s index f5f71095..ef86a00c 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -672,12 +672,12 @@ _0238AA30: mov r1, #0 ldr r0, [r0] add r0, r0, #0x5c - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238AF9C ; =ov17_0238BE00 mov r1, #0 ldr r0, [r0] add r0, r0, #0x5c - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238AF9C ; =ov17_0238BE00 ldr r1, [r0] ldrsb r0, [r1, #1] diff --git a/asm/overlay_18.s b/asm/overlay_18.s index d0a6aab5..c21c30ff 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -680,7 +680,7 @@ ov18_0238AAC0: ; 0x0238AAC0 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -703,7 +703,7 @@ ov18_0238AAE8: ; 0x0238AAE8 _0238AB18: mov r0, r5 add r1, sp, #0 - bl sub_0205384C + bl GetEncodedHalfword ldrb r1, [r0] add r5, r0, #1 cmp r1, r8 @@ -850,7 +850,7 @@ ov18_0238ACE4: ; 0x0238ACE4 _0238AD14: mov r0, r5 add r1, sp, #0 - bl sub_0205384C + bl GetEncodedHalfword ldrb r1, [r0] add r5, r0, #1 cmp r1, r8 @@ -1432,12 +1432,12 @@ _0238B4A4: mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238BD40 ; =ov18_0238D620 mov r1, #0 ldr r0, [r0] add r0, r0, #0x64 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238BD40 ; =ov18_0238D620 ldr r1, [r0] ldrsb r0, [r1, #1] @@ -3588,7 +3588,7 @@ ov18_0238CF98: ; 0x0238CF98 mov r2, #8 add r0, r0, #0xa6 add r0, r0, #0x300 - bl Memcpy + bl memcpy ldr r0, _0238D030 ; =ov18_0238D620 mov r2, #0 ldr r1, [r0] diff --git a/asm/overlay_19.s b/asm/overlay_19.s index 0f1e9a1e..405b37a9 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -235,7 +235,7 @@ _0238A3E8: .word 0x0238DAE8 ov19_0238A3EC: ; 0x0238A3EC stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r0 - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance mov r6, #0 ldr r5, _0238A464 ; =0x0238DAE8 mov r4, r0 @@ -369,7 +369,7 @@ _0238A4C8: ; jump table _0238A5CC: mvn r0, #0 mov r1, #0 - bl ov11_022E8124 + bl InitRandomNpcJobs bl ov11_02311D6C mov r0, #1 str r0, [r8, #4] @@ -1252,7 +1252,7 @@ _0238B250: add r0, r8, #0x10 mov r1, #0xc str r2, [sp, #0x7ec] - bl SetPortraitExpressionId + bl SetPortraitEmotion bl ov19_0238D450 mov r0, #4 ldr r1, _0238B484 ; =0x0000101C @@ -1279,7 +1279,7 @@ _0238B2B8: add r0, r8, #0x10 mov r1, #0xc str r2, [sp, #0x79c] - bl SetPortraitExpressionId + bl SetPortraitEmotion bl ov19_0238D450 mov r0, #5 ldr r1, _0238B484 ; =0x0000101C @@ -1303,7 +1303,7 @@ _0238B320: bl sub_02046D20 add r0, r8, #0x10 mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion add r0, r8, #0x100 mov r1, #0 strh r1, [r0] @@ -1318,7 +1318,7 @@ _0238B34C: add r0, r8, #0x10 mov r1, #7 str r2, [sp, #0x74c] - bl SetPortraitExpressionId + bl SetPortraitEmotion bl ov19_0238D450 mov r0, #6 ldr r1, _0238B484 ; =0x0000101C @@ -1342,7 +1342,7 @@ _0238B3B4: bl ov19_0238D47C add r0, r8, #0x10 mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion add r0, sp, #0x6b0 bl InitPreprocessorArgs ldr r1, [r8, #0xd4] @@ -1902,7 +1902,7 @@ _0238BB9C: bl PreprocessStringFromMessageId mov r0, r5 add r1, r5, #0x400 - bl Strcat + bl strcat add r0, sp, #0x114 ldrsh r0, [r0, #0x66] cmp r0, #0 @@ -1933,7 +1933,7 @@ _0238BC38: beq _0238BC8C ldr r1, _0238C4CC ; =0x0238E2C0 mov r0, r5 - bl Strcat + bl strcat mov r1, r7, lsl #1 ldrh r1, [r4, r1] ldr r0, [sp, #0x10] @@ -1947,7 +1947,7 @@ _0238BC38: bl PreprocessStringFromMessageId mov r0, r5 add r1, r5, #0x400 - bl Strcat + bl strcat _0238BC8C: add r7, r7, #1 cmp r7, #6 @@ -2230,7 +2230,7 @@ _0238C07C: bl InitPortraitBoxWithMonsterId add r0, r8, #0x10 mov r1, #0x13 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, [r8, #0xd4] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -2239,12 +2239,12 @@ _0238C07C: beq _0238C0D0 ldr r1, _0238C4E0 ; =0x0238E1BC add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset b _0238C0DC _0238C0D0: ldr r1, _0238C4E4 ; =0x0238E1C4 add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset _0238C0DC: ldr r0, _0238B440 ; =0x0000301C ldr r1, _0238C4E8 ; =0x000045DB @@ -2274,7 +2274,7 @@ _0238C0FC: bl InitPortraitBoxWithMonsterId add r0, r8, #0x10 mov r1, #0x13 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, [r8, #0xd4] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -2283,12 +2283,12 @@ _0238C0FC: beq _0238C174 ldr r1, _0238C4EC ; =0x0238E1A4 add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset b _0238C180 _0238C174: ldr r1, _0238C4F0 ; =0x0238E1AC add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset _0238C180: bl ov19_0238D450 ldr r1, _0238C4F4 ; =0x0238E220 @@ -2313,10 +2313,10 @@ _0238C1BC: bl sub_02046D20 ldr r1, _0238C4FC ; =0x0238E1B4 add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset add r0, r8, #0x10 mov r1, #0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, r8, #0x100 mov r1, #0 strh r1, [r0] @@ -2331,10 +2331,10 @@ _0238C200: bl sub_02046D20 add r0, r8, #0x10 mov r1, #0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r1, _0238C4FC ; =0x0238E1B4 add r0, r8, #0x10 - bl SetPortraitAttrStruct + bl SetPortraitOffset add r0, r8, #0x100 mov r1, #0 strh r1, [r0] @@ -2936,7 +2936,7 @@ ov19_0238C9F0: ; 0x0238C9F0 bl PreprocessStringFromMessageId mov r0, r5 add r1, r5, #0x400 - bl Strcat + bl strcat cmp sb, #0 beq _0238CABC ldrsh r2, [r4, #8] @@ -3081,14 +3081,14 @@ _0238CC4C: bl InitPreprocessorArgs ldr r1, _0238CCE0 ; =0x0238E2C0 mov r0, sl - bl Strcat + bl strcat ldr r1, [r4, #0xd4] mov r0, sl orr r1, r1, #0x20000 str r1, [sp, #0xc] ldr r1, _0238CCE4 ; =0x0238E2C4 str r5, [sp, #0x1c] - bl Strcat + bl strcat add r0, sp, #0xc str r0, [sp] mov r0, #1 @@ -3108,7 +3108,7 @@ ov19_0238CC94: ; 0x0238CC94 ov19_0238CCA8: ; 0x0238CCA8 mov r0, sl mov r1, sb - bl Strcat + bl strcat add r0, fp, #0x14 and r1, r5, #0xff arm_func_end ov19_0238CCA8 @@ -3338,7 +3338,7 @@ _0238CF84: ldr r0, [sp, #0xc] str r0, [sp, #0x58] mov r0, r5 - bl Abs + bl abs str r0, [sp, #0x44] cmp r8, #1 ldreq r0, [sl, #0x20] @@ -3794,10 +3794,10 @@ ov19_0238D56C: ; 0x0238D56C bl InitPortraitBoxWithMonsterId add r0, r4, #0x10 mov r1, #0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, r4, #0x10 mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion add r0, r4, #0x5c bl sub_020580C4 mov r0, #0 @@ -3832,10 +3832,10 @@ ov19_0238D5FC: ; 0x0238D5FC bl InitPortraitBoxWithMonsterId add r0, r4, #0x10 mov r1, #0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, r4, #0x10 mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion add r0, r4, #0x5c bl sub_020580C4 ldr r0, [r4] diff --git a/asm/overlay_20.s b/asm/overlay_20.s index eaa2d7a4..c606ca5f 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -1011,7 +1011,7 @@ _0238AEE8: mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 mov r1, #0x64 - bl DivideInt + bl __divsi3 mov r5, r1, lsl #0x10 add r0, sb, #0x84 bl sub_02011E18 @@ -1024,7 +1024,7 @@ _0238AEE8: str r5, [sp] bl Rand16Bit ldr r1, [r5, #4] - bl DivideInt + bl __divsi3 ldr r2, [r5] mov r0, #0x18 mla r0, r1, r0, r2 @@ -1462,10 +1462,10 @@ _0238B4D4: bl InitPortraitBoxWithMonsterId add r0, r4, #0x1c mov r1, #0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout add r0, r4, #0x1c mov r1, #0 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldrsb r0, [r4, #0x18] add r1, r4, #0x1c bl ShowPortraitBox @@ -2490,7 +2490,7 @@ ov20_0238C2E0: ; 0x0238C2E0 stmdb sp!, {r4, r5, r6, lr} mov r6, r1 mov r5, r2 - bl sub_0200CE74 + bl IsTicketItem bl sub_02012294 mov r4, r0 mov r0, #0x1cc diff --git a/asm/overlay_21.s b/asm/overlay_21.s index db368a33..87abe8d9 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -116,14 +116,14 @@ _0238A274: mov r1, #0 ldr r0, [r0] add r0, r0, #0xc8 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B08C ; =ov21_0238CF40 ldr r1, [r0] add r0, r1, #0xc8 ldr r1, [r1, #0x28] mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B08C ; =ov21_0238CF40 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -163,7 +163,7 @@ _0238A378: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -191,7 +191,7 @@ _0238A3E0: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -237,7 +237,7 @@ _0238A478: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -281,7 +281,7 @@ _0238A520: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -308,7 +308,7 @@ _0238A594: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -336,7 +336,7 @@ _0238A5FC: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -366,7 +366,7 @@ _0238A668: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -396,7 +396,7 @@ _0238A6DC: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -429,7 +429,7 @@ _0238A750: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -459,7 +459,7 @@ _0238A7D0: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -497,7 +497,7 @@ _0238A854: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -529,7 +529,7 @@ _0238A8D4: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -655,7 +655,7 @@ _0238AAC0: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -810,7 +810,7 @@ _0238AD04: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -896,7 +896,7 @@ _0238AE54: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B08C ; =ov21_0238CF40 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -921,7 +921,7 @@ _0238AE94: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1124,7 +1124,7 @@ _0238B188: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B08C ; =ov21_0238CF40 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1240,7 +1240,7 @@ _0238B344: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1341,7 +1341,7 @@ _0238B4CC: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1369,7 +1369,7 @@ _0238B538: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1410,7 +1410,7 @@ _0238B5D0: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -1459,7 +1459,7 @@ _0238B68C: add r0, r0, #0xc8 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, r4 ldr r1, [r0] ldrsb r0, [r1, #0x81] @@ -2634,7 +2634,7 @@ _0238C724: bl ov21_0238A140 mvn r0, #0 mov r1, #0 - bl ov11_022E8124 + bl InitRandomNpcJobs bl ov00_0230D92C ldr r0, _0238C8D0 ; =ov21_0238CF40 mov r2, #0 diff --git a/asm/overlay_22.s b/asm/overlay_22.s index d4049987..e0173903 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -215,7 +215,7 @@ _0238A378: add r1, sp, #0x14 add r0, r0, #0xe8 add r0, r0, sb - bl Strcpy + bl strcpy ldr r0, [r4, #4] add r0, r0, sl strb fp, [r0, #0x368] @@ -228,17 +228,17 @@ _0238A40C: ldr r1, _0238A4C4 ; =0x0238E82C add r0, r0, #0xe8 add r0, r0, sb - bl Strcpy + bl strcpy ldr r0, [r4, #4] add r1, sp, #0x14 add r0, r0, #0xe8 add r0, r0, sb - bl Strcat + bl strcat ldr r0, [r4, #4] ldr r1, _0238A4C8 ; =0x0238E834 add r0, r0, #0xe8 add r0, r0, sb - bl Strcat + bl strcat ldr r0, [r4, #4] add r1, r0, sl mov r0, #0 @@ -720,7 +720,7 @@ _0238A9C4: add r1, sp, #0x14 add r0, r0, #0xc8 add r0, r0, sb - bl Strcpy + bl strcpy ldr r0, [r4, #4] add r0, r0, sl strb fp, [r0, #0x208] @@ -733,17 +733,17 @@ _0238AA58: ldr r1, _0238AB10 ; =0x0238E84C add r0, r0, #0xc8 add r0, r0, sb - bl Strcpy + bl strcpy ldr r0, [r4, #4] add r1, sp, #0x14 add r0, r0, #0xc8 add r0, r0, sb - bl Strcat + bl strcat ldr r0, [r4, #4] ldr r1, _0238AB14 ; =0x0238E854 add r0, r0, #0xc8 add r0, r0, sb - bl Strcat + bl strcat ldr r0, [r4, #4] add r1, r0, sl mov r0, #0 @@ -2172,7 +2172,7 @@ _0238BED4: tst r0, #0xff beq _0238BF48 ldrsh r0, [sb, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0238BF48 mov r0, r6 @@ -3516,7 +3516,7 @@ _0238D278: tst r0, #0xff beq _0238D2EC ldrsh r0, [sb, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0238D2EC mov r0, r6 @@ -3729,7 +3729,7 @@ _0238D57C: tst r0, #0xff beq _0238D5E0 ldrsh r0, [sb, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0238D5E0 mov r0, sb @@ -3765,7 +3765,7 @@ _0238D614: cmp r0, #1 moveq r1, #3 add r0, r3, #0x1e0 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238D63C ; =0x0238EC70 ldr r1, [r0] ldrsb r0, [r1, #0x49] @@ -3859,12 +3859,12 @@ _0238D758: mov r1, #0 ldr r0, [r0] add r0, r0, #0x1e0 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238D7A4 ; =0x0238EC70 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1e0 - bl SetPortraitExpressionId + bl SetPortraitEmotion mov r0, #0 bl ov22_0238ADD8 mov r0, #1 @@ -4515,7 +4515,7 @@ _0238E0A0: ldr r0, _0238E794 ; =0x0238EC70 ldr r0, [r0] ldrsh r0, [r0, #0x30] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 ldreq r0, _0238E794 ; =0x0238EC70 moveq r1, #0xe @@ -4689,7 +4689,7 @@ _0238E2FC: tst r0, #0xff beq _0238E368 ldrsh r0, [r7, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0238E368 ldrb r0, [r7, #1] @@ -4807,7 +4807,7 @@ _0238E4A4: tst r0, #0xff beq _0238E520 ldrsh r0, [r7, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0238E520 mov r0, r4 diff --git a/asm/overlay_23.s b/asm/overlay_23.s index 74c41caf..932e445e 100644 --- a/asm/overlay_23.s +++ b/asm/overlay_23.s @@ -86,7 +86,7 @@ _0238A218: mov r1, #0 ldr r0, [r0] add r0, r0, #0x1ac - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, _0238B0E0 ; =0x00003008 ldr r3, [r0] @@ -492,7 +492,7 @@ _0238A85C: cmp r0, #1 bne _0238A8B0 ldrsh r0, [r1, #0x1c] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 ldrne r0, _0238B0DC ; =ov23_0238D8A0 movne r1, #0 @@ -1234,7 +1234,7 @@ _0238B308: mov r1, #0 ldr r0, [r0] add r0, r0, #0x1ac - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, _0238C1D0 ; =0x00003008 ldr r3, [r0] @@ -1640,7 +1640,7 @@ _0238B94C: cmp r0, #1 bne _0238B9A0 ldrsh r0, [r1, #0x1c] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 ldrne r0, _0238C1CC ; =ov23_0238D8A0 movne r1, #0 @@ -2588,7 +2588,7 @@ _0238C728: cmp r1, #0x10 bne _0238C78C ldrsh r0, [r2, #0x1c] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 bne _0238C76C ldr r0, _0238D090 ; =ov23_0238D8A0 @@ -3302,7 +3302,7 @@ ov23_0238D0E0: ; 0x0238D0E0 ldmeqia sp!, {r4, r5, r6, pc} ldrsb r1, [r3, #0x88] add r0, r3, #0x1ac - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238D144 ; =ov23_0238D8A0 ldr r1, [r0] ldrsb r0, [r1, #0x96] diff --git a/asm/overlay_24.s b/asm/overlay_24.s index 033fadda..683a847e 100644 --- a/asm/overlay_24.s +++ b/asm/overlay_24.s @@ -434,13 +434,13 @@ _0238A6F4: mov r1, #0 ldr r0, [r0] add r0, r0, #0x294 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B384 ; =ov24_0238C600 ldr r2, [r0] add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -505,7 +505,7 @@ _0238A82C: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -534,7 +534,7 @@ _0238A890: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -560,7 +560,7 @@ _0238A900: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -592,7 +592,7 @@ _0238A964: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -624,7 +624,7 @@ _0238A9E0: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -656,7 +656,7 @@ _0238AA5C: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -687,7 +687,7 @@ _0238AAD8: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -719,7 +719,7 @@ _0238AB50: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion bl sub_0201077C ldr r1, _0238B384 ; =ov24_0238C600 ldr r1, [r1] @@ -828,7 +828,7 @@ _0238ACE0: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 mov r3, #0x1b ldr r1, [r0] @@ -957,7 +957,7 @@ _0238AECC: _0238AF00: bl Rand16Bit mov r1, #0x64 - bl DivideInt + bl __divsi3 ldr r0, _0238B3D8 ; =0x020A1868 ldrsh r0, [r0] cmp r1, r0 @@ -987,7 +987,7 @@ _0238AF00: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1012,7 +1012,7 @@ _0238AFC0: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B384 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1369,13 +1369,13 @@ _0238B4D0: mov r1, #0 ldr r0, [r0] add r0, r0, #0x294 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238C164 ; =ov24_0238C600 ldr r2, [r0] add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1440,7 +1440,7 @@ _0238B608: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1469,7 +1469,7 @@ _0238B66C: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1495,7 +1495,7 @@ _0238B6DC: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1527,7 +1527,7 @@ _0238B740: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1559,7 +1559,7 @@ _0238B7BC: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1591,7 +1591,7 @@ _0238B838: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1622,7 +1622,7 @@ _0238B8B4: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1654,7 +1654,7 @@ _0238B92C: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion bl sub_0201077C ldr r1, _0238C164 ; =ov24_0238C600 ldr r1, [r1] @@ -1763,7 +1763,7 @@ _0238BABC: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 mov r3, #0x1b ldr r1, [r0] @@ -1888,7 +1888,7 @@ _0238BCA8: _0238BCDC: bl Rand16Bit mov r1, #0x64 - bl DivideInt + bl __divsi3 ldr r0, _0238C1B4 ; =0x020A1868 ldrsh r0, [r0] cmp r1, r0 @@ -1918,7 +1918,7 @@ _0238BCDC: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -1943,7 +1943,7 @@ _0238BD9C: add r0, r2, #0x100 ldrsb r1, [r0, #0xf0] add r0, r2, #0x294 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238C164 ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x200 @@ -2253,7 +2253,7 @@ ov24_0238C1D4: ; 0x0238C1D4 ldr r1, [r0] add r0, r1, #0x22 add r1, r1, #0x52 - bl Strcpy + bl strcpy ldr r0, _0238C33C ; =ov24_0238C600 ldr r1, [r0] add r0, r1, #0x42 diff --git a/asm/overlay_25.s b/asm/overlay_25.s index eba318d8..c6d2fa07 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -457,14 +457,14 @@ _0238A734: mov r1, #0 ldr r0, [r0] add r0, r0, #0x140 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x140 ldr r1, [r1, #0x20] mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -501,7 +501,7 @@ _0238A828: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -531,7 +531,7 @@ _0238A890: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -558,7 +558,7 @@ _0238A904: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -588,7 +588,7 @@ _0238A96C: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -618,7 +618,7 @@ _0238A9E0: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -648,7 +648,7 @@ _0238AA54: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -678,7 +678,7 @@ _0238AAC8: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -711,7 +711,7 @@ _0238AB3C: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -744,7 +744,7 @@ _0238ABBC: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -766,7 +766,7 @@ _0238AC1C: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -796,7 +796,7 @@ _0238AC90: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 @@ -916,7 +916,7 @@ _0238AE64: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 mov r3, #0x1b ldr r1, [r0] @@ -1054,7 +1054,7 @@ _0238B00C: add r0, r0, #0x140 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 - bl SetPortraitExpressionId + bl SetPortraitEmotion ldr r0, _0238B0D0 ; =ov25_0238B5E0 ldr r1, [r0] add r0, r1, #0x100 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index 9de263de..a89a84a8 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -90,7 +90,7 @@ _0238A274: cmp r0, #0 beq _0238A2B4 ldrsh r0, [sp, #0xa] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 ldreq r1, [r7] sub r5, r5, #1 @@ -128,7 +128,7 @@ _0238A2FC: cmp r0, #0 beq _0238A344 ldrsh r0, [sp, #4] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 beq _0238A338 mov r0, r6, lsl #0x10 @@ -694,7 +694,7 @@ _0238AA78: mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a4 - bl SetPortraitUnknownAttr + bl SetPortraitLayout ldr r0, _0238B920 ; =0x0238CE84 ldr r2, _0238B924 ; =0x000004BE ldr r3, [r0] @@ -1031,7 +1031,7 @@ _0238AF94: add r0, r1, #0x88 str r0, [sp, #0x104] ldrsh r0, [r1, #0x14] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 ldrne r0, _0238B920 ; =0x0238CE84 movne r1, #0 @@ -2031,7 +2031,7 @@ _0238BE4C: cmp r1, #0xf bne _0238BEB0 ldrsh r0, [r2, #0x14] - bl sub_0200CCA8 + bl IsStorableItem cmp r0, #0 bne _0238BE90 ldr r0, _0238C8F8 ; =0x0238CE84 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 9f84384d..9f46e69d 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -55,7 +55,7 @@ _0238A1B4: sub r1, r2, r1 add r0, r5, #0x1a add r1, r3, r1, lsl #6 - bl Strcpy + bl strcpy ldr r0, [r5, #4] mov r2, #0 mov r3, r0, asr #0x10 diff --git a/asm/overlay_29_022DC240.s b/asm/overlay_29_022DC240.s index 51c2d9f1..9a05b7fe 100644 --- a/asm/overlay_29_022DC240.s +++ b/asm/overlay_29_022DC240.s @@ -229,7 +229,7 @@ ov29_022DC544: ; 0x022DC544 mov r2, #0x300 ldr r1, [r1, r0, lsl #2] add r0, sp, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r4, [sp] ldr r2, [sp, #4] mov r0, r4 @@ -718,7 +718,7 @@ _022DCB24: mov fp, r6, lsl #5 mov r0, r2, asr #2 mov r6, r3, lsr #0x10 - bl DivideInt + bl __divsi3 mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1374,7 +1374,7 @@ ov29_022DD518: ; 0x022DD518 mov r0, r0, asr #2 smulbb r2, r3, r2 mov r6, r2, lsl #5 - bl DivideInt + bl __divsi3 mov r0, #1 str r0, [sp] mov r0, #0xe @@ -2700,8 +2700,8 @@ ov29_022DE608: ; 0x022DE608 _022DE61C: .word 0x02353530 arm_func_end ov29_022DE608 - arm_func_start ov29_022DE620 -ov29_022DE620: ; 0x022DE620 + arm_func_start GetWeatherColorTable +GetWeatherColorTable: ; 0x022DE620 ldr r1, _022DE634 ; =0x02353530 ldr r1, [r1] ldr r1, [r1, #0x48] @@ -2709,7 +2709,7 @@ ov29_022DE620: ; 0x022DE620 bx lr .align 2, 0 _022DE634: .word 0x02353530 - arm_func_end ov29_022DE620 + arm_func_end GetWeatherColorTable arm_func_start ov29_022DE638 ov29_022DE638: ; 0x022DE638 @@ -2720,7 +2720,7 @@ ov29_022DE638: ; 0x022DE638 mov r4, #0 add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] - bl ov10_022C2574 + bl IsBackgroundTileset cmp r0, #0 mov r1, r4 bne _022DE754 @@ -2740,7 +2740,7 @@ ov29_022DE638: ; 0x022DE638 bl sub_02051EF0 mov r0, #1 bl sub_02051D68 - bl ov29_02336450 + bl GetDefaultTileTextureId cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r7, #0 @@ -2803,7 +2803,7 @@ _022DE754: bl sub_02051EF0 mov r0, #1 bl sub_02051D68 - bl ov29_02336450 + bl GetDefaultTileTextureId cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r7, #0 @@ -3523,7 +3523,7 @@ _022DF0AC: bl ov29_022E6F94 bl ov29_022E1640 bl ov29_023362EC - bl ov29_02344054 + bl OpenFixedBin bl ov29_022E9F18 bl ov29_02338F68 mov r0, #0 @@ -3641,7 +3641,7 @@ _022DF238: bl sub_020634F4 _022DF2C4: ldr r0, [sb, #0x7a0] - bl ov29_022EA968 + bl SetDungeonRngPreseed23Bit b _022DF2D8 _022DF2D0: ldr r0, [sb, #0x7ac] @@ -3820,7 +3820,7 @@ _022DF53C: ldr r2, _022DFF5C ; =ov29_022DEBBC mov r0, r5 and r1, r1, #0xff - bl ov29_022E6FBC + bl LoadMappaFileAttributes mov r0, #0 bl ov29_0234B4CC bl ov29_0234BB38 @@ -3854,7 +3854,7 @@ _022DF5C4: bl ov29_022FBB1C _022DF5CC: bl ov29_022FE2E4 - bl ov29_022FBF58 + bl InitEnemySpawnStats cmp r5, #0 bne _022DF5E4 bl ov29_022EAD68 @@ -3875,7 +3875,7 @@ _022DF5E4: ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344178 + bl IsRoomIlluminated cmp r0, #0 addne r0, sb, #0x1a000 movne r1, #1 @@ -3886,7 +3886,7 @@ _022DF5E4: ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_022E0864 + bl IsBossFight cmp r0, #0 bne _022DF660 mov r0, #0x3c @@ -3905,17 +3905,17 @@ _022DF660: strb r0, [sb, #0x79a] _022DF68C: bl ov29_0233785C - bl ov29_02336A4C + bl DetermineAllTilesWalkableNeighbors bl ov29_02336460 cmp r5, #0 bne _022DF6C0 ldr r0, [sp, #4] - bl InitTeam + bl SpawnTeam mov r0, #0 str r0, [sp, #4] - bl ov29_022FE24C - bl ov29_022FCD78 - bl ov29_0233836C + bl SpawnShopkeepers + bl SpawnInitialMonsters + bl ResetGravity b _022DF6F8 _022DF6C0: ldr r0, _022DFF40 ; =0x02353538 @@ -3946,21 +3946,21 @@ _022DF6F8: bl ov29_022ED888 bl ov29_0233873C bl ov29_02344C4C - bl ov29_02338560 + bl TrySpawnDoughSeedPoke ldr r1, [sb, #0x7bc] mov r0, #0 str r1, [sb, #0x7c4] str r0, [sb, #0x7c0] bl ov29_02343980 bl ov29_0233781C - bl ov29_0233AE94 + bl ClearHiddenStairs b _022DF750 _022DF74C: bl ov29_022F9970 _022DF750: bl ov29_022F7EAC bl ov29_0233665C - bl ov29_02336F4C + bl UpdateTrapsVisibility cmp r5, #0 bne _022DF778 mov r1, #0 @@ -3987,7 +3987,7 @@ _022DF798: bl ov29_023350FC bl ov29_022FA750 _022DF7B4: - bl ov29_02336260 + bl CountItemsOnFloorForAcuteSniffer mov r0, r5 bl ov29_0233904C mov r0, #1 @@ -4000,7 +4000,7 @@ _022DF7B4: bne _022DF7EC mov r0, #1 bl ov29_0233A1BC - bl ov29_02339CE8 + bl UpdateMinimap _022DF7EC: mov r0, #0 bl ov29_022E34B0 @@ -4091,7 +4091,7 @@ _022DF90C: bne _022DF944 bl GetLeader bl ov29_022E2DFC - bl ov29_02339CE8 + bl UpdateMinimap _022DF944: ldr r0, _022DFF40 ; =0x02353538 ldr r0, [r0] @@ -4110,7 +4110,7 @@ _022DF974: bl ov29_022FACBC mov r0, #0 bl ov29_022FAA58 - bl ov29_022EFA74 + bl TryActivateIqBooster mov r0, #0 bl ov29_022FAF08 bl TryActivateSlowStart @@ -4179,7 +4179,7 @@ _022DFA78: bl ov29_02338F48 mov r0, #1 bl ov29_02339F88 - bl ov29_02339CE8 + bl UpdateMinimap cmp r5, #0 bne _022DFAA4 mov r0, #0 @@ -4196,7 +4196,7 @@ _022DFAA4: bl ov29_02305814 mov r0, #1 mov r1, r7 - bl ov29_023354C4 + bl TryActivateWeather _022DFAD4: mov r0, #0x10c00 bl ov10_022BFE6C @@ -4392,9 +4392,9 @@ _022DFD9C: mov r3, #0 bl ov29_022ECDE4 _022DFDB0: - bl ov29_023384F0 - bl ov29_0233861C - bl ov29_022F7804 + bl UpdateShouldBoostKecleonShopSpawnChance + bl UpdateShouldBoostHiddenStairsSpawnChance + bl DeleteAllMonsterSpriteFiles bl ov29_023365B8 bl ov29_022DD7AC ldr r0, _022DFF40 ; =0x02353538 @@ -4771,12 +4771,12 @@ _022E030C: bl ov29_02338D30 bl ov29_022ED0B0 bl ov29_022DE930 - bl ov29_022F6F10 + bl FreeLoadedAttackSpriteAndMore ldr r0, _022DFF40 ; =0x02353538 mov r1, #0 str r1, [r0] bl ov29_022DE15C - bl ov29_02344088 + bl CloseFixedBin mov r0, #1 add sp, sp, #0xd0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 7b08704e..c4eade18 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -136,7 +136,7 @@ _022E04C4: strh r5, [r2, #0x48] ldr r2, [r3] strb r1, [r2, #0x78d] - bl ov29_022FDDC0 + bl SubInitMonster ldrsh r0, [r4, #2] mov r5, #0 mov sb, r5 @@ -184,7 +184,7 @@ _022E05BC: cmp r0, #2 bne _022E05FC mov r0, r7 - bl ov29_022E1608 + bl GetTrapInfo ldrb r1, [r0] cmp r1, #0x20 streqb r4, [r0] @@ -368,8 +368,8 @@ _022E083C: _022E0860: .word 0x02353538 arm_func_end ov29_022E081C - arm_func_start ov29_022E0864 -ov29_022E0864: ; 0x022E0864 + arm_func_start IsBossFight +IsBossFight: ; 0x022E0864 cmp r0, #0 beq _022E0878 cmp r0, #0x51 @@ -378,23 +378,23 @@ ov29_022E0864: ; 0x022E0864 _022E0878: mov r0, #0 bx lr - arm_func_end ov29_022E0864 + arm_func_end IsBossFight - arm_func_start ov29_022E0880 -ov29_022E0880: ; 0x022E0880 + arm_func_start IsCurrentFixedRoomBossFight +IsCurrentFixedRoomBossFight: ; 0x022E0880 ldr r0, _022E0898 ; =0x02353538 - ldr ip, _022E089C ; =ov29_022E0864 + ldr ip, _022E089C ; =IsBossFight ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] bx ip .align 2, 0 _022E0898: .word 0x02353538 -_022E089C: .word ov29_022E0864 - arm_func_end ov29_022E0880 +_022E089C: .word IsBossFight + arm_func_end IsCurrentFixedRoomBossFight - arm_func_start ov29_022E08A0 -ov29_022E08A0: ; 0x022E08A0 + arm_func_start IsMarowakTrainingMaze +IsMarowakTrainingMaze: ; 0x022E08A0 ldr r0, _022E08C8 ; =0x02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] @@ -408,7 +408,7 @@ _022E08C0: bx lr .align 2, 0 _022E08C8: .word 0x02353538 - arm_func_end ov29_022E08A0 + arm_func_end IsMarowakTrainingMaze arm_func_start FixedRoomIsSubstituteRoom FixedRoomIsSubstituteRoom: ; 0x022E08CC @@ -463,13 +463,13 @@ _022E0950: _022E0958: .word 0x02353538 arm_func_end StoryRestrictionsEnabled - arm_func_start GetScenarioBalance__022E095C -GetScenarioBalance__022E095C: ; 0x022E095C - ldr ip, _022E0964 ; =GetScenarioBalance__0204CB94 + arm_func_start GetScenarioBalanceVeneer +GetScenarioBalanceVeneer: ; 0x022E095C + ldr ip, _022E0964 ; =GetScenarioBalance bx ip .align 2, 0 -_022E0964: .word GetScenarioBalance__0204CB94 - arm_func_end GetScenarioBalance__022E095C +_022E0964: .word GetScenarioBalance + arm_func_end GetScenarioBalanceVeneer arm_func_start FadeToBlack FadeToBlack: ; 0x022E0968 @@ -534,7 +534,7 @@ _022E0A14: .word 0x02353538 ov29_022E0A18: ; 0x022E0A18 stmdb sp!, {r3, lr} mov r0, #0 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, #0 bl ov29_0234B1A4 mov r0, #0 @@ -759,8 +759,8 @@ ov29_022E0C9C: ; 0x022E0C9C _022E0CB4: .word 0x0237C6A4 arm_func_end ov29_022E0C9C - arm_func_start ov29_022E0CB8 -ov29_022E0CB8: ; 0x022E0CB8 + arm_func_start CheckTouchscreenArea +CheckTouchscreenArea: ; 0x022E0CB8 stmdb sp!, {r3, lr} ldr lr, _022E0CF8 ; =0x0237C6B8 ldr ip, [lr] @@ -781,7 +781,7 @@ _022E0CF0: ldmia sp!, {r3, pc} .align 2, 0 _022E0CF8: .word 0x0237C6B8 - arm_func_end ov29_022E0CB8 + arm_func_end CheckTouchscreenArea arm_func_start ov29_022E0CFC ov29_022E0CFC: ; 0x022E0CFC @@ -1135,7 +1135,7 @@ _022E11A8: blt _022E1180 add r0, sp, #0x20 bl UnloadWte - bl ov29_023356C0 + bl LoadTextureUi bl ov29_02335774 add sp, sp, #0x74 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} @@ -1186,7 +1186,7 @@ _022E1254: ldr r1, [lr, #4] mov r0, #0x120 mul r4, r1, r0 - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _022E1298 mov r0, #0x5000 @@ -1461,17 +1461,17 @@ ov29_022E1604: ; 0x022E1604 bx lr arm_func_end ov29_022E1604 - arm_func_start ov29_022E1608 -ov29_022E1608: ; 0x022E1608 + arm_func_start GetTrapInfo +GetTrapInfo: ; 0x022E1608 ldr r0, [r0, #0xb4] bx lr - arm_func_end ov29_022E1608 + arm_func_end GetTrapInfo - arm_func_start ov29_022E1610 -ov29_022E1610: ; 0x022E1610 + arm_func_start GetItemInfo +GetItemInfo: ; 0x022E1610 ldr r0, [r0, #0xb4] bx lr - arm_func_end ov29_022E1610 + arm_func_end GetItemInfo arm_func_start ov29_022E1618 ov29_022E1618: ; 0x022E1618 diff --git a/asm/overlay_29_022E1A40.s b/asm/overlay_29_022E1A40.s index c6855477..6f2c371b 100644 --- a/asm/overlay_29_022E1A40.s +++ b/asm/overlay_29_022E1A40.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_022E1A40 -ov29_022E1A40: ; 0x022E1A40 + arm_func_start UpdateEntityPixelPos +UpdateEntityPixelPos: ; 0x022E1A40 cmp r1, #0 ldrne r2, [r1] strne r2, [r0, #0xc] @@ -23,7 +23,7 @@ ov29_022E1A40: ; 0x022E1A40 _022E1A7C: str r1, [r0, #0x10] bx lr - arm_func_end ov29_022E1A40 + arm_func_end UpdateEntityPixelPos arm_func_start ov29_022E1A84 ov29_022E1A84: ; 0x022E1A84 @@ -260,8 +260,8 @@ ov29_022E1D2C: ; 0x022E1D2C mov r6, r0 mov r1, r8 mov r0, #0 - bl ov29_022F9408 - bl GetSpriteIndex__022F7388 + bl GetMonsterApparentId + bl DungeonGetSpriteIndex mov r4, r0 add r0, sp, #8 add r1, sp, #4 @@ -297,7 +297,7 @@ _022E1D90: strh r8, [r0, #2] mov r1, r8 mov r0, #0 - bl ov29_022F9408 + bl GetMonsterApparentId ldr r1, [r7, #0xb4] mov r2, #0 strh r0, [r1, #4] @@ -521,8 +521,8 @@ _022E20A0: _022E20BC: .word 0x0237C79C arm_func_end ov29_022E2018 - arm_func_start ov29_022E20C0 -ov29_022E20C0: ; 0x022E20C0 + arm_func_start CreateEnemyEntity +CreateEnemyEntity: ; 0x022E20C0 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc mov r8, r0 @@ -531,9 +531,9 @@ ov29_022E20C0: ; 0x022E20C0 mov r6, r0 mov r1, r8 mov r0, #0 - bl ov29_022F9408 + bl GetMonsterApparentId mov r4, r0 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r3, r0 add r0, sp, #8 add r1, sp, #4 @@ -569,7 +569,7 @@ _022E211C: str r2, [r7, #0xb4] mov r1, r8 strh r8, [r2, #2] - bl ov29_022F9408 + bl GetMonsterApparentId ldr r2, [r7, #0xb4] mov r1, #1 strh r0, [r2, #4] @@ -579,7 +579,7 @@ _022E211C: ldr r1, [r7, #0xb4] mov r0, r4 strb r2, [r1, #8] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [r7, #0xa8] strb r6, [r7, #0xaa] ldr r0, [sp, #8] @@ -632,10 +632,10 @@ _022E2254: ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022E225C: .word 0x02353538 - arm_func_end ov29_022E20C0 + arm_func_end CreateEnemyEntity - arm_func_start ov29_022E2260 -ov29_022E2260: ; 0x022E2260 + arm_func_start SpawnTrap +SpawnTrap: ; 0x022E2260 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov sl, r0 mov sb, r1 @@ -685,10 +685,10 @@ _022E2300: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _022E2310: .word 0x02353538 - arm_func_end ov29_022E2260 + arm_func_end SpawnTrap - arm_func_start ov29_022E2314 -ov29_022E2314: ; 0x022E2314 + arm_func_start SpawnItemEntity +SpawnItemEntity: ; 0x022E2314 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r1, _022E2410 ; =0x02353538 ldr r2, _022E2414 ; =0x020A1AE8 @@ -759,13 +759,13 @@ _022E2400: .align 2, 0 _022E2410: .word 0x02353538 _022E2414: .word 0x020A1AE8 - arm_func_end ov29_022E2314 + arm_func_end SpawnItemEntity arm_func_start ov29_022E2418 ov29_022E2418: ; 0x022E2418 stmdb sp!, {r4, lr} mov r4, r0 - bl ov29_023386D8 + bl HiddenStairsPresent cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -802,8 +802,8 @@ ov29_022E2470: ; 0x022E2470 bx lr arm_func_end ov29_022E2470 - arm_func_start ov29_022E2498 -ov29_022E2498: ; 0x022E2498 + arm_func_start ShouldMinimapDisplayEntity +ShouldMinimapDisplayEntity: ; 0x022E2498 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5] @@ -854,7 +854,7 @@ _022E252C: mov r2, r0 mov r0, r4 add r1, r5, #4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r3, r4, r5, pc} _022E2560: mov r0, #0 @@ -864,10 +864,10 @@ _022E2568: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022E2570: .word 0x02353538 - arm_func_end ov29_022E2498 + arm_func_end ShouldMinimapDisplayEntity - arm_func_start ov29_022E2574 -ov29_022E2574: ; 0x022E2574 + arm_func_start ShouldDisplayEntity +ShouldDisplayEntity: ; 0x022E2574 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldrb r5, [r0, #0x20] cmp r5, #0 @@ -989,28 +989,28 @@ _022E271C: .align 2, 0 _022E2724: .word 0x02353538 _022E2728: .word 0x0001A224 - arm_func_end ov29_022E2574 + arm_func_end ShouldDisplayEntity - arm_func_start ov29_022E272C -ov29_022E272C: ; 0x022E272C - ldr ip, _022E2738 ; =ov29_022E2574 + arm_func_start ShouldDisplayEntityWrapper +ShouldDisplayEntityWrapper: ; 0x022E272C + ldr ip, _022E2738 ; =ShouldDisplayEntity mov r1, #0 bx ip .align 2, 0 -_022E2738: .word ov29_022E2574 - arm_func_end ov29_022E272C +_022E2738: .word ShouldDisplayEntity + arm_func_end ShouldDisplayEntityWrapper arm_func_start ov29_022E273C ov29_022E273C: ; 0x022E273C - ldr ip, _022E2748 ; =ov29_022E2574 + ldr ip, _022E2748 ; =ShouldDisplayEntity mov r1, #1 bx ip .align 2, 0 -_022E2748: .word ov29_022E2574 +_022E2748: .word ShouldDisplayEntity arm_func_end ov29_022E273C - arm_func_start ov29_022E274C -ov29_022E274C: ; 0x022E274C + arm_func_start CanSeeTarget +CanSeeTarget: ; 0x022E274C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -1060,9 +1060,9 @@ _022E27F4: mov r2, r0 add r0, r5, #4 add r1, r4, #4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022E274C + arm_func_end CanSeeTarget arm_func_start CanTargetEntity CanTargetEntity: ; 0x022E2810 @@ -1142,7 +1142,7 @@ ov29_022E28D4: ; 0x022E28D4 mov r2, r0 add r0, r5, #4 add r1, r4, #4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022E28D4 @@ -1155,7 +1155,7 @@ ov29_022E2930: ; 0x022E2930 mov r2, r0 mov r1, r4 add r0, r5, #4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022E2930 @@ -1229,8 +1229,8 @@ _022E2A28: _022E2A34: .word 0x02353538 arm_func_end ov29_022E2978 - arm_func_start ov29_022E2A38 -ov29_022E2A38: ; 0x022E2A38 + arm_func_start GetTeamMemberIndex +GetTeamMemberIndex: ; 0x022E2A38 ldr r1, _022E2A74 ; =0x02353538 mov r2, #0 ldr r3, [r1] @@ -1250,7 +1250,7 @@ _022E2A64: bx lr .align 2, 0 _022E2A74: .word 0x02353538 - arm_func_end ov29_022E2A38 + arm_func_end GetTeamMemberIndex arm_func_start ov29_022E2A78 ov29_022E2A78: ; 0x022E2A78 @@ -1266,7 +1266,7 @@ ov29_022E2A78: ; 0x022E2A78 b _022E2ABC _022E2AA0: ldr r1, [r1, #0xb4] - bl ov29_02300164 + bl GetMonsterName ldmia sp!, {r4, pc} _022E2AAC: ldr r1, [r1, #0xb4] @@ -1278,7 +1278,7 @@ _022E2ABC: bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy ldmia sp!, {r4, pc} .align 2, 0 _022E2AD4: .word 0x00000A42 @@ -1431,13 +1431,13 @@ ov29_022E2CA0: ; 0x022E2CA0 add r5, r0, #0x1a000 sub r0, r2, r1 ldr r6, [r5, #0x10] - bl Abs + bl abs cmp r0, #6 bgt _022E2D2C ldrsh r1, [r5, #2] ldrsh r0, [r4, #2] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #5 bgt _022E2D2C mov r0, r5 @@ -1453,7 +1453,7 @@ ov29_022E2CA0: ; 0x022E2CA0 mov r2, r0 mov r0, r5 mov r1, r4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r4, r5, r6, pc} _022E2D2C: mov r0, #0 @@ -1476,13 +1476,13 @@ ov29_022E2D3C: ; 0x022E2D3C add r5, r0, #0x1a000 sub r0, r2, r1 ldr r6, [r5, #0x10] - bl Abs + bl abs cmp r0, #6 bgt _022E2DC8 ldrsh r1, [r5, #2] ldrsh r0, [r4, #2] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #6 bgt _022E2DC8 mov r0, r5 @@ -1498,7 +1498,7 @@ ov29_022E2D3C: ; 0x022E2D3C mov r2, r0 mov r0, r5 mov r1, r4 - bl ov29_022E90CC + bl IsPositionActuallyInSight ldmia sp!, {r4, r5, r6, pc} _022E2DC8: mov r0, #0 @@ -1543,15 +1543,15 @@ ov29_022E2DFC: ; 0x022E2DFC strneb r0, [r1, #0x2f] _022E2E40: mov r0, #0 - bl ov29_022E2EC4 + bl UpdateCamera bl ov29_022E2C6C ldmia sp!, {r3, pc} .align 2, 0 _022E2E50: .word 0x02353538 arm_func_end ov29_022E2DFC - arm_func_start ov29_022E2E54 -ov29_022E2E54: ; 0x022E2E54 + arm_func_start PointCameraToMonster +PointCameraToMonster: ; 0x022E2E54 stmdb sp!, {r4, lr} ldr r2, _022E2EC0 ; =0x02353538 mov r4, r1 @@ -1572,20 +1572,20 @@ ov29_022E2E54: ; 0x022E2E54 _022E2E98: str r0, [r2, #0x10] mov r0, #0 - bl ov29_022E2EC4 + bl UpdateCamera bl ov29_022E2C6C bl ov29_02304954 cmp r4, #0 ldmeqia sp!, {r4, pc} - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap ldmia sp!, {r4, pc} .align 2, 0 _022E2EC0: .word 0x02353538 - arm_func_end ov29_022E2E54 + arm_func_end PointCameraToMonster - arm_func_start ov29_022E2EC4 -ov29_022E2EC4: ; 0x022E2EC4 + arm_func_start UpdateCamera +UpdateCamera: ; 0x022E2EC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 ldr r1, _022E32DC ; =0x02353538 @@ -1757,8 +1757,8 @@ _022E3108: ldr r0, [sp, #4] cmp r0, #0 beq _022E3168 - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap _022E3168: cmp r7, #0 beq _022E3178 @@ -1774,17 +1774,17 @@ _022E3178: ldrsh r5, [r4, #8] ldrsh r7, [r4, #0xc] sub r0, r7, r5 - bl Abs + bl abs cmp r0, #8 bge _022E31C0 ldrsh r1, [r4, #0xe] ldrsh r0, [r4, #0xa] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #8 blt _022E31D0 _022E31C0: - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, #1 strb r0, [r4, #0x2c] b _022E3228 @@ -1836,7 +1836,7 @@ _022E3250: beq _022E327C ldrsh r0, [r7, #4] ldrsh r1, [r7, #6] - bl ov29_023391EC + bl DrawMinimapTile _022E327C: add r5, r5, #1 cmp r5, #0x14 @@ -1857,7 +1857,7 @@ _022E3298: beq _022E32C4 ldrsh r0, [r6, #4] ldrsh r1, [r6, #6] - bl ov29_023391EC + bl DrawMinimapTile _022E32C4: add r5, r5, #1 cmp r5, #0x40 @@ -1871,4 +1871,4 @@ _022E32D4: _022E32DC: .word 0x02353538 _022E32E0: .word 0x0237C84C _022E32E4: .word 0x0000FFFF - arm_func_end ov29_022E2EC4 + arm_func_end UpdateCamera diff --git a/asm/overlay_29_022E330C.s b/asm/overlay_29_022E330C.s index a8e89de3..66f8748a 100644 --- a/asm/overlay_29_022E330C.s +++ b/asm/overlay_29_022E330C.s @@ -9,7 +9,7 @@ ItemIsActive__022E330C: ; 0x022E330C mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -19,8 +19,8 @@ ItemIsActive__022E330C: ; 0x022E330C ldmia sp!, {r3, r4, r5, pc} arm_func_end ItemIsActive__022E330C - arm_func_start ov29_022E333C -ov29_022E333C: ; 0x022E333C + arm_func_start GetVisibilityRange +GetVisibilityRange: ; 0x022E333C ldr r0, _022E3358 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x1a000 @@ -30,7 +30,7 @@ ov29_022E333C: ; 0x022E333C bx lr .align 2, 0 _022E3358: .word 0x02353538 - arm_func_end ov29_022E333C + arm_func_end GetVisibilityRange arm_func_start ov29_022E335C ov29_022E335C: ; 0x022E335C @@ -63,7 +63,7 @@ _022E33B0: add r4, r0, #0x1a000 ldr r0, [r4, #0x10] ldr r5, [r0, #0xb4] - bl ov29_02335A10 + bl DisplayUi ldr r1, _022E3428 ; =0x02353538 ldr r0, _022E342C ; =0x000003E7 ldr r1, [r1] @@ -119,9 +119,9 @@ _022E3458: cmp r7, #0x20 blt _022E3454 mov r0, #0 - bl ov29_022E2EC4 - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateTrapsVisibility + bl UpdateMinimap ldr r1, _022E34AC ; =0x00000B77 mov r0, r4 bl LogMessageByIdWithPopupCheckUser @@ -237,13 +237,13 @@ ov29_022E3590: ; 0x022E3590 mov r2, r4 and r3, r3, #0xff str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} arm_func_end ov29_022E3590 - arm_func_start ov29_022E35E4 -ov29_022E35E4: ; 0x022E35E4 + arm_func_start PlayEffectAnimationEntity +PlayEffectAnimationEntity: ; 0x022E35E4 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x30 mov r8, r0 @@ -273,7 +273,7 @@ ov29_022E35E4: ; 0x022E35E4 moveq r0, #1 movne r0, #0 and r0, r0, #0xff - bl ov29_022E38E0 + bl AnimationDelayOrSomething _022E365C: add r0, sp, #0 mov r2, r7 @@ -374,4 +374,4 @@ _022E37A8: .align 2, 0 _022E37B0: .word 0x02353538 _022E37B4: .word 0x0001A226 - arm_func_end ov29_022E35E4 + arm_func_end PlayEffectAnimationEntity diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index 2b07abaa..d803f785 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_022E37DC -ov29_022E37DC: ; 0x022E37DC + arm_func_start PlayEffectAnimationPos +PlayEffectAnimationPos: ; 0x022E37DC stmdb sp!, {r3, lr} sub sp, sp, #8 ldrsh ip, [r0] @@ -19,13 +19,13 @@ ov29_022E37DC: ; 0x022E37DC add r3, r3, #0x10 mov r3, r3, lsl #8 str r3, [sp, #4] - bl ov29_022E3820 + bl PlayEffectAnimationPixelPos add sp, sp, #8 ldmia sp!, {r3, pc} - arm_func_end ov29_022E37DC + arm_func_end PlayEffectAnimationPos - arm_func_start ov29_022E3820 -ov29_022E3820: ; 0x022E3820 + arm_func_start PlayEffectAnimationPixelPos +PlayEffectAnimationPixelPos: ; 0x022E3820 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x2c mov r5, r0 @@ -79,10 +79,10 @@ _022E38D4: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _022E38DC: .word 0x0000FFFF - arm_func_end ov29_022E3820 + arm_func_end PlayEffectAnimationPixelPos - arm_func_start ov29_022E38E0 -ov29_022E38E0: ; 0x022E38E0 + arm_func_start AnimationDelayOrSomething +AnimationDelayOrSomething: ; 0x022E38E0 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldr r1, _022E3A38 ; =0x02353538 mov r7, #0 @@ -185,7 +185,7 @@ _022E3A30: .align 2, 0 _022E3A38: .word 0x02353538 _022E3A3C: .word 0x0235354C - arm_func_end ov29_022E38E0 + arm_func_end AnimationDelayOrSomething arm_func_start ov29_022E3A40 ov29_022E3A40: ; 0x022E3A40 @@ -455,7 +455,7 @@ ov29_022E3DD8: ; 0x022E3DD8 mov r1, #0x144 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E3DD8 @@ -478,7 +478,7 @@ ov29_022E3E24: ; 0x022E3E24 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -503,7 +503,7 @@ ov29_022E3E74: ; 0x022E3E74 mov r1, #0x25 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity ldr r1, _022E3ECC ; =0x0000030E mov r0, r4 bl ov29_022E56A0 @@ -531,7 +531,7 @@ ov29_022E3ED0: ; 0x022E3ED0 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -561,7 +561,7 @@ ov29_022E3F24: ; 0x022E3F24 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -596,7 +596,7 @@ ov29_022E3F7C: ; 0x022E3F7C mov r1, #7 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E3F7C @@ -623,7 +623,7 @@ ov29_022E3FCC: ; 0x022E3FCC mov r0, r4 mov r1, #4 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E3FCC @@ -633,8 +633,8 @@ ov29_022E4014: ; 0x022E4014 bx lr arm_func_end ov29_022E4014 - arm_func_start ov29_022E4018 -ov29_022E4018: ; 0x022E4018 + arm_func_start PlayEffectAnimation0x171Full +PlayEffectAnimation0x171Full: ; 0x022E4018 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -651,20 +651,20 @@ ov29_022E4018: ; 0x022E4018 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E4064: .word 0x00000171 - arm_func_end ov29_022E4018 + arm_func_end PlayEffectAnimation0x171Full arm_func_start ov29_022E4068 ov29_022E4068: ; 0x022E4068 bx lr arm_func_end ov29_022E4068 - arm_func_start ov29_022E406C -ov29_022E406C: ; 0x022E406C + arm_func_start PlayEffectAnimation0x171 +PlayEffectAnimation0x171: ; 0x022E406C stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -680,12 +680,12 @@ ov29_022E406C: ; 0x022E406C mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E40B4: .word 0x00000171 - arm_func_end ov29_022E406C + arm_func_end PlayEffectAnimation0x171 arm_func_start ov29_022E40B8 ov29_022E40B8: ; 0x022E40B8 @@ -714,7 +714,7 @@ ov29_022E40C0: ; 0x022E40C0 mov r0, r4 mov r1, #0x1ac str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E40C0 @@ -747,7 +747,7 @@ ov29_022E4110: ; 0x022E4110 mov r1, #4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4110 @@ -775,7 +775,7 @@ ov29_022E4160: ; 0x022E4160 mov r1, #0x1a8 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4160 @@ -834,7 +834,7 @@ ov29_022E41F0: ; 0x022E41F0 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -859,7 +859,7 @@ ov29_022E4240: ; 0x022E4240 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -889,7 +889,7 @@ ov29_022E4294: ; 0x022E4294 mov r1, #0x4c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4294 @@ -923,7 +923,7 @@ ov29_022E42E8: ; 0x022E42E8 mov r1, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022E42E8 @@ -946,7 +946,7 @@ ov29_022E4338: ; 0x022E4338 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -971,7 +971,7 @@ ov29_022E4388: ; 0x022E4388 add r1, r1, #0x138 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -996,7 +996,7 @@ ov29_022E43D8: ; 0x022E43D8 add r1, r1, #0x138 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1031,7 +1031,7 @@ ov29_022E4430: ; 0x022E4430 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1056,7 +1056,7 @@ ov29_022E4480: ; 0x022E4480 mov r1, #7 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4480 @@ -1079,7 +1079,7 @@ ov29_022E44CC: ; 0x022E44CC mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1104,7 +1104,7 @@ ov29_022E451C: ; 0x022E451C add r1, r1, #0x188 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1129,7 +1129,7 @@ ov29_022E456C: ; 0x022E456C mov r1, #5 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E456C @@ -1168,7 +1168,7 @@ ov29_022E45D0: ; 0x022E45D0 mov r1, #0x2f mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, #0x30 bl GetEffectAnimationField0x19 mov r1, r0 @@ -1183,7 +1183,7 @@ ov29_022E45D0: ; 0x022E45D0 mov r0, r5 mov r1, #0x30 mov r2, #1 - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022E45D0 @@ -1236,7 +1236,7 @@ ov29_022E4674: ; 0x022E4674 mov r1, #0x21 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4674 @@ -1308,7 +1308,7 @@ ov29_022E471C: ; 0x022E471C mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1333,7 +1333,7 @@ ov29_022E476C: ; 0x022E476C mov r1, #0x30 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E476C @@ -1386,7 +1386,7 @@ ov29_022E47CC: ; 0x022E47CC mov r1, r5 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E4860 _022E4828: mov r0, #0xe @@ -1402,7 +1402,7 @@ _022E4828: mov r1, #0xe mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E4860: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} @@ -1431,7 +1431,7 @@ ov29_022E486C: ; 0x022E486C mov r1, #0x41 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E486C @@ -1454,7 +1454,7 @@ ov29_022E48B8: ; 0x022E48B8 add r1, r1, #0x11c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, r4 mov r1, #0x20c bl ov29_022E56A0 @@ -1482,15 +1482,15 @@ ov29_022E4914: ; 0x022E4914 add r1, r1, #0x1ac mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E4960: .word 0x000001AE arm_func_end ov29_022E4914 - arm_func_start ov29_022E4964 -ov29_022E4964: ; 0x022E4964 + arm_func_start ShowPpRestoreEffect +ShowPpRestoreEffect: ; 0x022E4964 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -1507,12 +1507,12 @@ ov29_022E4964: ; 0x022E4964 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E49B0: .word 0x000001B1 - arm_func_end ov29_022E4964 + arm_func_end ShowPpRestoreEffect arm_func_start ov29_022E49B4 ov29_022E49B4: ; 0x022E49B4 @@ -1532,7 +1532,7 @@ ov29_022E49B4: ; 0x022E49B4 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1557,7 +1557,7 @@ ov29_022E4A04: ; 0x022E4A04 add r1, r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1582,7 +1582,7 @@ ov29_022E4A54: ; 0x022E4A54 add r1, r1, #0x18c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1607,7 +1607,7 @@ ov29_022E4AA4: ; 0x022E4AA4 mov r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4AA4 @@ -1630,7 +1630,7 @@ ov29_022E4AF0: ; 0x022E4AF0 mov r1, #0x15 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4AF0 @@ -1653,7 +1653,7 @@ ov29_022E4B3C: ; 0x022E4B3C mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1698,7 +1698,7 @@ ov29_022E4BB4: ; 0x022E4BB4 mov r1, #0x15 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4BB4 @@ -1721,7 +1721,7 @@ ov29_022E4C00: ; 0x022E4C00 mov r1, #0xf mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E4C00 @@ -1739,7 +1739,7 @@ ov29_022E4C4C: ; 0x022E4C4C mov r2, #1 mov r3, #3 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r3, pc} arm_func_end ov29_022E4C4C @@ -1762,7 +1762,7 @@ ov29_022E4C84: ; 0x022E4C84 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1787,7 +1787,7 @@ ov29_022E4CD4: ; 0x022E4CD4 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -1821,7 +1821,7 @@ ov29_022E4D28: ; 0x022E4D28 mov r1, #0x194 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E4DB8 _022E4D80: ldr r0, _022E4DC8 ; =0x00000193 @@ -1837,7 +1837,7 @@ _022E4D80: mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E4DB8: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -1869,7 +1869,7 @@ ov29_022E4DCC: ; 0x022E4DCC mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E4E5C _022E4E24: ldr r0, _022E4E70 ; =0x00000191 @@ -1885,7 +1885,7 @@ _022E4E24: mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E4E5C: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -1918,7 +1918,7 @@ ov29_022E4E74: ; 0x022E4E74 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E4F04 _022E4ECC: ldr r0, _022E4F18 ; =0x00000192 @@ -1934,7 +1934,7 @@ _022E4ECC: add r1, r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E4F04: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -1967,7 +1967,7 @@ ov29_022E4F1C: ; 0x022E4F1C add r1, r1, #0x18c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E4FAC _022E4F74: mov r0, #0x190 @@ -1983,7 +1983,7 @@ _022E4F74: mov r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E4FAC: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2015,7 +2015,7 @@ ov29_022E4FC0: ; 0x022E4FC0 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E5050 _022E5018: ldr r0, _022E5064 ; =0x00000192 @@ -2031,7 +2031,7 @@ _022E5018: add r1, r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E5050: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2064,7 +2064,7 @@ ov29_022E5068: ; 0x022E5068 mov r1, #0x194 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E50F8 _022E50C0: ldr r0, _022E5108 ; =0x00000193 @@ -2080,7 +2080,7 @@ _022E50C0: mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E50F8: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2112,7 +2112,7 @@ ov29_022E510C: ; 0x022E510C add r1, r1, #0x18c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E519C _022E5164: mov r0, #0x190 @@ -2128,7 +2128,7 @@ _022E5164: mov r1, #0x190 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E519C: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2160,7 +2160,7 @@ ov29_022E51B0: ; 0x022E51B0 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E5240 _022E5208: ldr r0, _022E5254 ; =0x00000191 @@ -2176,7 +2176,7 @@ _022E5208: mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E5240: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2209,7 +2209,7 @@ ov29_022E5258: ; 0x022E5258 mov r1, #0x18c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E52E8 _022E52B0: mov r0, #0xd @@ -2225,7 +2225,7 @@ _022E52B0: mov r1, #0xd mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E52E8: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2255,7 +2255,7 @@ ov29_022E52F8: ; 0x022E52F8 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E5388 _022E5350: mov r0, #0xe @@ -2271,7 +2271,7 @@ _022E5350: mov r1, #0xe mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E5388: add sp, sp, #0x10 ldmia sp!, {r4, lr} @@ -2299,7 +2299,7 @@ ov29_022E539C: ; 0x022E539C mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2329,7 +2329,7 @@ ov29_022E53F0: ; 0x022E53F0 mov r1, #0x19 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E53F0 @@ -2347,7 +2347,7 @@ ov29_022E543C: ; 0x022E543C mov r2, #1 mov r3, #3 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r3, pc} arm_func_end ov29_022E543C @@ -2399,7 +2399,7 @@ _022E54D8: mov r0, r4 mov r3, #3 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2424,7 +2424,7 @@ ov29_022E550C: ; 0x022E550C add r1, r1, #0x13c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2456,7 +2456,7 @@ ov29_022E5560: ; 0x022E5560 mov r1, #0xf8 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E55E8 _022E55B0: mov r0, #0xf9 @@ -2472,7 +2472,7 @@ _022E55B0: mov r1, #0xf9 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E55E8: add sp, sp, #0x10 ldmia sp!, {r4, pc} @@ -2496,19 +2496,19 @@ ov29_022E55F0: ; 0x022E55F0 mov r1, #0x2a mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E55F0 arm_func_start ov29_022E563C ov29_022E563C: ; 0x022E563C - ldr ip, _022E564C ; =ov29_022E3820 + ldr ip, _022E564C ; =PlayEffectAnimationPixelPos mov r1, #0x90 mov r2, #1 bx ip .align 2, 0 -_022E564C: .word ov29_022E3820 +_022E564C: .word PlayEffectAnimationPixelPos arm_func_end ov29_022E563C arm_func_start ov29_022E5650 @@ -2529,7 +2529,7 @@ ov29_022E5650: ; 0x022E5650 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2664,7 +2664,7 @@ ov29_022E57D4: ; 0x022E57D4 add r1, r1, #0x258 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity ldr r0, _022E5860 ; =0x0000025B bl GetEffectAnimationField0x19 mov r1, r0 @@ -2679,7 +2679,7 @@ ov29_022E57D4: ; 0x022E57D4 ldr r1, _022E5860 ; =0x0000025B mov r0, r4 mov r2, #1 - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -2705,7 +2705,7 @@ ov29_022E5864: ; 0x022E5864 mov r1, #0x16 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E5864 @@ -2945,7 +2945,7 @@ ov29_022E5BD8: ; 0x022E5BD8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x40 mov r5, r0 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _022E5D4C ldr r1, [r5, #0xb4] @@ -3034,7 +3034,7 @@ _022E5CC0: mov r2, #1 str r4, [sp, #4] str r3, [sp, #8] - bl ov29_022E3820 + bl PlayEffectAnimationPixelPos b _022E5D50 _022E5D4C: mvn r0, #0 @@ -3084,7 +3084,7 @@ ov29_022E5DBC: ; 0x022E5DBC cmp r4, #3 bne _022E5DD8 mov r0, #0 - bl ov29_022EAE14 + bl ChangeDungeonMusic _022E5DD8: cmp r5, #4 beq _022E5E10 @@ -3183,7 +3183,7 @@ ov29_022E5ED0: ; 0x022E5ED0 and r0, r0, #0xff ldmia sp!, {r3, pc} _022E5F14: - bl ov29_022E272C + bl ShouldDisplayEntityWrapper ldmia sp!, {r3, pc} .align 2, 0 _022E5F1C: .word 0x02353538 @@ -3223,7 +3223,7 @@ _022E5F44: str r5, [sp, #0xc] mov r0, sb mov r2, r5 - bl ov29_022E35E4 + bl PlayEffectAnimationEntity ldrb r0, [sl, #6] cmp r0, #0 bne _022E5FC8 @@ -3275,7 +3275,7 @@ _022E6034: blt _022E60CC cmp r5, #0 beq _022E6090 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 bne _022E6090 mov r0, r7 @@ -3290,7 +3290,7 @@ _022E6034: mov r1, r7 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity b _022E60CC _022E6090: ldr r0, _022E60E0 ; =0x0235124C @@ -3307,7 +3307,7 @@ _022E6090: mov r1, r5 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity _022E60CC: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -3336,13 +3336,13 @@ ov29_022E60E4: ; 0x022E60E4 mov r1, #0x29 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E60E4 - arm_func_start ov29_022E6130 -ov29_022E6130: ; 0x022E6130 + arm_func_start PlayEffectAnimation0x1A9__022E6130 +PlayEffectAnimation0x1A9__022E6130: ; 0x022E6130 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3358,15 +3358,15 @@ ov29_022E6130: ; 0x022E6130 mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E6178: .word 0x000001A9 - arm_func_end ov29_022E6130 + arm_func_end PlayEffectAnimation0x1A9__022E6130 - arm_func_start ov29_022E617C -ov29_022E617C: ; 0x022E617C + arm_func_start PlayEffectAnimation0x1A9__022E617C +PlayEffectAnimation0x1A9__022E617C: ; 0x022E617C stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3382,15 +3382,15 @@ ov29_022E617C: ; 0x022E617C mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E61C4: .word 0x000001A9 - arm_func_end ov29_022E617C + arm_func_end PlayEffectAnimation0x1A9__022E617C - arm_func_start ov29_022E61C8 -ov29_022E61C8: ; 0x022E61C8 + arm_func_start PlayEffectAnimation0x1A9__022E61C8 +PlayEffectAnimation0x1A9__022E61C8: ; 0x022E61C8 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3406,15 +3406,15 @@ ov29_022E61C8: ; 0x022E61C8 mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E6210: .word 0x000001A9 - arm_func_end ov29_022E61C8 + arm_func_end PlayEffectAnimation0x1A9__022E61C8 - arm_func_start ov29_022E6214 -ov29_022E6214: ; 0x022E6214 + arm_func_start PlayEffectAnimation0x1A9__022E6214 +PlayEffectAnimation0x1A9__022E6214: ; 0x022E6214 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3430,12 +3430,12 @@ ov29_022E6214: ; 0x022E6214 mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E625C: .word 0x000001A9 - arm_func_end ov29_022E6214 + arm_func_end PlayEffectAnimation0x1A9__022E6214 arm_func_start ov29_022E6260 ov29_022E6260: ; 0x022E6260 @@ -3454,7 +3454,7 @@ ov29_022E6260: ; 0x022E6260 mov r0, r4 mov r1, #0x1a8 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E6260 @@ -3476,7 +3476,7 @@ ov29_022E62A8: ; 0x022E62A8 mov r0, r4 mov r1, #0x29 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E62A8 @@ -3498,7 +3498,7 @@ ov29_022E62F0: ; 0x022E62F0 mov r0, r4 mov r1, #0x48 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E62F0 @@ -3521,7 +3521,7 @@ ov29_022E6338: ; 0x022E6338 add r1, r1, #0x1a4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -3546,15 +3546,15 @@ ov29_022E6388: ; 0x022E6388 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E63D4: .word 0x00000297 arm_func_end ov29_022E6388 - arm_func_start ov29_022E63D8 -ov29_022E63D8: ; 0x022E63D8 + arm_func_start PlayEffectAnimation0x18E +PlayEffectAnimation0x18E: ; 0x022E63D8 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3570,12 +3570,12 @@ ov29_022E63D8: ; 0x022E63D8 add r1, r1, #0x18c and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E6420: .word 0x0000018E - arm_func_end ov29_022E63D8 + arm_func_end PlayEffectAnimation0x18E arm_func_start ov29_022E6424 ov29_022E6424: ; 0x022E6424 @@ -3595,7 +3595,7 @@ ov29_022E6424: ; 0x022E6424 mov r1, #0x1b0 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, #0xa mov r1, #0x42 bl ov29_022EA370 @@ -3620,13 +3620,13 @@ ov29_022E647C: ; 0x022E647C mov r0, r4 mov r1, #0x1a8 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E647C - arm_func_start ov29_022E64C4 -ov29_022E64C4: ; 0x022E64C4 + arm_func_start PlayEffectAnimation0x1A9__022E64C4 +PlayEffectAnimation0x1A9__022E64C4: ; 0x022E64C4 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3642,15 +3642,15 @@ ov29_022E64C4: ; 0x022E64C4 mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E650C: .word 0x000001A9 - arm_func_end ov29_022E64C4 + arm_func_end PlayEffectAnimation0x1A9__022E64C4 - arm_func_start ov29_022E6510 -ov29_022E6510: ; 0x022E6510 + arm_func_start PlayEffectAnimation0x1A9__022E6510 +PlayEffectAnimation0x1A9__022E6510: ; 0x022E6510 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -3666,12 +3666,12 @@ ov29_022E6510: ; 0x022E6510 mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _022E6558: .word 0x000001A9 - arm_func_end ov29_022E6510 + arm_func_end PlayEffectAnimation0x1A9__022E6510 arm_func_start ov29_022E655C ov29_022E655C: ; 0x022E655C @@ -3690,7 +3690,7 @@ ov29_022E655C: ; 0x022E655C mov r0, r4 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -3715,7 +3715,7 @@ ov29_022E65A8: ; 0x022E65A8 mov r1, #4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E65A8 @@ -3738,7 +3738,7 @@ ov29_022E65F4: ; 0x022E65F4 add r1, r1, #0x11c mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -3763,7 +3763,7 @@ ov29_022E6644: ; 0x022E6644 mov r0, r4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 @@ -3776,7 +3776,7 @@ ov29_022E6694: ; 0x022E6694 mov r4, r1 ldr r1, _022E66C0 ; =0x0000019E mov r2, #1 - bl ov29_022E37DC + bl PlayEffectAnimationPos cmp r4, #0 ldmeqia sp!, {r4, pc} mov r0, #0 @@ -3789,12 +3789,12 @@ _022E66C0: .word 0x0000019E arm_func_start ov29_022E66C4 ov29_022E66C4: ; 0x022E66C4 - ldr ip, _022E66D4 ; =ov29_022E37DC + ldr ip, _022E66D4 ; =PlayEffectAnimationPos mov r1, #0x36 mov r2, #1 bx ip .align 2, 0 -_022E66D4: .word ov29_022E37DC +_022E66D4: .word PlayEffectAnimationPos arm_func_end ov29_022E66C4 arm_func_start ov29_022E66D8 @@ -3815,7 +3815,7 @@ ov29_022E66D8: ; 0x022E66D8 mov r1, #0x15 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E66D8 @@ -3838,29 +3838,29 @@ ov29_022E6724: ; 0x022E6724 mov r1, #0x1b4 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E6724 arm_func_start ov29_022E6770 ov29_022E6770: ; 0x022E6770 - ldr ip, _022E6780 ; =ov29_022E37DC + ldr ip, _022E6780 ; =PlayEffectAnimationPos mov r1, #0x37 mov r2, #1 bx ip .align 2, 0 -_022E6780: .word ov29_022E37DC +_022E6780: .word PlayEffectAnimationPos arm_func_end ov29_022E6770 arm_func_start ov29_022E6784 ov29_022E6784: ; 0x022E6784 - ldr ip, _022E6794 ; =ov29_022E37DC + ldr ip, _022E6794 ; =PlayEffectAnimationPos mov r1, #0x29 mov r2, #1 bx ip .align 2, 0 -_022E6794: .word ov29_022E37DC +_022E6794: .word PlayEffectAnimationPos arm_func_end ov29_022E6784 arm_func_start ov29_022E6798 @@ -3881,7 +3881,7 @@ ov29_022E6798: ; 0x022E6798 mov r1, #0x18 mov r2, #1 str ip, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} arm_func_end ov29_022E6798 @@ -3910,7 +3910,7 @@ ov29_022E67E4: ; 0x022E67E4 mov r1, r7 and r3, r3, #0xff str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, r4 mov r1, #0x42 bl ov29_022EA370 @@ -3940,7 +3940,7 @@ _022E6894: _022E68A0: mov r0, #0 strb r0, [r6, #0x20] - bl ov29_022E38E0 + bl AnimationDelayOrSomething _022E68AC: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -4028,7 +4028,7 @@ _022E6944: mov r0, r5 and r3, ip, #0xff str r4, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 mov r6, #0 @@ -4493,8 +4493,8 @@ ov29_022E6F94: ; 0x022E6F94 _022E6FB8: .word 0x02353538 arm_func_end ov29_022E6F94 - arm_func_start ov29_022E6FBC -ov29_022E6FBC: ; 0x022E6FBC + arm_func_start LoadMappaFileAttributes +LoadMappaFileAttributes: ; 0x022E6FBC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x50 ldr r3, _022E79E4 ; =0x02353538 @@ -4541,18 +4541,18 @@ ov29_022E6FBC: ; 0x022E6FBC bne _022E707C ldr r1, _022E79EC ; =0x02351594 add r0, sp, #0x48 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom b _022E709C _022E707C: cmp r0, #2 add r0, sp, #0x48 bne _022E7094 ldr r1, _022E79F0 ; =0x023515B0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom b _022E709C _022E7094: ldr r1, _022E79F4 ; =0x023515CC - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom _022E709C: mov r0, #0x65 bl AdvanceFrame @@ -4584,7 +4584,7 @@ _022E709C: movne r0, #0 tst r0, #0xff beq _022E7138 - bl ov29_0234914C + bl CheckActiveChallengeRequest cmp r0, #0 bne _022E7138 ldr r0, _022E79E4 ; =0x02353538 @@ -4713,11 +4713,11 @@ _022E7294: ldr r0, [r0] add r0, r0, #0x28000 ldrb r0, [r0, #0x6c4] - bl ov29_022E0864 + bl IsBossFight cmp r0, #0 bne _022E7398 mov r0, r5 - bl ov29_022FB5EC + bl CheckSpawnThreshold cmp r0, #0 beq _022E7398 mov r0, r5 @@ -4728,7 +4728,7 @@ _022E7294: mov r1, r5 ldr r0, [r0] add r0, r0, #0x7d0 - bl ov29_0231B3FC + bl IsInSpawnList cmp r0, #0 ldreq r0, [sp, #0x10] cmpeq r0, #0 @@ -4861,7 +4861,7 @@ _022E74EC: cmp fp, r0 movlt fp, r0 mov r0, sl - bl ov29_022F7068 + bl DungeonGetTotalSpriteFileSize add r5, r5, r0 add r8, r8, #1 _022E7528: @@ -4892,7 +4892,7 @@ _022E7574: bne _022E7574 add r0, sp, #0x34 bl GetMonsterIdFromSpawnEntry - bl ov29_022F7068 + bl DungeonGetTotalSpriteFileSize sub r5, r5, r0 ldr r1, _022E79E4 ; =0x02353538 ldr r0, _022E7A04 ; =0x0000FFFF @@ -5055,7 +5055,7 @@ _022E77CC: cmp sl, #0x10 blt _022E76D8 _022E77D4: - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 beq _022E782C ldr r0, _022E79E4 ; =0x02353538 @@ -5068,7 +5068,7 @@ _022E77D4: ldrb r2, [r2, #0xda] ldrsh r3, [r4, r3] add r0, r0, r8, lsl #3 - bl ov29_02343E20 + bl LoadFixedRoom ldr r2, _022E79E4 ; =0x02353538 ldr r1, [r2] add r1, r1, #0x12000 @@ -5220,7 +5220,7 @@ _022E7A20: .word 0x0002C9E8 _022E7A24: .word 0xFFFF8AD0 _022E7A28: .word 0x000286D2 _022E7A2C: .word 0x000286F2 - arm_func_end ov29_022E6FBC + arm_func_end LoadMappaFileAttributes arm_func_start ov29_022E7A30 ov29_022E7A30: ; 0x022E7A30 @@ -5274,8 +5274,8 @@ _022E7AB8: ldmia sp!, {r4, pc} arm_func_end ov29_022E7A8C - arm_func_start ov29_022E7AC4 -ov29_022E7AC4: ; 0x022E7AC4 + arm_func_start GetItemIdToSpawn +GetItemIdToSpawn: ; 0x022E7AC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r4, r0 ldr r0, _022E7BA8 ; =0x00002710 @@ -5345,13 +5345,13 @@ _022E7BA8: .word 0x00002710 _022E7BAC: .word 0x02353538 _022E7BB0: .word 0x000286D2 _022E7BB4: .word 0x000286F2 - arm_func_end ov29_022E7AC4 + arm_func_end GetItemIdToSpawn arm_func_start ov29_022E7BB8 ov29_022E7BB8: ; 0x022E7BB8 stmdb sp!, {r3, lr} mov r0, #4 - bl ov29_022E7AC4 + bl GetItemIdToSpawn cmp r0, #0xb7 moveq r0, #0x46 ldmia sp!, {r3, pc} @@ -5361,7 +5361,7 @@ ov29_022E7BB8: ; 0x022E7BB8 ov29_022E7BD0: ; 0x022E7BD0 stmdb sp!, {r3, lr} mov r0, #5 - bl ov29_022E7AC4 + bl GetItemIdToSpawn cmp r0, #0xb7 moveq r0, #0x46 ldmia sp!, {r3, pc} @@ -5406,8 +5406,8 @@ _022E7C54: _022E7C5C: .word 0x02353538 arm_func_end ov29_022E7BE8 - arm_func_start ov29_022E7C60 -ov29_022E7C60: ; 0x022E7C60 + arm_func_start MonsterSpawnListPartialCopy +MonsterSpawnListPartialCopy: ; 0x022E7C60 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -5453,7 +5453,7 @@ _022E7CEC: .align 2, 0 _022E7CF4: .word 0x02353538 _022E7CF8: .word 0x0002C966 - arm_func_end ov29_022E7C60 + arm_func_end MonsterSpawnListPartialCopy arm_func_start ov29_022E7CFC ov29_022E7CFC: ; 0x022E7CFC @@ -5682,7 +5682,7 @@ ov29_022E7F94: ; 0x022E7F94 mov r0, #1 mov r1, r0 bl ov29_02339D7C - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #0 bl SetMinimapDataE447 ldr r1, _022E8014 ; =0x02353554 @@ -5945,7 +5945,7 @@ ov29_022E82CC: ; 0x022E82CC bne _022E82F0 _022E82E4: ldr r0, _022E8404 ; =0x00000229 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex str r0, [sp, #0x18] _022E82F0: ldrb r0, [r8, #0xc4] @@ -7058,25 +7058,25 @@ GetChebyshevDistance: ; 0x022E908C ldrsh r1, [r5] ldrsh r0, [r4] sub r0, r1, r0 - bl Abs + bl abs ldrsh r1, [r4, #2] ldrsh r2, [r5, #2] mov r4, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r4, r0 movle r4, r0 mov r0, r4 ldmia sp!, {r3, r4, r5, pc} arm_func_end GetChebyshevDistance - arm_func_start ov29_022E90CC -ov29_022E90CC: ; 0x022E90CC + arm_func_start IsPositionActuallyInSight +IsPositionActuallyInSight: ; 0x022E90CC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r4, r1 mov r6, r2 - bl ov29_022E333C + bl GetVisibilityRange mov r5, r0 ldrsh r0, [r7] ldrsh r1, [r7, #2] @@ -7090,13 +7090,13 @@ _022E9104: ldrsh r1, [r7] ldrsh r0, [r4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, r5 bgt _022E9198 ldrsh r1, [r7, #2] ldrsh r0, [r4, #2] sub r0, r1, r0 - bl Abs + bl abs cmp r0, r5 bgt _022E9198 mov r0, #1 @@ -7130,7 +7130,7 @@ _022E9198: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022E91A0: .word 0x02353538 - arm_func_end ov29_022E90CC + arm_func_end IsPositionActuallyInSight arm_func_start IsPositionInSight IsPositionInSight: ; 0x022E91A4 @@ -7173,12 +7173,12 @@ _022E9230: ldrsh r1, [r5, #2] ldrsh r0, [r4, #2] sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [r5] ldrsh r1, [r4] mov r6, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r0, r6 movle r0, r6 cmp r0, #2 @@ -7210,7 +7210,7 @@ ov29_022E9298: ; 0x022E9298 mov r7, r2 bl GetTile mov r6, r0 - bl ov29_022E333C + bl GetVisibilityRange cmp r7, #0 ldrb r2, [r6, #7] bne _022E92D0 @@ -7264,14 +7264,14 @@ ov29_022E935C: ; 0x022E935C ldrsh r4, [r8] ldrsh r0, [r7] sub r0, r4, r0 - bl Abs + bl abs mov r6, r0 cmp r6, #1 bgt _022E93A0 ldrsh r1, [r8, #2] ldrsh r0, [r7, #2] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 movle r0, #1 ldmleia sp!, {r4, r5, r6, r7, r8, pc} @@ -7279,7 +7279,7 @@ _022E93A0: ldrsh r5, [r8, #2] ldrsh r0, [r7, #2] sub r0, r5, r0 - bl Abs + bl abs cmp r6, r0 movle r6, r0 cmp r6, #2 diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index 05b5851d..26a8e91f 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -3,13 +3,13 @@ .text - arm_func_start ov29_022E9618 -ov29_022E9618: ; 0x022E9618 + arm_func_start GetLeaderMonster +GetLeaderMonster: ; 0x022E9618 stmdb sp!, {r3, lr} bl GetLeader ldr r0, [r0, #0xb4] ldmia sp!, {r3, pc} - arm_func_end ov29_022E9618 + arm_func_end GetLeaderMonster arm_func_start ov29_022E9628 ov29_022E9628: ; 0x022E9628 @@ -84,11 +84,11 @@ _022E96E8: cmpeq r0, #0 bne _022E97A8 ldr r0, [sp, #4] - bl Abs + bl abs cmp r0, #6 bge _022E9740 sub r0, fp, r7 - bl Abs + bl abs cmp r0, #6 blt _022E97A8 _022E9740: @@ -171,8 +171,8 @@ _022E983C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end ov29_022E96E4 - arm_func_start ov29_022E9844 -ov29_022E9844: ; 0x022E9844 + arm_func_start FindNearbyUnoccupiedTile +FindNearbyUnoccupiedTile: ; 0x022E9844 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xc mov r8, r3 @@ -293,43 +293,43 @@ _022E99D8: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022E99EC: .word 0x02353538 - arm_func_end ov29_022E9844 + arm_func_end FindNearbyUnoccupiedTile - arm_func_start ov29_022E99F0 -ov29_022E99F0: ; 0x022E99F0 + arm_func_start FindClosestUnoccupiedTileWithin2 +FindClosestUnoccupiedTileWithin2: ; 0x022E99F0 stmdb sp!, {r3, lr} str r2, [sp] ldr r2, _022E9A08 ; =0x02351844 mov r3, #0x19 - bl ov29_022E9844 + bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 _022E9A08: .word 0x02351844 - arm_func_end ov29_022E99F0 + arm_func_end FindClosestUnoccupiedTileWithin2 - arm_func_start ov29_022E9A0C -ov29_022E9A0C: ; 0x022E9A0C + arm_func_start FindFarthestUnoccupiedTileWithin2 +FindFarthestUnoccupiedTileWithin2: ; 0x022E9A0C stmdb sp!, {r3, lr} str r2, [sp] ldr r2, _022E9A24 ; =0x023517DC mov r3, #0x19 - bl ov29_022E9844 + bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 _022E9A24: .word 0x023517DC - arm_func_end ov29_022E9A0C + arm_func_end FindFarthestUnoccupiedTileWithin2 - arm_func_start ov29_022E9A28 -ov29_022E9A28: ; 0x022E9A28 + arm_func_start FindUnoccupiedTileWithin3 +FindUnoccupiedTileWithin3: ; 0x022E9A28 stmdb sp!, {r3, lr} str r2, [sp] ldr r2, _022E9A40 ; =0x023518AC mov r3, #0x31 - bl ov29_022E9844 + bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 _022E9A40: .word 0x023518AC - arm_func_end ov29_022E9A28 + arm_func_end FindUnoccupiedTileWithin3 arm_func_start TickStatusTurnCounter TickStatusTurnCounter: ; 0x022E9A44 @@ -780,7 +780,7 @@ ov29_022EA008: ; 0x022EA008 cmp r0, #0 beq _022EA0F8 mov r0, #1 - bl ov29_022E2EC4 + bl UpdateCamera ldr r1, _022EA290 ; =0x02353538 ldr r0, _022EA298 ; =0x0001A224 ldr ip, [r1] @@ -853,7 +853,7 @@ _022EA140: _022EA154: bl ov29_022EA64C bl ov29_022EA80C - bl ov29_02335A10 + bl DisplayUi ldr r1, _022EA294 ; =0x02353560 ldrb r0, [r1] cmp r0, #0 @@ -966,7 +966,7 @@ _022EA2C0: ldr r0, [r0] add r0, r0, #0x1a000 strb r1, [r0, #0x248] - bl ov29_0233A290 + bl InitWeirdMinimapMatrix ldr r0, _022EA31C ; =0x02353560 ldrb r0, [r0, #6] cmp r0, #0 @@ -1131,7 +1131,7 @@ _022EA4B4: ldrb r0, [r0, #4] cmp r0, #0 bne _022EA614 - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #0 bl ov29_02339FF4 b _022EA614 @@ -1193,7 +1193,7 @@ _022EA594: ldrb r0, [r0, #4] cmp r0, #0 bne _022EA5BC - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #1 bl ov29_02339FF4 _022EA5BC: @@ -1440,7 +1440,7 @@ _022EA848: bge _022EA910 rsb r0, r1, r1, lsl #8 mov r1, #0x1f - bl DivideInt + bl __divsi3 _022EA910: ldr ip, _022EA95C ; =0x0237C850 mov r1, r4, lsl #0x10 @@ -1468,8 +1468,8 @@ _022EA960: .word 0x02353538 _022EA964: .word 0x0001A224 arm_func_end ov29_022EA80C - arm_func_start ov29_022EA968 -ov29_022EA968: ; 0x022EA968 + arm_func_start SetDungeonRngPreseed23Bit +SetDungeonRngPreseed23Bit: ; 0x022EA968 orr r1, r0, #1 ldr r0, _022EA97C ; =0x02353570 bic r1, r1, #0xff000000 @@ -1477,7 +1477,7 @@ ov29_022EA968: ; 0x022EA968 bx lr .align 2, 0 _022EA97C: .word 0x02353570 - arm_func_end ov29_022EA968 + arm_func_end SetDungeonRngPreseed23Bit arm_func_start GenerateDungeonRngSeed GenerateDungeonRngSeed: ; 0x022EA980 diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index c7396422..8074d215 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -42,7 +42,7 @@ _022EABBC: _022EAC04: mov r0, r4 mov r1, #0x14 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 cmpne r5, #0x7f beq _022EAC24 @@ -159,11 +159,11 @@ ov29_022EACE4: ; 0x022EACE4 _022EACFC: .word 0x000003E6 arm_func_end ov29_022EACE4 - arm_func_start ov29_022EAD00 -ov29_022EAD00: ; 0x022EAD00 + arm_func_start MusicTableIdxToMusicId +MusicTableIdxToMusicId: ; 0x022EAD00 stmdb sp!, {r4, lr} mov r1, #0xaa - bl DivideInt + bl __divsi3 ldr r0, _022EAD5C ; =0x022C555C mov r1, r1, lsl #1 ldrh r4, [r0, r1] @@ -188,12 +188,12 @@ ov29_022EAD00: ; 0x022EAD00 _022EAD5C: .word 0x022C555C _022EAD60: .word 0x00007FFF _022EAD64: .word 0x022C51FC - arm_func_end ov29_022EAD00 + arm_func_end MusicTableIdxToMusicId arm_func_start ov29_022EAD68 ov29_022EAD68: ; 0x022EAD68 stmdb sp!, {r4, r5, r6, lr} - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 beq _022EADAC mov r6, #0 @@ -225,13 +225,13 @@ _022EADAC: strneh r1, [r0, #0xd6] mov r0, r1, lsl #0x10 mov r0, r0, asr #0x10 - bl ov29_022EAD00 + bl MusicTableIdxToMusicId mov r4, r0 bl sub_02017B18 cmp r0, #0 mov r0, r4 bne _022EAE00 - bl ov29_022EAE14 + bl ChangeDungeonMusic ldmia sp!, {r4, r5, r6, pc} _022EAE00: bl ov29_022EAE40 @@ -242,8 +242,8 @@ _022EAE0C: .word 0x02353538 _022EAE10: .word 0x022C6C70 arm_func_end ov29_022EAD68 - arm_func_start ov29_022EAE14 -ov29_022EAE14: ; 0x022EAE14 + arm_func_start ChangeDungeonMusic +ChangeDungeonMusic: ; 0x022EAE14 ldr r3, _022EAE38 ; =0x02353538 ldr r1, _022EAE3C ; =0x0002CB06 ldr ip, [r3] @@ -256,7 +256,7 @@ ov29_022EAE14: ; 0x022EAE14 .align 2, 0 _022EAE38: .word 0x02353538 _022EAE3C: .word 0x0002CB06 - arm_func_end ov29_022EAE14 + arm_func_end ChangeDungeonMusic arm_func_start ov29_022EAE40 ov29_022EAE40: ; 0x022EAE40 @@ -408,7 +408,7 @@ ov29_022EAFB0: ; 0x022EAFB0 ldr r0, [r0, r1, lsl #2] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 - bl ov29_022EAD00 + bl MusicTableIdxToMusicId b _022EB034 _022EB004: ldrb r0, [r3, #0x791] @@ -524,7 +524,7 @@ TrySwitchPlace: ; 0x022EB178 mov r4, r1 mov r1, #0xe mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022EB1BC mov r0, #0 @@ -552,14 +552,14 @@ _022EB1E4: beq _022EB204 mov r0, r5 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _022EB210 _022EB204: mov r0, r4 mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _022EB210: cmp r0, #0 beq _022EB23C @@ -589,18 +589,18 @@ _022EB23C: ldrsh r2, [sp, #2] mov r0, r5 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos ldrsh r1, [sp, #4] ldrsh r2, [sp, #6] mov r0, r4 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, r5 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, r4 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, r5 bl ov29_02321260 mov r0, r4 @@ -634,7 +634,7 @@ _022EB2F8: mov r0, r7 bl StringFromMessageId ldr r1, _022EB368 ; =0x02352070 - bl Strcmp + bl strcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -680,7 +680,7 @@ _022EB394: .word 0x02352030 ov29_022EB398: ; 0x022EB398 stmdb sp!, {r4, lr} mov r4, r0 - bl ov29_022E9618 + bl GetLeaderMonster mov r1, #0 strh r1, [r0, #0x4a] cmp r4, #0 @@ -692,11 +692,11 @@ ov29_022EB398: ; 0x022EB398 ldmia sp!, {r4, pc} arm_func_end ov29_022EB398 - arm_func_start ov29_022EB3C8 -ov29_022EB3C8: ; 0x022EB3C8 + arm_func_start SetLeaderActionFields +SetLeaderActionFields: ; 0x022EB3C8 stmdb sp!, {r4, lr} mov r4, r0 - bl ov29_022E9618 + bl GetLeaderMonster mov r1, #0 strh r4, [r0, #0x4a] strb r1, [r0, #0x4e] @@ -705,7 +705,7 @@ ov29_022EB3C8: ; 0x022EB3C8 strh r1, [r0, #0x5a] strh r1, [r0, #0x5c] ldmia sp!, {r4, pc} - arm_func_end ov29_022EB3C8 + arm_func_end SetLeaderActionFields arm_func_start ClearMonsterActionFields ClearMonsterActionFields: ; 0x022EB3F4 @@ -741,8 +741,8 @@ SetActionPassTurnOrWalk: ; 0x022EB41C ldmia sp!, {r4, pc} arm_func_end SetActionPassTurnOrWalk - arm_func_start ov29_022EB44C -ov29_022EB44C: ; 0x022EB44C + arm_func_start GetItemToUseByIndex +GetItemToUseByIndex: ; 0x022EB44C stmdb sp!, {r3, lr} ldrb r2, [r1] cmp r2, #1 @@ -761,7 +761,7 @@ _022EB478: ldrsh r1, [r1, #4] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo ldmia sp!, {r3, pc} _022EB498: cmp r2, #0x81 @@ -786,7 +786,7 @@ _022EB4DC: ldmia sp!, {r3, pc} .align 2, 0 _022EB4E4: .word 0x02353538 - arm_func_end ov29_022EB44C + arm_func_end GetItemToUseByIndex arm_func_start ov29_022EB4E8 ov29_022EB4E8: ; 0x022EB4E8 @@ -803,7 +803,7 @@ ov29_022EB4E8: ; 0x022EB4E8 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl RemoveItem - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper mov r0, #1 ldmia sp!, {r3, pc} _022EB528: @@ -813,21 +813,21 @@ _022EB528: add r0, r0, #6 add r0, r0, r2 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem mov r0, #1 ldmia sp!, {r3, pc} arm_func_end ov29_022EB4E8 - arm_func_start ov29_022EB54C -ov29_022EB54C: ; 0x022EB54C + arm_func_start GetItemToUse +GetItemToUse: ; 0x022EB54C stmdb sp!, {r3, lr} ldr ip, [r0, #0xb4] mov r3, #6 add ip, ip, #0x4e mla r1, r3, r1, ip - bl ov29_022EB44C + bl GetItemToUseByIndex ldmia sp!, {r3, pc} - arm_func_end ov29_022EB54C + arm_func_end GetItemToUse arm_func_start ov29_022EB568 ov29_022EB568: ; 0x022EB568 @@ -872,8 +872,8 @@ _022EB5D0: bx lr arm_func_end ov29_022EB594 - arm_func_start ov29_022EB5D8 -ov29_022EB5D8: ; 0x022EB5D8 + arm_func_start GetItemAction +GetItemAction: ; 0x022EB5D8 stmdb sp!, {r3, lr} ldrsh r0, [r0, #4] ldr r1, _022EB604 ; =0x0000016B @@ -888,24 +888,24 @@ ov29_022EB5D8: ; 0x022EB5D8 .align 2, 0 _022EB604: .word 0x0000016B _022EB608: .word 0x02352010 - arm_func_end ov29_022EB5D8 + arm_func_end GetItemAction - arm_func_start ov29_022EB60C -ov29_022EB60C: ; 0x022EB60C + arm_func_start RemoveUsedItem +RemoveUsedItem: ; 0x022EB60C stmdb sp!, {r3, r4, r5, lr} ldr ip, [r0, #0xb4] mov r3, #6 add ip, ip, #0x4e mla r1, r3, r1, ip ldr r4, [r0, #0xb4] - bl ov29_022EB44C + bl GetItemToUseByIndex ldrb r1, [r4, #0x4e] mov r5, r0 cmp r1, #0x80 bne _022EB648 add r0, r4, #0x50 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldmia sp!, {r3, r4, r5, pc} _022EB648: ldrb r1, [r5, #1] @@ -915,9 +915,9 @@ _022EB648: _022EB658: mov r0, r5 bl ItemZInit - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022EB60C + arm_func_end RemoveUsedItem arm_func_start ov29_022EB668 ov29_022EB668: ; 0x022EB668 @@ -931,7 +931,7 @@ ov29_022EB668: ; 0x022EB668 mov r7, r2 add r1, r1, #0x4e add r1, r1, r6 - bl ov29_022EB44C + bl GetItemToUseByIndex mov r4, r0 ldrsh r0, [r4, #4] ldr r5, [sb, #0xb4] @@ -955,7 +955,7 @@ ov29_022EB668: ; 0x022EB668 strh r2, [sp, #2] ldrh r2, [r4, #4] strh r2, [sp, #4] - bl ov29_023456BC + bl RemoveGroundItem ldrsh r0, [r4, #4] mov r3, #0xbb add r1, sp, #0 @@ -964,7 +964,7 @@ ov29_022EB668: ; 0x022EB668 mov r2, #1 strh r4, [sp, #2] strh r3, [sp, #4] - bl ov29_02345538 + bl SpawnItem b _022EB7F8 _022EB71C: ldrb r1, [r4, #1] @@ -1024,7 +1024,7 @@ _022EB7E8: mov r0, sb mov r1, r8 mov r2, r7 - bl ov29_022EB60C + bl RemoveUsedItem _022EB7F8: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -1043,8 +1043,8 @@ ov29_022EB804: ; 0x022EB804 _022EB818: .word 0x0237C920 arm_func_end ov29_022EB804 - arm_func_start ov29_022EB81C -ov29_022EB81C: ; 0x022EB81C + arm_func_start AddDungeonSubMenuOption +AddDungeonSubMenuOption: ; 0x022EB81C stmdb sp!, {r4, r5, r6, lr} ldr r2, _022EB89C ; =0x0237C918 ldr r2, [r2] @@ -1085,7 +1085,7 @@ _022EB8A0: .word 0x0237C91C _022EB8A4: .word 0x0237C91E _022EB8A8: .word 0x0237C920 _022EB8AC: .word 0x0237C922 - arm_func_end ov29_022EB81C + arm_func_end AddDungeonSubMenuOption arm_func_start ov29_022EB8B0 ov29_022EB8B0: ; 0x022EB8B0 @@ -1111,8 +1111,8 @@ _022EB8EC: .word 0x0237C918 _022EB8F0: .word 0x0237C91C arm_func_end ov29_022EB8B0 - arm_func_start ov29_022EB8F4 -ov29_022EB8F4: ; 0x022EB8F4 + arm_func_start DisableDungeonSubMenuOption +DisableDungeonSubMenuOption: ; 0x022EB8F4 stmdb sp!, {r3, lr} ldr r1, _022EB938 ; =0x0237C918 mov ip, #0 @@ -1136,7 +1136,7 @@ _022EB92C: _022EB938: .word 0x0237C918 _022EB93C: .word 0x0237C91C _022EB940: .word 0x0237C920 - arm_func_end ov29_022EB8F4 + arm_func_end DisableDungeonSubMenuOption arm_func_start ov29_022EB944 ov29_022EB944: ; 0x022EB944 @@ -1144,7 +1144,7 @@ ov29_022EB944: ; 0x022EB944 cmp r1, #0 ldr r4, [r0, #0xb4] beq _022EB964 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r4, pc} @@ -1438,8 +1438,8 @@ ov29_022EBC74: ; 0x022EBC74 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022EBC74 - arm_func_start ov29_022EBC98 -ov29_022EBC98: ; 0x022EBC98 + arm_func_start SetActionUseMovePlayer +SetActionUseMovePlayer: ; 0x022EBC98 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r1, #0x14 @@ -1449,7 +1449,7 @@ ov29_022EBC98: ; 0x022EBC98 strb r5, [r6, #4] strb r4, [r6, #0xa] ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_022EBC98 + arm_func_end SetActionUseMovePlayer arm_func_start SetActionUseMoveAi SetActionUseMoveAi: ; 0x022EBCBC @@ -1571,7 +1571,7 @@ _022EBD80: bl EnemyEvolution mov r0, r4 mov r1, #1 - bl ov29_02307D54 + bl TryRestoreRoostTyping mov sb, #0 mov r7, sb mov r6, sb @@ -1642,12 +1642,12 @@ _022EBF18: ldrsh r1, [r8, #6] ldrsh r0, [r7, #6] sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [r8, #4] ldrsh r1, [r7, #4] mov r5, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r0, r5 movle r0, r5 cmp r0, #3 @@ -1871,7 +1871,7 @@ _022EC2A4: _022EC2AC: mov r0, #1 mov r1, #0 - bl ov29_023354C4 + bl TryActivateWeather bl ov29_022EF9C8 mov r0, #0 bl TryForcedLoss @@ -1928,7 +1928,7 @@ RunLeaderTurn: ; 0x022EC308 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, r4 mov r1, #1 - bl ov29_02307D54 + bl TryRestoreRoostTyping _022EC380: bl GetLeader movs sb, r0 @@ -1989,7 +1989,7 @@ _022EC434: mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x11] - bl ov29_022F0EDC + bl SetLeaderAction ldr r0, _022EC600 ; =0x02353538 mov r1, #0 ldr r0, [r0] @@ -2081,7 +2081,7 @@ _022EC59C: ldr r0, [r1, #0xc8] cmp r0, #0 beq _022EC5DC - bl ov29_022F3934 + bl ChangeLeader ldr r0, _022EC600 ; =0x02353538 mov r1, #0 ldr r0, [r0] diff --git a/asm/overlay_29_022EC62C.s b/asm/overlay_29_022EC62C.s index 674b4e86..bc520fda 100644 --- a/asm/overlay_29_022EC62C.s +++ b/asm/overlay_29_022EC62C.s @@ -103,7 +103,7 @@ _022EC750: moveq sl, fp mov r0, sb movne sl, r7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] mov r1, #0x38 @@ -111,7 +111,7 @@ _022EC750: addne r0, r0, #0x3000 strneb r6, [r0, #0xe36] mov r0, sb - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] addne r0, r0, sl @@ -199,7 +199,7 @@ ov29_022EC8A8: ; 0x022EC8A8 mov r0, r2 mov r1, #0x30 mov r4, r3 - bl DivideInt + bl __divsi3 mov r3, r1, lsl #1 and r0, r3, #0xff mov r2, r0, lsr #1 @@ -338,7 +338,7 @@ _022ECA8C: ldr r0, [r0, r5, lsl #2] mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl ov29_022EAE14 + bl ChangeDungeonMusic mov r0, r5, lsl #2 add r0, r0, #8 mov r2, r0, lsl #0x10 @@ -348,7 +348,7 @@ _022ECA8C: mov r2, #0x10 bl ov29_022EC8A8 mov r0, r4 - bl ov29_022EAE14 + bl ChangeDungeonMusic _022ECAD0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} @@ -434,7 +434,7 @@ _022ECB70: mov r1, #1 mov r0, r4 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster mov r0, r4 bl DisplayActions bl IsFloorOver @@ -463,7 +463,7 @@ _022ECC2C: mov r1, #1 mov r0, r4 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster mov r0, r4 bl DisplayActions bl IsFloorOver @@ -492,7 +492,7 @@ _022ECC9C: mov r1, #1 mov r0, r4 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster mov r0, r4 bl DisplayActions bl IsFloorOver @@ -517,7 +517,7 @@ _022ECD0C: mov r1, #1 mov r0, r4 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster mov r0, r4 bl DisplayActions bl IsFloorOver @@ -558,7 +558,7 @@ ov29_022ECD84: ; 0x022ECD84 cmp r1, #0 ldmeqia sp!, {r4, pc} ldr r0, _022ECDBC ; =0x0237C974 - bl ov29_02300164 + bl GetMonsterName ldmia sp!, {r4, pc} .align 2, 0 _022ECDBC: .word 0x0237C974 diff --git a/asm/overlay_29_022ECDE4.s b/asm/overlay_29_022ECDE4.s index 6c8cda21..bc7f29a3 100644 --- a/asm/overlay_29_022ECDE4.s +++ b/asm/overlay_29_022ECDE4.s @@ -28,7 +28,7 @@ _022ECE28: beq _022ECE44 mov r0, r4 mov r1, r5 - bl ov29_02300164 + bl GetMonsterName b _022ECE6C _022ECE44: ldr r1, _022ECF38 ; =0x0237C974 @@ -36,7 +36,7 @@ _022ECE44: cmp r0, #0 beq _022ECE60 mov r0, r4 - bl Strcpy + bl strcpy b _022ECE6C _022ECE60: ldr r1, _022ECF3C ; =0x00000A41 @@ -45,14 +45,14 @@ _022ECE60: _022ECE6C: mov r1, r6 add r0, r4, #0x1e - bl ov29_02300164 + bl GetMonsterName cmp r7, #0 moveq r0, #0 streqb r0, [r4, #0x3c] beq _022ECE94 mov r1, r7 add r0, r4, #0x3c - bl Strcpy + bl strcpy _022ECE94: mov r1, r8 add r0, r4, #0x70 @@ -92,7 +92,7 @@ _022ECE94: strb r3, [r4, #0x5c] ldrb r3, [r5, #0x749] strb r3, [r4, #0x5d] - bl Memset + bl memset ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022ECF34: .word 0x02353538 @@ -329,7 +329,7 @@ _022ED1D0: bne _022ED370 _022ED1E0: add r0, sp, #0x48 - bl sub_0201E730 + bl InitRender3dElement ldr r1, _022ED7F4 ; =0x0237C99C ldr r0, _022ED7F8 ; =0x020AFC70 ldrh r2, [r1] @@ -450,7 +450,7 @@ _022ED37C: strh r1, [sp, #6] ldrsh r5, [r2, #0xa] ldrsh r4, [r2, #8] - bl sub_0201E730 + bl InitRender3dElement ldrsh r3, [sp, #2] ldrsh r6, [sp, #4] ldrsh lr, [sp] @@ -759,29 +759,29 @@ ov29_022ED82C: ; 0x022ED82C bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy ldmia sp!, {r4, pc} arm_func_end ov29_022ED82C - arm_func_start ov29_022ED858 -ov29_022ED858: ; 0x022ED858 + arm_func_start BindTrapToTile +BindTrapToTile: ; 0x022ED858 cmp r1, #0 strne r1, [r0, #0x10] strneb r2, [r1, #0x20] bx lr - arm_func_end ov29_022ED858 + arm_func_end BindTrapToTile arm_func_start ov29_022ED868 ov29_022ED868: ; 0x022ED868 ldr r0, _022ED880 ; =0x02353538 - ldr ip, _022ED884 ; =ov29_02344148 + ldr ip, _022ED884 ; =AreLateGameTrapsEnabled ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] bx ip .align 2, 0 _022ED880: .word 0x02353538 -_022ED884: .word ov29_02344148 +_022ED884: .word AreLateGameTrapsEnabled arm_func_end ov29_022ED868 arm_func_start ov29_022ED888 @@ -823,22 +823,22 @@ _022ED8FC: bne _022ED92C mov r2, fp mov r3, #0 - bl ov29_022E2260 + bl SpawnTrap movs r1, r0 beq _022ED94C mov r0, sb mov r2, #1 - bl ov29_022ED858 + bl BindTrapToTile b _022ED94C _022ED92C: mov r2, #0 mov r3, r2 - bl ov29_022E2260 + bl SpawnTrap movs r1, r0 beq _022ED94C mov r0, sb mov r2, #0 - bl ov29_022ED858 + bl BindTrapToTile _022ED94C: add r8, r8, #1 cmp r8, #0x38 @@ -852,8 +852,8 @@ _022ED94C: _022ED96C: .word 0x023526A0 arm_func_end ov29_022ED888 - arm_func_start ov29_022ED970 -ov29_022ED970: ; 0x022ED970 + arm_func_start SpawnEnemyTrapAtPos +SpawnEnemyTrapAtPos: ; 0x022ED970 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r7, r1 @@ -870,16 +870,16 @@ ov29_022ED970: ; 0x022ED970 mov r2, #0 strh r7, [sp] strh r6, [sp, #2] - bl ov29_022E2260 + bl SpawnTrap movs r1, r0 beq _022ED9C8 ldrb r2, [sp, #0x20] mov r0, r4 - bl ov29_022ED858 + bl BindTrapToTile _022ED9C8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} - arm_func_end ov29_022ED970 + arm_func_end SpawnEnemyTrapAtPos arm_func_start ov29_022ED9D0 ov29_022ED9D0: ; 0x022ED9D0 @@ -1021,8 +1021,8 @@ _022EDBCC: .word 0xFFFF000F _022EDBD0: .word 0x020AFC4C arm_func_end ov29_022ED9D0 - arm_func_start ov29_022EDBD4 -ov29_022EDBD4: ; 0x022EDBD4 + arm_func_start PrepareTrapperTrap +PrepareTrapperTrap: ; 0x022EDBD4 stmdb sp!, {r3, r4, r5, lr} ldr lr, _022EDC28 ; =0x02353538 ldrsh r5, [r0] @@ -1047,7 +1047,7 @@ ov29_022EDBD4: ; 0x022EDBD4 .align 2, 0 _022EDC28: .word 0x02353538 _022EDC2C: .word 0x00012AAA - arm_func_end ov29_022EDBD4 + arm_func_end PrepareTrapperTrap arm_func_start ov29_022EDC30 ov29_022EDC30: ; 0x022EDC30 @@ -1089,8 +1089,8 @@ _022EDCB4: ldmia sp!, {r3, pc} arm_func_end ov29_022EDC30 - arm_func_start ov29_022EDCBC -ov29_022EDCBC: ; 0x022EDCBC + arm_func_start TrySpawnTrap +TrySpawnTrap: ; 0x022EDCBC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r0 mov r7, r1 @@ -1143,10 +1143,10 @@ _022EDD14: cmp r1, #2 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - bl ov29_022E1608 + bl GetTrapInfo strb r7, [r0] ldr r0, [r4, #0x10] - bl ov29_022E1608 + bl GetTrapInfo strb r6, [r0, #1] ldr r1, [r4, #0x10] mov r0, #1 @@ -1157,19 +1157,19 @@ _022EDDA0: mov r1, r8 mov r2, r6 mov r3, #0 - bl ov29_022E2260 + bl SpawnTrap movs r1, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r0, r4 mov r2, r5 - bl ov29_022ED858 + bl BindTrapToTile mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_022EDCBC + arm_func_end TrySpawnTrap - arm_func_start ov29_022EDDD4 -ov29_022EDDD4: ; 0x022EDDD4 + arm_func_start TrySpawnTrapperTrap +TrySpawnTrapperTrap: ; 0x022EDDD4 stmdb sp!, {r3, r4, r5, lr} ldr r1, _022EDE6C ; =0x02353538 mov r5, r0 @@ -1188,7 +1188,7 @@ ov29_022EDDD4: ; 0x022EDDD4 ldrb r2, [r2, #0xaaf] add r0, r3, r0 mov r3, #1 - bl ov29_022EDCBC + bl TrySpawnTrap movs r4, r0 ldr r1, _022EDE70 ; =0x00012AAA beq _022EDE48 @@ -1207,7 +1207,7 @@ _022EDE48: add r1, r3, r1 bl LogMessageByIdWithPopupCheckUserUnknown _022EDE60: - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -1215,7 +1215,7 @@ _022EDE6C: .word 0x02353538 _022EDE70: .word 0x00012AAA _022EDE74: .word 0x00000E57 _022EDE78: .word 0x00000E58 - arm_func_end ov29_022EDDD4 + arm_func_end TrySpawnTrapperTrap arm_func_start ov29_022EDE7C ov29_022EDE7C: ; 0x022EDE7C @@ -1236,7 +1236,7 @@ ov29_022EDE7C: ; 0x022EDE7C str r1, [r0, #0x10] cmp r4, #0 beq _022EDEC4 - bl ov29_02336F4C + bl UpdateTrapsVisibility _022EDEC4: mov r0, #1 ldmia sp!, {r4, pc} @@ -1271,11 +1271,11 @@ ov29_022EDEDC: ; 0x022EDEDC strb r0, [r1, #0x20] ldrsh r0, [r5] ldrsh r1, [r5, #2] - bl ov29_023391EC + bl DrawMinimapTile _022EDF34: cmp r4, #0 beq _022EDF40 - bl ov29_02336F4C + bl UpdateTrapsVisibility _022EDF40: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} @@ -1314,8 +1314,8 @@ ov29_022EDF7C: ; 0x022EDF7C ldmia sp!, {r4, r5, r6, pc} arm_func_end ov29_022EDF7C - arm_func_start ov29_022EDFA0 -ov29_022EDFA0: ; 0x022EDFA0 + arm_func_start TryTriggerTrap +TryTriggerTrap: ; 0x022EDFA0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 mov sb, r1 @@ -1333,7 +1333,7 @@ ov29_022EDFA0: ; 0x022EDFA0 cmp r0, #2 bne _022EE2F4 mov r0, r4 - bl ov29_022E1608 + bl GetTrapInfo mov r6, r0 ldrb r1, [r6] mov r0, #0 @@ -1383,7 +1383,7 @@ _022EE05C: mov r0, #1 mov r2, #0 bl SubstitutePlaceholderStringTags - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 ldrne r8, _022EE300 ; =0x00000E5B bne _022EE0C8 @@ -1419,7 +1419,7 @@ _022EE110: bl ov29_022E2CA0 cmp r0, #0 beq _022EE12C - bl ov29_02336F4C + bl UpdateTrapsVisibility _022EE12C: mov r0, sl mov r1, r5 @@ -1444,7 +1444,7 @@ _022EE148: mov r0, #1 mov r2, r7 bl SubstitutePlaceholderStringTags - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 ldrne r7, _022EE300 ; =0x00000E5B bne _022EE1A4 @@ -1459,7 +1459,7 @@ _022EE1A4: bl ov29_022E2CA0 cmp r0, #0 beq _022EE1C0 - bl ov29_02336F4C + bl UpdateTrapsVisibility _022EE1C0: mov r0, sl mov r1, r5 @@ -1475,13 +1475,13 @@ _022EE1D8: mov r0, #0 mov r1, #0x11c bl ov29_022E56A0 - bl ov29_02336F4C + bl UpdateTrapsVisibility ldrb r2, [r6] mov r0, sl mov r1, sb bl ov29_022E58B0 mov r0, r4 - bl ov29_022E1608 + bl GetTrapInfo mov r6, r0 mov r0, #0 ldrb r1, [r6] @@ -1512,14 +1512,14 @@ _022EE264: bne _022EE288 mov r0, r5 mov r1, #1 - bl ov29_0230D47C + bl UpdateShopkeeperModeAfterTrap b _022EE29C _022EE288: cmp r0, #1 bne _022EE29C mov r0, r5 mov r1, #0 - bl ov29_0230D47C + bl UpdateShopkeeperModeAfterTrap _022EE29C: str sb, [sp] ldrb r6, [r6] @@ -1530,7 +1530,7 @@ _022EE29C: str r6, [sp, #4] mov r4, #0 str r4, [sp, #8] - bl ov29_022EF154 + bl ApplyTrapEffect mov r4, r0 mov r0, r5 bl EntityIsValid__022EE348 @@ -1555,7 +1555,7 @@ _022EE308: .word 0x02353538 _022EE30C: .word 0x00000E5C _022EE310: .word 0x022C445C _022EE314: .word 0x00000E5D - arm_func_end ov29_022EDFA0 + arm_func_end TryTriggerTrap arm_func_start ItemIsActive__022EE318 ItemIsActive__022EE318: ; 0x022EE318 @@ -1563,7 +1563,7 @@ ItemIsActive__022EE318: ; 0x022EE318 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 285d9657..221b5640 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_022EE36C -ov29_022EE36C: ; 0x022EE36C + arm_func_start ApplyMudTrapEffect +ApplyMudTrapEffect: ; 0x022EE36C stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 movs r4, r1 @@ -60,10 +60,10 @@ _022EE424: .align 2, 0 _022EE42C: .word 0x02352AEC _022EE430: .word 0x02352AE8 - arm_func_end ov29_022EE36C + arm_func_end ApplyMudTrapEffect - arm_func_start ov29_022EE434 -ov29_022EE434: ; 0x022EE434 + arm_func_start ApplyStickyTrapEffect +ApplyStickyTrapEffect: ; 0x022EE434 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xcc mov sb, r1 @@ -200,10 +200,10 @@ _022EE61C: .word 0x00000E5F _022EE620: .word 0x02353538 _022EE624: .word 0x00000309 _022EE628: .word 0x00000E5E - arm_func_end ov29_022EE434 + arm_func_end ApplyStickyTrapEffect - arm_func_start ov29_022EE62C -ov29_022EE62C: ; 0x022EE62C + arm_func_start ApplyGrimyTrapEffect +ApplyGrimyTrapEffect: ; 0x022EE62C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xd8 movs sl, r1 @@ -281,7 +281,7 @@ _022EE6FC: mov r0, r8 mov r2, #2 add r5, r5, #1 - bl ov29_02344BD0 + bl GenerateStandardItem cmp r6, #0 beq _022EE7AC ldr r0, [sp, #4] @@ -340,10 +340,10 @@ _022EE810: .word 0x02353538 _022EE814: .word 0x00000E63 _022EE818: .word 0x00000E61 _022EE81C: .word 0x00000E62 - arm_func_end ov29_022EE62C + arm_func_end ApplyGrimyTrapEffect - arm_func_start ov29_022EE820 -ov29_022EE820: ; 0x022EE820 + arm_func_start ApplyPitfallTrapEffect +ApplyPitfallTrapEffect: ; 0x022EE820 stmdb sp!, {r4, r5, r6, r7, r8, lr} movs r7, r1 mov r8, r0 @@ -355,7 +355,7 @@ ov29_022EE820: ; 0x022EE820 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344148 + bl AreLateGameTrapsEnabled cmp r0, #0 bne _022EE868 ldr r1, _022EE984 ; =0x00000E64 @@ -367,7 +367,7 @@ _022EE868: ldr r5, [r7, #0xb4] bne _022EE8AC mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _022EE8AC mov r0, r6 @@ -398,7 +398,7 @@ _022EE8AC: ldrsh r1, [r1] mov r2, #0x11 mov r3, #0x254 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper ldr r0, _022EE980 ; =0x02353538 mov r1, #2 ldr r0, [r0] @@ -445,10 +445,10 @@ _022EE984: .word 0x00000E64 _022EE988: .word 0x022C44E4 _022EE98C: .word 0x00000E66 _022EE990: .word 0x00000E65 - arm_func_end ov29_022EE820 + arm_func_end ApplyPitfallTrapEffect - arm_func_start ov29_022EE994 -ov29_022EE994: ; 0x022EE994 + arm_func_start ApplySummonTrapEffect +ApplySummonTrapEffect: ; 0x022EE994 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r0, #3 @@ -459,7 +459,7 @@ ov29_022EE994: ; 0x022EE994 ldr r0, [r1] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344148 + bl AreLateGameTrapsEnabled cmp r0, #0 bne _022EE9D8 ldr r1, _022EEA24 ; =0x00000E68 @@ -491,10 +491,10 @@ _022EEA20: .word 0x02353538 _022EEA24: .word 0x00000E68 _022EEA28: .word 0x0000030F _022EEA2C: .word 0x00000E67 - arm_func_end ov29_022EE994 + arm_func_end ApplySummonTrapEffect - arm_func_start ov29_022EEA30 -ov29_022EEA30: ; 0x022EEA30 + arm_func_start ApplyPpZeroTrapEffect +ApplyPpZeroTrapEffect: ; 0x022EEA30 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 movs r4, r1 @@ -558,22 +558,22 @@ _022EEB08: .align 2, 0 _022EEB10: .word 0x00000E69 _022EEB14: .word 0x00000E6A - arm_func_end ov29_022EEA30 + arm_func_end ApplyPpZeroTrapEffect - arm_func_start ov29_022EEB18 -ov29_022EEB18: ; 0x022EEB18 + arm_func_start ApplyPokemonTrapEffect +ApplyPokemonTrapEffect: ; 0x022EEB18 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 mov sl, r0 mov r4, r1 mov r7, #0 - bl ov29_022E333C + bl GetVisibilityRange ldr r1, _022EED1C ; =0x02353538 mov r5, r0 ldr r0, [r1] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344148 + bl AreLateGameTrapsEnabled cmp r0, #0 bne _022EEB60 ldr r1, _022EED20 ; =0x00000E6B @@ -626,7 +626,7 @@ _022EEBE4: ldr r1, [r0] cmp r1, #3 bne _022EECD8 - bl ov29_022E1610 + bl GetItemInfo ldrb r0, [r0] tst r0, #2 bne _022EECD8 @@ -678,12 +678,12 @@ _022EEC70: beq _022EECCC add r0, sp, #0xe mov r1, #0 - bl ov29_023456BC + bl RemoveGroundItem add r7, r7, #1 _022EECCC: mov r0, r6 mov r1, sb - bl ov29_023391EC + bl DrawMinimapTile _022EECD8: add r6, r6, #1 _022EECDC: @@ -711,10 +711,10 @@ _022EED1C: .word 0x02353538 _022EED20: .word 0x00000E6B _022EED24: .word 0x00000E6C _022EED28: .word 0x00000E6D - arm_func_end ov29_022EEB18 + arm_func_end ApplyPokemonTrapEffect - arm_func_start ov29_022EED2C -ov29_022EED2C: ; 0x022EED2C + arm_func_start ApplyTripTrapEffect +ApplyTripTrapEffect: ; 0x022EED2C stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 movs r5, r1 @@ -733,7 +733,7 @@ ov29_022EED2C: ; 0x022EED2C mov r0, r5 mov r1, #0x2c ldr r4, [r5, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _022EEE38 ldrb r0, [r4, #0x62] @@ -756,7 +756,7 @@ ov29_022EED2C: ; 0x022EED2C _022EEDC4: mov r0, #0 strb r0, [r4, #0x62] - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldr r1, _022EEE40 ; =0x0000130F mov r0, r5 bl ov29_022E56A0 @@ -791,17 +791,17 @@ _022EEE40: .word 0x0000130F _022EEE44: .word 0x0235171C _022EEE48: .word 0x0235171E _022EEE4C: .word 0x02351844 - arm_func_end ov29_022EED2C + arm_func_end ApplyTripTrapEffect - arm_func_start ov29_022EEE50 -ov29_022EEE50: ; 0x022EEE50 + arm_func_start ApplyStealthRockTrapEffect +ApplyStealthRockTrapEffect: ; 0x022EEE50 stmdb sp!, {r3, r4, r5, lr} movs r4, r1 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r4 mov r1, #0xd ldr r5, [r4, #0xb4] - bl ov29_02301EAC + bl HasTypeAffectedByGravity cmp r0, #0 bne _022EEEBC ldrsh r2, [r5, #0x12] @@ -820,7 +820,7 @@ ov29_022EEE50: ; 0x022EEE50 mov r0, r4 mov r1, r1, asr #8 mov r2, #0x16 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper ldmia sp!, {r3, r4, r5, pc} _022EEEBC: mov r0, #0 @@ -836,10 +836,10 @@ _022EEEDC: .word 0x000003E7 _022EEEE0: .word 0x022C4770 _022EEEE4: .word 0x0000026D _022EEEE8: .word 0x00000E6E - arm_func_end ov29_022EEE50 + arm_func_end ApplyStealthRockTrapEffect - arm_func_start ov29_022EEEEC -ov29_022EEEEC: ; 0x022EEEEC + arm_func_start ApplyToxicSpikesTrapEffect +ApplyToxicSpikesTrapEffect: ; 0x022EEEEC stmdb sp!, {r3, r4, r5, lr} movs r4, r1 mov r5, r0 @@ -849,7 +849,7 @@ ov29_022EEEEC: ; 0x022EEEEC ldrsh r1, [r1] mov r2, #0x15 mov r3, #0x26c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper mov r0, r4 bl ov29_022FBD80 cmp r0, #0 @@ -862,10 +862,10 @@ ov29_022EEEEC: ; 0x022EEEEC ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022EEF3C: .word 0x022C45CC - arm_func_end ov29_022EEEEC + arm_func_end ApplyToxicSpikesTrapEffect - arm_func_start ov29_022EEF40 -ov29_022EEF40: ; 0x022EEF40 + arm_func_start ApplyRandomTrapEffect +ApplyRandomTrapEffect: ; 0x022EEF40 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x64 movs sb, r2 @@ -892,7 +892,7 @@ ov29_022EEF40: ; 0x022EEF40 mov r1, sl mov r2, sb str r4, [sp, #8] - bl ov29_022EF154 + bl ApplyTrapEffect b _022EF064 _022EEFB0: ldr r0, [sb, #0xb4] @@ -937,9 +937,9 @@ _022EF020: mov r2, r6 mov r1, sl stmib sp, {r4, fp} - bl ov29_022EF154 + bl ApplyTrapEffect mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething add sb, sb, #1 _022EF05C: cmp sb, r7 @@ -950,10 +950,10 @@ _022EF064: .align 2, 0 _022EF06C: .word 0x022C4B18 _022EF070: .word 0x02353538 - arm_func_end ov29_022EEF40 + arm_func_end ApplyRandomTrapEffect - arm_func_start ov29_022EF074 -ov29_022EF074: ; 0x022EF074 + arm_func_start ApplyGrudgeTrapEffect +ApplyGrudgeTrapEffect: ; 0x022EF074 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov sl, r0 mov r0, #3 @@ -995,7 +995,7 @@ _022EF0C4: mov r0, sb mov r1, sb mov r2, r6 - bl ov29_02314EB8 + bl TryInflictGrudgeStatus cmp r0, #0 movne r7, r5 _022EF11C: @@ -1014,10 +1014,10 @@ _022EF11C: _022EF148: .word 0x0000030F _022EF14C: .word 0x02353538 _022EF150: .word 0x00000E6F - arm_func_end ov29_022EF074 + arm_func_end ApplyGrudgeTrapEffect - arm_func_start ov29_022EF154 -ov29_022EF154: ; 0x022EF154 + arm_func_start ApplyTrapEffect +ApplyTrapEffect: ; 0x022EF154 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 ldrb ip, [sp, #0x24] @@ -1066,22 +1066,22 @@ _022EF180: ; jump table _022EF204: mov r0, r6 mov r1, r5 - bl ov29_022EE36C + bl ApplyMudTrapEffect b _022EF454 _022EF214: mov r0, r6 mov r1, r5 - bl ov29_022EE434 + bl ApplyStickyTrapEffect b _022EF454 _022EF224: mov r0, r6 mov r1, r5 - bl ov29_022EE62C + bl ApplyGrimyTrapEffect b _022EF454 _022EF234: mov r0, r6 mov r1, lr - bl ov29_022EE994 + bl ApplySummonTrapEffect mov r4, #1 b _022EF454 _022EF248: @@ -1089,7 +1089,7 @@ _022EF248: ldrb r3, [sp, #0x28] mov r0, r6 mov r1, r5 - bl ov29_022EE820 + bl ApplyPitfallTrapEffect b _022EF454 _022EF260: cmp r5, #0 @@ -1163,7 +1163,7 @@ _022EF348: add r2, r5, #4 mov r3, #1 stmia sp, {r4, ip} - bl ov29_02320448 + bl TryExplosion b _022EF454 _022EF368: ldr ip, _022EF464 ; =0x00000251 @@ -1172,12 +1172,12 @@ _022EF368: add r2, r5, #4 mov r3, #2 stmia sp, {r4, ip} - bl ov29_02320448 + bl TryExplosion b _022EF454 _022EF388: mov r0, r6 mov r1, r5 - bl ov29_022EEA30 + bl ApplyPpZeroTrapEffect b _022EF454 _022EF398: cmp r5, #0 @@ -1187,18 +1187,18 @@ _022EF398: ldrsh r1, [r0] mov r0, r5 mov r2, #0xf - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _022EF454 _022EF3BC: mov r0, r6 mov r1, r5 mov r2, r4 - bl ov29_02319624 + bl TryResetStatChanges b _022EF454 _022EF3D0: mov r0, r6 mov r1, lr - bl ov29_022EEB18 + bl ApplyPokemonTrapEffect mov r4, #1 b _022EF454 _022EF3E4: @@ -1209,31 +1209,31 @@ _022EF3E4: ldrsh r1, [r0] mov r0, r5 mov r2, #0xa - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _022EF454 _022EF408: mov r0, r6 mov r1, r5 - bl ov29_022EEE50 + bl ApplyStealthRockTrapEffect b _022EF454 _022EF418: mov r0, r6 mov r1, r5 - bl ov29_022EEEEC + bl ApplyToxicSpikesTrapEffect b _022EF454 _022EF428: mov r0, r6 mov r1, r5 - bl ov29_022EED2C + bl ApplyTripTrapEffect b _022EF454 _022EF438: str lr, [sp] - bl ov29_022EEF40 + bl ApplyRandomTrapEffect b _022EF454 _022EF444: mov r0, r6 mov r1, lr - bl ov29_022EF074 + bl ApplyGrudgeTrapEffect mov r4, #1 _022EF454: mov r0, r4 @@ -1246,7 +1246,7 @@ _022EF468: .word 0x022C45C8 _022EF46C: .word 0x00000252 _022EF470: .word 0x022C4418 _022EF474: .word 0x00000245 - arm_func_end ov29_022EF154 + arm_func_end ApplyTrapEffect arm_func_start ov29_022EF478 ov29_022EF478: ; 0x022EF478 @@ -1261,10 +1261,10 @@ ov29_022EF478: ; 0x022EF478 cmp r0, #2 bne _022EF4AC mov r0, r4 - bl ov29_022E1608 + bl GetTrapInfo strb r5, [r0] _022EF4AC: - bl ov29_02336F4C + bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022EF478 @@ -1353,12 +1353,12 @@ _022EF5D0: .word 0x0000017B _022EF5D4: .word 0x0235171C arm_func_end ov29_022EF4B4 - arm_func_start ov29_022EF5D8 -ov29_022EF5D8: ; 0x022EF5D8 + arm_func_start RevealTrapsNearby +RevealTrapsNearby: ; 0x022EF5D8 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r0 mov r5, #0 - bl ov29_022E333C + bl GetVisibilityRange ldrb r7, [r8, #0x25] mov r6, r0 cmp r7, #0xff @@ -1430,8 +1430,8 @@ _022EF6C4: ldr r1, _022EF6F8 ; =0x00000E02 mov r0, r8 bl LogMessageByIdWithPopupCheckUser - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility ldmia sp!, {r4, r5, r6, r7, r8, pc} _022EF6E4: ldr r1, _022EF6FC ; =0x00000E03 @@ -1442,7 +1442,7 @@ _022EF6E4: _022EF6F4: .word 0x02353538 _022EF6F8: .word 0x00000E02 _022EF6FC: .word 0x00000E03 - arm_func_end ov29_022EF5D8 + arm_func_end RevealTrapsNearby arm_func_start ov29_022EF700 ov29_022EF700: ; 0x022EF700 @@ -1466,7 +1466,7 @@ _022EF730: arm_func_start ov29_022EF738 ov29_022EF738: ; 0x022EF738 stmdb sp!, {r3, lr} - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 beq _022EF780 ldr r0, _022EF798 ; =0x02353538 diff --git a/asm/overlay_29_022EF7C4.s b/asm/overlay_29_022EF7C4.s index c4a8d8e8..87a305a8 100644 --- a/asm/overlay_29_022EF7C4.s +++ b/asm/overlay_29_022EF7C4.s @@ -62,7 +62,7 @@ _022EF874: cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldr r0, _022EF8A0 ; =0x000003E7 - bl ov29_022EAE14 + bl ChangeDungeonMusic ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022EF89C: .word 0x02353538 @@ -97,10 +97,10 @@ _022EF8BC: beq _022EF918 mov r0, sb mov r3, r7 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, sb mov r1, r6 - bl ov29_022E1A40 + bl UpdateEntityPixelPos _022EF918: add r0, r8, #1 mov r0, r0, lsl #0x10 @@ -180,8 +180,8 @@ ov29_022EF9C8: ; 0x022EF9C8 _022EF9E8: .word 0x02353538 arm_func_end ov29_022EF9C8 - arm_func_start ov29_022EF9EC -ov29_022EF9EC: ; 0x022EF9EC + arm_func_start ShouldRunMonsterAi +ShouldRunMonsterAi: ; 0x022EF9EC ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xbc] cmp r0, #0x14 @@ -218,16 +218,16 @@ _022EFA5C: _022EFA64: mov r0, #0 bx lr - arm_func_end ov29_022EF9EC + arm_func_end ShouldRunMonsterAi - arm_func_start ov29_022EFA6C -ov29_022EFA6C: ; 0x022EFA6C + arm_func_start DebugRecruitingEnabled +DebugRecruitingEnabled: ; 0x022EFA6C mov r0, #1 bx lr - arm_func_end ov29_022EFA6C + arm_func_end DebugRecruitingEnabled - arm_func_start ov29_022EFA74 -ov29_022EFA74: ; 0x022EFA74 + arm_func_start TryActivateIqBooster +TryActivateIqBooster: ; 0x022EFA74 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x10 ldr r1, _022EFAE0 ; =0x02353538 @@ -238,7 +238,7 @@ ov29_022EFA74: ; 0x022EFA74 ble _022EFAD8 add r0, sp, #0 mov r1, #0x44 - bl ov29_0230F798 + bl TeamMemberHasItemActive mov r7, r0 cmp r7, #0 ble _022EFAD8 @@ -250,7 +250,7 @@ _022EFABC: ldr r0, [r5, r8, lsl #2] mov r1, r6 mov r2, r4 - bl ov29_022FA144 + bl BoostIQ add r8, r8, #1 _022EFAD0: cmp r8, r7 @@ -261,7 +261,7 @@ _022EFAD8: .align 2, 0 _022EFAE0: .word 0x02353538 _022EFAE4: .word 0x000286D0 - arm_func_end ov29_022EFA74 + arm_func_end TryActivateIqBooster arm_func_start ov29_022EFAE8 ov29_022EFAE8: ; 0x022EFAE8 @@ -274,8 +274,8 @@ ov29_022EFAE8: ; 0x022EFAE8 bx lr arm_func_end ov29_022EFAE8 - arm_func_start ov29_022EFB04 -ov29_022EFB04: ; 0x022EFB04 + arm_func_start IsSecretBazaarNpcBehavior +IsSecretBazaarNpcBehavior: ; 0x022EFB04 add r0, r0, #0xf0 and r0, r0, #0xff cmp r0, #4 @@ -283,7 +283,7 @@ ov29_022EFB04: ; 0x022EFB04 movhi r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_022EFB04 + arm_func_end IsSecretBazaarNpcBehavior arm_func_start ov29_022EFB20 ov29_022EFB20: ; 0x022EFB20 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index 46e2cac3..8c3e98ae 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -129,7 +129,7 @@ _022F0700: stmia sp, {r2, r4} bl ov29_02322DDC mov r0, r4 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r3, #0 add r0, sp, #0x10 add r2, sp, #8 @@ -144,7 +144,7 @@ _022F0700: bl GetLeader mov r1, r4 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 @@ -321,7 +321,7 @@ ov29_022F0984: ; 0x022F0984 ldrsh r1, [r4, #2] add r0, sp, #0xc mov r5, r3 - bl ov29_0234BAC0 + bl InitPortraitDungeon ldrb r0, [r4, #6] cmp r0, #0 bne _022F09E0 @@ -466,24 +466,24 @@ _022F0B84: .word 0x023526B8 _022F0B88: .word 0x00000225 arm_func_end ov29_022F0B10 - arm_func_start ov29_022F0B8C -ov29_022F0B8C: ; 0x022F0B8C + arm_func_start GetLeaderAction +GetLeaderAction: ; 0x022F0B8C stmdb sp!, {r3, lr} - bl ov29_022E9618 + bl GetLeaderMonster add r0, r0, #0x4a ldmia sp!, {r3, pc} - arm_func_end ov29_022F0B8C + arm_func_end GetLeaderAction arm_func_start ov29_022F0B9C ov29_022F0B9C: ; 0x022F0B9C stmdb sp!, {r3, lr} - bl ov29_022E9618 + bl GetLeaderMonster ldrh r0, [r0, #0x4a] ldmia sp!, {r3, pc} arm_func_end ov29_022F0B9C - arm_func_start ov29_022F0BAC -ov29_022F0BAC: ; 0x022F0BAC + arm_func_start GetEntityTouchscreenArea +GetEntityTouchscreenArea: ; 0x022F0BAC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r3, r0 @@ -512,7 +512,7 @@ ov29_022F0BAC: ; 0x022F0BAC str r0, [r6, #4] add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_022F0BAC + arm_func_end GetEntityTouchscreenArea arm_func_start ov29_022F0C1C ov29_022F0C1C: ; 0x022F0C1C @@ -609,7 +609,7 @@ _022F0D44: mov r0, #0 mov r1, r0 bl ov29_02339190 - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #4 mov r1, #0x2f bl ov29_022EA370 @@ -668,7 +668,7 @@ _022F0E18: moveq r0, #1 movne r0, #0 strb r0, [r5] - bl ov29_02339CE8 + bl UpdateMinimap b _022F0D78 _022F0E30: cmp sl, #0 @@ -701,7 +701,7 @@ _022F0E64: ldr r0, _022F0ECC ; =0x0237CFBB mov r1, #1 strb r1, [r0] - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #0 bl ov29_022E0DF0 mov r0, #0x2f @@ -719,8 +719,8 @@ _022F0ED4: .word 0x0237C694 _022F0ED8: .word 0x00003F03 arm_func_end ov29_022F0C98 - arm_func_start ov29_022F0EDC -ov29_022F0EDC: ; 0x022F0EDC + arm_func_start SetLeaderAction +SetLeaderAction: ; 0x022F0EDC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xdc ldr r1, _022F1DDC ; =0x02353538 @@ -741,7 +741,7 @@ ov29_022F0EDC: ; 0x022F0EDC bl GetLeader mov r1, #1 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster bl GetLeader bl ov29_022FB538 bl GetLeader @@ -792,7 +792,7 @@ _022F0FAC: bl ov29_0234E8F8 bl ov29_022E0B44 bl sub_02006B70 - bl ov29_022E9618 + bl GetLeaderMonster ldrh r0, [r0, #0x4a] cmp r0, #0 bne _022F2B34 @@ -815,7 +815,7 @@ _022F1024: ldrb r0, [r0, #0x78b] cmp r0, #0 beq _022F1064 - bl ov29_022F308C + bl ShouldLeaderKeepRunning cmp r0, #0 movne r0, #2 strneh r0, [sb, #0x4a] @@ -845,7 +845,7 @@ _022F1064: _022F10AC: mov r0, #0 str r0, [sp, #0x6c] - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r0, _022F1DE4 ; =0x0237C9A4 mov r1, #0 strb r1, [r0] @@ -1040,7 +1040,7 @@ _022F1364: cmp r0, #0 beq _022F13B0 mov r0, #1 - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r0, _022F1DDC ; =0x02353538 mov r1, #1 ldr r0, [r0] @@ -1156,7 +1156,7 @@ _022F1470: bne _022F15C0 _022F1548: add r0, sp, #0xa6 - bl ov29_02337B68 + bl PositionHasMonster cmp r0, #0 beq _022F16F4 ldr r1, [sp, #0x60] @@ -1196,7 +1196,7 @@ _022F15C0: cmpeq r1, r0 bne _022F16F4 add r0, sp, #0xa6 - bl ov29_02337B68 + bl PositionHasMonster str r0, [sp, #0x74] cmp r0, #0 beq _022F16A4 @@ -1410,13 +1410,13 @@ _022F18B4: ldrsh r1, [sp, #0xb2] ldrsh r0, [r6, #4] sub r0, r1, r0 - bl Abs + bl abs mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 ldrsh r1, [sp, #0xb4] ldrsh r0, [r6, #6] sub r0, r1, r0 - bl Abs + bl abs mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r0, [sp, #0x78] @@ -1449,13 +1449,13 @@ _022F198C: ldrsh r1, [sp, #0xb2] ldrsh r0, [r6, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _022F19DC ldrsh r1, [sp, #0xb4] ldrsh r0, [r6, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _022F19DC ldr r0, [sp, #0x78] @@ -1495,7 +1495,7 @@ _022F19DC: cmp r0, #0 beq _022F1CE0 mov r0, #1 - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r0, _022F1DDC ; =0x02353538 mov r1, #1 ldr r0, [r0] @@ -1511,7 +1511,7 @@ _022F1A64: mov r0, r6 bl LogMessageByIdWithPopupCheckUser mov r0, #1 - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r0, _022F1DDC ; =0x02353538 mov r1, #1 ldr r0, [r0] @@ -1633,12 +1633,12 @@ _022F1C04: beq _022F2970 _022F1C28: mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r4, lsl #0x10 mov r1, r0 add r0, sb, #0x4a mov r2, r2, asr #0x10 - bl ov29_022EBC98 + bl SetActionUseMovePlayer b _022F2970 _022F1C48: ldr r0, [sp, #0x34] @@ -1701,7 +1701,7 @@ _022F1D10: beq _022F1D84 mov r0, r6 add r1, sp, #0xcc - bl ov29_022F0BAC + bl GetEntityTouchscreenArea ldr r0, [sp, #0xd4] ldr r1, [sp, #0xcc] ldr r2, [sp, #0xd8] @@ -1714,7 +1714,7 @@ _022F1D10: mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 mov r3, r3, asr #0x10 - bl ov29_022E0CB8 + bl CheckTouchscreenArea cmp r0, #0 beq _022F1D84 mov r0, #0 @@ -1771,7 +1771,7 @@ _022F1E04: ldrb r0, [r5, #0x35] cmp r0, #0 beq _022F1E3C - bl ov29_0233779C + bl HideTileGrid ldr r0, _022F1DE4 ; =0x0237C9A4 mov r1, #0 strb r1, [r0, #2] @@ -1837,7 +1837,7 @@ _022F1EF8: bne _022F1F68 mov r0, r6 add r1, sp, #0xbc - bl ov29_022F0BAC + bl GetEntityTouchscreenArea ldr r0, _022F1DEC ; =0x0237C6A4 ldrh r0, [r0] tst r0, #0x100 @@ -1854,7 +1854,7 @@ _022F1EF8: mov r1, r1, asr #0x10 mov r2, r2, asr #0x10 mov r3, r3, asr #0x10 - bl ov29_022E0CB8 + bl CheckTouchscreenArea cmp r0, #0 movne r8, #1 _022F1F68: @@ -1903,7 +1903,7 @@ _022F1FC0: ldr r0, [r1, #0xb4] str r0, [sp, #0xc] mov r0, r6 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _022F203C cmp fp, #0 @@ -1970,11 +1970,11 @@ _022F20EC: cmp r0, #0 beq _022F2118 mov r0, r6 - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 beq _022F2118 mov r0, r6 - bl ov29_02318700 + bl LogItemBlockedByEmbargo mov r0, #0 str r0, [sp, #0x44] _022F2118: @@ -1996,7 +1996,7 @@ _022F2150: cmp r8, #0 beq _022F2970 mov r0, #0xb - bl ov29_022EB3C8 + bl SetLeaderActionFields add r0, fp, #1 strb r0, [sb, #0x4e] mov r0, #0 @@ -2187,7 +2187,7 @@ _022F23C4: ldrb r0, [r5, #0x35] cmp r0, #0 beq _022F243C - bl ov29_0233779C + bl HideTileGrid ldr r0, _022F1DE4 ; =0x0237C9A4 mov r1, #0 strb r1, [r0, #2] @@ -2337,7 +2337,7 @@ _022F25D8: bne _022F2748 ldrb r1, [fp, #0x4c] mov r0, r6 - bl ov29_0230105C + bl CanMonsterMoveInDirection cmp r0, #0 moveq r0, #0 beq _022F2748 @@ -2351,7 +2351,7 @@ _022F25D8: mov r2, #1 mov r3, r0 str r0, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #2 moveq r0, #0 beq _022F2748 @@ -2454,7 +2454,7 @@ _022F2804: bl LogMessageByIdWithPopupCheckUser _022F282C: mov r0, #1 - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r1, _022F1DDC ; =0x02353538 mov r3, #1 ldr r0, [r1] @@ -2469,7 +2469,7 @@ _022F282C: b _022F2970 _022F2864: mov r0, #2 - bl ov29_022EB3C8 + bl SetLeaderActionFields ldr r0, [sp, #0x40] cmp r0, #0 beq _022F289C @@ -2545,7 +2545,7 @@ _022F2970: ldrb r0, [r5, #0x35] cmp r0, #0 beq _022F2980 - bl ov29_0233779C + bl HideTileGrid _022F2980: ldrh r0, [sb, #0x4a] cmp r0, #0x2d @@ -2557,7 +2557,7 @@ _022F2980: cmp r0, #0 bne _022F2B34 mov r0, #0 - bl ov29_022EB3C8 + bl SetLeaderActionFields b _022F1024 _022F29B0: ldrb r0, [sp, #0xb6] @@ -2607,7 +2607,7 @@ _022F2A00: moveq r0, #1 movne r0, #0 and r0, r0, #0xff - bl ov29_0234DDF4 + bl OpenMenu bl sub_02006B70 b _022F2A9C _022F2A70: @@ -2620,7 +2620,7 @@ _022F2A70: moveq r0, #1 movne r0, #0 and r0, r0, #0xff - bl ov29_0234DDF4 + bl OpenMenu bl sub_02006B70 _022F2A9C: bl ov29_022E0B44 @@ -2628,7 +2628,7 @@ _022F2A9C: mov r1, #0 strb r1, [r0, #2] strb r1, [r5, #0x35] - bl ov29_0233779C + bl HideTileGrid bl IsFloorOver cmp r0, #0 bne _022F2B34 @@ -2666,7 +2666,7 @@ _022F2B18: _022F2B34: add sp, sp, #0xdc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end ov29_022F0EDC + arm_func_end SetLeaderAction arm_func_start ov29_022F2B3C ov29_022F2B3C: ; 0x022F2B3C @@ -2965,7 +2965,7 @@ _022F2F7C: ldrb r1, [r5, #0x36] add r0, r0, #4 mov r2, #0 - bl ov29_02337428 + bl DrawTileGrid _022F2FB4: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -3031,8 +3031,8 @@ _022F3084: .word 0x02353538 _022F3088: .word 0x0237C694 arm_func_end ov29_022F2FE4 - arm_func_start ov29_022F308C -ov29_022F308C: ; 0x022F308C + arm_func_start ShouldLeaderKeepRunning +ShouldLeaderKeepRunning: ; 0x022F308C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x68 ldr r0, _022F35D4 ; =0x02353538 @@ -3395,7 +3395,7 @@ _022F35CC: _022F35D4: .word 0x02353538 _022F35D8: .word 0x0235171C _022F35DC: .word 0x0235171E - arm_func_end ov29_022F308C + arm_func_end ShouldLeaderKeepRunning arm_func_start ov29_022F35E0 ov29_022F35E0: ; 0x022F35E0 @@ -3422,8 +3422,8 @@ ov29_022F35E0: ; 0x022F35E0 bx lr arm_func_end ov29_022F35E0 - arm_func_start ov29_022F3634 -ov29_022F3634: ; 0x022F3634 + arm_func_start CheckLeaderTile +CheckLeaderTile: ; 0x022F3634 stmdb sp!, {r4, r5, r6, r7, r8, lr} bl GetLeader movs r4, r0 @@ -3473,7 +3473,7 @@ _022F36CC: ; jump table ldmia sp!, {r4, r5, r6, r7, r8, pc} ; case 6 _022F36E8: mov r0, r5 - bl ov29_022E1608 + bl GetTrapInfo mov r6, r0 mov r7, #0 mov r0, r4 @@ -3487,7 +3487,7 @@ _022F36E8: bne _022F372C mov r0, #1 strb r0, [r5, #0x20] - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r8, #1 _022F372C: ldrb r0, [r6, #1] @@ -3508,17 +3508,17 @@ _022F3750: add r1, r4, #4 mov r2, #0 mov r3, #1 - bl ov29_022EDFA0 + bl TryTriggerTrap ldmia sp!, {r4, r5, r6, r7, r8, pc} _022F3778: mov r0, r5 - bl ov29_022E1610 + bl GetItemInfo ldrb r0, [r0] tst r0, #2 bne _022F37A0 add r0, r4, #4 mov r1, #1 - bl ov29_02345058 + bl TryLeaderItemPickUp bl ov29_022FB920 ldmia sp!, {r4, r5, r6, r7, r8, pc} _022F37A0: @@ -3532,11 +3532,11 @@ _022F37A0: ldmia sp!, {r4, r5, r6, r7, r8, pc} _022F37C0: mov r0, #1 - bl ov29_02338794 + bl HiddenStairsTrigger ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _022F37CC: .word 0x02353538 - arm_func_end ov29_022F3634 + arm_func_end CheckLeaderTile arm_func_start ov29_022F37D0 ov29_022F37D0: ; 0x022F37D0 @@ -3598,7 +3598,7 @@ ov29_022F3890: ; 0x022F3890 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r5, r1 mov r6, r0 - bl ov29_022E9618 + bl GetLeaderMonster mov r4, r0 cmp r5, #0 beq _022F38D0 @@ -3642,8 +3642,8 @@ _022F3928: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end ov29_022F3890 - arm_func_start ov29_022F3934 -ov29_022F3934: ; 0x022F3934 + arm_func_start ChangeLeader +ChangeLeader: ; 0x022F3934 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r0, _022F3AE4 ; =0x02353538 ldr r0, [r0] @@ -3661,7 +3661,7 @@ ov29_022F3934: ; 0x022F3934 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022F3970: mov r0, #2 - bl ov29_02346BD8 + bl CheckTeamItemsFlags cmp r0, #0 bne _022F398C bl ov29_022F670C @@ -3736,7 +3736,7 @@ _022F3A6C: bne _022F3A6C mov r0, r6 mov r1, #1 - bl ov29_022E2E54 + bl PointCameraToMonster bl ov29_022E8104 bl ov29_022E81F8 mov r0, fp @@ -3767,7 +3767,7 @@ _022F3AEC: .word 0x00000BA5 _022F3AF0: .word 0x00000BA6 _022F3AF4: .word 0x0235355C _022F3AF8: .word 0x00000BA7 - arm_func_end ov29_022F3934 + arm_func_end ChangeLeader arm_func_start ov29_022F3AFC ov29_022F3AFC: ; 0x022F3AFC @@ -4061,27 +4061,27 @@ _022F3EE0: ldrsh r0, [r7, r0] mov r1, #0x18 add r0, r2, r0 - bl DivideInt + bl __divsi3 ldr r1, _022F40B4 ; =0x0001A226 ldr r3, [sp, #4] ldrsh r2, [r7, r1] mov r7, r0 mov r1, #0x18 add r0, r3, r2 - bl DivideInt + bl __divsi3 mov r8, r0 strh r7, [sb] strh r8, [sb, #2] ldrsh r1, [sb] ldrsh r0, [r5, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #2 ble _022F3F58 ldrsh r1, [sb, #2] ldrsh r0, [r5, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #2 bgt _022F3F5C _022F3F58: @@ -4214,12 +4214,12 @@ ov29_022F40B8: ; 0x022F40B8 ldrsh r1, [sl, #4] ldrsh r0, [sb] sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [sl, #6] ldrsh r1, [sb, #2] mov r6, r0 sub r0, r2, r1 - bl Abs + bl abs mov r7, r0 cmp r6, r7 movgt r1, #1 @@ -4256,7 +4256,7 @@ _022F4198: ldrsh r0, [sb] add r1, r2, r1 sub r0, r1, r0 - bl Abs + bl abs ldr r1, _022F4268 ; =0x0235171C ldrsh r3, [sl, #6] add r1, r1, r8, lsl #2 @@ -4265,7 +4265,7 @@ _022F4198: ldrsh r1, [sb, #2] add r0, r3, r2 sub r0, r0, r1 - bl Abs + bl abs cmp fp, r6 cmple r0, r7 bgt _022F4208 @@ -4384,13 +4384,13 @@ _022F434C: .word 0x02353538 ov29_022F4350: ; 0x022F4350 ldr r2, [r0, #0xb4] mov r3, #1 - ldr ip, _022F436C ; =ov29_02345058 + ldr ip, _022F436C ; =TryLeaderItemPickUp add r0, r0, #4 mov r1, #0 strb r3, [r2, #0x4e] bx ip .align 2, 0 -_022F436C: .word ov29_02345058 +_022F436C: .word TryLeaderItemPickUp arm_func_end ov29_022F4350 arm_func_start ov29_022F4370 @@ -4400,7 +4400,7 @@ ov29_022F4370: ; 0x022F4370 mov r1, #0 mov r2, #0xfe mov r6, r0 - bl ov29_022EB54C + bl GetItemToUse mov sb, #0 mov lr, #1 mov r4, r0 @@ -4578,7 +4578,7 @@ ov29_022F45CC: ; 0x022F45CC mov r1, #0 mov r2, #2 ldr sb, [r4, #0xb4] - bl ov29_022EB54C + bl GetItemToUse ldrb r1, [r8, #0x4e] mov r5, r0 mov r0, r5 @@ -4655,7 +4655,7 @@ _022F46C0: beq _022F472C add r0, sl, #4 mov r2, #1 - bl ov29_02345538 + bl SpawnItem b _022F4734 _022F472C: mov r0, r1 @@ -4678,7 +4678,7 @@ _022F4734: b _022F4778 _022F4770: mov r0, sb - bl ov29_02346F14 + bl AddHeldItemToBag _022F4778: add r1, sp, #6 mov r0, #0 @@ -4728,7 +4728,7 @@ _022F47CC: b _022F4834 _022F482C: mov r0, sb - bl ov29_02346F14 + bl AddHeldItemToBag _022F4834: add r1, sp, #0 mov r0, #0 @@ -4763,7 +4763,7 @@ _022F4878: mov r0, sl add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse _022F48B8: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} @@ -4838,7 +4838,7 @@ _022F4928: mov r0, r6 add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse _022F49C8: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} @@ -4861,7 +4861,7 @@ ov29_022F49E0: ; 0x022F49E0 ldr r2, _022F4BC8 ; =0x00001565 mov r0, r7 mov r1, #1 - bl ov29_022EB54C + bl GetItemToUse ldrb r1, [r5, #0x62] mov r6, r0 tst r1, #8 @@ -4934,7 +4934,7 @@ _022F4AF0: strneb r0, [r5, #0x63] bne _022F4B24 mov r0, r5 - bl ov29_02346F14 + bl AddHeldItemToBag _022F4B24: ldrh r2, [sp] ldrh r0, [sp, #2] @@ -4954,9 +4954,9 @@ _022F4B24: add r0, r0, #0x3f4 add r0, r0, #0x400 add r0, r0, r1, lsl #6 - bl ov29_02346F14 + bl AddHeldItemToBag _022F4B70: - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldr r0, _022F4BD4 ; =0x00001317 bl ov29_022EACCC ldr r1, _022F4BD8 ; =0x00000BB6 @@ -4975,7 +4975,7 @@ _022F4B70: mov r0, r7 add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse _022F4BC0: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -5005,7 +5005,7 @@ ov29_022F4BF8: ; 0x022F4BF8 mov r1, #0 mov r2, #4 ldr r6, [r5, #0xb4] - bl ov29_022EB54C + bl GetItemToUse mov r4, r0 mov r1, r4 mov r0, #0 @@ -5083,7 +5083,7 @@ _022F4D08: mov r1, r4 add r0, r5, #4 mov r2, #1 - bl ov29_02345538 + bl SpawnItem cmp r0, #0 bne _022F4D48 ldr r1, _022F4D9C ; =0x00000BB8 @@ -5093,7 +5093,7 @@ _022F4D08: _022F4D48: mov r0, r4 bl ItemZInit - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldr r0, _022F4DA0 ; =0x00001317 bl ov29_022EACCC mov r0, #0 @@ -5108,7 +5108,7 @@ _022F4D48: ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022F4D94: .word 0x00000BB7 @@ -5127,12 +5127,12 @@ ov29_022F4DAC: ; 0x022F4DAC ldr r6, [r8, #0xb4] mov r1, #0 mov r2, #5 - bl ov29_022EB54C + bl GetItemToUse mov r4, r0 mov r0, r8 mov r1, #1 mov r2, #6 - bl ov29_022EB54C + bl GetItemToUse ldrb r1, [r6, #0x4e] mov r7, r0 cmp r1, #0x80 @@ -5217,7 +5217,7 @@ _022F4EB4: strb ip, [sp, #7] strb r3, [sp] strb r2, [sp, #6] - bl ov29_023456BC + bl RemoveGroundItem mov r0, r7 bl RemoveEquivItemNoHole ldrb r0, [r7, #1] @@ -5229,13 +5229,13 @@ _022F4F3C: add r1, sp, #6 add r0, r6, #0x50 mov r2, #1 - bl ov29_02345538 + bl SpawnItem cmp r0, #0 bne _022F4F68 ldr r1, _022F504C ; =0x00000BBC mov r0, r8 bl LogMessageByIdWithPopupCheckUser - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper b _022F5034 _022F4F68: strb r4, [sp, #1] @@ -5270,7 +5270,7 @@ _022F4FD0: mov r1, r4 bl AddItemToBag _022F4FDC: - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper add r1, sp, #6 mov r0, #0 bl ov29_02344B44 @@ -5287,7 +5287,7 @@ _022F4FDC: ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse add r0, sp, #0 mov r1, r5 bl ov29_02348ECC @@ -5319,7 +5319,7 @@ ov29_022F505C: ; 0x022F505C mov r0, r7 mov r1, #0 mov r2, #7 - bl ov29_022EB54C + bl GetItemToUse mov r6, r0 mov r1, r6 mov r0, #0 @@ -5367,7 +5367,7 @@ _022F5118: bl LogMessageByIdWithPopupCheckUser b _022F526C _022F513C: - bl ov29_022E1610 + bl GetItemInfo mov r4, r0 mov r1, r4 mov r0, #1 @@ -5392,7 +5392,7 @@ _022F513C: strh r4, [sp, #0xa] strb r3, [sp] strb r2, [sp, #6] - bl ov29_023456BC + bl RemoveGroundItem mov r0, r6 bl RemoveEquivItemNoHole ldrb r0, [r6, #1] @@ -5404,13 +5404,13 @@ _022F51C0: add r1, sp, #0 add r0, r7, #4 mov r2, #1 - bl ov29_02345538 + bl SpawnItem cmp r0, #0 bne _022F51EC ldr r1, _022F527C ; =0x00000BBC mov r0, r7 bl LogMessageByIdWithPopupCheckUser - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper b _022F526C _022F51EC: add r0, sp, #6 @@ -5431,7 +5431,7 @@ _022F51EC: _022F5228: bl AddItemToBagNoHeld _022F522C: - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldr r0, _022F5280 ; =0x00001317 bl ov29_022EACCC ldr r1, _022F5284 ; =0x00000BBD @@ -5442,7 +5442,7 @@ _022F522C: ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse add r0, sp, #6 mov r1, r4 bl ov29_02348ECC diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index 207b286b..2e58ec94 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -13,42 +13,42 @@ _022F52B8: .word ov29_02343D30 arm_func_start ov29_022F52BC ov29_022F52BC: ; 0x022F52BC - ldr ip, _022F52C8 ; =ov29_022F52F8 + ldr ip, _022F52C8 ; =UseSingleUseItem mov r1, r0 bx ip .align 2, 0 -_022F52C8: .word ov29_022F52F8 +_022F52C8: .word UseSingleUseItem arm_func_end ov29_022F52BC - arm_func_start ov29_022F52CC -ov29_022F52CC: ; 0x022F52CC + arm_func_start UseSingleUseItemWrapper +UseSingleUseItemWrapper: ; 0x022F52CC ldr r2, [r0, #0xb4] ldr r1, _022F52F0 ; =0x02353538 ldrb r2, [r2, #0x54] ldr r1, [r1] - ldr ip, _022F52F4 ; =ov29_022F52F8 + ldr ip, _022F52F4 ; =UseSingleUseItem add r1, r1, r2, lsl #2 add r1, r1, #0x12000 ldr r1, [r1, #0xb28] bx ip .align 2, 0 _022F52F0: .word 0x02353538 -_022F52F4: .word ov29_022F52F8 - arm_func_end ov29_022F52CC +_022F52F4: .word UseSingleUseItem + arm_func_end UseSingleUseItemWrapper - arm_func_start ov29_022F52F8 -ov29_022F52F8: ; 0x022F52F8 + arm_func_start UseSingleUseItem +UseSingleUseItem: ; 0x022F52F8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x10 mov r8, r1 mov sb, r0 mov r0, r8 ldr r5, [r8, #0xb4] - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 beq _022F5334 mov r0, r8 - bl ov29_02318700 + bl LogItemBlockedByEmbargo mov r0, #0x14 mov r1, #9 bl ov29_022EA370 @@ -59,7 +59,7 @@ _022F5334: mov r0, sb mov r1, #0 mov r2, #8 - bl ov29_022EB54C + bl GetItemToUse mov r4, r0 mov r1, r4 mov r0, #0 @@ -72,7 +72,7 @@ _022F5334: bl ov29_0230040C mov r0, r8 mov r1, r4 - bl ov29_0231D4A4 + bl CanMonsterUseItem cmp r0, #0 beq _022F54B0 mov r0, r4 @@ -89,7 +89,7 @@ _022F5334: strh r3, [sp, #0xa] ldrh r3, [r4, #4] strh r3, [sp, #0xc] - bl ov29_022EB60C + bl RemoveUsedItem mov r0, #0x1e mov r1, #0x11 bl ov29_022EA370 @@ -151,16 +151,16 @@ _022F5498: ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse _022F54B0: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _022F54B8: .word 0x02353538 - arm_func_end ov29_022F52F8 + arm_func_end UseSingleUseItem - arm_func_start ov29_022F54BC -ov29_022F54BC: ; 0x022F54BC + arm_func_start UseThrowableItem +UseThrowableItem: ; 0x022F54BC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x14 mov sb, r0 @@ -169,14 +169,14 @@ ov29_022F54BC: ; 0x022F54BC mov r0, sb mov r1, #0 mov r2, #9 - bl ov29_022EB54C + bl GetItemToUse mov r4, r0 mov r0, sb - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 beq _022F550C mov r0, sb - bl ov29_02318700 + bl LogItemBlockedByEmbargo mov r0, #0x14 mov r1, #9 bl ov29_022EA370 @@ -261,7 +261,7 @@ _022F55E8: add r0, r8, #0x50 mov r1, #1 mov r4, #0 - bl ov29_023456BC + bl RemoveGroundItem _022F563C: ldrsh r0, [sp, #0x10] mov r5, #1 @@ -291,7 +291,7 @@ _022F566C: _022F5698: mov r0, r4 bl ItemZInit - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper b _022F56F4 _022F56A8: cmp r0, #0x80 @@ -302,7 +302,7 @@ _022F56A8: sub r3, r2, #1 mov r2, #1 strh r3, [sp, #0xe] - bl ov29_02345538 + bl SpawnItem b _022F56F4 _022F56D0: mov r0, r4 @@ -326,7 +326,7 @@ _022F56F4: strb r0, [r8, #0x4c] _022F5714: mov r0, sb - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _022F577C ldr r1, _022F5988 ; =0x00000103 @@ -493,7 +493,7 @@ _022F5944: ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] - bl ov29_02307F4C + bl TryTriggerMonsterHouse _022F5978: add sp, sp, #0x14 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} @@ -503,7 +503,7 @@ _022F5984: .word 0x00000BBE _022F5988: .word 0x00000103 _022F598C: .word 0x00000BBF _022F5990: .word 0x02353538 - arm_func_end ov29_022F54BC + arm_func_end UseThrowableItem arm_func_start ItemIsActive__022F5994 ItemIsActive__022F5994: ; 0x022F5994 @@ -511,7 +511,7 @@ ItemIsActive__022F5994: ; 0x022F5994 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -588,7 +588,7 @@ _022F5A70: _022F5A90: ldr r0, [sl, #0xb4] ldrb r0, [r0, #0xbc] - bl ov29_022EFB04 + bl IsSecretBazaarNpcBehavior movs r4, r0 bne _022F5ADC mov r0, r6 @@ -692,7 +692,7 @@ _022F5BE4: bl DisplayMessage2 b _022F5D94 _022F5C18: - bl ov29_023491A4 + bl GetMissionDestination ldrb r0, [r0, #0x18] cmp r0, #0 mov r0, sl @@ -711,7 +711,7 @@ _022F5C3C: movgt r1, r0 mov r0, r1, lsl #3 mov r1, #0xa - bl DivideInt + bl __divsi3 ldrsh r1, [sb, #0x10] cmp r1, r0 movge r4, #0 @@ -739,7 +739,7 @@ _022F5CA4: sub fp, r0, #0x1b _022F5CBC: mov r0, sb - bl ov29_0234CFEC + bl GetPersonalityIndex mov r7, r0 cmp r7, fp ldrne r0, _022F5DB4 ; =0x000004D3 @@ -768,7 +768,7 @@ _022F5CE8: bne _022F5D34 ldr r1, _022F5DBC ; =0x02352758 mov r0, r5 - bl Strcpy + bl strcpy _022F5D34: cmp r6, #0 bne _022F5CBC @@ -786,7 +786,7 @@ _022F5D5C: _022F5D60: ldrsh r1, [sb, #4] add r0, sp, #8 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r1, sp, #8 mov r0, sl mov r2, r5 @@ -865,7 +865,7 @@ _022F5E1C: bl IsMonsterIdInNormalRange__022F9C68 cmp r0, #0 beq _022F5E84 - bl ov29_022E08A0 + bl IsMarowakTrainingMaze cmp r0, #0 addne r5, r5, #2 ldr r6, _022F5F14 ; =0x00000BCA @@ -876,7 +876,7 @@ _022F5E84: mov r3, r2 mov r0, #0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _022F5F04 mov r0, #0 @@ -886,7 +886,7 @@ _022F5E84: mov r1, r0 add r0, sp, #4 mov r2, #0x40 - bl Strncpy + bl strncpy mov r0, r7 bl ov29_022E690C mov r0, r7 @@ -925,7 +925,7 @@ ov29_022F5F18: ; 0x022F5F18 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344160 + bl AreMovesEnabled cmp r0, #0 bne _022F5F60 ldr r1, _022F6054 ; =0x00000DFD @@ -937,7 +937,7 @@ _022F5F60: mov r1, r7 mov r0, sb strb r1, [r4, #0x23f] - bl ov29_0231A7A0 + bl ShouldUsePp cmp r0, #0 movne r7, #1 strneb r7, [r4, #0x23f] diff --git a/asm/overlay_29_022F62CC.s b/asm/overlay_29_022F62CC.s index 6090d3f5..3aa741a2 100644 --- a/asm/overlay_29_022F62CC.s +++ b/asm/overlay_29_022F62CC.s @@ -42,7 +42,7 @@ ov29_022F62CC: ; 0x022F62CC cmp r0, #0 beq _022F6364 mov r0, #0 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _022F6364: ldr r0, _022F66FC ; =0x02353538 mov r2, #0 @@ -83,7 +83,7 @@ _022F63D8: mov r1, r0 add r0, sp, #0x18 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon cmp fp, #0 cmpeq r5, #1 bne _022F6448 @@ -149,13 +149,13 @@ _022F648C: ldrsh r0, [sl, #4] mov r7, #1 sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _022F6510 ldrsh r1, [r4, #6] ldrsh r0, [sl, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _022F65CC _022F6510: @@ -193,7 +193,7 @@ _022F6548: beq _022F65B4 mov r0, sl add r1, sp, #0x14 - bl ov29_022FF764 + bl CannotStandOnTile cmp r0, #0 bne _022F65B4 add r3, sp, #0x14 @@ -332,7 +332,7 @@ ov29_022F6748: ; 0x022F6748 mov r1, r0 add r0, sp, #0 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r0, #1 bl ov29_022F67D0 mov r0, #1 @@ -385,7 +385,7 @@ ov29_022F67D0: ; 0x022F67D0 mov r1, r0 add r0, sp, #0x14 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon ldr r0, _022F69EC ; =0x02353538 cmp r4, #0 ldr r0, [r0] @@ -417,7 +417,7 @@ _022F6870: add r0, sp, #0x14 mov r3, r2 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _022F69E4 ldr r0, _022F6A00 ; =0x00001308 @@ -459,7 +459,7 @@ _022F68FC: ldr r1, [r0] cmp r1, #3 bne _022F698C - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] tst r1, #2 bne _022F698C @@ -471,9 +471,9 @@ _022F68FC: ldrh r2, [r0, #4] mov r0, r5 strh r2, [sp, #0x10] - bl ov29_023456BC + bl RemoveGroundItem ldrsh r0, [sp, #0x10] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 ldrneb r0, [sp, #0xc] mov r1, r6 @@ -481,7 +481,7 @@ _022F68FC: orrne r0, r0, #2 strneb r0, [sp, #0xc] mov r0, r5 - bl ov29_02345538 + bl SpawnItem _022F698C: add r8, r8, #1 _022F6990: @@ -535,7 +535,7 @@ ov29_022F6A0C: ; 0x022F6A0C mov r1, r0 add r0, sp, #4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon ldr r0, _022F6C8C ; =0x02353538 cmp r4, #0 ldr r0, [r0] @@ -573,7 +573,7 @@ _022F6AAC: add r0, sp, #4 mov r3, #1 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 beq _022F6AE8 mov r0, #1 @@ -613,10 +613,10 @@ _022F6B28: ldr r1, [r0] cmp r1, #3 bne _022F6B78 - bl ov29_022E1610 + bl GetItemInfo mov r7, r0 ldrsh r0, [r7, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 ldrneb r0, [r7] bicne r0, r0, #2 @@ -645,7 +645,7 @@ _022F6BA4: tst r0, #0xff beq _022F6BE4 ldrsh r0, [r7, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 ldrneb r0, [r7] bicne r0, r0, #2 @@ -675,7 +675,7 @@ _022F6C00: tst r0, #0xff beq _022F6C54 ldrsh r0, [r6, #0x66] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 ldrneb r0, [r6, #0x62] bicne r0, r0, #2 @@ -733,7 +733,7 @@ _022F6CE0: ldr r1, [r0] cmp r1, #3 bne _022F6D14 - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] bic r1, r1, #2 strb r1, [r0] @@ -809,8 +809,8 @@ _022F6E10: .word 0x00000E54 _022F6E14: .word 0x020AF6B8 arm_func_end ov29_022F6CAC - arm_func_start ResetDamageDesc -ResetDamageDesc: ; 0x022F6E18 + arm_func_start ResetDamageData +ResetDamageData: ; 0x022F6E18 mov r1, #0 str r1, [r0] str r1, [r0, #4] @@ -821,7 +821,7 @@ ResetDamageDesc: ; 0x022F6E18 strb r1, [r0, #0xf] strb r1, [r0, #0x10] bx lr - arm_func_end ResetDamageDesc + arm_func_end ResetDamageData arm_func_start ov29_022F6E40 ov29_022F6E40: ; 0x022F6E40 @@ -887,10 +887,10 @@ _022F6F08: .word 0x0000FFFF _022F6F0C: .word 0x023535AC arm_func_end ov29_022F6EF4 - arm_func_start ov29_022F6F10 -ov29_022F6F10: ; 0x022F6F10 + arm_func_start FreeLoadedAttackSpriteAndMore +FreeLoadedAttackSpriteAndMore: ; 0x022F6F10 stmdb sp!, {r4, r5, r6, lr} - bl ov29_022F7008 + bl ClearLoadedAttackSprite ldr r0, _022F6F60 ; =0x0237C9AC ldr r0, [r0] bl MemFree @@ -914,10 +914,10 @@ _022F6F44: .align 2, 0 _022F6F60: .word 0x0237C9AC _022F6F64: .word 0x0237C9B0 - arm_func_end ov29_022F6F10 + arm_func_end FreeLoadedAttackSpriteAndMore - arm_func_start ov29_022F6F68 -ov29_022F6F68: ; 0x022F6F68 + arm_func_start SetAndLoadCurrentAttackAnimation +SetAndLoadCurrentAttackAnimation: ; 0x022F6F68 stmdb sp!, {r3, r4, r5, lr} ldr r2, _022F6FFC ; =0x023535AC mov r5, r0 @@ -933,7 +933,7 @@ ov29_022F6F68: ; 0x022F6F68 ldrsh r0, [r0] cmp r0, #0 beq _022F6FA8 - bl ov29_022F7008 + bl ClearLoadedAttackSprite _022F6FA8: mov r1, #1 ldr r0, _022F7004 ; =0x020AFC68 @@ -943,7 +943,7 @@ _022F6FA8: ldr r3, [r1] mov r1, r5 mov r2, r4 - bl sub_0201D590 + bl LoadWanTableEntryFromPackUseProvidedMemory ldr r1, _022F7000 ; =0x0237C9AC ldr r2, _022F6FFC ; =0x023535AC ldr r1, [r1] @@ -961,10 +961,10 @@ _022F6FE8: _022F6FFC: .word 0x023535AC _022F7000: .word 0x0237C9AC _022F7004: .word 0x020AFC68 - arm_func_end ov29_022F6F68 + arm_func_end SetAndLoadCurrentAttackAnimation - arm_func_start ov29_022F7008 -ov29_022F7008: ; 0x022F7008 + arm_func_start ClearLoadedAttackSprite +ClearLoadedAttackSprite: ; 0x022F7008 stmdb sp!, {r3, lr} ldr r0, _022F7048 ; =0x0237C9AC ldr r0, [r0] @@ -984,10 +984,10 @@ ov29_022F7008: ; 0x022F7008 .align 2, 0 _022F7048: .word 0x0237C9AC _022F704C: .word 0x020AFC68 - arm_func_end ov29_022F7008 + arm_func_end ClearLoadedAttackSprite - arm_func_start ov29_022F7050 -ov29_022F7050: ; 0x022F7050 + arm_func_start GetLoadedAttackSpriteId +GetLoadedAttackSpriteId: ; 0x022F7050 ldr r0, _022F7064 ; =0x0237C9AC ldr r0, [r0] add r0, r0, #0x1a000 @@ -995,10 +995,10 @@ ov29_022F7050: ; 0x022F7050 bx lr .align 2, 0 _022F7064: .word 0x0237C9AC - arm_func_end ov29_022F7050 + arm_func_end GetLoadedAttackSpriteId - arm_func_start ov29_022F7068 -ov29_022F7068: ; 0x022F7068 + arm_func_start DungeonGetTotalSpriteFileSize +DungeonGetTotalSpriteFileSize: ; 0x022F7068 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, #0 @@ -1042,7 +1042,7 @@ _022F70F4: .word 0x0000017B _022F70F8: .word 0x0000017D _022F70FC: .word 0x0000017E _022F7100: .word 0x000001CD - arm_func_end ov29_022F7068 + arm_func_end DungeonGetTotalSpriteFileSize arm_func_start ov29_022F7104 ov29_022F7104: ; 0x022F7104 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index d5ae2113..4be663bf 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -3,8 +3,8 @@ .text - arm_func_start GetSpriteIndex__022F7388 -GetSpriteIndex__022F7388: ; 0x022F7388 + arm_func_start DungeonGetSpriteIndex +DungeonGetSpriteIndex: ; 0x022F7388 ldr r2, _022F73A0 ; =0x02353538 ldr r1, _022F73A4 ; =0x00019914 ldr r2, [r2] @@ -14,7 +14,7 @@ GetSpriteIndex__022F7388: ; 0x022F7388 .align 2, 0 _022F73A0: .word 0x02353538 _022F73A4: .word 0x00019914 - arm_func_end GetSpriteIndex__022F7388 + arm_func_end DungeonGetSpriteIndex arm_func_start JoinedAtRangeCheck2Veneer JoinedAtRangeCheck2Veneer: ; 0x022F73A8 @@ -56,8 +56,8 @@ _022F7404: .word 0x000003D7 _022F7408: .word 0x0000017F arm_func_end GetKecleonIdToSpawnByFloor - arm_func_start ov29_022F740C -ov29_022F740C: ; 0x022F740C + arm_func_start StoreSpriteFileIndexBothGenders +StoreSpriteFileIndexBothGenders: ; 0x022F740C stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r2, _022F74D0 ; =0x02353538 mov r7, r0 @@ -110,10 +110,10 @@ _022F7490: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022F74D0: .word 0x02353538 - arm_func_end ov29_022F740C + arm_func_end StoreSpriteFileIndexBothGenders - arm_func_start ov29_022F74D4 -ov29_022F74D4: ; 0x022F74D4 + arm_func_start LoadMonsterSpriteInner +LoadMonsterSpriteInner: ; 0x022F74D4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr r1, _022F75C4 ; =0x02353538 @@ -147,10 +147,10 @@ ov29_022F74D4: ; 0x022F74D4 ldr r0, [r0] mov r2, r4 mov r1, #0 - bl sub_0201D590 + bl LoadWanTableEntryFromPackUseProvidedMemory mov r1, r0 mov r0, r6 - bl ov29_022F740C + bl StoreSpriteFileIndexBothGenders b _022F7598 _022F756C: mov r1, #1 @@ -160,10 +160,10 @@ _022F756C: ldr r0, [r0] mov r2, r4 mov r3, r1 - bl sub_0201D484 + bl LoadWanTableEntryFromPack mov r1, r0 mov r0, r6 - bl ov29_022F740C + bl StoreSpriteFileIndexBothGenders _022F7598: mov r1, r4 mov r0, #0 @@ -182,10 +182,10 @@ _022F75C4: .word 0x02353538 _022F75C8: .word 0x00019914 _022F75CC: .word 0x0237C9B0 _022F75D0: .word 0x020AFC68 - arm_func_end ov29_022F74D4 + arm_func_end LoadMonsterSpriteInner - arm_func_start ov29_022F75D4 -ov29_022F75D4: ; 0x022F75D4 + arm_func_start SwapMonsterWanFileIndex +SwapMonsterWanFileIndex: ; 0x022F75D4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr r2, _022F764C ; =0x02353538 @@ -207,7 +207,7 @@ ov29_022F75D4: ; 0x022F75D4 bl ReplaceWanFromBinFile mov r1, r0 mov r0, r5 - bl ov29_022F740C + bl StoreSpriteFileIndexBothGenders mov r3, r6, lsl #1 ldrsh r2, [r4, r3] mov r1, r5, lsl #1 @@ -219,7 +219,7 @@ ov29_022F75D4: ; 0x022F75D4 .align 2, 0 _022F764C: .word 0x02353538 _022F7650: .word 0x020AFC68 - arm_func_end ov29_022F75D4 + arm_func_end SwapMonsterWanFileIndex arm_func_start LoadMonsterSprite LoadMonsterSprite: ; 0x022F7654 @@ -239,11 +239,11 @@ LoadMonsterSprite: ; 0x022F7654 ldr r0, [r0] add r0, r0, #0x3e00 ldrsh r0, [r0, #0x3a] - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldmia sp!, {r4, pc} _022F769C: mov r0, r4 - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldr r1, _022F7750 ; =0x0000017B cmp r4, r1 cmpne r4, #0x17c @@ -262,13 +262,13 @@ _022F769C: bhi _022F7704 _022F76E4: ldr r0, _022F7750 ; =0x0000017B - bl ov29_022F74D4 + bl LoadMonsterSpriteInner mov r0, #0x17c - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldr r0, _022F7758 ; =0x0000017D - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldr r0, _022F775C ; =0x0000017E - bl ov29_022F74D4 + bl LoadMonsterSpriteInner _022F7704: cmp r4, #0x1cc ldrne r0, _022F7760 ; =0x000001CD @@ -284,9 +284,9 @@ _022F7704: ldmhiia sp!, {r4, pc} _022F7734: mov r0, #0x1cc - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldr r0, _022F7760 ; =0x000001CD - bl ov29_022F74D4 + bl LoadMonsterSpriteInner ldmia sp!, {r4, pc} .align 2, 0 _022F7748: .word 0xFFFFFE5E @@ -299,8 +299,8 @@ _022F7760: .word 0x000001CD _022F7764: .word 0xFFFFFBDC arm_func_end LoadMonsterSprite - arm_func_start ov29_022F7768 -ov29_022F7768: ; 0x022F7768 + arm_func_start DeleteMonsterSpriteFile +DeleteMonsterSpriteFile: ; 0x022F7768 stmdb sp!, {r3, r4, r5, lr} ldr r1, _022F77F4 ; =0x02353538 mov r5, r0 @@ -341,16 +341,16 @@ _022F77F4: .word 0x02353538 _022F77F8: .word 0x00019914 _022F77FC: .word 0x020AFC68 _022F7800: .word 0x0237C9B0 - arm_func_end ov29_022F7768 + arm_func_end DeleteMonsterSpriteFile - arm_func_start ov29_022F7804 -ov29_022F7804: ; 0x022F7804 + arm_func_start DeleteAllMonsterSpriteFiles +DeleteAllMonsterSpriteFiles: ; 0x022F7804 stmdb sp!, {r3, r4, r5, lr} ldr r4, _022F7830 ; =0x00000483 mov r5, #0 _022F7810: mov r0, r5 - bl ov29_022F7768 + bl DeleteMonsterSpriteFile add r0, r5, #1 mov r0, r0, lsl #0x10 cmp r4, r0, asr #16 @@ -359,7 +359,7 @@ _022F7810: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F7830: .word 0x00000483 - arm_func_end ov29_022F7804 + arm_func_end DeleteAllMonsterSpriteFiles arm_func_start ov29_022F7834 ov29_022F7834: ; 0x022F7834 @@ -517,7 +517,7 @@ _022F7A14: ldr r1, _022F7BD8 ; =0x00000C0E mov r2, r0 str r3, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _022F7AA4 ldr r1, _022F7BDC ; =0x00000C0F @@ -811,7 +811,7 @@ _022F7E4C: strneb r5, [sb] bne _022F7E94 ldrsh r0, [sb, #8] - bl CheckTeamMemberIdx__02056228 + bl CheckTeamMemberIdx cmp r0, #0 strneb r4, [sb] _022F7E94: @@ -845,7 +845,7 @@ ov29_022F7EAC: ; 0x022F7EAC and r1, r0, #0xff add r0, r4, #4 strb r1, [r5, #0x7c9] - bl ov29_02337A3C + bl DiscoverMinimap ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022F7F04: .word 0x02353538 @@ -888,7 +888,7 @@ _022F7F64: streq r0, [r4, #0xc] ldrsh r0, [sl, #4] ldrsh r1, [sl, #6] - bl ov29_023391EC + bl DrawMinimapTile mov r5, #0 ldr fp, _022F85D0 ; =0x02353538 mov r4, r5 @@ -1032,7 +1032,7 @@ _022F80F4: ldr r1, _022F85DC ; =0x00000C13 mov r2, r0 str r3, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _022F8208 ldr r1, _022F85E0 ; =0x00000C14 @@ -1151,7 +1151,7 @@ _022F8330: mov r1, r5 bl ov29_022FE048 ldrsh r0, [r4, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _022F83A8 ldr r0, _022F85D0 ; =0x02353538 @@ -1253,7 +1253,7 @@ _022F84AC: mov r1, r7 bl ov29_022FE048 ldrsh r0, [r4, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _022F856C ldr r0, _022F85D0 ; =0x02353538 @@ -1332,8 +1332,8 @@ _022F85E8: .word 0x0000025E _022F85EC: .word 0x00000233 arm_func_end HandleFaint - arm_func_start ov29_022F85F0 -ov29_022F85F0: ; 0x022F85F0 + arm_func_start MoveMonsterToPos +MoveMonsterToPos: ; 0x022F85F0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r1 mov r7, r2 @@ -1375,7 +1375,7 @@ _022F8658: bl ov29_02337EC0 ldrsh r0, [sb, #4] ldrsh r1, [sb, #6] - bl ov29_023391EC + bl DrawMinimapTile _022F8690: ldrsh r2, [sb, #4] mov r0, r8, lsl #0x10 @@ -1408,7 +1408,7 @@ _022F86C8: _022F86FC: mov r0, r8 mov r1, r7 - bl ov29_023391EC + bl DrawMinimapTile cmp r6, #0 beq _022F871C cmp r6, #1 @@ -1459,7 +1459,7 @@ _022F87A8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022F87BC: .word 0x02353538 - arm_func_end ov29_022F85F0 + arm_func_end MoveMonsterToPos arm_func_start ov29_022F87C0 ov29_022F87C0: ; 0x022F87C0 @@ -1622,7 +1622,7 @@ ov29_022F89CC: ; 0x022F89CC mov r7, r0 mov r1, r5 add r0, r7, #2 - bl ov29_02300164 + bl GetMonsterName ldrsh r1, [r5, #2] ldr r0, _022F8FF0 ; =0x000003E7 mov r3, #0 @@ -1667,7 +1667,7 @@ _022F8A28: strneb r1, [r7, #0x45] mov r0, r6 mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer str r0, [sp] ldrsh r1, [r5, #2] ldrsh r3, [r5, #0xe] @@ -2094,7 +2094,7 @@ ov29_022F9058: ; 0x022F9058 strh r1, [r5, #0xc] ldrsh r1, [r4, #2] ldrb r2, [r4, #0xa] - bl GetLvlStats + bl GetLvlUpEntry ldr r0, [sp] add r3, r4, #0x124 str r0, [r5, #0x10] @@ -2161,13 +2161,13 @@ _022F918C: .word 0x0235171C _022F9190: .word 0x0235171E arm_func_end UpdateAiTargetPos - arm_func_start ov29_022F9194 -ov29_022F9194: ; 0x022F9194 + arm_func_start SetMonsterTypeAndAbility +SetMonsterTypeAndAbility: ; 0x022F9194 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r1, #0x25 ldr r4, [r5, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022F91D8 mov r0, r5 @@ -2210,7 +2210,7 @@ _022F9200: .align 2, 0 _022F9234: .word 0x022C4C6C _022F9238: .word 0x02353538 - arm_func_end ov29_022F9194 + arm_func_end SetMonsterTypeAndAbility arm_func_start TryActivateSlowStart TryActivateSlowStart: ; 0x022F923C @@ -2233,7 +2233,7 @@ _022F925C: beq _022F92C0 mov r0, sl mov r1, r8 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022F92C0 mov r0, r7 @@ -2290,7 +2290,7 @@ _022F9324: beq _022F93F4 mov r0, sl mov r1, #4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] addne r0, r0, #0xcd00 @@ -2298,7 +2298,7 @@ _022F9324: bne _022F93C0 mov r0, sl mov r1, #0x1c - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] addne r0, r0, #0xcd00 @@ -2306,7 +2306,7 @@ _022F9324: bne _022F93C0 mov r0, sl mov r1, #0x31 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] addne r0, r0, #0xcd00 @@ -2314,7 +2314,7 @@ _022F9324: bne _022F93C0 mov r0, sl mov r1, #0x78 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r4] addne r0, r0, #0xcd00 @@ -2322,12 +2322,12 @@ _022F9324: _022F93C0: mov r0, sl mov r1, #8 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _022F93E8 mov r0, sl mov r1, #0x2d - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022F93F4 _022F93E8: @@ -2343,8 +2343,8 @@ _022F93F4: _022F9404: .word 0x02353538 arm_func_end TryActivateArtificialWeatherAbilities - arm_func_start ov29_022F9408 -ov29_022F9408: ; 0x022F9408 + arm_func_start GetMonsterApparentId +GetMonsterApparentId: ; 0x022F9408 stmdb sp!, {r4, lr} movs r4, r0 beq _022F94A8 @@ -2355,7 +2355,7 @@ ov29_022F9408: ; 0x022F9408 cmp r1, r2 bgt _022F945C mov r1, #0x25 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldreq r0, _022F94E0 ; =0x0000017B ldmeqia sp!, {r4, pc} @@ -2375,7 +2375,7 @@ _022F945C: bgt _022F94D8 mov r0, r4 mov r1, #0x25 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldreq r0, _022F94E8 ; =0x000003D3 ldmeqia sp!, {r4, pc} @@ -2408,10 +2408,10 @@ _022F94E0: .word 0x0000017B _022F94E4: .word 0x022C4C6E _022F94E8: .word 0x000003D3 _022F94EC: .word 0x022C4C70 - arm_func_end ov29_022F9408 + arm_func_end GetMonsterApparentId - arm_func_start ov29_022F94F0 -ov29_022F94F0: ; 0x022F94F0 + arm_func_start TryActivateTraceAndColorChange +TryActivateTraceAndColorChange: ; 0x022F94F0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -2427,7 +2427,7 @@ ov29_022F94F0: ; 0x022F94F0 ldr r5, [sb, #0xb4] ldr r6, [r8, #0xb4] ldrb r0, [r5, #0xbc] - bl ov29_022EFB04 + bl IsSecretBazaarNpcBehavior cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldrb r0, [r6, #0x60] @@ -2479,7 +2479,7 @@ _022F95A0: bl ov29_022E6260 mov r0, sb mov r1, r8 - bl ov29_022FA7DC + bl TryEndStatusWithAbility _022F95FC: ldrb r0, [r6, #0x164] cmp r0, #0 @@ -2535,7 +2535,7 @@ _022F96BC: .word 0x02353538 _022F96C0: .word 0x00000C18 _022F96C4: .word 0x022C48DC _022F96C8: .word 0x00000C19 - arm_func_end ov29_022F94F0 + arm_func_end TryActivateTraceAndColorChange arm_func_start DefenderAbilityIsActive__022F96CC DefenderAbilityIsActive__022F96CC: ; 0x022F96CC @@ -2552,14 +2552,14 @@ DefenderAbilityIsActive__022F96CC: ; 0x022F96CC beq _022F9710 mov r0, r7 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _022F9710: mov r0, r6 mov r1, r5 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end DefenderAbilityIsActive__022F96CC @@ -2576,8 +2576,8 @@ IsMonster__022F9720: ; 0x022F9720 bx lr arm_func_end IsMonster__022F9720 - arm_func_start ov29_022F9744 -ov29_022F9744: ; 0x022F9744 + arm_func_start TryActivateConversion2 +TryActivateConversion2: ; 0x022F9744 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -2622,7 +2622,7 @@ ov29_022F9744: ; 0x022F9744 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022F97EC: .word 0x00000C16 - arm_func_end ov29_022F9744 + arm_func_end TryActivateConversion2 arm_func_start TryActivateTruant TryActivateTruant: ; 0x022F97F0 @@ -2634,7 +2634,7 @@ TryActivateTruant: ; 0x022F97F0 beq _022F9838 mov r0, r4 mov r1, #0x2a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022F9838 mov r2, #0 @@ -2673,18 +2673,18 @@ _022F987C: cmp r4, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} mov r1, #1 mov r0, r5 mov r2, r1 - bl ov29_022F98B4 + bl TryPointCameraToMonster ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_022F9840 - arm_func_start ov29_022F98B4 -ov29_022F98B4: ; 0x022F98B4 + arm_func_start TryPointCameraToMonster +TryPointCameraToMonster: ; 0x022F98B4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r0 mov r5, r1 @@ -2704,7 +2704,7 @@ ov29_022F98B4: ; 0x022F98B4 cmp r5, #0 beq _022F9928 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r7, #0x34 ldr r5, _022F9968 ; =0x02353538 b _022F9918 @@ -2722,11 +2722,11 @@ _022F9928: bl ov29_022EA370 mov r0, r6 mov r1, r4 - bl ov29_022E2E54 + bl PointCameraToMonster cmp r4, #0 beq _022F9950 add r0, r6, #4 - bl ov29_02337A3C + bl DiscoverMinimap _022F9950: ldr r0, _022F9968 ; =0x02353538 mov r1, #0 @@ -2736,7 +2736,7 @@ _022F9950: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022F9968: .word 0x02353538 - arm_func_end ov29_022F98B4 + arm_func_end TryPointCameraToMonster arm_func_start ov29_022F996C ov29_022F996C: ; 0x022F996C @@ -2956,10 +2956,10 @@ _022F9C00: arm_func_start CheckTeamMemberIdx__022F9C34 CheckTeamMemberIdx__022F9C34: ; 0x022F9C34 - ldr ip, _022F9C3C ; =CheckTeamMemberIdx__02056228 + ldr ip, _022F9C3C ; =CheckTeamMemberIdx bx ip .align 2, 0 -_022F9C3C: .word CheckTeamMemberIdx__02056228 +_022F9C3C: .word CheckTeamMemberIdx arm_func_end CheckTeamMemberIdx__022F9C34 arm_func_start ov29_022F9C40 @@ -2983,10 +2983,10 @@ ov29_022F9C4C: ; 0x022F9C4C arm_func_start IsMonsterIdInNormalRange__022F9C68 IsMonsterIdInNormalRange__022F9C68: ; 0x022F9C68 - ldr ip, _022F9C70 ; =IsMonsterIdInNormalRange__02056294 + ldr ip, _022F9C70 ; =IsMonsterIdInNormalRange bx ip .align 2, 0 -_022F9C70: .word IsMonsterIdInNormalRange__02056294 +_022F9C70: .word IsMonsterIdInNormalRange arm_func_end IsMonsterIdInNormalRange__022F9C68 arm_func_start ov29_022F9C74 @@ -3046,7 +3046,7 @@ _022F9D34: bne _022F9E78 mov r0, r6 mov r1, r6 - bl ov29_023061A8 + bl EndBurnClassStatus b _022F9E78 _022F9D50: cmp r0, #0 @@ -3147,7 +3147,7 @@ ov29_022F9EA0: ; 0x022F9EA0 mov r5, r0 mov r1, #0x6f ldr r4, [r5, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _022F9FEC ldrb r0, [r4, #7] @@ -3227,8 +3227,8 @@ _022F9FBC: cmpne r0, #0xe bne _022F9FEC mov r0, #1 - bl ov29_022E2EC4 - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateMinimap _022F9FEC: ldrsh r1, [r4, #0x68] ldrsh r0, [r4, #0x66] @@ -3333,8 +3333,8 @@ _022FA12C: _022FA140: .word 0x00000C1C arm_func_end ov29_022FA02C - arm_func_start ov29_022FA144 -ov29_022FA144: ; 0x022FA144 + arm_func_start BoostIQ +BoostIQ: ; 0x022FA144 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 ldr r5, [r7, #0xb4] @@ -3375,7 +3375,7 @@ _022FA1B0: _022FA1CC: .word 0x000003E7 _022FA1D0: .word 0x00000C27 _022FA1D4: .word 0x00000C26 - arm_func_end ov29_022FA144 + arm_func_end BoostIQ arm_func_start ov29_022FA1D8 ov29_022FA1D8: ; 0x022FA1D8 @@ -3554,7 +3554,7 @@ _022FA414: .word 0x02353538 arm_func_start ov29_022FA418 ov29_022FA418: ; 0x022FA418 stmdb sp!, {r3, lr} - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 ldmeqia sp!, {r3, pc} bl ov29_022EF938 @@ -3776,7 +3776,7 @@ _022FA6C4: movne sb, #1 bne _022FA70C ldrsh r0, [r4, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 movne sb, #1 _022FA70C: @@ -3845,8 +3845,8 @@ _022FA7C8: _022FA7D8: .word 0x02353538 arm_func_end ov29_022FA750 - arm_func_start ov29_022FA7DC -ov29_022FA7DC: ; 0x022FA7DC + arm_func_start TryEndStatusWithAbility +TryEndStatusWithAbility: ; 0x022FA7DC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -3862,7 +3862,7 @@ ov29_022FA7DC: ; 0x022FA7DC bne _022FA81C mov r0, r6 mov r1, r5 - bl ov29_023061A8 + bl EndBurnClassStatus _022FA81C: mov r0, r6 mov r1, r5 @@ -3890,7 +3890,7 @@ _022FA850: bne _022FA884 mov r0, r6 mov r1, r5 - bl ov29_023061A8 + bl EndBurnClassStatus _022FA884: mov r0, r6 mov r1, r5 @@ -3922,7 +3922,7 @@ _022FA8B8: beq _022FA924 _022FA8F0: mov r0, r5 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 bne _022FA90C ldrb r0, [r4, #0xbd] @@ -3934,7 +3934,7 @@ _022FA90C: mov r1, r5 mov r2, #0 str r3, [sp] - bl ov29_02305FDC + bl EndSleepClassStatus _022FA924: mov r0, r6 mov r1, r5 @@ -3965,11 +3965,11 @@ _022FA95C: bhi _022FA998 mov r0, r6 mov r1, r5 - bl ov29_023061A8 + bl EndBurnClassStatus _022FA998: mov r0, r5 mov r1, #0x25 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022FA9CC mov r0, #0 @@ -3979,11 +3979,11 @@ _022FA998: bne _022FA9CC mov r0, r6 mov r1, r5 - bl ov29_023064F4 + bl EndReflectClassStatus _022FA9CC: mov r0, r5 mov r1, #0x2b - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _022FA9FC ldrb r0, [r4, #0xc4] @@ -3996,7 +3996,7 @@ _022FA9CC: _022FA9FC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_022FA7DC + arm_func_end TryEndStatusWithAbility arm_func_start ov29_022FAA04 ov29_022FAA04: ; 0x022FAA04 @@ -4099,7 +4099,7 @@ _022FAB58: cmp r0, #0 beq _022FAB98 mov r0, r5 - bl ov29_022E4964 + bl ShowPpRestoreEffect cmp sl, #0 bne _022FAB98 mov r0, #0 @@ -4172,7 +4172,7 @@ _022FAC60: mov r1, sb mov r2, #1 mov r3, sl - bl RestoreMovePP + bl RestoreAllMovePP _022FAC74: add r0, r8, #1 mov r0, r0, lsl #0x10 @@ -4305,7 +4305,7 @@ _022FAE14: add r0, sp, #0 add r1, sp, #2 mov r4, #0 - bl ov29_023363C0 + bl GetStairsSpawnPosition ldrsh r1, [sp] ldrsh r3, [r5, #4] ldrsh r2, [sp, #2] @@ -4380,7 +4380,7 @@ ov29_022FAF08: ; 0x022FAF08 mov r5, #0 add r0, r0, #0x328 add r8, r0, #0x12800 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov sb, r5 @@ -4505,8 +4505,8 @@ TeamLeaderIqSkillIsEnabled: ; 0x022FB080 ldmia sp!, {r4, pc} arm_func_end TeamLeaderIqSkillIsEnabled - arm_func_start ov29_022FB0A8 -ov29_022FB0A8: ; 0x022FB0A8 + arm_func_start CountMovesOutOfPp +CountMovesOutOfPp: ; 0x022FB0A8 stmdb sp!, {r3, lr} ldr ip, [r0, #0xb4] mov r0, #0 @@ -4534,10 +4534,10 @@ _022FB0F4: cmp lr, #4 blt _022FB0C0 ldmia sp!, {r3, pc} - arm_func_end ov29_022FB0A8 + arm_func_end CountMovesOutOfPp - arm_func_start ov29_022FB10C -ov29_022FB10C: ; 0x022FB10C + arm_func_start HasSuperEffectiveMoveAgainstUser +HasSuperEffectiveMoveAgainstUser: ; 0x022FB10C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sb, r1 ldr r6, [sb, #0xb4] @@ -4559,7 +4559,7 @@ _022FB134: cmp r8, #0 beq _022FB168 add r0, r4, r7, lsl #3 - bl ov29_02324798 + bl HasMaxGinsengBoost99 cmp r0, #0 beq _022FB18C _022FB168: @@ -4568,7 +4568,7 @@ _022FB168: mov r2, r0 mov r0, sb mov r1, sl - bl ov29_0230AA8C + bl GetTypeMatchupBothTypes cmp r0, #3 moveq r0, #1 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -4581,7 +4581,7 @@ _022FB198: blt _022FB134 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end ov29_022FB10C + arm_func_end HasSuperEffectiveMoveAgainstUser arm_func_start ov29_022FB1A8 ov29_022FB1A8: ; 0x022FB1A8 @@ -4617,8 +4617,8 @@ _022FB204: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_022FB1A8 - arm_func_start ov29_022FB214 -ov29_022FB214: ; 0x022FB214 + arm_func_start TryEatItem +TryEatItem: ; 0x022FB214 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x74 mov sl, r0 @@ -4643,12 +4643,12 @@ _022FB24C: cmp r0, #0 beq _022FB504 ldrsh r0, [r4, #0x66] - bl ov29_0231E990 + bl ShouldTryEatItem cmp r0, #0 beq _022FB504 mov r0, sl add r1, r4, #0x62 - bl ov29_0231D4A4 + bl CanMonsterUseItem cmp r0, #0 beq _022FB504 mov r0, r5 @@ -4688,12 +4688,12 @@ _022FB24C: mov r5, #1 b _022FB504 _022FB31C: - bl ov29_0231E990 + bl ShouldTryEatItem cmp r0, #0 beq _022FB3D4 mov r0, sl add r1, r4, #0x62 - bl ov29_0231D4A4 + bl CanMonsterUseItem cmp r0, #0 beq _022FB504 mov r0, r5 @@ -4779,12 +4779,12 @@ _022FB430: cmp r0, #0 bne _022FB4F8 ldrsh r0, [r6, #4] - bl ov29_0231E990 + bl ShouldTryEatItem cmp r0, #0 beq _022FB4F8 mov r0, sl mov r1, r6 - bl ov29_0231D4A4 + bl CanMonsterUseItem cmp r0, #0 beq _022FB504 mov r0, #0 @@ -4827,12 +4827,12 @@ _022FB508: _022FB510: .word 0x00000C24 _022FB514: .word 0x020AF6B8 _022FB518: .word 0x00000C25 - arm_func_end ov29_022FB214 + arm_func_end TryEatItem arm_func_start ov29_022FB51C ov29_022FB51C: ; 0x022FB51C stmdb sp!, {r3, lr} - bl GetScenarioBalance__0204CB94 + bl GetScenarioBalance cmp r0, #2 movhs r0, #1 movlo r0, #0 @@ -4873,7 +4873,7 @@ _022FB574: bne _022FB5D8 mov r0, r6 mov r1, r8 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _022FB5D8 ldr r0, [r8, #0xb4] @@ -4893,18 +4893,18 @@ _022FB5DC: _022FB5E8: .word 0x02353538 arm_func_end ov29_022FB538 - arm_func_start ov29_022FB5EC -ov29_022FB5EC: ; 0x022FB5EC + arm_func_start CheckSpawnThreshold +CheckSpawnThreshold: ; 0x022FB5EC stmdb sp!, {r4, lr} bl GetSpawnThreshold mov r4, r0 - bl GetScenarioBalance__022E095C + bl GetScenarioBalanceVeneer cmp r4, r0 movls r0, #1 movhi r0, #0 and r0, r0, #0xff ldmia sp!, {r4, pc} - arm_func_end ov29_022FB5EC + arm_func_end CheckSpawnThreshold arm_func_start HasLowHealth HasLowHealth: ; 0x022FB610 @@ -4937,8 +4937,8 @@ HasLowHealth: ; 0x022FB610 _022FB674: .word 0x000003E7 arm_func_end HasLowHealth - arm_func_start ov29_022FB678 -ov29_022FB678: ; 0x022FB678 + arm_func_start AreEntitiesAdjacent +AreEntitiesAdjacent: ; 0x022FB678 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -4969,7 +4969,7 @@ _022FB6D0: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022FB6E0: .word 0x0235171C - arm_func_end ov29_022FB678 + arm_func_end AreEntitiesAdjacent arm_func_start ov29_022FB6E4 ov29_022FB6E4: ; 0x022FB6E4 @@ -5194,7 +5194,7 @@ ov29_022FB9BC: ; 0x022FB9BC stmdb sp!, {r3, lr} ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xbc] - bl ov29_022EFB04 + bl IsSecretBazaarNpcBehavior cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -5339,7 +5339,7 @@ _022FBB38: bl sub_0201C0CC ldrsh r1, [r8, #0xa8] add r0, r8, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl mov r0, r8 bl GetSleepAnimationId mov r1, r0 @@ -5547,11 +5547,11 @@ _022FBDEC: .word ov29_022EFAE8 arm_func_start ov29_022FBDF0 ov29_022FBDF0: ; 0x022FBDF0 ldr r0, [r0, #0xb4] - ldr ip, _022FBE00 ; =ov29_022EFB04 + ldr ip, _022FBE00 ; =IsSecretBazaarNpcBehavior ldrb r0, [r0, #0xbc] bx ip .align 2, 0 -_022FBE00: .word ov29_022EFB04 +_022FBE00: .word IsSecretBazaarNpcBehavior arm_func_end ov29_022FBDF0 arm_func_start ov29_022FBE04 @@ -5570,7 +5570,7 @@ ov29_022FBE04: ; 0x022FBE04 ldrsh r1, [r1, #0x84] cmp r1, r0 bne _022FBE4C - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -5581,8 +5581,8 @@ _022FBE4C: _022FBE54: .word 0x02353538 arm_func_end ov29_022FBE04 - arm_func_start ov29_022FBE58 -ov29_022FBE58: ; 0x022FBE58 + arm_func_start InitOtherMonsterData +InitOtherMonsterData: ; 0x022FBE58 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, r0 ldr ip, [r4, #0xb4] @@ -5628,7 +5628,7 @@ ov29_022FBE58: ; 0x022FBE58 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022FBF04: .word 0x022C5938 - arm_func_end ov29_022FBE58 + arm_func_end InitOtherMonsterData arm_func_start ov29_022FBF08 ov29_022FBF08: ; 0x022FBF08 @@ -5660,8 +5660,8 @@ ov29_022FBF30: ; 0x022FBF30 _022FBF54: .word 0x02353538 arm_func_end ov29_022FBF30 - arm_func_start ov29_022FBF58 -ov29_022FBF58: ; 0x022FBF58 + arm_func_start InitEnemySpawnStats +InitEnemySpawnStats: ; 0x022FBF58 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x218 ldr r1, _022FC230 ; =0x02353538 @@ -5689,14 +5689,14 @@ _022FBF94: ldrsh r1, [r5] ldrsh r2, [r5, #2] add r0, r5, #4 - bl ov29_02303B18 + bl GetMonsterMoves ldrh r0, [r5, #4] cmp r0, #0 moveq r0, #0x170 streqh r0, [r5, #4] ldrsh r0, [r5] ldrsh r1, [r5, #2] - bl ov29_022FE2FC + bl GetMaxHpAtLevel strh r0, [r5, #0xc] mov r7, #0 _022FBFE8: @@ -5704,12 +5704,12 @@ _022FBFE8: ldrsh r1, [r5, #2] mov r2, r7 add r8, r5, r7 - bl ov29_022FE350 + bl GetOffensiveStatAtLevel strb r0, [r8, #0xe] ldrsh r0, [r5] ldrsh r1, [r5, #2] mov r2, r7 - bl ov29_022FE3B8 + bl GetDefensiveStatAtLevel add r7, r7, #1 strb r0, [r8, #0x10] cmp r7, #2 @@ -5745,7 +5745,7 @@ _022FC040: beq _022FC0A8 _022FC088: add r0, sp, #8 - bl ov29_022FE420 + bl GetOutlawSpawnData add r0, sp, #0x16 ldrsh r1, [sp, #0xc] ldrsh r2, [sp, #8] @@ -5799,7 +5799,7 @@ _022FC128: str r0, [sp, #4] mov r0, fp mov r1, #0x258 - bl DivideInt + bl __divsi3 ldr r0, _022FC230 ; =0x02353538 mov r1, r1, lsl #0x10 ldr r0, [r0] @@ -5864,10 +5864,10 @@ _022FC1FC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022FC230: .word 0x02353538 - arm_func_end ov29_022FBF58 + arm_func_end InitEnemySpawnStats - arm_func_start ov29_022FC234 -ov29_022FC234: ; 0x022FC234 + arm_func_start InitEnemyStatsAndMoves +InitEnemyStatsAndMoves: ; 0x022FC234 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov sl, r0 @@ -5877,7 +5877,7 @@ ov29_022FC234: ; 0x022FC234 mov r8, r2 mov r7, r3 ldr r6, [sp, #0x34] - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 ldr r2, _022FC464 ; =0x02353538 mov r4, r0, asr #0x10 @@ -5901,13 +5901,13 @@ _022FC284: mov r1, r4 mov r2, r6 add r0, r5, #4 - bl ov29_02303B18 + bl GetMonsterMoves mov r4, #0 _022FC2BC: add r0, r5, r4, lsl #1 ldrh r1, [r0, #4] add r0, sl, r4, lsl #3 - bl GetInfoMoveCheckId + bl InitMoveCheckId add r4, r4, #1 cmp r4, #4 blt _022FC2BC @@ -5937,32 +5937,32 @@ _022FC31C: add r0, sp, #0 mov r1, r4 mov r2, r6 - bl ov29_02303B18 + bl GetMonsterMoves mov r5, #0 add fp, sp, #0 _022FC33C: mov r0, r5, lsl #1 ldrh r1, [fp, r0] add r0, sl, r5, lsl #3 - bl GetInfoMoveCheckId + bl InitMoveCheckId add r5, r5, #1 cmp r5, #4 blt _022FC33C mov r0, r4 mov r1, r6 - bl ov29_022FE2FC + bl GetMaxHpAtLevel strh r0, [sb] mov r5, #0 _022FC36C: mov r0, r4 mov r1, r6 mov r2, r5 - bl ov29_022FE350 + bl GetOffensiveStatAtLevel strb r0, [r8, r5] mov r0, r4 mov r1, r6 mov r2, r5 - bl ov29_022FE3B8 + bl GetDefensiveStatAtLevel strb r0, [r7, r5] add r5, r5, #1 cmp r5, #2 @@ -5974,10 +5974,10 @@ _022FC3A4: mov r2, r6 strh r6, [r5, #2] add r0, r5, #4 - bl ov29_02303B18 + bl GetMonsterMoves ldrsh r0, [r5] ldrsh r1, [r5, #2] - bl ov29_022FE2FC + bl GetMaxHpAtLevel strh r0, [r5, #0xc] mov r6, #0 _022FC3D0: @@ -5985,12 +5985,12 @@ _022FC3D0: ldrsh r1, [r5, #2] mov r2, r6 add r4, r5, r6 - bl ov29_022FE350 + bl GetOffensiveStatAtLevel strb r0, [r4, #0xe] ldrsh r0, [r5] ldrsh r1, [r5, #2] mov r2, r6 - bl ov29_022FE3B8 + bl GetDefensiveStatAtLevel add r6, r6, #1 strb r0, [r4, #0x10] cmp r6, #2 @@ -6000,7 +6000,7 @@ _022FC40C: add r0, r5, r4, lsl #1 ldrh r1, [r0, #4] add r0, sl, r4, lsl #3 - bl GetInfoMoveCheckId + bl InitMoveCheckId add r4, r4, #1 cmp r4, #4 blt _022FC40C @@ -6024,7 +6024,7 @@ _022FC45C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022FC464: .word 0x02353538 - arm_func_end ov29_022FC234 + arm_func_end InitEnemyStatsAndMoves arm_func_start ov29_022FC468 ov29_022FC468: ; 0x022FC468 @@ -6073,8 +6073,8 @@ _022FC4C4: _022FC508: .word 0x020A1C7C arm_func_end ov29_022FC468 - arm_func_start InitTeam -InitTeam: ; 0x022FC50C + arm_func_start SpawnTeam +SpawnTeam: ; 0x022FC50C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 mov sl, r0 @@ -6260,7 +6260,7 @@ _022FC750: cmp r0, fp bne _022FC800 ldrsh r0, [r5, #0xc] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 bne _022FC800 ldr r0, _022FC98C ; =0x02353538 @@ -6309,7 +6309,7 @@ _022FC818: bl GetTile mov r1, r0 ldrsh r0, [r5, #0xc] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 bne _022FC8B4 ldr r0, _022FC98C ; =0x02353538 @@ -6392,4 +6392,4 @@ _022FC98C: .word 0x02353538 _022FC990: .word 0x0000017B _022FC994: .word 0x000003D3 _022FC998: .word 0x02351E28 - arm_func_end InitTeam + arm_func_end SpawnTeam diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index cc672efc..9fcee0c5 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -116,7 +116,7 @@ _022FCB14: cmp r0, r4 bne _022FCBA4 ldrsh r0, [r6, #0xc] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 bne _022FCBA4 mov r1, #0 @@ -158,7 +158,7 @@ _022FCBBC: bl GetTile mov r1, r0 ldrsh r0, [r6, #0xc] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 bne _022FCC40 mov r1, #0 @@ -197,7 +197,7 @@ _022FCC60: bl GetTile mov r1, r0 ldrsh r0, [r6, #0xc] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 bne _022FCCC4 mov r1, #0 @@ -271,8 +271,8 @@ _022FCD70: .word 0x02353538 _022FCD74: .word 0x0237C690 arm_func_end ov29_022FCD04 - arm_func_start ov29_022FCD78 -ov29_022FCD78: ; 0x022FCD78 + arm_func_start SpawnInitialMonsters +SpawnInitialMonsters: ; 0x022FCD78 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x34 add r0, sp, #0x24 @@ -297,10 +297,10 @@ ov29_022FCD78: ; 0x022FCD78 beq _022FCDDC _022FCDD0: add r0, sp, #0x24 - bl ov29_022FE420 + bl GetOutlawSpawnData b _022FCE34 _022FCDDC: - bl ov29_023491A4 + bl GetMissionDestination ldrsh r2, [r0, #0xc] mov r0, r7 mov r1, #7 @@ -433,7 +433,7 @@ _022FCFB4: mov r2, #0 add r1, r1, #0xce0 add r1, r1, #0xc000 - bl ov29_022E9A0C + bl FindFarthestUnoccupiedTileWithin2 cmp r0, #0 ldrnesh r1, [sp] ldrnesh r0, [sp, #2] @@ -448,7 +448,7 @@ _022FCFEC: mov r2, #0 add r1, r1, #0xce0 add r1, r1, #0xc000 - bl ov29_022E99F0 + bl FindClosestUnoccupiedTileWithin2 cmp r0, #0 ldrnesh r1, [sp] ldrnesh r0, [sp, #2] @@ -484,7 +484,7 @@ _022FD070: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022FD080: .word 0x02353538 - arm_func_end ov29_022FCD78 + arm_func_end SpawnInitialMonsters arm_func_start SpawnMonster SpawnMonster: ; 0x022FD084 @@ -497,19 +497,19 @@ SpawnMonster: ; 0x022FD084 bl GetTile mov r1, r0 ldrsh r0, [r7] - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 movne r0, #0 bne _022FD2F8 ldrsh r0, [r7] - bl ov29_022E20C0 + bl CreateEnemyEntity movs r4, r0 mov r0, #0 beq _022FD2F8 ldr r3, _022FD300 ; =0x0237C690 mov r1, r4 mov r2, r7 - bl ov29_022FD9D4 + bl InitMonster ldr r5, [r4, #0xb4] mov r0, #1 strb r0, [r5, #6] @@ -567,7 +567,7 @@ _022FD194: add r2, r5, #0x1a add r3, r5, #0x1c str ip, [sp, #4] - bl ov29_022FC234 + bl InitEnemyStatsAndMoves ldrb r1, [r5, #6] cmp r1, #0 beq _022FD1D0 @@ -578,7 +578,7 @@ _022FD1D0: cmp r1, #0 beq _022FD1F0 ldrb r0, [r7, #2] - bl ov29_022EFB04 + bl IsSecretBazaarNpcBehavior cmp r0, #0 beq _022FD1F0 _022FD1E8: @@ -685,15 +685,15 @@ ov29_022FD318: ; 0x022FD318 bl GetTile mov r1, r0 mov r0, r7 - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 movne r0, #0 bne _022FD3AC _022FD36C: mov r1, r7 mov r0, #0 - bl ov29_022F9408 - bl GetSpriteIndex__022F7388 + bl GetMonsterApparentId + bl DungeonGetSpriteIndex mov r4, r0 mov r0, #1 bl ov29_022DEA10 @@ -782,7 +782,7 @@ _022FD420: mov r1, r7 mov r0, #1 strh r8, [sp, #0xc] - bl ov29_022FD9D4 + bl InitMonster ldr r8, [r7, #0xb4] mov r2, #0 strb r2, [r8, #6] @@ -896,7 +896,7 @@ _022FD570: bl GetCurrentBagCapacity cmp r0, #1 beq _022FD760 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 bne _022FD760 mov r0, r7 @@ -943,7 +943,7 @@ _022FD6FC: cmp r0, #0 bne _022FD760 mov r0, #0 - bl ov29_022E7AC4 + bl GetItemIdToSpawn mov r1, r0 cmp r1, #0xb7 beq _022FD760 @@ -951,7 +951,7 @@ _022FD6FC: mov r2, #0 bl InitStandardItem mov r0, r8 - bl ov29_02346F14 + bl AddHeldItemToBag mov r0, #1 strb r0, [r8, #0xfc] _022FD760: @@ -999,9 +999,9 @@ ov29_022FD7A0: ; 0x022FD7A0 ble _022FD864 mov r1, r6 mov r0, r4 - bl ov29_022F9408 + bl GetMonsterApparentId mov r8, r0 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r4, r0 mov r0, r7 mov r1, #1 @@ -1038,14 +1038,14 @@ _022FD864: ldrh r2, [r7, #6] strh r2, [sp, #0x1c] str r0, [sp, #0x14] - bl ov29_022F9408 + bl GetMonsterApparentId mov r1, #0 strb r1, [r7, #0x22] ldr r1, [r7, #0xb4] strh r0, [r1, #4] ldr r1, [r7, #0xb4] strh r6, [r1, #2] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [r7, #0xa8] cmp r4, #0 beq _022FD904 @@ -1096,7 +1096,7 @@ _022FD94C: movne r0, #0 and r0, r0, #0xff mov r3, #0 - bl ov29_022FD9D4 + bl InitMonster ldrsh r2, [r5, #2] add r0, r5, #0x124 add r1, r5, #0x12 @@ -1105,7 +1105,7 @@ _022FD94C: add r2, r5, #0x1a add r3, r5, #0x1c str r4, [sp, #4] - bl ov29_022FC234 + bl InitEnemyStatsAndMoves ldrsh r2, [r5, #0x12] ldrsh r1, [r5, #0x16] ldr r0, _022FD9D0 ; =0x000003E7 @@ -1125,8 +1125,8 @@ _022FD94C: _022FD9D0: .word 0x000003E7 arm_func_end ov29_022FD7A0 - arm_func_start ov29_022FD9D4 -ov29_022FD9D4: ; 0x022FD9D4 + arm_func_start InitMonster +InitMonster: ; 0x022FD9D4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0xc ldr r4, _022FDDB0 ; =0x02353538 @@ -1139,7 +1139,7 @@ ov29_022FD9D4: ; 0x022FD9D4 mov r6, r2 mov r0, r4 mov r5, r3 - bl ov29_022FDDC0 + bl SubInitMonster mov r0, #0 ldrb r2, [r6, #2] mov r3, #1 @@ -1155,10 +1155,10 @@ ov29_022FD9D4: ; 0x022FD9D4 mov r0, r7 ldrsh r1, [r6, #0xa] ldrsh r2, [r6, #0xc] - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, r7 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos cmp r8, #0 bne _022FDAD4 ldrsh r1, [r6] @@ -1275,7 +1275,7 @@ _022FDB18: strb r3, [r4, #0x23c] strb r3, [r4, #0x23d] strb r3, [r4, #0x23f] - bl ov29_022FDDC0 + bl SubInitMonster add r0, r4, #0x62 bl ItemZInit mov r2, #0 @@ -1383,10 +1383,10 @@ _022FDDB0: .word 0x02353538 _022FDDB4: .word 0x0000017F _022FDDB8: .word 0x0000028A _022FDDBC: .word 0x0235276C - arm_func_end ov29_022FD9D4 + arm_func_end InitMonster - arm_func_start ov29_022FDDC0 -ov29_022FDDC0: ; 0x022FDDC0 + arm_func_start SubInitMonster +SubInitMonster: ; 0x022FDDC0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 mov r2, #0 @@ -1514,7 +1514,7 @@ _022FDF48: .align 2, 0 _022FDF9C: .word 0x022C4C6C _022FDFA0: .word 0x02353538 - arm_func_end ov29_022FDDC0 + arm_func_end SubInitMonster arm_func_start ov29_022FDFA4 ov29_022FDFA4: ; 0x022FDFA4 @@ -1657,8 +1657,8 @@ _022FE190: .word 0x000055AA _022FE194: .word 0x00005AA5 arm_func_end ov29_022FE048 - arm_func_start ov29_022FE198 -ov29_022FE198: ; 0x022FE198 + arm_func_start MarkShopkeeperSpawn +MarkShopkeeperSpawn: ; 0x022FE198 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr ip, _022FE248 ; =0x02353538 mov r6, #0 @@ -1708,10 +1708,10 @@ _022FE1E8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022FE248: .word 0x02353538 - arm_func_end ov29_022FE198 + arm_func_end MarkShopkeeperSpawn - arm_func_start ov29_022FE24C -ov29_022FE24C: ; 0x022FE24C + arm_func_start SpawnShopkeepers +SpawnShopkeepers: ; 0x022FE24C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x10 ldr r0, _022FE2E0 ; =0x02353538 @@ -1754,7 +1754,7 @@ _022FE2C8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022FE2E0: .word 0x02353538 - arm_func_end ov29_022FE24C + arm_func_end SpawnShopkeepers arm_func_start ov29_022FE2E4 ov29_022FE2E4: ; 0x022FE2E4 @@ -1767,8 +1767,8 @@ ov29_022FE2E4: ; 0x022FE2E4 _022FE2F8: .word 0x02353538 arm_func_end ov29_022FE2E4 - arm_func_start ov29_022FE2FC -ov29_022FE2FC: ; 0x022FE2FC + arm_func_start GetMaxHpAtLevel +GetMaxHpAtLevel: ; 0x022FE2FC stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0xc mov r8, r0 @@ -1782,7 +1782,7 @@ _022FE320: mov r0, r4 mov r1, r8 mov r2, r5 - bl GetLvlStats + bl GetLvlUpEntry ldrh r0, [sp, #4] add r5, r5, #1 add r6, r6, r0 @@ -1792,10 +1792,10 @@ _022FE33C: mov r0, r6 add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} - arm_func_end ov29_022FE2FC + arm_func_end GetMaxHpAtLevel - arm_func_start ov29_022FE350 -ov29_022FE350: ; 0x022FE350 + arm_func_start GetOffensiveStatAtLevel +GetOffensiveStatAtLevel: ; 0x022FE350 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc mov r7, r2 @@ -1812,7 +1812,7 @@ _022FE380: mov r0, r6 mov r1, r5 mov r2, r7 - bl GetLvlStats + bl GetLvlUpEntry ldrb r0, [sb, #6] add r7, r7, #1 add r8, r8, r0 @@ -1824,10 +1824,10 @@ _022FE39C: mov r0, r8 add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_022FE350 + arm_func_end GetOffensiveStatAtLevel - arm_func_start ov29_022FE3B8 -ov29_022FE3B8: ; 0x022FE3B8 + arm_func_start GetDefensiveStatAtLevel +GetDefensiveStatAtLevel: ; 0x022FE3B8 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc mov r7, r2 @@ -1844,7 +1844,7 @@ _022FE3E8: mov r0, r6 mov r1, r5 mov r2, r7 - bl GetLvlStats + bl GetLvlUpEntry ldrb r0, [sb, #8] add r7, r7, #1 add r8, r8, r0 @@ -1856,10 +1856,10 @@ _022FE404: mov r0, r8 add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_022FE3B8 + arm_func_end GetDefensiveStatAtLevel - arm_func_start ov29_022FE420 -ov29_022FE420: ; 0x022FE420 + arm_func_start GetOutlawSpawnData +GetOutlawSpawnData: ; 0x022FE420 stmdb sp!, {r3, r4, r5, lr} ldr r1, _022FE4A0 ; =0x02353538 mov r4, r0 @@ -1868,7 +1868,7 @@ ov29_022FE420: ; 0x022FE420 add r0, r0, #0x400 bl GetMissionRank mov r5, r0 - bl ov29_023491A4 + bl GetMissionDestination ldrsh r2, [r0, #0xe] ldr r0, _022FE4A4 ; =0x020A1998 mov r1, r5, lsl #1 @@ -1895,7 +1895,7 @@ ov29_022FE420: ; 0x022FE420 .align 2, 0 _022FE4A0: .word 0x02353538 _022FE4A4: .word 0x020A1998 - arm_func_end ov29_022FE420 + arm_func_end GetOutlawSpawnData arm_func_start ov29_022FE4A8 ov29_022FE4A8: ; 0x022FE4A8 @@ -1912,7 +1912,7 @@ ExecuteMonsterAction: ; 0x022FE4BC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething bl ov29_022FBD08 mov r0, #1 bl ov29_0234B024 @@ -2196,7 +2196,7 @@ _022FE8D8: mov r2, r8 mov r3, #0 strh r4, [sp, #2] - bl ov29_022F85F0 + bl MoveMonsterToPos ldrb r1, [r6, #0x4c] add r2, sp, #0 mov r0, sb @@ -2210,7 +2210,7 @@ _022FE8D8: beq _022FE95C mov r0, sb mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _022FE94C @@ -2271,7 +2271,7 @@ _022FE9F0: b _022FEBB4 _022FEA08: mov r0, sb - bl ov29_022F52CC + bl UseSingleUseItemWrapper b _022FEBB4 _022FEA14: mov r0, sb @@ -2340,7 +2340,7 @@ _022FEAC8: mov r0, sb bl ov29_022F996C mov r0, sb - bl ov29_022F54BC + bl UseThrowableItem b _022FEBB4 _022FEAEC: mov r0, r4 @@ -2374,7 +2374,7 @@ _022FEB44: mov r2, r4 mov r3, r4 add r1, sb, #4 - bl ov29_022EDFA0 + bl TryTriggerTrap b _022FEBB4 _022FEB5C: mov r0, sb @@ -2406,7 +2406,7 @@ _022FEBAC: strh r0, [r6, #0x4a] _022FEBB4: mov r0, sb - bl ov29_022EDDD4 + bl TrySpawnTrapperTrap mov r0, sb bl EntityIsValid__022FED98 cmp r0, #0 @@ -2462,7 +2462,7 @@ _022FEC68: mov r0, sb bl LogMessageByIdWithPopupCheckUser _022FEC88: - bl ov29_022FF168 + bl TryActivateFlashFireOnAllMonsters bl ov29_022EC85C cmp r0, #0 bne _022FECB4 @@ -2517,7 +2517,7 @@ _022FED48: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _022FED50: mov r0, sb - bl ov29_02321104 + bl EnsureCanStandCurrentTile _022FED58: mov r0, sb bl ov29_0230FC24 diff --git a/asm/overlay_29_022FEDBC.s b/asm/overlay_29_022FEDBC.s index ef9fbb1b..945151b5 100644 --- a/asm/overlay_29_022FEDBC.s +++ b/asm/overlay_29_022FEDBC.s @@ -30,7 +30,7 @@ _022FEDC8: strneb r0, [r8, #0x177] bne _022FEFA4 mov r0, r7 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 moveq r0, #0xff streqb r0, [r8, #0x177] @@ -178,7 +178,7 @@ _022FEFD4: strneb r0, [sl, #0x177] bne _022FF14C mov r0, r8 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 moveq r0, #0xff streqb r0, [sl, #0x178] @@ -268,8 +268,8 @@ _022FF160: .word 0x02353538 _022FF164: .word 0x00000DF4 arm_func_end ov29_022FEFC8 - arm_func_start ov29_022FF168 -ov29_022FF168: ; 0x022FF168 + arm_func_start TryActivateFlashFireOnAllMonsters +TryActivateFlashFireOnAllMonsters: ; 0x022FF168 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, #0 ldr r5, _022FF1C4 ; =0x02353538 @@ -289,7 +289,7 @@ _022FF178: mov r0, r7 mov r1, r7 strb r6, [r2, #0x15c] - bl ov29_02313CE4 + bl ActivateFlashFire _022FF1B4: add r4, r4, #1 cmp r4, #0x14 @@ -297,7 +297,7 @@ _022FF1B4: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022FF1C4: .word 0x02353538 - arm_func_end ov29_022FF168 + arm_func_end TryActivateFlashFireOnAllMonsters arm_func_start HasStatusThatPreventsActing HasStatusThatPreventsActing: ; 0x022FF1C8 @@ -582,7 +582,7 @@ _022FF578: beq _022FF5F0 mov r0, r7 add r1, r4, r1 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _022FF5F0 ldrb r0, [r6, #0xd4] @@ -603,7 +603,7 @@ _022FF5D4: mov r2, r5, lsl #0x10 add r0, r6, #0x4a mov r2, r2, asr #0x10 - bl ov29_022EBC98 + bl SetActionUseMovePlayer mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _022FF5F0: @@ -628,8 +628,8 @@ _022FF624: .word 0x00000C2D _022FF628: .word 0x00000C2F arm_func_end ov29_022FF3F4 - arm_func_start ov29_022FF62C -ov29_022FF62C: ; 0x022FF62C + arm_func_start GetMobilityTypeCheckSlip +GetMobilityTypeCheckSlip: ; 0x022FF62C stmdb sp!, {r4, lr} mov r4, r1 bl GetMobilityType @@ -650,10 +650,10 @@ _022FF660: ldmia sp!, {r4, pc} .align 2, 0 _022FF670: .word 0x0237C9B8 - arm_func_end ov29_022FF62C + arm_func_end GetMobilityTypeCheckSlip - arm_func_start ov29_022FF674 -ov29_022FF674: ; 0x022FF674 + arm_func_start GetMobilityTypeCheckSlipAndFloating +GetMobilityTypeCheckSlipAndFloating: ; 0x022FF674 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r0, [r5, #0xb4] @@ -663,22 +663,22 @@ ov29_022FF674: ; 0x022FF674 movne r2, #0 mov r0, r1 and r1, r2, #0xff - bl ov29_022FF62C + bl GetMobilityTypeCheckSlip mov r4, r0 cmp r4, #3 beq _022FF6BC mov r0, r5 - bl HasConditionalGroundImmunity + bl IsFloating cmp r0, #0 movne r0, #2 ldmneia sp!, {r3, r4, r5, pc} _022FF6BC: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022FF674 + arm_func_end GetMobilityTypeCheckSlipAndFloating - arm_func_start ov29_022FF6C4 -ov29_022FF6C4: ; 0x022FF6C4 + arm_func_start IsInvalidSpawnTile +IsInvalidSpawnTile: ; 0x022FF6C4 stmdb sp!, {r4, lr} mov r4, r1 ldr r1, [r4, #0xc] @@ -690,7 +690,7 @@ ov29_022FF6C4: ; 0x022FF6C4 movne r0, #1 ldmneia sp!, {r4, pc} mov r1, #0 - bl ov29_022FF62C + bl GetMobilityTypeCheckSlip ldrh r1, [r4] cmp r0, #3 and r1, r1, #3 @@ -725,10 +725,10 @@ _022FF754: _022FF75C: mov r0, #1 ldmia sp!, {r4, pc} - arm_func_end ov29_022FF6C4 + arm_func_end IsInvalidSpawnTile - arm_func_start ov29_022FF764 -ov29_022FF764: ; 0x022FF764 + arm_func_start CannotStandOnTile +CannotStandOnTile: ; 0x022FF764 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r1 mov r6, r0 @@ -759,7 +759,7 @@ ov29_022FF764: ; 0x022FF764 tst r0, #0x10 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _022FF810 ldrb r0, [r5, #0xef] @@ -775,12 +775,12 @@ ov29_022FF764: ; 0x022FF764 _022FF810: ldrsh r1, [r5, #2] mov r0, r6 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldrh r2, [r4] mov r1, r0 mov r0, r6 and r4, r2, #3 - bl ov29_022FF8C8 + bl GetMobilityTypeAfterIqSkills cmp r0, #3 addls pc, pc, r0, lsl #2 b _022FF888 @@ -813,7 +813,7 @@ _022FF888: _022FF890: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_022FF764 + arm_func_end CannotStandOnTile arm_func_start ItemIsActive__022FF898 ItemIsActive__022FF898: ; 0x022FF898 @@ -831,8 +831,8 @@ ItemIsActive__022FF898: ; 0x022FF898 ldmia sp!, {r3, r4, r5, pc} arm_func_end ItemIsActive__022FF898 - arm_func_start ov29_022FF8C8 -ov29_022FF8C8: ; 0x022FF8C8 + arm_func_start GetMobilityTypeAfterIqSkills +GetMobilityTypeAfterIqSkills: ; 0x022FF8C8 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -850,7 +850,7 @@ _022FF8EC: movne r4, #3 mov r0, r4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022FF8C8 + arm_func_end GetMobilityTypeAfterIqSkills arm_func_start ov29_022FF908 ov29_022FF908: ; 0x022FF908 @@ -868,7 +868,7 @@ ov29_022FF908: ; 0x022FF908 ldmneia sp!, {r3, r4, r5, pc} ldrsh r1, [r4, #2] mov r0, r5 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating cmp r0, #3 moveq r0, #1 movne r0, #0 @@ -910,7 +910,7 @@ ov29_022FF958: ; 0x022FF958 cmpne r0, #1 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _022FFA0C ldrb r0, [r5, #0xef] @@ -926,12 +926,12 @@ ov29_022FF958: ; 0x022FF958 _022FFA0C: ldrsh r1, [r5, #2] mov r0, r6 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldrh r2, [r4] mov r1, r0 mov r0, r6 and r4, r2, #3 - bl ov29_022FF8C8 + bl GetMobilityTypeAfterIqSkills cmp r0, #3 addls pc, pc, r0, lsl #2 b _022FFA84 @@ -1002,7 +1002,7 @@ ov29_022FFA94: ; 0x022FFA94 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldrsh r1, [r5, #2] mov r0, r6 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldrh r1, [r4] cmp r0, #3 and r1, r1, #3 @@ -1073,7 +1073,7 @@ ov29_022FFB90: ; 0x022FFB90 cmpne r0, #1 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _022FFC44 ldrb r0, [r5, #0xef] @@ -1089,12 +1089,12 @@ ov29_022FFB90: ; 0x022FFB90 _022FFC44: ldrsh r1, [r5, #2] mov r0, r6 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldrh r2, [r4] mov r1, r0 mov r0, r6 and r4, r2, #3 - bl ov29_022FF8C8 + bl GetMobilityTypeAfterIqSkills cmp r0, #3 addls pc, pc, r0, lsl #2 b _022FFC94 @@ -1157,7 +1157,7 @@ _022FFD30: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _022FFD38: - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _022FFD6C ldrb r0, [r5, #0xef] @@ -1173,12 +1173,12 @@ _022FFD38: _022FFD6C: ldrsh r1, [r5, #2] mov r0, r6 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldrh r2, [r4] mov r1, r0 mov r0, r6 and r4, r2, #3 - bl ov29_022FF8C8 + bl GetMobilityTypeAfterIqSkills cmp r0, #3 addls pc, pc, r0, lsl #2 b _022FFDE4 @@ -1385,7 +1385,7 @@ _02300028: ldr r0, [sl, #0xb4] mov r2, r5 mov r1, #0x40 - bl ov29_023023C0 + bl UpdateStateFlags cmp r0, #0 beq _023000C8 mov r0, sl @@ -1400,7 +1400,7 @@ _02300068: ldr r0, [sl, #0xb4] mov r2, r5 mov r1, #0x40 - bl ov29_023023C0 + bl UpdateStateFlags cmp r0, #0 beq _023000C8 mov r0, sl diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index ee9d07bc..9dbd44ed 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_02300108 -ov29_02300108: ; 0x02300108 + arm_func_start GetMonsterDisplayNameType +GetMonsterDisplayNameType: ; 0x02300108 ldr r1, _02300160 ; =0x02353538 ldr r1, [r1] add r1, r1, #0x1a000 @@ -31,15 +31,15 @@ _0230014C: bx lr .align 2, 0 _02300160: .word 0x02353538 - arm_func_end ov29_02300108 + arm_func_end GetMonsterDisplayNameType - arm_func_start ov29_02300164 -ov29_02300164: ; 0x02300164 + arm_func_start GetMonsterName +GetMonsterName: ; 0x02300164 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 mov r0, r4 - bl ov29_02300108 + bl GetMonsterDisplayNameType cmp r0, #1 bne _02300190 ldr r1, _02300274 ; =0x00000C34 @@ -113,7 +113,7 @@ _0230025C: .align 2, 0 _02300274: .word 0x00000C34 _02300278: .word 0x00000C32 - arm_func_end ov29_02300164 + arm_func_end GetMonsterName arm_func_start ov29_0230027C ov29_0230027C: ; 0x0230027C @@ -132,7 +132,7 @@ ov29_0230027C: ; 0x0230027C bl SprintfStatic b _023002B8 _023002B4: - bl ov29_02300164 + bl GetMonsterName _023002B8: add sp, sp, #0x100 ldmia sp!, {r4, pc} @@ -149,7 +149,7 @@ SprintfStatic: ; 0x023002C8 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -211,7 +211,7 @@ _0230038C: bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy ldmia sp!, {r4, pc} _023003B0: ldrb r0, [r1, #0xd8] @@ -221,7 +221,7 @@ _023003B0: bl StringFromMessageId mov r1, r0 mov r0, r4 - bl Strcpy + bl strcpy ldmia sp!, {r4, pc} _023003D4: ldrb r0, [r1, #6] @@ -261,11 +261,11 @@ ov29_0230040C: ; 0x0230040C b _02300490 _02300448: mov r1, r5 - bl ov29_02300164 + bl GetMonsterName b _02300490 _02300454: mov r0, r5 - bl ov29_02300108 + bl GetMonsterDisplayNameType cmp r0, #0 bne _02300478 ldrsh r1, [r5, #4] @@ -276,7 +276,7 @@ _02300454: _02300478: mov r0, r4 mov r1, r5 - bl ov29_02300164 + bl GetMonsterName b _02300490 _02300488: mov r1, r5 @@ -292,8 +292,8 @@ _02300490: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_0230040C - arm_func_start ov29_023004B0 -ov29_023004B0: ; 0x023004B0 + arm_func_start IsMonsterDrowsy +IsMonsterDrowsy: ; 0x023004B0 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xbd] cmp r0, #1 @@ -307,10 +307,10 @@ ov29_023004B0: ; 0x023004B0 movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_023004B0 + arm_func_end IsMonsterDrowsy - arm_func_start ov29_023004E4 -ov29_023004E4: ; 0x023004E4 + arm_func_start MonsterHasNonvolatileNonsleepStatus +MonsterHasNonvolatileNonsleepStatus: ; 0x023004E4 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xbf] cmp r0, #0 @@ -318,10 +318,10 @@ ov29_023004E4: ; 0x023004E4 moveq r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_023004E4 + arm_func_end MonsterHasNonvolatileNonsleepStatus - arm_func_start ov29_02300500 -ov29_02300500: ; 0x02300500 + arm_func_start MonsterHasImmobilizingStatus +MonsterHasImmobilizingStatus: ; 0x02300500 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xc4] cmp r0, #3 @@ -330,10 +330,10 @@ ov29_02300500: ; 0x02300500 movne r0, #1 moveq r0, #0 bx lr - arm_func_end ov29_02300500 + arm_func_end MonsterHasImmobilizingStatus - arm_func_start ov29_02300520 -ov29_02300520: ; 0x02300520 + arm_func_start MonsterHasAttackInterferingStatus +MonsterHasAttackInterferingStatus: ; 0x02300520 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xd0] cmp r0, #0 @@ -341,10 +341,10 @@ ov29_02300520: ; 0x02300520 moveq r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_02300520 + arm_func_end MonsterHasAttackInterferingStatus - arm_func_start ov29_0230053C -ov29_0230053C: ; 0x0230053C + arm_func_start MonsterHasSkillInterferingStatus +MonsterHasSkillInterferingStatus: ; 0x0230053C ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xd8] cmp r0, #1 @@ -364,10 +364,10 @@ ov29_0230053C: ; 0x0230053C movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_0230053C + arm_func_end MonsterHasSkillInterferingStatus - arm_func_start ov29_02300588 -ov29_02300588: ; 0x02300588 + arm_func_start MonsterHasLeechSeedStatus +MonsterHasLeechSeedStatus: ; 0x02300588 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xe0] cmp r0, #1 @@ -375,10 +375,10 @@ ov29_02300588: ; 0x02300588 movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_02300588 + arm_func_end MonsterHasLeechSeedStatus - arm_func_start ov29_023005A4 -ov29_023005A4: ; 0x023005A4 + arm_func_start MonsterHasWhifferStatus +MonsterHasWhifferStatus: ; 0x023005A4 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xec] cmp r0, #2 @@ -386,10 +386,10 @@ ov29_023005A4: ; 0x023005A4 movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_023005A4 + arm_func_end MonsterHasWhifferStatus - arm_func_start ov29_023005C0 -ov29_023005C0: ; 0x023005C0 + arm_func_start IsMonsterVisuallyImpaired +IsMonsterVisuallyImpaired: ; 0x023005C0 stmdb sp!, {r4, lr} ldr r4, [r0, #0xb4] bl IsBlinded @@ -405,10 +405,10 @@ ov29_023005C0: ; 0x023005C0 movne r0, #0 and r0, r0, #0xff ldmia sp!, {r4, pc} - arm_func_end ov29_023005C0 + arm_func_end IsMonsterVisuallyImpaired - arm_func_start ov29_023005FC -ov29_023005FC: ; 0x023005FC + arm_func_start IsMonsterMuzzled +IsMonsterMuzzled: ; 0x023005FC ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xf3] cmp r0, #1 @@ -416,10 +416,10 @@ ov29_023005FC: ; 0x023005FC movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_023005FC + arm_func_end IsMonsterMuzzled - arm_func_start ov29_02300618 -ov29_02300618: ; 0x02300618 + arm_func_start MonsterHasMiracleEyeStatus +MonsterHasMiracleEyeStatus: ; 0x02300618 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xf5] cmp r0, #1 @@ -427,61 +427,61 @@ ov29_02300618: ; 0x02300618 movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_02300618 + arm_func_end MonsterHasMiracleEyeStatus - arm_func_start ov29_02300634 -ov29_02300634: ; 0x02300634 + arm_func_start MonsterHasNegativeStatus +MonsterHasNegativeStatus: ; 0x02300634 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r4, [r6, #0xb4] mov r5, r1 - bl ov29_023004B0 + bl IsMonsterDrowsy cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_023004E4 + bl MonsterHasNonvolatileNonsleepStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_02300500 + bl MonsterHasImmobilizingStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_02300520 + bl MonsterHasAttackInterferingStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_0230053C + bl MonsterHasSkillInterferingStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_02300588 + bl MonsterHasLeechSeedStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_023005A4 + bl MonsterHasWhifferStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 - bl ov29_023005C0 + bl IsMonsterVisuallyImpaired cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_023005FC + bl IsMonsterMuzzled cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 - bl ov29_02300618 + bl MonsterHasMiracleEyeStatus cmp r0, #0 movne r0, #1 ldmneia sp!, {r4, r5, r6, pc} @@ -529,10 +529,10 @@ _02300798: blt _02300780 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_02300634 + arm_func_end MonsterHasNegativeStatus - arm_func_start ov29_023007A8 -ov29_023007A8: ; 0x023007A8 + arm_func_start IsMonsterSleeping +IsMonsterSleeping: ; 0x023007A8 ldr r0, [r0, #0xb4] ldrb r0, [r0, #0xbd] cmp r0, #1 @@ -546,7 +546,7 @@ ov29_023007A8: ; 0x023007A8 movne r0, #0 and r0, r0, #0xff bx lr - arm_func_end ov29_023007A8 + arm_func_end IsMonsterSleeping arm_func_start ov29_023007DC ov29_023007DC: ; 0x023007DC @@ -1039,7 +1039,7 @@ ov29_02300E78: ; 0x02300E78 ldr r2, [r6, #0xb4] mov r5, r1 ldrsh r1, [r2, #2] - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02300F24 ; =0x0235171C mov ip, r5, lsl #2 ldr r1, _02300F28 ; =0x0235171E @@ -1062,7 +1062,7 @@ ov29_02300E78: ; 0x02300E78 mov r0, r6 mov r1, r4 and r2, r5, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r4, r0 ldrsh r0, [r6, #4] ldrsh r1, [r6, #6] @@ -1083,13 +1083,13 @@ _02300F28: .word 0x0235171E _02300F2C: .word 0x02352798 arm_func_end ov29_02300E78 - arm_func_start ov29_02300F30 -ov29_02300F30: ; 0x02300F30 + arm_func_start GetDirectionalMobilityType +GetDirectionalMobilityType: ; 0x02300F30 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 mov r4, r2 - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 bne _02300FC4 ldr r0, [r6, #0xb4] @@ -1126,7 +1126,7 @@ _02300F98: _02300FC4: mov r0, r5 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_02300F30 + arm_func_end GetDirectionalMobilityType arm_func_start ov29_02300FCC ov29_02300FCC: ; 0x02300FCC @@ -1169,14 +1169,14 @@ _02301054: .word 0x0235171E _02301058: .word 0x02352790 arm_func_end ov29_02300FCC - arm_func_start ov29_0230105C -ov29_0230105C: ; 0x0230105C + arm_func_start CanMonsterMoveInDirection +CanMonsterMoveInDirection: ; 0x0230105C stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r2, [r6, #0xb4] mov r5, r1 ldrsh r1, [r2, #2] - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldr r2, _0230110C ; =0x0235171C mov ip, r5, lsl #2 ldr r1, _02301110 ; =0x0235171E @@ -1201,7 +1201,7 @@ ov29_0230105C: ; 0x0230105C mov r0, r6 mov r1, r4 and r2, r5, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r4, r0 ldrsh r0, [r6, #4] ldrsh r1, [r6, #6] @@ -1219,7 +1219,7 @@ ov29_0230105C: ; 0x0230105C _0230110C: .word 0x0235171C _02301110: .word 0x0235171E _02301114: .word 0x02352788 - arm_func_end ov29_0230105C + arm_func_end CanMonsterMoveInDirection arm_func_start IsMonsterCornered IsMonsterCornered: ; 0x02301118 @@ -1250,7 +1250,7 @@ ov29_02301158: ; 0x02301158 ldr r2, [r6, #0xb4] mov r5, r1 ldrsh r1, [r2, #2] - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02301228 ; =0x0235171C mov ip, r5, lsl #2 ldr r1, _0230122C ; =0x0235171E @@ -1283,7 +1283,7 @@ _023011E0: mov r0, r6 mov r1, r4 and r2, r5, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r4, r0 ldrsh r0, [r6, #4] ldrsh r1, [r6, #6] @@ -1311,7 +1311,7 @@ CanAttackInDirection: ; 0x02301234 ldr r2, [r6, #0xb4] mov r5, r1 ldrsh r1, [r2, #2] - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating mov r4, r0 ldr r1, _023012EC ; =0x0235171C mov ip, r5, lsl #2 @@ -1338,7 +1338,7 @@ CanAttackInDirection: ; 0x02301234 mov r0, r6 mov r1, r4 and r2, r5, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r4, r0 ldrsh r0, [r6, #4] ldrsh r1, [r6, #6] @@ -1366,7 +1366,7 @@ CanAiMonsterMoveInDirection: ; 0x023012F8 mov r7, r1 ldrsh r1, [r3, #2] mov r6, r2 - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating mov r1, #0 strb r1, [r6] ldr r2, _02301484 ; =0x0235171C @@ -1444,7 +1444,7 @@ _0230142C: mov r0, r8 mov r1, r5 and r2, r7, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r5, r0 ldrsh r0, [r8, #4] ldrsh r1, [r8, #6] @@ -1477,11 +1477,11 @@ ov29_02301498: ; 0x02301498 mov r5, r0 ldr r1, [r5, #0xb4] ldrsh r1, [r1, #2] - bl ov29_022FF674 + bl GetMobilityTypeCheckSlipAndFloating mov r1, r0 mov r0, r5 mov r2, #0xff - bl ov29_02300F30 + bl GetDirectionalMobilityType mov r4, r0 cmp r4, #3 bne _023014FC @@ -1664,7 +1664,7 @@ ov29_023016D8: ; 0x023016D8 and r2, r1, #0xff mov r0, r4 mov r1, #4 - bl ov29_023023C0 + bl UpdateStateFlags cmp r5, #0 cmpne r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -1813,8 +1813,8 @@ ov29_023018AC: ; 0x023018AC ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_023018AC - arm_func_start ov29_02301940 -ov29_02301940: ; 0x02301940 + arm_func_start SafeguardIsActive +SafeguardIsActive: ; 0x02301940 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 ldr r3, [r4, #0xb4] @@ -1839,10 +1839,10 @@ _02301988: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02301990: .word 0x00000C36 - arm_func_end ov29_02301940 + arm_func_end SafeguardIsActive - arm_func_start ov29_02301994 -ov29_02301994: ; 0x02301994 + arm_func_start LeafGuardIsActive +LeafGuardIsActive: ; 0x02301994 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -1876,7 +1876,7 @@ _02301A00: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02301A08: .word 0x00000C37 - arm_func_end ov29_02301994 + arm_func_end LeafGuardIsActive arm_func_start DefenderAbilityIsActive__02301A0C DefenderAbilityIsActive__02301A0C: ; 0x02301A0C @@ -1966,8 +1966,8 @@ _02301B24: .word 0x023535C0 _02301B28: .word 0x00000C39 arm_func_end ov29_02301A84 - arm_func_start ov29_02301B2C -ov29_02301B2C: ; 0x02301B2C + arm_func_start IsProtectedFromStatDrops +IsProtectedFromStatDrops: ; 0x02301B2C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r0, #0 @@ -1976,7 +1976,7 @@ ov29_02301B2C: ; 0x02301B2C mov r2, r0 bl SubstitutePlaceholderStringTags mov r0, r6 - bl ov29_023197CC + bl MistIsActive movs r4, r0 beq _02301BB0 cmp r5, #0 @@ -2039,7 +2039,7 @@ _02301C18: _02301C20: .word 0x00000C38 _02301C24: .word 0x00000C39 _02301C28: .word 0x00000C3A - arm_func_end ov29_02301B2C + arm_func_end IsProtectedFromStatDrops arm_func_start ov29_02301C2C ov29_02301C2C: ; 0x02301C2C @@ -2141,16 +2141,16 @@ _02301D58: ldmia sp!, {r3, r4, r5, pc} arm_func_end AbilityIsActive - arm_func_start AbilityIsActive2 -AbilityIsActive2: ; 0x02301D78 + arm_func_start AbilityIsActiveVeneer +AbilityIsActiveVeneer: ; 0x02301D78 ldr ip, _02301D80 ; =AbilityIsActive bx ip .align 2, 0 _02301D80: .word AbilityIsActive - arm_func_end AbilityIsActive2 + arm_func_end AbilityIsActiveVeneer - arm_func_start ov29_02301D84 -ov29_02301D84: ; 0x02301D84 + arm_func_start OtherMonsterAbilityIsActive +OtherMonsterAbilityIsActive: ; 0x02301D84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r7, r0 mov r6, r1 @@ -2192,7 +2192,7 @@ _02301E04: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _02301E14: .word 0x02353538 - arm_func_end ov29_02301D84 + arm_func_end OtherMonsterAbilityIsActive arm_func_start LevitateIsActive LevitateIsActive: ; 0x02301E18 @@ -2230,8 +2230,8 @@ MonsterIsType: ; 0x02301E50 bx lr arm_func_end MonsterIsType - arm_func_start ov29_02301E88 -ov29_02301E88: ; 0x02301E88 + arm_func_start IsTypeAffectedByGravity +IsTypeAffectedByGravity: ; 0x02301E88 stmdb sp!, {r3, lr} cmp r1, #0xa bne _02301EA4 @@ -2242,10 +2242,10 @@ ov29_02301E88: ; 0x02301E88 _02301EA4: mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02301E88 + arm_func_end IsTypeAffectedByGravity - arm_func_start ov29_02301EAC -ov29_02301EAC: ; 0x02301EAC + arm_func_start HasTypeAffectedByGravity +HasTypeAffectedByGravity: ; 0x02301EAC stmdb sp!, {r3, lr} ldr r3, [r0, #0xb4] cmp r1, #0 @@ -2254,16 +2254,16 @@ ov29_02301EAC: ; 0x02301EAC ldrb r2, [r3, #0x5e] cmp r2, r1 bne _02301ED4 - bl ov29_02301E88 + bl IsTypeAffectedByGravity ldmia sp!, {r3, pc} _02301ED4: ldrb r2, [r3, #0x5f] cmp r2, r1 movne r0, #0 ldmneia sp!, {r3, pc} - bl ov29_02301E88 + bl IsTypeAffectedByGravity ldmia sp!, {r3, pc} - arm_func_end ov29_02301EAC + arm_func_end HasTypeAffectedByGravity arm_func_start CanSeeInvisibleMonsters CanSeeInvisibleMonsters: ; 0x02301EEC @@ -2338,8 +2338,8 @@ _02301FAC: _02301FB8: .word 0x02353538 arm_func_end IqSkillIsEnabled - arm_func_start ov29_02301FBC -ov29_02301FBC: ; 0x02301FBC + arm_func_start UpdateIqSkills +UpdateIqSkills: ; 0x02301FBC stmdb sp!, {r4, r5, r6, lr} mov r4, r0 ldrb r0, [r4, #6] @@ -2499,15 +2499,15 @@ _023021C4: .align 2, 0 _023021E8: .word 0x020A188C _023021EC: .word 0x020A18A4 - arm_func_end ov29_02301FBC + arm_func_end UpdateIqSkills arm_func_start ov29_023021F0 ov29_023021F0: ; 0x023021F0 - ldr ip, _023021FC ; =ov29_02301FBC + ldr ip, _023021FC ; =UpdateIqSkills ldr r0, [r0, #0xb4] bx ip .align 2, 0 -_023021FC: .word ov29_02301FBC +_023021FC: .word UpdateIqSkills arm_func_end ov29_023021F0 arm_func_start ov29_02302200 @@ -2534,7 +2534,7 @@ _02302228: beq _02302264 mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -2578,7 +2578,7 @@ _023022C0: cmp r1, r0 bne _023022F4 mov r0, r5 - bl ov29_0231AE90 + bl GetEntityNaturalGiftInfo cmp r0, #0 ldrneb r0, [r0, #2] ldmneia sp!, {r3, r4, r5, pc} @@ -2587,7 +2587,7 @@ _023022F4: cmp r0, #0x1f bne _0230230C mov r0, r5 - bl ov29_0231AF0C + bl GetEntityWeatherBallType ldmia sp!, {r3, r4, r5, pc} _0230230C: mov r0, r4 @@ -2651,8 +2651,8 @@ _023023B8: ldmia sp!, {r4, pc} arm_func_end ov29_02302388 - arm_func_start ov29_023023C0 -ov29_023023C0: ; 0x023023C0 + arm_func_start UpdateStateFlags +UpdateStateFlags: ; 0x023023C0 stmdb sp!, {r3, lr} add r3, r0, #0x100 ldrh ip, [r3, #0x58] @@ -2682,16 +2682,16 @@ ov29_023023C0: ; 0x023023C0 _02302428: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end ov29_023023C0 + arm_func_end UpdateStateFlags - arm_func_start ov29_02302430 -ov29_02302430: ; 0x02302430 + arm_func_start IsProtectedFromNegativeStatus +IsProtectedFromNegativeStatus: ; 0x02302430 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r6, r0 mov r5, r1 mov r4, r2 - bl ov29_02301994 + bl LeafGuardIsActive cmp r0, #0 movne r0, #1 bne _023024D4 @@ -2734,7 +2734,7 @@ _023024D4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023024DC: .word 0x00000C39 - arm_func_end ov29_02302430 + arm_func_end IsProtectedFromNegativeStatus arm_func_start ov29_023024E0 ov29_023024E0: ; 0x023024E0 @@ -2797,7 +2797,7 @@ _02302580: mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r6, lsl #8 bl MultiplyByFixedPoint @@ -2812,7 +2812,7 @@ _023025C0: mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r6, lsl #8 bl MultiplyByFixedPoint @@ -2827,7 +2827,7 @@ _023025F8: mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r6, lsl #8 bl MultiplyByFixedPoint @@ -2848,7 +2848,7 @@ _02302650: mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r6, lsl #8 bl MultiplyByFixedPoint @@ -2883,7 +2883,7 @@ ItemIsActive__023026CC: ; 0x023026CC mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -3010,7 +3010,7 @@ _02302818: mov r1, r5 mov r2, #1 mov r3, r2 - bl ov29_0230303C + bl LevelUp orr r6, r6, r0 _023028C4: ldrb r0, [sb, #0x153] @@ -3037,7 +3037,7 @@ _023028FC: mov r1, r8, lsl #1 add r0, sp, #0x2c ldrsh r0, [r0, r1] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex cmp r0, #0 bne _02302944 _0230292C: diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 0b68448c..5b6ef1e1 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_02302A5C -ov29_02302A5C: ; 0x02302A5C + arm_func_start LevelUpItemEffect +LevelUpItemEffect: ; 0x02302A5C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x74 mov sb, r1 @@ -49,14 +49,14 @@ _02302AA4: beq _02302BA8 ldrsh r1, [r5, #2] add r0, sp, #0x18 - bl GetLvlStats + bl GetLvlUpEntry ldr r1, [sp, #0x18] ldrb r3, [sp, #0x98] str r1, [r5, #0x20] mov r0, sl mov r1, sb mov r2, r8 - bl ov29_0230303C + bl LevelUp orrs r4, r4, r0 beq _02302BA8 ldrb r0, [r5, #6] @@ -115,7 +115,7 @@ _02302BF4: .align 2, 0 _02302BFC: .word 0x000003E7 _02302C00: .word 0x00000F1D - arm_func_end ov29_02302A5C + arm_func_end LevelUpItemEffect arm_func_start ov29_02302C04 ov29_02302C04: ; 0x02302C04 @@ -187,10 +187,10 @@ ov29_02302CC8: ; 0x02302CC8 mov r0, sb mov r1, r4 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster add r0, sp, #0x18 mov r1, r7 - bl ov29_02300164 + bl GetMonsterName add r1, sp, #0x18 mov r0, sb str r1, [r8, #0x38] @@ -217,7 +217,7 @@ _02302D58: cmp r6, #0 beq _02302DEC mov r0, r7 - bl ov29_0234CFEC + bl GetPersonalityIndex mov r6, r0 ldrb r0, [r7, #0x48] bl ov29_0234CFA0 @@ -229,7 +229,7 @@ _02302D58: ldrsh r1, [r7, #4] add r0, sp, #8 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r6 mov r0, r5 bl GetStringFromFileVeneer @@ -244,7 +244,7 @@ _02302DBC: bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcpy + bl strcpy mov r2, r4 mov r0, r5 mov r3, r2 @@ -262,7 +262,7 @@ _02302DEC: bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcat + bl strcat add r4, r4, #1 _02302E18: ldr r0, [r8, #0x28] @@ -275,13 +275,13 @@ _02302E18: ldr r1, _02302F74 ; =0x023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] - bl Strcat + bl strcat _02302E44: ldr r0, _02302F78 ; =0x00000F19 bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcat + bl strcat add r4, r4, #1 _02302E5C: ldr r0, [r8, #0x2c] @@ -294,13 +294,13 @@ _02302E5C: ldr r1, _02302F74 ; =0x023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] - bl Strcat + bl strcat _02302E88: ldr r0, _02302F7C ; =0x00000F1A bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcat + bl strcat add r4, r4, #1 _02302EA0: ldr r0, [r8, #0x30] @@ -313,13 +313,13 @@ _02302EA0: ldr r1, _02302F74 ; =0x023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] - bl Strcat + bl strcat _02302ECC: ldr r0, _02302F80 ; =0x00000F1B bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcat + bl strcat add r4, r4, #1 _02302EE4: ldr r0, [r8, #0x34] @@ -332,13 +332,13 @@ _02302EE4: ldr r1, _02302F74 ; =0x023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] - bl Strcat + bl strcat _02302F10: ldr r0, _02302F84 ; =0x00000F1C bl StringFromMessageId mov r1, r0 mov r0, r5 - bl Strcat + bl strcat _02302F24: ldrb r0, [r5] cmp r0, #0 @@ -354,7 +354,7 @@ _02302F4C: bl GetLeader mov r1, #0 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster add sp, sp, #0x58 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 @@ -369,8 +369,8 @@ _02302F80: .word 0x00000F1B _02302F84: .word 0x00000F1C arm_func_end ov29_02302CC8 - arm_func_start ov29_02302F88 -ov29_02302F88: ; 0x02302F88 + arm_func_start TryDecreaseLevel +TryDecreaseLevel: ; 0x02302F88 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0xc mov r7, r1 @@ -394,7 +394,7 @@ ov29_02302F88: ; 0x02302F88 beq _02303000 ldrsh r1, [r5, #2] add r0, sp, #0 - bl GetLvlStats + bl GetLvlUpEntry ldr r2, [sp] mov r0, r8 mov r1, r7 @@ -419,10 +419,10 @@ _02303030: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02303038: .word 0x00000F1E - arm_func_end ov29_02302F88 + arm_func_end TryDecreaseLevel - arm_func_start ov29_0230303C -ov29_0230303C: ; 0x0230303C + arm_func_start LevelUp +LevelUp: ; 0x0230303C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x18 mov sl, r1 @@ -451,7 +451,7 @@ _0230309C: add r0, sp, #0xc mov r1, fp mov r2, r5 - bl GetLvlStats + bl GetLvlUpEntry ldr r0, [sp, #0xc] cmp r0, r8 bgt _02303264 @@ -465,7 +465,7 @@ _0230309C: mov r0, sl mov r1, #0 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster cmp r6, #0 bne _023030F0 bl ov29_022EAC7C @@ -579,7 +579,7 @@ _02303274: .word 0x000003E7 _02303278: .word 0x0237C9C8 _0230327C: .word 0x0237C9C9 _02303280: .word 0x0237C9C5 - arm_func_end ov29_0230303C + arm_func_end LevelUp arm_func_start ov29_02303284 ov29_02303284: ; 0x02303284 @@ -608,7 +608,7 @@ _023032D8: mov r0, r4 mov r1, r5 mov r2, sb - bl GetLvlStats + bl GetLvlUpEntry ldr r0, [sp, #8] cmp r0, r8 bge _02303304 @@ -629,7 +629,7 @@ _02303314: add r0, sp, #8 mov r1, r5 add r2, sb, #1 - bl GetLvlStats + bl GetLvlUpEntry ldr r0, [sp, #8] sub r0, r0, #1 str r0, [r7, #0x20] @@ -639,7 +639,7 @@ _0230333C: add r0, sp, #8 mov r1, r5 add r2, sb, #1 - bl GetLvlStats + bl GetLvlUpEntry strb sb, [r7, #0xa] ldrh r1, [sp, #0xc] add r0, r7, #0x10 @@ -1199,8 +1199,8 @@ _02303B10: .word 0x00000F28 _02303B14: .word 0x00000F24 arm_func_end ov29_023038D4 - arm_func_start ov29_02303B18 -ov29_02303B18: ; 0x02303B18 + arm_func_start GetMonsterMoves +GetMonsterMoves: ; 0x02303B18 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #4 mov sb, r2 @@ -1223,7 +1223,7 @@ _02303B30: _02303B60: mov r0, r7 mov r1, r6 - bl sub_0205384C + bl GetEncodedHalfword ldrb r1, [r0] add r7, r0, #1 cmp r1, sb @@ -1262,7 +1262,7 @@ _02303BD8: _02303BE4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} - arm_func_end ov29_02303B18 + arm_func_end GetMonsterMoves arm_func_start ov29_02303BEC ov29_02303BEC: ; 0x02303BEC @@ -1326,22 +1326,22 @@ EvolveMonster: ; 0x02303C7C mov r0, #1 bl ov29_0234B06C mov r0, r5 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r5, [r6, #4] strh r5, [r6, #2] mov r4, r0 ldrb r2, [r6, #0xa] add r0, sp, #0x14 mov r1, r5 - bl GetLvlStats + bl GetLvlUpEntry ldr r1, [sp, #0x14] mov r0, r6 str r1, [r6, #0x20] mov r1, #0 strh r4, [r7, #0xa8] - bl ov29_022FDDC0 + bl SubInitMonster mov r0, r7 - bl ov29_022F9194 + bl SetMonsterTypeAndAbility mov r0, r7 mov r1, #7 bl ov29_02304830 @@ -1373,7 +1373,7 @@ _02303D48: bl GetTile mov r1, r0 mov r0, r8 - bl ov29_022FF6C4 + bl IsInvalidSpawnTile cmp r0, #0 beq _02303D8C add r5, r5, #1 @@ -1601,10 +1601,10 @@ _02304044: bne _0230414C cmp r0, #0 beq _023040EC - bl ov29_022F7050 + bl GetLoadedAttackSpriteId mov r1, r0 add r0, r7, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r1, r6, lsl #0x10 mov r3, r1, asr #0x10 @@ -1616,12 +1616,12 @@ _02304044: ldrb r1, [r7, #0xae] ldrb r2, [r7, #0xb0] add r0, r7, #0x2c - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl b _023041E4 _023040EC: ldrsh r1, [r7, #0xa8] add r0, r7, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit ldrb r1, [r7, #0xaa] and r0, r0, #3 @@ -1635,7 +1635,7 @@ _023040EC: ldrb r2, [r7, #0xb0] add r0, r7, #0x2c mov r3, r3, asr #0x10 - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl ldrb r0, [r5, #0x171] cmp r0, #0 beq _023041E4 @@ -1646,10 +1646,10 @@ _023040EC: _0230414C: cmp r0, #0 beq _02304198 - bl ov29_022F7050 + bl GetLoadedAttackSpriteId mov r1, r0 add r0, r7, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r1, r6, lsl #0x10 mov r3, r1, asr #0x10 @@ -1661,14 +1661,14 @@ _0230414C: ldrb r1, [r7, #0xae] ldrb r2, [r7, #0xb0] add r0, r7, #0x2c - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl b _023041E4 _02304198: ldr r0, _023046D0 ; =0x00000229 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r1, r0 add r0, r7, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r1, r6, lsl #0x10 mov r3, r1, asr #0x10 @@ -1682,7 +1682,7 @@ _02304198: add r0, r7, #0x2c ldrb r1, [r7, #0xae] ldrb r2, [r7, #0xb0] - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl _023041E4: ldrb r0, [r7, #0xae] cmp r0, #6 @@ -1997,9 +1997,9 @@ _0230464C: cmp r0, #0 bne _02304690 add r0, r7, #0x2c - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame add r0, r7, #0x2c - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame b _023046B8 _02304690: ldrb r0, [r7, #0xaf] @@ -2011,10 +2011,10 @@ _02304690: cmp r0, #1 ble _023046B8 add r0, r7, #0x2c - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame _023046B8: add r0, r7, #0x2c - bl sub_0201C458 + bl SwitchAnimationControlToNextFrame _023046C0: add sp, sp, #0x38 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} diff --git a/asm/overlay_29_023047DC.s b/asm/overlay_29_023047DC.s index d8873e5e..3a7d388f 100644 --- a/asm/overlay_29_023047DC.s +++ b/asm/overlay_29_023047DC.s @@ -61,7 +61,7 @@ ov29_02304830: ; 0x02304830 bne _023048E0 ldrsh r1, [r5, #0xa8] add r0, r5, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit ldrb r1, [r5, #0xaa] and r0, r0, #3 @@ -75,14 +75,14 @@ ov29_02304830: ; 0x02304830 ldrb r2, [r5, #0xb0] add r0, r5, #0x2c mov r3, r3, asr #0x10 - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl b _0230492C _023048E0: ldr r0, _02304950 ; =0x00000229 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r1, r0 add r0, r5, #0x2c - bl sub_0201C0E8 + bl SetSpriteIdForAnimationControl bl Rand16Bit mov r1, r6, lsl #0x10 mov r3, r1, asr #0x10 @@ -96,7 +96,7 @@ _023048E0: add r0, r5, #0x2c ldrb r1, [r5, #0xae] ldrb r2, [r5, #0xb0] - bl sub_0201C418 + bl SetAndPlayAnimationForAnimationControl _0230492C: mov r0, #0 strb r0, [r5, #0xb2] @@ -328,7 +328,7 @@ ov29_02304BAC: ; 0x02304BAC ldmeqia sp!, {r4, r5, r6, pc} cmp r6, #1 bne _02304BF8 - bl ov29_02337E94 + bl IsWaterTileset cmp r0, #0 ldrne r0, _02304C30 ; =0x02352808 ldrneb r4, [r0, r4] @@ -370,7 +370,7 @@ ov29_02304C3C: ; 0x02304C3C mov r0, r4 ldrb r7, [r1, #0x4c] mov r8, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} mov sb, #0 @@ -483,7 +483,7 @@ ov29_02304D20: ; 0x02304D20 ldr r1, [r5] mov r0, #0x18 mov r1, r1, lsl #1 - bl DivideInt + bl __divsi3 add r1, sb, #0x100 strh r0, [r1, #0xb4] ldr r0, [sb, #0x1ac] @@ -496,7 +496,7 @@ ov29_02304D20: ; 0x02304D20 str r2, [sb, #0x1b0] ldr r1, [r1] mov r1, r1, lsl #1 - bl DivideInt + bl __divsi3 strh r0, [r7, #0x18] ldr r0, [r7, #0x10] mov r0, r0, lsl #1 @@ -516,7 +516,7 @@ _02304E80: ldr r1, [r5] mov r0, r4 add r1, r1, r1, lsl #1 - bl DivideInt + bl __divsi3 add r1, r8, #0x100 strh r0, [r1, #0xb4] ldr r0, [r8, #0x1ac] @@ -540,7 +540,7 @@ _02304E80: mov r0, #0x18 ldr r1, [r1] add r1, r1, r1, lsl #1 - bl DivideInt + bl __divsi3 strh r0, [r7, #0x18] ldr r0, [r7, #0x10] add r0, r0, r0, lsl #1 @@ -561,7 +561,7 @@ _02304F2C: ldr r1, [r5] mov r0, r6 mov r1, r1, lsl #2 - bl DivideInt + bl __divsi3 add r1, sl, #0x100 strh r0, [r1, #0xb4] ldr r0, [sl, #0x1ac] @@ -572,11 +572,11 @@ _02304F2C: mov r0, r0, lsl #2 str r0, [sl, #0x1b0] ldr r0, [sl, #0x1ac] - bl DivideInt + bl __divsi3 str r0, [sl, #0x1ac] ldr r0, [sl, #0x1b0] mov r1, #3 - bl DivideInt + bl __divsi3 add r8, r8, #1 str r0, [sl, #0x1b0] cmp r8, #3 @@ -585,7 +585,7 @@ _02304F2C: mov r0, #0x18 ldr r1, [r1] mov r1, r1, lsl #2 - bl DivideInt + bl __divsi3 strh r0, [r7, #0x18] ldr r0, [r7, #0x10] mov r0, r0, lsl #2 @@ -597,7 +597,7 @@ _02304F2C: _02304FC0: ldr r1, [r5] mov r0, #0x18 - bl DivideInt + bl __divsi3 strh r0, [r7, #0x18] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -695,7 +695,7 @@ _023050EC: add r2, r2, #0x10 mov r2, r2, lsl #8 str r2, [sp, #0x10] - bl ov29_022E1A40 + bl UpdateEntityPixelPos ldr r2, [sb, #0x1a8] mov r0, r8 mov r1, #0 @@ -704,7 +704,7 @@ _023050EC: strh fp, [r0, #0xe] mov r0, r8 mov r6, #1 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r7, r6 _02305160: @@ -807,7 +807,7 @@ _02305258: mov r2, r2, lsl #8 add r1, sp, #4 str r2, [sp, #8] - bl ov29_022E1A40 + bl UpdateEntityPixelPos add r2, sb, #0x200 ldrsh r3, [r2, #0xe] mov r2, #0x1c @@ -825,7 +825,7 @@ _02305314: ldr r1, _02305584 ; =0x0237C9CC mov r0, #0x18 ldr r1, [r1] - bl DivideInt + bl __divsi3 cmp r5, r0 blt _023051B0 _0230532C: @@ -849,7 +849,7 @@ _02305338: beq _0230537C mov r0, r5 mov r1, r4 - bl ov29_022E1A40 + bl UpdateEntityPixelPos _0230537C: add r7, r7, #1 cmp r7, #0x14 @@ -907,10 +907,10 @@ _02305430: cmp r0, #0 beq _0230545C add r0, sb, #4 - bl ov29_02337A3C + bl DiscoverMinimap mov r0, fp bl ov29_022F62CC - bl ov29_022F3634 + bl CheckLeaderTile b _0230547C _0230545C: mov r0, sb @@ -920,7 +920,7 @@ _0230545C: cmp r0, #0 beq _0230552C mov r0, sb - bl ov29_02305694 + bl CheckNonLeaderTile _0230547C: mov r0, sb bl EntityIsValid__0230558C @@ -966,7 +966,7 @@ _023054E4: strneb r7, [r4] bl ov29_022F9C74 mov r0, sb - bl ov29_02321104 + bl EnsureCanStandCurrentTile _0230552C: add sl, sl, #1 _02305530: diff --git a/asm/overlay_29_023055B0.s b/asm/overlay_29_023055B0.s index c55ad1cb..c9c344f8 100644 --- a/asm/overlay_29_023055B0.s +++ b/asm/overlay_29_023055B0.s @@ -68,8 +68,8 @@ _02305684: _02305690: .word 0x02353538 arm_func_end ov29_023055B0 - arm_func_start ov29_02305694 -ov29_02305694: ; 0x02305694 + arm_func_start CheckNonLeaderTile +CheckNonLeaderTile: ; 0x02305694 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 ldr r8, [sb, #0xb4] @@ -88,7 +88,7 @@ ov29_02305694: ; 0x02305694 beq _02305708 mov r0, sb mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _023056F8 @@ -118,7 +118,7 @@ _02305724: ; jump table ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ; case 6 _02305740: mov r0, r4 - bl ov29_022E1608 + bl GetTrapInfo ldrb r1, [r8, #6] mov r6, #0 mov r5, r0 @@ -135,7 +135,7 @@ _02305740: bne _02305790 mov r0, #1 strb r0, [r4, #0x20] - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r7, #1 _02305790: ldrb r0, [r5, #1] @@ -169,13 +169,13 @@ _023057E0: add r1, sb, #4 mov r2, #0 mov r3, #1 - bl ov29_022EDFA0 + bl TryTriggerTrap ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _02305808: mov r0, sb - bl ov29_0230F164 + bl TryNonLeaderItemPickUp ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_02305694 + arm_func_end CheckNonLeaderTile arm_func_start ov29_02305814 ov29_02305814: ; 0x02305814 @@ -210,7 +210,7 @@ ov29_02305814: ; 0x02305814 mov r3, #1 mov r1, r4 strb r3, [r2, #0x794] - bl ov29_02307F4C + bl TryTriggerMonsterHouse mov r0, #0 bl ov29_022E3A58 add r0, r5, #4 @@ -226,8 +226,8 @@ _023058BC: .word 0x02353538 _023058C0: .word 0x00000C82 arm_func_end ov29_02305814 - arm_func_start ov29_023058C4 -ov29_023058C4: ; 0x023058C4 + arm_func_start EndNegativeStatusCondition +EndNegativeStatusCondition: ; 0x023058C4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r4, #0 mov sb, r1 @@ -243,12 +243,12 @@ ov29_023058C4: ; 0x023058C4 mov r0, sb mov r1, r4 ldr r6, [sb, #0xb4] - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 beq _02305AD8 mov r0, sb mov r4, #1 - bl ov29_023004B0 + bl IsMonsterDrowsy cmp r0, #0 beq _0230593C mov r2, r5 @@ -257,7 +257,7 @@ ov29_023058C4: ; 0x023058C4 mov r1, sb mov r3, r2 str fp, [sp] - bl ov29_02305FDC + bl EndSleepClassStatus _0230593C: mov r0, sb bl EntityIsValid__02305C04 @@ -265,18 +265,18 @@ _0230593C: moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, sb - bl ov29_023004E4 + bl MonsterHasNonvolatileNonsleepStatus cmp r0, #0 beq _0230596C mov r0, sl mov r1, sb - bl ov29_023061A8 + bl EndBurnClassStatus _0230596C: ldrb r0, [sp, #0x28] cmp r0, #0 mov r0, sb beq _0230599C - bl ov29_02300500 + bl MonsterHasImmobilizingStatus cmp r0, #0 beq _023059C0 mov r0, sl @@ -285,7 +285,7 @@ _0230596C: bl EndFrozenClassStatus b _023059C0 _0230599C: - bl ov29_02300500 + bl MonsterHasImmobilizingStatus cmp r0, #0 ldrneb r0, [r6, #0xc4] cmpne r0, #3 @@ -296,7 +296,7 @@ _0230599C: bl EndFrozenClassStatus _023059C0: mov r0, sb - bl ov29_02300520 + bl MonsterHasAttackInterferingStatus cmp r0, #0 beq _023059DC mov r0, sl @@ -304,55 +304,55 @@ _023059C0: bl EndCringeClassStatus _023059DC: mov r0, sb - bl ov29_0230053C + bl MonsterHasSkillInterferingStatus cmp r0, #0 beq _02305A00 mov r0, sl mov r1, sb mov r2, #0 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus _02305A00: mov r0, sb - bl ov29_02300588 + bl MonsterHasLeechSeedStatus cmp r0, #0 beq _02305A1C mov r0, sl mov r1, sb - bl ov29_023068C4 + bl EndLeechSeedClassStatus _02305A1C: mov r0, sb - bl ov29_023005A4 + bl MonsterHasWhifferStatus cmp r0, #0 beq _02305A38 mov r0, sl mov r1, sb - bl ov29_02306950 + bl EndSureShotClassStatus _02305A38: mov r0, sb mov r1, #0 - bl ov29_023005C0 + bl IsMonsterVisuallyImpaired cmp r0, #0 beq _02305A58 mov r0, sl mov r1, sb - bl ov29_02306B28 + bl EndBlinkerClassStatus _02305A58: mov r0, sb - bl ov29_023005FC + bl IsMonsterMuzzled cmp r0, #0 beq _02305A74 mov r0, sl mov r1, sb - bl ov29_02306BF8 + bl EndMuzzledStatus _02305A74: mov r0, sb - bl ov29_02300618 + bl MonsterHasMiracleEyeStatus cmp r0, #0 beq _02305A90 mov r0, sl mov r1, sb - bl ov29_02306C64 + bl EndMiracleEyeStatus _02305A90: ldrb r0, [r6, #0x106] cmp r0, #0 @@ -457,4 +457,4 @@ _02305BF4: .word 0x00000C84 _02305BF8: .word 0x02353318 _02305BFC: .word 0x00000C85 _02305C00: .word 0x00000C86 - arm_func_end ov29_023058C4 + arm_func_end EndNegativeStatusCondition diff --git a/asm/overlay_29_02305C28.s b/asm/overlay_29_02305C28.s index 029ab4fe..a6376887 100644 --- a/asm/overlay_29_02305C28.s +++ b/asm/overlay_29_02305C28.s @@ -3,17 +3,17 @@ .text - arm_func_start ov29_02305C28 -ov29_02305C28: ; 0x02305C28 + arm_func_start EndNegativeStatusConditionWrapper +EndNegativeStatusConditionWrapper: ; 0x02305C28 stmdb sp!, {r3, lr} mov ip, #0 str ip, [sp] - bl ov29_023058C4 + bl EndNegativeStatusCondition ldmia sp!, {r3, pc} - arm_func_end ov29_02305C28 + arm_func_end EndNegativeStatusConditionWrapper - arm_func_start ov29_02305C3C -ov29_02305C3C: ; 0x02305C3C + arm_func_start TransferNegativeStatusCondition +TransferNegativeStatusCondition: ; 0x02305C3C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xb8 mov sb, r0 @@ -30,7 +30,7 @@ ov29_02305C3C: ; 0x02305C3C mov r1, r5 ldr r6, [sb, #0xb4] ldr r7, [r8, #0xb4] - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 beq _02305D28 mov r0, sb @@ -63,7 +63,7 @@ ov29_02305C3C: ; 0x02305C3C orr r5, r5, r0 mov r0, sb mov r1, r8 - bl ov29_023078EC + bl TransferNegativeBlinkerClassStatus orr r5, r5, r0 mov r0, sb mov r1, r8 @@ -80,7 +80,7 @@ _02305D28: mov r0, sb mov r1, r8 mov r2, #1 - bl ov29_0231662C + bl TryInflictPerishSongStatus cmp r0, #0 ldrneb r1, [r6, #0x106] orrne r0, r5, #0x11 @@ -98,7 +98,7 @@ _02305D68: mov r1, r8 mov r2, #0 mov r3, #1 - bl ov29_023174C8 + bl TryInflictExposedStatus cmp r0, #0 ldrneb r1, [r6, #0xfe] orrne r0, r5, #0x11 @@ -112,13 +112,13 @@ _02305DAC: mov r0, sb mov r1, r8 mov r2, #0 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 bne _02305E08 mov r0, sb mov r1, r8 mov r2, #0 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 bne _02305E08 mov r2, #0 @@ -231,7 +231,7 @@ _02305F4C: _02305F54: .word 0x00000CCC _02305F58: .word 0x00000CCB _02305F5C: .word 0x00000CCA - arm_func_end ov29_02305C3C + arm_func_end TransferNegativeStatusCondition arm_func_start ov29_02305F60 ov29_02305F60: ; 0x02305F60 @@ -244,7 +244,7 @@ ov29_02305F60: ; 0x02305F60 ldr r5, [r4, #0xb4] mov r1, #0 mov r0, r5 - bl ov29_022FDDC0 + bl SubInitMonster mov ip, #0 strb ip, [r5, #0x106] strb ip, [r5, #0xfe] @@ -269,8 +269,8 @@ _02305FA0: ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_02305F60 - arm_func_start ov29_02305FDC -ov29_02305FDC: ; 0x02305FDC + arm_func_start EndSleepClassStatus +EndSleepClassStatus: ; 0x02305FDC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r1 mov sb, r0 @@ -324,7 +324,7 @@ _02306070: ldrsh r1, [r0] mov r0, r8 mov r2, #8 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02306164 _023060A8: mov r0, sb @@ -354,7 +354,7 @@ _023060E8: mov r1, r8 mov r3, r2 str r6, [sp] - bl ov29_023058C4 + bl EndNegativeStatusCondition b _02306164 _02306118: cmp r7, #0 @@ -396,10 +396,10 @@ _02306198: .word 0x0000024E _0230619C: .word 0x022C45A0 _023061A0: .word 0x022C4868 _023061A4: .word 0x00000C91 - arm_func_end ov29_02305FDC + arm_func_end EndSleepClassStatus - arm_func_start ov29_023061A8 -ov29_023061A8: ; 0x023061A8 + arm_func_start EndBurnClassStatus +EndBurnClassStatus: ; 0x023061A8 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -409,7 +409,7 @@ ov29_023061A8: ; 0x023061A8 ldmeqia sp!, {r4, r5, r6, pc} mov r0, #0 ldr r4, [r5, #0xb4] - arm_func_end ov29_023061A8 + arm_func_end EndBurnClassStatus arm_func_start ov29_023061CC ov29_023061CC: ; 0x023061CC @@ -658,8 +658,8 @@ _023064EC: .word 0x00000CB7 _023064F0: .word 0x00000CBC arm_func_end EndCringeClassStatus - arm_func_start ov29_023064F4 -ov29_023064F4: ; 0x023064F4 + arm_func_start EndReflectClassStatus +EndReflectClassStatus: ; 0x023064F4 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -800,10 +800,10 @@ _023066C8: .word 0x00000CB4 _023066CC: .word 0x00000CB5 _023066D0: .word 0x00000CBE _023066D4: .word 0x00000CC1 - arm_func_end ov29_023064F4 + arm_func_end EndReflectClassStatus - arm_func_start ov29_023066D8 -ov29_023066D8: ; 0x023066D8 + arm_func_start TryRemoveSnatchedMonsterFromDungeonStruct +TryRemoveSnatchedMonsterFromDungeonStruct: ; 0x023066D8 stmdb sp!, {r4, lr} mov r4, r1 mov r0, r4 @@ -825,10 +825,10 @@ ov29_023066D8: ; 0x023066D8 ldmia sp!, {r4, pc} .align 2, 0 _02306724: .word 0x02353538 - arm_func_end ov29_023066D8 + arm_func_end TryRemoveSnatchedMonsterFromDungeonStruct - arm_func_start ov29_02306728 -ov29_02306728: ; 0x02306728 + arm_func_start EndCurseClassStatus +EndCurseClassStatus: ; 0x02306728 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r7, r1 mov r8, r0 @@ -874,7 +874,7 @@ _023067AC: _023067C4: mov r0, r8 mov r1, r7 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct b _02306894 _023067D4: mov r1, #0 @@ -943,10 +943,10 @@ _023068B4: .word 0x00000CA5 _023068B8: .word 0x00000CBF _023068BC: .word 0x00000CC2 _023068C0: .word 0x00000CC3 - arm_func_end ov29_02306728 + arm_func_end EndCurseClassStatus - arm_func_start ov29_023068C4 -ov29_023068C4: ; 0x023068C4 + arm_func_start EndLeechSeedClassStatus +EndLeechSeedClassStatus: ; 0x023068C4 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -987,10 +987,10 @@ _0230692C: .align 2, 0 _02306948: .word 0x00000C94 _0230694C: .word 0x00000CAF - arm_func_end ov29_023068C4 + arm_func_end EndLeechSeedClassStatus - arm_func_start ov29_02306950 -ov29_02306950: ; 0x02306950 + arm_func_start EndSureShotClassStatus +EndSureShotClassStatus: ; 0x02306950 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -1042,10 +1042,10 @@ _023069E0: _023069F4: .word 0x00000CA1 _023069F8: .word 0x00000CA2 _023069FC: .word 0x00000CA3 - arm_func_end ov29_02306950 + arm_func_end EndSureShotClassStatus - arm_func_start ov29_02306A00 -ov29_02306A00: ; 0x02306A00 + arm_func_start EndInvisibleClassStatus +EndInvisibleClassStatus: ; 0x02306A00 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r1 mov r4, #0 @@ -1085,10 +1085,10 @@ _02306A74: _02306A84: ldrsh r1, [r6, #2] mov r0, r8 - bl ov29_022F9408 + bl GetMonsterApparentId strh r0, [r6, #4] ldrsh r0, [r6, #4] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [r8, #0xa8] mov r0, r8 bl GetSleepAnimationId @@ -1122,17 +1122,17 @@ _02306AFC: cmp r5, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r8 - bl ov29_02321104 + bl EnsureCanStandCurrentTile ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02306B18: .word 0x00000CA8 _02306B1C: .word 0x00000CB8 _02306B20: .word 0x00000CB6 _02306B24: .word 0x00000CAC - arm_func_end ov29_02306A00 + arm_func_end EndInvisibleClassStatus - arm_func_start ov29_02306B28 -ov29_02306B28: ; 0x02306B28 + arm_func_start EndBlinkerClassStatus +EndBlinkerClassStatus: ; 0x02306B28 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -1184,18 +1184,18 @@ _02306BB8: ldmeqia sp!, {r3, r4, r5, pc} mov r0, #0x31 bl AdvanceFrame - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02306BE8: .word 0x00000CA9 _02306BEC: .word 0x00000CAA _02306BF0: .word 0x00000CAB _02306BF4: .word 0x00000CAD - arm_func_end ov29_02306B28 + arm_func_end EndBlinkerClassStatus - arm_func_start ov29_02306BF8 -ov29_02306BF8: ; 0x02306BF8 + arm_func_start EndMuzzledStatus +EndMuzzledStatus: ; 0x02306BF8 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -1226,10 +1226,10 @@ _02306C4C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02306C60: .word 0x00000CB9 - arm_func_end ov29_02306BF8 + arm_func_end EndMuzzledStatus - arm_func_start ov29_02306C64 -ov29_02306C64: ; 0x02306C64 + arm_func_start EndMiracleEyeStatus +EndMiracleEyeStatus: ; 0x02306C64 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -1244,7 +1244,7 @@ ov29_02306C64: ; 0x02306C64 ldrb r0, [r4, #0xf5] cmp r0, #0 beq _02306CB8 - arm_func_end ov29_02306C64 + arm_func_end EndMiracleEyeStatus arm_func_start ov29_02306C9C ov29_02306C9C: ; 0x02306C9C @@ -1266,8 +1266,8 @@ _02306CB8: _02306CCC: .word 0x00000CC4 arm_func_end ov29_02306C9C - arm_func_start ov29_02306CD0 -ov29_02306CD0: ; 0x02306CD0 + arm_func_start EndMagnetRiseStatus +EndMagnetRiseStatus: ; 0x02306CD0 stmdb sp!, {r4, r5, r6, lr} mov r6, r1 mov r0, r6 @@ -1304,7 +1304,7 @@ _02306D2C: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02306D50: .word 0x00000CC5 - arm_func_end ov29_02306CD0 + arm_func_end EndMagnetRiseStatus arm_func_start ov29_02306D54 ov29_02306D54: ; 0x02306D54 @@ -1332,7 +1332,7 @@ _02306DA0: cmp r0, #0 beq _02306DB0 mov r0, sb - bl ov29_02306CD0 + bl EndMagnetRiseStatus _02306DB0: add r0, r8, #1 mov r0, r0, lsl #0x10 @@ -1689,7 +1689,7 @@ _02307280: mov r0, sb mov r1, r8 mov r2, #1 - bl ov29_023163A8 + bl TryInflictTauntStatus mov sl, r0 mov r4, #1 b _0230731C @@ -1717,7 +1717,7 @@ _023072E4: mov r0, sb mov r1, r8 mov r2, #1 - bl ov29_02316720 + bl TryInflictEncoreStatus mov sl, r0 mov r4, #1 b _0230731C @@ -1809,7 +1809,7 @@ _0230741C: mov r1, r8 mov r3, r2 str r4, [sp] - bl ov29_02315E24 + bl TryInflictDecoyStatus mov r5, r0 b _0230749C _02307440: @@ -1817,7 +1817,7 @@ _02307440: mov r1, r8 mov r2, r4 mov r3, #1 - bl ov29_0231827C + bl TryInflictGastroAcidStatus mov r5, r0 mov r4, #1 b _0230749C @@ -1826,7 +1826,7 @@ _02307460: mov r1, r8 mov r2, r4 mov r3, #1 - bl ov29_023185A8 + bl TryInflictHealBlockStatus mov r5, r0 mov r4, #1 b _0230749C @@ -1835,7 +1835,7 @@ _02307480: mov r1, r8 mov r2, r4 mov r3, #1 - bl ov29_0231872C + bl TryInflictEmbargoStatus mov r5, r0 mov r4, #1 _0230749C: @@ -1856,7 +1856,7 @@ _023074C8: beq _02307500 mov r0, sb mov r1, r8 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct add r3, r7, #0xd8 add r2, sl, #0xd8 mov r1, #5 @@ -1874,7 +1874,7 @@ _02307500: mov r1, sb mov r2, #1 mov r3, #0 - bl ov29_02306728 + bl EndCurseClassStatus orr r0, r6, #1 and r6, r0, #0xff b _023076A0 @@ -1886,7 +1886,7 @@ _02307528: mov r1, r8 mov r2, #1 str r3, [sp] - bl ov29_02315E24 + bl TryInflictDecoyStatus orr r0, r6, #0x11 and r6, r0, #0xff b _023076A0 @@ -1895,7 +1895,7 @@ _02307554: beq _023075AC mov r0, sb mov r1, r8 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct add r3, r7, #0xd8 add r2, sl, #0xd8 mov r1, #5 @@ -1921,7 +1921,7 @@ _023075AC: mov r1, sb mov r2, #4 mov r3, #0 - bl ov29_02306728 + bl EndCurseClassStatus orr r0, r6, #1 and r6, r0, #0xff b _023076A0 @@ -1930,7 +1930,7 @@ _023075D4: beq _02307614 mov r0, sb mov r1, r8 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct add r3, r7, #0xd8 add r2, sl, #0xd8 mov r1, #5 @@ -1950,7 +1950,7 @@ _02307614: mov r1, sb mov r2, #5 mov r3, #0 - bl ov29_02306728 + bl EndCurseClassStatus orr r0, r6, #1 and r6, r0, #0xff b _023076A0 @@ -1959,7 +1959,7 @@ _0230763C: beq _0230767C mov r0, sb mov r1, r8 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct add r3, r7, #0xd8 add r2, sl, #0xd8 mov r1, #5 @@ -1979,7 +1979,7 @@ _0230767C: mov r1, sb mov r2, #6 mov r3, #0 - bl ov29_02306728 + bl EndCurseClassStatus orr r0, r6, #1 and r6, r0, #0xff _023076A0: @@ -2126,7 +2126,7 @@ _02307884: mov r1, r8 mov r2, r4 mov r3, #1 - bl ov29_02315C00 + bl TryInflictWhifferStatus mov sl, r0 mov r4, #1 _023078A0: @@ -2152,8 +2152,8 @@ _023078C0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} arm_func_end ov29_023077FC - arm_func_start ov29_023078EC -ov29_023078EC: ; 0x023078EC + arm_func_start TransferNegativeBlinkerClassStatus +TransferNegativeBlinkerClassStatus: ; 0x023078EC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov r4, #0 mov sb, r0 @@ -2194,7 +2194,7 @@ _02307974: mov r1, r8 mov r2, #1 mov r3, r4 - bl ov29_023176CC + bl TryInflictBlinkerStatus mov sl, r0 mov r4, #1 b _023079C4 @@ -2202,14 +2202,14 @@ _02307994: mov r0, sb mov r1, r8 mov r2, #1 - bl ov29_02317844 + bl TryInflictCrossEyedStatus mov sl, r0 mov r4, #1 b _023079C4 _023079B0: mov r0, sb mov r1, r8 - bl ov29_02317AF4 + bl TryInflictDropeyeStatus mov sl, r0 mov r4, #1 _023079C4: @@ -2236,12 +2236,12 @@ _023079E4: beq _02307A24 mov r0, #0x31 bl AdvanceFrame - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap _02307A24: mov r0, r5 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} - arm_func_end ov29_023078EC + arm_func_end TransferNegativeBlinkerClassStatus arm_func_start ov29_02307A2C ov29_02307A2C: ; 0x02307A2C @@ -2280,7 +2280,7 @@ _02307AA8: mov r0, sl mov r1, sb mov r2, #1 - bl ov29_02317124 + bl TryInflictMuzzledStatus mov r5, r0 mov r4, #1 _02307AC0: @@ -2338,7 +2338,7 @@ ov29_02307B0C: ; 0x02307B0C mov r0, sl mov r1, sb mov r2, #1 - bl ov29_02318850 + bl TryInflictMiracleEyeStatus mov r5, r0 mov r4, #1 _02307B90: @@ -2389,7 +2389,7 @@ _02307C0C: mov r1, r5 mov r2, #0 str r3, [sp] - bl ov29_02305FDC + bl EndSleepClassStatus mov r3, #1 _02307C3C: mov r0, r3 @@ -2413,8 +2413,8 @@ ov29_02307C48: ; 0x02307C48 ldmia sp!, {r4, pc} arm_func_end ov29_02307C48 - arm_func_start ov29_02307C78 -ov29_02307C78: ; 0x02307C78 + arm_func_start EndFrozenStatus +EndFrozenStatus: ; 0x02307C78 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -2442,14 +2442,14 @@ ov29_02307C78: ; 0x02307C78 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02307CDC: .word 0x00000C9F - arm_func_end ov29_02307C78 + arm_func_end EndFrozenStatus arm_func_start ov29_02307CE0 ov29_02307CE0: ; 0x02307CE0 stmdb sp!, {r4, lr} ldr r4, [r0, #0xb4] mov r1, #0 - bl ov29_02307D54 + bl TryRestoreRoostTyping mov r1, #0 strb r1, [r4, #0xff] ldrsh r0, [r4, #2] @@ -2462,8 +2462,8 @@ ov29_02307CE0: ; 0x02307CE0 ldmia sp!, {r4, pc} arm_func_end ov29_02307CE0 - arm_func_start ov29_02307D18 -ov29_02307D18: ; 0x02307D18 + arm_func_start EndProtectStatus +EndProtectStatus: ; 0x02307D18 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -2477,12 +2477,12 @@ ov29_02307D18: ; 0x02307D18 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, r4 - bl ov29_023064F4 + bl EndReflectClassStatus ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02307D18 + arm_func_end EndProtectStatus - arm_func_start ov29_02307D54 -ov29_02307D54: ; 0x02307D54 + arm_func_start TryRestoreRoostTyping +TryRestoreRoostTyping: ; 0x02307D54 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -2511,7 +2511,7 @@ ov29_02307D54: ; 0x02307D54 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02307DBC: .word 0x00000CC8 - arm_func_end ov29_02307D54 + arm_func_end TryRestoreRoostTyping arm_func_start ov29_02307DC0 ov29_02307DC0: ; 0x02307DC0 @@ -2564,13 +2564,13 @@ _02307E2C: ldrsh r1, [sb, #4] ldrsh r0, [r6, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _02307E94 ldrsh r1, [sb, #6] ldrsh r0, [r6, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 movle r8, #1 ble _02307EC4 diff --git a/asm/overlay_29_02307F1C.s b/asm/overlay_29_02307F1C.s index 50e44ddb..0bf42a45 100644 --- a/asm/overlay_29_02307F1C.s +++ b/asm/overlay_29_02307F1C.s @@ -9,7 +9,7 @@ ItemIsActive__02307F1C: ; 0x02307F1C mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -19,8 +19,8 @@ ItemIsActive__02307F1C: ; 0x02307F1C ldmia sp!, {r3, r4, r5, pc} arm_func_end ItemIsActive__02307F1C - arm_func_start ov29_02307F4C -ov29_02307F4C: ; 0x02307F4C + arm_func_start TryTriggerMonsterHouse +TryTriggerMonsterHouse: ; 0x02307F4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x1a0 mov r4, r0 @@ -241,7 +241,7 @@ _02308258: blt _0230814C _02308260: mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _02308268: add sp, sp, #0x1a0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -249,4 +249,4 @@ _02308268: _02308270: .word 0x02353538 _02308274: .word 0x022C4560 _02308278: .word 0x022C4660 - arm_func_end ov29_02307F4C + arm_func_end TryTriggerMonsterHouse diff --git a/asm/overlay_29_023082A0.s b/asm/overlay_29_023082A0.s index 61a1cd3d..989706b1 100644 --- a/asm/overlay_29_023082A0.s +++ b/asm/overlay_29_023082A0.s @@ -73,7 +73,7 @@ _02308374: ldrb r1, [r4, #0xbc] cmp r1, #6 bls _02308394 - bl ov29_022EF9EC + bl ShouldRunMonsterAi cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} _02308394: @@ -263,8 +263,8 @@ _02308618: ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_023085DC - arm_func_start ov29_0230863C -ov29_0230863C: ; 0x0230863C + arm_func_start ApplyDamageAndEffects +ApplyDamageAndEffects: ; 0x0230863C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x40 ldr r7, [sp, #0x68] @@ -329,7 +329,7 @@ _023086D4: blt _02308F64 _02308730: ldrb r0, [r8, #0xd] - bl ov29_0231EA30 + bl CategoryIsNotPhysical cmp r0, #0 bne _02308778 cmp sl, sb @@ -337,13 +337,13 @@ _02308730: ldrsh r1, [sl, #4] ldrsh r0, [sb, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _02308778 ldrsh r1, [sl, #6] ldrsh r0, [sb, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _02308780 _02308778: @@ -369,7 +369,7 @@ _023087B4: movne r0, #1 bne _02308F64 ldrb r0, [r8, #0xd] - bl ov29_0231EA30 + bl CategoryIsNotPhysical mov r4, r0 cmp sl, sb mov r5, #0 @@ -377,13 +377,13 @@ _023087B4: ldrsh r1, [sl, #4] ldrsh r0, [sb, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _02308808 ldrsh r1, [sl, #6] ldrsh r0, [sb, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _02308810 _02308808: @@ -391,7 +391,7 @@ _02308808: b _02308A28 _02308810: add r0, sp, #0x2c - bl ResetDamageDesc + bl ResetDamageData ldr r0, [sb, #0xb4] cmp r4, #0 ldrb r0, [r0, #0xd5] @@ -543,13 +543,13 @@ _02308A28: ldrsh r1, [sl, #4] ldrsh r0, [sb, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _02308A6C ldrsh r1, [sl, #6] ldrsh r0, [sb, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _02308A74 _02308A6C: @@ -557,7 +557,7 @@ _02308A6C: b _02308ECC _02308A74: ldrb r0, [r8, #0xd] - bl ov29_0231EA30 + bl CategoryIsNotPhysical mov r4, r0 mov r0, sb mov r1, #0xb @@ -655,7 +655,7 @@ _02308BB0: beq _02308C00 mov r0, sl mov r1, #0xa - bl ov29_02301EAC + bl HasTypeAffectedByGravity cmp r0, #0 bne _02308C00 mov r0, sl @@ -884,7 +884,7 @@ _02308ECC: mov r0, r4 mov r2, #0xc mov r3, #0x238 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02308F4C: mov r0, sl mov r1, sb @@ -917,4 +917,4 @@ _02308FAC: .word 0x022C467C _02308FB0: .word 0x022C4524 _02308FB4: .word 0x022C4638 _02308FB8: .word 0x02353538 - arm_func_end ov29_0230863C + arm_func_end ApplyDamageAndEffects diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index aef54e69..a9b25942 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -21,7 +21,7 @@ ApplyDamage: ; 0x02308FE0 bne _0230902C ldr r0, [r7, #0xb4] ldrb r0, [r0, #0xbc] - bl ov29_022EFB04 + bl IsSecretBazaarNpcBehavior cmp r0, #0 beq _0230903C _0230902C: @@ -44,7 +44,7 @@ _0230905C: bl ov29_02307BDC mov r0, r8 mov r1, r7 - bl ov29_0230D440 + bl UpdateShopkeeperModeAfterAttack ldr r0, [r8] cmp r0, #1 ldreq r0, [r8, #0xb4] @@ -79,11 +79,11 @@ _0230905C: mov r1, r7 bl LogMessageByIdWithPopupCheckUserTarget mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309124 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309124 mov r0, r8 @@ -99,7 +99,7 @@ _02309134: bne _023091A4 mov r0, r7 mov r1, #0x73 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, [r6, #4] cmpne r0, #4 @@ -114,7 +114,7 @@ _02309134: mov r0, r7 bl LogMessageByIdWithPopupCheckUser mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309194 mov r0, r7 @@ -268,7 +268,7 @@ _02309398: cmp r0, #5 bne _023093D8 mov r0, r7 - bl ov29_0231B060 + bl ActivateMotorDrive mov r0, #1 strb r0, [r6, #0x10] mov r0, #0 @@ -287,7 +287,7 @@ _023093E0: mov r2, #0 mov r1, r7 mov r3, r2 - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 beq _02309448 ldr r0, [sl, #4] @@ -321,11 +321,11 @@ _0230945C: cmp r0, #1 bne _023094AC mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023094C8 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023094C8 mov r0, r8 @@ -334,7 +334,7 @@ _0230945C: b _023094C8 _023094AC: mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023094C8 mov r0, r8 @@ -363,7 +363,7 @@ _023094D8: mov r1, r7 mov r2, #1 mov r3, #0 - bl ov29_02317E88 + bl RestoreRandomMovePP _02309520: ldrb r0, [r4, #0x15c] cmp r0, #0 @@ -414,11 +414,11 @@ _023095A0: cmp r1, #0 bne _02309650 mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309618 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309618 ldrb r0, [r4, #0x15c] @@ -458,7 +458,7 @@ _02309650: cmp r0, #0 beq _02309718 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02309718 mov r0, r7 @@ -473,7 +473,7 @@ _02309650: mov fp, r0 mov r0, r7 mov r3, #3 - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, r0, lsl #0x10 mov sl, r0, asr #0x10 mvn r1, #0 @@ -500,7 +500,7 @@ _023096D4: mov r0, r7 mov r3, #3 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity ldr r1, _02309FC8 ; =0x023535D4 strh r0, [r1] _02309718: @@ -532,7 +532,7 @@ _02309740: cmp r1, r0 strgt r0, [r4, #0xb8] mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023097E4 ldr r0, [r6, #4] @@ -579,7 +579,7 @@ _02309820: cmp fp, #0 bne _0230991C mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0230991C ldrsh r1, [r8, #4] @@ -605,7 +605,7 @@ _02309820: bne _023098A0 mov r0, r7 mov r1, r8 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 movne sl, #1 _023098A0: @@ -779,7 +779,7 @@ _02309B04: beq _02309B18 mov r0, r7 bl ov29_0230D7D4 - bl ov29_02336F4C + bl UpdateTrapsVisibility _02309B18: mov r0, #0 b _0230A918 @@ -806,7 +806,7 @@ _02309B5C: mov r0, r8 mov r1, r7 mov r2, #0 - bl ov29_02306A00 + bl EndInvisibleClassStatus _02309B78: cmp fp, #0 beq _02309BA4 @@ -817,7 +817,7 @@ _02309B78: mov r0, r7 strb r1, [r7, #0x22] bl ov29_0230D7D4 - bl ov29_02336F4C + bl UpdateTrapsVisibility b _02309BC0 _02309BA4: cmp sb, #0 @@ -1032,7 +1032,7 @@ _02309DE4: mov r1, r7 mov r2, #3 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus b _02309EDC _02309EC0: cmp r0, #2 @@ -1041,13 +1041,13 @@ _02309EC0: mov r1, r7 mov r2, #2 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus _02309EDC: mov r0, r7 bl ov29_023159D4 mov r0, r4 mov r1, #0 - bl ov29_022FDDC0 + bl SubInitMonster bl ov10_022BDC68 mov r0, r7 bl RestorePpAllMovesSetFlags @@ -1139,19 +1139,19 @@ _0230A024: beq _0230A08C mov r0, r7 mov r1, sl - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _0230A08C ldrsh r1, [sl, #4] ldrsh r0, [r7, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _0230A08C ldrsh r1, [sl, #6] ldrsh r0, [r7, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _0230A098 _0230A08C: @@ -1180,10 +1180,10 @@ _0230A098: ldrsh r2, [sp, #0x1a] mov r0, r7 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, r7 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, #0 strb r0, [r7, #0x22] ldrsh r2, [r4, #0x12] @@ -1220,7 +1220,7 @@ _0230A098: mov r1, r7 mov r2, #3 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus b _0230A1AC _0230A190: cmp r0, #2 @@ -1229,13 +1229,13 @@ _0230A190: mov r1, r7 mov r2, #2 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus _0230A1AC: mov r0, r7 bl ov29_023159D4 mov r0, r4 mov r1, #0 - bl ov29_022FDDC0 + bl SubInitMonster bl ov10_022BDC68 mov r0, r7 bl RestorePpAllMovesSetFlags @@ -1277,7 +1277,7 @@ _0230A224: beq _0230A29C mov r0, r7 mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230A29C ldrb r0, [r4, #0x62] @@ -1374,7 +1374,7 @@ _0230A330: mov r1, r7 mov r2, #3 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus b _0230A3F4 _0230A3D8: cmp r0, #2 @@ -1383,13 +1383,13 @@ _0230A3D8: mov r1, r7 mov r2, #2 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus _0230A3F4: mov r0, r7 bl ov29_023159D4 mov r0, r4 mov r1, #0 - bl ov29_022FDDC0 + bl SubInitMonster bl ov10_022BDC68 mov r0, r7 bl RestorePpAllMovesSetFlags @@ -1428,7 +1428,7 @@ _0230A45C: mov r0, r7 mov r1, r7 mov r3, #0 - bl ov29_02306728 + bl EndCurseClassStatus _0230A4A0: mov r0, #0 mov r1, #0x69 @@ -1504,8 +1504,8 @@ _0230A4A0: ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] - bl ov29_022EAD00 - bl ov29_022EAE14 + bl MusicTableIdxToMusicId + bl ChangeDungeonMusic mov r0, r6 bl ov29_022EAF34 mov r0, r7 @@ -1542,7 +1542,7 @@ _0230A648: add r1, r7, #4 add r2, r4, #0x62 mov r3, #1 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper cmp r0, #0 beq _0230A684 ldrb r0, [r4, #0x62] @@ -1561,7 +1561,7 @@ _0230A684: _0230A690: mov r0, r8 mov r1, r7 - bl ov29_0230F9D8 + bl TrySpawnEnemyItemDrop _0230A69C: ldrb r0, [r4, #0x100] mov r6, #0 @@ -1676,13 +1676,13 @@ _0230A824: bl ov29_022F9058 mov r0, r8 mov r1, r7 - bl ov29_0230DBD0 + bl RecruitCheck cmp r0, #0 beq _0230A8A8 add r2, sp, #0x1c mov r0, r8 mov r1, r7 - bl ov29_0230E064 + bl TryRecruit cmp r0, #0 bne _0230A898 mov r0, r7 @@ -1692,7 +1692,7 @@ _0230A824: mov r0, r8 mov r1, r7 mov r2, r5 - bl ov29_0230AA0C + bl AftermathCheck mov r0, r7 mov r2, r8 mov r1, #0x234 @@ -1707,7 +1707,7 @@ _0230A8A8: mov r0, r8 mov r1, r7 mov r2, r5 - bl ov29_0230AA0C + bl AftermathCheck mov r0, r7 mov r1, r5 mov r2, r8 @@ -1717,7 +1717,7 @@ _0230A8CC: mov r0, r8 mov r1, r7 mov r2, r5 - bl ov29_0230AA0C + bl AftermathCheck mov r0, r8 bl ov29_022ECD84 mov r0, r7 @@ -1764,14 +1764,14 @@ DefenderAbilityIsActive__0230A940: ; 0x0230A940 beq _0230A984 mov r0, r7 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _0230A984: mov r0, r6 mov r1, r5 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end DefenderAbilityIsActive__0230A940 @@ -1807,7 +1807,7 @@ ItemIsActive__0230A9DC: ; 0x0230A9DC mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -1817,8 +1817,8 @@ ItemIsActive__0230A9DC: ; 0x0230A9DC ldmia sp!, {r3, r4, r5, pc} arm_func_end ItemIsActive__0230A9DC - arm_func_start ov29_0230AA0C -ov29_0230AA0C: ; 0x0230AA0C + arm_func_start AftermathCheck +AftermathCheck: ; 0x0230AA0C stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r4, r2 @@ -1843,7 +1843,7 @@ ov29_0230AA0C: ; 0x0230AA0C add r2, r5, #4 mov r3, #1 str ip, [sp, #4] - bl ov29_02320788 + bl TryAftermathExplosion mov r0, #1 b _0230AA7C _0230AA78: @@ -1854,10 +1854,10 @@ _0230AA7C: .align 2, 0 _0230AA84: .word 0x022C4594 _0230AA88: .word 0x0000026F - arm_func_end ov29_0230AA0C + arm_func_end AftermathCheck - arm_func_start ov29_0230AA8C -ov29_0230AA8C: ; 0x0230AA8C + arm_func_start GetTypeMatchupBothTypes +GetTypeMatchupBothTypes: ; 0x0230AA8C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r3, _0230AB4C ; =0x02352838 mov sl, r0 @@ -1867,7 +1867,7 @@ ov29_0230AA8C: ; 0x0230AA8C mov r8, r2 strh r4, [sp] strh r3, [sp, #2] - bl ov29_0230AB58 + bl ScrappyShouldActivate ldr fp, _0230AB50 ; =0x02353538 mov r7, r0 mov r6, #0 @@ -1877,13 +1877,13 @@ _0230AAC8: cmp r7, #0 bne _0230AB04 mov r0, r8 - bl ov29_0230ABF0 + bl IsTypeIneffectiveAgainstGhost cmp r0, #0 beq _0230AB04 mov r0, sl mov r1, sb mov r2, r6 - bl ov29_0230AC04 + bl GhostImmunityIsActive cmp r0, #0 ldrne r1, [fp] movne r0, #0 @@ -1913,10 +1913,10 @@ _0230AB18: _0230AB4C: .word 0x02352838 _0230AB50: .word 0x02353538 _0230AB54: .word 0x022C4D14 - arm_func_end ov29_0230AA8C + arm_func_end GetTypeMatchupBothTypes - arm_func_start ov29_0230AB58 -ov29_0230AB58: ; 0x0230AB58 + arm_func_start ScrappyShouldActivate +ScrappyShouldActivate: ; 0x0230AB58 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r6, #0 mov sl, r0 @@ -1930,7 +1930,7 @@ _0230AB7C: mov r0, sl mov r1, r5 ldr r7, [sb, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230ABB4 add r0, r7, r6 @@ -1960,19 +1960,19 @@ _0230ABDC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0230ABEC: .word 0x02353538 - arm_func_end ov29_0230AB58 + arm_func_end ScrappyShouldActivate - arm_func_start ov29_0230ABF0 -ov29_0230ABF0: ; 0x0230ABF0 + arm_func_start IsTypeIneffectiveAgainstGhost +IsTypeIneffectiveAgainstGhost: ; 0x0230ABF0 cmp r0, #1 cmpne r0, #7 moveq r0, #1 movne r0, #0 bx lr - arm_func_end ov29_0230ABF0 + arm_func_end IsTypeIneffectiveAgainstGhost - arm_func_start ov29_0230AC04 -ov29_0230AC04: ; 0x0230AC04 + arm_func_start GhostImmunityIsActive +GhostImmunityIsActive: ; 0x0230AC04 stmdb sp!, {r3, lr} ldr r3, [r1, #0xb4] add r1, r3, r2 @@ -1998,7 +1998,7 @@ _0230AC44: _0230AC50: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end ov29_0230AC04 + arm_func_end GhostImmunityIsActive arm_func_start GetTypeMatchup GetTypeMatchup: ; 0x0230AC58 @@ -2035,7 +2035,7 @@ _0230ACA0: ldmia sp!, {r3, r4, r5, r6, r7, pc} _0230ACCC: mov r0, r7 - bl HasConditionalGroundImmunity + bl IsFloating cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -2052,8 +2052,8 @@ _0230ACE0: _0230AD00: .word 0x022C56B0 arm_func_end GetTypeMatchup - arm_func_start ov29_0230AD04 -ov29_0230AD04: ; 0x0230AD04 + arm_func_start CalcTypeBasedDamageEffects +CalcTypeBasedDamageEffects: ; 0x0230AD04 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x64 ldr r5, _0230B774 ; =0x02352838 @@ -2083,7 +2083,7 @@ ov29_0230AD04: ; 0x0230AD04 moveq r0, #1 beq _0230B76C mov r0, r8 - bl ov29_0230ABF0 + bl IsTypeIneffectiveAgainstGhost str r0, [sp, #0x2c] mov r0, sl mov r1, sb @@ -2099,7 +2099,7 @@ ov29_0230AD04: ; 0x0230AD04 mov r1, sb mov r2, r8 str r3, [r7, #8] - bl ov29_0230AB58 + bl ScrappyShouldActivate ldr r3, _0230B778 ; =0x022C4820 str r0, [sp, #0x28] ldr r0, [r3] @@ -2183,7 +2183,7 @@ _0230AEC0: mov r1, sb mov r2, r4, lsl #0x10 mov r2, r2, asr #0x10 - bl ov29_0230AC04 + bl GhostImmunityIsActive cmp r0, #0 beq _0230AF1C ldr r0, _0230B798 ; =0x02353538 @@ -2253,7 +2253,7 @@ _0230AF94: _0230AFEC: mov r0, sl mov r1, #0x50 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B02C ldr r0, [r7, #8] @@ -2306,7 +2306,7 @@ _0230B0A4: bne _0230B104 mov r0, sl mov r1, #0x64 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B104 ldr r0, _0230B7AC ; =0x022C455C @@ -2324,7 +2324,7 @@ _0230B0A4: str r1, [sp] mov r1, sb mov r3, #2 - bl ov29_0234B250 + bl LogMessageByIdWithPopupCheckParticipants _0230B104: cmp r8, #2 cmpne r8, #6 @@ -2349,7 +2349,7 @@ _0230B14C: bne _0230B198 mov r0, sl mov r1, sb - bl ov29_02313C74 + bl FlashFireShouldActivate cmp r0, #0 beq _0230B198 ldr r1, _0230B798 ; =0x02353538 @@ -2387,7 +2387,7 @@ _0230B1DC: bne _0230B248 mov r0, sl mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230B208 mov r0, sb @@ -2396,7 +2396,7 @@ _0230B1DC: bne _0230B218 _0230B208: mov r0, sb - bl HasConditionalGroundImmunity + bl IsFloating cmp r0, #0 beq _0230B248 _0230B218: @@ -2417,7 +2417,7 @@ _0230B248: bne _0230B2F4 mov r0, sl mov r1, #0x10 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B2F4 ldrsh r2, [r6, #0x12] @@ -2436,7 +2436,7 @@ _0230B248: mov r0, r6 mov r2, r7 mov r1, #0x80 - bl ov29_023023C0 + bl UpdateStateFlags mov r5, r0 cmp r7, #0 beq _0230B2D4 @@ -2452,7 +2452,7 @@ _0230B2D4: cmp r5, #0 beq _0230B2F4 mov r0, sl - bl ov29_022E6214 + bl PlayEffectAnimation0x1A9__022E6214 ldr r2, _0230B7C0 ; =0x00000C4F mov r0, sl mov r1, sb @@ -2462,7 +2462,7 @@ _0230B2F4: bne _0230B3A0 mov r0, sl mov r1, #0x1a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B3A0 ldrsh r2, [r6, #0x12] @@ -2481,7 +2481,7 @@ _0230B2F4: mov r0, r6 mov r2, r7 mov r1, #2 - bl ov29_023023C0 + bl UpdateStateFlags mov r5, r0 cmp r7, #0 beq _0230B380 @@ -2497,7 +2497,7 @@ _0230B380: cmp r5, #0 beq _0230B3A0 mov r0, sl - bl ov29_022E61C8 + bl PlayEffectAnimation0x1A9__022E61C8 mov r0, sl mov r1, sb mov r2, #0xc50 @@ -2507,7 +2507,7 @@ _0230B3A0: bne _0230B44C mov r0, sl mov r1, #0x43 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B44C ldrsh r2, [r6, #0x12] @@ -2526,7 +2526,7 @@ _0230B3A0: mov r0, r6 mov r2, r7 mov r1, #0x10 - bl ov29_023023C0 + bl UpdateStateFlags mov r5, r0 cmp r7, #0 beq _0230B42C @@ -2542,7 +2542,7 @@ _0230B42C: cmp r5, #0 beq _0230B44C mov r0, sl - bl ov29_022E64C4 + bl PlayEffectAnimation0x1A9__022E64C4 ldr r2, _0230B7C4 ; =0x00000C51 mov r0, sl mov r1, sb @@ -2552,7 +2552,7 @@ _0230B44C: bne _0230B534 mov r0, sl mov r1, #0x46 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B4F8 ldrsh r2, [r6, #0x12] @@ -2571,7 +2571,7 @@ _0230B44C: mov r0, r6 mov r2, r7 mov r1, #0x20 - bl ov29_023023C0 + bl UpdateStateFlags mov r5, r0 cmp r7, #0 beq _0230B4D8 @@ -2587,7 +2587,7 @@ _0230B4D8: cmp r5, #0 beq _0230B4F8 mov r0, sl - bl ov29_022E6510 + bl PlayEffectAnimation0x1A9__022E6510 ldr r2, _0230B7C8 ; =0x00000C52 mov r0, sl mov r1, sb @@ -2636,7 +2636,7 @@ _0230B560: mov r3, #1 mov r1, #0x63 strb r3, [r2, #0x1cf] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B5BC ldr r2, _0230B7BC ; =0x0235284C @@ -2791,7 +2791,7 @@ _0230B7C4: .word 0x00000C51 _0230B7C8: .word 0x00000C52 _0230B7CC: .word 0x022C4744 _0230B7D0: .word 0x0235285C - arm_func_end ov29_0230AD04 + arm_func_end CalcTypeBasedDamageEffects arm_func_start ov29_0230B7D4 ov29_0230B7D4: ; 0x0230B7D4 @@ -2811,7 +2811,7 @@ ov29_0230B7D4: ; 0x0230B7D4 mov r1, #0x6b ldr r7, [sl, #0xb4] ldr r6, [sb, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r8, r4 cmp r8, #1 @@ -2821,7 +2821,7 @@ ov29_0230B7D4: ; 0x0230B7D4 bne _0230B84C mov r0, sl mov r1, sb - bl ov29_02313C74 + bl FlashFireShouldActivate cmp r0, #0 movne r0, #0 bne _0230BB98 @@ -2852,7 +2852,7 @@ _0230B89C: bne _0230B8E0 mov r0, sl mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230B8C8 mov r0, sb @@ -2861,7 +2861,7 @@ _0230B89C: bne _0230B8D8 _0230B8C8: mov r0, sb - bl HasConditionalGroundImmunity + bl IsFloating cmp r0, #0 beq _0230B8E0 _0230B8D8: @@ -2871,7 +2871,7 @@ _0230B8E0: mov r0, sl mov r1, sb mov r2, r8 - bl ov29_0230AB58 + bl ScrappyShouldActivate ldr r1, _0230BBA0 ; =0x02352884 str r0, [sp] add ip, sp, #4 @@ -2939,7 +2939,7 @@ _0230B9D4: bne _0230BA1C mov r0, sl mov r1, #0x10 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BA1C ldrsh r2, [r7, #0x12] @@ -2958,7 +2958,7 @@ _0230BA1C: bne _0230BA64 mov r0, sl mov r1, #0x1a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BA64 ldrsh r2, [r7, #0x12] @@ -2977,7 +2977,7 @@ _0230BA64: bne _0230BAAC mov r0, sl mov r1, #0x43 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BAAC ldrsh r2, [r7, #0x12] @@ -2996,7 +2996,7 @@ _0230BAAC: bne _0230BAF4 mov r0, sl mov r1, #0x46 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BAF4 ldrsh r2, [r7, #0x12] @@ -3085,7 +3085,7 @@ CalcDamage: ; 0x0230BBAC add r5, r4, #0x184 ldr r7, [sb, #0xb4] str r1, [sp, #0x1c] - bl ResetDamageDesc + bl ResetDamageData ldrb r0, [r6, #0x221] cmp r0, #0 beq _0230BC1C @@ -3097,7 +3097,7 @@ CalcDamage: ; 0x0230BBAC _0230BC1C: mov r0, sl mov r1, #0x5c - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BC50 ldr r0, [sp, #0xf4] @@ -3111,7 +3111,7 @@ _0230BC1C: _0230BC50: mov r0, sl mov r1, #0x65 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BC84 ldr r0, [sp, #0xf4] @@ -3125,7 +3125,7 @@ _0230BC50: _0230BC84: mov r0, sl mov r1, #0x6b - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #1 strne r0, [sp, #0xc] @@ -3137,7 +3137,7 @@ _0230BC84: ldr r0, [sp, #0xf4] bl MoveIsNotPhysical str r0, [sp, #0x18] - bl ResetDamageCalcScratchSpace + bl ResetDamageCalcDiagnostics ldrb r0, [r6, #7] cmp r0, #0 bne _0230BD34 @@ -3216,7 +3216,7 @@ _0230BDA0: ldr r0, [r0, #0x3c] str r0, [sp, #0x38] mov r0, sl - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BE40 ldrb r1, [r7, #0x1c] @@ -3279,7 +3279,7 @@ _0230BE70: addne r0, r0, #1 strneb r0, [r5, #0x34] mov r0, sl - bl ov29_02338288 + bl NearbyAllyIqSkillIsEnabled cmp r0, #0 ldr r0, [sp, #0x18] addne r4, r4, #1 @@ -3287,7 +3287,7 @@ _0230BE70: mov r0, sl bne _0230BFA8 mov r1, #0x68 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BF5C ldrsh r0, [r6, #4] @@ -3317,12 +3317,12 @@ _0230BF5C: bne _0230C040 mov r0, sl mov r1, #0x71 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230BF94 mov r0, sl mov r1, #0x71 - bl ov29_02301D84 + bl OtherMonsterAbilityIsActive cmp r0, #0 beq _0230C040 _0230BF94: @@ -3333,7 +3333,7 @@ _0230BF94: b _0230C040 _0230BFA8: mov r1, #0x5a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230BFD4 mov r0, sl @@ -3350,12 +3350,12 @@ _0230BFD4: bne _0230C01C mov r0, sb mov r1, #0x71 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230C00C mov r0, sb mov r1, #0x71 - bl ov29_02301D84 + bl OtherMonsterAbilityIsActive cmp r0, #0 beq _0230C01C _0230C00C: @@ -3398,7 +3398,7 @@ _0230C07C: beq _0230C0AC mov r0, sl mov r1, #0x4f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0x14 strne r0, [sp, #0x44] @@ -3490,7 +3490,7 @@ _0230C170: _0230C1F4: mov r0, sl mov r1, #0x67 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0x100 movne r4, #0xa @@ -3783,26 +3783,26 @@ _0230C5E0: bne _0230C6B8 mov r0, sl mov r1, #0x11 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230C6B8 ldr r0, [sl, #0xb4] mov r1, r4 str r0, [sp, #0x24] mov r0, sl - bl ov29_02300634 + bl MonsterHasNegativeStatus str r0, [sp, #0x48] ldr r0, [sp, #0x24] ldr r2, [sp, #0x48] mov r1, r4 - bl ov29_023023C0 + bl UpdateStateFlags ldr r1, [sp, #0x48] cmp r1, #0 movne r4, r4, lsl #1 cmp r0, #0 beq _0230C6B8 mov r0, sl - bl ov29_022E6130 + bl PlayEffectAnimation0x1A9__022E6130 mov r0, sl mov r1, sb ldr r2, _0230C490 ; =0x00000C53 @@ -3810,12 +3810,12 @@ _0230C5E0: _0230C6B8: mov r0, sl mov r1, #0x22 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0230C6E0 mov r0, sl mov r1, #0x4b - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230C748 _0230C6E0: @@ -3834,7 +3834,7 @@ _0230C704: str r1, [sp, #0x34] ldr r2, [sp, #0x34] mov r1, #0x100 - bl ov29_023023C0 + bl UpdateStateFlags ldr r1, [sp, #0x34] cmp r1, #0 addne r4, r4, r4, lsl #1 @@ -3842,7 +3842,7 @@ _0230C704: cmp r0, #0 beq _0230C748 mov r0, sl - bl ov29_022E617C + bl PlayEffectAnimation0x1A9__022E617C mov r0, sl mov r1, sb ldr r2, _0230C494 ; =0x00000C54 @@ -3850,7 +3850,7 @@ _0230C704: _0230C748: mov r0, sl mov r1, #0x30 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230C76C ldr r0, [sp, #0x30] @@ -3867,7 +3867,7 @@ _0230C76C: movne r0, #0 strne r0, [sp, #0x14] mov r0, sl - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230C7D4 ldr r0, [sp, #0x30] @@ -3887,7 +3887,7 @@ _0230C76C: _0230C7D4: mov r0, sl mov r1, #0x3f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230C820 ldr r0, [sp, #0x30] @@ -3931,12 +3931,12 @@ _0230C84C: mov r1, #1 str r0, [sp, #0x20] mov r0, sb - bl ov29_02300634 + bl MonsterHasNegativeStatus str r0, [sp, #0x4c] ldr r0, [sp, #0x20] ldr r2, [sp, #0x4c] mov r1, #8 - bl ov29_023023C0 + bl UpdateStateFlags ldr r1, [sp, #0x4c] cmp r1, #0 beq _0230C8C0 @@ -3950,7 +3950,7 @@ _0230C8C0: cmp r0, #0 beq _0230C8E0 mov r0, sb - bl ov29_022E63D8 + bl PlayEffectAnimation0x18E mov r0, sl mov r1, sb ldr r2, _0230C498 ; =0x00000C55 @@ -3969,7 +3969,7 @@ _0230C8E0: str r0, [r1] beq _0230C920 mov r1, fp - bl DivideInt + bl __divsi3 add r1, sp, #0x90 str r0, [r1] _0230C920: @@ -3979,7 +3979,7 @@ _0230C920: add r4, sp, #0x94 mov r1, r0 ldr r0, [r4] - bl DivideInt + bl __divsi3 str r0, [r4] _0230C940: ldr r0, [sp, #0x90] @@ -4157,14 +4157,14 @@ _0230CB78: add r0, sp, #0xb8 mov r1, sl mov r2, sb - bl ov29_0230AD04 + bl CalcTypeBasedDamageEffects mov fp, r0 ldr r0, [sp, #0xc] cmp r0, #2 bne _0230CC78 mov r0, sl mov r1, sb - bl ov29_02313C74 + bl FlashFireShouldActivate movs r4, r0 beq _0230CC78 ldrb r0, [r7, #0x15c] @@ -4216,7 +4216,7 @@ _0230CCBC: beq _0230CCF0 _0230CCD0: mov r0, sb - bl ov29_022E406C + bl PlayEffectAnimation0x171 add r0, sp, #0xb8 ldr r2, _0230D064 ; =0x0235283C mov r1, r0 @@ -4237,7 +4237,7 @@ _0230CCF0: beq _0230CD3C _0230CD1C: mov r0, sb - bl ov29_022E4018 + bl PlayEffectAnimation0x171Full add r0, sp, #0xb8 ldr r2, _0230D064 ; =0x0235283C mov r1, r0 @@ -4299,7 +4299,7 @@ _0230CDF0: _0230CE04: mov r0, sl mov r1, #0x58 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrne r0, _0230D06C ; =0x022C4510 movne r1, #1 @@ -4336,14 +4336,14 @@ _0230CE74: mov r1, sb add r3, r2, #0xdc0 str r4, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _0230CEEC mov r2, #1 mov r0, sl mov r1, #0x5d strb r2, [r8, #0xe] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 add r0, sp, #0xb8 beq _0230CEE0 @@ -4495,7 +4495,7 @@ ov29_0230D088: ; 0x0230D088 str r5, [sp, #4] mov ip, #0 str ip, [sp, #8] - bl ov29_0230AD04 + bl CalcTypeBasedDamageEffects add r0, sp, #0xc mov r1, r4 bl IntToFixedPoint64 @@ -4514,8 +4514,8 @@ ov29_0230D088: ; 0x0230D088 _0230D118: .word 0x000003E7 arm_func_end ov29_0230D088 - arm_func_start ov29_0230D11C -ov29_0230D11C: ; 0x0230D11C + arm_func_start ApplyDamageAndEffectsWrapper +ApplyDamageAndEffectsWrapper: ; 0x0230D11C stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0xdc mov r7, r0 @@ -4523,7 +4523,7 @@ ov29_0230D11C: ; 0x0230D11C mov r6, r1 mov r5, r2 mov r4, r3 - bl ResetDamageDesc + bl ResetDamageData add r0, sp, #0x24 bl ov29_022E2470 mov r3, #0 @@ -4541,10 +4541,10 @@ ov29_0230D11C: ; 0x0230D11C add r0, sp, #0x24 add r2, sp, #0x10 str r3, [sp, #0xc] - bl ov29_0230863C + bl ApplyDamageAndEffects add sp, sp, #0xdc ldmia sp!, {r4, r5, r6, r7, pc} - arm_func_end ov29_0230D11C + arm_func_end ApplyDamageAndEffectsWrapper arm_func_start CalcRecoilDamageFixed CalcRecoilDamageFixed: ; 0x0230D18C @@ -4566,7 +4566,7 @@ CalcRecoilDamageFixed: ; 0x0230D18C beq _0230D238 mov r0, r7 mov r1, #0x5c - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0230D1F0 mov r0, r6, lsl #8 @@ -4611,7 +4611,7 @@ CalcDamageFixed: ; 0x0230D240 mov r8, r2 mov r7, r3 ldr r6, [sp, #0x54] - bl ResetDamageDesc + bl ResetDamageData mov r5, #0 ldrb r0, [sp, #0x58] ldr r1, [sp, #0x60] @@ -4686,7 +4686,7 @@ _0230D334: mov r1, sb mov r3, #0 str r4, [sp, #0xc] - bl ov29_0230863C + bl ApplyDamageAndEffects ldr r1, [sp, #0x50] cmp r1, #0 ldrneb r0, [sp, #0x28] @@ -4745,8 +4745,8 @@ CalcDamageFixedWrapper: ; 0x0230D3F4 ldmia sp!, {pc} arm_func_end CalcDamageFixedWrapper - arm_func_start ov29_0230D440 -ov29_0230D440: ; 0x0230D440 + arm_func_start UpdateShopkeeperModeAfterAttack +UpdateShopkeeperModeAfterAttack: ; 0x0230D440 ldr r2, [r1, #0xb4] ldrb r1, [r2, #9] cmp r1, #0 @@ -4762,10 +4762,10 @@ ov29_0230D440: ; 0x0230D440 moveq r0, #3 streqb r0, [r2, #9] bx lr - arm_func_end ov29_0230D440 + arm_func_end UpdateShopkeeperModeAfterAttack - arm_func_start ov29_0230D47C -ov29_0230D47C: ; 0x0230D47C + arm_func_start UpdateShopkeeperModeAfterTrap +UpdateShopkeeperModeAfterTrap: ; 0x0230D47C ldr r2, [r0, #0xb4] ldrb r0, [r2, #9] cmp r0, #0 @@ -4776,7 +4776,7 @@ ov29_0230D47C: ; 0x0230D47C moveq r0, #3 streqb r0, [r2, #9] bx lr - arm_func_end ov29_0230D47C + arm_func_end UpdateShopkeeperModeAfterTrap arm_func_start ov29_0230D4A4 ov29_0230D4A4: ; 0x0230D4A4 @@ -4818,8 +4818,8 @@ _0230D518: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_0230D4A4 - arm_func_start ResetDamageCalcScratchSpace -ResetDamageCalcScratchSpace: ; 0x0230D528 + arm_func_start ResetDamageCalcDiagnostics +ResetDamageCalcDiagnostics: ; 0x0230D528 stmdb sp!, {r3, r4, r5, lr} ldr r0, _0230D614 ; =0x02353538 mov r1, #0x54 @@ -4881,7 +4881,7 @@ ResetDamageCalcScratchSpace: ; 0x0230D528 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0230D614: .word 0x02353538 - arm_func_end ResetDamageCalcScratchSpace + arm_func_end ResetDamageCalcDiagnostics arm_func_start ov29_0230D618 ov29_0230D618: ; 0x0230D618 @@ -4902,7 +4902,7 @@ ov29_0230D628: ; 0x0230D628 cmp r1, r0 ldmneia sp!, {r3, pc} mov r1, #1 - bl ov29_022E2E54 + bl PointCameraToMonster ldmia sp!, {r3, pc} .align 2, 0 _0230D650: .word 0x02353538 @@ -4940,7 +4940,7 @@ ov29_0230D688: ; 0x0230D688 strh r3, [sp, #2] ldrh r3, [r4, #4] strh r3, [sp, #4] - bl ov29_02344BD0 + bl GenerateStandardItem mov r0, r4 bl SetItemAcquired ldrb r0, [sp, #1] @@ -5064,7 +5064,7 @@ _0230D808: rsb r1, r1, #0x2b8 mov r3, #3 str r2, [sp, #0xc] - bl ov29_022E35E4 + bl PlayEffectAnimationEntity mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 mvn r0, #0 @@ -5290,8 +5290,8 @@ ov29_0230DAB8: ; 0x0230DAB8 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_0230DAB8 - arm_func_start ov29_0230DB14 -ov29_0230DB14: ; 0x0230DB14 + arm_func_start SpecificRecruitCheck +SpecificRecruitCheck: ; 0x0230DB14 stmdb sp!, {r4, lr} ldr r1, _0230DBC8 ; =0x02353538 mov r4, r0 @@ -5300,7 +5300,7 @@ ov29_0230DB14: ; 0x0230DB14 cmp r1, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - bl ov29_022EFA6C + bl DebugRecruitingEnabled cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -5340,10 +5340,10 @@ ov29_0230DB14: ; 0x0230DB14 .align 2, 0 _0230DBC8: .word 0x02353538 _0230DBCC: .word 0x000001A3 - arm_func_end ov29_0230DB14 + arm_func_end SpecificRecruitCheck - arm_func_start ov29_0230DBD0 -ov29_0230DBD0: ; 0x0230DBD0 + arm_func_start RecruitCheck +RecruitCheck: ; 0x0230DBD0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r2, _0230E024 ; =0x02353538 mov r8, r0 @@ -5355,7 +5355,7 @@ ov29_0230DBD0: ; 0x0230DBD0 bl IsRecruitingAllowed cmp r0, #0 beq _0230DC28 - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 bne _0230DC28 bl IsLegendaryChallengeFloor @@ -5432,20 +5432,20 @@ _0230DD04: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldrsh r0, [r6, #2] - bl ov29_0230DB14 + bl SpecificRecruitCheck cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldrsh r1, [r8, #4] ldrsh r0, [r7, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _0230DD5C ldrsh r1, [r8, #6] ldrsh r0, [r7, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _0230DD64 _0230DD5C: @@ -5460,7 +5460,7 @@ _0230DD64: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r0, r7 mov r1, r8 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -5655,10 +5655,10 @@ _0230E054: .word 0x022C4704 _0230E058: .word 0x022C4700 _0230E05C: .word 0x022C46FC _0230E060: .word 0x022C5064 - arm_func_end ov29_0230DBD0 + arm_func_end RecruitCheck - arm_func_start ov29_0230E064 -ov29_0230E064: ; 0x0230E064 + arm_func_start TryRecruit +TryRecruit: ; 0x0230E064 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x114 mov sl, r0 @@ -5992,7 +5992,7 @@ _0230E540: cmp r5, #0 beq _0230E550 mov r0, r5 - bl ov29_02321104 + bl EnsureCanStandCurrentTile _0230E550: mov r0, r4 add sp, sp, #0x114 @@ -6005,7 +6005,7 @@ _0230E568: .word 0x00000C7E _0230E56C: .word 0x00000C7F _0230E570: .word 0x00000233 _0230E574: .word 0x00000C78 - arm_func_end ov29_0230E064 + arm_func_end TryRecruit arm_func_start ItemIsActive__0230E578 ItemIsActive__0230E578: ; 0x0230E578 @@ -6013,7 +6013,7 @@ ItemIsActive__0230E578: ; 0x0230E578 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} diff --git a/asm/overlay_29_0230E914.s b/asm/overlay_29_0230E914.s index 6114ffea..5c91d281 100644 --- a/asm/overlay_29_0230E914.s +++ b/asm/overlay_29_0230E914.s @@ -156,7 +156,7 @@ _0230EB0C: ldr r1, [r0] cmp r1, #3 bne _0230ED8C - bl ov29_022E1610 + bl GetItemInfo mov r8, r0 mov r6, #0x80 b _0230EB84 @@ -382,18 +382,18 @@ _0230EE50: _0230EE68: mov r0, sl mov r1, r4 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _0230EFE0 ldrsh r6, [r4, #4] ldrsh r7, [sl, #4] sub r0, r7, r6 - bl Abs + bl abs mov r5, r0 ldrsh r8, [r4, #6] ldrsh sb, [sl, #6] sub r0, sb, r8 - bl Abs + bl abs ldr r1, [sl, #0xb4] ldrb r1, [r1, #0xee] cmp r1, #0 diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index f52aab73..1d6e384d 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -26,7 +26,7 @@ _0230F04C: beq _0230F128 mov r0, sl mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _0230F128 mov r0, sl @@ -39,12 +39,12 @@ _0230F04C: ldrsh r1, [r7, #6] ldrsh r0, [sl, #6] sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [r7, #4] ldrsh r1, [sl, #4] mov r5, r0 sub r0, r2, r1 - bl Abs + bl abs cmp r0, r5 movle r0, r5 cmp r0, #0xa @@ -90,22 +90,22 @@ _0230F148: .word ov29_022F52BC arm_func_start ov29_0230F14C ov29_0230F14C: ; 0x0230F14C - ldr ip, _0230F154 ; =ov29_022F54BC + ldr ip, _0230F154 ; =UseThrowableItem bx ip .align 2, 0 -_0230F154: .word ov29_022F54BC +_0230F154: .word UseThrowableItem arm_func_end ov29_0230F14C arm_func_start ov29_0230F158 ov29_0230F158: ; 0x0230F158 - ldr ip, _0230F160 ; =ov29_0230F164 + ldr ip, _0230F160 ; =TryNonLeaderItemPickUp bx ip .align 2, 0 -_0230F160: .word ov29_0230F164 +_0230F160: .word TryNonLeaderItemPickUp arm_func_end ov29_0230F158 - arm_func_start ov29_0230F164 -ov29_0230F164: ; 0x0230F164 + arm_func_start TryNonLeaderItemPickUp +TryNonLeaderItemPickUp: ; 0x0230F164 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x198 mov r8, r0 @@ -138,7 +138,7 @@ ov29_0230F164: ; 0x0230F164 ldr r6, [r8, #0xb4] mov r0, r4 mov r7, #1 - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r6, #6] mov r4, r0 cmp r1, #0 @@ -210,7 +210,7 @@ _0230F2B0: bl ov29_02344B44 add r0, r8, #4 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r1, _0230F638 ; =0x00000C5F mov r0, r8 bl LogMessageByIdWithPopup @@ -315,7 +315,7 @@ _0230F408: bl ov29_02344B44 add r0, r8, #4 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r0, _0230F644 ; =0x00001304 bl ov29_022EACCC add r0, sp, #0xcc @@ -401,7 +401,7 @@ _0230F564: bl ov29_02344B44 add r0, r8, #4 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem mov r0, r8 mov r1, #0xc60 bl LogMessageByIdWithPopup @@ -427,7 +427,7 @@ _0230F5F8: bl ov29_02344B44 add r0, r8, #4 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r1, _0230F648 ; =0x00000C61 mov r0, r8 bl LogMessageByIdWithPopup @@ -448,7 +448,7 @@ _0230F644: .word 0x00001304 _0230F648: .word 0x00000C61 _0230F64C: .word 0x00000C62 _0230F650: .word 0x00000C63 - arm_func_end ov29_0230F164 + arm_func_end TryNonLeaderItemPickUp arm_func_start ov29_0230F654 ov29_0230F654: ; 0x0230F654 @@ -490,7 +490,7 @@ AuraBowIsActive: ; 0x0230F6C8 mov r5, r0 ldr r4, [r5, #0xb4] mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -554,8 +554,8 @@ ExclusiveItemDefenseBoost: ; 0x0230F788 bx lr arm_func_end ExclusiveItemDefenseBoost - arm_func_start ov29_0230F798 -ov29_0230F798: ; 0x0230F798 + arm_func_start TeamMemberHasItemActive +TeamMemberHasItemActive: ; 0x0230F798 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r6, #0 ldr r4, _0230F80C ; =0x02353538 @@ -589,7 +589,7 @@ _0230F7F0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0230F80C: .word 0x02353538 - arm_func_end ov29_0230F798 + arm_func_end TeamMemberHasItemActive arm_func_start ItemIsActive__0230F810 ItemIsActive__0230F810: ; 0x0230F810 @@ -597,7 +597,7 @@ ItemIsActive__0230F810: ; 0x0230F810 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -607,8 +607,8 @@ ItemIsActive__0230F810: ; 0x0230F810 ldmia sp!, {r3, r4, r5, pc} arm_func_end ItemIsActive__0230F810 - arm_func_start ov29_0230F840 -ov29_0230F840: ; 0x0230F840 + arm_func_start TeamMemberHasExclusiveItemEffectActive +TeamMemberHasExclusiveItemEffectActive: ; 0x0230F840 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, r0 mov r6, #0 @@ -640,7 +640,7 @@ _0230F898: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0230F8A8: .word 0x02353538 - arm_func_end ov29_0230F840 + arm_func_end TeamMemberHasExclusiveItemEffectActive arm_func_start ExclusiveItemEffectIsActive__0230F8AC ExclusiveItemEffectIsActive__0230F8AC: ; 0x0230F8AC @@ -737,8 +737,8 @@ ov29_0230F9A4: ; 0x0230F9A4 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_0230F9A4 - arm_func_start ov29_0230F9D8 -ov29_0230F9D8: ; 0x0230F9D8 + arm_func_start TrySpawnEnemyItemDrop +TrySpawnEnemyItemDrop: ; 0x0230F9D8 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 ldr r2, _0230FB28 ; =0x02353538 @@ -774,19 +774,19 @@ _0230FA54: ldrsh r1, [r4, #2] add r0, sp, #0 mov r2, r7 - bl ov29_02346060 + bl TryGenerateUnownStoneDrop cmp r0, #0 beq _0230FA84 add r2, sp, #0 mov r0, r5 add r1, r5, #4 mov r3, #1 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper b _0230FB20 _0230FA84: mov r0, r6 mov r1, #0x75 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r2, r0 add r0, sp, #0 mov r1, r5 @@ -798,7 +798,7 @@ _0230FA84: mov r0, r5 add r1, r5, #4 mov r3, #1 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper b _0230FB20 _0230FAC4: mov r0, r6 @@ -818,19 +818,19 @@ _0230FAC4: add r0, sp, #0 mov r1, #0xb7 mov r2, #2 - bl ov29_02344BD0 + bl GenerateStandardItem add r2, sp, #0 mov r0, r5 add r1, r5, #4 mov r3, #1 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper _0230FB20: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0230FB28: .word 0x02353538 _0230FB2C: .word 0x022C4650 - arm_func_end ov29_0230F9D8 + arm_func_end TrySpawnEnemyItemDrop arm_func_start ov29_0230FB30 ov29_0230FB30: ; 0x0230FB30 @@ -866,7 +866,7 @@ TickNoSlipCap: ; 0x0230FB90 stmdb sp!, {r3, r4, r5, lr} mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0230FBB8 @@ -1011,7 +1011,7 @@ _0230FD0C: mov r0, r5 mov r1, #0x59 add r7, r7, r2 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1198,7 +1198,7 @@ _0230FFE8: mov r1, #1 mov r2, #0xe mov r3, #0x250 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper mov r0, #1 strb r0, [r4, #0x150] add r0, r4, #0x100 @@ -1260,12 +1260,12 @@ _0231013C: mov r0, r5 bne _023101FC mov r1, #0x77 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02310360 mov r0, r5 mov r1, #0x4d - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02310360 mov r0, r5 @@ -1279,7 +1279,7 @@ _0231013C: mov r1, r5 mov r2, #1 str r6, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 ldr r0, _02310A9C ; =0x022C46EC @@ -1287,7 +1287,7 @@ _0231013C: ldrsh r1, [r0] mov r0, r5 mov r2, #0x12 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02310360 _023101FC: bl GetApparentWeather @@ -1295,7 +1295,7 @@ _023101FC: mov r0, r5 bne _02310298 mov r1, #0x1d - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02310360 mov r0, r5 @@ -1319,7 +1319,7 @@ _023101FC: mov r1, r5 mov r2, #1 str r6, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 ldr r0, _02310A9C ; =0x022C46EC @@ -1327,7 +1327,7 @@ _023101FC: ldrsh r1, [r0] mov r0, r5 mov r2, #0x12 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02310360 _02310298: bl GetApparentWeather @@ -1335,7 +1335,7 @@ _02310298: bne _02310360 mov r0, r5 mov r1, #0x5a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02310304 ldr r3, _02310A98 ; =0x00000DBD @@ -1344,7 +1344,7 @@ _02310298: mov r1, r5 mov r2, #1 str r6, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 mov r0, #2 @@ -1355,12 +1355,12 @@ _02310298: ldrsh r1, [r0] mov r0, r5 rsb r3, r2, #0x278 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02310360 _02310304: mov r0, r5 mov r1, #0x55 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02310360 ldr r3, _02310A98 ; =0x00000DBD @@ -1369,7 +1369,7 @@ _02310304: mov r1, r5 mov r2, #1 str r6, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 mov r0, #2 @@ -1380,7 +1380,7 @@ _02310304: ldrsh r1, [r0] mov r0, r5 mov r2, #0x1a - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310360: mov r0, r5 bl EntityIsValid__02311010 @@ -1395,7 +1395,7 @@ _0231037C: mov r6, r0 mov r0, r5 mov r1, #0x21 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023103F8 ldr r0, _02310AA4 ; =0x022C46A0 @@ -1404,7 +1404,7 @@ _0231037C: bge _023103F8 mov r0, r5 mov r1, #0 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 beq _023103F8 mov r0, #0 @@ -1420,11 +1420,11 @@ _0231037C: mov r1, r5 mov r2, #1 mov r3, #0 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper _023103F8: mov r0, r5 mov r1, #0x51 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02310474 mov r0, r5 @@ -1433,7 +1433,7 @@ _023103F8: bne _02310474 mov r0, r5 mov r1, #0 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 ldrneb r0, [r4, #0xc4] cmpne r0, #3 @@ -1452,11 +1452,11 @@ _023103F8: mov r1, r5 mov r2, #1 str r3, [sp] - bl ov29_023058C4 + bl EndNegativeStatusCondition _02310474: mov r0, r5 mov r1, #0xb - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023104C0 ldrb r1, [r4, #0x11f] @@ -1519,7 +1519,7 @@ _023104F8: ldrsh r1, [r0] mov r0, r5 rsb r3, r2, #0x248 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310574: mov r0, r5 bl EntityIsValid__02311010 @@ -1533,14 +1533,14 @@ _02310590: cmp r0, #0 beq _023105DC mov r0, r5 - bl HasConditionalGroundImmunity + bl IsFloating cmp r0, #0 beq _023105C0 mov r0, r5 mov r1, r5 - bl ov29_02306CD0 + bl EndMagnetRiseStatus mov r0, r5 - bl ov29_02321104 + bl EnsureCanStandCurrentTile _023105C0: mov r0, r5 bl EntityIsValid__02311010 @@ -1552,11 +1552,11 @@ _023105C0: _023105DC: mov r0, r5 mov r1, #0x69 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02310614 mov r0, r5 - bl ov29_0231B1B8 + bl TryActivateBadDreams mov r0, r5 bl EntityIsValid__02311010 cmp r0, #0 @@ -1601,7 +1601,7 @@ _0231067C: mov r0, r5 mov r1, r5 mov r3, r2 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper _023106A4: mov r0, r5 mov r1, #0x5c @@ -1631,7 +1631,7 @@ _023106C8: bl ov29_022E543C mov r0, r8 mov r1, r8 - bl ov29_023061A8 + bl EndBurnClassStatus mov sl, r7 _02310718: add r0, sb, #1 @@ -1679,7 +1679,7 @@ _02310754: bl ov29_02307BDC mov r0, r5 mov r1, #0x72 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023107F8 ldr r0, _02310AC4 ; =0x022C44D8 @@ -1697,7 +1697,7 @@ _023107F8: ldrsh r1, [r0] mov r0, r5 rsb r3, r2, #0x24c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310810: mov r0, r5 bl EntityIsValid__02311010 @@ -1744,7 +1744,7 @@ _02310830: bl ov29_02307BDC mov r0, r5 mov r1, #0x72 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023108F4 ldr r0, _02310ACC ; =0x022C4C9C @@ -1764,7 +1764,7 @@ _023108F4: mov r2, #3 mov r0, r5 rsb r3, r2, #0x24c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310910: mov r0, r5 bl EntityIsValid__02311010 @@ -1807,7 +1807,7 @@ _0231092C: ldrsh r1, [r1] mov r2, #2 mov r3, #0x248 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _023109B4: mov r0, r5 bl EntityIsValid__02311010 @@ -1847,7 +1847,7 @@ _023109D4: ldrsh r1, [r0] mov r0, r5 mov r2, #5 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310A4C: mov r0, r5 bl EntityIsValid__02311010 @@ -1967,7 +1967,7 @@ ov29_02310BDC: ; 0x02310BDC mov r0, r5 mov r1, r6 add r3, r2, #0x244 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310C0C: mov r0, r5 bl EntityIsValid__02311010 @@ -2028,14 +2028,14 @@ _02310CD0: beq _02310CF0 mov r0, r7 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r8, #0 bne _02310D00 _02310CF0: mov r0, r5 mov r1, #0x3a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r8, r0 _02310D00: mov r0, r5 @@ -2063,7 +2063,7 @@ _02310D00: mov r1, r6 mov r2, #9 mov r3, #0x24c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper cmp r8, #0 beq _02310D94 mov r0, r7 @@ -2073,12 +2073,12 @@ _02310D00: mov r0, r7 mov r1, r6 add r3, r2, #0x22c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02310DC4 _02310D94: mov r0, r5 mov r1, #0x73 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02310DC4 mov r8, #1 @@ -2137,7 +2137,7 @@ _02310E6C: ldr r1, _02311004 ; =0x0000270F mov r0, r5 rsb r3, r2, #0x258 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _02310E80: mov r0, r5 bl EntityIsValid__02311010 diff --git a/asm/overlay_29_02311034.s b/asm/overlay_29_02311034.s index 9eb0c339..8b5e5730 100644 --- a/asm/overlay_29_02311034.s +++ b/asm/overlay_29_02311034.s @@ -9,7 +9,7 @@ ItemIsActive__02311034: ; 0x02311034 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -53,7 +53,7 @@ TickStatusAndHealthRegen: ; 0x02311088 bhi _023110E0 mov r0, sl mov r1, #0x72 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 moveq r4, #1 _023110E0: @@ -98,7 +98,7 @@ _0231115C: ldreqsh r0, [r0] addeq r4, r4, r0 mov r0, sl - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0231119C mov r0, sl @@ -110,7 +110,7 @@ _0231115C: _0231119C: mov r0, sl mov r1, #0x55 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023111C8 mov r0, sl @@ -122,7 +122,7 @@ _0231119C: _023111C8: mov r0, sl mov r1, #0x4d - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023111F4 mov r0, sl @@ -209,7 +209,7 @@ _02311304: mov r1, sl mov r3, r2 str r2, [sp] - bl ov29_02305FDC + bl EndSleepClassStatus _0231131C: mov r0, sl bl EntityIsValid__02311010 @@ -228,7 +228,7 @@ _0231131C: bne _02311364 mov r0, sl mov r1, sl - bl ov29_023061A8 + bl EndBurnClassStatus _02311364: mov r0, sl bl EntityIsValid__02311010 @@ -290,14 +290,14 @@ _023113F8: cmp r0, #0 bne _02311450 mov r0, sl - bl ov29_023183E8 + bl ApplyAquaRingHealing _02311450: ldrb r0, [r7, #0xd6] cmp r0, #0 bne _02311468 mov r0, sl mov r1, sl - bl ov29_023064F4 + bl EndReflectClassStatus _02311468: mov r0, sl bl EntityIsValid__02311010 @@ -318,7 +318,7 @@ _02311468: mov r1, sl mov r2, #0 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus _023114B8: mov r0, sl bl EntityIsValid__02311010 @@ -337,7 +337,7 @@ _023114B8: bne _02311500 mov r0, sl mov r1, sl - bl ov29_023068C4 + bl EndLeechSeedClassStatus _02311500: mov r0, sl bl EntityIsValid__02311010 @@ -356,7 +356,7 @@ _02311500: bne _02311548 mov r0, sl mov r1, sl - bl ov29_02306950 + bl EndSureShotClassStatus _02311548: mov r0, sl bl EntityIsValid__02311010 @@ -376,7 +376,7 @@ _02311548: mov r0, sl mov r1, sl mov r2, #0 - bl ov29_02306A00 + bl EndInvisibleClassStatus _02311594: mov r0, sl bl EntityIsValid__02311010 @@ -395,7 +395,7 @@ _02311594: bne _023115DC mov r0, sl mov r1, sl - bl ov29_02306B28 + bl EndBlinkerClassStatus _023115DC: mov r0, sl bl EntityIsValid__02311010 @@ -414,7 +414,7 @@ _023115DC: bne _02311624 mov r0, sl mov r1, sl - bl ov29_02306BF8 + bl EndMuzzledStatus _02311624: mov r0, sl bl EntityIsValid__02311010 @@ -433,7 +433,7 @@ _02311624: bne _0231166C mov r0, sl mov r1, sl - bl ov29_02306C64 + bl EndMiracleEyeStatus _0231166C: mov r0, sl bl EntityIsValid__02311010 @@ -452,7 +452,7 @@ _0231166C: bne _023116B4 mov r0, sl mov r1, sl - bl ov29_02306CD0 + bl EndMagnetRiseStatus _023116B4: mov r0, sl bl EntityIsValid__02311010 @@ -577,7 +577,7 @@ InflictSleepStatusSingle: ; 0x02311824 beq _02311890 mov r0, r7 mov r1, #0x2f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02311890 add r0, r6, r6, lsr #31 diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index 80bab58f..179f2352 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -13,7 +13,7 @@ TryInflictSleepStatus: ; 0x023118D8 mov r7, r0 mov r6, r1 str r4, [sp] - bl ov29_023119E4 + bl IsProtectedFromSleepClassStatus cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r6, #0xb4] @@ -79,8 +79,8 @@ _023119DC: .word 0x00000D07 _023119E0: .word 0x00000D04 arm_func_end TryInflictSleepStatus - arm_func_start ov29_023119E4 -ov29_023119E4: ; 0x023119E4 + arm_func_start IsProtectedFromSleepClassStatus +IsProtectedFromSleepClassStatus: ; 0x023119E4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r7, r1 @@ -102,7 +102,7 @@ ov29_023119E4: ; 0x023119E4 mov r0, r8 mov r1, r7 mov r2, r4 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #1 bne _02311B78 @@ -112,7 +112,7 @@ _02311A48: mov r0, r8 mov r1, r7 mov r2, r4 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #1 bne _02311B78 @@ -187,7 +187,7 @@ _02311B4C: mov r1, r7 mov r2, r4 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -201,7 +201,7 @@ _02311B84: .word 0x00000DA5 _02311B88: .word 0x00000DA6 _02311B8C: .word 0x00000DB1 _02311B90: .word 0x00000DC2 - arm_func_end ov29_023119E4 + arm_func_end IsProtectedFromSleepClassStatus arm_func_start DefenderAbilityIsActive__02311B94 DefenderAbilityIsActive__02311B94: ; 0x02311B94 @@ -223,14 +223,14 @@ _02311BC8: cmpne r3, #0 beq _02311BE8 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _02311BE8: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} arm_func_end DefenderAbilityIsActive__02311B94 @@ -240,7 +240,7 @@ ItemIsActive__02311BF8: ; 0x02311BF8 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -255,7 +255,7 @@ ov29_02311C28: ; 0x02311C28 stmdb sp!, {r3, lr} ldrb ip, [sp, #8] str ip, [sp] - bl ov29_023119E4 + bl IsProtectedFromSleepClassStatus cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -274,7 +274,7 @@ TryInflictNightmareStatus: ; 0x02311C4C mov r6, r1 str r2, [sp] mov r4, #0 - bl ov29_023119E4 + bl IsProtectedFromSleepClassStatus cmp r0, #0 bne _02311D4C ldr r5, [r6, #0xb4] @@ -355,7 +355,7 @@ TryInflictNappingStatus: ; 0x02311D60 mov r8, r0 mov r7, r1 str r5, [sp] - bl ov29_023119E4 + bl IsProtectedFromSleepClassStatus cmp r0, #0 bne _02311E5C ldr r5, [r7, #0xb4] @@ -432,7 +432,7 @@ TryInflictYawningStatus: ; 0x02311E70 mov r6, r0 mov r5, r1 str r2, [sp] - bl ov29_023119E4 + bl IsProtectedFromSleepClassStatus cmp r0, #0 bne _02311F6C ldr r1, [r5, #0xb4] @@ -586,7 +586,7 @@ TryInflictPausedStatus: ; 0x0231206C ldrb r2, [sp, #0x18] mov r0, r7 mov r1, r6 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -594,7 +594,7 @@ _023120BC: ldrb r2, [sp, #0x18] mov r0, r7 mov r1, r6 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -676,14 +676,14 @@ TryInflictInfatuatedStatus: ; 0x023121AC mov r1, r4 mov r2, r8 ldr r6, [r4, #0xb4] - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 bne _0231231C mov r0, r5 mov r1, r4 mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 bne _0231231C @@ -714,7 +714,7 @@ _02312260: mov r1, r4 mov r2, r8 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #0 bne _0231231C @@ -783,14 +783,14 @@ TryInflictBurnStatus: ; 0x02312338 mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -898,7 +898,7 @@ _02312504: bl UpdateStatusIconFlags mov r0, sb mov r1, #0x19 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023125E8 cmp r5, #0 @@ -1010,14 +1010,14 @@ TryInflictPoisonedStatus: ; 0x02312664 mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -1128,7 +1128,7 @@ _02312830: _02312840: mov r0, sb mov r1, #0x19 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02312914 cmp r4, #0 @@ -1211,14 +1211,14 @@ TryInflictBadlyPoisonedStatus: ; 0x0231293C mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -1321,7 +1321,7 @@ _02312AEC: _02312AFC: mov r0, sb mov r1, #0x19 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02312BD0 cmp r4, #0 @@ -1410,13 +1410,13 @@ TryInflictFrozenStatus: ; 0x02312BF8 mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov ip, #4 @@ -1425,7 +1425,7 @@ TryInflictFrozenStatus: ; 0x02312BF8 mov r2, r5 rsb r3, ip, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 @@ -1484,7 +1484,7 @@ _02312D48: mov r2, r5 rsb r3, ip, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldrb r0, [r4, #0xc4] @@ -1517,7 +1517,7 @@ _02312D88: bl TryActivateQuickFeet mov r0, r6 mov r1, #0 - bl ov29_0231B4EC + bl ChangeShayminForme cmp r0, #3 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldr r2, _02312E1C ; =0x00000D23 @@ -1551,14 +1551,14 @@ TryInflictConstrictionStatus: ; 0x02312E20 mov r0, r7 mov r1, r6 mov r2, r4 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, r4 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -1645,14 +1645,14 @@ TryInflictShadowHoldStatus: ; 0x02312F78 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} @@ -1821,13 +1821,13 @@ TryInflictWrappedStatus: ; 0x023131F4 mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldr r4, [r7, #0xb4] @@ -1997,13 +1997,13 @@ TryInflictPetrifiedStatus: ; 0x0231346C mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} mov r0, r5 @@ -2139,7 +2139,7 @@ _02313678: ldrb r2, [sp, #0x2c] mov r0, r8 mov r1, r7 - bl ov29_02301B2C + bl IsProtectedFromStatDrops cmp r0, #0 bne _023137E8 mov r0, r7 @@ -2188,7 +2188,7 @@ _02313720: bl ov29_022E4D28 mov r0, r7 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, r5, lsl #0x11 movne r5, r0, asr #0x10 @@ -2287,7 +2287,7 @@ _02313890: ldrb r2, [sp, #0x2c] mov r0, r8 mov r1, r7 - bl ov29_02301B2C + bl IsProtectedFromStatDrops cmp r0, #0 bne _0231397C _023138B4: @@ -2302,7 +2302,7 @@ _023138B4: bl ov29_022E4DCC mov r0, r7 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, r5, lsl #0x11 movne r5, r0, asr #0x10 @@ -2403,7 +2403,7 @@ _02313A24: _02313A3C: mov r0, r8 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, r6, lsl #0x11 movne r6, r0, asr #0x10 @@ -2506,7 +2506,7 @@ _02313B90: _02313BA8: mov r0, r8 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, r6, lsl #0x11 movne r6, r0, asr #0x10 @@ -2563,8 +2563,8 @@ _02313C6C: .word 0x00000D8E _02313C70: .word 0x00000DD6 arm_func_end BoostDefensiveStat - arm_func_start ov29_02313C74 -ov29_02313C74: ; 0x02313C74 + arm_func_start FlashFireShouldActivate +FlashFireShouldActivate: ; 0x02313C74 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -2575,7 +2575,7 @@ ov29_02313C74: ; 0x02313C74 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, #0x6b - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -2593,10 +2593,10 @@ ov29_02313C74: ; 0x02313C74 movge r0, #1 movlt r0, #2 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02313C74 + arm_func_end FlashFireShouldActivate - arm_func_start ov29_02313CE4 -ov29_02313CE4: ; 0x02313CE4 + arm_func_start ActivateFlashFire +ActivateFlashFire: ; 0x02313CE4 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r0, r5 @@ -2621,7 +2621,7 @@ _02313D34: mov r0, r5 bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02313CE4 + arm_func_end ActivateFlashFire arm_func_start ApplyOffensiveStatMultiplier ApplyOffensiveStatMultiplier: ; 0x02313D40 @@ -2659,7 +2659,7 @@ _02313DAC: ldrb r2, [sp, #0x30] mov r0, sb mov r1, r8 - bl ov29_02301B2C + bl IsProtectedFromStatDrops cmp r0, #0 bne _02313F3C _02313DCC: @@ -2812,7 +2812,7 @@ _02313FD0: ldrb r2, [sp, #0x30] mov r0, sb mov r1, r8 - bl ov29_02301B2C + bl IsProtectedFromStatDrops cmp r0, #0 bne _023140C0 _02313FF0: @@ -2928,7 +2928,7 @@ _0231415C: _02314174: mov r0, r6 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldr r1, [sp, #0x20] cmp r0, #0 movne r0, r4, lsl #0x11 @@ -3014,7 +3014,7 @@ _0231429C: mov r0, r7 mov r1, r6 mov r2, r8 - bl ov29_02301B2C + bl IsProtectedFromStatDrops cmp r0, #0 bne _023143C4 mov r0, r7 @@ -3041,7 +3041,7 @@ _0231429C: _02314308: mov r0, r6 mov r1, #0x61 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, r4, lsl #0x11 movne r4, r0, asr #0x10 @@ -3118,14 +3118,14 @@ TryInflictCringeStatus: ; 0x023143E8 mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -3176,7 +3176,7 @@ _02314498: bl LogMessageByIdWithPopupCheckUserTarget mov r0, r7 mov r1, r6 - bl ov29_0231B364 + bl TryActivateSteadfast mov r0, r7 mov r1, r6 bl TryActivateQuickFeet @@ -3214,14 +3214,14 @@ TryInflictParalysisStatus: ; 0x02314544 mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 bne _023147D0 mov r0, sl mov r1, sb mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 bne _023147D0 @@ -3315,7 +3315,7 @@ _023146E0: _023146F0: mov r0, sb mov r1, #0x19 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023147C4 cmp r4, #0 @@ -3508,13 +3508,13 @@ LowerSpeed: ; 0x02314954 mov r0, sl mov r1, sb mov r2, r7 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, sl mov r1, sb mov r2, r7 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, #0 @@ -3609,14 +3609,14 @@ TrySealMove: ; 0x02314ABC moveq r0, r5 beq _02314C18 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, r5 bne _02314C18 mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, r5 bne _02314C18 @@ -3657,7 +3657,7 @@ _02314B74: mov r1, r7 mov r2, #1 str r5, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #0 bne _02314C18 @@ -3786,8 +3786,8 @@ _02314D30: _02314D3C: .word 0x00000D61 arm_func_end ResetHitChanceStat - arm_func_start ov29_02314D40 -ov29_02314D40: ; 0x02314D40 + arm_func_start ExclusiveItemEffectIsActiveWithLogging +ExclusiveItemEffectIsActiveWithLogging: ; 0x02314D40 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 mov r6, r1 @@ -3824,7 +3824,7 @@ _02314DB8: _02314DBC: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_02314D40 + arm_func_end ExclusiveItemEffectIsActiveWithLogging arm_func_start ov29_02314DC4 ov29_02314DC4: ; 0x02314DC4 @@ -3859,7 +3859,7 @@ TryActivateQuickFeet: ; 0x02314E1C mov r5, r0 mov r0, r4 mov r1, #0x6d - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -3873,8 +3873,8 @@ TryActivateQuickFeet: ; 0x02314E1C ldmia sp!, {r3, r4, r5, pc} arm_func_end TryActivateQuickFeet - arm_func_start ov29_02314E60 -ov29_02314E60: ; 0x02314E60 + arm_func_start TryInflictTerrifiedStatus +TryInflictTerrifiedStatus: ; 0x02314E60 stmdb sp!, {r3, r4, r5, lr} ldr r2, _02314EB0 ; =0x022C4618 mov r4, r1 @@ -3898,10 +3898,10 @@ ov29_02314E60: ; 0x02314E60 .align 2, 0 _02314EB0: .word 0x022C4618 _02314EB4: .word 0x00000DE5 - arm_func_end ov29_02314E60 + arm_func_end TryInflictTerrifiedStatus - arm_func_start ov29_02314EB8 -ov29_02314EB8: ; 0x02314EB8 + arm_func_start TryInflictGrudgeStatus +TryInflictGrudgeStatus: ; 0x02314EB8 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r7, r1 ldr r5, [r7, #0xb4] @@ -3937,7 +3937,7 @@ _02314F2C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02314F34: .word 0x00000ED1 - arm_func_end ov29_02314EB8 + arm_func_end TryInflictGrudgeStatus arm_func_start TryInflictConfusedStatus TryInflictConfusedStatus: ; 0x02314F38 @@ -3954,14 +3954,14 @@ TryInflictConfusedStatus: ; 0x02314F38 mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 mov r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -3989,7 +3989,7 @@ _02314FD8: mov r1, r6 mov r2, r5 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -4008,14 +4008,14 @@ _02315028: beq _02315048 mov r0, r7 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _02315054 _02315048: mov r0, r6 mov r1, #0x40 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _02315054: cmp r0, #0 beq _0231507C diff --git a/asm/overlay_29_0231513C.s b/asm/overlay_29_0231513C.s index 0805ff34..dd3f2e1e 100644 --- a/asm/overlay_29_0231513C.s +++ b/asm/overlay_29_0231513C.s @@ -9,7 +9,7 @@ ItemIsActive__0231513C: ; 0x0231513C mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -34,14 +34,14 @@ TryInflictCoweringStatus: ; 0x0231516C mov r0, r5 mov r1, r4 mov r2, r7 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r5 mov r1, r4 mov r2, r7 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -90,8 +90,8 @@ _02315264: .word 0x00000D43 _02315268: .word 0x00000D44 arm_func_end TryInflictCoweringStatus - arm_func_start ov29_0231526C -ov29_0231526C: ; 0x0231526C + arm_func_start TryRestoreHp +TryRestoreHp: ; 0x0231526C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r0, r4 @@ -124,7 +124,7 @@ _023152D0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023152E0: .word 0x000003E7 - arm_func_end ov29_0231526C + arm_func_end TryRestoreHp arm_func_start TryIncreaseHp TryIncreaseHp: ; 0x023152E4 @@ -165,7 +165,7 @@ _02315348: mov r1, r1, lsl #8 bl MultiplyByFixedPoint mov r1, #0x64 - bl DivideInt + bl __divsi3 add r5, r5, r0, asr #8 _0231537C: ldrsh r1, [sb, #0x12] @@ -229,7 +229,7 @@ _02315454: mov r0, r7 mov r1, r6 mov r2, r5 - bl ov29_0231526C + bl TryRestoreHp _02315464: ldrsh r2, [sb, #0x12] ldrsh r1, [sb, #0x16] @@ -292,7 +292,7 @@ _02315534: mov r4, #0 beq _02315560 mov r0, r6 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 ldr r2, _02315604 ; =0x00000CFC mov r0, r7 @@ -303,7 +303,7 @@ _02315560: cmp sl, #0 beq _023155C8 mov r0, r6 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, sl cmp r5, #0 @@ -350,8 +350,8 @@ _02315608: .word 0x00000CF9 _0231560C: .word 0x00000CF8 arm_func_end TryIncreaseHp - arm_func_start ov29_02315610 -ov29_02315610: ; 0x02315610 + arm_func_start RevealItems +RevealItems: ; 0x02315610 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -382,18 +382,18 @@ _02315650: mov r1, r4 bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0 - bl ov29_022E2EC4 - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateMinimap mov r0, r4 bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02315698: .word 0x00000CE4 _0231569C: .word 0x00000CE2 - arm_func_end ov29_02315610 + arm_func_end RevealItems - arm_func_start ov29_023156A0 -ov29_023156A0: ; 0x023156A0 + arm_func_start RevealStairs +RevealStairs: ; 0x023156A0 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -425,7 +425,7 @@ _02315700: strb r1, [r2, #0xfb] bl ov29_022E4660 mov r0, #0 - bl ov29_02338794 + bl HiddenStairsTrigger mov r0, #0 mov r1, r4 mov r2, r0 @@ -435,8 +435,8 @@ _02315700: mov r1, r4 bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0 - bl ov29_022E2EC4 - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateMinimap mov r0, r4 bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, pc} @@ -444,10 +444,10 @@ _02315700: _02315750: .word 0x00000CE6 _02315754: .word 0x00000CE5 _02315758: .word 0x00000CE3 - arm_func_end ov29_023156A0 + arm_func_end RevealStairs - arm_func_start ov29_0231575C -ov29_0231575C: ; 0x0231575C + arm_func_start RevealEnemies +RevealEnemies: ; 0x0231575C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -478,15 +478,15 @@ _0231579C: mov r1, r4 bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0 - bl ov29_022E2EC4 - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateMinimap mov r0, r4 bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023157E4: .word 0x00000CEA _023157E8: .word 0x00000CE9 - arm_func_end ov29_0231575C + arm_func_end RevealEnemies arm_func_start TryInflictLeechSeedStatus TryInflictLeechSeedStatus: ; 0x023157EC @@ -520,14 +520,14 @@ _02315850: mov r0, r6 mov r1, r5 mov r2, r8 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r6 mov r1, r5 mov r2, r8 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 mov r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} @@ -662,8 +662,8 @@ _02315A3C: _02315A4C: .word 0x02353538 arm_func_end ov29_023159D4 - arm_func_start TryInflictDestinyBond -TryInflictDestinyBond: ; 0x02315A50 + arm_func_start TryInflictDestinyBondStatus +TryInflictDestinyBondStatus: ; 0x02315A50 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -741,10 +741,10 @@ _02315B60: .word 0x022C47D4 _02315B64: .word 0x00000D54 _02315B68: .word 0x02353538 _02315B6C: .word 0x00000D53 - arm_func_end TryInflictDestinyBond + arm_func_end TryInflictDestinyBondStatus - arm_func_start ov29_02315B70 -ov29_02315B70: ; 0x02315B70 + arm_func_start TryInflictSureShotStatus +TryInflictSureShotStatus: ; 0x02315B70 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 mov r7, r0 @@ -784,10 +784,10 @@ _02315BEC: .align 2, 0 _02315BF8: .word 0x00000D2E _02315BFC: .word 0x00000D2F - arm_func_end ov29_02315B70 + arm_func_end TryInflictSureShotStatus - arm_func_start ov29_02315C00 -ov29_02315C00: ; 0x02315C00 + arm_func_start TryInflictWhifferStatus +TryInflictWhifferStatus: ; 0x02315C00 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, r1 mov r5, r0 @@ -801,14 +801,14 @@ ov29_02315C00: ; 0x02315C00 mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -849,10 +849,10 @@ _02315CD4: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02315CE4: .word 0x00000D31 - arm_func_end ov29_02315C00 + arm_func_end TryInflictWhifferStatus - arm_func_start ov29_02315CE8 -ov29_02315CE8: ; 0x02315CE8 + arm_func_start TryInflictSetDamageStatus +TryInflictSetDamageStatus: ; 0x02315CE8 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -895,10 +895,10 @@ _02315D70: .align 2, 0 _02315D7C: .word 0x022C47A4 _02315D80: .word 0x00000D3F - arm_func_end ov29_02315CE8 + arm_func_end TryInflictSetDamageStatus - arm_func_start ov29_02315D84 -ov29_02315D84: ; 0x02315D84 + arm_func_start TryInflictFocusEnergyStatus +TryInflictFocusEnergyStatus: ; 0x02315D84 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -942,10 +942,10 @@ _02315E0C: _02315E18: .word 0x022C47AC _02315E1C: .word 0x00000D41 _02315E20: .word 0x00000D42 - arm_func_end ov29_02315D84 + arm_func_end TryInflictFocusEnergyStatus - arm_func_start ov29_02315E24 -ov29_02315E24: ; 0x02315E24 + arm_func_start TryInflictDecoyStatus +TryInflictDecoyStatus: ; 0x02315E24 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 mov sb, r1 @@ -960,14 +960,14 @@ ov29_02315E24: ; 0x02315E24 mov r0, sl mov r1, sb mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 bne _023160C4 mov r0, sl mov r1, sb mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 mov r0, #0 bne _023160C4 @@ -1014,7 +1014,7 @@ _02315EDC: mov r1, r5 mov r2, #0 mov r3, r7 - bl ov29_02306728 + bl EndCurseClassStatus mov r0, #0x2a bl AdvanceFrame _02315F34: @@ -1034,11 +1034,11 @@ _02315F34: mov r1, sb mov r3, r7 mov r2, #2 - bl ov29_02306728 + bl EndCurseClassStatus _02315F78: mov r0, sl mov r1, sb - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct mov r0, #2 strb r0, [r6, #0xd8] ldr r0, [sl, #0xb4] @@ -1133,10 +1133,10 @@ _023160CC: .word 0x00000D46 _023160D0: .word 0x02353538 _023160D4: .word 0x022C47B4 _023160D8: .word 0x00000D45 - arm_func_end ov29_02315E24 + arm_func_end TryInflictDecoyStatus - arm_func_start ov29_023160DC -ov29_023160DC: ; 0x023160DC + arm_func_start TryInflictCurseStatus +TryInflictCurseStatus: ; 0x023160DC stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1161,14 +1161,14 @@ ov29_023160DC: ; 0x023160DC mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 bne _0231626C mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 bne _0231626C @@ -1176,7 +1176,7 @@ ov29_023160DC: ; 0x023160DC mov r1, r7 mov r3, r6 mov r2, #1 - bl ov29_02306728 + bl EndCurseClassStatus mov r0, r7 bl ov29_022E46C0 ldrsh r0, [r4, #0x10] @@ -1192,7 +1192,7 @@ ov29_023160DC: ; 0x023160DC beq _023161E0 mov r0, r8 mov r1, r7 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct mov r2, #1 ldr r1, _02316274 ; =0x022C4784 mov r0, r7 @@ -1248,10 +1248,10 @@ _0231626C: _02316274: .word 0x022C4784 _02316278: .word 0x00000CEC _0231627C: .word 0x02352AEC - arm_func_end ov29_023160DC + arm_func_end TryInflictCurseStatus - arm_func_start ov29_02316280 -ov29_02316280: ; 0x02316280 + arm_func_start TryInflictSnatchStatus +TryInflictSnatchStatus: ; 0x02316280 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov r4, r1 mov r5, r0 @@ -1263,7 +1263,7 @@ ov29_02316280: ; 0x02316280 mov r1, r4 mov r2, #3 mov r3, #1 - bl ov29_02306728 + bl EndCurseClassStatus mov sb, #0 ldr r6, _0231639C ; =0x02353538 mov r8, sb @@ -1285,7 +1285,7 @@ _023162C0: mov r1, sl mov r2, r8 mov r3, r7 - bl ov29_02306728 + bl EndCurseClassStatus _02316304: add sb, sb, #1 cmp sb, #0x14 @@ -1330,10 +1330,10 @@ _02316350: _0231639C: .word 0x02353538 _023163A0: .word 0x022C4788 _023163A4: .word 0x00000CED - arm_func_end ov29_02316280 + arm_func_end TryInflictSnatchStatus - arm_func_start ov29_023163A8 -ov29_023163A8: ; 0x023163A8 + arm_func_start TryInflictTauntStatus +TryInflictTauntStatus: ; 0x023163A8 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r4, r1 @@ -1347,14 +1347,14 @@ ov29_023163A8: ; 0x023163A8 mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 bne _023164C0 mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 bne _023164C0 @@ -1364,7 +1364,7 @@ ov29_023163A8: ; 0x023163A8 mov r1, r4 mov r2, #1 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #0 bne _023164C0 @@ -1414,10 +1414,10 @@ _023164C8: .word 0x00000C39 _023164CC: .word 0x022C47BC _023164D0: .word 0x00000D49 _023164D4: .word 0x00000D4A - arm_func_end ov29_023163A8 + arm_func_end TryInflictTauntStatus - arm_func_start ov29_023164D8 -ov29_023164D8: ; 0x023164D8 + arm_func_start TryInflictStockpileStatus +TryInflictStockpileStatus: ; 0x023164D8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 mov r7, r0 @@ -1437,7 +1437,7 @@ ov29_023164D8: ; 0x023164D8 add r1, r0, #1 mov r0, #1 strb r1, [r5, #0x11e] - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, r6 bl ov29_022E46D4 ldrb r1, [r5, #0x11e] @@ -1462,10 +1462,10 @@ _02316564: .align 2, 0 _02316574: .word 0x00000D4B _02316578: .word 0x00000D4C - arm_func_end ov29_023164D8 + arm_func_end TryInflictStockpileStatus - arm_func_start ov29_0231657C -ov29_0231657C: ; 0x0231657C + arm_func_start TryInflictInvisibleStatus +TryInflictInvisibleStatus: ; 0x0231657C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -1484,7 +1484,7 @@ ov29_0231657C: ; 0x0231657C mov r0, r6 mov r1, r5 mov r2, #0 - bl ov29_02306A00 + bl EndInvisibleClassStatus mov r3, #1 ldr r1, _02316620 ; =0x022C47C8 mov r0, r5 @@ -1513,10 +1513,10 @@ _02316614: _02316620: .word 0x022C47C8 _02316624: .word 0x00000D4D _02316628: .word 0x00000D4E - arm_func_end ov29_0231657C + arm_func_end TryInflictInvisibleStatus - arm_func_start ov29_0231662C -ov29_0231662C: ; 0x0231662C + arm_func_start TryInflictPerishSongStatus +TryInflictPerishSongStatus: ; 0x0231662C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -1529,14 +1529,14 @@ ov29_0231662C: ; 0x0231662C mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} @@ -1581,10 +1581,10 @@ _02316704: _02316714: .word 0x022C47D0 _02316718: .word 0x00000D51 _0231671C: .word 0x00000D52 - arm_func_end ov29_0231662C + arm_func_end TryInflictPerishSongStatus - arm_func_start ov29_02316720 -ov29_02316720: ; 0x02316720 + arm_func_start TryInflictEncoreStatus +TryInflictEncoreStatus: ; 0x02316720 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 ldr r4, [r6, #0xb4] @@ -1598,14 +1598,14 @@ ov29_02316720: ; 0x02316720 mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -1615,7 +1615,7 @@ ov29_02316720: ; 0x02316720 mov r1, r6 mov r2, #1 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -1704,10 +1704,10 @@ _023168C8: .word 0x00000D57 _023168CC: .word 0x022C47D8 _023168D0: .word 0x00000D55 _023168D4: .word 0x00000D56 - arm_func_end ov29_02316720 + arm_func_end TryInflictEncoreStatus - arm_func_start ov29_023168D8 -ov29_023168D8: ; 0x023168D8 + arm_func_start TryDecreaseBelly +TryDecreaseBelly: ; 0x023168D8 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x24 mov r5, r1 @@ -1896,10 +1896,10 @@ _02316BA0: .word 0x00000D64 _02316BA4: .word 0x00000D68 _02316BA8: .word 0x00000D63 _02316BAC: .word 0x00000D69 - arm_func_end ov29_023168D8 + arm_func_end TryDecreaseBelly - arm_func_start ov29_02316BB0 -ov29_02316BB0: ; 0x02316BB0 + arm_func_start TryIncreaseBelly +TryIncreaseBelly: ; 0x02316BB0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c mov sb, r1 @@ -1919,7 +1919,7 @@ ov29_02316BB0: ; 0x02316BB0 bne _02316C08 mov r0, sb mov r1, #0x59 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02316C38 _02316C08: @@ -1929,7 +1929,7 @@ _02316C08: mov r1, r1, lsl #8 bl MultiplyByFixedPoint mov r1, #0x64 - bl DivideInt + bl __divsi3 bl sub_02001888 ldr r1, _02317108 ; =0x000003E7 add r8, r8, r0, asr #8 @@ -2261,10 +2261,10 @@ _02317114: .word 0x00000D66 _02317118: .word 0x00000D65 _0231711C: .word 0x00000D67 _02317120: .word 0x00000D6B - arm_func_end ov29_02316BB0 + arm_func_end TryIncreaseBelly - arm_func_start ov29_02317124 -ov29_02317124: ; 0x02317124 + arm_func_start TryInflictMuzzledStatus +TryInflictMuzzledStatus: ; 0x02317124 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -2277,14 +2277,14 @@ ov29_02317124: ; 0x02317124 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} @@ -2330,10 +2330,10 @@ _02317200: _02317210: .word 0x022C4848 _02317214: .word 0x00000D72 _02317218: .word 0x00000D73 - arm_func_end ov29_02317124 + arm_func_end TryInflictMuzzledStatus - arm_func_start ov29_0231721C -ov29_0231721C: ; 0x0231721C + arm_func_start TryTransform +TryTransform: ; 0x0231721C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x240 mov sb, r1 @@ -2358,7 +2358,7 @@ _02317260: bl SubstitutePlaceholderStringTags add r0, sp, #0x40 mov r1, #0 - bl ov29_022E7C60 + bl MonsterSpawnListPartialCopy movs r6, r0 bne _02317298 ldr r2, _02317400 ; =0x00000D6E @@ -2371,7 +2371,7 @@ _02317298: bl sub_02024FB8 mov r1, r0 add r0, sp, #0 - bl Strcpy + bl strcpy mov r4, #0 mov r7, r4 ldrsh r5, [r8, #4] @@ -2384,7 +2384,7 @@ _023172C0: bl GetMonsterIdFromSpawnEntry mov r1, r0 mov r0, sb - bl ov29_022F9408 + bl GetMonsterApparentId ldrsh r1, [r8, #4] mov r5, r0 cmp r5, r1 @@ -2394,7 +2394,7 @@ _023172C0: cmp r0, #0 beq _0231730C mov r0, r5 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex movs r4, r0 bne _02317318 _0231730C: @@ -2433,7 +2433,7 @@ _02317350: mov r0, sl mov r1, sb mov r2, #0 - bl ov29_02306A00 + bl EndInvisibleClassStatus mov r0, #2 strb r0, [r8, #0xef] ldr r1, _02317404 ; =0x022C47FC @@ -2468,10 +2468,10 @@ _023173FC: .word 0x00000D6F _02317400: .word 0x00000D6E _02317404: .word 0x022C47FC _02317408: .word 0x00000D6D - arm_func_end ov29_0231721C + arm_func_end TryTransform - arm_func_start ov29_0231740C -ov29_0231740C: ; 0x0231740C + arm_func_start TryInflictMobileStatus +TryInflictMobileStatus: ; 0x0231740C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -2486,7 +2486,7 @@ ov29_0231740C: ; 0x0231740C mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02306A00 + bl EndInvisibleClassStatus mov r3, #3 ldr r1, _023174C0 ; =0x022C480C mov r0, r5 @@ -2522,10 +2522,10 @@ _023174B4: .align 2, 0 _023174C0: .word 0x022C480C _023174C4: .word 0x00000D71 - arm_func_end ov29_0231740C + arm_func_end TryInflictMobileStatus - arm_func_start ov29_023174C8 -ov29_023174C8: ; 0x023174C8 + arm_func_start TryInflictExposedStatus +TryInflictExposedStatus: ; 0x023174C8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov sb, #0 mov r7, r1 @@ -2541,14 +2541,14 @@ ov29_023174C8: ; 0x023174C8 mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, sb ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 mov r0, sb ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -2629,10 +2629,10 @@ _02317638: .word 0x00000D77 _0231763C: .word 0x00000D75 _02317640: .word 0x00000D76 _02317644: .word 0x00000D74 - arm_func_end ov29_023174C8 + arm_func_end TryInflictExposedStatus - arm_func_start ov29_02317648 -ov29_02317648: ; 0x02317648 + arm_func_start TryActivateIdentifyCondition +TryActivateIdentifyCondition: ; 0x02317648 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -2668,10 +2668,10 @@ _023176AC: _023176C0: .word 0x02353538 _023176C4: .word 0x00000D78 _023176C8: .word 0x00000D79 - arm_func_end ov29_02317648 + arm_func_end TryActivateIdentifyCondition - arm_func_start ov29_023176CC -ov29_023176CC: ; 0x023176CC + arm_func_start TryInflictBlinkerStatus +TryInflictBlinkerStatus: ; 0x023176CC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, r1 mov r5, r0 @@ -2685,14 +2685,14 @@ ov29_023176CC: ; 0x023176CC mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r5 mov r1, r4 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -2726,8 +2726,8 @@ _0231777C: bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0x31 bl AdvanceFrame - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap mov r0, r5 mov r1, r4 bl TryActivateQuickFeet @@ -2746,7 +2746,7 @@ _023177C8: _023177D8: .word 0x022C4828 _023177DC: .word 0x00000D34 _023177E0: .word 0x00000D35 - arm_func_end ov29_023176CC + arm_func_end TryInflictBlinkerStatus arm_func_start IsBlinded IsBlinded: ; 0x023177E4 @@ -2778,8 +2778,8 @@ _0231783C: ldmia sp!, {r3, r4, r5, pc} arm_func_end IsBlinded - arm_func_start ov29_02317844 -ov29_02317844: ; 0x02317844 + arm_func_start TryInflictCrossEyedStatus +TryInflictCrossEyedStatus: ; 0x02317844 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -2792,14 +2792,14 @@ ov29_02317844: ; 0x02317844 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} @@ -2830,11 +2830,11 @@ ov29_02317844: ; 0x02317844 mov r0, r6 mov r1, r5 strb r2, [r4, #0xf2] - bl ov29_0231B364 + bl TryActivateSteadfast mov r0, #1 - bl ov29_022E2EC4 - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateCamera + bl UpdateTrapsVisibility + bl UpdateMinimap mov r0, r6 mov r1, r5 bl TryActivateQuickFeet @@ -2853,10 +2853,10 @@ _02317940: _02317950: .word 0x00000D36 _02317954: .word 0x022C4830 _02317958: .word 0x00000D37 - arm_func_end ov29_02317844 + arm_func_end TryInflictCrossEyedStatus - arm_func_start ov29_0231795C -ov29_0231795C: ; 0x0231795C + arm_func_start TryInflictEyedropStatus +TryInflictEyedropStatus: ; 0x0231795C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -2888,8 +2888,8 @@ ov29_0231795C: ; 0x0231795C bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0x31 bl AdvanceFrame - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap b _023179F4 _023179E4: ldr r2, _02317A08 ; =0x00000D39 @@ -2904,10 +2904,10 @@ _023179F4: _02317A00: .word 0x022C4838 _02317A04: .word 0x00000D38 _02317A08: .word 0x00000D39 - arm_func_end ov29_0231795C + arm_func_end TryInflictEyedropStatus - arm_func_start ov29_02317A0C -ov29_02317A0C: ; 0x02317A0C + arm_func_start TryInflictSlipStatus +TryInflictSlipStatus: ; 0x02317A0C stmdb sp!, {r4, r5, r6, lr} mov r4, r1 mov r5, r0 @@ -2935,7 +2935,7 @@ _02317A54: mov r0, r5 mov r1, r4 mov r2, #0 - bl ov29_02306A00 + bl EndInvisibleClassStatus mov r3, #4 ldr r1, _02317AE8 ; =0x022C486C mov r0, r4 @@ -2971,10 +2971,10 @@ _02317AD8: _02317AE8: .word 0x022C486C _02317AEC: .word 0x00000D3A _02317AF0: .word 0x00000D3B - arm_func_end ov29_02317A0C + arm_func_end TryInflictSlipStatus - arm_func_start ov29_02317AF4 -ov29_02317AF4: ; 0x02317AF4 + arm_func_start TryInflictDropeyeStatus +TryInflictDropeyeStatus: ; 0x02317AF4 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -2985,13 +2985,13 @@ ov29_02317AF4: ; 0x02317AF4 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 bne _02317B40 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 beq _02317B48 _02317B40: @@ -3034,8 +3034,8 @@ _02317B70: bl LogMessageByIdWithPopupCheckUserTarget mov r0, #0x31 bl AdvanceFrame - bl ov29_02336F4C - bl ov29_02339CE8 + bl UpdateTrapsVisibility + bl UpdateMinimap mov r0, r6 mov r1, r5 bl TryActivateQuickFeet @@ -3056,10 +3056,10 @@ _02317C10: .word 0x022C487C _02317C14: .word 0x00000115 _02317C18: .word 0x00000D3C _02317C1C: .word 0x00000D3D - arm_func_end ov29_02317AF4 + arm_func_end TryInflictDropeyeStatus - arm_func_start RestoreMovePP -RestoreMovePP: ; 0x02317C20 + arm_func_start RestoreAllMovePP +RestoreAllMovePP: ; 0x02317C20 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov sb, r1 @@ -3112,7 +3112,7 @@ _02317CD0: cmp r6, #0 beq _02317D18 mov r0, sb - bl ov29_022E4964 + bl ShowPpRestoreEffect cmp r8, #0 bne _02317D40 mov r0, #0 @@ -3144,10 +3144,10 @@ _02317D48: .align 2, 0 _02317D50: .word 0x00000DB3 _02317D54: .word 0x00000DB4 - arm_func_end RestoreMovePP + arm_func_end RestoreAllMovePP - arm_func_start ov29_02317D58 -ov29_02317D58: ; 0x02317D58 + arm_func_start RestoreOneMovePP +RestoreOneMovePP: ; 0x02317D58 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r7, r1 @@ -3195,7 +3195,7 @@ _02317E04: cmp r4, #0 beq _02317E44 mov r0, r7 - bl ov29_022E4964 + bl ShowPpRestoreEffect ldrb r0, [sp, #0x20] cmp r0, #0 beq _02317E70 @@ -3229,10 +3229,10 @@ _02317E78: .align 2, 0 _02317E80: .word 0x00000DB3 _02317E84: .word 0x00000DB4 - arm_func_end ov29_02317D58 + arm_func_end RestoreOneMovePP - arm_func_start ov29_02317E88 -ov29_02317E88: ; 0x02317E88 + arm_func_start RestoreRandomMovePP +RestoreRandomMovePP: ; 0x02317E88 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 mov sb, r1 @@ -3282,14 +3282,14 @@ _02317F00: mov r1, sb mov r3, r8 str r7, [sp] - bl ov29_02317D58 + bl RestoreOneMovePP _02317F48: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end ov29_02317E88 + arm_func_end RestoreRandomMovePP - arm_func_start ov29_02317F50 -ov29_02317F50: ; 0x02317F50 + arm_func_start ApplyProteinEffect +ApplyProteinEffect: ; 0x02317F50 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -3330,10 +3330,10 @@ _02317FD0: .align 2, 0 _02317FDC: .word 0x00000D96 _02317FE0: .word 0x00000D97 - arm_func_end ov29_02317F50 + arm_func_end ApplyProteinEffect - arm_func_start ov29_02317FE4 -ov29_02317FE4: ; 0x02317FE4 + arm_func_start ApplyCalciumEffect +ApplyCalciumEffect: ; 0x02317FE4 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -3374,10 +3374,10 @@ _02318064: .align 2, 0 _02318070: .word 0x00000D98 _02318074: .word 0x00000D99 - arm_func_end ov29_02317FE4 + arm_func_end ApplyCalciumEffect - arm_func_start ov29_02318078 -ov29_02318078: ; 0x02318078 + arm_func_start ApplyIronEffect +ApplyIronEffect: ; 0x02318078 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -3418,10 +3418,10 @@ _023180F8: .align 2, 0 _02318104: .word 0x00000D9A _02318108: .word 0x00000D9B - arm_func_end ov29_02318078 + arm_func_end ApplyIronEffect - arm_func_start ov29_0231810C -ov29_0231810C: ; 0x0231810C + arm_func_start ApplyZincEffect +ApplyZincEffect: ; 0x0231810C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -3462,10 +3462,10 @@ _0231818C: .align 2, 0 _02318198: .word 0x00000D9C _0231819C: .word 0x00000D9D - arm_func_end ov29_0231810C + arm_func_end ApplyZincEffect - arm_func_start ov29_023181A0 -ov29_023181A0: ; 0x023181A0 + arm_func_start TryInflictLongTossStatus +TryInflictLongTossStatus: ; 0x023181A0 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] @@ -3497,10 +3497,10 @@ _023181FC: .align 2, 0 _02318208: .word 0x00000DDD _0231820C: .word 0x00000DDE - arm_func_end ov29_023181A0 + arm_func_end TryInflictLongTossStatus - arm_func_start ov29_02318210 -ov29_02318210: ; 0x02318210 + arm_func_start TryInflictPierceStatus +TryInflictPierceStatus: ; 0x02318210 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] @@ -3531,10 +3531,10 @@ _0231826C: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02318278: .word 0x00000DDF - arm_func_end ov29_02318210 + arm_func_end TryInflictPierceStatus - arm_func_start ov29_0231827C -ov29_0231827C: ; 0x0231827C + arm_func_start TryInflictGastroAcidStatus +TryInflictGastroAcidStatus: ; 0x0231827C stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r7, r0 mov r6, r1 @@ -3556,14 +3556,14 @@ ov29_0231827C: ; 0x0231827C mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, pc} @@ -3575,7 +3575,7 @@ ov29_0231827C: ; 0x0231827C beq _02318388 mov r0, r7 mov r1, r6 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #4 ldr r1, _023183B0 ; =0x022C476C mov r0, r6 @@ -3620,10 +3620,10 @@ _023183B0: .word 0x022C476C _023183B4: .word 0x02353538 _023183B8: .word 0x00000D7B _023183BC: .word 0x00000D7C - arm_func_end ov29_0231827C + arm_func_end TryInflictGastroAcidStatus - arm_func_start SetReflectDamageCountdownTo4 -SetReflectDamageCountdownTo4: ; 0x023183C0 + arm_func_start SetAquaRingHealingCountdownTo4 +SetAquaRingHealingCountdownTo4: ; 0x023183C0 stmdb sp!, {r4, lr} mov r4, r0 bl EntityIsValid__02315118 @@ -3635,10 +3635,10 @@ SetReflectDamageCountdownTo4: ; 0x023183C0 ldmia sp!, {r4, pc} .align 2, 0 _023183E4: .word 0x022C4620 - arm_func_end SetReflectDamageCountdownTo4 + arm_func_end SetAquaRingHealingCountdownTo4 - arm_func_start ov29_023183E8 -ov29_023183E8: ; 0x023183E8 + arm_func_start ApplyAquaRingHealing +ApplyAquaRingHealing: ; 0x023183E8 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 mov r4, r0 @@ -3664,17 +3664,17 @@ ov29_023183E8: ; 0x023183E8 bl TryIncreaseHp _02318444: mov r0, r4 - bl SetReflectDamageCountdownTo4 + bl SetAquaRingHealingCountdownTo4 _0231844C: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 _02318454: .word 0x000003E7 _02318458: .word 0x022C4628 - arm_func_end ov29_023183E8 + arm_func_end ApplyAquaRingHealing - arm_func_start ov29_0231845C -ov29_0231845C: ; 0x0231845C + arm_func_start TryInflictAquaRingStatus +TryInflictAquaRingStatus: ; 0x0231845C stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -3702,7 +3702,7 @@ ov29_0231845C: ; 0x0231845C add r1, r0, #1 mov r0, r5 strb r1, [r4, #0xd6] - bl SetReflectDamageCountdownTo4 + bl SetAquaRingHealingCountdownTo4 ldr r2, _02318500 ; =0x00000D7D mov r0, r6 mov r1, r5 @@ -3721,10 +3721,10 @@ _023184F0: _023184FC: .word 0x022C4764 _02318500: .word 0x00000D7D _02318504: .word 0x00000D7E - arm_func_end ov29_0231845C + arm_func_end TryInflictAquaRingStatus - arm_func_start ov29_02318508 -ov29_02318508: ; 0x02318508 + arm_func_start TryInflictLuckyChantStatus +TryInflictLuckyChantStatus: ; 0x02318508 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -3768,10 +3768,10 @@ _02318594: .align 2, 0 _023185A0: .word 0x022C4768 _023185A4: .word 0x00000D7F - arm_func_end ov29_02318508 + arm_func_end TryInflictLuckyChantStatus - arm_func_start ov29_023185A8 -ov29_023185A8: ; 0x023185A8 + arm_func_start TryInflictHealBlockStatus +TryInflictHealBlockStatus: ; 0x023185A8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r0 mov r5, r1 @@ -3789,14 +3789,14 @@ ov29_023185A8: ; 0x023185A8 mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -3813,7 +3813,7 @@ ov29_023185A8: ; 0x023185A8 beq _02318698 mov r0, r6 mov r1, r5 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #5 ldr r1, _023186C0 ; =0x022C4774 mov r0, r5 @@ -3849,10 +3849,10 @@ _023186B0: _023186C0: .word 0x022C4774 _023186C4: .word 0x00000D81 _023186C8: .word 0x00000D82 - arm_func_end ov29_023185A8 + arm_func_end TryInflictHealBlockStatus - arm_func_start ov29_023186CC -ov29_023186CC: ; 0x023186CC + arm_func_start MonsterHasEmbargoStatus +MonsterHasEmbargoStatus: ; 0x023186CC stmdb sp!, {r4, lr} mov r4, r0 bl EntityIsValid__02315118 @@ -3866,10 +3866,10 @@ ov29_023186CC: ; 0x023186CC movne r0, #0 and r0, r0, #0xff ldmia sp!, {r4, pc} - arm_func_end ov29_023186CC + arm_func_end MonsterHasEmbargoStatus - arm_func_start ov29_02318700 -ov29_02318700: ; 0x02318700 + arm_func_start LogItemBlockedByEmbargo +LogItemBlockedByEmbargo: ; 0x02318700 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #0 @@ -3882,10 +3882,10 @@ ov29_02318700: ; 0x02318700 ldmia sp!, {r4, pc} .align 2, 0 _02318728: .word 0x00000D86 - arm_func_end ov29_02318700 + arm_func_end LogItemBlockedByEmbargo - arm_func_start ov29_0231872C -ov29_0231872C: ; 0x0231872C + arm_func_start TryInflictEmbargoStatus +TryInflictEmbargoStatus: ; 0x0231872C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r0 mov r5, r1 @@ -3903,14 +3903,14 @@ ov29_0231872C: ; 0x0231872C mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6 mov r1, r5 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -3927,7 +3927,7 @@ ov29_0231872C: ; 0x0231872C beq _0231881C mov r0, r6 mov r1, r5 - bl ov29_023066D8 + bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #6 ldr r1, _02318844 ; =0x022C4778 mov r0, r5 @@ -3963,10 +3963,10 @@ _02318834: _02318844: .word 0x022C4778 _02318848: .word 0x00000D84 _0231884C: .word 0x00000D85 - arm_func_end ov29_0231872C + arm_func_end TryInflictEmbargoStatus - arm_func_start ov29_02318850 -ov29_02318850: ; 0x02318850 + arm_func_start TryInflictMiracleEyeStatus +TryInflictMiracleEyeStatus: ; 0x02318850 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -3983,14 +3983,14 @@ ov29_02318850: ; 0x02318850 mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02301940 + bl SafeguardIsActive cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r7 mov r1, r6 mov r2, #1 - bl ov29_02302430 + bl IsProtectedFromNegativeStatus cmp r0, #0 mov r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -4000,7 +4000,7 @@ ov29_02318850: ; 0x02318850 bl SubstitutePlaceholderStringTags mov r0, r6 mov r1, #0x10 - bl ov29_02301EAC + bl HasTypeAffectedByGravity cmp r0, #0 bne _02318900 cmp r5, #0 @@ -4049,10 +4049,10 @@ _02318974: .word 0x00000D89 _02318978: .word 0x022C477C _0231897C: .word 0x00000D87 _02318980: .word 0x00000D88 - arm_func_end ov29_02318850 + arm_func_end TryInflictMiracleEyeStatus - arm_func_start ov29_02318984 -ov29_02318984: ; 0x02318984 + arm_func_start TryInflictMagnetRiseStatus +TryInflictMagnetRiseStatus: ; 0x02318984 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -4107,10 +4107,10 @@ _02318A3C: .word 0x00000D8C _02318A40: .word 0x022C4780 _02318A44: .word 0x00000D8A _02318A48: .word 0x00000D8B - arm_func_end ov29_02318984 + arm_func_end TryInflictMagnetRiseStatus - arm_func_start HasConditionalGroundImmunity -HasConditionalGroundImmunity: ; 0x02318A4C + arm_func_start IsFloating +IsFloating: ; 0x02318A4C stmdb sp!, {r4, lr} mov r4, r0 bl EntityIsValid__02315118 @@ -4128,7 +4128,7 @@ HasConditionalGroundImmunity: ; 0x02318A4C movne r0, #0 and r0, r0, #0xff ldmia sp!, {r4, pc} - arm_func_end HasConditionalGroundImmunity + arm_func_end IsFloating arm_func_start ov29_02318A90 ov29_02318A90: ; 0x02318A90 diff --git a/asm/overlay_29_02318E70.s b/asm/overlay_29_02318E70.s index 8fcb13f7..39085ebb 100644 --- a/asm/overlay_29_02318E70.s +++ b/asm/overlay_29_02318E70.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_02318E70 -ov29_02318E70: ; 0x02318E70 + arm_func_start TryInflictSafeguardStatus +TryInflictSafeguardStatus: ; 0x02318E70 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -48,10 +48,10 @@ _02318EF8: _02318F04: .word 0x022C4734 _02318F08: .word 0x00000CEE _02318F0C: .word 0x00000CEF - arm_func_end ov29_02318E70 + arm_func_end TryInflictSafeguardStatus - arm_func_start ov29_02318F10 -ov29_02318F10: ; 0x02318F10 + arm_func_start TryInflictMistStatus +TryInflictMistStatus: ; 0x02318F10 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -94,10 +94,10 @@ _02318F98: .align 2, 0 _02318FA4: .word 0x022C4738 _02318FA8: .word 0x00000CF1 - arm_func_end ov29_02318F10 + arm_func_end TryInflictMistStatus - arm_func_start ov29_02318FAC -ov29_02318FAC: ; 0x02318FAC + arm_func_start TryInflictWishStatus +TryInflictWishStatus: ; 0x02318FAC stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -141,10 +141,10 @@ _02319034: _02319040: .word 0x022C4794 _02319044: .word 0x00000CDE _02319048: .word 0x00000CDF - arm_func_end ov29_02318FAC + arm_func_end TryInflictWishStatus - arm_func_start ov29_0231904C -ov29_0231904C: ; 0x0231904C + arm_func_start TryInflictMagicCoatStatus +TryInflictMagicCoatStatus: ; 0x0231904C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -188,10 +188,10 @@ _023190D4: _023190E0: .word 0x022C4740 _023190E4: .word 0x00000CE7 _023190E8: .word 0x00000CE8 - arm_func_end ov29_0231904C + arm_func_end TryInflictMagicCoatStatus - arm_func_start ov29_023190EC -ov29_023190EC: ; 0x023190EC + arm_func_start TryInflictLightScreenStatus +TryInflictLightScreenStatus: ; 0x023190EC stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -235,10 +235,10 @@ _02319174: _02319180: .word 0x022C4730 _02319184: .word 0x00000CF4 _02319188: .word 0x00000CF5 - arm_func_end ov29_023190EC + arm_func_end TryInflictLightScreenStatus - arm_func_start ov29_0231918C -ov29_0231918C: ; 0x0231918C + arm_func_start TryInflictReflectStatus +TryInflictReflectStatus: ; 0x0231918C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -282,10 +282,10 @@ _02319214: _02319220: .word 0x022C472C _02319224: .word 0x00000CF6 _02319228: .word 0x00000CF7 - arm_func_end ov29_0231918C + arm_func_end TryInflictReflectStatus - arm_func_start ov29_0231922C -ov29_0231922C: ; 0x0231922C + arm_func_start TryInflictProtectStatus +TryInflictProtectStatus: ; 0x0231922C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -333,10 +333,10 @@ _023192C4: _023192D0: .word 0x022C47B8 _023192D4: .word 0x00000D47 _023192D8: .word 0x00000D48 - arm_func_end ov29_0231922C + arm_func_end TryInflictProtectStatus - arm_func_start ov29_023192DC -ov29_023192DC: ; 0x023192DC + arm_func_start TryInflictMirrorCoatStatus +TryInflictMirrorCoatStatus: ; 0x023192DC stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -379,10 +379,10 @@ _02319364: .align 2, 0 _02319370: .word 0x022C47CC _02319374: .word 0x00000D4F - arm_func_end ov29_023192DC + arm_func_end TryInflictMirrorCoatStatus - arm_func_start ov29_02319378 -ov29_02319378: ; 0x02319378 + arm_func_start TryInflictEndureStatus +TryInflictEndureStatus: ; 0x02319378 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -426,10 +426,10 @@ _02319400: _0231940C: .word 0x022C47F4 _02319410: .word 0x00000D58 _02319414: .word 0x00000D59 - arm_func_end ov29_02319378 + arm_func_end TryInflictEndureStatus - arm_func_start ov29_02319418 -ov29_02319418: ; 0x02319418 + arm_func_start TryInflictMirrorMoveStatus +TryInflictMirrorMoveStatus: ; 0x02319418 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -473,10 +473,10 @@ _023194A0: _023194AC: .word 0x022C4840 _023194B0: .word 0x00000D5A _023194B4: .word 0x00000D5B - arm_func_end ov29_02319418 + arm_func_end TryInflictMirrorMoveStatus - arm_func_start ov29_023194B8 -ov29_023194B8: ; 0x023194B8 + arm_func_start TryInflictConversion2Status +TryInflictConversion2Status: ; 0x023194B8 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -487,7 +487,7 @@ ov29_023194B8: ; 0x023194B8 mov r0, r5 mov r1, #0x25 ldr r4, [r5, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02319500 ldr r2, _02319574 ; =0x00000DC4 @@ -532,10 +532,10 @@ _02319574: .word 0x00000DC4 _02319578: .word 0x022C4854 _0231957C: .word 0x00000D5C _02319580: .word 0x00000D5D - arm_func_end ov29_023194B8 + arm_func_end TryInflictConversion2Status - arm_func_start ov29_02319584 -ov29_02319584: ; 0x02319584 + arm_func_start TryInflictVitalThrowStatus +TryInflictVitalThrowStatus: ; 0x02319584 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 @@ -579,10 +579,10 @@ _0231960C: _02319618: .word 0x022C485C _0231961C: .word 0x00000D5E _02319620: .word 0x00000D5F - arm_func_end ov29_02319584 + arm_func_end TryInflictVitalThrowStatus - arm_func_start ov29_02319624 -ov29_02319624: ; 0x02319624 + arm_func_start TryResetStatChanges +TryResetStatChanges: ; 0x02319624 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r6, r1 mov r7, r0 @@ -662,10 +662,10 @@ _02319738: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02319744: .word 0x00000D61 - arm_func_end ov29_02319624 + arm_func_end TryResetStatChanges - arm_func_start ov29_02319748 -ov29_02319748: ; 0x02319748 + arm_func_start MirrorMoveIsActive +MirrorMoveIsActive: ; 0x02319748 stmdb sp!, {r4, lr} mov r4, r0 bl EntityIsValid__02318E4C @@ -692,7 +692,7 @@ _0231979C: ldmia sp!, {r4, pc} .align 2, 0 _023197A4: .word 0x022C4648 - arm_func_end ov29_02319748 + arm_func_end MirrorMoveIsActive arm_func_start ExclusiveItemEffectIsActive__023197A8 ExclusiveItemEffectIsActive__023197A8: ; 0x023197A8 @@ -707,8 +707,8 @@ ExclusiveItemEffectIsActive__023197A8: ; 0x023197A8 ldmia sp!, {r3, pc} arm_func_end ExclusiveItemEffectIsActive__023197A8 - arm_func_start ov29_023197CC -ov29_023197CC: ; 0x023197CC + arm_func_start MistIsActive +MistIsActive: ; 0x023197CC stmdb sp!, {r4, lr} mov r4, r0 bl EntityIsValid__02318E4C @@ -728,7 +728,7 @@ ov29_023197CC: ; 0x023197CC _0231980C: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end ov29_023197CC + arm_func_end MistIsActive arm_func_start Conversion2IsActive Conversion2IsActive: ; 0x02319814 @@ -910,7 +910,7 @@ _02319A64: beq _02319AB8 mov r0, sl mov r1, r8 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02319AB8 str sb, [sp] @@ -1029,20 +1029,20 @@ _02319BF0: bne _02319DE8 ldr r1, [sp, #0x18] mov r0, sl - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02319DE8 ldr r0, [sp, #0x18] ldrsh r6, [sl, #4] ldrsh fp, [r0, #4] sub r0, r6, fp - bl Abs + bl abs str r0, [sp, #0x10] ldr r0, [sp, #0x18] ldrsh r8, [sl, #6] ldrsh r7, [r0, #6] sub r0, r8, r7 - bl Abs + bl abs ldr r1, [sp, #0x10] cmp r1, r0 movgt r2, r1 diff --git a/asm/overlay_29_02319FB0.s b/asm/overlay_29_02319FB0.s index 8e74bbb0..59a00ff8 100644 --- a/asm/overlay_29_02319FB0.s +++ b/asm/overlay_29_02319FB0.s @@ -187,7 +187,7 @@ _0231A23C: bne _0231A260 mov r0, r6 mov r1, #1 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 bne _0231A358 mov r0, #0 @@ -196,7 +196,7 @@ _0231A260: cmp r0, #0x400 bne _0231A280 mov r0, r6 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 bne _0231A358 mov r0, #0 @@ -227,7 +227,7 @@ _0231A2B8: mov r0, r6 mov r1, #1 bne _0231A304 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 bne _0231A358 mov r0, r6 @@ -237,7 +237,7 @@ _0231A2B8: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _0231A304: - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 bne _0231A358 mov r0, r6 @@ -277,7 +277,7 @@ ov29_0231A364: ; 0x0231A364 mov r6, r3 ldr r5, [r7, #0xb4] mov r4, #1 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0231A3A4 @@ -302,7 +302,7 @@ _0231A3A4: beq _0231A404 ldrsh r0, [r5, #2] mov r1, #0x258 - bl DivideInt + bl __divsi3 ldr r0, _0231A45C ; =0x02353538 ldr r0, [r0] add r0, r0, r1 @@ -512,12 +512,12 @@ IsTargetInRange: ; 0x0231A694 mov r8, r2 mov r7, r3 sub r0, r1, r0 - bl Abs + bl abs ldrsh r2, [sb, #4] ldrsh r1, [r5, #4] mov r6, r0 sub r0, r2, r1 - bl Abs + bl abs mov r4, r0 cmp r4, r6 movle r4, r6 @@ -578,8 +578,8 @@ _0231A798: .word 0x0235171C _0231A79C: .word 0x0235171E arm_func_end IsTargetInRange - arm_func_start ov29_0231A7A0 -ov29_0231A7A0: ; 0x0231A7A0 + arm_func_start ShouldUsePp +ShouldUsePp: ; 0x0231A7A0 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, #0 mov r1, #0x52 @@ -638,7 +638,7 @@ _0231A868: _0231A870: .word 0x022C459C _0231A874: .word 0x00000DF5 _0231A878: .word 0x00000DF7 - arm_func_end ov29_0231A7A0 + arm_func_end ShouldUsePp arm_func_start ExclusiveItemEffectIsActive__0231A87C ExclusiveItemEffectIsActive__0231A87C: ; 0x0231A87C @@ -667,7 +667,7 @@ ov29_0231A8A0: ; 0x0231A8A0 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_02344160 + bl AreMovesEnabled cmp r0, #0 bne _0231A8EC ldr r1, _0231A9D0 ; =0x00000DFD @@ -678,7 +678,7 @@ _0231A8EC: mov r1, r7 mov r0, sb strb r1, [r4, #0x23f] - bl ov29_0231A7A0 + bl ShouldUsePp cmp r0, #0 movne r7, #1 strneb r7, [r4, #0x23f] @@ -763,7 +763,7 @@ ov29_0231A9F8: ; 0x0231A9F8 mov r1, #0 mov r2, #0x15 ldr r5, [r7, #0xb4] - bl ov29_022EB54C + bl GetItemToUse mov r1, r0 ldrb r0, [r1] ldrh r4, [r1] @@ -798,7 +798,7 @@ _0231AA74: ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_023440AC + bl AreOrbsAllowed cmp r0, #0 mov r4, #1 bne _0231AAB4 @@ -879,7 +879,7 @@ _0231ABA0: bne _0231AC00 mov r0, r7 mov r2, #0x7a - bl ov29_022EB60C + bl RemoveUsedItem ldrb r2, [sp, #0x10] mov r0, #0xa mov r1, #0 @@ -915,7 +915,7 @@ _0231AC24: mov r0, r7 mov r1, #0 mov r2, #0x7a - bl ov29_022EB60C + bl RemoveUsedItem _0231AC4C: mov r0, r7 bl EnemyEvolution @@ -1092,8 +1092,8 @@ _0231AE54: ldmia sp!, {r3, pc} arm_func_end ov29_0231AE3C - arm_func_start ov29_0231AE90 -ov29_0231AE90: ; 0x0231AE90 + arm_func_start GetEntityNaturalGiftInfo +GetEntityNaturalGiftInfo: ; 0x0231AE90 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 bl IsMonster__0231A9D4 @@ -1129,10 +1129,10 @@ _0231AF00: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0231AF08: .word 0x022C5130 - arm_func_end ov29_0231AE90 + arm_func_end GetEntityNaturalGiftInfo - arm_func_start ov29_0231AF0C -ov29_0231AF0C: ; 0x0231AF0C + arm_func_start GetEntityWeatherBallType +GetEntityWeatherBallType: ; 0x0231AF0C stmdb sp!, {r3, lr} bl GetApparentWeather ldr r1, _0231AF20 ; =0x022C48DC @@ -1140,7 +1140,7 @@ ov29_0231AF0C: ; 0x0231AF0C ldmia sp!, {r3, pc} .align 2, 0 _0231AF20: .word 0x022C48DC - arm_func_end ov29_0231AF0C + arm_func_end GetEntityWeatherBallType arm_func_start ov29_0231AF24 ov29_0231AF24: ; 0x0231AF24 @@ -1241,8 +1241,8 @@ _0231B034: _0231B05C: .word 0x02353538 arm_func_end ov29_0231B008 - arm_func_start ov29_0231B060 -ov29_0231B060: ; 0x0231B060 + arm_func_start ActivateMotorDrive +ActivateMotorDrive: ; 0x0231B060 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr r2, _0231B0A0 ; =0x00000C3B @@ -1251,7 +1251,7 @@ ov29_0231B060: ; 0x0231B060 mov r1, #0 mov r3, #2 str ip, [sp] - bl ov29_0234B250 + bl LogMessageByIdWithPopupCheckParticipants mov r0, r4 mov r1, r4 mov r2, #0 @@ -1261,10 +1261,10 @@ ov29_0231B060: ; 0x0231B060 ldmia sp!, {r3, r4, pc} .align 2, 0 _0231B0A0: .word 0x00000C3B - arm_func_end ov29_0231B060 + arm_func_end ActivateMotorDrive - arm_func_start ov29_0231B0A4 -ov29_0231B0A4: ; 0x0231B0A4 + arm_func_start TryActivateFrisk +TryActivateFrisk: ; 0x0231B0A4 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r5, r0 @@ -1328,4 +1328,4 @@ _0231B184: .align 2, 0 _0231B18C: .word 0x00000C3D _0231B190: .word 0x00000C3C - arm_func_end ov29_0231B0A4 + arm_func_end TryActivateFrisk diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index a240ed13..217d4f08 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0231B1B8 -ov29_0231B1B8: ; 0x0231B1B8 + arm_func_start TryActivateBadDreams +TryActivateBadDreams: ; 0x0231B1B8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x50 mov sl, r0 @@ -73,14 +73,14 @@ _0231B27C: cmpne sl, sb beq _0231B2F0 mov r0, sb - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 beq _0231B2F0 mov r0, sb mov r1, r7 mov r2, r4 mov r3, fp - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper mov r0, sb bl EntityIsValid__0231B194 cmp r0, #0 @@ -101,7 +101,7 @@ _0231B2FC: _0231B30C: .word 0x02353538 _0231B310: .word 0x022C4530 _0231B314: .word 0x0000026E - arm_func_end ov29_0231B1B8 + arm_func_end TryActivateBadDreams arm_func_start IsMonster__0231B318 IsMonster__0231B318: ; 0x0231B318 @@ -116,8 +116,8 @@ IsMonster__0231B318: ; 0x0231B318 bx lr arm_func_end IsMonster__0231B318 - arm_func_start ov29_0231B33C -ov29_0231B33C: ; 0x0231B33C + arm_func_start ActivateStench +ActivateStench: ; 0x0231B33C stmdb sp!, {r4, lr} ldr r4, [r0, #0xb4] bl ov29_022E60E4 @@ -129,16 +129,16 @@ ov29_0231B33C: ; 0x0231B33C ldmia sp!, {r4, pc} .align 2, 0 _0231B360: .word 0x022C457C - arm_func_end ov29_0231B33C + arm_func_end ActivateStench - arm_func_start ov29_0231B364 -ov29_0231B364: ; 0x0231B364 + arm_func_start TryActivateSteadfast +TryActivateSteadfast: ; 0x0231B364 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 mov r0, r4 mov r1, #0x70 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -147,7 +147,7 @@ ov29_0231B364: ; 0x0231B364 mov r3, #1 bl BoostSpeedOneStage ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0231B364 + arm_func_end TryActivateSteadfast arm_func_start ov29_0231B39C ov29_0231B39C: ; 0x0231B39C @@ -182,8 +182,8 @@ ov29_0231B3CC: ; 0x0231B3CC bx lr arm_func_end ov29_0231B3CC - arm_func_start ov29_0231B3FC -ov29_0231B3FC: ; 0x0231B3FC + arm_func_start IsInSpawnList +IsInSpawnList: ; 0x0231B3FC stmdb sp!, {r4, r5, r6, lr} mov r5, r0 mov r0, r1 @@ -212,7 +212,7 @@ _0231B44C: blt _0231B418 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_0231B3FC + arm_func_end IsInSpawnList arm_func_start ov29_0231B460 ov29_0231B460: ; 0x0231B460 @@ -264,8 +264,8 @@ ov29_0231B4AC: ; 0x0231B4AC _0231B4E8: .word 0x02353538 arm_func_end ov29_0231B4AC - arm_func_start ov29_0231B4EC -ov29_0231B4EC: ; 0x0231B4EC + arm_func_start ChangeShayminForme +ChangeShayminForme: ; 0x0231B4EC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r0 ldr r7, [r8, #0xb4] @@ -318,7 +318,7 @@ _0231B5A0: bl ov29_022E9FD0 mov r0, r4 mov r1, r5 - bl ov29_022F75D4 + bl SwapMonsterWanFileIndex strh r5, [r7, #2] ldrsh r0, [r7, #2] strh r0, [r7, #4] @@ -328,7 +328,7 @@ _0231B5A0: strh r0, [r7, #4] ldr r4, [r8, #0xb4] ldrsh r0, [r4, #4] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [r8, #0xa8] ldrb r0, [r4, #0xd8] cmp r0, #2 @@ -344,7 +344,7 @@ _0231B5F4: mov r0, r8 bl ov29_02304BAC mov r0, r8 - bl ov29_022F9194 + bl SetMonsterTypeAndAbility mov r0, #1 bl ov29_022E9FD0 ldr r0, _0231B684 ; =0x00000217 @@ -366,7 +366,7 @@ _0231B5F4: mov r0, r8 bl ov29_022F04F0 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, r8 bl ov29_022F0518 _0231B678: @@ -376,7 +376,7 @@ _0231B678: _0231B680: .word 0x00000216 _0231B684: .word 0x00000217 _0231B688: .word 0x02353538 - arm_func_end ov29_0231B4EC + arm_func_end ChangeShayminForme arm_func_start ApplyItemEffect ApplyItemEffect: ; 0x0231B68C @@ -400,7 +400,7 @@ ApplyItemEffect: ; 0x0231B68C mov r2, r6 add r1, r7, #4 mov r3, r4 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper b _0231CBA4 _0231B6E4: ldrb r0, [r5, #6] @@ -465,7 +465,7 @@ _0231B7B0: mov r2, r6 add r1, r7, #4 mov r3, #0 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper b _0231CBA4 _0231B7D4: ldr r0, _0231C6C4 ; =0x00001317 @@ -491,7 +491,7 @@ _0231B7D4: cmp r0, #0 bne _0231B834 mov r0, r5 - bl ov29_02346F14 + bl AddHeldItemToBag _0231B834: mov r0, r7 bl ov29_022F9EA0 @@ -504,7 +504,7 @@ _0231B840: bl ov29_022E5A00 mov r0, r8 mov r1, r7 - bl ov29_0230D440 + bl UpdateShopkeeperModeAfterAttack _0231B860: ldrb r0, [r6] tst r0, #8 @@ -558,7 +558,7 @@ _0231B8F8: mov r1, r7 mov r2, #5 str r3, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly _0231B92C: ldrsh r0, [r6, #4] bl GetItemCategoryVeneer @@ -921,7 +921,7 @@ _0231BE50: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BE88: ldr r1, _0231C700 ; =0x00000195 @@ -936,7 +936,7 @@ _0231BE88: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BEC0: ldr r1, _0231C700 ; =0x00000195 @@ -951,7 +951,7 @@ _0231BEC0: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BEF8: ldr r1, _0231C700 ; =0x00000195 @@ -966,7 +966,7 @@ _0231BEF8: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BF30: ldr r1, _0231C700 ; =0x00000195 @@ -981,7 +981,7 @@ _0231BF30: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BF68: ldr r1, _0231C700 ; =0x00000195 @@ -996,7 +996,7 @@ _0231BF68: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231BFA0: mov r4, #0 @@ -1043,7 +1043,7 @@ _0231C018: mov r0, r8 mov r1, r7 str r4, [sp, #4] - bl CalcDamageProjectile + bl DealDamageProjectile b _0231CB14 _0231C050: mov r4, #0 @@ -1066,7 +1066,7 @@ _0231C08C: mov r1, r7 mov r3, sl mov r2, #1 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper b _0231CB14 _0231C0A4: ldr r1, _0231C730 ; =0x022C45EC @@ -1105,13 +1105,13 @@ _0231C118: mov r0, r8 mov r1, r7 mov r3, r2 - bl ov29_023176CC + bl TryInflictBlinkerStatus b _0231CB14 _0231C130: mov r0, r8 mov r1, r7 mov r2, #0 - bl ov29_02317844 + bl TryInflictCrossEyedStatus b _0231CB14 _0231C144: mov r0, r8 @@ -1123,7 +1123,7 @@ _0231C144: _0231C15C: mov r0, r8 mov r1, r7 - bl ov29_0231795C + bl TryInflictEyedropStatus b _0231CB14 _0231C16C: mov r0, r8 @@ -1135,12 +1135,12 @@ _0231C16C: _0231C184: mov r0, r8 mov r1, r7 - bl ov29_0231CBEC + bl ApplyCheriBerryEffect b _0231CB14 _0231C194: mov r0, r8 mov r1, r7 - bl ov29_0231CC18 + bl ApplyPechaBerryEffect b _0231CB14 _0231C1A4: mov r2, #0 @@ -1171,13 +1171,13 @@ _0231C1F4: mov r1, r7 mov r3, r2 str r2, [sp] - bl ov29_02302A5C + bl LevelUpItemEffect b _0231CB14 _0231C210: mov r0, r8 mov r1, r7 mov r2, #1 - bl ov29_02302F88 + bl TryDecreaseLevel b _0231CB14 _0231C224: mov r0, r8 @@ -1193,65 +1193,65 @@ _0231C234: _0231C248: mov r0, r8 mov r1, r7 - bl ov29_0231CC4C + bl ApplyRawstBerryEffect b _0231CB14 _0231C258: mov r0, r8 mov r1, r7 - bl ov29_0231CC94 + bl ApplyHungerSeedEffect b _0231CB14 _0231C268: mov r0, r8 mov r1, r7 - bl ov29_0231CE68 + bl ApplyGinsengEffect b _0231CB14 _0231C278: mov r0, r8 mov r1, r7 mov r2, sb - bl ov29_0231CF84 + bl ApplyBlastSeedEffect b _0231CB14 _0231C28C: ldr r2, _0231C74C ; =0x000003E7 mov r0, r8 mov r1, r7 mov r3, #0 - bl RestoreMovePP + bl RestoreAllMovePP b _0231CB14 _0231C2A4: ldr r1, _0231C750 ; =0x022C4420 mov r0, r8 ldrsh r2, [r1] mov r1, r7 - bl ov29_02317F50 + bl ApplyProteinEffect b _0231CB14 _0231C2BC: ldr r1, _0231C754 ; =0x022C46CC mov r0, r8 ldrsh r2, [r1] mov r1, r7 - bl ov29_02317FE4 + bl ApplyCalciumEffect b _0231CB14 _0231C2D4: ldr r1, _0231C758 ; =0x022C46C8 mov r0, r8 ldrsh r2, [r1] mov r1, r7 - bl ov29_02318078 + bl ApplyIronEffect b _0231CB14 _0231C2EC: ldr r1, _0231C75C ; =0x022C46C4 mov r0, r8 ldrsh r2, [r1] mov r1, r7 - bl ov29_0231810C + bl ApplyZincEffect b _0231CB14 _0231C304: mov r0, r8 mov r1, r7 mov r2, #1 mov r3, #0 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper b _0231CB14 _0231C31C: mov r3, #1 @@ -1259,12 +1259,12 @@ _0231C31C: mov r1, r7 mov r2, #5 str r3, [sp] - bl ov29_02302A5C + bl LevelUpItemEffect b _0231CB14 _0231C338: mov r0, r8 mov r1, r7 - bl ov29_0231CD80 + bl ApplyVileSeedEffect b _0231CB14 _0231C348: mov r0, r8 @@ -1276,18 +1276,18 @@ _0231C348: _0231C360: mov r0, r8 mov r1, r7 - bl ViolentSeedBoost + bl ApplyViolentSeedEffect b _0231CB14 _0231C370: mov r0, r8 mov r1, r7 - bl ov29_0231657C + bl TryInflictInvisibleStatus b _0231CB14 _0231C380: mov r0, r7 mov r1, #0xa mov r2, #0 - bl ov29_022FA144 + bl BoostIQ b _0231CB14 _0231C394: mov r4, #1 @@ -1296,7 +1296,7 @@ _0231C394: mov r2, #0x32 mov r3, #5 str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C3B4: mov r4, #1 @@ -1305,7 +1305,7 @@ _0231C3B4: mov r2, #0x64 mov r3, #0xa str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C3D4: mov r4, #1 @@ -1314,12 +1314,12 @@ _0231C3D4: rsb r2, r4, #0x3e8 mov r3, #0xa str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C3F4: mov r0, r8 mov r1, r7 - bl ov29_0231D534 + bl ApplyGrimyFoodEffect b _0231CB14 _0231C404: ldr r1, _0231C760 ; =0x020A1888 @@ -1472,7 +1472,7 @@ _0231C5FC: mov r2, #0x32 mov r3, #5 str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C61C: mov r4, #1 @@ -1481,7 +1481,7 @@ _0231C61C: mov r2, #0xa mov r3, #0 str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C63C: mov r4, #1 @@ -1490,7 +1490,7 @@ _0231C63C: rsb r2, r4, #0x3e8 mov r3, #0x32 str r4, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly b _0231CB14 _0231C65C: cmp sb, #0 @@ -1513,12 +1513,12 @@ _0231C65C: b _0231CB14 _0231C6A4: mov r0, r8 - bl ov29_02343CD8 + bl ApplyKeyEffect b _0231CB14 _0231C6B0: mov r0, r8 mov r1, r7 - bl ov29_02317AF4 + bl TryInflictDropeyeStatus b _0231CB14 .align 2, 0 _0231C6C0: .word 0x000001AB @@ -1566,7 +1566,7 @@ _0231C764: .word 0x020A18B0 _0231C768: mov r0, r8 mov r1, r7 - bl ov29_02317A0C + bl TryInflictSlipStatus cmp r0, #0 bne _0231CB14 mov r0, #0 @@ -1581,12 +1581,12 @@ _0231C768: _0231C7A0: mov r0, r8 mov r1, r7 - bl ov29_0231D74C + bl ApplyViaSeedEffect b _0231CB14 _0231C7B0: mov r0, r8 mov r1, r7 - bl ov29_0231D680 + bl ApplyMixElixirEffect b _0231CB14 _0231C7C0: mov r4, #0 @@ -1607,24 +1607,24 @@ _0231C7C0: _0231C7FC: mov r0, r8 mov r1, r7 - bl ov29_0231D6E0 + bl ApplyDoughSeedEffect b _0231CB14 _0231C80C: mov r0, r8 mov r1, r7 - bl ov29_0231D7C0 + bl ApplyGravelyrockEffect b _0231CB14 _0231C81C: mov r0, r8 mov r1, r7 - bl ov29_0231D838 + bl ApplyGonePebbleEffect b _0231CB14 _0231C82C: mov r2, #0 mov r0, r8 mov r1, r7 mov r3, r2 - bl ov29_023176CC + bl TryInflictBlinkerStatus b _0231CB14 _0231C844: cmp sb, #0 @@ -1770,7 +1770,7 @@ _0231CA3C: _0231CA50: mov r0, r8 mov r1, r7 - bl ov29_0231D9C0 + bl ApplyGracideaEffect b _0231CB14 _0231CA60: cmp sb, #0 diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index ef4e1dfd..61dcb356 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -3,14 +3,14 @@ .text - arm_func_start ov29_0231CBEC -ov29_0231CBEC: ; 0x0231CBEC + arm_func_start ApplyCheriBerryEffect +ApplyCheriBerryEffect: ; 0x0231CBEC stmdb sp!, {r3, lr} ldr r2, [r1, #0xb4] ldrb r2, [r2, #0xbf] cmp r2, #4 bne _0231CC08 - bl ov29_023061A8 + bl EndBurnClassStatus ldmia sp!, {r3, pc} _0231CC08: ldr r2, _0231CC14 ; =0x00000BE9 @@ -18,10 +18,10 @@ _0231CC08: ldmia sp!, {r3, pc} .align 2, 0 _0231CC14: .word 0x00000BE9 - arm_func_end ov29_0231CBEC + arm_func_end ApplyCheriBerryEffect - arm_func_start ov29_0231CC18 -ov29_0231CC18: ; 0x0231CC18 + arm_func_start ApplyPechaBerryEffect +ApplyPechaBerryEffect: ; 0x0231CC18 stmdb sp!, {r3, lr} ldr r2, [r1, #0xb4] ldrb r2, [r2, #0xbf] @@ -29,7 +29,7 @@ ov29_0231CC18: ; 0x0231CC18 and r2, r2, #0xff cmp r2, #1 bhi _0231CC3C - bl ov29_023061A8 + bl EndBurnClassStatus ldmia sp!, {r3, pc} _0231CC3C: ldr r2, _0231CC48 ; =0x00000BE9 @@ -37,10 +37,10 @@ _0231CC3C: ldmia sp!, {r3, pc} .align 2, 0 _0231CC48: .word 0x00000BE9 - arm_func_end ov29_0231CC18 + arm_func_end ApplyPechaBerryEffect - arm_func_start ov29_0231CC4C -ov29_0231CC4C: ; 0x0231CC4C + arm_func_start ApplyRawstBerryEffect +ApplyRawstBerryEffect: ; 0x0231CC4C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 ldr r2, [r4, #0xb4] @@ -48,7 +48,7 @@ ov29_0231CC4C: ; 0x0231CC4C ldrb r2, [r2, #0xbf] cmp r2, #1 bne _0231CC70 - bl ov29_023061A8 + bl EndBurnClassStatus ldmia sp!, {r3, r4, r5, pc} _0231CC70: mov r0, #0 @@ -61,10 +61,10 @@ _0231CC70: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0231CC90: .word 0x00000BEA - arm_func_end ov29_0231CC4C + arm_func_end ApplyRawstBerryEffect - arm_func_start ov29_0231CC94 -ov29_0231CC94: ; 0x0231CC94 + arm_func_start ApplyHungerSeedEffect +ApplyHungerSeedEffect: ; 0x0231CC94 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -75,7 +75,7 @@ ov29_0231CC94: ; 0x0231CC94 beq _0231CCC4 mov r2, #0 mov r3, #5 - bl ov29_023168D8 + bl TryDecreaseBelly b _0231CD6C _0231CCC4: mov r0, #0 @@ -129,10 +129,10 @@ _0231CD6C: _0231CD74: .word 0x00000BEB _0231CD78: .word 0x00000BEC _0231CD7C: .word 0x00000BED - arm_func_end ov29_0231CC94 + arm_func_end ApplyHungerSeedEffect - arm_func_start ov29_0231CD80 -ov29_0231CD80: ; 0x0231CD80 + arm_func_start ApplyVileSeedEffect +ApplyVileSeedEffect: ; 0x0231CD80 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r4, r1 @@ -173,10 +173,10 @@ ov29_0231CD80: ; 0x0231CD80 _0231CE10: .word 0x023529AC _0231CE14: .word 0x02352AEC _0231CE18: .word 0x02352AE8 - arm_func_end ov29_0231CD80 + arm_func_end ApplyVileSeedEffect - arm_func_start ViolentSeedBoost -ViolentSeedBoost: ; 0x0231CE1C + arm_func_start ApplyViolentSeedEffect +ApplyViolentSeedEffect: ; 0x0231CE1C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] @@ -197,10 +197,10 @@ ViolentSeedBoost: ; 0x0231CE1C .align 2, 0 _0231CE60: .word 0x02352AEC _0231CE64: .word 0x02352AE8 - arm_func_end ViolentSeedBoost + arm_func_end ApplyViolentSeedEffect - arm_func_start ov29_0231CE68 -ov29_0231CE68: ; 0x0231CE68 + arm_func_start ApplyGinsengEffect +ApplyGinsengEffect: ; 0x0231CE68 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -278,10 +278,10 @@ _0231CF64: _0231CF78: .word 0x022C46C0 _0231CF7C: .word 0x00000BEF _0231CF80: .word 0x00000BEE - arm_func_end ov29_0231CE68 + arm_func_end ApplyGinsengEffect - arm_func_start ov29_0231CF84 -ov29_0231CF84: ; 0x0231CF84 + arm_func_start ApplyBlastSeedEffect +ApplyBlastSeedEffect: ; 0x0231CF84 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x1c mov r6, r0 @@ -289,7 +289,7 @@ ov29_0231CF84: ; 0x0231CF84 cmp r2, #0 beq _0231D00C ldr r7, [r5, #0xb4] - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 ldrne r0, _0231D0A8 ; =0x022C45D8 ldreq r0, _0231D0AC ; =0x022C45D4 @@ -330,7 +330,7 @@ _0231D00C: b _0231D0A0 _0231D034: ldr r7, [r4, #0xb4] - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 ldrne r0, _0231D0B8 ; =0x022C45DC ldreq r0, _0231D0BC ; =0x022C44E8 @@ -367,7 +367,7 @@ _0231D0B0: .word 0x00000255 _0231D0B4: .word 0x00000BF2 _0231D0B8: .word 0x022C45DC _0231D0BC: .word 0x022C44E8 - arm_func_end ov29_0231CF84 + arm_func_end ApplyBlastSeedEffect arm_func_start ApplyGummiBoostsDungeonMode ApplyGummiBoostsDungeonMode: ; 0x0231D0C0 @@ -420,7 +420,7 @@ _0231D164: mov r2, r3 str r6, [sp] mov r3, #0 - bl ov29_02316BB0 + bl TryIncreaseBelly ldrb r0, [r7, #6] cmp r0, #0 bne _0231D284 @@ -645,8 +645,8 @@ _0231D49C: .word 0x00000BF9 _0231D4A0: .word 0x00000BFA arm_func_end ApplyGummiBoostsDungeonMode - arm_func_start ov29_0231D4A4 -ov29_0231D4A4: ; 0x0231D4A4 + arm_func_start CanMonsterUseItem +CanMonsterUseItem: ; 0x0231D4A4 stmdb sp!, {r4, lr} ldrb r2, [r1] mov r4, r0 @@ -686,10 +686,10 @@ _0231D524: .align 2, 0 _0231D52C: .word 0x00000BE7 _0231D530: .word 0x00000BF6 - arm_func_end ov29_0231D4A4 + arm_func_end CanMonsterUseItem - arm_func_start ov29_0231D534 -ov29_0231D534: ; 0x0231D534 + arm_func_start ApplyGrimyFoodEffect +ApplyGrimyFoodEffect: ; 0x0231D534 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 mov ip, #1 @@ -698,7 +698,7 @@ ov29_0231D534: ; 0x0231D534 mov r3, #0 mov r5, r0 str ip, [sp] - bl ov29_02316BB0 + bl TryIncreaseBelly mov r0, r4 mov r1, #0x25 bl IqSkillIsEnabled @@ -706,7 +706,7 @@ ov29_0231D534: ; 0x0231D534 bne _0231D580 mov r0, r4 mov r1, #0x59 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0231D598 _0231D580: @@ -783,10 +783,10 @@ _0231D66C: _0231D674: .word 0x022C4680 _0231D678: .word 0x02352AEC _0231D67C: .word 0x02352AE8 - arm_func_end ov29_0231D534 + arm_func_end ApplyGrimyFoodEffect - arm_func_start ov29_0231D680 -ov29_0231D680: ; 0x0231D680 + arm_func_start ApplyMixElixirEffect +ApplyMixElixirEffect: ; 0x0231D680 stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r2, [r5, #0xb4] @@ -802,7 +802,7 @@ ov29_0231D680: ; 0x0231D680 mov r0, r6 mov r1, r5 mov r3, #0 - bl RestoreMovePP + bl RestoreAllMovePP ldmia sp!, {r4, r5, r6, pc} _0231D6C4: ldr r2, _0231D6DC ; =0x00000C64 @@ -813,10 +813,10 @@ _0231D6C4: .align 2, 0 _0231D6D8: .word 0x000003E7 _0231D6DC: .word 0x00000C64 - arm_func_end ov29_0231D680 + arm_func_end ApplyMixElixirEffect - arm_func_start ov29_0231D6E0 -ov29_0231D6E0: ; 0x0231D6E0 + arm_func_start ApplyDoughSeedEffect +ApplyDoughSeedEffect: ; 0x0231D6E0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r0, #0 @@ -831,7 +831,7 @@ ov29_0231D6E0: ; 0x0231D6E0 cmp r0, #0 bne _0231D730 mov r0, #1 - bl ov29_02338548 + bl SetDoughSeedFlag ldr r2, _0231D744 ; =0x00000C6E mov r0, r5 mov r1, r4 @@ -846,10 +846,10 @@ _0231D730: .align 2, 0 _0231D744: .word 0x00000C6E _0231D748: .word 0x00000C6F - arm_func_end ov29_0231D6E0 + arm_func_end ApplyDoughSeedEffect - arm_func_start ov29_0231D74C -ov29_0231D74C: ; 0x0231D74C + arm_func_start ApplyViaSeedEffect +ApplyViaSeedEffect: ; 0x0231D74C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r0, #0 @@ -857,7 +857,7 @@ ov29_0231D74C: ; 0x0231D74C mov r2, r0 bl SubstitutePlaceholderStringTags mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231D788 ldr r1, _0231D7B8 ; =0x00000C68 @@ -882,10 +882,10 @@ _0231D7A0: .align 2, 0 _0231D7B8: .word 0x00000C68 _0231D7BC: .word 0x00000C69 - arm_func_end ov29_0231D74C + arm_func_end ApplyViaSeedEffect - arm_func_start ov29_0231D7C0 -ov29_0231D7C0: ; 0x0231D7C0 + arm_func_start ApplyGravelyrockEffect +ApplyGravelyrockEffect: ; 0x0231D7C0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -901,7 +901,7 @@ ov29_0231D7C0: ; 0x0231D7C0 ldrsh r2, [r0] ldrsh r3, [r0, #2] mov r0, r6 - bl ov29_02316BB0 + bl TryIncreaseBelly cmp r4, #0x1e0 cmpne r4, #0xb9 bne _0231D828 @@ -911,23 +911,23 @@ ov29_0231D7C0: ; 0x0231D7C0 mov r2, #0 mov r1, r1, lsl #0x10 mov r1, r1, asr #0x10 - bl ov29_022FA144 + bl BoostIQ _0231D828: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0231D830: .word 0x022C47E0 _0231D834: .word 0x022C47F0 - arm_func_end ov29_0231D7C0 + arm_func_end ApplyGravelyrockEffect - arm_func_start ov29_0231D838 -ov29_0231D838: ; 0x0231D838 + arm_func_start ApplyGonePebbleEffect +ApplyGonePebbleEffect: ; 0x0231D838 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc mov r5, r1 mov r6, r0 mov r0, r5 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231D978 mov r0, #1 @@ -971,21 +971,21 @@ ov29_0231D838: ; 0x0231D838 bl ov29_0234BA54 mov r0, r6 mov r1, r5 - bl ov29_02319378 + bl TryInflictEndureStatus ldr r0, _0231D9BC ; =0x02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] - bl ov29_022EAD00 - bl ov29_022EAE14 + bl MusicTableIdxToMusicId + bl ChangeDungeonMusic mov r0, r4 bl ov29_022EAF34 - bl ov29_02339CE8 + bl UpdateMinimap mov r0, #1 bl ov29_02339FF4 mov r0, #0 bl GetApparentWeather - bl ov29_022DE620 + bl GetWeatherColorTable mov r1, #6 bl ov29_022F085C mov r0, r5 @@ -1014,7 +1014,7 @@ _0231D978: bl ov29_0234BA54 mov r0, r6 mov r1, r5 - bl ov29_02319378 + bl TryInflictEndureStatus _0231D9A8: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} @@ -1023,10 +1023,10 @@ _0231D9B0: .word 0x000003FF _0231D9B4: .word 0x00000C65 _0231D9B8: .word 0x00000C66 _0231D9BC: .word 0x02353538 - arm_func_end ov29_0231D838 + arm_func_end ApplyGonePebbleEffect - arm_func_start ov29_0231D9C0 -ov29_0231D9C0: ; 0x0231D9C0 + arm_func_start ApplyGracideaEffect +ApplyGracideaEffect: ; 0x0231D9C0 stmdb sp!, {r3, r4, r5, lr} mov r0, #0x1a mov r5, r1 @@ -1035,7 +1035,7 @@ ov29_0231D9C0: ; 0x0231D9C0 beq _0231DA50 mov r0, r5 mov r1, #1 - bl ov29_0231B4EC + bl ChangeShayminForme mov r4, r0 mov r0, #0 mov r1, r5 @@ -1080,7 +1080,7 @@ _0231DA70: .word 0x00000C71 _0231DA74: .word 0x00000C72 _0231DA78: .word 0x00000C74 _0231DA7C: .word 0x00000C73 - arm_func_end ov29_0231D9C0 + arm_func_end ApplyGracideaEffect arm_func_start ov29_0231DA80 ov29_0231DA80: ; 0x0231DA80 @@ -1391,7 +1391,7 @@ _0231DEB0: mov r0, #0 mov r2, #1 mov r3, r0 - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _0231DF1C mov r0, #0 @@ -1403,7 +1403,7 @@ _0231DF00: mov r2, r0 mov r3, r0 str r0, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 beq _0231DFF4 _0231DF1C: @@ -1480,7 +1480,7 @@ _0231E008: mov r0, sl mov r1, #0 mov r2, #0x6e - bl ov29_022EB60C + bl RemoveUsedItem add r0, r4, #0x4a mov r1, #0x2c bl SetMonsterActionFields @@ -1770,7 +1770,7 @@ _0231E430: _0231E448: mov r0, r7 mov r1, #1 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 movne r4, #0x50 moveq r4, #0 @@ -2155,8 +2155,8 @@ _0231E97C: _0231E98C: .word 0x0235171C arm_func_end ov29_0231E8F0 - arm_func_start ov29_0231E990 -ov29_0231E990: ; 0x0231E990 + arm_func_start ShouldTryEatItem +ShouldTryEatItem: ; 0x0231E990 stmdb sp!, {r4, lr} mov r4, r0 cmp r4, #0x45 @@ -2186,7 +2186,7 @@ _0231E9D8: ldmia sp!, {r4, pc} .align 2, 0 _0231E9EC: .word 0x022C4B74 - arm_func_end ov29_0231E990 + arm_func_end ShouldTryEatItem arm_func_start GetMaxPpWrapper GetMaxPpWrapper: ; 0x0231E9F0 @@ -2217,19 +2217,19 @@ MoveIsNotPhysical: ; 0x0231EA18 ldmia sp!, {r3, pc} arm_func_end MoveIsNotPhysical - arm_func_start ov29_0231EA30 -ov29_0231EA30: ; 0x0231EA30 + arm_func_start CategoryIsNotPhysical +CategoryIsNotPhysical: ; 0x0231EA30 cmp r0, #0 moveq r0, #0 movne r0, #1 bx lr - arm_func_end ov29_0231EA30 + arm_func_end CategoryIsNotPhysical arm_func_start ov29_0231EA40 ov29_0231EA40: ; 0x0231EA40 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 bne _0231EA80 ldr r0, _0231EDC8 ; =0x02353538 @@ -2399,7 +2399,7 @@ _0231EC88: _0231ECA8: mov r0, r5 mov r1, r7 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r7, r7, #1 cmp r7, #0x20 blt _0231EC88 @@ -2430,8 +2430,8 @@ _0231ED08: bl ov29_0233785C bl ov29_0233665C bl ov29_02304B64 - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility ldr r1, _0231EDD4 ; =0x00000DFE mov r0, sl bl LogMessageByIdWithPopupCheckUser @@ -2459,7 +2459,7 @@ _0231ED58: cmp r0, #0 beq _0231ED98 mov r0, r5 - bl ov29_02321104 + bl EnsureCanStandCurrentTile _0231ED98: add r6, r6, #1 cmp r6, #0x14 diff --git a/asm/overlay_29_0231EDFC.s b/asm/overlay_29_0231EDFC.s index 2b8d6ddf..16db53ac 100644 --- a/asm/overlay_29_0231EDFC.s +++ b/asm/overlay_29_0231EDFC.s @@ -24,14 +24,14 @@ _0231EE34: beq _0231EE54 mov r0, r5 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0231EE60 _0231EE54: mov r0, r4 mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _0231EE60: cmp r0, #0 beq _0231EE8C @@ -82,7 +82,7 @@ _0231EEE0: beq _0231F080 mov r0, r5 mov r1, sb - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _0231F080 cmp r8, #0 @@ -117,7 +117,7 @@ _0231EF64: add r1, sp, #0x34 add r2, r3, r2 strh r2, [sp, #0x36] - bl ov29_022FF764 + bl CannotStandOnTile cmp r0, #0 bne _0231EFB8 ldrsh r0, [sp, #0x34] @@ -158,7 +158,7 @@ _0231EFF8: add r1, sp, #0x30 add r2, r3, r2 strh r2, [sp, #0x32] - bl ov29_022FF764 + bl CannotStandOnTile cmp r0, #0 bne _0231F074 ldrsh r0, [sp, #0x30] @@ -225,7 +225,7 @@ _0231F0F4: strh r0, [sp, #0x2e] mov r0, r4 mov r1, r6 - bl ov29_022FF764 + bl CannotStandOnTile cmp r0, #0 bne _0231F150 ldrsh r0, [sp, #0x2c] @@ -261,7 +261,7 @@ _0231F178: mov r1, r4 bl LogMessageByIdWithPopupCheckUserTarget mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231F1B0 ldr r0, _0231F55C ; =0x00000212 @@ -292,7 +292,7 @@ _0231F1B0: ldrsh r0, [r0, r1] mov r1, #3 mov r0, r0, lsl #8 - bl DivideInt + bl __divsi3 ldrsh sl, [sp, #0x40] mov r1, #0x18 ldr r2, _0231F560 ; =0x0235171E @@ -303,7 +303,7 @@ _0231F1B0: ldrsh r2, [r2, r3] mov r1, #3 mov r0, r2, lsl #8 - bl DivideInt + bl __divsi3 ldrsh r2, [sp, #0x42] mov r1, #0x18 ldr sl, [r4, #0xc] @@ -313,7 +313,7 @@ _0231F1B0: ldr r0, [r4, #0x10] mov r1, sb sub r0, fp, r0 - bl DivideInt + bl __divsi3 str sl, [sp, #0x38] ldr r1, [r4, #0x10] str r0, [sp, #0x18] @@ -321,7 +321,7 @@ _0231F1B0: str r1, [sp, #0x3c] mov r1, sb mov sl, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x1c] b _0231F31C _0231F294: @@ -335,9 +335,9 @@ _0231F294: str r0, [sp, #0x3c] mov r0, r4 add r1, sp, #0x38 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231F308 mov r0, r7 @@ -357,7 +357,7 @@ _0231F294: _0231F308: mov r0, #0x800 mov r1, sb - bl DivideInt + bl __divsi3 add r7, r7, r0 add sl, sl, #1 _0231F31C: @@ -369,7 +369,7 @@ _0231F31C: str fp, [sp, #0x3c] mov r2, #0 str r2, [r4, #0x1c] - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, #0x3b bl AdvanceFrame ldr r0, [r4, #0xb4] @@ -387,7 +387,7 @@ _0231F31C: ldrsh r2, [sp, #0x42] mov r0, r4 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, r4 bl ov29_02321238 b _0231F53C @@ -409,7 +409,7 @@ _0231F3A4: mov r1, sb strh r3, [sp, #0x28] strh r2, [sp, #0x2a] - bl ov29_022FF764 + bl CannotStandOnTile cmp r0, #0 bne _0231F408 ldrsh r0, [sp, #0x28] @@ -444,7 +444,7 @@ _0231F434: ldrsh r2, [sp, #0x42] mov r0, r4 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos _0231F454: ldr r0, [r7] cmp r0, #1 @@ -454,7 +454,7 @@ _0231F454: bl InitMove add r1, sp, #0x20 mov r0, r7 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _0231F4B4 mov r3, #0 diff --git a/asm/overlay_29_0231F594.s b/asm/overlay_29_0231F594.s index 8ee9f16b..8043b894 100644 --- a/asm/overlay_29_0231F594.s +++ b/asm/overlay_29_0231F594.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0231F594 -ov29_0231F594: ; 0x0231F594 + arm_func_start TryDrought +TryDrought: ; 0x0231F594 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r1, _0231F6D4 ; =0x02353538 mov r8, r0 @@ -12,7 +12,7 @@ ov29_0231F594: ; 0x0231F594 mov r6, #0 add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_0234413C + bl AreOrbsAllowedVeneer cmp r0, #0 bne _0231F5CC ldr r1, _0231F6D8 ; =0x00000C08 @@ -20,7 +20,7 @@ ov29_0231F594: ; 0x0231F594 bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0231F5CC: - bl ov29_02337E94 + bl IsWaterTileset cmp r0, #0 beq _0231F5E8 ldr r1, _0231F6DC ; =0x00000C09 @@ -65,7 +65,7 @@ _0231F65C: _0231F660: mov r0, r7 mov r1, r5 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r7, r7, #1 cmp r7, #0x38 blt _0231F660 @@ -91,15 +91,15 @@ _0231F6B4: ldr r0, [r0] strb r1, [r0, #0x78f] bl ov29_02304B64 - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0231F6D4: .word 0x02353538 _0231F6D8: .word 0x00000C08 _0231F6DC: .word 0x00000C09 _0231F6E0: .word 0x00000C07 - arm_func_end ov29_0231F594 + arm_func_end TryDrought arm_func_start ov29_0231F6E4 ov29_0231F6E4: ; 0x0231F6E4 @@ -110,7 +110,7 @@ ov29_0231F6E4: ; 0x0231F6E4 ldr r0, [r1] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_0234410C + bl AreTrawlOrbsAllowed cmp r0, #0 bne _0231F71C mov r0, sl @@ -143,13 +143,13 @@ _0231F74C: ldrsh sb, [r7, #4] ldrsh r0, [sl, #4] sub r0, sb, r0 - bl Abs + bl abs cmp r0, #2 bgt _0231F7A0 ldrsh r1, [r7, #6] ldrsh r0, [sl, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #2 ble _0231F868 _0231F7A0: @@ -310,10 +310,10 @@ _0231F9C4: mla r8, sb, r0, r4 mov r1, #1 add r0, r8, #4 - bl ov29_023456BC + bl RemoveGroundItem ldrsh r0, [r8, #4] ldrsh r1, [r8, #6] - bl ov29_023391EC + bl DrawMinimapTile add r0, r4, sb, lsl #2 add r0, r0, #0x1200 ldrsh r2, [r0, #0x8e] @@ -322,7 +322,7 @@ _0231F9C4: smulbb r2, r2, fp add r2, r2, #4 rsb r0, r0, r2, lsl #8 - bl DivideInt + bl __divsi3 add r1, r4, sb, lsl #3 add r1, r1, #0x1000 str r0, [r1, #0x2f4] @@ -334,7 +334,7 @@ _0231F9C4: smulbb r0, r0, r5 add r0, r0, #4 rsb r0, r2, r0, lsl #8 - bl DivideInt + bl __divsi3 add r1, r4, sb, lsl #3 add r1, r1, #0x1000 str r0, [r1, #0x2f8] @@ -415,16 +415,16 @@ _0231FB54: cmp r0, #0 blt _0231FB98 mla r0, sb, r5, r4 - bl ov29_022E1610 + bl GetItemInfo mov r1, r0 mov r2, fp add r0, r8, sb, lsl #2 - bl ov29_02345538 + bl SpawnItem add r0, r4, sb, lsl #2 add r1, r0, #0x1200 ldrsh r0, [r1, #0x8e] ldrsh r1, [r1, #0x90] - bl ov29_023391EC + bl DrawMinimapTile str r7, [sp, #0xc] _0231FB98: add sb, sb, #1 diff --git a/asm/overlay_29_0231FC20.s b/asm/overlay_29_0231FC20.s index 951c938a..f0ce9d90 100644 --- a/asm/overlay_29_0231FC20.s +++ b/asm/overlay_29_0231FC20.s @@ -25,14 +25,14 @@ _0231FC5C: beq _0231FC7C mov r0, r6 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0231FC88 _0231FC7C: mov r0, sl mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _0231FC88: cmp r0, #0 beq _0231FCB4 @@ -50,7 +50,7 @@ _0231FCB4: ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_023440DC + bl AreTileJumpsAllowed cmp r0, #0 bne _0231FCE4 ldr r2, _0231FDD8 ; =0x00000E55 @@ -101,12 +101,12 @@ _0231FD1C: mov r1, r6 mov r2, r7 mov r3, r5 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, sl mov r1, r4 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, sl - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231FD1C mov r0, fp @@ -116,7 +116,7 @@ _0231FDB4: mov r0, sl bl ov29_022F9C74 mov r0, sl - bl ov29_02321104 + bl EnsureCanStandCurrentTile mov r0, sl bl ov29_0232124C ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -141,7 +141,7 @@ TryBlowAway: ; 0x0231FDE0 mov r4, r2 str r1, [sp, #0x20] mov fp, #0 - bl ov29_023440DC + bl AreTileJumpsAllowed cmp r0, #0 bne _0231FE30 ldr r2, _02320158 ; =0x00000B97 @@ -179,14 +179,14 @@ _0231FE8C: beq _0231FEAC mov r0, sl mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0231FEB8 _0231FEAC: mov r0, sb mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _0231FEB8: cmp r0, #0 beq _0231FED4 @@ -247,7 +247,7 @@ _0231FF84: mov r0, sb bl ov29_022E1A90 mov r0, sb - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0231FFAC mov r0, #0x19 @@ -283,7 +283,7 @@ _02320010: ldrsh r2, [sp, #0x2e] mov r0, sb mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos ldr r0, [sp, #0x20] sub r0, r0, #1 str r0, [sp, #0x20] @@ -329,7 +329,7 @@ _0232009C: bl InitMove add r1, sp, #0x24 mov r0, r4 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _02320118 mov r0, sl @@ -359,7 +359,7 @@ _02320118: mov r0, sb bl ov29_022F9C74 mov r0, sb - bl ov29_02321104 + bl EnsureCanStandCurrentTile mov r0, sb bl ov29_02321238 _0232014C: diff --git a/asm/overlay_29_023201A0.s b/asm/overlay_29_023201A0.s index 41e8de0e..dafc42c3 100644 --- a/asm/overlay_29_023201A0.s +++ b/asm/overlay_29_023201A0.s @@ -13,7 +13,7 @@ ov29_023201A0: ; 0x023201A0 mov r0, r4 bl ov29_022F9C74 mov r0, r4 - bl ov29_02321104 + bl EnsureCanStandCurrentTile mov r0, r4 bl ov29_02321238 ldmia sp!, {r4, pc} @@ -91,7 +91,7 @@ _023202C4: mov r2, r7 bl ov29_022E1A90 mov r0, sl - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023202EC mov r0, r4 @@ -104,7 +104,7 @@ _023202EC: ldrsh r2, [sp, #2] mov r0, sl mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos bl IsFloorOver cmp r0, #0 bne _02320328 @@ -137,12 +137,12 @@ ov29_0232033C: ; 0x0232033C sub r0, r8, r2, lsl #8 mov r6, r2, lsl #8 mov r7, r1, lsl #8 - bl Abs + bl abs cmp r0, #0xc bge _02320394 ldr r0, [sl, #0x10] sub r0, r0, r7 - bl Abs + bl abs cmp r0, #0xc blt _0232041C _02320394: @@ -150,11 +150,11 @@ _02320394: sub r0, r6, r8 mov r1, #0xc mov r5, #0 - bl DivideInt + bl __divsi3 str r0, [sp] sub r0, r7, sb mov r1, #0xc - bl DivideInt + bl __divsi3 mov fp, r0 mov r4, r5 _023203C0: @@ -170,9 +170,9 @@ _023203C0: str r1, [sl, #0x1c] mov r0, sl add r1, sp, #4 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, sl - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0232040C mov r0, #0x1a @@ -189,15 +189,15 @@ _0232041C: str r7, [sp, #8] mov r2, #0 str r2, [sl, #0x1c] - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, #0x1a bl AdvanceFrame add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end ov29_0232033C - arm_func_start ov29_02320448 -ov29_02320448: ; 0x02320448 + arm_func_start TryExplosion +TryExplosion: ; 0x02320448 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov sl, r0 @@ -222,7 +222,7 @@ _0232047C: beq _023204B0 mov r0, r6 mov r1, r7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _023204BC _023204B0: @@ -341,7 +341,7 @@ _02320634: bne _02320660 add r0, sp, #0xc mov r1, #0 - bl ov29_023456BC + bl RemoveGroundItem _02320660: mov r6, #1 _02320664: @@ -398,7 +398,7 @@ _02320714: _02320718: mov r0, r5 mov r1, r6 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r5, r5, #1 cmp r5, #0x38 blt _02320718 @@ -406,8 +406,8 @@ _02320718: cmp r6, #0x20 blt _02320714 _0232073C: - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility _02320744: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -418,4 +418,4 @@ _02320754: .word 0x00000BFB _02320758: .word 0x023529B8 _0232075C: .word 0x02353700 _02320760: .word 0x0000026F - arm_func_end ov29_02320448 + arm_func_end TryExplosion diff --git a/asm/overlay_29_02320788.s b/asm/overlay_29_02320788.s index 862f9788..d53cbb5f 100644 --- a/asm/overlay_29_02320788.s +++ b/asm/overlay_29_02320788.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_02320788 -ov29_02320788: ; 0x02320788 + arm_func_start TryAftermathExplosion +TryAftermathExplosion: ; 0x02320788 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov sl, r0 @@ -29,7 +29,7 @@ _023207BC: beq _023207F0 mov r0, r6 mov r1, r7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _023207FC _023207F0: @@ -148,7 +148,7 @@ _02320974: bne _023209A0 add r0, sp, #0xc mov r1, #0 - bl ov29_023456BC + bl RemoveGroundItem _023209A0: mov r6, #1 _023209A4: @@ -205,7 +205,7 @@ _02320A54: _02320A58: mov r0, r5 mov r1, r6 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r5, r5, #1 cmp r5, #0x38 blt _02320A58 @@ -213,8 +213,8 @@ _02320A58: cmp r6, #0x20 blt _02320A54 _02320A7C: - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility _02320A84: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -225,7 +225,7 @@ _02320A94: .word 0x00000BFB _02320A98: .word 0x023529B8 _02320A9C: .word 0x02353700 _02320AA0: .word 0x0000026F - arm_func_end ov29_02320788 + arm_func_end TryAftermathExplosion arm_func_start ov29_02320AA4 ov29_02320AA4: ; 0x02320AA4 @@ -245,7 +245,7 @@ ov29_02320AA4: ; 0x02320AA4 bl InitMove add r1, sp, #0x1a mov r0, r7 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _02320BC0 ldrb r0, [r4, #6] @@ -277,7 +277,7 @@ _02320B44: mov r2, #1 mov r3, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r4, #1 bne _02320B94 @@ -287,7 +287,7 @@ _02320B44: mov r1, r7 rsb r3, r2, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 addne r0, r4, r4, lsr #31 movne r4, r0, asr #1 @@ -328,7 +328,7 @@ ov29_02320BCC: ; 0x02320BCC bl InitMove add r1, sp, #0x1a mov r0, r8 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _02320CFC ldrb r0, [r5, #6] @@ -360,7 +360,7 @@ _02320C6C: mov r2, #1 mov r3, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 movne r4, #1 bne _02320CBC @@ -370,7 +370,7 @@ _02320C6C: mov r1, r8 rsb r3, r2, #0xdc0 str ip, [sp] - bl ov29_02314D40 + bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 addne r0, r4, r4, lsr #31 movne r4, r0, asr #1 @@ -425,14 +425,14 @@ _02320D58: beq _02320D78 mov r0, sb mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _02320D84 _02320D78: mov r0, r8 mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _02320D84: cmp r0, #0 beq _02320DA0 @@ -446,7 +446,7 @@ _02320DA0: ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] - bl ov29_023440DC + bl AreTileJumpsAllowed cmp r0, #0 bne _02320DD0 ldr r2, _023210F0 ; =0x00000E72 @@ -487,7 +487,7 @@ _02320E20: mov r1, r8 bl ov29_022E5650 mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02320EA4 ldrb sl, [r5, #0x4c] @@ -541,7 +541,7 @@ _02320EF4: mov r2, #0 add r1, r1, #0xe4 add r1, r1, #0xcc00 - bl ov29_022E99F0 + bl FindClosestUnoccupiedTileWithin2 cmp r0, #0 bne _02321008 ldrh r0, [r8, #4] @@ -554,7 +554,7 @@ _02320F30: add r0, sp, #0 mov r1, r6 mov r2, #0 - bl ov29_022E99F0 + bl FindClosestUnoccupiedTileWithin2 cmp r0, #0 bne _02321008 ldrh r0, [r8, #4] @@ -576,7 +576,7 @@ _02320F74: mov r2, #1 add r1, r1, #0xe4 add r1, r1, #0xcc00 - bl ov29_022E9A28 + bl FindUnoccupiedTileWithin3 cmp r0, #0 bne _02321008 ldrh r0, [r8, #4] @@ -596,7 +596,7 @@ _02320FB0: add r0, sp, #0 add r1, r1, #4 mov r2, #0 - bl ov29_022E99F0 + bl FindClosestUnoccupiedTileWithin2 cmp r0, #0 bne _02321008 _02320FE4: @@ -614,16 +614,16 @@ _02321008: ldrsh r2, [sp, #2] mov r0, r8 mov r3, #1 - bl ov29_022F85F0 + bl MoveMonsterToPos mov r0, r8 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, r8 bl sub_01FFB62C mov r0, #1 - bl ov29_022E2EC4 + bl UpdateCamera mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _023210A0 ldrb sl, [r5, #0x4c] @@ -681,8 +681,8 @@ _023210FC: .word 0x0237C850 _02321100: .word 0x00000E75 arm_func_end TryWarp - arm_func_start ov29_02321104 -ov29_02321104: ; 0x02321104 + arm_func_start EnsureCanStandCurrentTile +EnsureCanStandCurrentTile: ; 0x02321104 stmdb sp!, {r4, lr} mov r4, r0 add r1, r4, #4 @@ -695,7 +695,7 @@ ov29_02321104: ; 0x02321104 mov r3, #0 bl TryWarp ldmia sp!, {r4, pc} - arm_func_end ov29_02321104 + arm_func_end EnsureCanStandCurrentTile arm_func_start ov29_02321134 ov29_02321134: ; 0x02321134 @@ -762,7 +762,7 @@ _023211E0: bl ov29_022F42F8 _02321200: add r0, r4, #4 - bl ov29_02337A3C + bl DiscoverMinimap mov r0, #0 bl ov29_022F62CC _02321210: diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 3983f09b..1a209cb9 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -114,7 +114,7 @@ _023215D8: cmpne r0, #0xe3 mov r0, sl bne _02321610 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 bne _02321620 mov r0, sl @@ -145,7 +145,7 @@ _02321620: mov r0, sl mov r1, r4 str r2, [sp, #0x14] - bl ov29_023245A4 + bl IsChargingTwoTurnMove ldrb r1, [r4, #6] mov fp, r0 cmp r1, #0 @@ -279,7 +279,7 @@ _0232183C: bl LogMessageByIdWithPopupCheckUser _02321848: mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, sl bl EntityIsValid__02321438 cmp r0, #0 @@ -309,7 +309,7 @@ _0232189C: ldrh r1, [r0, #0x94] add r4, sp, #0x24 mov r0, r4 - bl GetInfoMoveCheckId + bl InitMoveCheckId ldrb r0, [sp, #0x24] tst r0, #1 movne r0, #1 @@ -366,7 +366,7 @@ _02321978: bl ov29_02322374 _0232198C: mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _02321994: add sb, sb, #1 cmp sb, #4 @@ -431,8 +431,8 @@ _02321A70: .word 0x00000E77 _02321A74: .word 0x022C4714 arm_func_end ov29_0232145C - arm_func_start ov29_02321A78 -ov29_02321A78: ; 0x02321A78 + arm_func_start TryActivateNondamagingDefenderAbility +TryActivateNondamagingDefenderAbility: ; 0x02321A78 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl EntityIsValid__02321438 @@ -584,7 +584,7 @@ _02321C7C: mov r0, r5 bl LogMessageByIdWithPopupCheckUser mov r0, r5 - bl ov29_0231B33C + bl ActivateStench _02321CB0: add r0, r4, #0x100 mov r1, #0 @@ -603,10 +603,10 @@ _02321CE0: .word 0x022C4720 _02321CE4: .word 0x00000E8A _02321CE8: .word 0x00000E8B _02321CEC: .word 0x00000E8C - arm_func_end ov29_02321A78 + arm_func_end TryActivateNondamagingDefenderAbility - arm_func_start ov29_02321CF0 -ov29_02321CF0: ; 0x02321CF0 + arm_func_start TryActivateNondamagingDefenderExclusiveItem +TryActivateNondamagingDefenderExclusiveItem: ; 0x02321CF0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -874,7 +874,7 @@ _023220A8: mov r0, r6 mov r1, r6 mov r3, r2 - bl ov29_023176CC + bl TryInflictBlinkerStatus _023220E4: ldr r0, [r4, #0x18c] tst r0, #0x8000 @@ -903,7 +903,7 @@ _0232211C: bl LogMessageByIdWithPopupCheckUser mov r0, r5 mov r1, r5 - bl ov29_0231657C + bl TryInflictInvisibleStatus _02322150: ldr r0, [r4, #0x18c] tst r0, #0x20000 @@ -934,7 +934,7 @@ _0232218C: mov r0, r6 mov r1, r6 mov r2, #0 - bl ov29_0231662C + bl TryInflictPerishSongStatus _023221C4: ldr r0, [r4, #0x18c] tst r0, #0x400000 @@ -996,10 +996,10 @@ _02322294: .word 0x00000E9E _02322298: .word 0x00000E9F _0232229C: .word 0x00000EA1 _023222A0: .word 0x00000EA2 - arm_func_end ov29_02321CF0 + arm_func_end TryActivateNondamagingDefenderExclusiveItem - arm_func_start ov29_023222A4 -ov29_023222A4: ; 0x023222A4 + arm_func_start GetMoveRangeDistance +GetMoveRangeDistance: ; 0x023222A4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r2, #1 @@ -1049,13 +1049,13 @@ _02322340: beq _0232236C mov r0, r7 mov r1, r6 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 moveq r4, #0 _0232236C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_023222A4 + arm_func_end GetMoveRangeDistance arm_func_start ov29_02322374 ov29_02322374: ; 0x02322374 @@ -1071,10 +1071,10 @@ ov29_02322374: ; 0x02322374 mov r8, sl str r7, [sp, #0x38] ldr r4, [sp, #0x160] - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, r6 mov r1, sl - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 mov r0, r6 mov r2, #1 @@ -1117,13 +1117,13 @@ _023223D4: add r3, sp, #0x38 bl ov29_02322DDC mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething add r8, sp, #0x28 b _023224C4 _02322460: cmp r1, #0x77 bne _023224C4 - bl ov29_023280D4 + bl GetNaturePowerVariant ldr r1, _02322D28 ; =0x022C4E40 mov r0, r0, lsl #3 ldrh r1, [r1, r0] @@ -1144,13 +1144,13 @@ _02322460: add r3, sp, #0x38 bl ov29_02322DDC mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething add r8, sp, #0x30 _023224C4: mov r0, r6 mov r1, r8 mov r2, #1 - bl ov29_023222A4 + bl GetMoveRangeDistance and fp, r0, #0xff bl ov29_0234B034 mov r1, #0 @@ -1165,7 +1165,7 @@ _023224C4: bl FormatMoveStringMore mov r0, r6 mov r1, r8 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02322554 ldr r0, _02322D30 ; =0x00000EA6 @@ -1334,7 +1334,7 @@ _02322768: bne _023227B0 mov r0, r6 mov r1, #0x5b - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 mov r0, r8 beq _023227A8 @@ -1380,7 +1380,7 @@ _023227C4: bne _0232284C _02322824: mov r0, r6 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 bne _02322860 mov r0, r6 @@ -1476,7 +1476,7 @@ _02322928: bne _02322A54 mov r0, r6 mov r1, sl - bl ov29_022FB678 + bl AreEntitiesAdjacent cmp r0, #0 beq _02322A54 mov r0, r6 @@ -1665,7 +1665,7 @@ _02322BE8: subne r0, r0, #1 strneb r0, [r8, #6] mov r0, r6 - bl ov29_023222A4 + bl GetMoveRangeDistance and fp, r0, #0xff b _02322C88 _02322C68: @@ -1694,7 +1694,7 @@ _02322C98: bl EndFrozenClassStatus mov r0, r6 mov r1, r6 - bl ov29_023068C4 + bl EndLeechSeedClassStatus _02322CC4: ldr r0, _02322D44 ; =0x0237CA68 ldrb r0, [r0, #2] @@ -1756,14 +1756,14 @@ DefenderAbilityIsActive__02322D64: ; 0x02322D64 beq _02322DA8 mov r0, r7 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _02322DA8: mov r0, r6 mov r1, r5 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end DefenderAbilityIsActive__02322D64 @@ -1790,7 +1790,7 @@ ov29_02322DDC: ; 0x02322DDC mov sb, r1 mov fp, r3 ldr r7, [sp, #0x28] - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r5, #1 cmp r8, #0 @@ -1801,7 +1801,7 @@ _02322E18: ldr r0, [fp, r6, lsl #2] cmp r0, #0 beq _02322E40 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r5, #1 bne _02322E40 @@ -1884,7 +1884,7 @@ _02322F24: ldrb r1, [r1, #0x4c] bl ov29_02304A48 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _02322F4C: mov r0, sl mov r1, sb @@ -2095,7 +2095,7 @@ _0232321C: beq _02323250 mov r0, r8 mov r1, r7 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 mvneq r0, #0 streq r0, [sp, #0xb0] @@ -2160,7 +2160,7 @@ _023232E4: ldrsh r2, [r2, r4] str r3, [sp, #0x10] str r2, [sp, #0xc] - bl DivideInt + bl __divsi3 ldr r2, [sp, #0x84] str r0, [sp, #0x18] mul r1, r2, r0 @@ -2175,7 +2175,7 @@ _0232335C: _02323360: mov r0, #0x80000 mov sb, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x80] mov r0, #1 bl ov29_0234B4CC @@ -2470,7 +2470,7 @@ _023237A8: _023237BC: ldr r0, [sl, #0xc] mov r1, r7 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _02323818 mov r0, r8 @@ -2520,7 +2520,7 @@ _0232385C: cmp r1, r0 bne _0232387C mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _0232387C: ldr r0, [sp, #0x88] cmp r0, #0 @@ -2550,7 +2550,7 @@ _023238B4: mov r0, r8 mov r2, r7 mov r1, #0 - bl ov29_023256B4 + bl PlayMoveAnimation _023238EC: add sp, sp, #0xc0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -2623,7 +2623,7 @@ _02323984: mov r4, r0 mov r1, r6 mov r0, #0x18 - bl DivideInt + bl __divsi3 str r0, [sp, #4] ldr r0, [sp] cmp r0, #2 @@ -2643,7 +2643,7 @@ _02323A18: _02323A20: mov r0, #0x80000 mov r5, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x1c] ldrb r2, [r7, #0x4c] ldr r1, _02323C38 ; =0x02352A8C @@ -2764,7 +2764,7 @@ _02323BCC: bl ov10_022BDE50 _02323BE0: mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, #0 bl ov29_0234B4CC mov r0, #1 @@ -2780,7 +2780,7 @@ _02323BE0: mov r0, sl mov r2, sb mov r1, #0 - bl ov29_023256B4 + bl PlayMoveAnimation add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -2854,7 +2854,7 @@ _02323D00: bgt _02324008 mov r0, r6 mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _02323D4C @@ -2876,7 +2876,7 @@ _02323D4C: ldrsh sb, [sb, #0x2c] subne r8, r8, r0 mov r0, r7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 ldrh r0, [fp, #4] addne sl, sl, #2 @@ -2924,7 +2924,7 @@ _02323DDC: _02323E30: mov r0, r7 mov r1, #0x30 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02323E54 ldrh r0, [fp, #4] @@ -3000,7 +3000,7 @@ _02323F44: mov r0, r7 mov r1, #0x6a add sl, sl, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne sb, #0xa mov r0, r7 @@ -3087,7 +3087,7 @@ ov29_02324030: ; 0x02324030 bne _023240C0 mov r0, sb mov r1, r8 - bl ov29_023245A4 + bl IsChargingTwoTurnMove ldrh r1, [r8, #4] mov r5, r0 cmp r1, #0x97 @@ -3145,7 +3145,7 @@ _02324134: add r0, sp, #0x14 add r1, r2, r1 strh r1, [sp, #0x16] - bl ov29_02337B68 + bl PositionHasMonster cmp r0, #0 beq _02324194 stmia sp, {r0, r8} @@ -3385,7 +3385,7 @@ _023244B8: _023244C0: ldr r1, [sp, #0x1c] mov r0, r5 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 movne r4, #0 cmp r4, #0 @@ -3420,8 +3420,8 @@ ov29_02324514: ; 0x02324514 ldmia sp!, {r3, pc} arm_func_end ov29_02324514 - arm_func_start ov29_02324534 -ov29_02324534: ; 0x02324534 + arm_func_start IsHyperBeamVariant +IsHyperBeamVariant: ; 0x02324534 ldrh r2, [r0, #4] cmp r2, #0xee moveq r0, #1 @@ -3451,10 +3451,10 @@ ov29_02324534: ; 0x02324534 bx lr .align 2, 0 _023245A0: .word 0x000001C5 - arm_func_end ov29_02324534 + arm_func_end IsHyperBeamVariant - arm_func_start ov29_023245A4 -ov29_023245A4: ; 0x023245A4 + arm_func_start IsChargingTwoTurnMove +IsChargingTwoTurnMove: ; 0x023245A4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -3488,7 +3488,7 @@ _02324608: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02324618: .word 0x02352AAC - arm_func_end ov29_023245A4 + arm_func_end IsChargingTwoTurnMove arm_func_start ov29_0232461C ov29_0232461C: ; 0x0232461C @@ -3609,8 +3609,8 @@ _02324790: ldmia sp!, {r4, pc} arm_func_end ov29_02324748 - arm_func_start ov29_02324798 -ov29_02324798: ; 0x02324798 + arm_func_start HasMaxGinsengBoost99 +HasMaxGinsengBoost99: ; 0x02324798 stmdb sp!, {r3, lr} bl GetMoveMaxGinsengBoost cmp r0, #0x63 @@ -3618,7 +3618,7 @@ ov29_02324798: ; 0x02324798 movne r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_02324798 + arm_func_end HasMaxGinsengBoost99 arm_func_start ov29_023247B4 ov29_023247B4: ; 0x023247B4 @@ -3638,7 +3638,7 @@ _023247D4: cmp r0, #0 beq _02324814 mov r0, sb - bl ov29_02324798 + bl HasMaxGinsengBoost99 cmp r0, #0 beq _02324814 ldrh r2, [sb, #4] @@ -3667,8 +3667,8 @@ _0232484C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end ov29_023247B4 - arm_func_start ov29_02324854 -ov29_02324854: ; 0x02324854 + arm_func_start TwoTurnMoveForcedMiss +TwoTurnMoveForcedMiss: ; 0x02324854 stmdb sp!, {r3, lr} ldr r2, [r0, #0xb4] ldrb r0, [r2, #0x10b] @@ -3715,7 +3715,7 @@ _023248D8: ldmeqia sp!, {r3, pc} cmp r0, #0x77 bne _02324920 - bl ov29_023280D4 + bl GetNaturePowerVariant ldr r1, _02324930 ; =0x022C4E40 mov r0, r0, lsl #3 ldrh r0, [r1, r0] @@ -3730,7 +3730,7 @@ _02324928: ldmia sp!, {r3, pc} .align 2, 0 _02324930: .word 0x022C4E40 - arm_func_end ov29_02324854 + arm_func_end TwoTurnMoveForcedMiss arm_func_start DungeonRandOutcomeUserTargetInteraction DungeonRandOutcomeUserTargetInteraction: ; 0x02324934 @@ -3765,7 +3765,7 @@ DungeonRandOutcomeUserTargetInteraction: ; 0x02324934 beq _023249DC mov r0, r6 mov r1, #0x26 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023249CC mov r0, r4, lsl #1 @@ -3813,7 +3813,7 @@ DungeonRandOutcomeUserAction: ; 0x02324A20 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, #0x26 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02324A68 mov r0, r4, lsl #1 @@ -4120,8 +4120,8 @@ _02324E34: ldmia sp!, {r3, r4, r5, pc} arm_func_end UpdateMovePp - arm_func_start ov29_02324E44 -ov29_02324E44: ; 0x02324E44 + arm_func_start GetDamageSourceWrapper +GetDamageSourceWrapper: ; 0x02324E44 stmdb sp!, {r4, lr} mov r4, r0 mov r0, r1 @@ -4130,7 +4130,7 @@ ov29_02324E44: ; 0x02324E44 ldrh r0, [r4, #4] bl GetDamageSource ldmia sp!, {r4, pc} - arm_func_end ov29_02324E44 + arm_func_end GetDamageSourceWrapper arm_func_start LowerSshort LowerSshort: ; 0x02324E64 @@ -4586,7 +4586,7 @@ _023254C8: bl GetSpriteIndex__02052708 mov r1, r0 mov r0, #1 - bl ov29_022F6F68 + bl SetAndLoadCurrentAttackAnimation mov r5, r0 b _02325530 _02325500: @@ -4594,7 +4594,7 @@ _02325500: bl GetSpriteIndex__02052708 mov r1, r0 mov r0, #1 - bl ov29_022F6F68 + bl SetAndLoadCurrentAttackAnimation mov r1, #0xff mov r5, r0 strb r1, [sl, #0xaf] @@ -4610,7 +4610,7 @@ _02325530: bl ov29_023049A8 ldrb r1, [sl, #0xae] mov r0, r5 - bl sub_0201DA80 + bl WanTableSpriteHasAnimationGroup cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -4659,7 +4659,7 @@ _023255E0: cmp r0, #0 beq _02325600 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _02325600: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index fd3d99fb..24033f0a 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -35,8 +35,8 @@ ov29_02325644: ; 0x02325644 ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_02325644 - arm_func_start ov29_023256B4 -ov29_023256B4: ; 0x023256B4 + arm_func_start PlayMoveAnimation +PlayMoveAnimation: ; 0x023256B4 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x18 mov r8, r2 @@ -190,7 +190,7 @@ _023258E0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _023258E8: .word 0x02352AD8 - arm_func_end ov29_023256B4 + arm_func_end PlayMoveAnimation arm_func_start ov29_023258EC ov29_023258EC: ; 0x023258EC @@ -483,7 +483,7 @@ _02325CC8: cmpne r1, #0xe3 bne _02325CEC mov r0, r5 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 movne r0, #0 moveq r0, #1 @@ -498,7 +498,7 @@ _02325CEC: _02325D04: mov r0, r5 mov r1, r4 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -555,8 +555,8 @@ ov29_02325D7C: ; 0x02325D7C ldmia sp!, {r4, pc} arm_func_end ov29_02325D7C - arm_func_start ov29_02325DC0 -ov29_02325DC0: ; 0x02325DC0 + arm_func_start DoMoveDamage__02325DC0 +DoMoveDamage__02325DC0: ; 0x02325DC0 stmdb sp!, {r3, lr} str r3, [sp] mov r3, #0x100 @@ -566,10 +566,10 @@ ov29_02325DC0: ; 0x02325DC0 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_02325DC0 + arm_func_end DoMoveDamage__02325DC0 - arm_func_start ov29_02325DE4 -ov29_02325DE4: ; 0x02325DE4 + arm_func_start DoMoveIronTail +DoMoveIronTail: ; 0x02325DE4 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -604,10 +604,10 @@ _02325E50: .align 2, 0 _02325E5C: .word 0x022C4440 _02325E60: .word 0x02352AEC - arm_func_end ov29_02325DE4 + arm_func_end DoMoveIronTail - arm_func_start ov29_02325E64 -ov29_02325E64: ; 0x02325E64 + arm_func_start DoMoveDamageMultihitUntilMiss +DoMoveDamageMultihitUntilMiss: ; 0x02325E64 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr ip, _02325EB8 ; =0x0237CA70 @@ -633,10 +633,10 @@ ov29_02325E64: ; 0x02325E64 _02325EB8: .word 0x0237CA70 _02325EBC: .word 0x02352AF0 _02325EC0: .word 0x0237CA69 - arm_func_end ov29_02325E64 + arm_func_end DoMoveDamageMultihitUntilMiss - arm_func_start ov29_02325EC4 -ov29_02325EC4: ; 0x02325EC4 + arm_func_start DoMoveYawn +DoMoveYawn: ; 0x02325EC4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -653,10 +653,10 @@ ov29_02325EC4: ; 0x02325EC4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02325EFC: .word 0x022C4860 - arm_func_end ov29_02325EC4 + arm_func_end DoMoveYawn - arm_func_start ov29_02325F00 -ov29_02325F00: ; 0x02325F00 + arm_func_start DoMoveSleep +DoMoveSleep: ; 0x02325F00 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -673,10 +673,10 @@ ov29_02325F00: ; 0x02325F00 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02325F38: .word 0x022C4720 - arm_func_end ov29_02325F00 + arm_func_end DoMoveSleep - arm_func_start ov29_02325F3C -ov29_02325F3C: ; 0x02325F3C + arm_func_start DoMoveNightmare +DoMoveNightmare: ; 0x02325F3C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -692,10 +692,10 @@ ov29_02325F3C: ; 0x02325F3C ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02325F70: .word 0x022C4724 - arm_func_end ov29_02325F3C + arm_func_end DoMoveNightmare - arm_func_start ov29_02325F74 -ov29_02325F74: ; 0x02325F74 + arm_func_start DoMoveMorningSun +DoMoveMorningSun: ; 0x02325F74 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -713,18 +713,18 @@ ov29_02325F74: ; 0x02325F74 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02325FB0: .word 0x022C4984 - arm_func_end ov29_02325F74 + arm_func_end DoMoveMorningSun - arm_func_start ov29_02325FB4 -ov29_02325FB4: ; 0x02325FB4 + arm_func_start DoMoveVitalThrow +DoMoveVitalThrow: ; 0x02325FB4 stmdb sp!, {r3, lr} - bl ov29_02319584 + bl TryInflictVitalThrowStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02325FB4 + arm_func_end DoMoveVitalThrow - arm_func_start ov29_02325FC4 -ov29_02325FC4: ; 0x02325FC4 + arm_func_start DoMoveDig +DoMoveDig: ; 0x02325FC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r0 mov r7, r1 @@ -749,7 +749,7 @@ _02326000: _02326014: mov r0, r8 mov r1, r6 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02326050 ldr r1, _02326080 ; =0x022C47E4 @@ -780,10 +780,10 @@ _02326074: _0232607C: .word 0x00000EC4 _02326080: .word 0x022C47E4 _02326084: .word 0x00000CD6 - arm_func_end ov29_02325FC4 + arm_func_end DoMoveDig - arm_func_start ov29_02326088 -ov29_02326088: ; 0x02326088 + arm_func_start DoMoveSweetScent +DoMoveSweetScent: ; 0x02326088 stmdb sp!, {r3, lr} ldr r2, _023260A4 ; =0x02352AE8 mov r3, #1 @@ -793,10 +793,10 @@ ov29_02326088: ; 0x02326088 ldmia sp!, {r3, pc} .align 2, 0 _023260A4: .word 0x02352AE8 - arm_func_end ov29_02326088 + arm_func_end DoMoveSweetScent - arm_func_start ov29_023260A8 -ov29_023260A8: ; 0x023260A8 + arm_func_start DoMoveCharm +DoMoveCharm: ; 0x023260A8 stmdb sp!, {r3, lr} ldr r2, _023260CC ; =0x02352AEC mov ip, #1 @@ -808,10 +808,10 @@ ov29_023260A8: ; 0x023260A8 ldmia sp!, {r3, pc} .align 2, 0 _023260CC: .word 0x02352AEC - arm_func_end ov29_023260A8 + arm_func_end DoMoveCharm - arm_func_start ov29_023260D0 -ov29_023260D0: ; 0x023260D0 + arm_func_start DoMoveRainDance +DoMoveRainDance: ; 0x023260D0 stmdb sp!, {r3, r4, r5, lr} ldr r3, _02326120 ; =0x022C4654 ldr r2, _02326124 ; =0x02353538 @@ -823,7 +823,7 @@ ov29_023260D0: ; 0x023260D0 mov r0, #1 mov r1, #0 strh r3, [r2, #0x42] - bl ov29_023354C4 + bl TryActivateWeather cmp r0, #0 bne _02326118 ldr r2, _02326128 ; =0x00000EC5 @@ -837,10 +837,10 @@ _02326118: _02326120: .word 0x022C4654 _02326124: .word 0x02353538 _02326128: .word 0x00000EC5 - arm_func_end ov29_023260D0 + arm_func_end DoMoveRainDance - arm_func_start ov29_0232612C -ov29_0232612C: ; 0x0232612C + arm_func_start DoMoveHail +DoMoveHail: ; 0x0232612C stmdb sp!, {r3, r4, r5, lr} ldr r3, _0232617C ; =0x022C4654 ldr r2, _02326180 ; =0x02353538 @@ -852,7 +852,7 @@ ov29_0232612C: ; 0x0232612C mov r0, #1 mov r1, #0 strh r3, [r2, #0x44] - bl ov29_023354C4 + bl TryActivateWeather cmp r0, #0 bne _02326174 ldr r2, _02326184 ; =0x00000EC8 @@ -866,20 +866,20 @@ _02326174: _0232617C: .word 0x022C4654 _02326180: .word 0x02353538 _02326184: .word 0x00000EC8 - arm_func_end ov29_0232612C + arm_func_end DoMoveHail - arm_func_start ov29_02326188 -ov29_02326188: ; 0x02326188 + arm_func_start DoMoveHealStatus +DoMoveHealStatus: ; 0x02326188 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02326188 + arm_func_end DoMoveHealStatus - arm_func_start ov29_023261A0 -ov29_023261A0: ; 0x023261A0 + arm_func_start DoMoveBubble +DoMoveBubble: ; 0x023261A0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -909,19 +909,19 @@ _023261FC: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02326208: .word 0x022C462C - arm_func_end ov29_023261A0 + arm_func_end DoMoveBubble - arm_func_start ov29_0232620C -ov29_0232620C: ; 0x0232620C + arm_func_start DoMoveEncore +DoMoveEncore: ; 0x0232620C stmdb sp!, {r3, lr} mov r2, #0 - bl ov29_02316720 + bl TryInflictEncoreStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232620C + arm_func_end DoMoveEncore - arm_func_start ov29_02326220 -ov29_02326220: ; 0x02326220 + arm_func_start DoMoveRage +DoMoveRage: ; 0x02326220 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -940,10 +940,10 @@ ov29_02326220: ; 0x02326220 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02326260: .word 0x00000CCF - arm_func_end ov29_02326220 + arm_func_end DoMoveRage - arm_func_start ov29_02326264 -ov29_02326264: ; 0x02326264 + arm_func_start DoMoveSuperFang +DoMoveSuperFang: ; 0x02326264 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x20 mov r7, r1 @@ -965,7 +965,7 @@ ov29_02326264: ; 0x02326264 mov sb, r0 mov r1, r5 mov r0, r6 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r4, sb} str r0, [sp, #0xc] @@ -993,10 +993,10 @@ _0232630C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _02326318: .word 0x00000EC9 - arm_func_end ov29_02326264 + arm_func_end DoMoveSuperFang - arm_func_start ov29_0232631C -ov29_0232631C: ; 0x0232631C + arm_func_start DoMovePainSplit +DoMovePainSplit: ; 0x0232631C stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -1059,10 +1059,10 @@ _023263B8: .align 2, 0 _02326400: .word 0x000003E7 _02326404: .word 0x00000ECA - arm_func_end ov29_0232631C + arm_func_end DoMovePainSplit - arm_func_start ov29_02326408 -ov29_02326408: ; 0x02326408 + arm_func_start DoMoveTorment +DoMoveTorment: ; 0x02326408 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov sb, r1 @@ -1153,20 +1153,20 @@ _0232653C: .align 2, 0 _02326548: .word 0x00000ECB _0232654C: .word 0x00000ECC - arm_func_end ov29_02326408 + arm_func_end DoMoveTorment - arm_func_start ov29_02326550 -ov29_02326550: ; 0x02326550 + arm_func_start DoMoveStringShot +DoMoveStringShot: ; 0x02326550 stmdb sp!, {r3, lr} mov r2, #1 mov r3, r2 bl LowerSpeed mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02326550 + arm_func_end DoMoveStringShot - arm_func_start ov29_02326568 -ov29_02326568: ; 0x02326568 + arm_func_start DoMoveSwagger +DoMoveSwagger: ; 0x02326568 stmdb sp!, {r3, r4, r5, lr} mov r2, #1 mov r3, #0 @@ -1183,10 +1183,10 @@ ov29_02326568: ; 0x02326568 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023265A0: .word 0x02352AEC - arm_func_end ov29_02326568 + arm_func_end DoMoveSwagger - arm_func_start ov29_023265A4 -ov29_023265A4: ; 0x023265A4 + arm_func_start DoMoveSnore +DoMoveSnore: ; 0x023265A4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1194,7 +1194,7 @@ ov29_023265A4: ; 0x023265A4 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 beq _02326624 mov r0, r8 @@ -1231,10 +1231,10 @@ _02326634: .align 2, 0 _02326640: .word 0x022C4600 _02326644: .word 0x00000ECD - arm_func_end ov29_023265A4 + arm_func_end DoMoveSnore - arm_func_start ov29_02326648 -ov29_02326648: ; 0x02326648 + arm_func_start DoMoveScreech +DoMoveScreech: ; 0x02326648 stmdb sp!, {r3, lr} ldr r2, _0232666C ; =0x02352AEC mov ip, #1 @@ -1246,10 +1246,10 @@ ov29_02326648: ; 0x02326648 ldmia sp!, {r3, pc} .align 2, 0 _0232666C: .word 0x02352AEC - arm_func_end ov29_02326648 + arm_func_end DoMoveScreech - arm_func_start ov29_02326670 -ov29_02326670: ; 0x02326670 + arm_func_start DoMoveDamageCringe30 +DoMoveDamageCringe30: ; 0x02326670 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1279,10 +1279,10 @@ _023266CC: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _023266D8: .word 0x022C444C - arm_func_end ov29_02326670 + arm_func_end DoMoveDamageCringe30 - arm_func_start ov29_023266DC -ov29_023266DC: ; 0x023266DC + arm_func_start DoMoveWeatherBall +DoMoveWeatherBall: ; 0x023266DC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r8, r0 @@ -1293,7 +1293,7 @@ ov29_023266DC: ; 0x023266DC mov r4, r0 mov r0, r8 mov r1, r7 - bl ov29_02307C78 + bl EndFrozenStatus ldr ip, _02326748 ; =0x022C4B54 ldr r2, _0232674C ; =0x022C48DC ldr ip, [ip, r4, lsl #2] @@ -1303,7 +1303,7 @@ ov29_023266DC: ; 0x023266DC mov r1, r7 mov r3, r6 str r5, [sp, #4] - bl ov29_02332CDC + bl DealDamageWithType cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1313,10 +1313,10 @@ ov29_023266DC: ; 0x023266DC .align 2, 0 _02326748: .word 0x022C4B54 _0232674C: .word 0x022C48DC - arm_func_end ov29_023266DC + arm_func_end DoMoveWeatherBall - arm_func_start ov29_02326750 -ov29_02326750: ; 0x02326750 + arm_func_start DoMoveWhirlpool +DoMoveWhirlpool: ; 0x02326750 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -1353,10 +1353,10 @@ _023267C8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _023267D4: .word 0x022C44A4 - arm_func_end ov29_02326750 + arm_func_end DoMoveWhirlpool - arm_func_start ov29_023267D8 -ov29_023267D8: ; 0x023267D8 + arm_func_start DoMoveFakeTears +DoMoveFakeTears: ; 0x023267D8 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _02326808 ; =0x02352AE8 @@ -1371,10 +1371,10 @@ ov29_023267D8: ; 0x023267D8 ldmia sp!, {r3, pc} .align 2, 0 _02326808: .word 0x02352AE8 - arm_func_end ov29_023267D8 + arm_func_end DoMoveFakeTears - arm_func_start ov29_0232680C -ov29_0232680C: ; 0x0232680C + arm_func_start DoMoveSpite +DoMoveSpite: ; 0x0232680C stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r5, r1 ldr r1, [r5, #0xb4] @@ -1424,18 +1424,18 @@ _023268AC: .align 2, 0 _023268B4: .word 0x00000ECE _023268B8: .word 0x00000ECF - arm_func_end ov29_0232680C + arm_func_end DoMoveSpite - arm_func_start ov29_023268BC -ov29_023268BC: ; 0x023268BC + arm_func_start DoMoveFocusEnergy +DoMoveFocusEnergy: ; 0x023268BC stmdb sp!, {r3, lr} - bl ov29_02315D84 + bl TryInflictFocusEnergyStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_023268BC + arm_func_end DoMoveFocusEnergy - arm_func_start ov29_023268CC -ov29_023268CC: ; 0x023268CC + arm_func_start DoMoveSmokescreen +DoMoveSmokescreen: ; 0x023268CC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -1447,28 +1447,28 @@ ov29_023268CC: ; 0x023268CC mov r0, r5 mov r1, r4 mov r3, #0 - bl ov29_02315C00 + bl TryInflictWhifferStatus mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02326904: .word 0x022C47C4 - arm_func_end ov29_023268CC + arm_func_end DoMoveSmokescreen - arm_func_start ov29_02326908 -ov29_02326908: ; 0x02326908 + arm_func_start DoMoveMirrorMove +DoMoveMirrorMove: ; 0x02326908 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r5 mov r1, r4 - bl ov29_02319418 + bl TryInflictMirrorMoveStatus mov r0, #1 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02326908 + arm_func_end DoMoveMirrorMove - arm_func_start ov29_0232692C -ov29_0232692C: ; 0x0232692C + arm_func_start DoMoveOverheat +DoMoveOverheat: ; 0x0232692C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -1476,7 +1476,7 @@ ov29_0232692C: ; 0x0232692C ldr r5, [sb, #0xb4] mov r6, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, sb mov r1, r8 mov r2, r7 @@ -1495,10 +1495,10 @@ ov29_0232692C: ; 0x0232692C _02326988: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_0232692C + arm_func_end DoMoveOverheat - arm_func_start ov29_02326990 -ov29_02326990: ; 0x02326990 + arm_func_start DoMoveAuroraBeam +DoMoveAuroraBeam: ; 0x02326990 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1532,10 +1532,10 @@ _023269F8: .align 2, 0 _02326A04: .word 0x022C4428 _02326A08: .word 0x02352AEC - arm_func_end ov29_02326990 + arm_func_end DoMoveAuroraBeam - arm_func_start ov29_02326A0C -ov29_02326A0C: ; 0x02326A0C + arm_func_start DoMoveMemento +DoMoveMemento: ; 0x02326A0C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -1563,10 +1563,10 @@ ov29_02326A0C: ; 0x02326A0C .align 2, 0 _02326A6C: .word 0x02352AEC _02326A70: .word 0x02352AE8 - arm_func_end ov29_02326A0C + arm_func_end DoMoveMemento - arm_func_start ov29_02326A74 -ov29_02326A74: ; 0x02326A74 + arm_func_start DoMoveOctazooka +DoMoveOctazooka: ; 0x02326A74 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1598,10 +1598,10 @@ _02326AD4: .align 2, 0 _02326AE0: .word 0x022C4500 _02326AE4: .word 0x02352AEC - arm_func_end ov29_02326A74 + arm_func_end DoMoveOctazooka - arm_func_start ov29_02326AE8 -ov29_02326AE8: ; 0x02326AE8 + arm_func_start DoMoveFlatter +DoMoveFlatter: ; 0x02326AE8 stmdb sp!, {r3, r4, r5, lr} mov r2, #1 mov r3, #0 @@ -1618,15 +1618,15 @@ ov29_02326AE8: ; 0x02326AE8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02326B20: .word 0x02352AE8 - arm_func_end ov29_02326AE8 + arm_func_end DoMoveFlatter - arm_func_start ov29_02326B24 -ov29_02326B24: ; 0x02326B24 + arm_func_start DoMoveWillOWisp +DoMoveWillOWisp: ; 0x02326B24 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 mov r5, r1 - bl ov29_02313C74 + bl FlashFireShouldActivate movs r4, r0 beq _02326B94 ldr r3, [r5, #0xb4] @@ -1665,10 +1665,10 @@ _02326BAC: .align 2, 0 _02326BB8: .word 0x00000CDD _02326BBC: .word 0x00000CDC - arm_func_end ov29_02326B24 + arm_func_end DoMoveWillOWisp - arm_func_start ov29_02326BC0 -ov29_02326BC0: ; 0x02326BC0 + arm_func_start DoMoveReturn +DoMoveReturn: ; 0x02326BC0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov sb, r0 @@ -1704,7 +1704,7 @@ _02326C20: mov r1, r4 mov r4, r0 mov r0, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r5} str r4, [sp, #8] @@ -1730,28 +1730,28 @@ _02326C20: _02326C98: .word 0x022C4C0C _02326C9C: .word 0x000003E7 _02326CA0: .word 0x022C4C0E - arm_func_end ov29_02326BC0 + arm_func_end DoMoveReturn - arm_func_start ov29_02326CA4 -ov29_02326CA4: ; 0x02326CA4 - ldr ip, _02326CB0 ; =ov29_02314EB8 + arm_func_start DoMoveGrudge +DoMoveGrudge: ; 0x02326CA4 + ldr ip, _02326CB0 ; =TryInflictGrudgeStatus mov r2, #1 bx ip .align 2, 0 -_02326CB0: .word ov29_02314EB8 - arm_func_end ov29_02326CA4 +_02326CB0: .word TryInflictGrudgeStatus + arm_func_end DoMoveGrudge - arm_func_start ov29_02326CB4 -ov29_02326CB4: ; 0x02326CB4 + arm_func_start DoMoveCounter +DoMoveCounter: ; 0x02326CB4 stmdb sp!, {r3, lr} mov r2, #4 bl ov29_02318D98 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02326CB4 + arm_func_end DoMoveCounter - arm_func_start ov29_02326CC8 -ov29_02326CC8: ; 0x02326CC8 + arm_func_start DoMoveDamageBurn10FlameWheel +DoMoveDamageBurn10FlameWheel: ; 0x02326CC8 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1759,7 +1759,7 @@ ov29_02326CC8: ; 0x02326CC8 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r8 mov r1, r7 mov r2, r6 @@ -1788,10 +1788,10 @@ _02326D40: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02326D4C: .word 0x022C4688 - arm_func_end ov29_02326CC8 + arm_func_end DoMoveDamageBurn10FlameWheel - arm_func_start ov29_02326D50 -ov29_02326D50: ; 0x02326D50 + arm_func_start DoMoveDamageBurn10 +DoMoveDamageBurn10: ; 0x02326D50 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1799,7 +1799,7 @@ ov29_02326D50: ; 0x02326D50 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r8 mov r1, r7 mov r2, r6 @@ -1828,10 +1828,10 @@ _02326DC8: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02326DD4: .word 0x022C4544 - arm_func_end ov29_02326D50 + arm_func_end DoMoveDamageBurn10 - arm_func_start ov29_02326DD8 -ov29_02326DD8: ; 0x02326DD8 + arm_func_start DoMoveExpose +DoMoveExpose: ; 0x02326DD8 stmdb sp!, {r3, lr} ldrh r3, [r2, #4] ldr r2, _02326E00 ; =0x0000013B @@ -1839,15 +1839,15 @@ ov29_02326DD8: ; 0x02326DD8 moveq r2, #0x7a movne r2, #0x51 mov r3, #0 - bl ov29_023174C8 + bl TryInflictExposedStatus mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 _02326E00: .word 0x0000013B - arm_func_end ov29_02326DD8 + arm_func_end DoMoveExpose - arm_func_start ov29_02326E04 -ov29_02326E04: ; 0x02326E04 + arm_func_start DoMoveDoubleTeam +DoMoveDoubleTeam: ; 0x02326E04 stmdb sp!, {r3, lr} ldr r2, _02326E1C ; =0x02352AE8 ldr r2, [r2] @@ -1856,10 +1856,10 @@ ov29_02326E04: ; 0x02326E04 ldmia sp!, {r3, pc} .align 2, 0 _02326E1C: .word 0x02352AE8 - arm_func_end ov29_02326E04 + arm_func_end DoMoveDoubleTeam - arm_func_start ov29_02326E20 -ov29_02326E20: ; 0x02326E20 + arm_func_start DoMoveGust +DoMoveGust: ; 0x02326E20 stmdb sp!, {r3, lr} ldr ip, [r1, #0xb4] mov lr, #1 @@ -1876,10 +1876,10 @@ ov29_02326E20: ; 0x02326E20 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_02326E20 + arm_func_end DoMoveGust - arm_func_start ov29_02326E60 -ov29_02326E60: ; 0x02326E60 + arm_func_start DoMoveBoostDefense1 +DoMoveBoostDefense1: ; 0x02326E60 stmdb sp!, {r3, lr} ldr r2, _02326E7C ; =0x02352AEC mov r3, #1 @@ -1889,20 +1889,20 @@ ov29_02326E60: ; 0x02326E60 ldmia sp!, {r3, pc} .align 2, 0 _02326E7C: .word 0x02352AEC - arm_func_end ov29_02326E60 + arm_func_end DoMoveBoostDefense1 - arm_func_start ov29_02326E80 -ov29_02326E80: ; 0x02326E80 + arm_func_start DoMoveParalyze__02326E80 +DoMoveParalyze__02326E80: ; 0x02326E80 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictParalysisStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02326E80 + arm_func_end DoMoveParalyze__02326E80 - arm_func_start ov29_02326E98 -ov29_02326E98: ; 0x02326E98 + arm_func_start DoMoveBoostAttack1 +DoMoveBoostAttack1: ; 0x02326E98 stmdb sp!, {r3, lr} ldr r2, _02326EB4 ; =0x02352AEC mov r3, #1 @@ -1912,17 +1912,17 @@ ov29_02326E98: ; 0x02326E98 ldmia sp!, {r3, pc} .align 2, 0 _02326EB4: .word 0x02352AEC - arm_func_end ov29_02326E98 + arm_func_end DoMoveBoostAttack1 - arm_func_start ov29_02326EB8 -ov29_02326EB8: ; 0x02326EB8 + arm_func_start DoMoveRazorWind +DoMoveRazorWind: ; 0x02326EB8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r1, r5 mov r7, r0 mov r4, r3 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02326F14 ldr r1, _02326F40 ; =0x022C48B0 @@ -1955,10 +1955,10 @@ _02326F38: .align 2, 0 _02326F40: .word 0x022C48B0 _02326F44: .word 0x00000CCD - arm_func_end ov29_02326EB8 + arm_func_end DoMoveRazorWind - arm_func_start ov29_02326F48 -ov29_02326F48: ; 0x02326F48 + arm_func_start DoMoveBide +DoMoveBide: ; 0x02326F48 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -1977,10 +1977,10 @@ ov29_02326F48: ; 0x02326F48 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02326F88: .word 0x00000CCE - arm_func_end ov29_02326F48 + arm_func_end DoMoveBide - arm_func_start ov29_02326F8C -ov29_02326F8C: ; 0x02326F8C + arm_func_start DoMoveBideUnleash +DoMoveBideUnleash: ; 0x02326F8C stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x20 mov r3, #0 @@ -2024,10 +2024,10 @@ ov29_02326F8C: ; 0x02326F8C .align 2, 0 _0232702C: .word 0x000003E7 _02327030: .word 0x0000023E - arm_func_end ov29_02326F8C + arm_func_end DoMoveBideUnleash - arm_func_start ov29_02327034 -ov29_02327034: ; 0x02327034 + arm_func_start DoMoveCrunch +DoMoveCrunch: ; 0x02327034 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -2062,10 +2062,10 @@ _023270A0: .align 2, 0 _023270AC: .word 0x022C4450 _023270B0: .word 0x02352AEC - arm_func_end ov29_02327034 + arm_func_end DoMoveCrunch - arm_func_start ov29_023270B4 -ov29_023270B4: ; 0x023270B4 + arm_func_start DoMoveDamageCringe20 +DoMoveDamageCringe20: ; 0x023270B4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2095,10 +2095,10 @@ _02327110: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232711C: .word 0x022C4534 - arm_func_end ov29_023270B4 + arm_func_end DoMoveDamageCringe20 - arm_func_start ov29_02327120 -ov29_02327120: ; 0x02327120 + arm_func_start DoMoveDamageParalyze20 +DoMoveDamageParalyze20: ; 0x02327120 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2128,10 +2128,10 @@ _0232717C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327188: .word 0x022C4658 - arm_func_end ov29_02327120 + arm_func_end DoMoveDamageParalyze20 - arm_func_start ov29_0232718C -ov29_0232718C: ; 0x0232718C + arm_func_start DoMoveEndeavor +DoMoveEndeavor: ; 0x0232718C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r4, #0 @@ -2147,7 +2147,7 @@ ov29_0232718C: ; 0x0232718C subs r5, r1, r0 mov r0, r8 movmi r5, r4 - bl ov29_02319748 + bl MirrorMoveIsActive cmp r0, #0 mov r0, r7 movne r8, sb @@ -2158,7 +2158,7 @@ ov29_0232718C: ; 0x0232718C mov r1, r6 mov r6, r0 mov r0, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper mov r2, r5 add r5, sp, #0x1c str r5, [sp] @@ -2180,10 +2180,10 @@ ov29_0232718C: ; 0x0232718C and r0, r0, #0xff add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_0232718C + arm_func_end DoMoveEndeavor - arm_func_start ov29_0232724C -ov29_0232724C: ; 0x0232724C + arm_func_start DoMoveFacade +DoMoveFacade: ; 0x0232724C stmdb sp!, {r3, lr} ldr ip, [r0, #0xb4] mov lr, #0x100 @@ -2201,10 +2201,10 @@ ov29_0232724C: ; 0x0232724C ldmia sp!, {r3, pc} .align 2, 0 _02327288: .word 0x022C4718 - arm_func_end ov29_0232724C + arm_func_end DoMoveFacade - arm_func_start ov29_0232728C -ov29_0232728C: ; 0x0232728C + arm_func_start DoMoveDamageLowerSpeed20 +DoMoveDamageLowerSpeed20: ; 0x0232728C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2234,10 +2234,10 @@ _023272E8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _023272F4: .word 0x022C4514 - arm_func_end ov29_0232728C + arm_func_end DoMoveDamageLowerSpeed20 - arm_func_start ov29_023272F8 -ov29_023272F8: ; 0x023272F8 + arm_func_start DoMoveBrickBreak +DoMoveBrickBreak: ; 0x023272F8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 ldr r5, [r6, #0xb4] @@ -2262,16 +2262,16 @@ ov29_023272F8: ; 0x023272F8 bl LogMessageByIdWithPopupCheckUserTarget mov r0, r7 mov r1, r6 - bl ov29_023064F4 + bl EndReflectClassStatus _0232735C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02327364: .word 0x00000ED2 - arm_func_end ov29_023272F8 + arm_func_end DoMoveBrickBreak - arm_func_start ov29_02327368 -ov29_02327368: ; 0x02327368 + arm_func_start DoMoveDamageLowerSpeed100 +DoMoveDamageLowerSpeed100: ; 0x02327368 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2298,17 +2298,17 @@ _023273C0: mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_02327368 + arm_func_end DoMoveDamageLowerSpeed100 - arm_func_start ov29_023273CC -ov29_023273CC: ; 0x023273CC + arm_func_start DoMoveFocusPunch +DoMoveFocusPunch: ; 0x023273CC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r1, r5 mov r7, r0 mov r4, r3 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02327428 ldr r1, _02327454 ; =0x022C48B4 @@ -2340,10 +2340,10 @@ _0232744C: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02327454: .word 0x022C48B4 - arm_func_end ov29_023273CC + arm_func_end DoMoveFocusPunch - arm_func_start ov29_02327458 -ov29_02327458: ; 0x02327458 + arm_func_start DoMoveDamageDrain +DoMoveDamageDrain: ; 0x02327458 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov sb, r0 mov r8, r1 @@ -2365,14 +2365,14 @@ _02327498: beq _023274B8 mov r0, sb mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r6, #0 bne _023274C8 _023274B8: mov r0, r8 mov r1, #0x3a - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r6, r0 _023274C8: mov r0, sb @@ -2406,7 +2406,7 @@ _023274C8: mov r0, sb mov r1, r5 add r3, r2, #0x22c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _02327590 _0232754C: ldr r1, [sb, #0xb4] @@ -2430,10 +2430,10 @@ _0232756C: _02327590: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_02327458 + arm_func_end DoMoveDamageDrain - arm_func_start ov29_02327598 -ov29_02327598: ; 0x02327598 + arm_func_start DoMoveReversal +DoMoveReversal: ; 0x02327598 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr ip, [r0, #0xb4] @@ -2481,10 +2481,10 @@ _0232761C: .align 2, 0 _02327644: .word 0x000003E7 _02327648: .word 0x022C4994 - arm_func_end ov29_02327598 + arm_func_end DoMoveReversal - arm_func_start ov29_0232764C -ov29_0232764C: ; 0x0232764C + arm_func_start DoMoveSmellingSalt +DoMoveSmellingSalt: ; 0x0232764C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 ldr ip, [r4, #0xb4] @@ -2501,7 +2501,7 @@ ov29_0232764C: ; 0x0232764C mov r1, r4 mov r0, r5 and r4, r2, #0xff - bl ov29_023061A8 + bl EndBurnClassStatus b _023276AC _02327694: mov r3, #0x100 @@ -2513,10 +2513,10 @@ _02327694: _023276AC: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0232764C + arm_func_end DoMoveSmellingSalt - arm_func_start ov29_023276B4 -ov29_023276B4: ; 0x023276B4 + arm_func_start DoMoveMetalSound +DoMoveMetalSound: ; 0x023276B4 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _023276E4 ; =0x02352AE8 @@ -2531,10 +2531,10 @@ ov29_023276B4: ; 0x023276B4 ldmia sp!, {r3, pc} .align 2, 0 _023276E4: .word 0x02352AE8 - arm_func_end ov29_023276B4 + arm_func_end DoMoveMetalSound - arm_func_start ov29_023276E8 -ov29_023276E8: ; 0x023276E8 + arm_func_start DoMoveTickle +DoMoveTickle: ; 0x023276E8 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc ldr r2, _02327740 ; =0x02352AE8 @@ -2559,28 +2559,28 @@ ov29_023276E8: ; 0x023276E8 ldmia sp!, {r4, r5, pc} .align 2, 0 _02327740: .word 0x02352AE8 - arm_func_end ov29_023276E8 + arm_func_end DoMoveTickle - arm_func_start ov29_02327744 -ov29_02327744: ; 0x02327744 + arm_func_start DoMoveShadowHold +DoMoveShadowHold: ; 0x02327744 stmdb sp!, {r3, lr} mov r2, #0 bl TryInflictShadowHoldStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327744 + arm_func_end DoMoveShadowHold - arm_func_start ov29_02327758 -ov29_02327758: ; 0x02327758 + arm_func_start DoMoveHaze +DoMoveHaze: ; 0x02327758 stmdb sp!, {r3, lr} mov r2, #1 - bl ov29_02319624 + bl TryResetStatChanges mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327758 + arm_func_end DoMoveHaze - arm_func_start ov29_0232776C -ov29_0232776C: ; 0x0232776C + arm_func_start DoMoveDamageMultihitFatigue +DoMoveDamageMultihitFatigue: ; 0x0232776C stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -2602,10 +2602,10 @@ _023277AC: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023277B4: .word 0x0237CA6A - arm_func_end ov29_0232776C + arm_func_end DoMoveDamageMultihitFatigue - arm_func_start ov29_023277B8 -ov29_023277B8: ; 0x023277B8 + arm_func_start DoMoveDamageWeightDependent +DoMoveDamageWeightDependent: ; 0x023277B8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 ldr r1, [r6, #0xb4] @@ -2625,10 +2625,10 @@ ov29_023277B8: ; 0x023277B8 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_023277B8 + arm_func_end DoMoveDamageWeightDependent - arm_func_start ov29_02327804 -ov29_02327804: ; 0x02327804 + arm_func_start DoMoveDamageBoostAllStats +DoMoveDamageBoostAllStats: ; 0x02327804 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc str r3, [sp] @@ -2688,10 +2688,10 @@ _023278D4: .align 2, 0 _023278E0: .word 0x022C4488 _023278E4: .word 0x02352AE8 - arm_func_end ov29_02327804 + arm_func_end DoMoveDamageBoostAllStats - arm_func_start ov29_023278E8 -ov29_023278E8: ; 0x023278E8 + arm_func_start DoMoveSynthesis +DoMoveSynthesis: ; 0x023278E8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -2709,20 +2709,20 @@ ov29_023278E8: ; 0x023278E8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02327924: .word 0x022C4954 - arm_func_end ov29_023278E8 + arm_func_end DoMoveSynthesis - arm_func_start ov29_02327928 -ov29_02327928: ; 0x02327928 + arm_func_start DoMoveBoostSpeed1 +DoMoveBoostSpeed1: ; 0x02327928 stmdb sp!, {r3, lr} mov r2, #0 mov r3, #1 bl BoostSpeedOneStage mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327928 + arm_func_end DoMoveBoostSpeed1 - arm_func_start ov29_02327940 -ov29_02327940: ; 0x02327940 + arm_func_start DoMoveRapidSpin +DoMoveRapidSpin: ; 0x02327940 stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -2752,10 +2752,10 @@ _023279A0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023279A8: .word 0x0237CA6D - arm_func_end ov29_02327940 + arm_func_end DoMoveRapidSpin - arm_func_start ov29_023279AC -ov29_023279AC: ; 0x023279AC + arm_func_start DoMoveSureShot +DoMoveSureShot: ; 0x023279AC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -2766,15 +2766,15 @@ ov29_023279AC: ; 0x023279AC mov r2, r0 mov r0, r5 mov r1, r4 - bl ov29_02315B70 + bl TryInflictSureShotStatus mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023279E0: .word 0x022C4798 - arm_func_end ov29_023279AC + arm_func_end DoMoveSureShot - arm_func_start ov29_023279E4 -ov29_023279E4: ; 0x023279E4 + arm_func_start DoMoveCosmicPower +DoMoveCosmicPower: ; 0x023279E4 stmdb sp!, {r3, r4, r5, lr} ldr r2, _02327A20 ; =0x02352AEC mov r3, #1 @@ -2793,10 +2793,10 @@ ov29_023279E4: ; 0x023279E4 .align 2, 0 _02327A20: .word 0x02352AEC _02327A24: .word 0x02352AE8 - arm_func_end ov29_023279E4 + arm_func_end DoMoveCosmicPower - arm_func_start ov29_02327A28 -ov29_02327A28: ; 0x02327A28 + arm_func_start DoMoveSkyAttack +DoMoveSkyAttack: ; 0x02327A28 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r6, r2 @@ -2805,7 +2805,7 @@ ov29_02327A28: ; 0x02327A28 mov r8, r0 mov r5, r3 mov r4, #0 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02327AB8 ldr r1, _02327AE8 ; =0x022C48A8 @@ -2852,10 +2852,10 @@ _02327ADC: _02327AE8: .word 0x022C48A8 _02327AEC: .word 0x022C4538 _02327AF0: .word 0x00000CD1 - arm_func_end ov29_02327A28 + arm_func_end DoMoveSkyAttack - arm_func_start ov29_02327AF4 -ov29_02327AF4: ; 0x02327AF4 + arm_func_start DoMoveDamageFreeze15 +DoMoveDamageFreeze15: ; 0x02327AF4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2884,10 +2884,10 @@ _02327B4C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327B58: .word 0x022C4634 - arm_func_end ov29_02327AF4 + arm_func_end DoMoveDamageFreeze15 - arm_func_start ov29_02327B5C -ov29_02327B5C: ; 0x02327B5C + arm_func_start DoMoveMeteorMash +DoMoveMeteorMash: ; 0x02327B5C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2923,28 +2923,28 @@ _02327BCC: .align 2, 0 _02327BD8: .word 0x022C4604 _02327BDC: .word 0x02352AEC - arm_func_end ov29_02327B5C + arm_func_end DoMoveMeteorMash - arm_func_start ov29_02327BE0 -ov29_02327BE0: ; 0x02327BE0 + arm_func_start DoMoveEndure +DoMoveEndure: ; 0x02327BE0 stmdb sp!, {r3, lr} - bl ov29_02319378 + bl TryInflictEndureStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327BE0 + arm_func_end DoMoveEndure - arm_func_start ov29_02327BF0 -ov29_02327BF0: ; 0x02327BF0 + arm_func_start DoMoveLowerSpeed1 +DoMoveLowerSpeed1: ; 0x02327BF0 stmdb sp!, {r3, lr} mov r2, #1 mov r3, r2 bl LowerSpeed mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327BF0 + arm_func_end DoMoveLowerSpeed1 - arm_func_start ov29_02327C08 -ov29_02327C08: ; 0x02327C08 + arm_func_start DoMoveDamageConfuse10 +DoMoveDamageConfuse10: ; 0x02327C08 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2974,10 +2974,10 @@ _02327C64: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327C70: .word 0x022C4690 - arm_func_end ov29_02327C08 + arm_func_end DoMoveDamageConfuse10 - arm_func_start ov29_02327C74 -ov29_02327C74: ; 0x02327C74 + arm_func_start DoMovePsywave +DoMovePsywave: ; 0x02327C74 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -3003,10 +3003,10 @@ ov29_02327C74: ; 0x02327C74 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_02327C74 + arm_func_end DoMovePsywave - arm_func_start ov29_02327CD8 -ov29_02327CD8: ; 0x02327CD8 + arm_func_start DoMoveDamageLowerDefensiveStatVariable +DoMoveDamageLowerDefensiveStatVariable: ; 0x02327CD8 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 @@ -3042,10 +3042,10 @@ _02327D4C: ldmia sp!, {r4, r5, r6, lr} add sp, sp, #0x10 bx lr - arm_func_end ov29_02327CD8 + arm_func_end DoMoveDamageLowerDefensiveStatVariable - arm_func_start ov29_02327D60 -ov29_02327D60: ; 0x02327D60 + arm_func_start DoMovePsychoBoost +DoMovePsychoBoost: ; 0x02327D60 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 str r3, [sp] @@ -3076,18 +3076,18 @@ _02327DC0: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02327DCC: .word 0x02352AE8 - arm_func_end ov29_02327D60 + arm_func_end DoMovePsychoBoost - arm_func_start ov29_02327DD0 -ov29_02327DD0: ; 0x02327DD0 + arm_func_start DoMoveUproar +DoMoveUproar: ; 0x02327DD0 stmdb sp!, {r3, lr} bl TryInflictSleeplessStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02327DD0 + arm_func_end DoMoveUproar - arm_func_start ov29_02327DE0 -ov29_02327DE0: ; 0x02327DE0 + arm_func_start DoMoveWaterSpout +DoMoveWaterSpout: ; 0x02327DE0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr ip, [r0, #0xb4] @@ -3135,10 +3135,10 @@ _02327E64: .align 2, 0 _02327E8C: .word 0x000003E7 _02327E90: .word 0x022C49A4 - arm_func_end ov29_02327DE0 + arm_func_end DoMoveWaterSpout - arm_func_start ov29_02327E94 -ov29_02327E94: ; 0x02327E94 + arm_func_start DoMovePsychUp +DoMovePsychUp: ; 0x02327E94 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 mov r7, r0 @@ -3181,10 +3181,10 @@ _02327EB4: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02327F30: .word 0x00000D62 - arm_func_end ov29_02327E94 + arm_func_end DoMovePsychUp - arm_func_start DealDamageWithRecoil -DealDamageWithRecoil: ; 0x02327F34 + arm_func_start DoMoveDamageWithRecoil +DoMoveDamageWithRecoil: ; 0x02327F34 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x18 str r3, [sp] @@ -3196,7 +3196,7 @@ DealDamageWithRecoil: ; 0x02327F34 cmp r0, #0 beq _02327FFC mov r0, r7 - bl EntityIsValid__0232800C + bl EntityIsValidMoveEffects__0232800C cmp r0, #0 beq _02327FFC ldr r1, [r7, #0xb4] @@ -3213,7 +3213,7 @@ DealDamageWithRecoil: ; 0x02327F34 mov r0, r7 mov r1, #7 moveq r5, #1 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02327FFC mov r0, r7 @@ -3241,4 +3241,4 @@ _02327FFC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02328008: .word 0x000003E7 - arm_func_end DealDamageWithRecoil + arm_func_end DoMoveDamageWithRecoil diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index cf67c935..d55cc678 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_02328030 -ov29_02328030: ; 0x02328030 + arm_func_start DoMoveRecoverHp +DoMoveRecoverHp: ; 0x02328030 stmdb sp!, {r3, lr} ldr r3, [r1, #0xb4] ldr r2, _02328070 ; =0x000003E7 @@ -23,10 +23,10 @@ ov29_02328030: ; 0x02328030 ldmia sp!, {r3, pc} .align 2, 0 _02328070: .word 0x000003E7 - arm_func_end ov29_02328030 + arm_func_end DoMoveRecoverHp - arm_func_start ov29_02328074 -ov29_02328074: ; 0x02328074 + arm_func_start DoMoveEarthquake +DoMoveEarthquake: ; 0x02328074 stmdb sp!, {r3, r4, r5, lr} ldr lr, _023280D0 ; =0x02353538 ldr r5, [r1, #0xb4] @@ -52,10 +52,10 @@ ov29_02328074: ; 0x02328074 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023280D0: .word 0x02353538 - arm_func_end ov29_02328074 + arm_func_end DoMoveEarthquake - arm_func_start ov29_023280D4 -ov29_023280D4: ; 0x023280D4 + arm_func_start GetNaturePowerVariant +GetNaturePowerVariant: ; 0x023280D4 ldr r0, _02328108 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x4000 @@ -72,16 +72,16 @@ ov29_023280D4: ; 0x023280D4 .align 2, 0 _02328108: .word 0x02353538 _0232810C: .word 0x022C6324 - arm_func_end ov29_023280D4 + arm_func_end GetNaturePowerVariant - arm_func_start ov29_02328110 -ov29_02328110: ; 0x02328110 + arm_func_start DoMoveNaturePower +DoMoveNaturePower: ; 0x02328110 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 mov r7, r0 mov r6, r1 mov r5, r3 - bl ov29_023280D4 + bl GetNaturePowerVariant mov r4, r0 ldr r0, _02328164 ; =0x022C4E40 mov r1, r4, lsl #3 @@ -100,10 +100,10 @@ ov29_02328110: ; 0x02328110 .align 2, 0 _02328164: .word 0x022C4E40 _02328168: .word 0x022C4E44 - arm_func_end ov29_02328110 + arm_func_end DoMoveNaturePower - arm_func_start ov29_0232816C -ov29_0232816C: ; 0x0232816C + arm_func_start DoMoveDamageParalyze10 +DoMoveDamageParalyze10: ; 0x0232816C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -133,10 +133,10 @@ _023281C8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _023281D4: .word 0x022C4528 - arm_func_end ov29_0232816C + arm_func_end DoMoveDamageParalyze10 - arm_func_start ov29_023281D8 -ov29_023281D8: ; 0x023281D8 + arm_func_start DoMoveSelfdestruct +DoMoveSelfdestruct: ; 0x023281D8 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r6, r2 @@ -148,31 +148,31 @@ ov29_023281D8: ; 0x023281D8 mov r4, r0 mov r0, r6 mov r1, r5 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r4, [sp] str r0, [sp, #4] mov r0, r8 mov r1, r7 add r2, r7, #4 mov r3, #1 - bl ov29_02320448 + bl TryExplosion mov r0, #1 add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end ov29_023281D8 + arm_func_end DoMoveSelfdestruct - arm_func_start ov29_02328230 -ov29_02328230: ; 0x02328230 + arm_func_start DoMoveParalyze__02328230 +DoMoveParalyze__02328230: ; 0x02328230 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictParalysisStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02328230 + arm_func_end DoMoveParalyze__02328230 - arm_func_start ov29_02328248 -ov29_02328248: ; 0x02328248 + arm_func_start DoMoveShadowBall +DoMoveShadowBall: ; 0x02328248 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -207,10 +207,10 @@ _023282B4: .align 2, 0 _023282C0: .word 0x022C461C _023282C4: .word 0x02352AE8 - arm_func_end ov29_02328248 + arm_func_end DoMoveShadowBall - arm_func_start ov29_023282C8 -ov29_023282C8: ; 0x023282C8 + arm_func_start DoMoveCharge +DoMoveCharge: ; 0x023282C8 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -236,10 +236,10 @@ ov29_023282C8: ; 0x023282C8 .align 2, 0 _02328320: .word 0x00000CD9 _02328324: .word 0x02352AE8 - arm_func_end ov29_023282C8 + arm_func_end DoMoveCharge - arm_func_start ov29_02328328 -ov29_02328328: ; 0x02328328 + arm_func_start DoMoveThunderbolt +DoMoveThunderbolt: ; 0x02328328 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -269,18 +269,18 @@ _02328384: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328390: .word 0x022C465C - arm_func_end ov29_02328328 + arm_func_end DoMoveThunderbolt - arm_func_start ov29_02328394 -ov29_02328394: ; 0x02328394 + arm_func_start DoMoveMist +DoMoveMist: ; 0x02328394 stmdb sp!, {r3, lr} - bl ov29_02318F10 + bl TryInflictMistStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02328394 + arm_func_end DoMoveMist - arm_func_start ov29_023283A4 -ov29_023283A4: ; 0x023283A4 + arm_func_start DoMoveFissure +DoMoveFissure: ; 0x023283A4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r7, r2 @@ -295,7 +295,7 @@ ov29_023283A4: ; 0x023283A4 mov r4, r0 mov r0, sb mov r1, #0x57 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r3, r0 mov r2, r4 mov r0, sb @@ -305,7 +305,7 @@ ov29_023283A4: ; 0x023283A4 mov r0, sb mov r1, #0x53 moveq r5, #0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _02328420 mov r0, r8 @@ -329,7 +329,7 @@ _0232843C: mov r4, r0 mov r0, r7 mov r1, r6 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r5} str r4, [sp, #8] @@ -355,10 +355,10 @@ _023284A8: .align 2, 0 _023284B4: .word 0x00000ED3 _023284B8: .word 0x0000270F - arm_func_end ov29_023283A4 + arm_func_end DoMoveFissure - arm_func_start ov29_023284BC -ov29_023284BC: ; 0x023284BC + arm_func_start DoMoveDamageCringe10 +DoMoveDamageCringe10: ; 0x023284BC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -388,18 +388,18 @@ _02328518: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328524: .word 0x022C4448 - arm_func_end ov29_023284BC + arm_func_end DoMoveDamageCringe10 - arm_func_start ov29_02328528 -ov29_02328528: ; 0x02328528 + arm_func_start DoMoveSafeguard +DoMoveSafeguard: ; 0x02328528 stmdb sp!, {r3, lr} - bl ov29_02318E70 + bl TryInflictSafeguardStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02328528 + arm_func_end DoMoveSafeguard - arm_func_start ov29_02328538 -ov29_02328538: ; 0x02328538 + arm_func_start DoMoveAbsorb +DoMoveAbsorb: ; 0x02328538 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r2 mov r6, r3 @@ -408,7 +408,7 @@ ov29_02328538: ; 0x02328538 mov r2, #0x3a mov r3, #1 mov r4, #0 - bl DefenderAbilityIsActive__02328634 + bl DefenderAbilityIsActiveMoveEffects__02328634 mov r5, r0 mov r0, r7 mov r1, sb @@ -423,7 +423,7 @@ ov29_02328538: ; 0x02328538 cmp r6, #1 mov r0, r7 movlt r6, #1 - bl EntityIsValid__0232800C + bl EntityIsValidMoveEffects__0232800C cmp r0, #0 beq _0232862C ldr r1, [r7, #0xb4] @@ -453,7 +453,7 @@ _023285E8: mov r0, r7 mov r1, r6 add r3, r2, #0x22c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _0232862C _02328610: mov r5, #1 @@ -466,10 +466,10 @@ _02328610: _0232862C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_02328538 + arm_func_end DoMoveAbsorb - arm_func_start DefenderAbilityIsActive__02328634 -DefenderAbilityIsActive__02328634: ; 0x02328634 + arm_func_start DefenderAbilityIsActiveMoveEffects__02328634 +DefenderAbilityIsActiveMoveEffects__02328634: ; 0x02328634 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 @@ -488,31 +488,31 @@ _02328668: cmpne r3, #0 beq _02328688 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _02328688: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} - arm_func_end DefenderAbilityIsActive__02328634 + arm_func_end DefenderAbilityIsActiveMoveEffects__02328634 - arm_func_start ov29_02328698 -ov29_02328698: ; 0x02328698 + arm_func_start DoMoveSkillSwap +DoMoveSkillSwap: ; 0x02328698 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r6, r1 mov r7, r0 mov r1, #0x35 ldr r4, [r7, #0xb4] ldr r5, [r6, #0xb4] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _023286D0 mov r0, r6 mov r1, #0x35 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _023286E8 _023286D0: @@ -525,7 +525,7 @@ _023286D0: _023286E8: mov r0, r7 mov r1, #0x74 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02328714 ldr r2, _02328788 ; =0x00000ED6 @@ -557,10 +557,10 @@ _02328714: movlo r0, #1 strlob r0, [r4, #0x108] mov r0, r7 - bl ov29_022FA7DC + bl TryEndStatusWithAbility mov r0, r7 mov r1, r6 - bl ov29_022FA7DC + bl TryEndStatusWithAbility mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 @@ -568,10 +568,10 @@ _02328784: .word 0x00000ED5 _02328788: .word 0x00000ED6 _0232878C: .word 0x02353538 _02328790: .word 0x00000ED4 - arm_func_end ov29_02328698 + arm_func_end DoMoveSkillSwap - arm_func_start ov29_02328794 -ov29_02328794: ; 0x02328794 + arm_func_start DoMoveSketch +DoMoveSketch: ; 0x02328794 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 mov r4, #0 @@ -657,10 +657,10 @@ _023288B4: .align 2, 0 _023288BC: .word 0x00000DB8 _023288C0: .word 0x00000DB7 - arm_func_end ov29_02328794 + arm_func_end DoMoveSketch - arm_func_start ov29_023288C4 -ov29_023288C4: ; 0x023288C4 + arm_func_start DoMoveHeadbutt +DoMoveHeadbutt: ; 0x023288C4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -690,10 +690,10 @@ _02328920: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232892C: .word 0x022C4498 - arm_func_end ov29_023288C4 + arm_func_end DoMoveHeadbutt - arm_func_start ov29_02328930 -ov29_02328930: ; 0x02328930 + arm_func_start DoMoveDoubleEdge +DoMoveDoubleEdge: ; 0x02328930 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x18 str r3, [sp] @@ -707,7 +707,7 @@ ov29_02328930: ; 0x02328930 mov r0, r6 mov r1, #7 mov r4, #1 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _023289E8 mov r0, r6 @@ -746,10 +746,10 @@ _023289E8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023289F4: .word 0x000003E7 - arm_func_end ov29_02328930 + arm_func_end DoMoveDoubleEdge - arm_func_start ov29_023289F8 -ov29_023289F8: ; 0x023289F8 + arm_func_start DoMoveSandstorm +DoMoveSandstorm: ; 0x023289F8 stmdb sp!, {r3, r4, r5, lr} ldr r3, _02328A48 ; =0x022C4654 ldr r2, _02328A4C ; =0x02353538 @@ -761,7 +761,7 @@ ov29_023289F8: ; 0x023289F8 mov r0, #1 mov r1, #0 strh r3, [r2, #0x3e] - bl ov29_023354C4 + bl TryActivateWeather cmp r0, #0 bne _02328A40 ldr r2, _02328A50 ; =0x00000EC6 @@ -775,10 +775,10 @@ _02328A40: _02328A48: .word 0x022C4654 _02328A4C: .word 0x02353538 _02328A50: .word 0x00000EC6 - arm_func_end ov29_023289F8 + arm_func_end DoMoveSandstorm - arm_func_start ov29_02328A54 -ov29_02328A54: ; 0x02328A54 + arm_func_start DoMoveLowerAccuracy1 +DoMoveLowerAccuracy1: ; 0x02328A54 stmdb sp!, {r3, lr} ldr r2, _02328A70 ; =0x02352AEC mov r3, #1 @@ -788,10 +788,10 @@ ov29_02328A54: ; 0x02328A54 ldmia sp!, {r3, pc} .align 2, 0 _02328A70: .word 0x02352AEC - arm_func_end ov29_02328A54 + arm_func_end DoMoveLowerAccuracy1 - arm_func_start ov29_02328A74 -ov29_02328A74: ; 0x02328A74 + arm_func_start DoMoveDamagePoison40 +DoMoveDamagePoison40: ; 0x02328A74 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -821,10 +821,10 @@ _02328AD0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328ADC: .word 0x022C451C - arm_func_end ov29_02328A74 + arm_func_end DoMoveDamagePoison40 - arm_func_start ov29_02328AE0 -ov29_02328AE0: ; 0x02328AE0 + arm_func_start DoMoveGrowth +DoMoveGrowth: ; 0x02328AE0 stmdb sp!, {r3, lr} ldr r2, _02328AFC ; =0x02352AE8 mov r3, #1 @@ -834,10 +834,10 @@ ov29_02328AE0: ; 0x02328AE0 ldmia sp!, {r3, pc} .align 2, 0 _02328AFC: .word 0x02352AE8 - arm_func_end ov29_02328AE0 + arm_func_end DoMoveGrowth - arm_func_start ov29_02328B00 -ov29_02328B00: ; 0x02328B00 + arm_func_start DoMoveSacredFire +DoMoveSacredFire: ; 0x02328B00 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -845,7 +845,7 @@ ov29_02328B00: ; 0x02328B00 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r8 mov r1, r7 mov r2, r6 @@ -874,10 +874,10 @@ _02328B78: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02328B84: .word 0x022C44A0 - arm_func_end ov29_02328B00 + arm_func_end DoMoveSacredFire - arm_func_start ov29_02328B88 -ov29_02328B88: ; 0x02328B88 + arm_func_start DoMoveOhko +DoMoveOhko: ; 0x02328B88 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r7, r2 @@ -891,7 +891,7 @@ ov29_02328B88: ; 0x02328B88 mov r4, r0 mov r0, sb mov r1, #0x57 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r2, r4 mov r3, r0 mov r0, sb @@ -914,7 +914,7 @@ _02328BF4: mov r4, r0 mov r0, r7 mov r1, r6 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r5} str r4, [sp, #8] @@ -940,10 +940,10 @@ _02328C64: .align 2, 0 _02328C6C: .word 0x00000ED7 _02328C70: .word 0x0000270F - arm_func_end ov29_02328B88 + arm_func_end DoMoveOhko - arm_func_start ov29_02328C74 -ov29_02328C74: ; 0x02328C74 + arm_func_start DoMoveSolarBeam +DoMoveSolarBeam: ; 0x02328C74 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r7, r0 @@ -957,7 +957,7 @@ ov29_02328C74: ; 0x02328C74 beq _02328CAC mov r0, r7 mov r1, r5 - bl ov29_023245A4 + bl IsChargingTwoTurnMove _02328CAC: cmp r0, #0 beq _02328D0C @@ -1002,10 +1002,10 @@ _02328D30: .align 2, 0 _02328D3C: .word 0x022C48A4 _02328D40: .word 0x00000CD2 - arm_func_end ov29_02328C74 + arm_func_end DoMoveSolarBeam - arm_func_start ov29_02328D44 -ov29_02328D44: ; 0x02328D44 + arm_func_start DoMoveSonicBoom +DoMoveSonicBoom: ; 0x02328D44 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x20 mov r5, #0 @@ -1022,7 +1022,7 @@ ov29_02328D44: ; 0x02328D44 mov r1, r5 mov r5, r0 mov r0, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r6} str r5, [sp, #8] @@ -1047,17 +1047,17 @@ ov29_02328D44: ; 0x02328D44 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02328DE0: .word 0x022C4568 - arm_func_end ov29_02328D44 + arm_func_end DoMoveSonicBoom - arm_func_start ov29_02328DE4 -ov29_02328DE4: ; 0x02328DE4 + arm_func_start DoMoveFly +DoMoveFly: ; 0x02328DE4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r1, r5 mov r7, r0 mov r4, r3 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02328E40 ldr r1, _02328E6C ; =0x022C48C0 @@ -1090,10 +1090,10 @@ _02328E64: .align 2, 0 _02328E6C: .word 0x022C48C0 _02328E70: .word 0x00000CD3 - arm_func_end ov29_02328DE4 + arm_func_end DoMoveFly - arm_func_start ov29_02328E74 -ov29_02328E74: ; 0x02328E74 + arm_func_start DoMoveExplosion +DoMoveExplosion: ; 0x02328E74 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r6, r2 @@ -1105,21 +1105,21 @@ ov29_02328E74: ; 0x02328E74 mov r4, r0 mov r0, r6 mov r1, r5 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r4, [sp] str r0, [sp, #4] mov r0, r8 mov r1, r7 add r2, r7, #4 mov r3, #2 - bl ov29_02320448 + bl TryExplosion mov r0, #1 add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end ov29_02328E74 + arm_func_end DoMoveExplosion - arm_func_start ov29_02328ECC -ov29_02328ECC: ; 0x02328ECC + arm_func_start DoMoveDive +DoMoveDive: ; 0x02328ECC stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1139,7 +1139,7 @@ ov29_02328ECC: ; 0x02328ECC _02328F0C: mov r0, r8 mov r1, r6 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02328F58 ldr r1, _02328F8C ; =0x022C47E8 @@ -1174,10 +1174,10 @@ _02328F7C: _02328F88: .word 0x00000ED8 _02328F8C: .word 0x022C47E8 _02328F90: .word 0x00000CD5 - arm_func_end ov29_02328ECC + arm_func_end DoMoveDive - arm_func_start ov29_02328F94 -ov29_02328F94: ; 0x02328F94 + arm_func_start DoMoveWaterfall +DoMoveWaterfall: ; 0x02328F94 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1207,10 +1207,10 @@ _02328FF0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328FFC: .word 0x022C4424 - arm_func_end ov29_02328F94 + arm_func_end DoMoveWaterfall - arm_func_start ov29_02329000 -ov29_02329000: ; 0x02329000 + arm_func_start DoMoveDamageLowerAccuracy40 +DoMoveDamageLowerAccuracy40: ; 0x02329000 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1242,14 +1242,14 @@ _02329060: .align 2, 0 _0232906C: .word 0x022C4484 _02329070: .word 0x02352AEC - arm_func_end ov29_02329000 + arm_func_end DoMoveDamageLowerAccuracy40 - arm_func_start ov29_02329074 -ov29_02329074: ; 0x02329074 + arm_func_start DoMoveStockpile +DoMoveStockpile: ; 0x02329074 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl ov29_023164D8 + bl TryInflictStockpileStatus cmp r0, #0 beq _023290BC ldr r1, _023290C4 ; =0x02352AEC @@ -1270,10 +1270,10 @@ _023290BC: .align 2, 0 _023290C4: .word 0x02352AEC _023290C8: .word 0x02352AE8 - arm_func_end ov29_02329074 + arm_func_end DoMoveStockpile - arm_func_start ov29_023290CC -ov29_023290CC: ; 0x023290CC + arm_func_start DoMoveTwister +DoMoveTwister: ; 0x023290CC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r4, r1 @@ -1312,10 +1312,10 @@ _0232914C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02329158: .word 0x022C4668 - arm_func_end ov29_023290CC + arm_func_end DoMoveTwister - arm_func_start ov29_0232915C -ov29_0232915C: ; 0x0232915C + arm_func_start DoMoveTwineedle +DoMoveTwineedle: ; 0x0232915C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1356,10 +1356,10 @@ _023291DC: _023291E8: .word 0x0237CA6B _023291EC: .word 0x0237CA78 _023291F0: .word 0x022C4444 - arm_func_end ov29_0232915C + arm_func_end DoMoveTwineedle - arm_func_start ov29_023291F4 -ov29_023291F4: ; 0x023291F4 + arm_func_start DoMoveRecoverHpTeam +DoMoveRecoverHpTeam: ; 0x023291F4 stmdb sp!, {r3, lr} ldr r3, [r1, #0xb4] ldr r2, _02329238 ; =0x000003E7 @@ -1379,10 +1379,10 @@ ov29_023291F4: ; 0x023291F4 ldmia sp!, {r3, pc} .align 2, 0 _02329238: .word 0x000003E7 - arm_func_end ov29_023291F4 + arm_func_end DoMoveRecoverHpTeam - arm_func_start ov29_0232923C -ov29_0232923C: ; 0x0232923C + arm_func_start DoMoveMinimize +DoMoveMinimize: ; 0x0232923C stmdb sp!, {r3, lr} ldr r2, _02329254 ; =0x02352AE8 ldr r2, [r2] @@ -1391,10 +1391,10 @@ ov29_0232923C: ; 0x0232923C ldmia sp!, {r3, pc} .align 2, 0 _02329254: .word 0x02352AE8 - arm_func_end ov29_0232923C + arm_func_end DoMoveMinimize - arm_func_start ov29_02329258 -ov29_02329258: ; 0x02329258 + arm_func_start DoMoveSeismicToss +DoMoveSeismicToss: ; 0x02329258 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x20 mov r4, #0 @@ -1466,7 +1466,7 @@ _02329350: mov r7, r0 mov r1, sl mov r0, r4 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r8} str r7, [sp, #8] @@ -1490,29 +1490,29 @@ _02329350: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _023293C8: .word 0x00000221 - arm_func_end ov29_02329258 + arm_func_end DoMoveSeismicToss - arm_func_start ov29_023293CC -ov29_023293CC: ; 0x023293CC + arm_func_start DoMoveConfuse +DoMoveConfuse: ; 0x023293CC stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictConfusedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_023293CC + arm_func_end DoMoveConfuse - arm_func_start ov29_023293E4 -ov29_023293E4: ; 0x023293E4 + arm_func_start DoMoveTaunt +DoMoveTaunt: ; 0x023293E4 stmdb sp!, {r3, lr} mov r2, #0 - bl ov29_023163A8 + bl TryInflictTauntStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_023293E4 + arm_func_end DoMoveTaunt - arm_func_start ov29_023293F8 -ov29_023293F8: ; 0x023293F8 + arm_func_start DoMoveMoonlight +DoMoveMoonlight: ; 0x023293F8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -1530,10 +1530,10 @@ ov29_023293F8: ; 0x023293F8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02329434: .word 0x022C4974 - arm_func_end ov29_023293F8 + arm_func_end DoMoveMoonlight - arm_func_start ov29_02329438 -ov29_02329438: ; 0x02329438 + arm_func_start DoMoveHornDrill +DoMoveHornDrill: ; 0x02329438 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r7, r2 @@ -1547,7 +1547,7 @@ ov29_02329438: ; 0x02329438 mov r4, r0 mov r0, sb mov r1, #0x57 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer mov r2, r4 mov r3, r0 mov r0, sb @@ -1570,7 +1570,7 @@ _023294A4: mov r4, r0 mov r0, r7 mov r1, r6 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r2, sp, #0x1c stmia sp, {r2, r5} str r4, [sp, #8] @@ -1600,10 +1600,10 @@ _02329524: .align 2, 0 _0232952C: .word 0x00000ED9 _02329530: .word 0x0000270F - arm_func_end ov29_02329438 + arm_func_end DoMoveHornDrill - arm_func_start ov29_02329534 -ov29_02329534: ; 0x02329534 + arm_func_start DoMoveSwordsDance +DoMoveSwordsDance: ; 0x02329534 stmdb sp!, {r3, lr} ldr r2, _02329550 ; =0x02352AEC mov r3, #2 @@ -1613,10 +1613,10 @@ ov29_02329534: ; 0x02329534 ldmia sp!, {r3, pc} .align 2, 0 _02329550: .word 0x02352AEC - arm_func_end ov29_02329534 + arm_func_end DoMoveSwordsDance - arm_func_start ov29_02329554 -ov29_02329554: ; 0x02329554 + arm_func_start DoMoveConversion +DoMoveConversion: ; 0x02329554 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov sb, r1 @@ -1625,7 +1625,7 @@ ov29_02329554: ; 0x02329554 mov r1, #0x25 ldr r7, [sb, #0xb4] mov r8, #0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02329598 ldr r2, _02329658 ; =0x00000DC3 @@ -1691,18 +1691,18 @@ _02329650: _02329658: .word 0x00000DC3 _0232965C: .word 0x00000DB6 _02329660: .word 0x00000DB5 - arm_func_end ov29_02329554 + arm_func_end DoMoveConversion - arm_func_start ov29_02329664 -ov29_02329664: ; 0x02329664 + arm_func_start DoMoveConversion2 +DoMoveConversion2: ; 0x02329664 stmdb sp!, {r3, lr} - bl ov29_023194B8 + bl TryInflictConversion2Status mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02329664 + arm_func_end DoMoveConversion2 - arm_func_start ov29_02329674 -ov29_02329674: ; 0x02329674 + arm_func_start DoMoveHelpingHand +DoMoveHelpingHand: ; 0x02329674 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -1731,10 +1731,10 @@ _023296C4: _023296CC: .word 0x00000EDA _023296D0: .word 0x02352AEC _023296D4: .word 0x02352AE8 - arm_func_end ov29_02329674 + arm_func_end DoMoveHelpingHand - arm_func_start ov29_023296D8 -ov29_023296D8: ; 0x023296D8 + arm_func_start DoMoveBoostDefense2 +DoMoveBoostDefense2: ; 0x023296D8 stmdb sp!, {r3, lr} ldr r2, _023296F4 ; =0x02352AEC mov r3, #2 @@ -1744,20 +1744,20 @@ ov29_023296D8: ; 0x023296D8 ldmia sp!, {r3, pc} .align 2, 0 _023296F4: .word 0x02352AEC - arm_func_end ov29_023296D8 + arm_func_end DoMoveBoostDefense2 - arm_func_start ov29_023296F8 -ov29_023296F8: ; 0x023296F8 + arm_func_start DoMoveWarp +DoMoveWarp: ; 0x023296F8 stmdb sp!, {r3, lr} mov r2, #0 mov r3, r2 bl TryWarp mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_023296F8 + arm_func_end DoMoveWarp - arm_func_start ov29_02329710 -ov29_02329710: ; 0x02329710 + arm_func_start DoMoveThundershock +DoMoveThundershock: ; 0x02329710 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1787,10 +1787,10 @@ _0232976C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02329778: .word 0x022C4490 - arm_func_end ov29_02329710 + arm_func_end DoMoveThundershock - arm_func_start ov29_0232977C -ov29_0232977C: ; 0x0232977C + arm_func_start DoMoveThunderWave +DoMoveThunderWave: ; 0x0232977C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 @@ -1806,11 +1806,11 @@ ov29_0232977C: ; 0x0232977C mov r1, r6 mov r2, #0x66 mov r3, #1 - bl DefenderAbilityIsActive__02328634 + bl DefenderAbilityIsActiveMoveEffects__02328634 cmp r0, #0 beq _023297D4 mov r0, r6 - bl ov29_0231B060 + bl ActivateMotorDrive mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} _023297D4: @@ -1821,10 +1821,10 @@ _023297D4: bl TryInflictParalysisStatus mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_0232977C + arm_func_end DoMoveThunderWave - arm_func_start ov29_023297F0 -ov29_023297F0: ; 0x023297F0 + arm_func_start DoMoveZapCannon +DoMoveZapCannon: ; 0x023297F0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1851,39 +1851,39 @@ _02329848: mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_023297F0 + arm_func_end DoMoveZapCannon - arm_func_start ov29_02329854 -ov29_02329854: ; 0x02329854 + arm_func_start DoMoveBlock +DoMoveBlock: ; 0x02329854 stmdb sp!, {r3, lr} mov r2, #0 bl TryInflictShadowHoldStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02329854 + arm_func_end DoMoveBlock - arm_func_start ov29_02329868 -ov29_02329868: ; 0x02329868 + arm_func_start DoMovePoison +DoMovePoison: ; 0x02329868 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictPoisonedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02329868 + arm_func_end DoMovePoison - arm_func_start ov29_02329880 -ov29_02329880: ; 0x02329880 + arm_func_start DoMoveToxic +DoMoveToxic: ; 0x02329880 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictBadlyPoisonedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02329880 + arm_func_end DoMoveToxic - arm_func_start ov29_02329898 -ov29_02329898: ; 0x02329898 + arm_func_start DoMovePoisonFang +DoMovePoisonFang: ; 0x02329898 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1913,10 +1913,10 @@ _023298F4: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02329900: .word 0x022C4644 - arm_func_end ov29_02329898 + arm_func_end DoMovePoisonFang - arm_func_start ov29_02329904 -ov29_02329904: ; 0x02329904 + arm_func_start DoMoveDamagePoison18 +DoMoveDamagePoison18: ; 0x02329904 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1946,10 +1946,10 @@ _02329960: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232996C: .word 0x022C463C - arm_func_end ov29_02329904 + arm_func_end DoMoveDamagePoison18 - arm_func_start ov29_02329970 -ov29_02329970: ; 0x02329970 + arm_func_start DoMoveJumpKick +DoMoveJumpKick: ; 0x02329970 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x30 ldrb r4, [sp, #0x50] @@ -2028,10 +2028,10 @@ _02329A88: .align 2, 0 _02329A94: .word 0x00000EDB _02329A98: .word 0x00000236 - arm_func_end ov29_02329970 + arm_func_end DoMoveJumpKick - arm_func_start ov29_02329A9C -ov29_02329A9C: ; 0x02329A9C + arm_func_start DoMoveBounce +DoMoveBounce: ; 0x02329A9C stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r6, r2 @@ -2040,7 +2040,7 @@ ov29_02329A9C: ; 0x02329A9C mov r8, r0 mov r5, r3 mov r4, #0 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _02329B2C ldr r1, _02329B5C ; =0x022C47EC @@ -2087,10 +2087,10 @@ _02329B50: _02329B5C: .word 0x022C47EC _02329B60: .word 0x022C4494 _02329B64: .word 0x00000CD4 - arm_func_end ov29_02329A9C + arm_func_end DoMoveBounce - arm_func_start ov29_02329B68 -ov29_02329B68: ; 0x02329B68 + arm_func_start DoMoveHiJumpKick +DoMoveHiJumpKick: ; 0x02329B68 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x30 ldrb r4, [sp, #0x50] @@ -2169,10 +2169,10 @@ _02329C80: .align 2, 0 _02329C8C: .word 0x00000EDB _02329C90: .word 0x00000237 - arm_func_end ov29_02329B68 + arm_func_end DoMoveHiJumpKick - arm_func_start ov29_02329C94 -ov29_02329C94: ; 0x02329C94 + arm_func_start DoMoveTriAttack +DoMoveTriAttack: ; 0x02329C94 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2225,10 +2225,10 @@ _02329D40: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02329D4C: .word 0x022C4694 - arm_func_end ov29_02329C94 + arm_func_end DoMoveTriAttack - arm_func_start ov29_02329D50 -ov29_02329D50: ; 0x02329D50 + arm_func_start DoMoveSwapItems +DoMoveSwapItems: ; 0x02329D50 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r7, r0 @@ -2248,7 +2248,7 @@ ov29_02329D50: ; 0x02329D50 mov r1, r6 mov r2, #0x2c mov r3, #1 - bl DefenderAbilityIsActive__02329F14 + bl DefenderAbilityIsActiveMoveEffects__02329F14 cmp r0, #0 beq _02329DC0 ldr r2, _02329F08 ; =0x00000EDE @@ -2301,7 +2301,7 @@ _02329E3C: cmp r0, #0 bne _02329E68 mov r0, r4 - bl ov29_02346F14 + bl AddHeldItemToBag _02329E68: ldrb r0, [r5, #6] cmp r0, #0 @@ -2319,9 +2319,9 @@ _02329E7C: cmp r0, #0 bne _02329EA8 mov r0, r5 - bl ov29_02346F14 + bl AddHeldItemToBag _02329EA8: - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldrb r0, [r4, #6] cmp r0, #0 movne r0, #0 @@ -2350,10 +2350,10 @@ _02329F00: _02329F08: .word 0x00000EDE _02329F0C: .word 0x00000EDD _02329F10: .word 0x00000EDC - arm_func_end ov29_02329D50 + arm_func_end DoMoveSwapItems - arm_func_start DefenderAbilityIsActive__02329F14 -DefenderAbilityIsActive__02329F14: ; 0x02329F14 + arm_func_start DefenderAbilityIsActiveMoveEffects__02329F14 +DefenderAbilityIsActiveMoveEffects__02329F14: ; 0x02329F14 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 @@ -2372,19 +2372,19 @@ _02329F48: cmpne r3, #0 beq _02329F68 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _02329F68: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} - arm_func_end DefenderAbilityIsActive__02329F14 + arm_func_end DefenderAbilityIsActiveMoveEffects__02329F14 - arm_func_start ov29_02329F78 -ov29_02329F78: ; 0x02329F78 + arm_func_start DoMoveTripleKick +DoMoveTripleKick: ; 0x02329F78 stmdb sp!, {r3, lr} ldr ip, _02329FB0 ; =0x0237CA7C ldr lr, [ip] @@ -2401,27 +2401,27 @@ ov29_02329F78: ; 0x02329F78 ldmia sp!, {r3, pc} .align 2, 0 _02329FB0: .word 0x0237CA7C - arm_func_end ov29_02329F78 + arm_func_end DoMoveTripleKick - arm_func_start ov29_02329FB4 -ov29_02329FB4: ; 0x02329FB4 + arm_func_start DoMoveSport +DoMoveSport: ; 0x02329FB4 stmdb sp!, {r3, lr} ldrh r0, [r2, #4] cmp r0, #0xd4 bne _02329FD0 mov r0, #0 - bl ov29_0233544C + bl ActivateSportCondition b _02329FD8 _02329FD0: mov r0, #1 - bl ov29_0233544C + bl ActivateSportCondition _02329FD8: mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_02329FB4 + arm_func_end DoMoveSport - arm_func_start ov29_02329FE0 -ov29_02329FE0: ; 0x02329FE0 + arm_func_start DoMoveMudSlap +DoMoveMudSlap: ; 0x02329FE0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2451,18 +2451,18 @@ _0232A03C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232A048: .word 0x02352AEC - arm_func_end ov29_02329FE0 + arm_func_end DoMoveMudSlap - arm_func_start ov29_0232A04C -ov29_0232A04C: ; 0x0232A04C - ldr ip, _0232A054 ; =ov29_0232C310 + arm_func_start DoMoveDamageStealItem +DoMoveDamageStealItem: ; 0x0232A04C + ldr ip, _0232A054 ; =DoMoveTakeaway bx ip .align 2, 0 -_0232A054: .word ov29_0232C310 - arm_func_end ov29_0232A04C +_0232A054: .word DoMoveTakeaway + arm_func_end DoMoveDamageStealItem - arm_func_start ov29_0232A058 -ov29_0232A058: ; 0x0232A058 + arm_func_start DoMoveAmnesia +DoMoveAmnesia: ; 0x0232A058 stmdb sp!, {r3, lr} ldr r2, _0232A074 ; =0x02352AE8 mov r3, #2 @@ -2472,10 +2472,10 @@ ov29_0232A058: ; 0x0232A058 ldmia sp!, {r3, pc} .align 2, 0 _0232A074: .word 0x02352AE8 - arm_func_end ov29_0232A058 + arm_func_end DoMoveAmnesia - arm_func_start ov01_0232A078 -ov01_0232A078: ; 0x0232A078 + arm_func_start DoMoveNightShade +DoMoveNightShade: ; 0x0232A078 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r4, #0 @@ -2494,7 +2494,7 @@ ov01_0232A078: ; 0x0232A078 mov r1, r7 mov r7, r0 mov r0, r4 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r8} str r7, [sp, #8] @@ -2516,10 +2516,10 @@ ov01_0232A078: ; 0x0232A078 and r0, r0, #0xff add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov01_0232A078 + arm_func_end DoMoveNightShade - arm_func_start ov29_0232A118 -ov29_0232A118: ; 0x0232A118 + arm_func_start DoMoveGrowl +DoMoveGrowl: ; 0x0232A118 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _0232A144 ; =0x02352AEC @@ -2533,10 +2533,10 @@ ov29_0232A118: ; 0x0232A118 ldmia sp!, {r3, pc} .align 2, 0 _0232A144: .word 0x02352AEC - arm_func_end ov29_0232A118 + arm_func_end DoMoveGrowl - arm_func_start ov29_0232A148 -ov29_0232A148: ; 0x0232A148 + arm_func_start DoMoveSurf +DoMoveSurf: ; 0x0232A148 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr ip, [r1, #0xb4] @@ -2553,10 +2553,10 @@ ov29_0232A148: ; 0x0232A148 mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, pc} - arm_func_end ov29_0232A148 + arm_func_end DoMoveSurf - arm_func_start ov29_0232A188 -ov29_0232A188: ; 0x0232A188 + arm_func_start DoMoveRolePlay +DoMoveRolePlay: ; 0x0232A188 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r0 mov r5, r1 @@ -2564,7 +2564,7 @@ ov29_0232A188: ; 0x0232A188 mov r3, #1 ldr r4, [r6, #0xb4] ldr r7, [r5, #0xb4] - bl DefenderAbilityIsActive__02329F14 + bl DefenderAbilityIsActiveMoveEffects__02329F14 cmp r0, #0 beq _0232A1C8 ldr r2, _0232A218 ; =0x00000EE1 @@ -2591,16 +2591,16 @@ _0232A1C8: bl LogMessageByIdWithPopupCheckUserTarget mov r0, r6 mov r1, r6 - bl ov29_022FA7DC + bl TryEndStatusWithAbility mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232A218: .word 0x00000EE1 _0232A21C: .word 0x02353538 - arm_func_end ov29_0232A188 + arm_func_end DoMoveRolePlay - arm_func_start ov29_0232A220 -ov29_0232A220: ; 0x0232A220 + arm_func_start DoMoveSunnyDay +DoMoveSunnyDay: ; 0x0232A220 stmdb sp!, {r3, r4, r5, lr} ldr r3, _0232A270 ; =0x022C4654 ldr r2, _0232A274 ; =0x02353538 @@ -2612,7 +2612,7 @@ ov29_0232A220: ; 0x0232A220 mov r0, #1 mov r1, #0 strh r3, [r2, #0x3c] - bl ov29_023354C4 + bl TryActivateWeather cmp r0, #0 bne _0232A268 ldr r2, _0232A278 ; =0x00000EC7 @@ -2626,10 +2626,10 @@ _0232A268: _0232A270: .word 0x022C4654 _0232A274: .word 0x02353538 _0232A278: .word 0x00000EC7 - arm_func_end ov29_0232A220 + arm_func_end DoMoveSunnyDay - arm_func_start ov29_0232A27C -ov29_0232A27C: ; 0x0232A27C + arm_func_start DoMoveLowerDefense1 +DoMoveLowerDefense1: ; 0x0232A27C stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _0232A2A8 ; =0x02352AEC @@ -2643,18 +2643,18 @@ ov29_0232A27C: ; 0x0232A27C ldmia sp!, {r3, pc} .align 2, 0 _0232A2A8: .word 0x02352AEC - arm_func_end ov29_0232A27C + arm_func_end DoMoveLowerDefense1 - arm_func_start ov29_0232A2AC -ov29_0232A2AC: ; 0x0232A2AC + arm_func_start DoMoveWish +DoMoveWish: ; 0x0232A2AC stmdb sp!, {r3, lr} - bl ov29_02318FAC + bl TryInflictWishStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232A2AC + arm_func_end DoMoveWish - arm_func_start ov29_0232A2BC -ov29_0232A2BC: ; 0x0232A2BC + arm_func_start DoMoveFakeOut +DoMoveFakeOut: ; 0x0232A2BC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -2684,10 +2684,10 @@ _0232A318: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232A324: .word 0x022C4670 - arm_func_end ov29_0232A2BC + arm_func_end DoMoveFakeOut - arm_func_start ov29_0232A328 -ov29_0232A328: ; 0x0232A328 + arm_func_start DoMoveSleepTalk +DoMoveSleepTalk: ; 0x0232A328 stmdb sp!, {r3, lr} ldr r2, _0232A33C ; =0x00000EE2 bl LogMessageByIdWithPopupCheckUserTarget @@ -2695,10 +2695,10 @@ ov29_0232A328: ; 0x0232A328 ldmia sp!, {r3, pc} .align 2, 0 _0232A33C: .word 0x00000EE2 - arm_func_end ov29_0232A328 + arm_func_end DoMoveSleepTalk - arm_func_start ov29_0232A340 -ov29_0232A340: ; 0x0232A340 + arm_func_start DoMovePayDay +DoMovePayDay: ; 0x0232A340 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x10 str r3, [sp] @@ -2716,7 +2716,7 @@ ov29_0232A340: ; 0x0232A340 cmp r0, #0 beq _0232A3C8 mov r0, r5 - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 bne _0232A3C8 ldr r3, _0232A3D4 ; =0x02352B18 @@ -2727,7 +2727,7 @@ ov29_0232A340: ; 0x0232A340 strh ip, [sp, #4] ldrh r3, [r3, #2] strh r3, [sp, #6] - bl ov29_02344BD0 + bl GenerateStandardItem add r2, sp, #8 add r3, sp, #4 mov r0, r6 @@ -2739,4 +2739,4 @@ _0232A3C8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0232A3D4: .word 0x02352B18 - arm_func_end ov29_0232A340 + arm_func_end DoMovePayDay diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index ba05db8a..e939482a 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0232A3FC -ov29_0232A3FC: ; 0x0232A3FC + arm_func_start DoMoveAssist +DoMoveAssist: ; 0x0232A3FC stmdb sp!, {r3, lr} ldr r2, _0232A410 ; =0x00000EE3 bl LogMessageByIdWithPopupCheckUserTarget @@ -12,10 +12,10 @@ ov29_0232A3FC: ; 0x0232A3FC ldmia sp!, {r3, pc} .align 2, 0 _0232A410: .word 0x00000EE3 - arm_func_end ov29_0232A3FC + arm_func_end DoMoveAssist - arm_func_start ov29_0232A414 -ov29_0232A414: ; 0x0232A414 + arm_func_start DoMoveRest +DoMoveRest: ; 0x0232A414 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 ldr r1, [r4, #0xb4] @@ -46,18 +46,18 @@ _0232A474: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232A47C: .word 0x022C4748 - arm_func_end ov29_0232A414 + arm_func_end DoMoveRest - arm_func_start ov29_0232A480 -ov29_0232A480: ; 0x0232A480 + arm_func_start DoMoveIngrain +DoMoveIngrain: ; 0x0232A480 stmdb sp!, {r3, lr} bl TryInflictIngrainStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232A480 + arm_func_end DoMoveIngrain - arm_func_start ov29_0232A490 -ov29_0232A490: ; 0x0232A490 + arm_func_start DoMoveSwallow +DoMoveSwallow: ; 0x0232A490 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr r4, [r1, #0xb4] @@ -83,20 +83,20 @@ _0232A4D4: .align 2, 0 _0232A4E0: .word 0x022C49D4 _0232A4E4: .word 0x00000EE4 - arm_func_end ov29_0232A490 + arm_func_end DoMoveSwallow - arm_func_start ov29_0232A4E8 -ov29_0232A4E8: ; 0x0232A4E8 + arm_func_start DoMoveCurse +DoMoveCurse: ; 0x0232A4E8 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 - bl ov29_023160DC + bl TryInflictCurseStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232A4E8 + arm_func_end DoMoveCurse - arm_func_start ov29_0232A500 -ov29_0232A500: ; 0x0232A500 + arm_func_start DoMoveDamage__0232A500 +DoMoveDamage__0232A500: ; 0x0232A500 stmdb sp!, {r3, lr} str r3, [sp] mov r3, #0x100 @@ -106,10 +106,10 @@ ov29_0232A500: ; 0x0232A500 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_0232A500 + arm_func_end DoMoveDamage__0232A500 - arm_func_start ov29_0232A524 -ov29_0232A524: ; 0x0232A524 + arm_func_start DoMoveSuperpower +DoMoveSuperpower: ; 0x0232A524 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc str r3, [sp] @@ -146,10 +146,10 @@ _0232A59C: ldmia sp!, {r4, r5, pc} .align 2, 0 _0232A5A8: .word 0x02352AEC - arm_func_end ov29_0232A524 + arm_func_end DoMoveSuperpower - arm_func_start ov29_0232A5AC -ov29_0232A5AC: ; 0x0232A5AC + arm_func_start DoMoveSteelWing +DoMoveSteelWing: ; 0x0232A5AC stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 @@ -189,10 +189,10 @@ _0232A628: bx lr .align 2, 0 _0232A63C: .word 0x022C44C4 - arm_func_end ov29_0232A5AC + arm_func_end DoMoveSteelWing - arm_func_start ov29_0232A640 -ov29_0232A640: ; 0x0232A640 + arm_func_start DoMoveSpitUp +DoMoveSpitUp: ; 0x0232A640 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr r4, [r0, #0xb4] @@ -214,10 +214,10 @@ _0232A678: ldmia sp!, {r3, r4, pc} .align 2, 0 _0232A684: .word 0x00000EE5 - arm_func_end ov29_0232A640 + arm_func_end DoMoveSpitUp - arm_func_start ov29_0232A688 -ov29_0232A688: ; 0x0232A688 + arm_func_start DoMoveDynamicPunch +DoMoveDynamicPunch: ; 0x0232A688 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -244,10 +244,10 @@ _0232A6E0: mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_0232A688 + arm_func_end DoMoveDynamicPunch - arm_func_start ov29_0232A6EC -ov29_0232A6EC: ; 0x0232A6EC + arm_func_start DoMoveKnockOff +DoMoveKnockOff: ; 0x0232A6EC stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0xc mov r7, r0 @@ -266,7 +266,7 @@ ov29_0232A6EC: ; 0x0232A6EC mov r1, r6 mov r2, #0x2c mov r3, #1 - bl DefenderAbilityIsActive__02329F14 + bl DefenderAbilityIsActiveMoveEffects__02329F14 cmp r0, #0 beq _0232A758 ldr r2, _0232A820 ; =0x00000EE6 @@ -335,7 +335,7 @@ _0232A824: .word 0x00000EE8 _0232A828: .word 0x00000EE7 _0232A82C: .word 0x0235171C _0232A830: .word 0x0235171E - arm_func_end ov29_0232A6EC + arm_func_end DoMoveKnockOff arm_func_start ov29_0232A834 ov29_0232A834: ; 0x0232A834 @@ -382,13 +382,13 @@ ov29_0232A834: ; 0x0232A834 mov r2, r4 add r1, sp, #8 mov r3, #1 - bl ov29_02345AD8 + bl SpawnDroppedItem add sp, sp, #0xc0 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_0232A834 - arm_func_start ov29_0232A8EC -ov29_0232A8EC: ; 0x0232A8EC + arm_func_start DoMoveSplash +DoMoveSplash: ; 0x0232A8EC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x28 mov sb, r1 @@ -453,7 +453,7 @@ _0232A9B8: add r0, r0, #0xc rsb r0, r1, r0, lsl #8 mov r1, #0xc - bl DivideInt + bl __divsi3 ldrsh r3, [sp, #0x26] mov r1, #0x18 ldr r2, [sb, #0x10] @@ -462,7 +462,7 @@ _0232A9B8: mov r5, r0 rsb r0, r2, r1, lsl #8 mov r1, #0xc - bl DivideInt + bl __divsi3 mov r4, r0 add r0, sb, #4 bl ov29_022E2CA0 @@ -500,12 +500,12 @@ _0232AA4C: bl InitMove add r1, sp, #0x1c mov r0, r6 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 bne _0232AAD8 mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper mov r3, #0 str r3, [sp] ldr r1, _0232AC40 ; =0x022C44B4 @@ -527,7 +527,7 @@ _0232AAD8: movne r0, #1 bne _0232AC30 mov r0, sl - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 moveq r0, #1 beq _0232AC30 @@ -551,13 +551,13 @@ _0232AAD8: movne r0, #1 bne _0232AC30 mov r0, sl - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 moveq r0, #1 beq _0232AC30 _0232AB5C: mov r0, sb - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 moveq r0, #1 beq _0232AC30 @@ -590,19 +590,19 @@ _0232ABC8: ldrsh r2, [sp, #0x26] mov r0, sb mov r3, #0 - bl ov29_022F85F0 + bl MoveMonsterToPos _0232ABDC: mov r0, sb - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 moveq r0, #1 beq _0232AC30 mov r0, sb mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, sb mov r1, #0xe - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0232AC24 mov r0, sb @@ -621,18 +621,18 @@ _0232AC30: _0232AC38: .word 0x00000EEA _0232AC3C: .word 0x00000163 _0232AC40: .word 0x022C44B4 - arm_func_end ov29_0232A8EC + arm_func_end DoMoveSplash - arm_func_start ov29_0232AC44 -ov29_0232AC44: ; 0x0232AC44 + arm_func_start DoMoveSetDamage +DoMoveSetDamage: ; 0x0232AC44 stmdb sp!, {r3, lr} - bl ov29_02315CE8 + bl TryInflictSetDamageStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232AC44 + arm_func_end DoMoveSetDamage - arm_func_start ov29_0232AC54 -ov29_0232AC54: ; 0x0232AC54 + arm_func_start DoMoveBellyDrum +DoMoveBellyDrum: ; 0x0232AC54 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 ldr r5, [r7, #0xb4] @@ -681,18 +681,18 @@ _0232ACF8: .align 2, 0 _0232AD00: .word 0x02352AEC _0232AD04: .word 0x00000EEB - arm_func_end ov29_0232AC54 + arm_func_end DoMoveBellyDrum - arm_func_start ov29_0232AD08 -ov29_0232AD08: ; 0x0232AD08 + arm_func_start DoMoveLightScreen +DoMoveLightScreen: ; 0x0232AD08 stmdb sp!, {r3, lr} - bl ov29_023190EC + bl TryInflictLightScreenStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232AD08 + arm_func_end DoMoveLightScreen - arm_func_start ov29_0232AD18 -ov29_0232AD18: ; 0x0232AD18 + arm_func_start DoMoveSecretPower +DoMoveSecretPower: ; 0x0232AD18 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -824,10 +824,10 @@ _0232AEE0: .word 0x02353538 _0232AEE4: .word 0x022C6321 _0232AEE8: .word 0x022C4720 _0232AEEC: .word 0x02352AEC - arm_func_end ov29_0232AD18 + arm_func_end DoMoveSecretPower - arm_func_start ov29_0232AEF0 -ov29_0232AEF0: ; 0x0232AEF0 + arm_func_start DoMoveDamageConfuse30 +DoMoveDamageConfuse30: ; 0x0232AEF0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -857,10 +857,10 @@ _0232AF4C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232AF58: .word 0x022C4548 - arm_func_end ov29_0232AEF0 + arm_func_end DoMoveDamageConfuse30 - arm_func_start ov29_0232AF5C -ov29_0232AF5C: ; 0x0232AF5C + arm_func_start DoMoveBulkUp +DoMoveBulkUp: ; 0x0232AF5C stmdb sp!, {r3, r4, r5, lr} ldr r2, _0232AF9C ; =0x02352AEC mov r3, #1 @@ -879,10 +879,10 @@ ov29_0232AF5C: ; 0x0232AF5C ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232AF9C: .word 0x02352AEC - arm_func_end ov29_0232AF5C + arm_func_end DoMoveBulkUp - arm_func_start ov29_0232AFA0 -ov29_0232AFA0: ; 0x0232AFA0 + arm_func_start DoMovePause +DoMovePause: ; 0x0232AFA0 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 mov r4, r1 @@ -904,10 +904,10 @@ ov29_0232AFA0: ; 0x0232AFA0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232AFEC: .word 0x022C471C - arm_func_end ov29_0232AFA0 + arm_func_end DoMovePause - arm_func_start ov29_0232AFF0 -ov29_0232AFF0: ; 0x0232AFF0 + arm_func_start DoMoveFeatherDance +DoMoveFeatherDance: ; 0x0232AFF0 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r2, _0232B020 ; =0x02352AEC @@ -922,10 +922,10 @@ ov29_0232AFF0: ; 0x0232AFF0 ldmia sp!, {r3, pc} .align 2, 0 _0232B020: .word 0x02352AEC - arm_func_end ov29_0232AFF0 + arm_func_end DoMoveFeatherDance - arm_func_start ov29_0232B024 -ov29_0232B024: ; 0x0232B024 + arm_func_start DoMoveBeatUp +DoMoveBeatUp: ; 0x0232B024 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 ldr r8, [sl, #0xb4] @@ -947,7 +947,7 @@ ov29_0232B024: ; 0x0232B024 _0232B06C: ldr sb, [r7, r5, lsl #2] mov r0, sb - bl EntityIsValid__0232A3D8 + bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 cmpne sl, sb beq _0232B0E4 @@ -992,10 +992,10 @@ _0232B108: .align 2, 0 _0232B110: .word 0x02353538 _0232B114: .word 0x00000EEC - arm_func_end ov29_0232B024 + arm_func_end DoMoveBeatUp - arm_func_start ov29_0232B118 -ov29_0232B118: ; 0x0232B118 + arm_func_start DoMoveBlastBurn +DoMoveBlastBurn: ; 0x0232B118 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1003,7 +1003,7 @@ ov29_0232B118: ; 0x0232B118 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r8 mov r1, r7 mov r2, r6 @@ -1015,10 +1015,10 @@ ov29_0232B118: ; 0x0232B118 mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} - arm_func_end ov29_0232B118 + arm_func_end DoMoveBlastBurn - arm_func_start ov29_0232B164 -ov29_0232B164: ; 0x0232B164 + arm_func_start DoMoveCrushClaw +DoMoveCrushClaw: ; 0x0232B164 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -1053,10 +1053,10 @@ _0232B1D0: .align 2, 0 _0232B1DC: .word 0x022C4608 _0232B1E0: .word 0x02352AEC - arm_func_end ov29_0232B164 + arm_func_end DoMoveCrushClaw - arm_func_start ov29_0232B1E4 -ov29_0232B1E4: ; 0x0232B1E4 + arm_func_start DoMoveBlazeKick +DoMoveBlazeKick: ; 0x0232B1E4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1064,7 +1064,7 @@ ov29_0232B1E4: ; 0x0232B1E4 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r8 mov r1, r7 mov r2, r6 @@ -1093,10 +1093,10 @@ _0232B25C: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _0232B268: .word 0x022C4540 - arm_func_end ov29_0232B1E4 + arm_func_end DoMoveBlazeKick - arm_func_start ov29_0232B26C -ov29_0232B26C: ; 0x0232B26C + arm_func_start DoMovePresent +DoMovePresent: ; 0x0232B26C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r0 mov r0, #0x64 @@ -1164,16 +1164,16 @@ _0232B340: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232B364: .word 0x000003E7 - arm_func_end ov29_0232B26C + arm_func_end DoMovePresent - arm_func_start ov29_0232B368 -ov29_0232B368: ; 0x0232B368 + arm_func_start DoMoveEruption +DoMoveEruption: ; 0x0232B368 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 mov r5, r2 mov r4, r3 - bl ov29_02307C78 + bl EndFrozenStatus ldr r2, [r7, #0xb4] ldr r3, _0232B42C ; =0x000003E7 ldrsh r1, [r2, #0x12] @@ -1221,24 +1221,24 @@ _0232B3FC: .align 2, 0 _0232B42C: .word 0x000003E7 _0232B430: .word 0x022C49C4 - arm_func_end ov29_0232B368 + arm_func_end DoMoveEruption - arm_func_start ov29_0232B434 -ov29_0232B434: ; 0x0232B434 + arm_func_start DoMoveParalyze__0232B434 +DoMoveParalyze__0232B434: ; 0x0232B434 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictParalysisStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B434 + arm_func_end DoMoveParalyze__0232B434 - arm_func_start ov29_0232B44C -ov29_0232B44C: ; 0x0232B44C + arm_func_start DoMoveTransform +DoMoveTransform: ; 0x0232B44C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 beq _0232B47C ldr r2, _0232B490 ; =0x00000EED @@ -1250,15 +1250,15 @@ ov29_0232B44C: ; 0x0232B44C _0232B47C: mov r0, r5 mov r1, r4 - bl ov29_0231721C + bl TryTransform mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232B490: .word 0x00000EED - arm_func_end ov29_0232B44C + arm_func_end DoMoveTransform - arm_func_start ov29_0232B494 -ov29_0232B494: ; 0x0232B494 + arm_func_start DoMovePoisonTail +DoMovePoisonTail: ; 0x0232B494 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 str r3, [sp] @@ -1288,20 +1288,20 @@ _0232B4F0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232B4FC: .word 0x022C448C - arm_func_end ov29_0232B494 + arm_func_end DoMovePoisonTail - arm_func_start ov29_0232B500 -ov29_0232B500: ; 0x0232B500 + arm_func_start DoMoveBlowback +DoMoveBlowback: ; 0x0232B500 stmdb sp!, {r3, lr} ldr r2, [r0, #0xb4] ldrb r2, [r2, #0x4c] bl TryBlowAway mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B500 + arm_func_end DoMoveBlowback - arm_func_start ov29_0232B518 -ov29_0232B518: ; 0x0232B518 + arm_func_start DoMoveCamouflage +DoMoveCamouflage: ; 0x0232B518 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r0 mov r4, r1 @@ -1317,7 +1317,7 @@ ov29_0232B518: ; 0x0232B518 smulbb r2, ip, r2 ldr r7, [r4, #0xb4] ldrb r6, [r3, r2] - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0232B578 ldr r2, _0232B5C0 ; =0x00000DC3 @@ -1348,10 +1348,10 @@ _0232B5B8: .word 0x02353538 _0232B5BC: .word 0x022C6322 _0232B5C0: .word 0x00000DC3 _0232B5C4: .word 0x00000EEE - arm_func_end ov29_0232B518 + arm_func_end DoMoveCamouflage - arm_func_start ov29_0232B5C8 -ov29_0232B5C8: ; 0x0232B5C8 + arm_func_start DoMoveTailGlow +DoMoveTailGlow: ; 0x0232B5C8 stmdb sp!, {r3, lr} ldr r2, _0232B5E4 ; =0x02352AE8 mov r3, #2 @@ -1361,10 +1361,10 @@ ov29_0232B5C8: ; 0x0232B5C8 ldmia sp!, {r3, pc} .align 2, 0 _0232B5E4: .word 0x02352AE8 - arm_func_end ov29_0232B5C8 + arm_func_end DoMoveTailGlow - arm_func_start ov29_0232B5E8 -ov29_0232B5E8: ; 0x0232B5E8 + arm_func_start DoMoveDamageConstrict10 +DoMoveDamageConstrict10: ; 0x0232B5E8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r5, r2 ldrh ip, [r5, #4] @@ -1378,7 +1378,7 @@ ov29_0232B5E8: ; 0x0232B5E8 bne _0232B628 mov r0, r7 mov r1, r6 - bl ov29_02307C78 + bl EndFrozenStatus mov sb, #0x13c b _0232B640 _0232B628: @@ -1416,27 +1416,27 @@ _0232B694: .align 2, 0 _0232B69C: .word 0x00000123 _0232B6A0: .word 0x022C44A4 - arm_func_end ov29_0232B5E8 + arm_func_end DoMoveDamageConstrict10 - arm_func_start ov29_0232B6A4 -ov29_0232B6A4: ; 0x0232B6A4 + arm_func_start DoMovePerishSong +DoMovePerishSong: ; 0x0232B6A4 stmdb sp!, {r3, lr} mov r2, #0 - bl ov29_0231662C + bl TryInflictPerishSongStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B6A4 + arm_func_end DoMovePerishSong - arm_func_start ov29_0232B6B8 -ov29_0232B6B8: ; 0x0232B6B8 + arm_func_start DoMoveWrap +DoMoveWrap: ; 0x0232B6B8 stmdb sp!, {r3, lr} bl TryInflictWrappedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B6B8 + arm_func_end DoMoveWrap - arm_func_start ov29_0232B6C8 -ov29_0232B6C8: ; 0x0232B6C8 + arm_func_start DoMoveSpikes +DoMoveSpikes: ; 0x0232B6C8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 ldr r0, [r7, #0xb4] @@ -1453,7 +1453,7 @@ ov29_0232B6C8: ; 0x0232B6C8 add r0, r7, #4 mov r1, #0x13 mov r3, #1 - bl ov29_022EDCBC + bl TrySpawnTrap cmp r0, #0 movne r4, #1 bne _0232B728 @@ -1463,15 +1463,15 @@ _0232B718: mov r1, r6 bl LogMessageByIdWithPopupCheckUserTarget _0232B728: - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232B734: .word 0x00000EEF - arm_func_end ov29_0232B6C8 + arm_func_end DoMoveSpikes - arm_func_start ov29_0232B738 -ov29_0232B738: ; 0x0232B738 + arm_func_start DoMoveMagnitude +DoMoveMagnitude: ; 0x0232B738 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr r4, _0232B7B0 ; =0x0237CA84 @@ -1507,26 +1507,26 @@ _0232B7B0: .word 0x0237CA84 _0232B7B4: .word 0x02353538 _0232B7B8: .word 0x02352B1C _0232B7BC: .word 0x022C4924 - arm_func_end ov29_0232B738 + arm_func_end DoMoveMagnitude - arm_func_start ov29_0232B7C0 -ov29_0232B7C0: ; 0x0232B7C0 + arm_func_start DoMoveMagicCoat +DoMoveMagicCoat: ; 0x0232B7C0 stmdb sp!, {r3, lr} - bl ov29_0231904C + bl TryInflictMagicCoatStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B7C0 + arm_func_end DoMoveMagicCoat - arm_func_start ov29_0232B7D0 -ov29_0232B7D0: ; 0x0232B7D0 + arm_func_start DoMoveProtect +DoMoveProtect: ; 0x0232B7D0 stmdb sp!, {r3, lr} - bl ov29_0231922C + bl TryInflictProtectStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B7D0 + arm_func_end DoMoveProtect - arm_func_start ov29_0232B7E0 -ov29_0232B7E0: ; 0x0232B7E0 + arm_func_start DoMoveDefenseCurl +DoMoveDefenseCurl: ; 0x0232B7E0 stmdb sp!, {r3, lr} ldr r2, _0232B7FC ; =0x02352AEC mov r3, #1 @@ -1536,22 +1536,22 @@ ov29_0232B7E0: ; 0x0232B7E0 ldmia sp!, {r3, pc} .align 2, 0 _0232B7FC: .word 0x02352AEC - arm_func_end ov29_0232B7E0 + arm_func_end DoMoveDefenseCurl - arm_func_start ov29_0232B800 -ov29_0232B800: ; 0x0232B800 + arm_func_start DoMoveDecoy +DoMoveDecoy: ; 0x0232B800 stmdb sp!, {r3, lr} mov r2, #1 mov ip, #0 mov r3, r2 str ip, [sp] - bl ov29_02315E24 + bl TryInflictDecoyStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B800 + arm_func_end DoMoveDecoy - arm_func_start ov29_0232B820 -ov29_0232B820: ; 0x0232B820 + arm_func_start DoMoveMistBall +DoMoveMistBall: ; 0x0232B820 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 str r3, [sp] @@ -1586,18 +1586,18 @@ _0232B88C: .align 2, 0 _0232B898: .word 0x022C44E0 _0232B89C: .word 0x02352AE8 - arm_func_end ov29_0232B820 + arm_func_end DoMoveMistBall - arm_func_start ov29_0232B8A0 -ov29_0232B8A0: ; 0x0232B8A0 + arm_func_start DoMoveDestinyBond +DoMoveDestinyBond: ; 0x0232B8A0 stmdb sp!, {r3, lr} - bl TryInflictDestinyBond + bl TryInflictDestinyBondStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B8A0 + arm_func_end DoMoveDestinyBond - arm_func_start ov29_0232B8B0 -ov29_0232B8B0: ; 0x0232B8B0 + arm_func_start DoMoveDamage__0232B8B0 +DoMoveDamage__0232B8B0: ; 0x0232B8B0 stmdb sp!, {r3, lr} str r3, [sp] mov r3, #0x100 @@ -1607,18 +1607,18 @@ ov29_0232B8B0: ; 0x0232B8B0 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_0232B8B0 + arm_func_end DoMoveDamage__0232B8B0 - arm_func_start ov29_0232B8D4 -ov29_0232B8D4: ; 0x0232B8D4 + arm_func_start DoMoveMirrorCoat +DoMoveMirrorCoat: ; 0x0232B8D4 stmdb sp!, {r3, lr} - bl ov29_023192DC + bl TryInflictMirrorCoatStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B8D4 + arm_func_end DoMoveMirrorCoat - arm_func_start ov29_0232B8E4 -ov29_0232B8E4: ; 0x0232B8E4 + arm_func_start DoMoveCalmMind +DoMoveCalmMind: ; 0x0232B8E4 stmdb sp!, {r3, r4, r5, lr} ldr r2, _0232B924 ; =0x02352AE8 mov r3, #1 @@ -1637,20 +1637,20 @@ ov29_0232B8E4: ; 0x0232B8E4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232B924: .word 0x02352AE8 - arm_func_end ov29_0232B8E4 + arm_func_end DoMoveCalmMind - arm_func_start ov29_0232B928 -ov29_0232B928: ; 0x0232B928 + arm_func_start DoMoveHiddenPower +DoMoveHiddenPower: ; 0x0232B928 stmdb sp!, {r3, lr} str r3, [sp] mov r3, #0x100 bl DealDamage mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232B928 + arm_func_end DoMoveHiddenPower - arm_func_start ov29_0232B940 -ov29_0232B940: ; 0x0232B940 + arm_func_start DoMoveMetalClaw +DoMoveMetalClaw: ; 0x0232B940 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 @@ -1689,10 +1689,10 @@ _0232B9B8: bx lr .align 2, 0 _0232B9CC: .word 0x022C4554 - arm_func_end ov29_0232B940 + arm_func_end DoMoveMetalClaw - arm_func_start ov29_0232B9D0 -ov29_0232B9D0: ; 0x0232B9D0 + arm_func_start DoMoveAttract +DoMoveAttract: ; 0x0232B9D0 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -1724,10 +1724,10 @@ _0232BA14: _0232BA3C: mov r0, r4 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_0232B9D0 + arm_func_end DoMoveAttract - arm_func_start ov29_0232BA44 -ov29_0232BA44: ; 0x0232BA44 + arm_func_start DoMoveCopycat +DoMoveCopycat: ; 0x0232BA44 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 mov r0, r1 @@ -1799,10 +1799,10 @@ _0232BB3C: .align 2, 0 _0232BB44: .word 0x0000020D _0232BB48: .word 0x00000EF1 - arm_func_end ov29_0232BA44 + arm_func_end DoMoveCopycat - arm_func_start ov29_0232BB4C -ov29_0232BB4C: ; 0x0232BB4C + arm_func_start DoMoveFrustration +DoMoveFrustration: ; 0x0232BB4C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x20 mov r7, #0 @@ -1839,7 +1839,7 @@ _0232BBB0: mov r7, r0 mov r1, sl mov r0, r4 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r8} str r7, [sp, #8] @@ -1865,10 +1865,10 @@ _0232BBB0: _0232BC28: .word 0x022C4C3C _0232BC2C: .word 0x000003E7 _0232BC30: .word 0x022C4C3E - arm_func_end ov29_0232BB4C + arm_func_end DoMoveFrustration - arm_func_start ov29_0232BC34 -ov29_0232BC34: ; 0x0232BC34 + arm_func_start DoMoveLeechSeed +DoMoveLeechSeed: ; 0x0232BC34 stmdb sp!, {r4, lr} mov r4, r0 mov r2, #1 @@ -1881,10 +1881,10 @@ ov29_0232BC34: ; 0x0232BC34 strlob r0, [r1, #0x108] mov r0, #1 ldmia sp!, {r4, pc} - arm_func_end ov29_0232BC34 + arm_func_end DoMoveLeechSeed - arm_func_start ov29_0232BC64 -ov29_0232BC64: ; 0x0232BC64 + arm_func_start DoMoveMetronome +DoMoveMetronome: ; 0x0232BC64 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 ldr r2, _0232BCB8 ; =0x0237CA88 @@ -1910,10 +1910,10 @@ ov29_0232BC64: ; 0x0232BC64 _0232BCB8: .word 0x0237CA88 _0232BCBC: .word 0x022C5DDC _0232BCC0: .word 0x022C5DE0 - arm_func_end ov29_0232BC64 + arm_func_end DoMoveMetronome - arm_func_start ov29_0232BCC4 -ov29_0232BCC4: ; 0x0232BCC4 + arm_func_start DoMoveDreamEater +DoMoveDreamEater: ; 0x0232BCC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, r2 mov r6, r3 @@ -1922,14 +1922,14 @@ ov29_0232BCC4: ; 0x0232BCC4 mov r3, #1 mov r7, r0 mov r4, #0 - bl DefenderAbilityIsActive__0232BDD0 + bl DefenderAbilityIsActiveMoveEffects__0232BDD0 mov r5, r0 mov r0, sb - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 beq _0232BDB4 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, r7 mov r1, sb mov r2, r8 @@ -1964,7 +1964,7 @@ ov29_0232BCC4: ; 0x0232BCC4 mov r0, r7 mov r1, r6 add r3, r2, #0x22c - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper b _0232BDC4 _0232BD94: mov r5, #1 @@ -1985,10 +1985,10 @@ _0232BDC4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232BDCC: .word 0x00000EF2 - arm_func_end ov29_0232BCC4 + arm_func_end DoMoveDreamEater - arm_func_start DefenderAbilityIsActive__0232BDD0 -DefenderAbilityIsActive__0232BDD0: ; 0x0232BDD0 + arm_func_start DefenderAbilityIsActiveMoveEffects__0232BDD0 +DefenderAbilityIsActiveMoveEffects__0232BDD0: ; 0x0232BDD0 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 @@ -2007,27 +2007,27 @@ _0232BE04: cmpne r3, #0 beq _0232BE24 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _0232BE24: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} - arm_func_end DefenderAbilityIsActive__0232BDD0 + arm_func_end DefenderAbilityIsActiveMoveEffects__0232BDD0 - arm_func_start ov29_0232BE34 -ov29_0232BE34: ; 0x0232BE34 + arm_func_start DoMoveSnatch +DoMoveSnatch: ; 0x0232BE34 stmdb sp!, {r3, lr} - bl ov29_02316280 + bl TryInflictSnatchStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232BE34 + arm_func_end DoMoveSnatch - arm_func_start ov29_0232BE44 -ov29_0232BE44: ; 0x0232BE44 + arm_func_start DoMoveRecycle +DoMoveRecycle: ; 0x0232BE44 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r5, r1 ldr r1, [r5, #0xb4] @@ -2112,18 +2112,18 @@ _0232BF68: .word 0x02353538 _0232BF6C: .word 0x020AF6B8 _0232BF70: .word 0x00000EF3 _0232BF74: .word 0x00000EF4 - arm_func_end ov29_0232BE44 + arm_func_end DoMoveRecycle - arm_func_start ov29_0232BF78 -ov29_0232BF78: ; 0x0232BF78 + arm_func_start DoMoveReflect +DoMoveReflect: ; 0x0232BF78 stmdb sp!, {r3, lr} - bl ov29_0231918C + bl TryInflictReflectStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232BF78 + arm_func_end DoMoveReflect - arm_func_start ov29_0232BF88 -ov29_0232BF88: ; 0x0232BF88 + arm_func_start DoMoveDragonRage +DoMoveDragonRage: ; 0x0232BF88 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x20 mov r5, #0 @@ -2140,7 +2140,7 @@ ov29_0232BF88: ; 0x0232BF88 mov r1, r5 mov r5, r0 mov r0, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r6} str r5, [sp, #8] @@ -2165,10 +2165,10 @@ ov29_0232BF88: ; 0x0232BF88 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0232C024: .word 0x022C46D4 - arm_func_end ov29_0232BF88 + arm_func_end DoMoveDragonRage - arm_func_start ov29_0232C028 -ov29_0232C028: ; 0x0232C028 + arm_func_start DoMoveDragonDance +DoMoveDragonDance: ; 0x0232C028 stmdb sp!, {r3, r4, r5, lr} ldr r2, _0232C060 ; =0x02352AEC mov r5, r0 @@ -2185,17 +2185,17 @@ ov29_0232C028: ; 0x0232C028 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232C060: .word 0x02352AEC - arm_func_end ov29_0232C028 + arm_func_end DoMoveDragonDance - arm_func_start ov29_0232C064 -ov29_0232C064: ; 0x0232C064 + arm_func_start DoMoveSkullBash +DoMoveSkullBash: ; 0x0232C064 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r1, r5 mov r7, r0 mov r4, r3 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _0232C0C0 ldr r1, _0232C0EC ; =0x022C48BC @@ -2228,10 +2228,10 @@ _0232C0E4: .align 2, 0 _0232C0EC: .word 0x022C48BC _0232C0F0: .word 0x00000CEB - arm_func_end ov29_0232C064 + arm_func_end DoMoveSkullBash - arm_func_start ov29_0232C0F4 -ov29_0232C0F4: ; 0x0232C0F4 + arm_func_start DoMoveDamageLowerSpecialDefense50 +DoMoveDamageLowerSpecialDefense50: ; 0x0232C0F4 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 mov r8, r2 @@ -2244,7 +2244,7 @@ ov29_0232C0F4: ; 0x0232C0F4 mov r6, #0 bne _0232C128 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _0232C128: mov r0, r5 mov r1, r4 @@ -2279,10 +2279,10 @@ _0232C18C: _0232C198: .word 0x0000014F _0232C19C: .word 0x022C450C _0232C1A0: .word 0x02352AE8 - arm_func_end ov29_0232C0F4 + arm_func_end DoMoveDamageLowerSpecialDefense50 - arm_func_start ov29_0232C1A4 -ov29_0232C1A4: ; 0x0232C1A4 + arm_func_start DoMoveStruggle +DoMoveStruggle: ; 0x0232C1A4 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x1c str r3, [sp] @@ -2340,10 +2340,10 @@ _0232C270: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _0232C278: .word 0x000003E7 - arm_func_end ov29_0232C1A4 + arm_func_end DoMoveStruggle - arm_func_start ov29_0232C27C -ov29_0232C27C: ; 0x0232C27C + arm_func_start DoMoveRockSmash +DoMoveRockSmash: ; 0x0232C27C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -2360,7 +2360,7 @@ ov29_0232C27C: ; 0x0232C27C b _0232C2E8 _0232C2B4: add r0, sp, #0 - bl ov29_02337B9C + bl TrySmashWall movs r4, r0 beq _0232C2D8 ldr r2, _0232C2F8 ; =0x00000EF6 @@ -2381,18 +2381,18 @@ _0232C2E8: _0232C2F4: .word 0x00000EF5 _0232C2F8: .word 0x00000EF6 _0232C2FC: .word 0x00000EF7 - arm_func_end ov29_0232C27C + arm_func_end DoMoveRockSmash - arm_func_start ov29_0232C300 -ov29_0232C300: ; 0x0232C300 + arm_func_start DoMoveSeeTrap +DoMoveSeeTrap: ; 0x0232C300 stmdb sp!, {r3, lr} - bl ov29_022EF5D8 + bl RevealTrapsNearby mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C300 + arm_func_end DoMoveSeeTrap - arm_func_start ov29_0232C310 -ov29_0232C310: ; 0x0232C310 + arm_func_start DoMoveTakeaway +DoMoveTakeaway: ; 0x0232C310 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 str r3, [sp] @@ -2424,7 +2424,7 @@ ov29_0232C310: ; 0x0232C310 mov r1, r7 mov r2, #0x2c mov r3, r4 - bl DefenderAbilityIsActive__0232BDD0 + bl DefenderAbilityIsActiveMoveEffects__0232BDD0 cmp r0, #0 beq _0232C3B0 ldr r2, _0232C4E8 ; =0x00000EFE @@ -2483,7 +2483,7 @@ _0232C440: cmp r0, #0 bne _0232C46C mov r0, r5 - bl ov29_02346F14 + bl AddHeldItemToBag _0232C46C: ldrb r0, [r6, #6] cmp r0, #0 @@ -2508,7 +2508,7 @@ _0232C480: b _0232C4DC _0232C4BC: mov r0, r7 - bl EntityIsValid__0232C500 + bl EntityIsValidMoveEffects__0232C500 cmp r0, #0 beq _0232C4DC ldr r2, _0232C4FC ; =0x00000EFD @@ -2527,4 +2527,4 @@ _0232C4F0: .word 0x00000EFB _0232C4F4: .word 0x00000EFC _0232C4F8: .word 0x00000EF9 _0232C4FC: .word 0x00000EFD - arm_func_end ov29_0232C310 + arm_func_end DoMoveTakeaway diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index c4e8bb7a..01c9e9f4 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -3,17 +3,17 @@ .text - arm_func_start ov29_0232C524 -ov29_0232C524: ; 0x0232C524 + arm_func_start DoMoveRebound +DoMoveRebound: ; 0x0232C524 stmdb sp!, {r3, lr} mov r2, #0xa bl ov29_02318D98 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C524 + arm_func_end DoMoveRebound - arm_func_start ov29_0232C538 -ov29_0232C538: ; 0x0232C538 + arm_func_start DoMoveSwitchPositions +DoMoveSwitchPositions: ; 0x0232C538 stmdb sp!, {r3, lr} ldr r3, [r0, #0xb4] ldrb r2, [r3, #0x108] @@ -24,20 +24,20 @@ ov29_0232C538: ; 0x0232C538 bl TrySwitchPlace mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C538 + arm_func_end DoMoveSwitchPositions - arm_func_start ov29_0232C560 -ov29_0232C560: ; 0x0232C560 + arm_func_start DoMoveStayAway +DoMoveStayAway: ; 0x0232C560 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryWarp mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C560 + arm_func_end DoMoveStayAway - arm_func_start ov29_0232C578 -ov29_0232C578: ; 0x0232C578 + arm_func_start DoMoveCleanse +DoMoveCleanse: ; 0x0232C578 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sb, r1 ldr r1, [sb, #0xb4] @@ -81,7 +81,7 @@ _0232C604: add r0, r0, #0x12000 ldr r7, [r0, #0xb28] mov r0, r7 - bl EntityIsValid__0232C500 + bl EntityIsValidMoveEffects__0232C500 cmp r0, #0 beq _0232C660 ldr r1, [r7, #0xb4] @@ -125,10 +125,10 @@ _0232C698: _0232C6A8: .word 0x020AF6B8 _0232C6AC: .word 0x02353538 _0232C6B0: .word 0x00000EFF - arm_func_end ov29_0232C578 + arm_func_end DoMoveCleanse - arm_func_start ov29_0232C6B4 -ov29_0232C6B4: ; 0x0232C6B4 + arm_func_start DoMoveSiesta +DoMoveSiesta: ; 0x0232C6B4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 @@ -145,10 +145,10 @@ ov29_0232C6B4: ; 0x0232C6B4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232C6EC: .word 0x022C4720 - arm_func_end ov29_0232C6B4 + arm_func_end DoMoveSiesta - arm_func_start ov29_0232C6F0 -ov29_0232C6F0: ; 0x0232C6F0 + arm_func_start DoMoveTwoEdge +DoMoveTwoEdge: ; 0x0232C6F0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x20 mov r4, #0 @@ -168,7 +168,7 @@ ov29_0232C6F0: ; 0x0232C6F0 mov r4, r0 mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper mov r2, r5 add r5, sp, #0x1d mov r3, #0 @@ -190,7 +190,7 @@ ov29_0232C6F0: ; 0x0232C6F0 mov r4, r0 mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r1, sp, #0x1c mov r3, #0 stmia sp, {r1, r3, r4} @@ -226,35 +226,35 @@ _0232C80C: and r0, r0, #0xff add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} - arm_func_end ov29_0232C6F0 + arm_func_end DoMoveTwoEdge - arm_func_start ov29_0232C818 -ov29_0232C818: ; 0x0232C818 + arm_func_start DoMoveNoMove +DoMoveNoMove: ; 0x0232C818 stmdb sp!, {r3, lr} mov r2, #0 - bl ov29_02317124 + bl TryInflictMuzzledStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C818 + arm_func_end DoMoveNoMove - arm_func_start ov29_0232C82C -ov29_0232C82C: ; 0x0232C82C + arm_func_start DoMoveScan +DoMoveScan: ; 0x0232C82C stmdb sp!, {r3, lr} - bl ov29_02315610 + bl RevealItems mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C82C + arm_func_end DoMoveScan - arm_func_start ov29_0232C83C -ov29_0232C83C: ; 0x0232C83C + arm_func_start DoMovePowerEars +DoMovePowerEars: ; 0x0232C83C stmdb sp!, {r3, lr} - bl ov29_0231575C + bl RevealEnemies mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232C83C + arm_func_end DoMovePowerEars - arm_func_start ov29_0232C84C -ov29_0232C84C: ; 0x0232C84C + arm_func_start DoMoveTransfer +DoMoveTransfer: ; 0x0232C84C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sb, r0 mov r8, r1 @@ -379,53 +379,53 @@ _0232CA04: .align 2, 0 _0232CA0C: .word 0x00000F02 _0232CA10: .word 0x00000F01 - arm_func_end ov29_0232C84C + arm_func_end DoMoveTransfer - arm_func_start ov29_0232CA14 -ov29_0232CA14: ; 0x0232CA14 + arm_func_start DoMoveSlowDown +DoMoveSlowDown: ; 0x0232CA14 stmdb sp!, {r3, lr} mov r2, #1 mov r3, r2 bl LowerSpeed mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CA14 + arm_func_end DoMoveSlowDown - arm_func_start ov29_0232CA2C -ov29_0232CA2C: ; 0x0232CA2C + arm_func_start DoMoveSearchlight +DoMoveSearchlight: ; 0x0232CA2C stmdb sp!, {r3, lr} bl ov29_022E3430 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CA2C + arm_func_end DoMoveSearchlight - arm_func_start ov29_0232CA3C -ov29_0232CA3C: ; 0x0232CA3C + arm_func_start DoMovePetrify +DoMovePetrify: ; 0x0232CA3C stmdb sp!, {r3, lr} bl TryInflictPetrifiedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CA3C + arm_func_end DoMovePetrify - arm_func_start ov29_0232CA4C -ov29_0232CA4C: ; 0x0232CA4C + arm_func_start DoMovePounce +DoMovePounce: ; 0x0232CA4C stmdb sp!, {r3, lr} mov r2, #8 bl TryPounce mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CA4C + arm_func_end DoMovePounce - arm_func_start ov29_0232CA60 -ov29_0232CA60: ; 0x0232CA60 + arm_func_start DoMoveTrawl +DoMoveTrawl: ; 0x0232CA60 stmdb sp!, {r3, lr} bl ov29_0231F6E4 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CA60 + arm_func_end DoMoveTrawl - arm_func_start ov29_0232CA70 -ov29_0232CA70: ; 0x0232CA70 + arm_func_start DoMoveEscape +DoMoveEscape: ; 0x0232CA70 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r0, #0 @@ -468,18 +468,18 @@ _0232CAF4: _0232CAFC: .word 0x02353538 _0232CB00: .word 0x00000F04 _0232CB04: .word 0x00000F03 - arm_func_end ov29_0232CA70 + arm_func_end DoMoveEscape - arm_func_start ov29_0232CB08 -ov29_0232CB08: ; 0x0232CB08 + arm_func_start DoMoveDrought +DoMoveDrought: ; 0x0232CB08 stmdb sp!, {r3, lr} - bl ov29_0231F594 + bl TryDrought mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CB08 + arm_func_end DoMoveDrought - arm_func_start ov29_0232CB18 -ov29_0232CB18: ; 0x0232CB18 + arm_func_start DoMoveTrapBuster +DoMoveTrapBuster: ; 0x0232CB18 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xc mov sb, r1 @@ -488,7 +488,7 @@ ov29_0232CB18: ; 0x0232CB18 mov r7, #0 bl GetTileAtEntity mov r4, r0 - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 beq _0232CB58 ldr r1, _0232CCB0 ; =0x00000F07 @@ -505,7 +505,7 @@ _0232CB58: cmp r0, #0 beq _0232CB94 _0232CB74: - bl ov29_022E333C + bl GetVisibilityRange ldrsh r2, [sb, #4] ldrsh r1, [sb, #6] sub r8, r2, r0 @@ -552,7 +552,7 @@ _0232CBFC: ldr r1, [r0] cmp r1, #2 bne _0232CC58 - bl ov29_022E1608 + bl GetTrapInfo ldrb r1, [r0, #2] tst r1, #1 bne _0232CC58 @@ -581,8 +581,8 @@ _0232CC68: mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility b _0232CCA4 _0232CC94: ldr r2, _0232CCC0 ; =0x00000F06 @@ -600,10 +600,10 @@ _0232CCB4: .word 0x02353538 _0232CCB8: .word 0x02352B38 _0232CCBC: .word 0x00000F05 _0232CCC0: .word 0x00000F06 - arm_func_end ov29_0232CB18 + arm_func_end DoMoveTrapBuster - arm_func_start ov29_0232CCC4 -ov29_0232CCC4: ; 0x0232CCC4 + arm_func_start DoMoveWildCall +DoMoveWildCall: ; 0x0232CCC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 ldr r0, [sl, #0xb4] @@ -626,7 +626,7 @@ ov29_0232CCC4: ; 0x0232CCC4 _0232CD10: ldr r8, [r7, r4, lsl #2] mov r0, r8 - bl EntityIsValid__0232C500 + bl EntityIsValidMoveEffects__0232C500 cmp r0, #0 cmpne sl, r8 beq _0232CD5C @@ -660,19 +660,19 @@ _0232CD80: .align 2, 0 _0232CD88: .word 0x02353538 _0232CD8C: .word 0x00000F08 - arm_func_end ov29_0232CCC4 + arm_func_end DoMoveWildCall - arm_func_start ov29_0232CD90 -ov29_0232CD90: ; 0x0232CD90 + arm_func_start DoMoveInvisify +DoMoveInvisify: ; 0x0232CD90 stmdb sp!, {r3, lr} mov r1, r0 - bl ov29_0231657C + bl TryInflictInvisibleStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CD90 + arm_func_end DoMoveInvisify - arm_func_start ov29_0232CDA4 -ov29_0232CDA4: ; 0x0232CDA4 + arm_func_start DoMoveOneShot +DoMoveOneShot: ; 0x0232CDA4 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x20 mov r5, #0 @@ -689,7 +689,7 @@ ov29_0232CDA4: ; 0x0232CDA4 mov r1, r5 mov r5, r0 mov r0, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r6} str r5, [sp, #8] @@ -713,18 +713,18 @@ ov29_0232CDA4: ; 0x0232CDA4 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0232CE3C: .word 0x0000270F - arm_func_end ov29_0232CDA4 + arm_func_end DoMoveOneShot - arm_func_start ov29_0232CE40 -ov29_0232CE40: ; 0x0232CE40 + arm_func_start DoMoveHpGauge +DoMoveHpGauge: ; 0x0232CE40 stmdb sp!, {r3, lr} - bl ov29_02317648 + bl TryActivateIdentifyCondition mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CE40 + arm_func_end DoMoveHpGauge - arm_func_start ov29_0232CE50 -ov29_0232CE50: ; 0x0232CE50 + arm_func_start DoMoveVacuumCut +DoMoveVacuumCut: ; 0x0232CE50 stmdb sp!, {r3, lr} ldr ip, _0232CE78 ; =0x022C456C str r3, [sp] @@ -737,10 +737,10 @@ ov29_0232CE50: ; 0x0232CE50 ldmia sp!, {r3, pc} .align 2, 0 _0232CE78: .word 0x022C456C - arm_func_end ov29_0232CE50 + arm_func_end DoMoveVacuumCut - arm_func_start ov29_0232CE7C -ov29_0232CE7C: ; 0x0232CE7C + arm_func_start DoMoveReviver +DoMoveReviver: ; 0x0232CE7C stmdb sp!, {r3, lr} ldr r2, _0232CE90 ; =0x00000F09 bl LogMessageByIdWithPopupCheckUserTarget @@ -748,20 +748,20 @@ ov29_0232CE7C: ; 0x0232CE7C ldmia sp!, {r3, pc} .align 2, 0 _0232CE90: .word 0x00000F09 - arm_func_end ov29_0232CE7C + arm_func_end DoMoveReviver - arm_func_start ov29_0232CE94 -ov29_0232CE94: ; 0x0232CE94 + arm_func_start DoMoveShocker +DoMoveShocker: ; 0x0232CE94 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 bl TryInflictCoweringStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CE94 + arm_func_end DoMoveShocker - arm_func_start ov29_0232CEAC -ov29_0232CEAC: ; 0x0232CEAC + arm_func_start DoMoveEcho +DoMoveEcho: ; 0x0232CEAC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x20 mov r5, #0 @@ -782,7 +782,7 @@ ov29_0232CEAC: ; 0x0232CEAC mov r1, r6 mov r6, r0 mov r0, sb - bl ov29_02324E44 + bl GetDamageSourceWrapper add r3, sp, #0x1c stmia sp, {r3, r7} str r6, [sp, #8] @@ -804,37 +804,37 @@ ov29_0232CEAC: ; 0x0232CEAC and r0, r0, #0xff add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_0232CEAC + arm_func_end DoMoveEcho - arm_func_start ov29_0232CF54 -ov29_0232CF54: ; 0x0232CF54 + arm_func_start DoMoveFamish +DoMoveFamish: ; 0x0232CF54 stmdb sp!, {r3, lr} ldr r2, _0232CF70 ; =0x022C45BC mov r3, #0 ldrsh r2, [r2] - bl ov29_023168D8 + bl TryDecreaseBelly mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 _0232CF70: .word 0x022C45BC - arm_func_end ov29_0232CF54 + arm_func_end DoMoveFamish - arm_func_start ov29_0232CF74 -ov29_0232CF74: ; 0x0232CF74 + arm_func_start DoMoveOneRoom +DoMoveOneRoom: ; 0x0232CF74 stmdb sp!, {r3, lr} bl ov29_0231EA40 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232CF74 + arm_func_end DoMoveOneRoom - arm_func_start ov29_0232CF84 -ov29_0232CF84: ; 0x0232CF84 + arm_func_start DoMoveFillIn +DoMoveFillIn: ; 0x0232CF84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r6, r1 mov r7, r0 ldr r5, [r6, #0xb4] mov r4, #0 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 beq _0232CFB8 ldr r1, _0232D0E0 ; =0x00000F0B @@ -898,7 +898,7 @@ _0232D074: _0232D078: mov r0, sb mov r1, r8 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add sb, sb, #1 cmp sb, #0x38 blt _0232D078 @@ -920,8 +920,8 @@ _0232D0C0: mov r1, r6 bl LogMessageByIdWithPopupCheckUserTarget _0232D0D0: - bl ov29_02339CE8 - bl ov29_02336F4C + bl UpdateMinimap + bl UpdateTrapsVisibility mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 @@ -929,10 +929,10 @@ _0232D0E0: .word 0x00000F0B _0232D0E4: .word 0x0235171C _0232D0E8: .word 0x0235171E _0232D0EC: .word 0x00000F0A - arm_func_end ov29_0232CF84 + arm_func_end DoMoveFillIn - arm_func_start ov29_0232D0F0 -ov29_0232D0F0: ; 0x0232D0F0 + arm_func_start DoMoveTrapper +DoMoveTrapper: ; 0x0232D0F0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -952,15 +952,15 @@ _0232D11C: movne r2, #2 moveq r2, #1 add r0, r4, #4 - bl ov29_022EDBD4 + bl PrepareTrapperTrap mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232D144: .word 0x00000E7E - arm_func_end ov29_0232D0F0 + arm_func_end DoMoveTrapper - arm_func_start ov29_0232D148 -ov29_0232D148: ; 0x0232D148 + arm_func_start DoMoveItemize +DoMoveItemize: ; 0x0232D148 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r4, r1 @@ -980,16 +980,16 @@ ov29_0232D148: ; 0x0232D148 _0232D188: mov r0, #0 strb r0, [r4, #0x20] - bl ov29_022E7AC4 + bl GetItemIdToSpawn mov r1, r0 add r0, sp, #0 mov r2, #0 - bl ov29_02344BD0 + bl GenerateStandardItem add r1, sp, #6 add r2, sp, #0 mov r0, r5 mov r3, #0 - bl ov29_02345A3C + bl SpawnDroppedItemWrapper ldr r1, _0232D1D8 ; =0x00000257 mov r0, r4 mov r2, r5 @@ -1001,50 +1001,50 @@ _0232D1CC: .align 2, 0 _0232D1D4: .word 0x00000F0C _0232D1D8: .word 0x00000257 - arm_func_end ov29_0232D148 + arm_func_end DoMoveItemize - arm_func_start ov29_0232D1DC -ov29_0232D1DC: ; 0x0232D1DC + arm_func_start DoMoveHurl +DoMoveHurl: ; 0x0232D1DC stmdb sp!, {r3, lr} bl ov29_0231EDFC mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D1DC + arm_func_end DoMoveHurl - arm_func_start ov29_0232D1EC -ov29_0232D1EC: ; 0x0232D1EC + arm_func_start DoMoveMobile +DoMoveMobile: ; 0x0232D1EC stmdb sp!, {r3, lr} - bl ov29_0231740C + bl TryInflictMobileStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D1EC + arm_func_end DoMoveMobile - arm_func_start ov29_0232D1FC -ov29_0232D1FC: ; 0x0232D1FC + arm_func_start DoMoveSeeStairs +DoMoveSeeStairs: ; 0x0232D1FC stmdb sp!, {r3, lr} - bl ov29_023156A0 + bl RevealStairs mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D1FC + arm_func_end DoMoveSeeStairs - arm_func_start ov29_0232D20C -ov29_0232D20C: ; 0x0232D20C + arm_func_start DoMoveLongToss +DoMoveLongToss: ; 0x0232D20C stmdb sp!, {r3, lr} - bl ov29_023181A0 + bl TryInflictLongTossStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D20C + arm_func_end DoMoveLongToss - arm_func_start ov29_0232D21C -ov29_0232D21C: ; 0x0232D21C + arm_func_start DoMovePierce +DoMovePierce: ; 0x0232D21C stmdb sp!, {r3, lr} - bl ov29_02318210 + bl TryInflictPierceStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D21C + arm_func_end DoMovePierce - arm_func_start ov29_0232D22C -ov29_0232D22C: ; 0x0232D22C + arm_func_start DoMoveHammerArm +DoMoveHammerArm: ; 0x0232D22C stmdb sp!, {r3, r4, lr} sub sp, sp, #4 str r3, [sp] @@ -1063,28 +1063,28 @@ ov29_0232D22C: ; 0x0232D22C _0232D268: add sp, sp, #4 ldmia sp!, {r3, r4, pc} - arm_func_end ov29_0232D22C + arm_func_end DoMoveHammerArm - arm_func_start ov29_0232D270 -ov29_0232D270: ; 0x0232D270 + arm_func_start DoMoveAquaRing +DoMoveAquaRing: ; 0x0232D270 stmdb sp!, {r3, lr} - bl ov29_0231845C + bl TryInflictAquaRingStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D270 + arm_func_end DoMoveAquaRing - arm_func_start ov29_0232D280 -ov29_0232D280: ; 0x0232D280 + arm_func_start DoMoveGastroAcid +DoMoveGastroAcid: ; 0x0232D280 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 - bl ov29_0231827C + bl TryInflictGastroAcidStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D280 + arm_func_end DoMoveGastroAcid - arm_func_start ov29_0232D298 -ov29_0232D298: ; 0x0232D298 + arm_func_start DoMoveHealingWish +DoMoveHealingWish: ; 0x0232D298 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -1101,15 +1101,15 @@ ov29_0232D298: ; 0x0232D298 mov r0, r5 mov r1, r4 mov r3, r2 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232D2E4: .word 0x022C46F4 - arm_func_end ov29_0232D298 + arm_func_end DoMoveHealingWish - arm_func_start ov29_0232D2E8 -ov29_0232D2E8: ; 0x0232D2E8 + arm_func_start DoMoveCloseCombat +DoMoveCloseCombat: ; 0x0232D2E8 stmdb sp!, {r4, lr} sub sp, sp, #8 str r3, [sp] @@ -1144,18 +1144,18 @@ _0232D358: .align 2, 0 _0232D360: .word 0x02352AEC _0232D364: .word 0x02352AE8 - arm_func_end ov29_0232D2E8 + arm_func_end DoMoveCloseCombat - arm_func_start ov29_0232D368 -ov29_0232D368: ; 0x0232D368 + arm_func_start DoMoveLuckyChant +DoMoveLuckyChant: ; 0x0232D368 stmdb sp!, {r3, lr} - bl ov29_02318508 + bl TryInflictLuckyChantStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D368 + arm_func_end DoMoveLuckyChant - arm_func_start ov29_0232D378 -ov29_0232D378: ; 0x0232D378 + arm_func_start DoMoveGuardSwap +DoMoveGuardSwap: ; 0x0232D378 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -1181,10 +1181,10 @@ ov29_0232D378: ; 0x0232D378 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232D3D4: .word 0x00000F2E - arm_func_end ov29_0232D378 + arm_func_end DoMoveGuardSwap - arm_func_start ov29_0232D3D8 -ov29_0232D3D8: ; 0x0232D3D8 + arm_func_start DoMoveHealOrder +DoMoveHealOrder: ; 0x0232D3D8 stmdb sp!, {r3, lr} ldr r2, _0232D3FC ; =0x022C44B8 mov ip, #1 @@ -1196,20 +1196,20 @@ ov29_0232D3D8: ; 0x0232D3D8 ldmia sp!, {r3, pc} .align 2, 0 _0232D3FC: .word 0x022C44B8 - arm_func_end ov29_0232D3D8 + arm_func_end DoMoveHealOrder - arm_func_start ov29_0232D400 -ov29_0232D400: ; 0x0232D400 + arm_func_start DoMoveHealBlock +DoMoveHealBlock: ; 0x0232D400 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 - bl ov29_023185A8 + bl TryInflictHealBlockStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D400 + arm_func_end DoMoveHealBlock - arm_func_start ov29_0232D418 -ov29_0232D418: ; 0x0232D418 + arm_func_start DoMoveThunderFang +DoMoveThunderFang: ; 0x0232D418 stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -1250,16 +1250,16 @@ _0232D49C: .align 2, 0 _0232D4A4: .word 0x022C452C _0232D4A8: .word 0x022C4678 - arm_func_end ov29_0232D418 + arm_func_end DoMoveThunderFang - arm_func_start ov29_0232D4AC -ov29_0232D4AC: ; 0x0232D4AC + arm_func_start DoMoveDefog +DoMoveDefog: ; 0x0232D4AC stmdb sp!, {r4, r5, r6, lr} mov r5, r1 mov r6, r0 mov r0, r5 ldr r4, [r5, #0xb4] - bl ov29_023197CC + bl MistIsActive cmp r0, #0 bne _0232D4E0 ldrb r0, [r4, #0xd5] @@ -1274,7 +1274,7 @@ _0232D4E0: bl LogMessageByIdWithPopupCheckUserTarget mov r0, r6 mov r1, r5 - bl ov29_023064F4 + bl EndReflectClassStatus _0232D4FC: ldr r1, _0232D554 ; =0x02352AE8 mov r0, r6 @@ -1294,7 +1294,7 @@ _0232D4FC: add r2, r1, #0xcd00 mov r1, #0 strh r3, [r2, #0x3a] - bl ov29_023354C4 + bl TryActivateWeather _0232D548: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} @@ -1303,10 +1303,10 @@ _0232D550: .word 0x00000ED2 _0232D554: .word 0x02352AE8 _0232D558: .word 0x022C4654 _0232D55C: .word 0x02353538 - arm_func_end ov29_0232D4AC + arm_func_end DoMoveDefog - arm_func_start ov29_0232D560 -ov29_0232D560: ; 0x0232D560 + arm_func_start DoMoveTrumpCard +DoMoveTrumpCard: ; 0x0232D560 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r6, r2 @@ -1320,7 +1320,7 @@ ov29_0232D560: ; 0x0232D560 mov r0, #0x64 mul r0, r4, r0 moveq r1, #1 - bl DivideInt + bl __divsi3 cmp r0, #0x19 bgt _0232D5BC mov r0, r8 @@ -1359,10 +1359,10 @@ _0232D614: mov r0, #1 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} - arm_func_end ov29_0232D560 + arm_func_end DoMoveTrumpCard - arm_func_start ov29_0232D620 -ov29_0232D620: ; 0x0232D620 + arm_func_start DoMoveIceFang +DoMoveIceFang: ; 0x0232D620 stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -1402,33 +1402,33 @@ _0232D6A0: .align 2, 0 _0232D6A8: .word 0x022C4518 _0232D6AC: .word 0x022C453C - arm_func_end ov29_0232D620 + arm_func_end DoMoveIceFang - arm_func_start ov29_0232D6B0 -ov29_0232D6B0: ; 0x0232D6B0 + arm_func_start DoMovePsychoShift +DoMovePsychoShift: ; 0x0232D6B0 stmdb sp!, {r3, lr} cmp r0, r1 beq _0232D6C8 mov r2, #0 mov r3, r2 - bl ov29_02305C3C + bl TransferNegativeStatusCondition _0232D6C8: mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D6B0 + arm_func_end DoMovePsychoShift - arm_func_start ov29_0232D6D0 -ov29_0232D6D0: ; 0x0232D6D0 + arm_func_start DoMoveEmbargo +DoMoveEmbargo: ; 0x0232D6D0 stmdb sp!, {r3, lr} mov r2, #1 mov r3, #0 - bl ov29_0231872C + bl TryInflictEmbargoStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D6D0 + arm_func_end DoMoveEmbargo - arm_func_start ov29_0232D6E8 -ov29_0232D6E8: ; 0x0232D6E8 + arm_func_start DoMoveBrine +DoMoveBrine: ; 0x0232D6E8 stmdb sp!, {r3, r4, r5, lr} ldr r5, [r1, #0xb4] ldr ip, _0232D734 ; =0x000003E7 @@ -1450,10 +1450,10 @@ ov29_0232D6E8: ; 0x0232D6E8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232D734: .word 0x000003E7 - arm_func_end ov29_0232D6E8 + arm_func_end DoMoveBrine - arm_func_start ov29_0232D738 -ov29_0232D738: ; 0x0232D738 + arm_func_start DoMoveNaturalGift +DoMoveNaturalGift: ; 0x0232D738 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x14 mov r7, r0 @@ -1473,7 +1473,7 @@ _0232D76C: strh r0, [r2], #2 bne _0232D76C mov r0, r7 - bl ov29_0231AE90 + bl GetEntityNaturalGiftInfo cmp r0, #0 beq _0232D7C8 str r4, [sp] @@ -1485,7 +1485,7 @@ _0232D76C: mov r0, r7 mov r3, #0x100 str r4, [sp, #8] - bl ov29_02332BB8 + bl DealDamageWithTypeAndPowerBoost cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1505,10 +1505,10 @@ _0232D7C8: _0232D7F0: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, pc} - arm_func_end ov29_0232D738 + arm_func_end DoMoveNaturalGift - arm_func_start ov29_0232D7F8 -ov29_0232D7F8: ; 0x0232D7F8 + arm_func_start DoMoveGyroBall +DoMoveGyroBall: ; 0x0232D7F8 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1537,17 +1537,17 @@ _0232D830: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _0232D85C: .word 0x00000F0D - arm_func_end ov29_0232D7F8 + arm_func_end DoMoveGyroBall - arm_func_start ov29_0232D860 -ov29_0232D860: ; 0x0232D860 + arm_func_start DoMoveShadowForce +DoMoveShadowForce: ; 0x0232D860 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r2 mov r6, r1 mov r1, r5 mov r7, r0 mov r4, r3 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 beq _0232D8CC ldr r1, _0232D8F4 ; =0x022C47DC @@ -1566,7 +1566,7 @@ ov29_0232D860: ; 0x0232D860 beq _0232D8EC mov r0, r7 mov r1, r6 - bl ov29_02307D18 + bl EndProtectStatus b _0232D8EC _0232D8CC: ldr r0, _0232D8F8 ; =0x00000CD7 @@ -1583,18 +1583,18 @@ _0232D8EC: .align 2, 0 _0232D8F4: .word 0x022C47DC _0232D8F8: .word 0x00000CD7 - arm_func_end ov29_0232D860 + arm_func_end DoMoveShadowForce - arm_func_start ov29_0232D8FC -ov29_0232D8FC: ; 0x0232D8FC + arm_func_start DoMoveGravity +DoMoveGravity: ; 0x0232D8FC stmdb sp!, {r3, lr} bl ov29_023383BC mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232D8FC + arm_func_end DoMoveGravity - arm_func_start ov29_0232D90C -ov29_0232D90C: ; 0x0232D90C + arm_func_start DoMoveStealthRock +DoMoveStealthRock: ; 0x0232D90C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 ldr r0, [r7, #0xb4] @@ -1611,7 +1611,7 @@ ov29_0232D90C: ; 0x0232D90C add r0, r7, #4 mov r1, #0x14 mov r3, #0 - bl ov29_022EDCBC + bl TrySpawnTrap cmp r0, #0 movne r4, #1 bne _0232D96C @@ -1621,15 +1621,15 @@ _0232D95C: mov r1, r6 bl LogMessageByIdWithPopupCheckUserTarget _0232D96C: - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232D978: .word 0x00000EEF - arm_func_end ov29_0232D90C + arm_func_end DoMoveStealthRock - arm_func_start ov29_0232D97C -ov29_0232D97C: ; 0x0232D97C + arm_func_start DoMoveChargeBeam +DoMoveChargeBeam: ; 0x0232D97C stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -1658,10 +1658,10 @@ _0232D9D4: .align 2, 0 _0232D9DC: .word 0x022C44F0 _0232D9E0: .word 0x02352AE8 - arm_func_end ov29_0232D97C + arm_func_end DoMoveChargeBeam - arm_func_start ov29_0232D9E4 -ov29_0232D9E4: ; 0x0232D9E4 + arm_func_start DoMoveDamageEatItem +DoMoveDamageEatItem: ; 0x0232D9E4 stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -1702,14 +1702,14 @@ _0232DA6C: beq _0232DA8C mov r0, r5 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0232DA98 _0232DA8C: mov r0, r4 mov r1, #0x2c - bl AbilityIsActive2 + bl AbilityIsActiveVeneer _0232DA98: cmp r0, #0 bne _0232DAC4 @@ -1721,16 +1721,16 @@ _0232DA98: beq _0232DAC4 mov r0, r5 mov r1, r4 - bl ov29_022FB214 + bl TryEatItem _0232DAC4: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232DACC: .word 0x02353538 - arm_func_end ov29_0232D9E4 + arm_func_end DoMoveDamageEatItem - arm_func_start ov29_0232DAD0 -ov29_0232DAD0: ; 0x0232DAD0 + arm_func_start DoMoveAcupressure +DoMoveAcupressure: ; 0x0232DAD0 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 mov r4, r1 @@ -1835,18 +1835,18 @@ _0232DC44: .word 0x02352B3C _0232DC48: .word 0x00000F0E _0232DC4C: .word 0x02352AEC _0232DC50: .word 0x02352AE8 - arm_func_end ov29_0232DAD0 + arm_func_end DoMoveAcupressure - arm_func_start ov29_0232DC54 -ov29_0232DC54: ; 0x0232DC54 + arm_func_start DoMoveMagnetRise +DoMoveMagnetRise: ; 0x0232DC54 stmdb sp!, {r3, lr} - bl ov29_02318984 + bl TryInflictMagnetRiseStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232DC54 + arm_func_end DoMoveMagnetRise - arm_func_start ov29_0232DC64 -ov29_0232DC64: ; 0x0232DC64 + arm_func_start DoMoveToxicSpikes +DoMoveToxicSpikes: ; 0x0232DC64 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 ldr r0, [r7, #0xb4] @@ -1863,7 +1863,7 @@ ov29_0232DC64: ; 0x0232DC64 add r0, r7, #4 mov r1, #0x15 mov r3, #1 - bl ov29_022EDCBC + bl TrySpawnTrap cmp r0, #0 movne r4, #1 bne _0232DCC4 @@ -1873,15 +1873,15 @@ _0232DCB4: mov r1, r6 bl LogMessageByIdWithPopupCheckUserTarget _0232DCC4: - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232DCD0: .word 0x00000EEF - arm_func_end ov29_0232DC64 + arm_func_end DoMoveToxicSpikes - arm_func_start ov29_0232DCD4 -ov29_0232DCD4: ; 0x0232DCD4 + arm_func_start DoMoveLastResort +DoMoveLastResort: ; 0x0232DCD4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, r0 @@ -1889,7 +1889,7 @@ ov29_0232DCD4: ; 0x0232DCD4 mov r6, r2 mov r5, r3 mov r4, #0 - bl ov29_022FB0A8 + bl CountMovesOutOfPp cmp r0, #0 ble _0232DD10 ldrb r1, [r6, #6] @@ -1927,18 +1927,18 @@ _0232DD64: .align 2, 0 _0232DD70: .word 0x022C4944 _0232DD74: .word 0x00000EBC - arm_func_end ov29_0232DCD4 + arm_func_end DoMoveLastResort - arm_func_start ov29_0232DD78 -ov29_0232DD78: ; 0x0232DD78 + arm_func_start DoMoveTrickRoom +DoMoveTrickRoom: ; 0x0232DD78 stmdb sp!, {r3, lr} bl BoostOrLowerSpeed mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232DD78 + arm_func_end DoMoveTrickRoom - arm_func_start ov29_0232DD88 -ov29_0232DD88: ; 0x0232DD88 + arm_func_start DoMoveDamage__0232DD88 +DoMoveDamage__0232DD88: ; 0x0232DD88 stmdb sp!, {r3, lr} str r3, [sp] mov r3, #0x100 @@ -1948,17 +1948,17 @@ ov29_0232DD88: ; 0x0232DD88 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_0232DD88 + arm_func_end DoMoveDamage__0232DD88 - arm_func_start ov29_0232DDAC -ov29_0232DDAC: ; 0x0232DDAC + arm_func_start DoMoveWorrySeed +DoMoveWorrySeed: ; 0x0232DDAC stmdb sp!, {r4, r5, r6, lr} mov r4, #1 mov r3, r4 mov r2, #0x2a mov r6, r0 mov r5, r1 - bl DefenderAbilityIsActive__0232DE20 + bl DefenderAbilityIsActiveMoveEffects__0232DE20 cmp r0, #0 beq _0232DE00 mov r4, #0 @@ -1984,10 +1984,10 @@ _0232DE14: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0232DE1C: .word 0x00000F13 - arm_func_end ov29_0232DDAC + arm_func_end DoMoveWorrySeed - arm_func_start DefenderAbilityIsActive__0232DE20 -DefenderAbilityIsActive__0232DE20: ; 0x0232DE20 + arm_func_start DefenderAbilityIsActiveMoveEffects__0232DE20 +DefenderAbilityIsActiveMoveEffects__0232DE20: ; 0x0232DE20 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 @@ -2006,19 +2006,19 @@ _0232DE54: cmpne r3, #0 beq _0232DE74 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _0232DE74: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} - arm_func_end DefenderAbilityIsActive__0232DE20 + arm_func_end DefenderAbilityIsActiveMoveEffects__0232DE20 - arm_func_start ov29_0232DE84 -ov29_0232DE84: ; 0x0232DE84 + arm_func_start DoMoveDamageHpDependent +DoMoveDamageHpDependent: ; 0x0232DE84 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 ldr ip, [r1, #0xb4] @@ -2066,10 +2066,10 @@ _0232DF08: .align 2, 0 _0232DF30: .word 0x000003E7 _0232DF34: .word 0x022C49B4 - arm_func_end ov29_0232DE84 + arm_func_end DoMoveDamageHpDependent - arm_func_start ov29_0232DF38 -ov29_0232DF38: ; 0x0232DF38 + arm_func_start DoMoveHeartSwap +DoMoveHeartSwap: ; 0x0232DF38 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -2107,10 +2107,10 @@ ov29_0232DF38: ; 0x0232DF38 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232DFC4: .word 0x00000F2F - arm_func_end ov29_0232DF38 + arm_func_end DoMoveHeartSwap - arm_func_start ov29_0232DFC8 -ov29_0232DFC8: ; 0x0232DFC8 + arm_func_start DoMoveRoost +DoMoveRoost: ; 0x0232DFC8 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r0 @@ -2161,10 +2161,10 @@ _0232E070: .align 2, 0 _0232E07C: .word 0x022C4964 _0232E080: .word 0x00000CC9 - arm_func_end ov29_0232DFC8 + arm_func_end DoMoveRoost - arm_func_start ov29_0232E084 -ov29_0232E084: ; 0x0232E084 + arm_func_start DoMovePowerSwap +DoMovePowerSwap: ; 0x0232E084 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -2190,19 +2190,19 @@ ov29_0232E084: ; 0x0232E084 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232E0E0: .word 0x00000F2B - arm_func_end ov29_0232E084 + arm_func_end DoMovePowerSwap - arm_func_start ov29_0232E0E4 -ov29_0232E0E4: ; 0x0232E0E4 + arm_func_start DoMovePowerTrick +DoMovePowerTrick: ; 0x0232E0E4 stmdb sp!, {r3, lr} mov r2, #1 bl ov29_0230DAB8 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232E0E4 + arm_func_end DoMovePowerTrick - arm_func_start ov29_0232E0F8 -ov29_0232E0F8: ; 0x0232E0F8 + arm_func_start DoMoveFeint +DoMoveFeint: ; 0x0232E0F8 stmdb sp!, {r3, r4, r5, lr} str r3, [sp] mov r3, #0x100 @@ -2214,20 +2214,20 @@ ov29_0232E0F8: ; 0x0232E0F8 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 mov r1, r4 - bl ov29_02307D18 + bl EndProtectStatus mov r0, #1 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0232E0F8 + arm_func_end DoMoveFeint - arm_func_start ov29_0232E130 -ov29_0232E130: ; 0x0232E130 + arm_func_start DoMoveFlareBlitz +DoMoveFlareBlitz: ; 0x0232E130 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x18 mov r5, r0 mov r7, r1 mov r4, r2 mov r6, r3 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r5 mov r1, r7 mov r2, r4 @@ -2238,7 +2238,7 @@ ov29_0232E130: ; 0x0232E130 moveq r0, #0 beq _0232E240 mov r0, r5 - bl EntityIsValid__0232E250 + bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E1B4 ldr r1, _0232E248 ; =0x022C4684 @@ -2256,12 +2256,12 @@ ov29_0232E130: ; 0x0232E130 bl TryInflictBurnStatus _0232E1B4: mov r0, r5 - bl EntityIsValid__0232E250 + bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E23C mov r0, r5 mov r1, #7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0232E23C ldr r1, [r5, #0xb4] @@ -2297,4 +2297,4 @@ _0232E240: .align 2, 0 _0232E248: .word 0x022C4684 _0232E24C: .word 0x000003E7 - arm_func_end ov29_0232E130 + arm_func_end DoMoveFlareBlitz diff --git a/asm/overlay_29_0232E274.s b/asm/overlay_29_0232E274.s index c248bebb..1d59e455 100644 --- a/asm/overlay_29_0232E274.s +++ b/asm/overlay_29_0232E274.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0232E274 -ov29_0232E274: ; 0x0232E274 + arm_func_start DoMoveDefendOrder +DoMoveDefendOrder: ; 0x0232E274 stmdb sp!, {r3, r4, r5, lr} ldr r2, _0232E2B0 ; =0x02352AEC mov r3, #1 @@ -23,16 +23,16 @@ ov29_0232E274: ; 0x0232E274 .align 2, 0 _0232E2B0: .word 0x02352AEC _0232E2B4: .word 0x02352AE8 - arm_func_end ov29_0232E274 + arm_func_end DoMoveDefendOrder - arm_func_start ov29_0232E2B8 -ov29_0232E2B8: ; 0x0232E2B8 + arm_func_start DoMoveFireFang +DoMoveFireFang: ; 0x0232E2B8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 mov r5, r2 mov r4, r3 - bl ov29_02307C78 + bl EndFrozenStatus mov r0, r7 mov r1, r6 mov r2, r5 @@ -74,10 +74,10 @@ _0232E358: .align 2, 0 _0232E360: .word 0x022C4684 _0232E364: .word 0x022C449C - arm_func_end ov29_0232E2B8 + arm_func_end DoMoveFireFang - arm_func_start ov29_0232E368 -ov29_0232E368: ; 0x0232E368 + arm_func_start DoMoveLunarDance +DoMoveLunarDance: ; 0x0232E368 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -94,26 +94,26 @@ ov29_0232E368: ; 0x0232E368 mov r0, r5 mov r1, r4 mov r3, #0 - bl RestoreMovePP + bl RestoreAllMovePP mov r2, #1 mov r0, r5 mov r1, r4 mov r3, r2 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232E3C8: .word 0x022C46F4 _0232E3CC: .word 0x000003E7 - arm_func_end ov29_0232E368 + arm_func_end DoMoveLunarDance - arm_func_start ov29_0232E3D0 -ov29_0232E3D0: ; 0x0232E3D0 + arm_func_start DoMoveMiracleEye +DoMoveMiracleEye: ; 0x0232E3D0 stmdb sp!, {r3, r4, r5, lr} mov r2, #0 mov r5, r0 mov r4, r1 - bl ov29_02318850 + bl TryInflictMiracleEyeStatus mov r2, #1 mov r0, r5 mov r1, r4 @@ -121,10 +121,10 @@ ov29_0232E3D0: ; 0x0232E3D0 bl ResetHitChanceStat mov r0, #1 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0232E3D0 + arm_func_end DoMoveMiracleEye - arm_func_start ov29_0232E400 -ov29_0232E400: ; 0x0232E400 + arm_func_start DoMoveWakeUpSlap +DoMoveWakeUpSlap: ; 0x0232E400 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r5, r1 @@ -149,7 +149,7 @@ ov29_0232E400: ; 0x0232E400 mov r3, #1 str r2, [sp] and r4, r4, #0xff - bl ov29_02305FDC + bl EndSleepClassStatus b _0232E480 _0232E468: mov r3, #0x100 @@ -162,19 +162,19 @@ _0232E480: mov r0, r4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_0232E400 + arm_func_end DoMoveWakeUpSlap - arm_func_start ov29_0232E48C -ov29_0232E48C: ; 0x0232E48C + arm_func_start DoMoveMetalBurst +DoMoveMetalBurst: ; 0x0232E48C stmdb sp!, {r3, lr} mov r2, #0xf bl ov29_02318D98 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232E48C + arm_func_end DoMoveMetalBurst - arm_func_start ov29_0232E4A0 -ov29_0232E4A0: ; 0x0232E4A0 + arm_func_start DoMoveHeadSmash +DoMoveHeadSmash: ; 0x0232E4A0 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x18 str r3, [sp] @@ -186,12 +186,12 @@ ov29_0232E4A0: ; 0x0232E4A0 moveq r0, #0 beq _0232E554 mov r0, r5 - bl EntityIsValid__0232E250 + bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E550 mov r0, r5 mov r1, #7 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 bne _0232E550 ldr r1, [r5, #0xb4] @@ -226,10 +226,10 @@ _0232E554: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232E55C: .word 0x000003E7 - arm_func_end ov29_0232E4A0 + arm_func_end DoMoveHeadSmash - arm_func_start ov29_0232E560 -ov29_0232E560: ; 0x0232E560 + arm_func_start DoMoveCaptivate +DoMoveCaptivate: ; 0x0232E560 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 mov r6, r0 @@ -246,7 +246,7 @@ ov29_0232E560: ; 0x0232E560 mov r1, r5 mov r2, #0x29 mov r3, #1 - bl DefenderAbilityIsActive__0232DE20 + bl DefenderAbilityIsActiveMoveEffects__0232DE20 cmp r0, #0 bne _0232E5D4 ldr r0, _0232E61C ; =0x02352AE8 @@ -263,7 +263,7 @@ _0232E5D4: cmp r4, #0 bne _0232E610 mov r0, r5 - bl EntityIsValid__0232E250 + bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 moveq r0, r4 beq _0232E614 @@ -283,10 +283,10 @@ _0232E614: .align 2, 0 _0232E61C: .word 0x02352AE8 _0232E620: .word 0x00000F0F - arm_func_end ov29_0232E560 + arm_func_end DoMoveCaptivate - arm_func_start ov29_0232E624 -ov29_0232E624: ; 0x0232E624 + arm_func_start DoMoveLeafStorm +DoMoveLeafStorm: ; 0x0232E624 stmdb sp!, {r4, lr} sub sp, sp, #8 str r3, [sp] @@ -311,10 +311,10 @@ _0232E670: ldmia sp!, {r4, pc} .align 2, 0 _0232E678: .word 0x02352AE8 - arm_func_end ov29_0232E624 + arm_func_end DoMoveLeafStorm - arm_func_start ov29_0232E67C -ov29_0232E67C: ; 0x0232E67C + arm_func_start DoMoveDracoMeteor +DoMoveDracoMeteor: ; 0x0232E67C stmdb sp!, {r4, lr} sub sp, sp, #8 str r3, [sp] @@ -343,10 +343,10 @@ _0232E6D4: ldmia sp!, {r4, pc} .align 2, 0 _0232E6DC: .word 0x02352AE8 - arm_func_end ov29_0232E67C + arm_func_end DoMoveDracoMeteor - arm_func_start ov29_0232E6E0 -ov29_0232E6E0: ; 0x0232E6E0 + arm_func_start DoMoveRockPolish +DoMoveRockPolish: ; 0x0232E6E0 stmdb sp!, {r3, r4, r5, lr} mov r2, #0 mov r5, r0 @@ -360,10 +360,10 @@ ov29_0232E6E0: ; 0x0232E6E0 bl BoostSpeedOneStage mov r0, #1 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0232E6E0 + arm_func_end DoMoveRockPolish - arm_func_start ov29_0232E714 -ov29_0232E714: ; 0x0232E714 + arm_func_start DoMoveNastyPlot +DoMoveNastyPlot: ; 0x0232E714 stmdb sp!, {r3, lr} ldr r2, _0232E730 ; =0x02352AE8 mov r3, #2 @@ -373,26 +373,26 @@ ov29_0232E714: ; 0x0232E714 ldmia sp!, {r3, pc} .align 2, 0 _0232E730: .word 0x02352AE8 - arm_func_end ov29_0232E714 + arm_func_end DoMoveNastyPlot - arm_func_start ov29_0232E734 -ov29_0232E734: ; 0x0232E734 + arm_func_start DoMoveTag0x1AB +DoMoveTag0x1AB: ; 0x0232E734 stmdb sp!, {r3, lr} - bl ov29_02314E60 + bl TryInflictTerrifiedStatus mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_0232E734 + arm_func_end DoMoveTag0x1AB arm_func_start ov29_0232E744 ov29_0232E744: ; 0x0232E744 - ldr ip, _0232E74C ; =ov29_0232CA70 + ldr ip, _0232E74C ; =DoMoveEscape bx ip .align 2, 0 -_0232E74C: .word ov29_0232CA70 +_0232E74C: .word DoMoveEscape arm_func_end ov29_0232E744 - arm_func_start ov29_0232E750 -ov29_0232E750: ; 0x0232E750 + arm_func_start DoMoveTag0x1A6 +DoMoveTag0x1A6: ; 0x0232E750 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 @@ -404,16 +404,16 @@ ov29_0232E750: ; 0x0232E750 mov r1, r6 mov r2, r5 mov r3, r4 - bl ov29_0232C578 + bl DoMoveCleanse mov r4, r0 mov r0, #0 bl ov29_0234AFFC mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_0232E750 + arm_func_end DoMoveTag0x1A6 - arm_func_start ov29_0232E794 -ov29_0232E794: ; 0x0232E794 + arm_func_start DoMoveTag0x1A7 +DoMoveTag0x1A7: ; 0x0232E794 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -423,16 +423,16 @@ ov29_0232E794: ; 0x0232E794 mov r1, r4 mov r2, #1 mov r3, #0 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper ldr r2, _0232E808 ; =0x000003E7 mov r0, r5 mov r1, r4 - bl ov29_0231526C + bl TryRestoreHp mov r0, r5 mov r1, r4 ldr r2, _0232E808 ; =0x000003E7 mov r3, #1 - bl RestoreMovePP + bl RestoreAllMovePP ldr r1, [r4, #0xb4] mov r0, #0 add r1, r1, #0x100 @@ -445,7 +445,7 @@ ov29_0232E794: ; 0x0232E794 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0232E808: .word 0x000003E7 - arm_func_end ov29_0232E794 + arm_func_end DoMoveTag0x1A7 arm_func_start ov29_0232E80C ov29_0232E80C: ; 0x0232E80C diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 75448b5d..9ec81f7e 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -158,7 +158,7 @@ _0232EA6C: _0232EAAC: mov r0, r4 mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _0232EAD0 @@ -201,7 +201,7 @@ _0232EAEC: bne _0232EE54 ldrb r5, [sl, #0x4c] str r5, [sp, #0x50] - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 beq _0232EB78 mov r0, sb @@ -250,7 +250,7 @@ _0232EB84: beq _0232ED48 _0232EC0C: mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0232ECA0 mov r0, #0 @@ -437,13 +437,13 @@ _0232EE54: bne _0232EF48 mov r0, sb mov r1, #0x56 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0232EF28 mov r0, sb mov r1, r4 mov r2, #1 - bl ov29_022FB10C + bl HasSuperEffectiveMoveAgainstUser cmp r0, #0 bne _0232EF00 mov r0, r4 @@ -464,16 +464,16 @@ _0232EF00: _0232EF28: mov r0, sb mov r1, #0x52 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _0232EF48 mov r0, sb mov r1, r4 - bl ov29_0231B0A4 + bl TryActivateFrisk _0232EF48: mov r0, sb mov r1, r8 - bl ov29_023245A4 + bl IsChargingTwoTurnMove cmp r0, #0 bne _0232EF74 ldrh r1, [r8, #4] @@ -560,7 +560,7 @@ _0232F060: b _0232F188 _0232F090: mov r0, r4 - bl ov29_02319748 + bl MirrorMoveIsActive str r0, [sp, #0x3c] cmp r0, #0 beq _0232F188 @@ -658,7 +658,7 @@ _0232F188: _0232F204: mov r0, r4 mov r1, r8 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 movne fp, #0 cmp fp, #0 @@ -730,7 +730,7 @@ _0232F2F0: mov r1, r4 ldr r2, _0232F82C ; =0x00000EBA mov r3, #2 - bl ov29_0234B250 + bl LogMessageByIdWithPopupCheckParticipants mov fp, #0 b _0232F350 _0232F330: @@ -753,7 +753,7 @@ _0232F350: movne fp, #0 _0232F370: mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0232F40C mov r0, #4 @@ -773,7 +773,7 @@ _0232F3B0: cmp r0, #0xad bne _0232F3C4 mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething _0232F3C4: ldr r0, [sp, #0x38] cmp r0, #0 @@ -786,14 +786,14 @@ _0232F3C4: mov r0, sb mov r2, r8 mov r3, #0 - bl ov29_023256B4 + bl PlayMoveAnimation b _0232F40C _0232F3F8: mov r0, sb mov r1, r4 mov r2, r8 mov r3, #0 - bl ov29_023256B4 + bl PlayMoveAnimation _0232F40C: ldr r0, _0232F830 ; =0x000001F6 cmp r6, r0 @@ -822,7 +822,7 @@ _0232F424: _0232F468: mov r0, sb mov r1, r4 - bl ov29_022FB678 + bl AreEntitiesAdjacent cmp r0, #0 moveq sl, #2 mov r0, #0 @@ -905,7 +905,7 @@ _0232F590: bl LogMessageByIdWithPopupCheckUserTarget _0232F598: mov r0, r4 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _0232F5BC ldr r0, _0232F858 ; =0x0000270F @@ -924,7 +924,7 @@ _0232F5BC: mov r0, sb mov r2, r8 mov r3, r7 - bl ov29_02329B68 + bl DoMoveHiJumpKick b _0232F608 _0232F5EC: mov r1, r4 @@ -933,7 +933,7 @@ _0232F5EC: mov r0, sb mov r2, r8 mov r3, r7 - bl ov29_02329970 + bl DoMoveJumpKick _0232F608: ldr r0, [sp, #0x70] add r0, r0, #1 @@ -1112,7 +1112,7 @@ _0232F87C: bne _0232F8A0 mov r0, sb mov r1, r4 - bl ov29_0230D440 + bl UpdateShopkeeperModeAfterAttack _0232F8A0: ldr r0, _0232F85C ; =0x0000021E mov r1, #1 @@ -1485,7 +1485,7 @@ _0232F8B8: ; jump table b _02331CC4 ; case 361 b _02330134 ; case 362 b ov29_02331A40 ; case 363 - b ov01_023310E4 ; case 364 + b CreateMainMenus ; case 364 b ov29_02331DC0 ; case 365 b _02330134 ; case 366 b ov29_023315D8 ; case 367 @@ -1669,7 +1669,7 @@ _02330134: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325DC0 + bl DoMoveDamage__02325DC0 mov sl, r0 b _023326CC arm_func_end ExecuteMoveEffect @@ -1702,13 +1702,13 @@ ov29_02330150: ; 0x02330150 bl CalcDamage mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r0, sb mov r1, r4 mov r2, r8 add r3, sp, #0xdc - bl CalcDamageFinal + bl PerformDamageSequence cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1741,13 +1741,13 @@ _023301E8: bl CalcDamage mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r0, sb mov r1, r4 mov r2, r8 add r3, sp, #0xc8 - bl CalcDamageFinal + bl PerformDamageSequence cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1761,7 +1761,7 @@ ov29_02330280: ; 0x02330280 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328F94 + bl DoMoveWaterfall mov sl, r0 b _023326CC arm_func_end ov29_02330280 @@ -1772,7 +1772,7 @@ ov29_0233029C: ; 0x0233029C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328074 + bl DoMoveEarthquake mov sl, r0 b _023326CC _023302B8: @@ -1780,7 +1780,7 @@ _023302B8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326E20 + bl DoMoveGust mov sl, r0 b _023326CC arm_func_end ov29_0233029C @@ -1791,7 +1791,7 @@ ov29_023302D4: ; 0x023302D4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C1A4 + bl DoMoveStruggle mov sl, r0 b _023326CC _023302F0: @@ -1799,7 +1799,7 @@ _023302F0: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326CC8 + bl DoMoveDamageBurn10FlameWheel mov sl, r0 b _023326CC _0233030C: @@ -1807,7 +1807,7 @@ _0233030C: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326D50 + bl DoMoveDamageBurn10 mov sl, r0 b _023326CC arm_func_end ov29_023302D4 @@ -1818,7 +1818,7 @@ ov29_02330328: ; 0x02330328 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327AF4 + bl DoMoveDamageFreeze15 mov sl, r0 b _023326CC arm_func_end ov29_02330328 @@ -1829,7 +1829,7 @@ ov29_02330344: ; 0x02330344 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A500 + bl DoMoveDamage__0232A500 mov sl, r0 b _023326CC arm_func_end ov29_02330344 @@ -1840,7 +1840,7 @@ ov29_02330360: ; 0x02330360 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023268BC + bl DoMoveFocusEnergy mov sl, r0 b _023326CC _0233037C: @@ -1870,13 +1870,13 @@ _0233037C: bl CalcDamage mov r0, r8 mov r1, r7 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r0, sb mov r1, r4 mov r2, r8 add r3, sp, #0xb4 - bl CalcDamageFinal + bl PerformDamageSequence cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -1890,7 +1890,7 @@ ov29_02330414: ; 0x02330414 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023283A4 + bl DoMoveFissure mov sl, r0 b _023326CC arm_func_end ov29_02330414 @@ -1901,7 +1901,7 @@ ov29_02330430: ; 0x02330430 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328B88 + bl DoMoveOhko mov sl, r0 b _023326CC arm_func_end ov29_02330430 @@ -1912,7 +1912,7 @@ ov29_0233044C: ; 0x0233044C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CDA4 + bl DoMoveOneShot mov sl, r0 b _023326CC arm_func_end ov29_0233044C @@ -1923,7 +1923,7 @@ ov29_02330468: ; 0x02330468 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B5E8 + bl DoMoveDamageConstrict10 mov sl, r0 b _023326CC _02330484: @@ -1931,7 +1931,7 @@ _02330484: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326750 + bl DoMoveWhirlpool mov sl, r0 b _023326CC arm_func_end ov29_02330468 @@ -1942,7 +1942,7 @@ ov29_023304A0: ; 0x023304A0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A148 + bl DoMoveSurf mov sl, r0 b _023326CC arm_func_end ov29_023304A0 @@ -1953,7 +1953,7 @@ ov29_023304BC: ; 0x023304BC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327744 + bl DoMoveShadowHold mov sl, r0 b _023326CC arm_func_end ov29_023304BC @@ -1964,7 +1964,7 @@ ov29_023304D8: ; 0x023304D8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329904 + bl DoMoveDamagePoison18 mov sl, r0 b _023326CC arm_func_end ov29_023304D8 @@ -1979,7 +1979,7 @@ ov29_023304F4: ; 0x023304F4 mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_023304F4 @@ -1994,7 +1994,7 @@ ov29_02330520: ; 0x02330520 mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_02330520 @@ -2009,7 +2009,7 @@ ov29_0233054C: ; 0x0233054C mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_0233054C @@ -2024,7 +2024,7 @@ ov29_02330578: ; 0x02330578 mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_02330578 @@ -2039,7 +2039,7 @@ ov29_023305A4: ; 0x023305A4 mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_023305A4 @@ -2055,7 +2055,7 @@ ov29_023305D0: ; 0x023305D0 mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_02327CD8 + bl DoMoveDamageLowerDefensiveStatVariable mov sl, r0 b _023326CC arm_func_end ov29_023305D0 @@ -2068,7 +2068,7 @@ ov29_02330600: ; 0x02330600 mov r1, r4 mov r2, r8 str r7, [sp] - bl ov29_0232B940 + bl DoMoveMetalClaw mov sl, r0 b _023326CC arm_func_end ov29_02330600 @@ -2081,7 +2081,7 @@ ov29_02330624: ; 0x02330624 mov r1, r4 mov r2, r8 str r7, [sp] - bl ov29_0232A5AC + bl DoMoveSteelWing mov sl, r0 b _023326CC arm_func_end ov29_02330624 @@ -2092,7 +2092,7 @@ ov29_02330648: ; 0x02330648 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B494 + bl DoMovePoisonTail mov sl, r0 b _023326CC arm_func_end ov29_02330648 @@ -2103,7 +2103,7 @@ ov29_02330664: ; 0x02330664 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023290CC + bl DoMoveTwister mov sl, r0 b _023326CC arm_func_end ov29_02330664 @@ -2114,7 +2114,7 @@ ov29_02330680: ; 0x02330680 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232728C + bl DoMoveDamageLowerSpeed20 mov sl, r0 b _023326CC arm_func_end ov29_02330680 @@ -2125,7 +2125,7 @@ ov29_0233069C: ; 0x0233069C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327804 + bl DoMoveDamageBoostAllStats mov sl, r0 b _023326CC arm_func_end ov29_0233069C @@ -2136,7 +2136,7 @@ ov29_023306B8: ; 0x023306B8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327C08 + bl DoMoveDamageConfuse10 mov sl, r0 b _023326CC arm_func_end ov29_023306B8 @@ -2147,7 +2147,7 @@ ov29_023306D4: ; 0x023306D4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B820 + bl DoMoveMistBall mov sl, r0 b _023326CC arm_func_end ov29_023306D4 @@ -2158,7 +2158,7 @@ ov29_023306F0: ; 0x023306F0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C0F4 + bl DoMoveDamageLowerSpecialDefense50 mov sl, r0 b _023326CC arm_func_end ov29_023306F0 @@ -2169,7 +2169,7 @@ ov29_0233070C: ; 0x0233070C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B164 + bl DoMoveCrushClaw mov sl, r0 b _023326CC arm_func_end ov29_0233070C @@ -2180,7 +2180,7 @@ ov29_02330728: ; 0x02330728 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328A74 + bl DoMoveDamagePoison40 mov sl, r0 b _023326CC arm_func_end ov29_02330728 @@ -2191,7 +2191,7 @@ ov29_02330744: ; 0x02330744 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328B00 + bl DoMoveSacredFire mov sl, r0 b _023326CC arm_func_end ov29_02330744 @@ -2202,7 +2202,7 @@ ov29_02330760: ; 0x02330760 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329710 + bl DoMoveThundershock mov sl, r0 b _023326CC arm_func_end ov29_02330760 @@ -2213,7 +2213,7 @@ ov29_0233077C: ; 0x0233077C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232816C + bl DoMoveDamageParalyze10 mov sl, r0 b _023326CC arm_func_end ov29_0233077C @@ -2224,7 +2224,7 @@ ov29_02330798: ; 0x02330798 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023284BC + bl DoMoveDamageCringe10 mov sl, r0 b _023326CC _023307B4: @@ -2232,7 +2232,7 @@ _023307B4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023270B4 + bl DoMoveDamageCringe20 mov sl, r0 b _023326CC arm_func_end ov29_02330798 @@ -2243,7 +2243,7 @@ ov29_023307D0: ; 0x023307D0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023288C4 + bl DoMoveHeadbutt mov sl, r0 b _023326CC _023307EC: @@ -2251,7 +2251,7 @@ _023307EC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326670 + bl DoMoveDamageCringe30 mov sl, r0 b _023326CC _02330808: @@ -2259,7 +2259,7 @@ _02330808: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327034 + bl DoMoveCrunch mov sl, r0 b _023326CC arm_func_end ov29_023307D0 @@ -2270,7 +2270,7 @@ ov29_02330824: ; 0x02330824 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328248 + bl DoMoveShadowBall mov sl, r0 b _023326CC arm_func_end ov29_02330824 @@ -2281,7 +2281,7 @@ ov29_02330840: ; 0x02330840 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AEF0 + bl DoMoveDamageConfuse30 mov sl, r0 b _023326CC arm_func_end ov29_02330840 @@ -2292,7 +2292,7 @@ ov29_0233085C: ; 0x0233085C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329C94 + bl DoMoveTriAttack mov sl, r0 b _023326CC arm_func_end ov29_0233085C @@ -2303,7 +2303,7 @@ ov29_02330878: ; 0x02330878 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327B5C + bl DoMoveMeteorMash mov sl, r0 b _023326CC arm_func_end ov29_02330878 @@ -2314,7 +2314,7 @@ ov29_02330894: ; 0x02330894 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B1E4 + bl DoMoveBlazeKick mov sl, r0 b _023326CC arm_func_end ov29_02330894 @@ -2325,7 +2325,7 @@ ov29_023308B0: ; 0x023308B0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B9D0 + bl DoMoveAttract mov sl, r0 b _023326CC _023308CC: @@ -2333,7 +2333,7 @@ _023308CC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326E80 + bl DoMoveParalyze__02326E80 mov sl, r0 b _023326CC arm_func_end ov29_023308B0 @@ -2344,7 +2344,7 @@ ov29_023308E8: ; 0x023308E8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A2BC + bl DoMoveFakeOut mov sl, r0 b _023326CC arm_func_end ov29_023308E8 @@ -2355,7 +2355,7 @@ ov29_02330904: ; 0x02330904 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328D44 + bl DoMoveSonicBoom mov sl, r0 b _023326CC arm_func_end ov29_02330904 @@ -2366,7 +2366,7 @@ ov29_02330920: ; 0x02330920 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BF88 + bl DoMoveDragonRage mov sl, r0 b _023326CC arm_func_end ov29_02330920 @@ -2377,7 +2377,7 @@ ov29_0233093C: ; 0x0233093C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328230 + bl DoMoveParalyze__02328230 mov sl, r0 b _023326CC _02330958: @@ -2385,7 +2385,7 @@ _02330958: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327120 + bl DoMoveDamageParalyze20 mov sl, r0 b _023326CC _02330974: @@ -2393,7 +2393,7 @@ _02330974: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325F00 + bl DoMoveSleep mov sl, r0 b _023326CC _02330990: @@ -2401,7 +2401,7 @@ _02330990: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325EC4 + bl DoMoveYawn mov sl, r0 b _023326CC arm_func_end ov29_0233093C @@ -2412,7 +2412,7 @@ ov29_023309AC: ; 0x023309AC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328328 + bl DoMoveThunderbolt mov sl, r0 b _023326CC arm_func_end ov29_023309AC @@ -2423,7 +2423,7 @@ ov29_023309C8: ; 0x023309C8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329854 + bl DoMoveBlock mov sl, r0 b _023326CC arm_func_end ov29_023309C8 @@ -2434,7 +2434,7 @@ ov29_023309E4: ; 0x023309E4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329438 + bl DoMoveHornDrill mov sl, r0 b _023326CC _02330A00: @@ -2442,7 +2442,7 @@ _02330A00: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023293CC + bl DoMoveConfuse mov sl, r0 b _023326CC arm_func_end ov29_023309E4 @@ -2453,7 +2453,7 @@ ov29_02330A1C: ; 0x02330A1C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329868 + bl DoMovePoison mov sl, r0 b _023326CC arm_func_end ov29_02330A1C @@ -2464,7 +2464,7 @@ ov29_02330A38: ; 0x02330A38 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232977C + bl DoMoveThunderWave mov sl, r0 b _023326CC arm_func_end ov29_02330A38 @@ -2475,7 +2475,7 @@ ov29_02330A54: ; 0x02330A54 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B434 + bl DoMoveParalyze__0232B434 mov sl, r0 b _023326CC arm_func_end ov29_02330A54 @@ -2486,7 +2486,7 @@ ov29_02330A70: ; 0x02330A70 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023297F0 + bl DoMoveZapCannon mov sl, r0 b _023326CC arm_func_end ov29_02330A70 @@ -2497,7 +2497,7 @@ ov29_02330A8C: ; 0x02330A8C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A524 + bl DoMoveSuperpower mov sl, r0 b _023326CC arm_func_end ov29_02330A8C @@ -2508,7 +2508,7 @@ ov29_02330AA8: ; 0x02330AA8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327368 + bl DoMoveDamageLowerSpeed100 mov sl, r0 b _023326CC arm_func_end ov29_02330AA8 @@ -2519,7 +2519,7 @@ ov29_02330AC4: ; 0x02330AC4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A688 + bl DoMoveDynamicPunch mov sl, r0 b _023326CC _02330AE0: @@ -2527,7 +2527,7 @@ _02330AE0: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023267D8 + bl DoMoveFakeTears mov sl, r0 b _023326CC arm_func_end ov29_02330AC4 @@ -2538,7 +2538,7 @@ ov29_02330AFC: ; 0x02330AFC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B500 + bl DoMoveBlowback mov sl, r0 b _023326CC _02330B18: @@ -2546,7 +2546,7 @@ _02330B18: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232631C + bl DoMovePainSplit mov sl, r0 b _023326CC arm_func_end ov29_02330AFC @@ -2557,7 +2557,7 @@ ov29_02330B34: ; 0x02330B34 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B5C8 + bl DoMoveTailGlow mov sl, r0 b _023326CC arm_func_end ov29_02330B34 @@ -2568,7 +2568,7 @@ ov29_02330B50: ; 0x02330B50 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232923C + bl DoMoveMinimize mov sl, r0 b _023326CC arm_func_end ov29_02330B50 @@ -2579,7 +2579,7 @@ ov29_02330B6C: ; 0x02330B6C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C028 + bl DoMoveDragonDance mov sl, r0 b _023326CC arm_func_end ov29_02330B6C @@ -2590,7 +2590,7 @@ ov29_02330B88: ; 0x02330B88 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AF5C + bl DoMoveBulkUp mov sl, r0 b _023326CC _02330BA4: @@ -2598,7 +2598,7 @@ _02330BA4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326E98 + bl DoMoveBoostAttack1 mov sl, r0 b _023326CC _02330BC0: @@ -2606,7 +2606,7 @@ _02330BC0: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326220 + bl DoMoveRage mov sl, r0 b _023326CC arm_func_end ov29_02330B88 @@ -2617,7 +2617,7 @@ ov29_02330BDC: ; 0x02330BDC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329534 + bl DoMoveSwordsDance mov sl, r0 b _023326CC arm_func_end ov29_02330BDC @@ -2628,7 +2628,7 @@ ov29_02330BF8: ; 0x02330BF8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B8E4 + bl DoMoveCalmMind mov sl, r0 b _023326CC arm_func_end ov29_02330BF8 @@ -2639,7 +2639,7 @@ ov29_02330C14: ; 0x02330C14 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328AE0 + bl DoMoveGrowth mov sl, r0 b _023326CC arm_func_end ov29_02330C14 @@ -2650,7 +2650,7 @@ ov29_02330C30: ; 0x02330C30 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A058 + bl DoMoveAmnesia mov sl, r0 b _023326CC arm_func_end ov29_02330C30 @@ -2661,7 +2661,7 @@ ov29_02330C4C: ; 0x02330C4C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B7E0 + bl DoMoveDefenseCurl mov sl, r0 b _023326CC arm_func_end ov29_02330C4C @@ -2672,7 +2672,7 @@ ov29_02330C68: ; 0x02330C68 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023296D8 + bl DoMoveBoostDefense2 mov sl, r0 b _023326CC arm_func_end ov29_02330C68 @@ -2683,7 +2683,7 @@ ov29_02330C84: ; 0x02330C84 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023279E4 + bl DoMoveCosmicPower mov sl, r0 b _023326CC arm_func_end ov29_02330C84 @@ -2694,7 +2694,7 @@ ov29_02330CA0: ; 0x02330CA0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329000 + bl DoMoveDamageLowerAccuracy40 mov sl, r0 b _023326CC _02330CBC: @@ -2702,7 +2702,7 @@ _02330CBC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326A74 + bl DoMoveOctazooka mov sl, r0 b _023326CC _02330CD8: @@ -2710,7 +2710,7 @@ _02330CD8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326990 + bl DoMoveAuroraBeam mov sl, r0 b _023326CC arm_func_end ov29_02330CA0 @@ -2721,7 +2721,7 @@ ov29_02330CF4: ; 0x02330CF4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327D60 + bl DoMovePsychoBoost mov sl, r0 b _023326CC arm_func_end ov29_02330CF4 @@ -2732,7 +2732,7 @@ ov29_02330D10: ; 0x02330D10 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327BF0 + bl DoMoveLowerSpeed1 mov sl, r0 b _023326CC arm_func_end ov29_02330D10 @@ -2743,7 +2743,7 @@ ov29_02330D2C: ; 0x02330D2C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A118 + bl DoMoveGrowl mov sl, r0 b _023326CC arm_func_end ov29_02330D2C @@ -2754,7 +2754,7 @@ ov29_02330D48: ; 0x02330D48 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AFF0 + bl DoMoveFeatherDance mov sl, r0 b _023326CC _02330D64: @@ -2762,7 +2762,7 @@ _02330D64: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326648 + bl DoMoveScreech mov sl, r0 b _023326CC arm_func_end ov29_02330D48 @@ -2773,7 +2773,7 @@ ov29_02330D80: ; 0x02330D80 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329258 + bl DoMoveSeismicToss mov sl, r0 b _023326CC arm_func_end ov29_02330D80 @@ -2784,7 +2784,7 @@ ov29_02330D9C: ; 0x02330D9C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov01_0232A078 + bl DoMoveNightShade mov sl, r0 b _023326CC arm_func_end ov29_02330D9C @@ -2795,7 +2795,7 @@ ov29_02330DB8: ; 0x02330DB8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327458 + bl DoMoveDamageDrain mov sl, r0 b _023326CC arm_func_end ov29_02330DB8 @@ -2806,7 +2806,7 @@ ov29_02330DD4: ; 0x02330DD4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328930 + bl DoMoveDoubleEdge mov sl, r0 b _023326CC arm_func_end ov29_02330DD4 @@ -2817,7 +2817,7 @@ ov29_02330DF0: ; 0x02330DF0 mov r1, r4 mov r2, r8 mov r3, r7 - bl DealDamageWithRecoil + bl DoMoveDamageWithRecoil mov sl, r0 b _023326CC arm_func_end ov29_02330DF0 @@ -2828,7 +2828,7 @@ ov29_02330E0C: ; 0x02330E0C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328538 + bl DoMoveAbsorb mov sl, r0 b _023326CC _02330E28: @@ -2836,7 +2836,7 @@ _02330E28: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326568 + bl DoMoveSwagger mov sl, r0 b _023326CC arm_func_end ov29_02330E0C @@ -2847,7 +2847,7 @@ ov29_02330E44: ; 0x02330E44 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329F78 + bl DoMoveTripleKick mov sl, r0 b _023326CC arm_func_end ov29_02330E44 @@ -2858,7 +2858,7 @@ ov29_02330E60: ; 0x02330E60 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232915C + bl DoMoveTwineedle mov sl, r0 b _023326CC arm_func_end ov29_02330E60 @@ -2869,7 +2869,7 @@ ov29_02330E7C: ; 0x02330E7C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328C74 + bl DoMoveSolarBeam mov sl, r0 b _023326CC arm_func_end ov29_02330E7C @@ -2880,7 +2880,7 @@ ov29_02330E98: ; 0x02330E98 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327A28 + bl DoMoveSkyAttack mov sl, r0 b _023326CC arm_func_end ov29_02330E98 @@ -2891,7 +2891,7 @@ ov29_02330EB4: ; 0x02330EB4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA14 + bl DoMoveSlowDown mov sl, r0 b _023326CC arm_func_end ov29_02330EB4 @@ -2902,7 +2902,7 @@ ov29_02330ED0: ; 0x02330ED0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232776C + bl DoMoveDamageMultihitFatigue mov sl, r0 b _023326CC arm_func_end ov29_02330ED0 @@ -2913,7 +2913,7 @@ ov29_02330EEC: ; 0x02330EEC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B6B8 + bl DoMoveWrap mov sl, r0 b _023326CC arm_func_end ov29_02330EEC @@ -2924,7 +2924,7 @@ ov29_02330F08: ; 0x02330F08 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327DD0 + bl DoMoveUproar mov sl, r0 b _023326CC arm_func_end ov29_02330F08 @@ -2935,7 +2935,7 @@ ov29_02330F24: ; 0x02330F24 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329898 + bl DoMovePoisonFang mov sl, r0 b _023326CC arm_func_end ov29_02330F24 @@ -2946,7 +2946,7 @@ ov29_02330F40: ; 0x02330F40 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B26C + bl DoMovePresent mov sl, r0 b _023326CC arm_func_end ov29_02330F40 @@ -2957,7 +2957,7 @@ ov29_02330F5C: ; 0x02330F5C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BF78 + bl DoMoveReflect mov sl, r0 b _023326CC arm_func_end ov29_02330F5C @@ -2968,7 +2968,7 @@ ov29_02330F78: ; 0x02330F78 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023289F8 + bl DoMoveSandstorm mov sl, r0 b _023326CC arm_func_end ov29_02330F78 @@ -2979,7 +2979,7 @@ ov29_02330F94: ; 0x02330F94 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328528 + bl DoMoveSafeguard mov sl, r0 b _023326CC arm_func_end ov29_02330F94 @@ -2990,7 +2990,7 @@ ov29_02330FB0: ; 0x02330FB0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328394 + bl DoMoveMist mov sl, r0 b _023326CC arm_func_end ov29_02330FB0 @@ -3001,7 +3001,7 @@ ov29_02330FCC: ; 0x02330FCC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AD08 + bl DoMoveLightScreen mov sl, r0 b _023326CC _02330FE8: @@ -3009,7 +3009,7 @@ _02330FE8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325E64 + bl DoMoveDamageMultihitUntilMiss mov sl, r0 b _023326CC _02331004: @@ -3017,7 +3017,7 @@ _02331004: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326A0C + bl DoMoveMemento mov sl, r0 b _023326CC arm_func_end ov29_02330FCC @@ -3028,7 +3028,7 @@ ov29_02331020: ; 0x02331020 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023291F4 + bl DoMoveRecoverHpTeam mov sl, r0 b _023326CC arm_func_end ov29_02331020 @@ -3039,7 +3039,7 @@ ov29_0233103C: ; 0x0233103C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023278E8 + bl DoMoveSynthesis mov sl, r0 b _023326CC arm_func_end ov29_0233103C @@ -3050,7 +3050,7 @@ ov29_02331058: ; 0x02331058 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023293F8 + bl DoMoveMoonlight mov sl, r0 b _023326CC arm_func_end ov29_02331058 @@ -3061,7 +3061,7 @@ ov29_02331074: ; 0x02331074 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A414 + bl DoMoveRest mov sl, r0 b _023326CC arm_func_end ov29_02331074 @@ -3072,7 +3072,7 @@ ov29_02331090: ; 0x02331090 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328030 + bl DoMoveRecoverHp mov sl, r0 b _023326CC arm_func_end ov29_02331090 @@ -3083,7 +3083,7 @@ ov29_023310AC: ; 0x023310AC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C82C + bl DoMoveScan mov sl, r0 b _023326CC arm_func_end ov29_023310AC @@ -3094,7 +3094,7 @@ ov29_023310C8: ; 0x023310C8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329D50 + bl DoMoveSwapItems mov sl, r0 b _023326CC arm_func_end ov29_023310C8 @@ -3105,7 +3105,7 @@ ov29_023310E4: ; 0x023310E4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C310 + bl DoMoveTakeaway mov sl, r0 b _023326CC arm_func_end ov29_023310E4 @@ -3116,7 +3116,7 @@ ov29_02331100: ; 0x02331100 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A04C + bl DoMoveDamageStealItem mov sl, r0 b _023326CC arm_func_end ov29_02331100 @@ -3127,7 +3127,7 @@ ov29_0233111C: ; 0x0233111C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327928 + bl DoMoveBoostSpeed1 mov sl, r0 b _023326CC _02331138: @@ -3135,7 +3135,7 @@ _02331138: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326CB4 + bl DoMoveCounter mov sl, r0 b _023326CC _02331154: @@ -3143,7 +3143,7 @@ _02331154: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326F48 + bl DoMoveBide mov sl, r0 b _023326CC arm_func_end ov29_0233111C @@ -3154,7 +3154,7 @@ ov29_02331170: ; 0x02331170 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326F8C + bl DoMoveBideUnleash mov sl, r0 b _023326CC arm_func_end ov29_02331170 @@ -3165,7 +3165,7 @@ ov29_0233118C: ; 0x0233118C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D0F0 + bl DoMoveTrapper mov sl, r0 b _023326CC arm_func_end ov29_0233118C @@ -3176,7 +3176,7 @@ ov29_023311A8: ; 0x023311A8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A328 + bl DoMoveSleepTalk mov sl, r0 b _023326CC arm_func_end ov29_023311A8 @@ -3187,7 +3187,7 @@ ov29_023311C4: ; 0x023311C4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A4E8 + bl DoMoveCurse mov sl, r0 b _023326CC arm_func_end ov29_023311C4 @@ -3200,7 +3200,7 @@ ov29_023311E0: ; 0x023311E0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329B68 + bl DoMoveHiJumpKick mov sl, r0 b _023326CC arm_func_end ov29_023311E0 @@ -3211,7 +3211,7 @@ ov29_02331204: ; 0x02331204 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B118 + bl DoMoveBlastBurn mov sl, r0 b _023326CC arm_func_end ov29_02331204 @@ -3222,7 +3222,7 @@ ov29_02331220: ; 0x02331220 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B928 + bl DoMoveHiddenPower mov sl, r0 b _023326CC _0233123C: @@ -3230,7 +3230,7 @@ _0233123C: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326EB8 + bl DoMoveRazorWind mov sl, r0 b _023326CC arm_func_end ov29_02331220 @@ -3241,7 +3241,7 @@ ov29_02331258: ; 0x02331258 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023273CC + bl DoMoveFocusPunch mov sl, r0 b _023326CC arm_func_end ov29_02331258 @@ -3252,7 +3252,7 @@ ov29_02331274: ; 0x02331274 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B7C0 + bl DoMoveMagicCoat mov sl, r0 b _023326CC _02331290: @@ -3260,7 +3260,7 @@ _02331290: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325F3C + bl DoMoveNightmare mov sl, r0 b _023326CC _023312AC: @@ -3268,7 +3268,7 @@ _023312AC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325F74 + bl DoMoveMorningSun mov sl, r0 b _023326CC arm_func_end ov29_02331274 @@ -3279,7 +3279,7 @@ ov29_023312C8: ; 0x023312C8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CE50 + bl DoMoveVacuumCut mov sl, r0 b _023326CC arm_func_end ov29_023312C8 @@ -3290,7 +3290,7 @@ ov29_023312E4: ; 0x023312E4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329FB4 + bl DoMoveSport mov sl, r0 b _023326CC _02331300: @@ -3298,7 +3298,7 @@ _02331300: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325DE4 + bl DoMoveIronTail mov sl, r0 b _023326CC arm_func_end ov29_023312E4 @@ -3309,7 +3309,7 @@ ov29_0233131C: ; 0x0233131C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A27C + bl DoMoveLowerDefense1 mov sl, r0 b _023326CC _02331338: @@ -3317,7 +3317,7 @@ _02331338: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326B24 + bl DoMoveWillOWisp mov sl, r0 b _023326CC arm_func_end ov29_0233131C @@ -3328,7 +3328,7 @@ ov29_02331354: ; 0x02331354 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A480 + bl DoMoveIngrain mov sl, r0 b _023326CC arm_func_end ov29_02331354 @@ -3339,7 +3339,7 @@ ov29_02331370: ; 0x02331370 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327C74 + bl DoMovePsywave mov sl, r0 b _023326CC arm_func_end ov29_02331370 @@ -3350,7 +3350,7 @@ ov29_0233138C: ; 0x0233138C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BC34 + bl DoMoveLeechSeed mov sl, r0 b _023326CC arm_func_end ov29_0233138C @@ -3361,7 +3361,7 @@ ov29_023313A8: ; 0x023313A8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B6C8 + bl DoMoveSpikes mov sl, r0 b _023326CC _023313C4: @@ -3369,7 +3369,7 @@ _023313C4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326188 + bl DoMoveHealStatus mov sl, r0 b _023326CC arm_func_end ov29_023313A8 @@ -3380,7 +3380,7 @@ ov29_023313E0: ; 0x023313E0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327758 + bl DoMoveHaze mov sl, r0 b _023326CC arm_func_end ov29_023313E0 @@ -3391,7 +3391,7 @@ ov29_023313FC: ; 0x023313FC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C83C + bl DoMovePowerEars mov sl, r0 b _023326CC arm_func_end ov29_023313FC @@ -3402,7 +3402,7 @@ ov29_02331418: ; 0x02331418 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C6B4 + bl DoMoveSiesta mov sl, r0 b _023326CC arm_func_end ov29_02331418 @@ -3413,7 +3413,7 @@ ov29_02331434: ; 0x02331434 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232764C + bl DoMoveSmellingSalt mov sl, r0 b _023326CC arm_func_end ov29_02331434 @@ -3424,7 +3424,7 @@ ov29_02331450: ; 0x02331450 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B738 + bl DoMoveMagnitude mov sl, r0 b _023326CC arm_func_end ov29_02331450 @@ -3435,7 +3435,7 @@ ov29_0233146C: ; 0x0233146C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C064 + bl DoMoveSkullBash mov sl, r0 b _023326CC arm_func_end ov29_0233146C @@ -3446,7 +3446,7 @@ ov29_02331488: ; 0x02331488 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A2AC + bl DoMoveWish mov sl, r0 b _023326CC _023314A4: @@ -3454,7 +3454,7 @@ _023314A4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326AE8 + bl DoMoveFlatter mov sl, r0 b _023326CC arm_func_end ov29_02331488 @@ -3465,7 +3465,7 @@ ov29_023314C0: ; 0x023314C0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329FE0 + bl DoMoveMudSlap mov sl, r0 b _023326CC arm_func_end ov29_023314C0 @@ -3476,7 +3476,7 @@ ov29_023314DC: ; 0x023314DC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328A54 + bl DoMoveLowerAccuracy1 mov sl, r0 b _023326CC _023314F8: @@ -3484,7 +3484,7 @@ _023314F8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232692C + bl DoMoveOverheat mov sl, r0 b _023326CC arm_func_end ov29_023314DC @@ -3495,7 +3495,7 @@ ov29_02331514: ; 0x02331514 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329880 + bl DoMoveToxic mov sl, r0 b _023326CC arm_func_end ov29_02331514 @@ -3506,7 +3506,7 @@ ov29_02331530: ; 0x02331530 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023276B4 + bl DoMoveMetalSound mov sl, r0 b _023326CC _0233154C: @@ -3514,7 +3514,7 @@ _0233154C: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326408 + bl DoMoveTorment mov sl, r0 b _023326CC _02331568: @@ -3522,7 +3522,7 @@ _02331568: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326264 + bl DoMoveSuperFang mov sl, r0 b _023326CC arm_func_end ov29_02331530 @@ -3533,7 +3533,7 @@ ov29_02331584: ; 0x02331584 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B8B0 + bl DoMoveDamage__0232B8B0 mov sl, r0 b _023326CC arm_func_end ov29_02331584 @@ -3544,7 +3544,7 @@ ov29_023315A0: ; 0x023315A0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C6F0 + bl DoMoveTwoEdge mov sl, r0 b _023326CC _023315BC: @@ -3552,7 +3552,7 @@ _023315BC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232718C + bl DoMoveEndeavor mov sl, r0 b _023326CC arm_func_end ov29_023315A0 @@ -3563,7 +3563,7 @@ ov29_023315D8: ; 0x023315D8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C538 + bl DoMoveSwitchPositions mov sl, r0 b _023326CC arm_func_end ov29_023315D8 @@ -3574,7 +3574,7 @@ ov29_023315F4: ; 0x023315F4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BCC4 + bl DoMoveDreamEater mov sl, r0 b _023326CC arm_func_end ov29_023315F4 @@ -3585,7 +3585,7 @@ ov29_02331610: ; 0x02331610 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA2C + bl DoMoveSearchlight mov sl, r0 b _023326CC arm_func_end ov29_02331610 @@ -3596,7 +3596,7 @@ ov29_0233162C: ; 0x0233162C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CF84 + bl DoMoveFillIn mov sl, r0 b _023326CC arm_func_end ov29_0233162C @@ -3607,7 +3607,7 @@ ov29_02331648: ; 0x02331648 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023296F8 + bl DoMoveWarp mov sl, r0 b _023326CC arm_func_end ov29_02331648 @@ -3618,7 +3618,7 @@ ov29_02331664: ; 0x02331664 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CB08 + bl DoMoveDrought mov sl, r0 b _023326CC arm_func_end ov29_02331664 @@ -3629,7 +3629,7 @@ ov29_02331680: ; 0x02331680 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D1FC + bl DoMoveSeeStairs mov sl, r0 b _023326CC arm_func_end ov29_02331680 @@ -3640,7 +3640,7 @@ ov29_0233169C: ; 0x0233169C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023272F8 + bl DoMoveBrickBreak mov sl, r0 b _023326CC _023316B8: @@ -3648,7 +3648,7 @@ _023316B8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326E60 + bl DoMoveBoostDefense1 mov sl, r0 b _023326CC arm_func_end ov29_0233169C @@ -3659,7 +3659,7 @@ ov29_023316D4: ; 0x023316D4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023279AC + bl DoMoveSureShot mov sl, r0 b _023326CC _023316F0: @@ -3667,7 +3667,7 @@ _023316F0: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325FB4 + bl DoMoveVitalThrow mov sl, r0 b _023326CC arm_func_end ov29_023316D4 @@ -3678,7 +3678,7 @@ ov29_0233170C: ; 0x0233170C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328DE4 + bl DoMoveFly mov sl, r0 b _023326CC arm_func_end ov29_0233170C @@ -3689,7 +3689,7 @@ ov29_02331728: ; 0x02331728 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329A9C + bl DoMoveBounce mov sl, r0 b _023326CC arm_func_end ov29_02331728 @@ -3700,7 +3700,7 @@ ov29_02331744: ; 0x02331744 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328ECC + bl DoMoveDive mov sl, r0 b _023326CC _02331760: @@ -3708,7 +3708,7 @@ _02331760: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02325FC4 + bl DoMoveDig mov sl, r0 b _023326CC _0233177C: @@ -3716,7 +3716,7 @@ _0233177C: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326088 + bl DoMoveSweetScent mov sl, r0 b _023326CC _02331798: @@ -3724,7 +3724,7 @@ _02331798: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326E04 + bl DoMoveDoubleTeam mov sl, r0 b _023326CC arm_func_end ov29_02331744 @@ -3735,7 +3735,7 @@ ov29_023317B4: ; 0x023317B4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A6EC + bl DoMoveKnockOff mov sl, r0 b _023326CC arm_func_end ov29_023317B4 @@ -3746,7 +3746,7 @@ ov29_023317D0: ; 0x023317D0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CB18 + bl DoMoveTrapBuster mov sl, r0 b _023326CC arm_func_end ov29_023317D0 @@ -3757,7 +3757,7 @@ ov29_023317EC: ; 0x023317EC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D20C + bl DoMoveLongToss mov sl, r0 b _023326CC arm_func_end ov29_023317EC @@ -3768,7 +3768,7 @@ ov29_02331808: ; 0x02331808 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D21C + bl DoMovePierce mov sl, r0 b _023326CC _02331824: @@ -3776,7 +3776,7 @@ _02331824: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326CA4 + bl DoMoveGrudge mov sl, r0 b _023326CC arm_func_end ov29_02331808 @@ -3787,7 +3787,7 @@ ov29_02331840: ; 0x02331840 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA3C + bl DoMovePetrify mov sl, r0 b _023326CC arm_func_end ov29_02331840 @@ -3798,7 +3798,7 @@ ov29_0233185C: ; 0x0233185C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A3FC + bl DoMoveAssist mov sl, r0 b _023326CC arm_func_end ov29_0233185C @@ -3809,7 +3809,7 @@ ov29_02331878: ; 0x02331878 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AC44 + bl DoMoveSetDamage mov sl, r0 b _023326CC arm_func_end ov29_02331878 @@ -3820,7 +3820,7 @@ ov29_02331894: ; 0x02331894 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CE94 + bl DoMoveShocker mov sl, r0 b _023326CC arm_func_end ov29_02331894 @@ -3831,7 +3831,7 @@ ov29_023318B0: ; 0x023318B0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B800 + bl DoMoveDecoy mov sl, r0 b _023326CC arm_func_end ov29_023318B0 @@ -3844,7 +3844,7 @@ ov29_023318CC: ; 0x023318CC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329970 + bl DoMoveJumpKick mov sl, r0 b _023326CC arm_func_end ov29_023318CC @@ -3855,7 +3855,7 @@ ov29_023318F0: ; 0x023318F0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B7D0 + bl DoMoveProtect mov sl, r0 b _023326CC arm_func_end ov29_023318F0 @@ -3866,7 +3866,7 @@ ov29_0233190C: ; 0x0233190C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023293E4 + bl DoMoveTaunt mov sl, r0 b _023326CC arm_func_end ov29_0233190C @@ -3877,7 +3877,7 @@ ov29_02331928: ; 0x02331928 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023276E8 + bl DoMoveTickle mov sl, r0 b _023326CC arm_func_end ov29_02331928 @@ -3888,7 +3888,7 @@ ov29_02331944: ; 0x02331944 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327598 + bl DoMoveReversal mov sl, r0 b _023326CC arm_func_end ov29_02331944 @@ -3899,7 +3899,7 @@ ov29_02331960: ; 0x02331960 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023281D8 + bl DoMoveSelfdestruct mov sl, r0 b _023326CC arm_func_end ov29_02331960 @@ -3910,7 +3910,7 @@ ov29_0233197C: ; 0x0233197C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328E74 + bl DoMoveExplosion mov sl, r0 b _023326CC arm_func_end ov29_0233197C @@ -3921,7 +3921,7 @@ ov29_02331998: ; 0x02331998 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023282C8 + bl DoMoveCharge mov sl, r0 b _023326CC arm_func_end ov29_02331998 @@ -3932,7 +3932,7 @@ ov29_023319B4: ; 0x023319B4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232724C + bl DoMoveFacade mov sl, r0 b _023326CC arm_func_end ov29_023319B4 @@ -3943,7 +3943,7 @@ ov29_023319D0: ; 0x023319D0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023277B8 + bl DoMoveDamageWeightDependent mov sl, r0 b _023326CC arm_func_end ov29_023319D0 @@ -3954,7 +3954,7 @@ ov29_023319EC: ; 0x023319EC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327DE0 + bl DoMoveWaterSpout mov sl, r0 b _023326CC arm_func_end ov29_023319EC @@ -3965,7 +3965,7 @@ ov29_02331A08: ; 0x02331A08 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B368 + bl DoMoveEruption mov sl, r0 b _023326CC _02331A24: @@ -3973,7 +3973,7 @@ _02331A24: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023268CC + bl DoMoveSmokescreen mov sl, r0 b _023326CC arm_func_end ov29_02331A08 @@ -3984,7 +3984,7 @@ ov29_02331A40: ; 0x02331A40 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C300 + bl DoMoveSeeTrap mov sl, r0 b _023326CC arm_func_end ov29_02331A40 @@ -3995,7 +3995,7 @@ ov29_02331A5C: ; 0x02331A5C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329074 + bl DoMoveStockpile mov sl, r0 b _023326CC arm_func_end ov29_02331A5C @@ -4006,7 +4006,7 @@ ov29_02331A78: ; 0x02331A78 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A640 + bl DoMoveSpitUp mov sl, r0 b _023326CC arm_func_end ov29_02331A78 @@ -4017,7 +4017,7 @@ ov29_02331A94: ; 0x02331A94 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A490 + bl DoMoveSwallow mov sl, r0 b _023326CC _02331AB0: @@ -4025,7 +4025,7 @@ _02331AB0: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023260D0 + bl DoMoveRainDance mov sl, r0 b _023326CC _02331ACC: @@ -4033,7 +4033,7 @@ _02331ACC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232680C + bl DoMoveSpite mov sl, r0 b _023326CC arm_func_end ov29_02331A94 @@ -4044,7 +4044,7 @@ ov29_02331AE8: ; 0x02331AE8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CD90 + bl DoMoveInvisify mov sl, r0 b _023326CC arm_func_end ov29_02331AE8 @@ -4055,7 +4055,7 @@ ov29_02331B04: ; 0x02331B04 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B8D4 + bl DoMoveMirrorCoat mov sl, r0 b _023326CC arm_func_end ov29_02331B04 @@ -4066,7 +4066,7 @@ ov29_02331B20: ; 0x02331B20 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B6A4 + bl DoMovePerishSong mov sl, r0 b _023326CC arm_func_end ov29_02331B20 @@ -4077,7 +4077,7 @@ ov29_02331B3C: ; 0x02331B3C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327940 + bl DoMoveRapidSpin mov sl, r0 b _023326CC arm_func_end ov29_02331B3C @@ -4088,7 +4088,7 @@ ov29_02331B58: ; 0x02331B58 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B8A0 + bl DoMoveDestinyBond mov sl, r0 b _023326CC _02331B74: @@ -4096,7 +4096,7 @@ _02331B74: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232620C + bl DoMoveEncore mov sl, r0 b _023326CC _02331B90: @@ -4104,7 +4104,7 @@ _02331B90: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023266DC + bl DoMoveWeatherBall mov sl, r0 b _023326CC arm_func_end ov29_02331B58 @@ -4115,7 +4115,7 @@ ov29_02331BAC: ; 0x02331BAC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A220 + bl DoMoveSunnyDay mov sl, r0 b _023326CC arm_func_end ov29_02331BAC @@ -4126,7 +4126,7 @@ ov29_02331BC8: ; 0x02331BC8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A340 + bl DoMovePayDay mov sl, r0 b _023326CC arm_func_end ov29_02331BC8 @@ -4137,7 +4137,7 @@ ov29_02331BE4: ; 0x02331BE4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CF74 + bl DoMoveOneRoom mov sl, r0 b _023326CC arm_func_end ov29_02331BE4 @@ -4148,7 +4148,7 @@ ov29_02331C00: ; 0x02331C00 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327BE0 + bl DoMoveEndure mov sl, r0 b _023326CC arm_func_end ov29_02331C00 @@ -4159,7 +4159,7 @@ ov29_02331C1C: ; 0x02331C1C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329674 + bl DoMoveHelpingHand mov sl, r0 b _023326CC arm_func_end ov29_02331C1C @@ -4170,7 +4170,7 @@ ov29_02331C38: ; 0x02331C38 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AC54 + bl DoMoveBellyDrum mov sl, r0 b _023326CC arm_func_end ov29_02331C38 @@ -4181,7 +4181,7 @@ ov29_02331C54: ; 0x02331C54 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CF54 + bl DoMoveFamish mov sl, r0 b _023326CC _02331C70: @@ -4189,7 +4189,7 @@ _02331C70: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023260A8 + bl DoMoveCharm mov sl, r0 b _023326CC _02331C8C: @@ -4197,7 +4197,7 @@ _02331C8C: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023261A0 + bl DoMoveBubble mov sl, r0 b _023326CC _02331CA8: @@ -4205,7 +4205,7 @@ _02331CA8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326550 + bl DoMoveStringShot mov sl, r0 b _023326CC _02331CC4: @@ -4213,7 +4213,7 @@ _02331CC4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C27C + bl DoMoveRockSmash mov sl, r0 b _023326CC arm_func_end ov29_02331C54 @@ -4224,7 +4224,7 @@ ov29_02331CE0: ; 0x02331CE0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B44C + bl DoMoveTransform mov sl, r0 b _023326CC _02331CFC: @@ -4232,7 +4232,7 @@ _02331CFC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232612C + bl DoMoveHail mov sl, r0 b _023326CC arm_func_end ov29_02331CE0 @@ -4243,7 +4243,7 @@ ov29_02331D18: ; 0x02331D18 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D1EC + bl DoMoveMobile mov sl, r0 b _023326CC _02331D34: @@ -4251,7 +4251,7 @@ _02331D34: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326DD8 + bl DoMoveExpose mov sl, r0 b _023326CC arm_func_end ov29_02331D18 @@ -4262,7 +4262,7 @@ ov29_02331D50: ; 0x02331D50 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A8EC + bl DoMoveSplash mov sl, r0 b _023326CC arm_func_end ov29_02331D50 @@ -4273,7 +4273,7 @@ ov29_02331D6C: ; 0x02331D6C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C84C + bl DoMoveTransfer mov sl, r0 b _023326CC arm_func_end ov29_02331D6C @@ -4284,7 +4284,7 @@ ov29_02331D88: ; 0x02331D88 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C560 + bl DoMoveStayAway mov sl, r0 b _023326CC arm_func_end ov29_02331D88 @@ -4295,7 +4295,7 @@ ov29_02331DA4: ; 0x02331DA4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B024 + bl DoMoveBeatUp mov sl, r0 b _023326CC arm_func_end ov29_02331DA4 @@ -4306,7 +4306,7 @@ ov29_02331DC0: ; 0x02331DC0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C524 + bl DoMoveRebound mov sl, r0 b _023326CC arm_func_end ov29_02331DC0 @@ -4317,7 +4317,7 @@ ov29_02331DDC: ; 0x02331DDC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AFA0 + bl DoMovePause mov sl, r0 b _023326CC arm_func_end ov29_02331DDC @@ -4328,7 +4328,7 @@ ov29_02331DF8: ; 0x02331DF8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CCC4 + bl DoMoveWildCall mov sl, r0 b _023326CC arm_func_end ov29_02331DF8 @@ -4339,7 +4339,7 @@ ov29_02331E14: ; 0x02331E14 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CE7C + bl DoMoveReviver mov sl, r0 b _023326CC arm_func_end ov29_02331E14 @@ -4350,7 +4350,7 @@ ov29_02331E30: ; 0x02331E30 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA70 + bl DoMoveEscape mov sl, r0 b _023326CC arm_func_end ov29_02331E30 @@ -4361,7 +4361,7 @@ ov29_02331E4C: ; 0x02331E4C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232AD18 + bl DoMoveSecretPower mov sl, r0 b _023326CC arm_func_end ov29_02331E4C @@ -4372,7 +4372,7 @@ ov29_02331E68: ; 0x02331E68 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328110 + bl DoMoveNaturePower mov sl, r0 b _023326CC arm_func_end ov29_02331E68 @@ -4383,7 +4383,7 @@ ov29_02331E84: ; 0x02331E84 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D148 + bl DoMoveItemize mov sl, r0 b _023326CC arm_func_end ov29_02331E84 @@ -4394,7 +4394,7 @@ ov29_02331EA0: ; 0x02331EA0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328794 + bl DoMoveSketch movs sl, r0 movne r0, #1 strne r0, [sp, #0x58] @@ -4404,7 +4404,7 @@ _02331EC4: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326908 + bl DoMoveMirrorMove mov sl, r0 b _023326CC arm_func_end ov29_02331EA0 @@ -4415,7 +4415,7 @@ ov29_02331EE0: ; 0x02331EE0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232A188 + bl DoMoveRolePlay mov sl, r0 b _023326CC arm_func_end ov29_02331EE0 @@ -4426,7 +4426,7 @@ ov29_02331EFC: ; 0x02331EFC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02328698 + bl DoMoveSkillSwap mov sl, r0 b _023326CC arm_func_end ov29_02331EFC @@ -4437,7 +4437,7 @@ ov29_02331F18: ; 0x02331F18 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329554 + bl DoMoveConversion mov sl, r0 b _023326CC arm_func_end ov29_02331F18 @@ -4448,7 +4448,7 @@ ov29_02331F34: ; 0x02331F34 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C578 + bl DoMoveCleanse mov sl, r0 b _023326CC _02331F50: @@ -4456,7 +4456,7 @@ _02331F50: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02326BC0 + bl DoMoveReturn mov sl, r0 b _023326CC arm_func_end ov29_02331F34 @@ -4467,7 +4467,7 @@ ov29_02331F6C: ; 0x02331F6C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BE34 + bl DoMoveSnatch mov sl, r0 b _023326CC arm_func_end ov29_02331F6C @@ -4478,7 +4478,7 @@ ov29_02331F88: ; 0x02331F88 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232B518 + bl DoMoveCamouflage mov sl, r0 b _023326CC arm_func_end ov29_02331F88 @@ -4489,7 +4489,7 @@ ov29_02331FA4: ; 0x02331FA4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BB4C + bl DoMoveFrustration mov sl, r0 b _023326CC arm_func_end ov29_02331FA4 @@ -4500,7 +4500,7 @@ ov29_02331FC0: ; 0x02331FC0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02327E94 + bl DoMovePsychUp mov sl, r0 b _023326CC _02331FDC: @@ -4508,7 +4508,7 @@ _02331FDC: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_023265A4 + bl DoMoveSnore mov sl, r0 b _023326CC arm_func_end ov29_02331FC0 @@ -4519,7 +4519,7 @@ ov29_02331FF8: ; 0x02331FF8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BE44 + bl DoMoveRecycle mov sl, r0 b _023326CC arm_func_end ov29_02331FF8 @@ -4530,7 +4530,7 @@ ov29_02332014: ; 0x02332014 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232C818 + bl DoMoveNoMove mov sl, r0 b _023326CC arm_func_end ov29_02332014 @@ -4541,7 +4541,7 @@ ov29_02332030: ; 0x02332030 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BC64 + bl DoMoveMetronome mov sl, r0 b _023326CC arm_func_end ov29_02332030 @@ -4552,7 +4552,7 @@ ov29_0233204C: ; 0x0233204C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CE40 + bl DoMoveHpGauge mov sl, r0 b _023326CC arm_func_end ov29_0233204C @@ -4563,7 +4563,7 @@ ov29_02332068: ; 0x02332068 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_02329664 + bl DoMoveConversion2 mov sl, r0 b _023326CC arm_func_end ov29_02332068 @@ -4574,7 +4574,7 @@ ov29_02332084: ; 0x02332084 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA4C + bl DoMovePounce mov sl, r0 b _023326CC arm_func_end ov29_02332084 @@ -4585,7 +4585,7 @@ ov29_023320A0: ; 0x023320A0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CA60 + bl DoMoveTrawl mov sl, r0 b _023326CC arm_func_end ov29_023320A0 @@ -4596,7 +4596,7 @@ ov29_023320BC: ; 0x023320BC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232BA44 + bl DoMoveCopycat mov sl, r0 b _023326CC _023320D8: @@ -4604,7 +4604,7 @@ _023320D8: mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D1DC + bl DoMoveHurl mov sl, r0 b _023326CC arm_func_end ov29_023320BC @@ -4615,7 +4615,7 @@ ov29_023320F4: ; 0x023320F4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232CEAC + bl DoMoveEcho mov sl, r0 b _023326CC arm_func_end ov29_023320F4 @@ -4626,7 +4626,7 @@ ov29_02332110: ; 0x02332110 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D22C + bl DoMoveHammerArm mov sl, r0 b _023326CC arm_func_end ov29_02332110 @@ -4637,7 +4637,7 @@ ov29_0233212C: ; 0x0233212C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D270 + bl DoMoveAquaRing mov sl, r0 b _023326CC arm_func_end ov29_0233212C @@ -4648,7 +4648,7 @@ ov29_02332148: ; 0x02332148 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D280 + bl DoMoveGastroAcid mov sl, r0 b _023326CC arm_func_end ov29_02332148 @@ -4659,7 +4659,7 @@ ov29_02332164: ; 0x02332164 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D298 + bl DoMoveHealingWish mov sl, r0 b _023326CC arm_func_end ov29_02332164 @@ -4670,7 +4670,7 @@ ov29_02332180: ; 0x02332180 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D2E8 + bl DoMoveCloseCombat mov sl, r0 b _023326CC arm_func_end ov29_02332180 @@ -4681,7 +4681,7 @@ ov29_0233219C: ; 0x0233219C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D368 + bl DoMoveLuckyChant mov sl, r0 b _023326CC arm_func_end ov29_0233219C @@ -4692,7 +4692,7 @@ ov29_023321B8: ; 0x023321B8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D378 + bl DoMoveGuardSwap mov sl, r0 b _023326CC arm_func_end ov29_023321B8 @@ -4703,7 +4703,7 @@ ov29_023321D4: ; 0x023321D4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D3D8 + bl DoMoveHealOrder mov sl, r0 b _023326CC arm_func_end ov29_023321D4 @@ -4714,7 +4714,7 @@ ov29_023321F0: ; 0x023321F0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D400 + bl DoMoveHealBlock mov sl, r0 b _023326CC arm_func_end ov29_023321F0 @@ -4725,7 +4725,7 @@ ov29_0233220C: ; 0x0233220C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D418 + bl DoMoveThunderFang mov sl, r0 b _023326CC arm_func_end ov29_0233220C @@ -4736,7 +4736,7 @@ ov29_02332228: ; 0x02332228 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D4AC + bl DoMoveDefog mov sl, r0 b _023326CC arm_func_end ov29_02332228 @@ -4747,7 +4747,7 @@ ov29_02332244: ; 0x02332244 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D560 + bl DoMoveTrumpCard mov sl, r0 b _023326CC arm_func_end ov29_02332244 @@ -4758,7 +4758,7 @@ ov29_02332260: ; 0x02332260 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D620 + bl DoMoveIceFang mov sl, r0 b _023326CC arm_func_end ov29_02332260 @@ -4769,7 +4769,7 @@ ov29_0233227C: ; 0x0233227C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D6B0 + bl DoMovePsychoShift mov sl, r0 b _023326CC arm_func_end ov29_0233227C @@ -4780,7 +4780,7 @@ ov29_02332298: ; 0x02332298 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D6D0 + bl DoMoveEmbargo mov sl, r0 b _023326CC arm_func_end ov29_02332298 @@ -4791,7 +4791,7 @@ ov29_023322B4: ; 0x023322B4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E2B8 + bl DoMoveFireFang mov sl, r0 b _023326CC arm_func_end ov29_023322B4 @@ -4802,7 +4802,7 @@ ov29_023322D0: ; 0x023322D0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D6E8 + bl DoMoveBrine mov sl, r0 b _023326CC arm_func_end ov29_023322D0 @@ -4813,7 +4813,7 @@ ov29_023322EC: ; 0x023322EC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D738 + bl DoMoveNaturalGift mov sl, r0 b _023326CC arm_func_end ov29_023322EC @@ -4824,7 +4824,7 @@ ov29_02332308: ; 0x02332308 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D7F8 + bl DoMoveGyroBall mov sl, r0 b _023326CC arm_func_end ov29_02332308 @@ -4835,7 +4835,7 @@ ov29_02332324: ; 0x02332324 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D860 + bl DoMoveShadowForce mov sl, r0 b _023326CC arm_func_end ov29_02332324 @@ -4846,7 +4846,7 @@ ov29_02332340: ; 0x02332340 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D8FC + bl DoMoveGravity mov sl, r0 b _023326CC arm_func_end ov29_02332340 @@ -4857,7 +4857,7 @@ ov29_0233235C: ; 0x0233235C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D90C + bl DoMoveStealthRock mov sl, r0 b _023326CC arm_func_end ov29_0233235C @@ -4868,7 +4868,7 @@ ov29_02332378: ; 0x02332378 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D97C + bl DoMoveChargeBeam mov sl, r0 b _023326CC arm_func_end ov29_02332378 @@ -4879,7 +4879,7 @@ ov29_02332394: ; 0x02332394 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232D9E4 + bl DoMoveDamageEatItem mov sl, r0 b _023326CC arm_func_end ov29_02332394 @@ -4890,7 +4890,7 @@ ov29_023323B0: ; 0x023323B0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DAD0 + bl DoMoveAcupressure mov sl, r0 b _023326CC arm_func_end ov29_023323B0 @@ -4901,7 +4901,7 @@ ov29_023323CC: ; 0x023323CC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DC54 + bl DoMoveMagnetRise mov sl, r0 b _023326CC arm_func_end ov29_023323CC @@ -4912,7 +4912,7 @@ ov29_023323E8: ; 0x023323E8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DC64 + bl DoMoveToxicSpikes mov sl, r0 b _023326CC arm_func_end ov29_023323E8 @@ -4923,7 +4923,7 @@ ov29_02332404: ; 0x02332404 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DD78 + bl DoMoveTrickRoom mov sl, r0 b _023326CC arm_func_end ov29_02332404 @@ -4934,7 +4934,7 @@ ov29_02332420: ; 0x02332420 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DCD4 + bl DoMoveLastResort mov sl, r0 b _023326CC arm_func_end ov29_02332420 @@ -4945,7 +4945,7 @@ ov29_0233243C: ; 0x0233243C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DDAC + bl DoMoveWorrySeed mov sl, r0 b _023326CC arm_func_end ov29_0233243C @@ -4956,7 +4956,7 @@ ov29_02332458: ; 0x02332458 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DE84 + bl DoMoveDamageHpDependent mov sl, r0 b _023326CC arm_func_end ov29_02332458 @@ -4967,7 +4967,7 @@ ov29_02332474: ; 0x02332474 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DF38 + bl DoMoveHeartSwap mov sl, r0 b _023326CC arm_func_end ov29_02332474 @@ -4978,7 +4978,7 @@ ov29_02332490: ; 0x02332490 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232DFC8 + bl DoMoveRoost mov sl, r0 b _023326CC arm_func_end ov29_02332490 @@ -4989,7 +4989,7 @@ ov29_023324AC: ; 0x023324AC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E084 + bl DoMovePowerSwap mov sl, r0 b _023326CC arm_func_end ov29_023324AC @@ -5000,7 +5000,7 @@ ov29_023324C8: ; 0x023324C8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E0E4 + bl DoMovePowerTrick mov sl, r0 b _023326CC arm_func_end ov29_023324C8 @@ -5011,7 +5011,7 @@ ov29_023324E4: ; 0x023324E4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E0F8 + bl DoMoveFeint mov sl, r0 b _023326CC arm_func_end ov29_023324E4 @@ -5022,7 +5022,7 @@ ov29_02332500: ; 0x02332500 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E130 + bl DoMoveFlareBlitz mov sl, r0 b _023326CC arm_func_end ov29_02332500 @@ -5033,7 +5033,7 @@ ov29_0233251C: ; 0x0233251C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E274 + bl DoMoveDefendOrder mov sl, r0 b _023326CC arm_func_end ov29_0233251C @@ -5044,7 +5044,7 @@ ov29_02332538: ; 0x02332538 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E368 + bl DoMoveLunarDance mov sl, r0 b _023326CC arm_func_end ov29_02332538 @@ -5055,7 +5055,7 @@ ov29_02332554: ; 0x02332554 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E3D0 + bl DoMoveMiracleEye mov sl, r0 b _023326CC arm_func_end ov29_02332554 @@ -5066,7 +5066,7 @@ ov29_02332570: ; 0x02332570 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E400 + bl DoMoveWakeUpSlap mov sl, r0 b _023326CC arm_func_end ov29_02332570 @@ -5077,7 +5077,7 @@ ov29_0233258C: ; 0x0233258C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E48C + bl DoMoveMetalBurst mov sl, r0 b _023326CC arm_func_end ov29_0233258C @@ -5088,7 +5088,7 @@ ov29_023325A8: ; 0x023325A8 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E4A0 + bl DoMoveHeadSmash mov sl, r0 b _023326CC arm_func_end ov29_023325A8 @@ -5099,7 +5099,7 @@ ov29_023325C4: ; 0x023325C4 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E560 + bl DoMoveCaptivate mov sl, r0 b _023326CC arm_func_end ov29_023325C4 @@ -5110,7 +5110,7 @@ ov29_023325E0: ; 0x023325E0 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E624 + bl DoMoveLeafStorm mov sl, r0 b _023326CC arm_func_end ov29_023325E0 @@ -5123,7 +5123,7 @@ ov29_023325FC: ; 0x023325FC mov r0, sb mov r2, r8 mov r3, r7 - bl ov29_0232E67C + bl DoMoveDracoMeteor mov sl, r0 b _023326CC arm_func_end ov29_023325FC @@ -5134,7 +5134,7 @@ ov29_02332620: ; 0x02332620 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E6E0 + bl DoMoveRockPolish mov sl, r0 b _023326CC arm_func_end ov29_02332620 @@ -5145,7 +5145,7 @@ ov29_0233263C: ; 0x0233263C mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E714 + bl DoMoveNastyPlot mov sl, r0 b _023326CC arm_func_end ov29_0233263C @@ -5156,7 +5156,7 @@ ov29_02332658: ; 0x02332658 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E734 + bl DoMoveTag0x1AB mov sl, r0 b _023326CC arm_func_end ov29_02332658 @@ -5178,7 +5178,7 @@ ov29_02332690: ; 0x02332690 mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E750 + bl DoMoveTag0x1A6 mov sl, r0 b _023326CC arm_func_end ov29_02332690 @@ -5189,7 +5189,7 @@ ov29_023326AC: ; 0x023326AC mov r1, r4 mov r2, r8 mov r3, r7 - bl ov29_0232E794 + bl DoMoveTag0x1A7 mov sl, r0 b _023326CC _023326C8: @@ -5249,7 +5249,7 @@ _0233275C: b _023327C8 _02332790: mov r0, r8 - bl ov29_02324534 + bl IsHyperBeamVariant cmp r0, #0 beq _023327C8 ldr r0, [sp, #0x58] @@ -5271,18 +5271,18 @@ _023327C8: cmp r6, #0x89 beq _02332818 mov r0, sb - bl ov29_02321A78 + bl TryActivateNondamagingDefenderAbility mov r0, sb mov r1, r4 - bl ov29_02321CF0 + bl TryActivateNondamagingDefenderExclusiveItem mov r0, sb mov r1, r4 mov r2, r8 - bl ov29_022F94F0 + bl TryActivateTraceAndColorChange mov r1, r4 mov r0, sb mov r2, r8 - bl ov29_022F9744 + bl TryActivateConversion2 _02332818: ldr r0, [sp, #0x7c] add r0, r0, #1 @@ -5319,7 +5319,7 @@ _02332858: sub r1, r1, #1 mov r1, r1, lsl #0x10 mov r1, r1, asr #0x10 - bl ov29_0230D11C + bl ApplyDamageAndEffectsWrapper _0233289C: ldr r0, [sp, #0x70] cmp r0, #0 @@ -5444,19 +5444,19 @@ _02332A40: cmpne r3, #0 beq _02332A60 mov r1, #0x53 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} _02332A60: mov r0, r5 mov r1, r4 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer ldmia sp!, {r3, r4, r5, pc} arm_func_end DefenderAbilityIsActive__02332A0C - arm_func_start ov29_02332A70 -ov29_02332A70: ; 0x02332A70 + arm_func_start DoMoveDamageInlined +DoMoveDamageInlined: ; 0x02332A70 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x28 mov r5, r2 @@ -5488,20 +5488,20 @@ ov29_02332A70: ; 0x02332A70 bl CalcDamage mov r1, r4 mov r0, r5 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r1, r6 mov r2, r5 mov r0, r7 add r3, sp, #0x14 - bl CalcDamageFinal + bl PerformDamageSequence cmp r0, #0 movne r0, #1 moveq r0, #0 and r0, r0, #0xff add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end ov29_02332A70 + arm_func_end DoMoveDamageInlined arm_func_start DealDamage DealDamage: ; 0x02332B20 @@ -5534,19 +5534,19 @@ DealDamage: ; 0x02332B20 bl CalcDamage ldr r1, [sp, #0x48] mov r0, r5 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r1, r6 mov r2, r5 mov r0, r7 add r3, sp, #0x14 - bl CalcDamageFinal + bl PerformDamageSequence add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end DealDamage - arm_func_start ov29_02332BB8 -ov29_02332BB8: ; 0x02332BB8 + arm_func_start DealDamageWithTypeAndPowerBoost +DealDamageWithTypeAndPowerBoost: ; 0x02332BB8 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x28 mov r5, r2 @@ -5575,19 +5575,19 @@ ov29_02332BB8: ; 0x02332BB8 bl CalcDamage ldr r1, [sp, #0x40] mov r0, r5 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r1, r6 mov r2, r5 mov r0, r7 add r3, sp, #0x14 - bl CalcDamageFinal + bl PerformDamageSequence add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end ov29_02332BB8 + arm_func_end DealDamageWithTypeAndPowerBoost - arm_func_start CalcDamageProjectile -CalcDamageProjectile: ; 0x02332C4C + arm_func_start DealDamageProjectile +DealDamageProjectile: ; 0x02332C4C stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x28 mov r4, r2 @@ -5615,19 +5615,19 @@ CalcDamageProjectile: ; 0x02332C4C bl CalcDamage ldr r1, [sp, #0x44] mov r0, r4 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r1, r5 mov r2, r4 mov r0, r6 add r3, sp, #0x14 - bl CalcDamageFinal + bl PerformDamageSequence add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end CalcDamageProjectile + arm_func_end DealDamageProjectile - arm_func_start ov29_02332CDC -ov29_02332CDC: ; 0x02332CDC + arm_func_start DealDamageWithType +DealDamageWithType: ; 0x02332CDC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x28 mov r4, r3 @@ -5655,19 +5655,19 @@ ov29_02332CDC: ; 0x02332CDC bl CalcDamage ldr r1, [sp, #0x44] mov r0, r4 - bl ov29_02324E44 + bl GetDamageSourceWrapper str r0, [sp] mov r1, r5 mov r2, r4 mov r0, r6 add r3, sp, #0x14 - bl CalcDamageFinal + bl PerformDamageSequence add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, r7, r8, pc} - arm_func_end ov29_02332CDC + arm_func_end DealDamageWithType - arm_func_start CalcDamageFinal -CalcDamageFinal: ; 0x02332D6C + arm_func_start PerformDamageSequence +PerformDamageSequence: ; 0x02332D6C stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x10 mov r8, r0 @@ -5716,7 +5716,7 @@ _02332DFC: str ip, [sp, #8] mov r5, #0 str r5, [sp, #0xc] - bl ov29_0230863C + bl ApplyDamageAndEffects mov r0, r5 strb r0, [r4, #0x166] strb r0, [r4, #0x167] @@ -5729,11 +5729,11 @@ _02332E3C: mov r1, #1 bl ov29_0230040C mov r0, r8 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02332EA8 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 beq _02332EA8 mov r2, #1 @@ -5782,7 +5782,7 @@ _02332F08: .word 0x02353538 _02332F0C: .word 0x000003E7 _02332F10: .word 0x0000270F _02332F14: .word 0x00000EC3 - arm_func_end CalcDamageFinal + arm_func_end PerformDamageSequence arm_func_start ov29_02332F18 ov29_02332F18: ; 0x02332F18 @@ -5807,7 +5807,7 @@ ov29_02332F18: ; 0x02332F18 bl ov29_0230D088 ldr r1, [sp, #0x40] mov r0, r6 - bl ov29_02324E44 + bl GetDamageSourceWrapper mov r1, #1 str r1, [sp] stmib sp, {r0, r1} @@ -5816,7 +5816,7 @@ ov29_02332F18: ; 0x02332F18 str r3, [sp, #0xc] mov r1, r7 add r2, sp, #0x10 - bl ov29_0230863C + bl ApplyDamageAndEffects ldrb r0, [sp, #0x20] cmp r0, #0 movne r0, #0 @@ -5844,13 +5844,13 @@ ov29_02332FC8: ; 0x02332FC8 ldrsh r1, [r5, #4] ldrsh r0, [r4, #4] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 bgt _02333010 ldrsh r1, [r5, #6] ldrsh r0, [r4, #6] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #1 ble _02333018 _02333010: @@ -6324,7 +6324,7 @@ _02333634: ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333648: mov r0, r4 - bl ov29_02319748 + bl MirrorMoveIsActive cmp r0, #0 beq _02333F90 mov r0, #0 @@ -6403,7 +6403,7 @@ _02333744: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333758: - bl ov29_023197CC + bl MistIsActive cmp r0, #0 beq _02333F90 mov r0, #0 @@ -6582,7 +6582,7 @@ _023339B0: bne _02333F90 mov r0, r4 mov r1, #0 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 bne _02333F90 mov r0, #0 @@ -6704,7 +6704,7 @@ _02333B60: cmp r0, #2 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 beq _02333F90 mov r0, #0 @@ -6731,7 +6731,7 @@ _02333BB8: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333BCC: - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 beq _02333F90 mov r0, #0 @@ -6761,7 +6761,7 @@ _02333C0C: beq _02333C5C mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02333C5C ldr r1, [r7, #0xb4] @@ -6795,7 +6795,7 @@ _02333C80: beq _02333CD0 mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02333CD0 ldr r1, [r7, #0xb4] @@ -6839,7 +6839,7 @@ _02333D18: beq _02333D5C mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 ldrne r0, [r7, #0xb4] ldrneb r0, [r0, #0xd5] @@ -6870,7 +6870,7 @@ _02333D80: beq _02333DC4 mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 ldrne r0, [r7, #0xb4] ldrneb r0, [r0, #0xd5] @@ -6888,7 +6888,7 @@ _02333DD0: ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333DE0: mov r1, #0 - bl ov29_02300634 + bl MonsterHasNegativeStatus cmp r0, #0 bne _02333F90 mov r0, #0 @@ -6912,7 +6912,7 @@ _02333E10: beq _02333E70 mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02333E70 ldr r1, [r7, #0xb4] @@ -6950,7 +6950,7 @@ _02333E94: beq _02333EF4 mov r0, r4 mov r1, r7 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 beq _02333EF4 ldr r1, [r7, #0xb4] diff --git a/asm/overlay_29_02333FD0.s b/asm/overlay_29_02333FD0.s index a9a6e3ab..fabc89e2 100644 --- a/asm/overlay_29_02333FD0.s +++ b/asm/overlay_29_02333FD0.s @@ -366,7 +366,7 @@ _023344C0: b _02334C9C _023344D0: mov r0, r6 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 beq _02334C9C mov r0, #0 @@ -377,7 +377,7 @@ _023344E8: moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r6 - bl ov29_023007A8 + bl IsMonsterSleeping cmp r0, #0 beq _02334C9C mov r0, #0 @@ -985,7 +985,7 @@ GetApparentWeather: ; 0x02334D08 movs r4, r0 beq _02334D40 mov r1, #0x6f - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 bne _02334D34 @@ -1026,7 +1026,7 @@ _02334D8C: bl TryActivateArtificialWeatherAbilities mov r0, #0 mov r1, #1 - bl ov29_023354C4 + bl TryActivateWeather ldmia sp!, {r3, pc} .align 2, 0 _02334DA4: .word 0x02353538 @@ -1095,7 +1095,7 @@ ov29_02334E70: ; 0x02334E70 str r0, [sp] mov r0, #0 bl GetApparentWeather - bl ov29_022DE620 + bl GetWeatherColorTable mov r5, r0 mov r0, #0 bl GetApparentWeather @@ -1104,7 +1104,7 @@ ov29_02334E70: ; 0x02334E70 mov r0, #0x25 bl AdvanceFrame mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething ldr r0, _0233503C ; =0x02353562 mov r1, #1 ldrb fp, [r0] @@ -1123,7 +1123,7 @@ _02334ED0: add r0, sl, r8, lsl #2 ldrb sb, [r0, #0x1e0] sub r0, sb, r7 - bl Abs + bl abs cmp r0, #0xa addlt r0, sl, r8, lsl #2 strltb r7, [r0, #0x1e0] @@ -1147,7 +1147,7 @@ _02334F28: add r0, sl, r8, lsl #2 ldrb sb, [r0, #0x1e1] sub r0, sb, r7 - bl Abs + bl abs cmp r0, #0xa addlt r0, sl, r8, lsl #2 strltb r7, [r0, #0x1e1] @@ -1171,7 +1171,7 @@ _02334F84: add r0, sl, r8, lsl #2 ldrb sb, [r0, #0x1e2] sub r0, sb, r7 - bl Abs + bl abs cmp r0, #0xa addlt r0, sl, r8, lsl #2 strltb r7, [r0, #0x1e2] diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 522d454c..e935e2b4 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -8,7 +8,7 @@ ov29_023350FC: ; 0x023350FC stmdb sp!, {r3, lr} mov r0, #0 bl GetApparentWeather - bl ov29_022DE620 + bl GetWeatherColorTable ldr r2, _0233516C ; =0x02353538 mov r1, #0 _02335114: @@ -55,7 +55,7 @@ TryWeatherFormChange: ; 0x02335170 bl CalcSpeedStageWrapper mov r0, sl mov r1, #0x25 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 mov r0, sl beq _023351E0 @@ -111,12 +111,12 @@ _02335258: _02335270: mov r0, sl mov r1, #0x25 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 beq _02335298 ldrsh r1, [r7, #2] mov r0, sl - bl ov29_022F9408 + bl GetMonsterApparentId strh r0, [r7, #4] b _023352C0 _02335298: @@ -136,7 +136,7 @@ _023352C0: cmp r0, r4 beq _02335420 ldrsh r0, [r7, #4] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [sl, #0xa8] mov r0, sl bl GetSleepAnimationId @@ -219,7 +219,7 @@ _023353F0: cmp r0, r4 beq _02335420 ldrsh r0, [r7, #4] - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex strh r0, [sl, #0xa8] mov r0, sl bl GetSleepAnimationId @@ -242,8 +242,8 @@ _02335444: .word 0x00000424 _02335448: .word 0x00000425 arm_func_end TryWeatherFormChange - arm_func_start ov29_0233544C -ov29_0233544C: ; 0x0233544C + arm_func_start ActivateSportCondition +ActivateSportCondition: ; 0x0233544C stmdb sp!, {r3, lr} cmp r0, #0 mov r0, #0 @@ -276,10 +276,10 @@ _023354B4: .word 0x022C478C _023354B8: .word 0x02353538 _023354BC: .word 0x00000CDA _023354C0: .word 0x00000CDB - arm_func_end ov29_0233544C + arm_func_end ActivateSportCondition - arm_func_start ov29_023354C4 -ov29_023354C4: ; 0x023354C4 + arm_func_start TryActivateWeather +TryActivateWeather: ; 0x023354C4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r4, #0 mov sl, r0 @@ -394,10 +394,10 @@ _0233565C: _02335664: .word 0x02353538 _02335668: .word 0x00000C93 _0233566C: .word 0x00000C92 - arm_func_end ov29_023354C4 + arm_func_end TryActivateWeather - arm_func_start ov29_02335670 -ov29_02335670: ; 0x02335670 + arm_func_start DigitCount +DigitCount: ; 0x02335670 stmdb sp!, {r3, r4, r5, lr} cmp r0, #0 rsblt r0, r0, #0 @@ -411,7 +411,7 @@ ov29_02335670: ; 0x02335670 b _023356B0 _0233569C: mov r1, r4 - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 add r5, r5, #1 @@ -420,10 +420,10 @@ _023356B0: bne _0233569C mov r0, r5 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02335670 + arm_func_end DigitCount - arm_func_start ov29_023356C0 -ov29_023356C0: ; 0x023356C0 + arm_func_start LoadTextureUi +LoadTextureUi: ; 0x023356C0 stmdb sp!, {r3, lr} sub sp, sp, #8 ldr r0, _02335750 ; =0x02352B4C @@ -465,7 +465,7 @@ _02335750: .word 0x02352B4C _02335754: .word 0x0235371C _02335758: .word 0x02353720 _0233575C: .word 0x0237CA8C - arm_func_end ov29_023356C0 + arm_func_end LoadTextureUi arm_func_start ov29_02335760 ov29_02335760: ; 0x02335760 @@ -529,7 +529,7 @@ ov29_02335808: ; 0x02335808 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 mov r5, r1 - bl sub_0201E730 + bl InitRender3dElement mov r1, #0 mov r0, r5, lsl #0x10 strb r1, [r4, #0x3c] @@ -564,8 +564,8 @@ ov29_02335864: ; 0x02335864 _0233587C: .word 0x020AFC70 arm_func_end ov29_02335864 - arm_func_start ov29_02335880 -ov29_02335880: ; 0x02335880 + arm_func_start DisplayNumberTextureUi +DisplayNumberTextureUi: ; 0x02335880 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x40 ldr r4, _02335984 ; =0x0237CA8C @@ -579,7 +579,7 @@ ov29_02335880: ; 0x02335880 mov r6, r3 bl ov29_02335808 mov r0, sl - bl ov29_02335670 + bl DigitCount mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 cmp r6, #0 @@ -599,7 +599,7 @@ _023358E8: mov r1, #0xa strh r2, [sp] strh fp, [sp, #2] - bl DivideInt + bl __divsi3 add r0, sb, r1 mov r0, r0, lsl #0x10 mov r7, r0, asr #0x10 @@ -617,7 +617,7 @@ _023358E8: bl sub_0201F2A0 mov r0, sl mov r1, #0xa - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov sl, r0, asr #0x10 add r0, r4, r7, lsl #3 @@ -635,10 +635,10 @@ _02335968: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02335984: .word 0x0237CA8C - arm_func_end ov29_02335880 + arm_func_end DisplayNumberTextureUi - arm_func_start ov29_02335988 -ov29_02335988: ; 0x02335988 + arm_func_start DisplayCharTextureUi +DisplayCharTextureUi: ; 0x02335988 stmdb sp!, {r4, r5, r6, lr} ldr r4, _023359F4 ; =0x0237CA8C mov r6, r0 @@ -668,7 +668,7 @@ ov29_02335988: ; 0x02335988 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023359F4: .word 0x0237CA8C - arm_func_end ov29_02335988 + arm_func_end DisplayCharTextureUi arm_func_start ov29_023359F8 ov29_023359F8: ; 0x023359F8 @@ -681,8 +681,8 @@ _02335A08: .word 0x0237CA8C _02335A0C: .word SetBothScreensWindowColorToDefault arm_func_end ov29_023359F8 - arm_func_start ov29_02335A10 -ov29_02335A10: ; 0x02335A10 + arm_func_start DisplayUi +DisplayUi: ; 0x02335A10 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 ldr r0, _02335F2C ; =0x02353538 @@ -776,7 +776,7 @@ _02335B5C: mov r1, #2 bl ov29_02335808 mov r6, #0 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 addne r0, r6, #0x18 movne r0, r0, lsl #0x10 @@ -793,7 +793,7 @@ _02335B5C: mov r2, r1 mov r3, #0x18 str sl, [sp] - bl ov29_02335988 + bl DisplayCharTextureUi add r0, r6, r0 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 @@ -809,7 +809,7 @@ _02335BC0: mov r0, r6 and r3, r3, #0xff mov r1, #0 - bl ov29_02335880 + bl DisplayNumberTextureUi b _02335C18 _02335BF4: cmp r0, #0 @@ -820,7 +820,7 @@ _02335BF4: mov r0, r6 and r3, r3, #0xff mov r1, #0 - bl ov29_02335880 + bl DisplayNumberTextureUi _02335C18: add r0, r6, r0 mov r0, r0, lsl #0x10 @@ -830,7 +830,7 @@ _02335C18: mov r2, #0 mov r3, #0x14 str sl, [sp] - bl ov29_02335988 + bl DisplayCharTextureUi add r0, r6, r0 mov r0, r0, lsl #0x10 mov r6, r0, asr #0x10 @@ -840,7 +840,7 @@ _02335C48: str sl, [sp] mov r2, #0 mov r3, #0x15 - bl ov29_02335988 + bl DisplayCharTextureUi ldrb r1, [r5, #0x2f] add r0, r6, r0 mov r0, r0, lsl #0x10 @@ -853,14 +853,14 @@ _02335C48: mov r0, r6 and r3, r3, #0xff mov r1, #0 - bl ov29_02335880 + bl DisplayNumberTextureUi mov r6, #0x48 add r0, sp, #4 mov r1, r6 str sl, [sp] mov r2, #0 mov r3, #0x16 - bl ov29_02335988 + bl DisplayCharTextureUi ldrb r1, [r5, #0x2f] add r0, r0, #0x48 mov r0, r0, lsl #0x10 @@ -873,7 +873,7 @@ _02335C48: mov r0, r6 and r3, r3, #0xff mov r1, #0 - bl ov29_02335880 + bl DisplayNumberTextureUi add r0, r6, r0 mov r7, r0, lsl #0x10 mov r6, r7, asr #0x10 @@ -882,7 +882,7 @@ _02335C48: str sl, [sp] mov r2, #0 mov r3, #0x17 - bl ov29_02335988 + bl DisplayCharTextureUi ldrb r1, [r5, #0x2f] add r0, r0, r7, asr #16 mov r0, r0, lsl #0x10 @@ -895,7 +895,7 @@ _02335C48: mov r0, r6 and r3, r3, #0xff mov r1, #0 - bl ov29_02335880 + bl DisplayNumberTextureUi ldr r0, _02335F30 ; =0x0237CA8C cmp r4, #0 ldr r0, [r0, #4] @@ -904,7 +904,7 @@ _02335C48: mov r6, #0x10 blt _02335F24 add r0, sp, #4 - bl sub_0201E730 + bl InitRender3dElement ldr r0, _02335F30 ; =0x0237CA8C mov fp, #5 ldrh r3, [r0] @@ -1028,7 +1028,7 @@ _02335F30: .word 0x0237CA8C _02335F34: .word 0x000003E7 _02335F38: .word 0x0237C850 _02335F3C: .word 0x020AFC70 - arm_func_end ov29_02335A10 + arm_func_end DisplayUi arm_func_start ov29_02335F40 ov29_02335F40: ; 0x02335F40 @@ -1039,7 +1039,7 @@ ov29_02335F40: ; 0x02335F40 mov sl, r1 mov r4, r3 ldr sb, [sp, #0x6c] - bl sub_0201E730 + bl InitRender3dElement mov r0, #0 ldrh r1, [sp, #0x68] mov r2, #0x21 @@ -1079,7 +1079,7 @@ ov29_02335F40: ; 0x02335F40 _02335FF0: mov r0, sb mov r4, #0 - bl ov29_02335670 + bl DigitCount mov r7, r0 mov r0, r7, lsl #3 add r0, r0, r0, lsr #31 @@ -1127,7 +1127,7 @@ _02336094: strh sl, [sp, #2] strh r5, [sp, #8] strh r5, [sp, #0xa] - bl DivideInt + bl __divsi3 mov r0, r1, lsl #3 strh r0, [sp, #0x16] add r0, sp, #0 @@ -1137,7 +1137,7 @@ _02336094: bl sub_0201F2A0 mov r0, sb mov r1, #0xa - bl DivideInt + bl __divsi3 mov r0, r0, lsl #0x10 mov sb, r0, asr #0x10 add r6, r6, #1 @@ -1217,8 +1217,8 @@ _023361CC: .word 0x0237CAB8 _023361D0: .word 0x02353538 arm_func_end GetTileSafe - arm_func_start ov29_023361D4 -ov29_023361D4: ; 0x023361D4 + arm_func_start IsFullFloorFixedRoom +IsFullFloorFixedRoom: ; 0x023361D4 ldr r0, _02336200 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x4000 @@ -1233,23 +1233,23 @@ _023361F8: bx lr .align 2, 0 _02336200: .word 0x02353538 - arm_func_end ov29_023361D4 + arm_func_end IsFullFloorFixedRoom - arm_func_start ov29_02336204 -ov29_02336204: ; 0x02336204 + arm_func_start IsCurrentTilesetBackground +IsCurrentTilesetBackground: ; 0x02336204 ldr r0, _0233621C ; =0x02353538 - ldr ip, _02336220 ; =ov10_022C2574 + ldr ip, _02336220 ; =IsBackgroundTileset ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] bx ip .align 2, 0 _0233621C: .word 0x02353538 -_02336220: .word ov10_022C2574 - arm_func_end ov29_02336204 +_02336220: .word IsBackgroundTileset + arm_func_end IsCurrentTilesetBackground - arm_func_start ov29_02336224 -ov29_02336224: ; 0x02336224 + arm_func_start TrySpawnGoldenChamber +TrySpawnGoldenChamber: ; 0x02336224 stmdb sp!, {r3, lr} bl IsGoldenChamber cmp r0, #0 @@ -1266,10 +1266,10 @@ ov29_02336224: ; 0x02336224 ldmia sp!, {r3, pc} .align 2, 0 _0233625C: .word 0x02353538 - arm_func_end ov29_02336224 + arm_func_end TrySpawnGoldenChamber - arm_func_start ov29_02336260 -ov29_02336260: ; 0x02336260 + arm_func_start CountItemsOnFloorForAcuteSniffer +CountItemsOnFloorForAcuteSniffer: ; 0x02336260 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, #0 @@ -1282,7 +1282,7 @@ _0233627C: b _023362A8 _02336284: mov r0, r4 - bl ov29_02337B2C + bl PositionHasItem cmp r0, #0 addne r0, r6, #1 movne r0, r0, lsl #0x10 @@ -1310,7 +1310,7 @@ _023362C0: .align 2, 0 _023362E4: .word 0x02353538 _023362E8: .word 0x00012AF8 - arm_func_end ov29_02336260 + arm_func_end CountItemsOnFloorForAcuteSniffer arm_func_start ov29_023362EC ov29_023362EC: ; 0x023362EC @@ -1372,8 +1372,8 @@ _02336314: _023363BC: .word 0x02353538 arm_func_end ov29_023362EC - arm_func_start ov29_023363C0 -ov29_023363C0: ; 0x023363C0 + arm_func_start GetStairsSpawnPosition +GetStairsSpawnPosition: ; 0x023363C0 ldr r3, _023363E8 ; =0x02353538 ldr r2, [r3] add r2, r2, #0xcc00 @@ -1386,10 +1386,10 @@ ov29_023363C0: ; 0x023363C0 bx lr .align 2, 0 _023363E8: .word 0x02353538 - arm_func_end ov29_023363C0 + arm_func_end GetStairsSpawnPosition - arm_func_start ov29_023363EC -ov29_023363EC: ; 0x023363EC + arm_func_start PositionIsOnStairs +PositionIsOnStairs: ; 0x023363EC ldr r2, _02336424 ; =0x02353538 mov ip, #0 ldr r2, [r2] @@ -1406,7 +1406,7 @@ ov29_023363EC: ; 0x023363EC bx lr .align 2, 0 _02336424: .word 0x02353538 - arm_func_end ov29_023363EC + arm_func_end PositionIsOnStairs arm_func_start GetStairsRoom GetStairsRoom: ; 0x02336428 @@ -1423,14 +1423,14 @@ GetStairsRoom: ; 0x02336428 _0233644C: .word 0x02353538 arm_func_end GetStairsRoom - arm_func_start ov29_02336450 -ov29_02336450: ; 0x02336450 + arm_func_start GetDefaultTileTextureId +GetDefaultTileTextureId: ; 0x02336450 ldr r0, _0233645C ; =0x02353724 ldr r0, [r0, #4] bx lr .align 2, 0 _0233645C: .word 0x02353724 - arm_func_end ov29_02336450 + arm_func_end GetDefaultTileTextureId arm_func_start ov29_02336460 ov29_02336460: ; 0x02336460 @@ -1802,7 +1802,7 @@ _0233699C: mov r4, r0 cmp r4, #3 moveq r4, #0 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 mov r0, sb mov r1, r8 @@ -1851,8 +1851,8 @@ _02336A08: _02336A48: .word 0x02353538 arm_func_end ov29_023369F8 - arm_func_start ov29_02336A4C -ov29_02336A4C: ; 0x02336A4C + arm_func_start DetermineAllTilesWalkableNeighbors +DetermineAllTilesWalkableNeighbors: ; 0x02336A4C stmdb sp!, {r4, r5, r6, lr} mov r6, #0 mov r4, r6 @@ -1861,7 +1861,7 @@ _02336A58: _02336A5C: mov r0, r5 mov r1, r6 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r5, r5, #1 cmp r5, #0x38 blt _02336A5C @@ -1869,10 +1869,10 @@ _02336A5C: cmp r6, #0x20 blt _02336A58 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_02336A4C + arm_func_end DetermineAllTilesWalkableNeighbors - arm_func_start ov29_02336A84 -ov29_02336A84: ; 0x02336A84 + arm_func_start DetermineTileWalkableNeighbors +DetermineTileWalkableNeighbors: ; 0x02336A84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x28 mov r4, r1 @@ -2081,7 +2081,7 @@ _02336C20: strb sb, [r0, #0xb] add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end ov29_02336A84 + arm_func_end DetermineTileWalkableNeighbors arm_func_start ov29_02336DB0 ov29_02336DB0: ; 0x02336DB0 @@ -2199,8 +2199,8 @@ _02336F2C: _02336F48: .word 0x02352F14 arm_func_end ov29_02336DB0 - arm_func_start ov29_02336F4C -ov29_02336F4C: ; 0x02336F4C + arm_func_start UpdateTrapsVisibility +UpdateTrapsVisibility: ; 0x02336F4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 ldr r0, _02337108 ; =0x02353538 @@ -2209,7 +2209,7 @@ ov29_02336F4C: ; 0x02336F4C ldrb r0, [r1, #0x245] str r0, [sp, #0x18] ldrb fp, [r1, #0x244] - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar ldr r1, _0233710C ; =0x0001A224 ldr r2, _02337110 ; =0x02352B9C ldrsh r3, [sl, r1] @@ -2321,7 +2321,7 @@ _0233710C: .word 0x0001A224 _02337110: .word 0x02352B9C _02337114: .word 0x02352D58 _02337118: .word 0x0001A226 - arm_func_end ov29_02336F4C + arm_func_end UpdateTrapsVisibility arm_func_start ov29_0233711C ov29_0233711C: ; 0x0233711C @@ -2335,7 +2335,7 @@ ov29_0233711C: ; 0x0233711C ldrb r0, [r1, #0x245] str r0, [sp, #0x18] ldrb fp, [r1, #0x244] - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar ldr r2, _02337298 ; =0x0001A224 ldr r1, _0233729C ; =0x02352B9C add r3, r2, #2 @@ -2440,7 +2440,7 @@ ov29_023372A4: ; 0x023372A4 ldrb r0, [r1, #0x245] str r0, [sp, #0x18] ldrb fp, [r1, #0x244] - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar ldr r2, _0233741C ; =0x0001A224 ldr r1, _02337420 ; =0x02352B9C add r3, r2, #2 @@ -2532,8 +2532,8 @@ _02337420: .word 0x02352B9C _02337424: .word 0x02352D58 arm_func_end ov29_023372A4 - arm_func_start ov29_02337428 -ov29_02337428: ; 0x02337428 + arm_func_start DrawTileGrid +DrawTileGrid: ; 0x02337428 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 ldr r5, _02337780 ; =0x02353538 @@ -2773,10 +2773,10 @@ _0233778C: .word 0x02352B9C _02337790: .word 0x02352D58 _02337794: .word 0x0001A226 _02337798: .word 0x0001213E - arm_func_end ov29_02337428 + arm_func_end DrawTileGrid - arm_func_start ov29_0233779C -ov29_0233779C: ; 0x0233779C + arm_func_start HideTileGrid +HideTileGrid: ; 0x0233779C stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #4 mov r8, #0 @@ -2812,7 +2812,7 @@ _023377BC: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02337818: .word 0x02353538 - arm_func_end ov29_0233779C + arm_func_end HideTileGrid arm_func_start ov29_0233781C ov29_0233781C: ; 0x0233781C @@ -2967,15 +2967,15 @@ _02337A34: .word 0x0000270F _02337A38: .word 0x02353538 arm_func_end ov29_0233785C - arm_func_start ov29_02337A3C -ov29_02337A3C: ; 0x02337A3C + arm_func_start DiscoverMinimap +DiscoverMinimap: ; 0x02337A3C stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r5, r0 ldrsh r0, [r5] ldrsh r1, [r5, #2] bl GetTile ldrb r4, [r0, #7] - bl ov29_022E333C + bl GetVisibilityRange ldr r1, _02337B28 ; =0x02353538 ldr r3, [r1] add r1, r3, #0x1a000 @@ -3024,7 +3024,7 @@ _02337AE8: orr r2, r2, #3 strh r2, [r0, #2] mov r0, r8 - bl ov29_023391EC + bl DrawMinimapTile add r8, r8, #1 _02337B10: cmp r8, r5 @@ -3036,15 +3036,15 @@ _02337B1C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02337B28: .word 0x02353538 - arm_func_end ov29_02337A3C + arm_func_end DiscoverMinimap - arm_func_start ov29_02337B2C -ov29_02337B2C: ; 0x02337B2C + arm_func_start PositionHasItem +PositionHasItem: ; 0x02337B2C stmdb sp!, {r3, lr} mov r1, r0 ldrsh r0, [r1] ldrsh r1, [r1, #2] - arm_func_end ov29_02337B2C + arm_func_end PositionHasItem arm_func_start ov29_02337B3C ov29_02337B3C: ; 0x02337B3C @@ -3061,8 +3061,8 @@ ov29_02337B3C: ; 0x02337B3C ldmia sp!, {r3, pc} arm_func_end ov29_02337B3C - arm_func_start ov29_02337B68 -ov29_02337B68: ; 0x02337B68 + arm_func_start PositionHasMonster +PositionHasMonster: ; 0x02337B68 stmdb sp!, {r3, lr} mov r1, r0 ldrsh r0, [r1] @@ -3077,12 +3077,12 @@ ov29_02337B68: ; 0x02337B68 _02337B94: mov r0, #0 ldmia sp!, {r3, pc} - arm_func_end ov29_02337B68 + arm_func_end PositionHasMonster - arm_func_start ov29_02337B9C -ov29_02337B9C: ; 0x02337B9C + arm_func_start TrySmashWall +TrySmashWall: ; 0x02337B9C stmdb sp!, {r4, r5, r6, r7, r8, lr} - arm_func_end ov29_02337B9C + arm_func_end TrySmashWall arm_func_start ov29_02337BA0 ov29_02337BA0: ; 0x02337BA0 @@ -3119,12 +3119,12 @@ _02337BF8: ldrsh r1, [r8, #2] add r0, r6, r0 add r1, r7, r1 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors ldrsh r0, [r8] ldrsh r1, [r8, #2] add r0, r6, r0 add r1, r7, r1 - bl ov29_023391EC + bl DrawMinimapTile add r6, r6, #1 cmp r6, #1 ble _02337BF8 @@ -3155,7 +3155,7 @@ _02337C84: add r6, r6, #1 cmp r6, #0x14 blt _02337C5C - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r8 bl ov29_022E66C4 _02337C9C: diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index f3c50597..1df9c24a 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -37,7 +37,7 @@ _02337D34: ldrsh r1, [r6, #2] add r0, r8, r0 add r1, r5, r1 - bl ov29_02336A84 + bl DetermineTileWalkableNeighbors add r8, r8, #1 cmp r8, #1 ble _02337D34 @@ -75,7 +75,7 @@ _02337D9C: ldrsh r1, [r7, #2] add r0, r5, r0 add r1, r6, r1 - bl ov29_023391EC + bl DrawMinimapTile add r5, r5, #1 cmp r5, #1 ble _02337D9C @@ -100,7 +100,7 @@ _02337E0C: add r5, r5, #1 cmp r5, #0x14 blt _02337DE4 - bl ov29_02336F4C + bl UpdateTrapsVisibility mov r0, r7 bl ov29_022E66C4 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -112,7 +112,7 @@ ov29_02337E2C: ; 0x02337E2C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, #0 - bl ov29_02337E94 + bl IsWaterTileset cmp r0, #0 ldrh r0, [r5] beq _02337E54 @@ -141,8 +141,8 @@ _02337E8C: .word 0x02353538 _02337E90: .word 0x020A1AE8 arm_func_end ov29_02337E2C - arm_func_start ov29_02337E94 -ov29_02337E94: ; 0x02337E94 + arm_func_start IsWaterTileset +IsWaterTileset: ; 0x02337E94 ldr r0, _02337EB8 ; =0x02353538 mov r1, #0xc ldr r0, [r0] @@ -155,7 +155,7 @@ ov29_02337E94: ; 0x02337E94 .align 2, 0 _02337EB8: .word 0x02353538 _02337EBC: .word 0x022C6327 - arm_func_end ov29_02337E94 + arm_func_end IsWaterTileset arm_func_start ov29_02337EC0 ov29_02337EC0: ; 0x02337EC0 @@ -223,8 +223,8 @@ _02337F90: .word 0x0000022A _02337F94: .word 0x000003D7 arm_func_end ov29_02337EE8 - arm_func_start ov29_02337F98 -ov29_02337F98: ; 0x02337F98 + arm_func_start GetRandomSpawnMonsterID +GetRandomSpawnMonsterID: ; 0x02337F98 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 ldr r0, _02338040 ; =0x02353538 @@ -274,7 +274,7 @@ _02338024: _02338040: .word 0x02353538 _02338044: .word 0x0000022A _02338048: .word 0x000003D7 - arm_func_end ov29_02337F98 + arm_func_end GetRandomSpawnMonsterID arm_func_start ov29_0233804C ov29_0233804C: ; 0x0233804C @@ -442,8 +442,8 @@ _02338274: _02338284: .word 0x0235171C arm_func_end ov29_023381C0 - arm_func_start ov29_02338288 -ov29_02338288: ; 0x02338288 + arm_func_start NearbyAllyIqSkillIsEnabled +NearbyAllyIqSkillIsEnabled: ; 0x02338288 stmdb sp!, {r3, lr} mov r2, #0 bl ov29_023381C0 @@ -452,7 +452,7 @@ ov29_02338288: ; 0x02338288 moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, pc} - arm_func_end ov29_02338288 + arm_func_end NearbyAllyIqSkillIsEnabled arm_func_start ov29_023382A8 ov29_023382A8: ; 0x023382A8 @@ -516,8 +516,8 @@ ov29_02338350: ; 0x02338350 ldmia sp!, {r3, pc} arm_func_end ov29_02338350 - arm_func_start ov29_0233836C -ov29_0233836C: ; 0x0233836C + arm_func_start ResetGravity +ResetGravity: ; 0x0233836C ldr r0, _02338388 ; =0x02353538 ldr ip, _0233838C ; =MemZero ldr r0, [r0] @@ -528,7 +528,7 @@ ov29_0233836C: ; 0x0233836C .align 2, 0 _02338388: .word 0x02353538 _0233838C: .word MemZero - arm_func_end ov29_0233836C + arm_func_end ResetGravity arm_func_start GravityIsActive GravityIsActive: ; 0x02338390 @@ -597,7 +597,7 @@ ov29_02338430: ; 0x02338430 cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, #1 - bl ov29_02338794 + bl HiddenStairsTrigger ldmia sp!, {r4, pc} arm_func_end ov29_02338430 @@ -636,8 +636,8 @@ _023384B8: .word 0x02353538 _023384BC: .word 0x00012AFE arm_func_end ov29_0233847C - arm_func_start ov29_023384C0 -ov29_023384C0: ; 0x023384C0 + arm_func_start ShouldBoostKecleonShopSpawnChance +ShouldBoostKecleonShopSpawnChance: ; 0x023384C0 ldr r0, _023384D4 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x12000 @@ -645,10 +645,10 @@ ov29_023384C0: ; 0x023384C0 bx lr .align 2, 0 _023384D4: .word 0x02353538 - arm_func_end ov29_023384C0 + arm_func_end ShouldBoostKecleonShopSpawnChance - arm_func_start ov29_023384D8 -ov29_023384D8: ; 0x023384D8 + arm_func_start SetShouldBoostKecleonShopSpawnChance +SetShouldBoostKecleonShopSpawnChance: ; 0x023384D8 ldr r1, _023384EC ; =0x02353538 ldr r1, [r1] add r1, r1, #0x12000 @@ -656,10 +656,10 @@ ov29_023384D8: ; 0x023384D8 bx lr .align 2, 0 _023384EC: .word 0x02353538 - arm_func_end ov29_023384D8 + arm_func_end SetShouldBoostKecleonShopSpawnChance - arm_func_start ov29_023384F0 -ov29_023384F0: ; 0x023384F0 + arm_func_start UpdateShouldBoostKecleonShopSpawnChance +UpdateShouldBoostKecleonShopSpawnChance: ; 0x023384F0 stmdb sp!, {r3, lr} ldr r0, _0233852C ; =0x02353538 mov r2, #0 @@ -667,7 +667,7 @@ ov29_023384F0: ; 0x023384F0 mov r0, #0x5e add r1, r1, #0x12000 strb r2, [r1, #0xb24] - bl ov29_0230F840 + bl TeamMemberHasExclusiveItemEffectActive cmp r0, #0 ldrne r0, _0233852C ; =0x02353538 movne r1, #1 @@ -677,7 +677,7 @@ ov29_023384F0: ; 0x023384F0 ldmia sp!, {r3, pc} .align 2, 0 _0233852C: .word 0x02353538 - arm_func_end ov29_023384F0 + arm_func_end UpdateShouldBoostKecleonShopSpawnChance arm_func_start ov29_02338530 ov29_02338530: ; 0x02338530 @@ -690,8 +690,8 @@ ov29_02338530: ; 0x02338530 _02338544: .word 0x02353538 arm_func_end ov29_02338530 - arm_func_start ov29_02338548 -ov29_02338548: ; 0x02338548 + arm_func_start SetDoughSeedFlag +SetDoughSeedFlag: ; 0x02338548 ldr r1, _0233855C ; =0x02353538 ldr r1, [r1] add r1, r1, #0x4000 @@ -699,10 +699,10 @@ ov29_02338548: ; 0x02338548 bx lr .align 2, 0 _0233855C: .word 0x02353538 - arm_func_end ov29_02338548 + arm_func_end SetDoughSeedFlag - arm_func_start ov29_02338560 -ov29_02338560: ; 0x02338560 + arm_func_start TrySpawnDoughSeedPoke +TrySpawnDoughSeedPoke: ; 0x02338560 stmdb sp!, {r3, lr} ldr r0, _023385BC ; =0x02353538 ldr r0, [r0] @@ -710,7 +710,7 @@ ov29_02338560: ; 0x02338560 ldrb r0, [r0, #0xc8] cmp r0, #0 ldmeqia sp!, {r3, pc} - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 bne _023385A4 ldr r1, _023385C0 ; =0x02352B5C @@ -730,10 +730,10 @@ _023385A4: .align 2, 0 _023385BC: .word 0x02353538 _023385C0: .word 0x02352B5C - arm_func_end ov29_02338560 + arm_func_end TrySpawnDoughSeedPoke - arm_func_start IsSecretBazaar__023385C4 -IsSecretBazaar__023385C4: ; 0x023385C4 + arm_func_start IsSecretBazaar +IsSecretBazaar: ; 0x023385C4 ldr r0, _023385E8 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x4000 @@ -745,10 +745,10 @@ IsSecretBazaar__023385C4: ; 0x023385C4 bx lr .align 2, 0 _023385E8: .word 0x02353538 - arm_func_end IsSecretBazaar__023385C4 + arm_func_end IsSecretBazaar - arm_func_start ov29_023385EC -ov29_023385EC: ; 0x023385EC + arm_func_start ShouldBoostHiddenStairsSpawnChance +ShouldBoostHiddenStairsSpawnChance: ; 0x023385EC ldr r0, _02338600 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x12000 @@ -756,10 +756,10 @@ ov29_023385EC: ; 0x023385EC bx lr .align 2, 0 _02338600: .word 0x02353538 - arm_func_end ov29_023385EC + arm_func_end ShouldBoostHiddenStairsSpawnChance - arm_func_start ov29_02338604 -ov29_02338604: ; 0x02338604 + arm_func_start SetShouldBoostHiddenStairsSpawnChance +SetShouldBoostHiddenStairsSpawnChance: ; 0x02338604 ldr r1, _02338618 ; =0x02353538 ldr r1, [r1] add r1, r1, #0x12000 @@ -767,10 +767,10 @@ ov29_02338604: ; 0x02338604 bx lr .align 2, 0 _02338618: .word 0x02353538 - arm_func_end ov29_02338604 + arm_func_end SetShouldBoostHiddenStairsSpawnChance - arm_func_start ov29_0233861C -ov29_0233861C: ; 0x0233861C + arm_func_start UpdateShouldBoostHiddenStairsSpawnChance +UpdateShouldBoostHiddenStairsSpawnChance: ; 0x0233861C stmdb sp!, {r3, lr} ldr r0, _02338658 ; =0x02353538 mov r2, #0 @@ -778,7 +778,7 @@ ov29_0233861C: ; 0x0233861C mov r0, #0x5f add r1, r1, #0x12000 strb r2, [r1, #0xb25] - bl ov29_0230F840 + bl TeamMemberHasExclusiveItemEffectActive cmp r0, #0 ldrne r0, _02338658 ; =0x02353538 movne r1, #1 @@ -788,7 +788,7 @@ ov29_0233861C: ; 0x0233861C ldmia sp!, {r3, pc} .align 2, 0 _02338658: .word 0x02353538 - arm_func_end ov29_0233861C + arm_func_end UpdateShouldBoostHiddenStairsSpawnChance arm_func_start IsSecretRoom IsSecretRoom: ; 0x0233865C @@ -808,7 +808,7 @@ _02338680: .word 0x02353538 arm_func_start IsSecretFloor IsSecretFloor: ; 0x02338684 stmdb sp!, {r3, lr} - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar cmp r0, #0 bne _023386A0 bl IsSecretRoom @@ -825,7 +825,7 @@ _023386A8: arm_func_start ov29_023386B0 ov29_023386B0: ; 0x023386B0 stmdb sp!, {r3, lr} - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -836,8 +836,8 @@ ov29_023386B0: ; 0x023386B0 ldmia sp!, {r3, pc} arm_func_end ov29_023386B0 - arm_func_start ov29_023386D8 -ov29_023386D8: ; 0x023386D8 + arm_func_start HiddenStairsPresent +HiddenStairsPresent: ; 0x023386D8 ldr r0, _02338704 ; =0x02353538 mvn r1, #0 ldr r0, [r0] @@ -851,7 +851,7 @@ ov29_023386D8: ; 0x023386D8 bx lr .align 2, 0 _02338704: .word 0x02353538 - arm_func_end ov29_023386D8 + arm_func_end HiddenStairsPresent arm_func_start ov29_02338708 ov29_02338708: ; 0x02338708 @@ -874,7 +874,7 @@ _02338738: .word 0x02353538 arm_func_start ov29_0233873C ov29_0233873C: ; 0x0233873C stmdb sp!, {r3, lr} - bl ov29_023386D8 + bl HiddenStairsPresent cmp r0, #0 ldmeqia sp!, {r3, pc} ldr r0, _02338764 ; =0x02353538 @@ -902,11 +902,11 @@ ov29_02338768: ; 0x02338768 ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_02338768 - arm_func_start ov29_02338794 -ov29_02338794: ; 0x02338794 + arm_func_start HiddenStairsTrigger +HiddenStairsTrigger: ; 0x02338794 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl ov29_023386D8 + bl HiddenStairsPresent cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _02338848 ; =0x02353538 @@ -934,7 +934,7 @@ ov29_02338794: ; 0x02338794 add r0, r0, #0xcc00 mov r1, #0x41 mov r2, #1 - bl ov29_022E37DC + bl PlayEffectAnimationPos bl GetLeader ldr r1, _0233884C ; =0x00000F31 bl LogMessageByIdWithPopupCheckUser @@ -947,13 +947,13 @@ _0233881C: add r1, r0, #0xcc00 ldrsh r0, [r1, #0xe8] ldrsh r1, [r1, #0xea] - bl ov29_023391EC - bl ov29_02336F4C + bl DrawMinimapTile + bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02338848: .word 0x02353538 _0233884C: .word 0x00000F31 - arm_func_end ov29_02338794 + arm_func_end HiddenStairsTrigger arm_func_start ov29_02338850 ov29_02338850: ; 0x02338850 @@ -1408,7 +1408,7 @@ _02338E04: add r7, r8, r6, lsl #6 mov r0, r7 mov r4, r6, lsl #6 - bl sub_0201E730 + bl InitRender3dElement strb fp, [r7, #0x3c] strh fp, [r8, r4] strh fp, [r7, #2] @@ -1734,8 +1734,8 @@ _023391E4: .word 0x02353538 _023391E8: .word 0x022C631C arm_func_end ov29_023391C0 - arm_func_start ov29_023391EC -ov29_023391EC: ; 0x023391EC + arm_func_start DrawMinimapTile +DrawMinimapTile: ; 0x023391EC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 mov sl, r0 @@ -1847,7 +1847,7 @@ _02339344: cmp r0, #1 bne _0233946C ldr r0, [sp, #4] - bl ov29_022E2498 + bl ShouldMinimapDisplayEntity cmp r0, #0 beq _0233946C ldr r0, [sp, #4] @@ -1956,7 +1956,7 @@ _023394F4: ldreq r2, [sp, #0x18] cmpeq r2, #0 beq _0233953C - bl ov29_022E1608 + bl GetTrapInfo ldrb r1, [r0] ldr r0, _023398D4 ; =0x02352FF4 mov r7, #0 @@ -2154,7 +2154,7 @@ _0233979C: add r6, r0, r4, lsl #6 ldr r1, [r2, r1, lsl #2] mov r0, r6 - bl ov29_0233A2F0 + bl InitMinimapDisplayTile ldr r0, _023398CC ; =0x0235376C ldrsh r1, [sp, #0x2e] ldr r0, [r0, #8] @@ -2165,7 +2165,7 @@ _0233979C: add r0, r8, r1, lsl #2 ldr r1, [r2, r0, lsl #2] mov r0, r7 - bl ov29_0233A2F0 + bl InitMinimapDisplayTile add r0, fp, #0xe000 ldrb r1, [r0, #0x445] cmp r1, #0 @@ -2212,7 +2212,7 @@ _023398C8: .word 0x02353538 _023398CC: .word 0x0235376C _023398D0: .word 0x0237CFB8 _023398D4: .word 0x02352FF4 - arm_func_end ov29_023391EC + arm_func_end DrawMinimapTile arm_func_start ov29_023398D8 ov29_023398D8: ; 0x023398D8 @@ -2504,8 +2504,8 @@ ov29_02339CD4: ; 0x02339CD4 _02339CE4: .word 0x0237CFB8 arm_func_end ov29_02339CD4 - arm_func_start ov29_02339CE8 -ov29_02339CE8: ; 0x02339CE8 + arm_func_start UpdateMinimap +UpdateMinimap: ; 0x02339CE8 stmdb sp!, {r4, r5, r6, lr} bl GetMinimapData cmp r0, #0 @@ -2520,7 +2520,7 @@ _02339D0C: _02339D10: mov r0, r5 mov r1, r6 - bl ov29_023391EC + bl DrawMinimapTile add r5, r5, #1 cmp r5, #0x38 blt _02339D10 @@ -2547,7 +2547,7 @@ _02339D54: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02339D78: .word 0x0235376C - arm_func_end ov29_02339CE8 + arm_func_end UpdateMinimap arm_func_start ov29_02339D7C ov29_02339D7C: ; 0x02339D7C @@ -2959,8 +2959,8 @@ _0233A274: ldmia sp!, {r4, pc} arm_func_end ov29_0233A248 - arm_func_start ov29_0233A290 -ov29_0233A290: ; 0x0233A290 + arm_func_start InitWeirdMinimapMatrix +InitWeirdMinimapMatrix: ; 0x0233A290 stmdb sp!, {r3, r4, r5, lr} bl GetMinimapData add r1, r0, #0xe000 @@ -2987,10 +2987,10 @@ _0233A2C0: add r0, r0, #0xe000 strb r3, [r0, #0x446] ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_0233A290 + arm_func_end InitWeirdMinimapMatrix - arm_func_start ov29_0233A2F0 -ov29_0233A2F0: ; 0x0233A2F0 + arm_func_start InitMinimapDisplayTile +InitMinimapDisplayTile: ; 0x0233A2F0 ldr r3, [r0] ldmia r1, {r2, ip} and r2, r3, r2 @@ -3087,7 +3087,7 @@ ov29_0233A2F0: ; 0x0233A2F0 orr r1, ip, r1 str r1, [r0, #0x3c] bx lr - arm_func_end ov29_0233A2F0 + arm_func_end InitMinimapDisplayTile arm_func_start ov29_0233A470 ov29_0233A470: ; 0x0233A470 @@ -3306,7 +3306,7 @@ GenerateFloor: ; 0x0233A6D8 strb r3, [r2, #3] strb r3, [r2, #1] strb r3, [r2, #7] - bl ov29_02342F08 + bl ResetHiddenStairsSpawn bl IsOutlawMonsterHouseFloor ldr r1, _0233AE64 ; =0x02353538 ldr r3, _0233AE6C ; =0x0237CFBC @@ -3315,7 +3315,7 @@ GenerateFloor: ; 0x0233A6D8 add r2, r2, #0xc4 strb r0, [r3, #8] add r0, r2, #0x4000 - bl ov29_02342D9C + bl GetHiddenStairsType ldr r1, _0233AE64 ; =0x02353538 ldr r2, _0233AE6C ; =0x0237CFBC ldr r1, [r1] @@ -3334,7 +3334,7 @@ GenerateFloor: ; 0x0233A6D8 mov r1, #0 strb r1, [r0, #6] ldrb r0, [sb, #7] - bl ov29_02342EBC + bl GetFinalKecleonShopSpawnChance ldr r1, _0233AE6C ; =0x0237CFBC strh r0, [r1, #0xc] ldrb r0, [sb, #8] @@ -3363,7 +3363,7 @@ GenerateFloor: ; 0x0233A6D8 b _0233A828 _0233A810: ldrb r0, [sb, #6] - bl Abs + bl abs ldr r1, _0233AE64 ; =0x02353538 ldr r1, [r1] add r1, r1, #0x700 @@ -3394,7 +3394,7 @@ _0233A870: ldr r0, [r1] add r0, r0, #0xc4 add r0, r0, #0x4000 - bl ov29_02342C68 + bl ResetImportantSpawnPositions mov r6, #0 mvn r5, #0 ldr r4, _0233AE64 ; =0x02353538 @@ -3491,13 +3491,13 @@ _0233A9DC: _0233A9E4: ldr r1, [sp, #8] mov r0, #0x38 - bl DivideInt + bl __divsi3 cmp r0, #7 movle r0, #1 strle r0, [sp, #8] ldr r1, [sp, #4] mov r0, #0x20 - bl DivideInt + bl __divsi3 ldr r1, [r4] cmp r0, #7 add r2, r1, #0x4000 @@ -3695,10 +3695,10 @@ _0233ACA0: and r4, r0, #0xff mov r0, sb mov r1, r4 - bl SpawnNonEnemies + bl MarkNonEnemySpawns mov r0, sb mov r1, r4 - bl SpawnEnemies + bl MarkEnemySpawns bl ResolveInvalidSpawns ldr r0, _0233AE64 ; =0x02353538 mvn r1, #0 @@ -3747,10 +3747,10 @@ _0233AD44: bl FinalizeJunctions mov r0, sb mov r1, #0 - bl SpawnNonEnemies + bl MarkNonEnemySpawns mov r0, sb mov r1, #0 - bl SpawnEnemies + bl MarkEnemySpawns bl ResolveInvalidSpawns _0233AD98: ldr r0, _0233AE6C ; =0x0237CFBC @@ -3765,7 +3765,7 @@ _0233AD98: ldrsh r0, [r1, #0x20] ldrsh r1, [r1, #0x22] mov r3, #0 - bl ov29_022FE198 + bl MarkShopkeeperSpawn _0233ADCC: ldr r0, _0233AE6C ; =0x0237CFBC ldr r0, [r0, #0x30] @@ -3832,8 +3832,8 @@ DungeonRand100: ; 0x0233AE84 _0233AE90: .word DungeonRandInt arm_func_end DungeonRand100 - arm_func_start ov29_0233AE94 -ov29_0233AE94: ; 0x0233AE94 + arm_func_start ClearHiddenStairs +ClearHiddenStairs: ; 0x0233AE94 stmdb sp!, {r3, lr} ldr r0, _0233AF04 ; =0x0235378C ldrb r0, [r0] @@ -3861,12 +3861,12 @@ ov29_0233AE94: ; 0x0233AE94 orr r1, r1, #1 strh r1, [r0] _0233AEFC: - bl ov29_02342F08 + bl ResetHiddenStairsSpawn ldmia sp!, {r3, pc} .align 2, 0 _0233AF04: .word 0x0235378C _0233AF08: .word 0x0237CFBC - arm_func_end ov29_0233AE94 + arm_func_end ClearHiddenStairs arm_func_start FlagHallwayJunctions FlagHallwayJunctions: ; 0x0233AF0C @@ -5316,7 +5316,7 @@ _0233C3E0: mov r5, r0, asr #0x10 b _0233C444 _0233C3F0: - bl ov29_023424D0 + bl GetNextFixedRoomAction str r0, [sp, #0x18] mov r0, r8 mov r1, sb @@ -5331,7 +5331,7 @@ _0233C3F0: mov ip, #1 mov r3, sb str ip, [sp] - bl ov29_02342F30 + bl PlaceFixedRoomTile cmp r0, #0 ldrne r0, [sp, #0x1c] strneh r8, [r0, #0xe4] @@ -5406,7 +5406,7 @@ _0233C500: cmp r5, #0x10 ble _0233C4FC _0233C534: - bl ov29_02336204 + bl IsCurrentTilesetBackground cmp r0, #0 beq _0233C584 mov r6, #0 @@ -5435,13 +5435,13 @@ _0233C584: _0233C590: add r1, r4, #4 mov r0, #0x38 - bl DivideInt + bl __divsi3 mov r6, r0 cmp r6, #2 add r1, r5, #4 mov r0, #0x20 movlt r6, #1 - bl DivideInt + bl __divsi3 mov r7, r0 cmp r7, #2 movlt r7, #1 @@ -6175,7 +6175,7 @@ _0233CFA8: mov r0, r5 mov r1, r8 str r4, [sl, r6, lsl #2] - bl DivideInt + bl __divsi3 add r4, r4, r0 add r6, r6, #1 _0233CFC0: @@ -6190,7 +6190,7 @@ _0233CFDC: mov r0, r4 mov r1, r7 str r6, [sb, r5, lsl #2] - bl DivideInt + bl __divsi3 add r6, r6, r0 add r5, r5, #1 _0233CFF4: @@ -9444,13 +9444,13 @@ _0233FD34: ldrsh r1, [r8, #4] ldrsh r0, [r8] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #5 blt _0233FF6C ldrsh r1, [r8, #6] ldrsh r0, [r8, #2] sub r0, r1, r0 - bl Abs + bl abs cmp r0, #4 blt _0233FF6C ldr r0, _0233FF90 ; =0x0237CFBC @@ -10613,8 +10613,8 @@ _02340D40: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ShuffleSpawnPositions - arm_func_start SpawnNonEnemies -SpawnNonEnemies: ; 0x02340D4C + arm_func_start MarkNonEnemySpawns +MarkNonEnemySpawns: ; 0x02340D4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xe00 ldr r3, _02341458 ; =0x02353538 @@ -10894,11 +10894,11 @@ _0234113C: beq _02341228 add r0, r6, r6, lsl #2 mov r1, #0xa - bl DivideInt + bl __divsi3 mov r4, r0 mov r0, r6, lsl #3 mov r1, #0xa - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r4 bl DungeonRandRange @@ -11112,10 +11112,10 @@ _02341460: .word 0x0002C9E8 _02341464: .word 0x00012AFA _02341468: .word 0x022C44AC _0234146C: .word 0x022C440C - arm_func_end SpawnNonEnemies + arm_func_end MarkNonEnemySpawns - arm_func_start SpawnEnemies -SpawnEnemies: ; 0x02341470 + arm_func_start MarkEnemySpawns +MarkEnemySpawns: ; 0x02341470 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x204 sub sp, sp, #0xc00 @@ -11134,7 +11134,7 @@ SpawnEnemies: ; 0x02341470 b _023414BC _023414B0: mov r0, r1 - bl Abs + bl abs mov r8, r0 _023414BC: mov r6, #0 @@ -11278,11 +11278,11 @@ _023416A0: beq _02341754 rsb r0, r7, r7, lsl #3 mov r1, #0xa - bl DivideInt + bl __divsi3 mov r4, r0 mov r0, r7, lsl #3 mov r1, #0xa - bl DivideInt + bl __divsi3 mov r1, r0 mov r0, r4 bl DungeonRandRange @@ -11323,7 +11323,7 @@ _02341754: _02341760: .word 0x02353538 _02341764: .word 0x0237CFBC _02341768: .word 0x022C4660 - arm_func_end SpawnEnemies + arm_func_end MarkEnemySpawns arm_func_start SetSecondaryTerrainOnWall SetSecondaryTerrainOnWall: ; 0x0234176C @@ -12271,8 +12271,8 @@ _023424B8: _023424CC: .word 0x000001C2 arm_func_end ov29_0234217C - arm_func_start ov29_023424D0 -ov29_023424D0: ; 0x023424D0 + arm_func_start GetNextFixedRoomAction +GetNextFixedRoomAction: ; 0x023424D0 ldr r1, _02342510 ; =0x0237CFBC ldrh r0, [r1, #0xa] cmp r0, #0 @@ -12293,7 +12293,7 @@ _02342504: .align 2, 0 _02342510: .word 0x0237CFBC _02342514: .word 0x0235378C - arm_func_end ov29_023424D0 + arm_func_end GetNextFixedRoomAction arm_func_start ov29_02342518 ov29_02342518: ; 0x02342518 @@ -12306,7 +12306,7 @@ ov29_02342518: ; 0x02342518 strh r4, [r0] strb lr, [r0, #6] str ip, [sp] - bl ov29_02342F30 + bl PlaceFixedRoomTile add sp, sp, #4 ldmia sp!, {r3, r4, pc} arm_func_end ov29_02342518 @@ -12385,7 +12385,7 @@ _0234260C: str r0, [sp, #0x14] b _02342728 _02342648: - bl ov29_023424D0 + bl GetNextFixedRoomAction mov fp, r0 mov r0, r4 mov r1, r8 @@ -12463,7 +12463,7 @@ _02342760: ldrsh sb, [sl] b _023427B4 _02342768: - bl ov29_023424D0 + bl GetNextFixedRoomAction mov r6, r0 mov r0, sb mov r1, r8 @@ -12478,7 +12478,7 @@ _02342768: strh ip, [r6] strb r5, [r6, #6] str fp, [sp] - bl ov29_02342F30 + bl PlaceFixedRoomTile strb r7, [r6, #7] strb r7, [r4, #0x2e0] add sb, sb, #1 @@ -12825,7 +12825,7 @@ _02342C30: mov sb, r4 b _02342C44 _02342C38: - bl ov29_023424D0 + bl GetNextFixedRoomAction strh r0, [sl], #2 add sb, sb, #1 _02342C44: @@ -12842,8 +12842,8 @@ _02342C60: .word 0x0235378C _02342C64: .word 0x0237CFBC arm_func_end ov29_02342BEC - arm_func_start ov29_02342C68 -ov29_02342C68: ; 0x02342C68 + arm_func_start ResetImportantSpawnPositions +ResetImportantSpawnPositions: ; 0x02342C68 add r0, r0, #0x8c00 mvn r1, #0 strh r1, [r0, #0x1c] @@ -12853,7 +12853,7 @@ ov29_02342C68: ; 0x02342C68 strh r1, [r0, #0x24] strh r1, [r0, #0x26] bx lr - arm_func_end ov29_02342C68 + arm_func_end ResetImportantSpawnPositions arm_func_start SpawnStairs SpawnStairs: ; 0x02342C8C @@ -12932,8 +12932,8 @@ _02342D94: .word 0x0235378C _02342D98: .word 0x0237CFBC arm_func_end SpawnStairs - arm_func_start ov29_02342D9C -ov29_02342D9C: ; 0x02342D9C + arm_func_start GetHiddenStairsType +GetHiddenStairsType: ; 0x02342D9C stmdb sp!, {r4, r5, r6, lr} ldr r2, _02342EB0 ; =0x02353538 mov r5, r0 @@ -12967,7 +12967,7 @@ _02342E00: ldrsb r0, [r0, #0x98] cmp r0, #2 beq _02342E24 - bl ov29_02349208 + bl IsDestinationFloor cmp r0, #0 beq _02342E2C _02342E24: @@ -12985,10 +12985,10 @@ _02342E30: beq _02342EA4 bl DungeonRand16Bit mov r1, #0x64 - bl DivideInt + bl __divsi3 mov r5, r1 ldrb r6, [r6, #0x1b] - bl ov29_023385EC + bl ShouldBoostHiddenStairsSpawnChance cmp r0, #0 beq _02342E94 ldr r1, _02342EB8 ; =0x022C4850 @@ -12997,7 +12997,7 @@ _02342E30: bl MultiplyByFixedPoint mov r6, r0 mov r0, #0 - bl ov29_02338604 + bl SetShouldBoostHiddenStairsSpawnChance mov r0, r6, asr #7 add r0, r6, r0, lsr #24 mov r6, r0, asr #8 @@ -13015,13 +13015,13 @@ _02342EA8: _02342EB0: .word 0x02353538 _02342EB4: .word 0x0235378C _02342EB8: .word 0x022C4850 - arm_func_end ov29_02342D9C + arm_func_end GetHiddenStairsType - arm_func_start ov29_02342EBC -ov29_02342EBC: ; 0x02342EBC + arm_func_start GetFinalKecleonShopSpawnChance +GetFinalKecleonShopSpawnChance: ; 0x02342EBC stmdb sp!, {r4, lr} mov r4, r0 - bl ov29_023384C0 + bl ShouldBoostKecleonShopSpawnChance cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, pc} @@ -13031,7 +13031,7 @@ ov29_02342EBC: ; 0x02342EBC bl MultiplyByFixedPoint mov r4, r0 mov r0, #0 - bl ov29_023384D8 + bl SetShouldBoostKecleonShopSpawnChance mov r0, r4, asr #7 add r0, r4, r0, lsr #24 mov r0, r0, lsl #8 @@ -13039,10 +13039,10 @@ ov29_02342EBC: ; 0x02342EBC ldmia sp!, {r4, pc} .align 2, 0 _02342F04: .word 0x022C484C - arm_func_end ov29_02342EBC + arm_func_end GetFinalKecleonShopSpawnChance - arm_func_start ov29_02342F08 -ov29_02342F08: ; 0x02342F08 + arm_func_start ResetHiddenStairsSpawn +ResetHiddenStairsSpawn: ; 0x02342F08 ldr r1, _02342F28 ; =0x0237CFBC mvn r2, #0 strh r2, [r1, #0x1c] @@ -13054,10 +13054,10 @@ ov29_02342F08: ; 0x02342F08 .align 2, 0 _02342F28: .word 0x0237CFBC _02342F2C: .word 0x0235378C - arm_func_end ov29_02342F08 + arm_func_end ResetHiddenStairsSpawn - arm_func_start ov29_02342F30 -ov29_02342F30: ; 0x02342F30 + arm_func_start PlaceFixedRoomTile +PlaceFixedRoomTile: ; 0x02342F30 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x34 ldr r4, _02343928 ; =0x00000FFF @@ -13134,7 +13134,7 @@ _02343010: strh r4, [r0, #0xa6] mov r0, #0xb str r3, [sp] - bl ov29_022ED970 + bl SpawnEnemyTrapAtPos _0234304C: ldrh r1, [r6] mov r0, #0 @@ -13191,7 +13191,7 @@ _023430B8: ldr r1, [r2] add r1, r1, #0xcc00 strh r4, [r1, #0xee] - bl ov29_0234396C + bl FixedRoomActionParamToDirection ldr r1, _0234392C ; =0x02353538 mov r2, #0 ldr r1, [r1] @@ -13293,7 +13293,7 @@ _02343268: strb r0, [r6, #7] b _0234391C _02343290: - bl ov29_023361D4 + bl IsFullFloorFixedRoom ldrh r1, [r6] cmp r0, #0 moveq r2, #1 @@ -13313,7 +13313,7 @@ _02343290: strb r0, [r6, #7] b _0234391C _023432DC: - bl ov29_023361D4 + bl IsFullFloorFixedRoom ldrh r1, [r6] cmp r0, #0 moveq r2, #1 @@ -13355,7 +13355,7 @@ _0234334C: add r1, r1, r7, lsl #2 add r1, r1, #0xcc00 strh r4, [r1, #0xee] - bl ov29_0234396C + bl FixedRoomActionParamToDirection ldr r1, _0234392C ; =0x02353538 mov r2, #0 ldr r1, [r1] @@ -13413,7 +13413,7 @@ _023433B8: ldrsh r3, [sl, #2] mov r1, r5 mov r2, r4 - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _02343468: bl IsTreasureBox @@ -13432,7 +13432,7 @@ _02343468: mov r3, #0 mov r0, #0x49 str r3, [sp, #4] - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _023434B0: ldr r0, _0234392C ; =0x02353538 @@ -13477,7 +13477,7 @@ _02343528: mov sl, #0 mov r2, r4 str sl, [sp, #4] - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _02343548: ldr r2, _0234394C ; =0x00000578 @@ -13492,7 +13492,7 @@ _02343548: ldrsh r3, [sl, #2] mov r1, r5 mov r2, r4 - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _02343580: add r1, r2, #1 @@ -13508,7 +13508,7 @@ _02343580: mov r2, #0 str r2, [sp, #4] mov r2, r4 - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _023435BC: add r1, r2, #0xa @@ -13532,7 +13532,7 @@ _023435BC: mov fp, r0, lsl #0x10 ldr r0, [sp, #0x18] mov r1, #0xa - bl DivideInt + bl __divsi3 ldr r3, [sl, #4] ldr r0, [sp, #0x20] str r3, [sp] @@ -13548,7 +13548,7 @@ _023435BC: ldrsh r3, [r3, sl] mov r1, r5 mov r2, r4 - bl ov29_02344430 + bl GenerateAndSpawnItem b _02343678 _02343658: ldr r2, [sl, #4] @@ -13558,15 +13558,15 @@ _02343658: ldrsh r3, [sl, #2] mov r1, r5 mov r2, r4 - bl ov29_02344430 + bl GenerateAndSpawnItem _02343678: ldrsh r0, [r7] - bl ov29_02344190 + bl GetMatchingMonsterId movs fp, r0 beq _023438BC mov r0, sb, asr #0xc and r0, r0, #0xff - bl ov29_0234396C + bl FixedRoomActionParamToDirection mov r1, #0 str r1, [sp, #8] ldrb r1, [r7, #2] @@ -13713,7 +13713,7 @@ _02343898: bne _023438BC ldr r1, [sp, #0x10] ldr r2, [sp, #0xc] - bl ov29_022FBE58 + bl InitOtherMonsterData _023438BC: ldrb r0, [r8] cmp r0, #0x19 @@ -13729,7 +13729,7 @@ _023438BC: str r1, [sp] ldrb r3, [r8, #1] mov r1, r5 - bl ov29_022ED970 + bl SpawnEnemyTrapAtPos _023438F8: ldrb r0, [r8, #3] tst r0, #8 @@ -13762,16 +13762,16 @@ _0234395C: .word 0x0234FDFC _02343960: .word 0x00000229 _02343964: .word 0x022C5938 _02343968: .word 0x0002C9E6 - arm_func_end ov29_02342F30 + arm_func_end PlaceFixedRoomTile - arm_func_start ov29_0234396C -ov29_0234396C: ; 0x0234396C + arm_func_start FixedRoomActionParamToDirection +FixedRoomActionParamToDirection: ; 0x0234396C cmp r0, #0 moveq r0, #0xff subne r0, r0, #1 andne r0, r0, #0xff bx lr - arm_func_end ov29_0234396C + arm_func_end FixedRoomActionParamToDirection arm_func_start ov29_02343980 ov29_02343980: ; 0x02343980 @@ -13791,7 +13791,7 @@ _02343994: mov r2, r6 mov r3, r7 str r4, [sp] - bl ov29_02342F30 + bl PlaceFixedRoomTile _023439BC: add r6, r6, #1 cmp r6, #0x38 @@ -13815,7 +13815,7 @@ ov29_023439D8: ; 0x023439D8 str r2, [sp, #4] cmp r1, #0 bne _02343CC0 - bl ov29_023361D4 + bl IsFullFloorFixedRoom ldrsh r1, [sl, #4] cmp r0, #0 str r0, [sp, #8] @@ -13895,7 +13895,7 @@ _02343B0C: add r1, r1, #0xd200 ldrh r1, [r1, #0x60] mov r3, r8 - bl ov29_02342F30 + bl PlaceFixedRoomTile ldrh r0, [r7, #2] cmp fp, #0xff orr r0, r0, #3 @@ -13986,8 +13986,8 @@ _02343C6C: ldrsh r0, [sl, #4] sub r1, r1, #1 bl ov29_02336694 - bl ov29_02336A4C - bl ov29_02336F4C + bl DetermineAllTilesWalkableNeighbors + bl UpdateTrapsVisibility mov r0, #0xc bl IsCurrentMissionType cmp r0, #0 @@ -14014,8 +14014,8 @@ _02343CD0: .word 0x02353538 _02343CD4: .word 0xFFFFCFEF arm_func_end ov29_023439D8 - arm_func_start ov29_02343CD8 -ov29_02343CD8: ; 0x02343CD8 + arm_func_start ApplyKeyEffect +ApplyKeyEffect: ; 0x02343CD8 stmdb sp!, {r4, lr} mov r4, r0 ldrsh r1, [r4, #6] @@ -14035,12 +14035,12 @@ _02343D10: mov r0, r4 add r3, r2, #1 bl ov29_023439D8 - bl ov29_02339CE8 + bl UpdateMinimap ldmia sp!, {r4, pc} .align 2, 0 _02343D28: .word 0x00000B94 _02343D2C: .word 0x00000B93 - arm_func_end ov29_02343CD8 + arm_func_end ApplyKeyEffect arm_func_start ov29_02343D30 ov29_02343D30: ; 0x02343D30 @@ -14065,7 +14065,7 @@ _02343D68: mov r1, r4 add r3, r2, #2 bl ov29_023439D8 - bl ov29_02339CE8 + bl UpdateMinimap ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02343D88: .word 0x00000B95 @@ -14079,7 +14079,7 @@ LoadFixedRoomData: ; 0x02343D90 ldr r1, _02343DC0 ; =0x02353110 ldr r0, [r0] mov r2, #0 - bl LoadFileFromRom__02008C3C + bl LoadFileFromRom ldr r0, _02343DBC ; =0x02353794 ldr r0, [r0] ldr r1, [r0], #8 @@ -14123,8 +14123,8 @@ ov29_02343DD8: ; 0x02343DD8 _02343E1C: .word 0x02353794 arm_func_end ov29_02343DD8 - arm_func_start ov29_02343E20 -ov29_02343E20: ; 0x02343E20 + arm_func_start LoadFixedRoom +LoadFixedRoom: ; 0x02343E20 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 movs r4, r2 @@ -14171,7 +14171,7 @@ _02343E78: ldrne r1, _02344044 ; =0x00000483 cmpne r0, r1 beq _0234400C - bl ov29_02344190 + bl GetMatchingMonsterId movs r8, r0 beq _0234400C mov r7, #0 @@ -14281,10 +14281,10 @@ _02344044: .word 0x00000483 _02344048: .word 0x02353538 _0234404C: .word 0x00000485 _02344050: .word 0x022C5938 - arm_func_end ov29_02343E20 + arm_func_end LoadFixedRoom - arm_func_start ov29_02344054 -ov29_02344054: ; 0x02344054 + arm_func_start OpenFixedBin +OpenFixedBin: ; 0x02344054 stmdb sp!, {r3, lr} mov r0, #0xc mov r1, #0 @@ -14299,10 +14299,10 @@ ov29_02344054: ; 0x02344054 ldmia sp!, {r3, pc} .align 2, 0 _02344084: .word 0x02353794 - arm_func_end ov29_02344054 + arm_func_end OpenFixedBin - arm_func_start ov29_02344088 -ov29_02344088: ; 0x02344088 + arm_func_start CloseFixedBin +CloseFixedBin: ; 0x02344088 stmdb sp!, {r3, lr} ldr r0, _023440A8 ; =0x02353794 ldr r0, [r0] @@ -14313,10 +14313,10 @@ ov29_02344088: ; 0x02344088 ldmia sp!, {r3, pc} .align 2, 0 _023440A8: .word 0x02353794 - arm_func_end ov29_02344088 + arm_func_end CloseFixedBin - arm_func_start ov29_023440AC -ov29_023440AC: ; 0x023440AC + arm_func_start AreOrbsAllowed +AreOrbsAllowed: ; 0x023440AC cmp r0, #0 beq _023440BC cmp r0, #0xa5 @@ -14332,10 +14332,10 @@ _023440C4: bx lr .align 2, 0 _023440D8: .word 0x022C6C77 - arm_func_end ov29_023440AC + arm_func_end AreOrbsAllowed - arm_func_start ov29_023440DC -ov29_023440DC: ; 0x023440DC + arm_func_start AreTileJumpsAllowed +AreTileJumpsAllowed: ; 0x023440DC cmp r0, #0 beq _023440EC cmp r0, #0xa5 @@ -14351,10 +14351,10 @@ _023440F4: bx lr .align 2, 0 _02344108: .word 0x022C6C78 - arm_func_end ov29_023440DC + arm_func_end AreTileJumpsAllowed - arm_func_start ov29_0234410C -ov29_0234410C: ; 0x0234410C + arm_func_start AreTrawlOrbsAllowed +AreTrawlOrbsAllowed: ; 0x0234410C cmp r0, #0 beq _0234411C cmp r0, #0xa5 @@ -14370,18 +14370,18 @@ _02344124: bx lr .align 2, 0 _02344138: .word 0x022C6C79 - arm_func_end ov29_0234410C + arm_func_end AreTrawlOrbsAllowed - arm_func_start ov29_0234413C -ov29_0234413C: ; 0x0234413C - ldr ip, _02344144 ; =ov29_023440AC + arm_func_start AreOrbsAllowedVeneer +AreOrbsAllowedVeneer: ; 0x0234413C + ldr ip, _02344144 ; =AreOrbsAllowed bx ip .align 2, 0 -_02344144: .word ov29_023440AC - arm_func_end ov29_0234413C +_02344144: .word AreOrbsAllowed + arm_func_end AreOrbsAllowedVeneer - arm_func_start ov29_02344148 -ov29_02344148: ; 0x02344148 + arm_func_start AreLateGameTrapsEnabled +AreLateGameTrapsEnabled: ; 0x02344148 mov r1, #0xc mul r1, r0, r1 ldr r0, _0234415C ; =0x022C6C75 @@ -14389,10 +14389,10 @@ ov29_02344148: ; 0x02344148 bx lr .align 2, 0 _0234415C: .word 0x022C6C75 - arm_func_end ov29_02344148 + arm_func_end AreLateGameTrapsEnabled - arm_func_start ov29_02344160 -ov29_02344160: ; 0x02344160 + arm_func_start AreMovesEnabled +AreMovesEnabled: ; 0x02344160 mov r1, #0xc mul r1, r0, r1 ldr r0, _02344174 ; =0x022C6C76 @@ -14400,10 +14400,10 @@ ov29_02344160: ; 0x02344160 bx lr .align 2, 0 _02344174: .word 0x022C6C76 - arm_func_end ov29_02344160 + arm_func_end AreMovesEnabled - arm_func_start ov29_02344178 -ov29_02344178: ; 0x02344178 + arm_func_start IsRoomIlluminated +IsRoomIlluminated: ; 0x02344178 mov r1, #0xc mul r1, r0, r1 ldr r0, _0234418C ; =0x022C6C74 @@ -14411,10 +14411,10 @@ ov29_02344178: ; 0x02344178 bx lr .align 2, 0 _0234418C: .word 0x022C6C74 - arm_func_end ov29_02344178 + arm_func_end IsRoomIlluminated - arm_func_start ov29_02344190 -ov29_02344190: ; 0x02344190 + arm_func_start GetMatchingMonsterId +GetMatchingMonsterId: ; 0x02344190 stmdb sp!, {r4, lr} cmp r0, #0 ldrne r2, _023442A4 ; =0x00000483 @@ -14499,7 +14499,7 @@ _023442A8: .word 0x00000467 _023442AC: .word 0x0000020F _023442B0: .word 0x02353538 _023442B4: .word 0x0000020D - arm_func_end ov29_02344190 + arm_func_end GetMatchingMonsterId arm_func_start ov29_023442B8 ov29_023442B8: ; 0x023442B8 @@ -14575,8 +14575,8 @@ _023443A8: _023443B0: .word 0x00000579 arm_func_end ov29_023442B8 - arm_func_start ov29_023443B4 -ov29_023443B4: ; 0x023443B4 + arm_func_start GenerateItemExplicit +GenerateItemExplicit: ; 0x023443B4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, r1 mov r7, r0 @@ -14595,7 +14595,7 @@ ov29_023443B4: ; 0x023443B4 strh r5, [r7, #2] b _02344420 _023443F8: - bl ov29_02344BE4 + bl GenerateCleanItem b _02344420 _02344400: mov r0, r7 @@ -14611,10 +14611,10 @@ _02344420: orr r0, r0, r4 strb r0, [r7] ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_023443B4 + arm_func_end GenerateItemExplicit - arm_func_start ov29_02344430 -ov29_02344430: ; 0x02344430 + arm_func_start GenerateAndSpawnItem +GenerateAndSpawnItem: ; 0x02344430 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc ldrb ip, [sp, #0x1c] @@ -14631,25 +14631,25 @@ ov29_02344430: ; 0x02344430 ldr r3, [sp, #0x18] mov r2, r4 mov r1, #0x49 - bl ov29_023443B4 + bl GenerateItemExplicit b _023444A0 _02344478: ldr r3, [sp, #0x18] mov r1, r5 mov r2, r4 - bl ov29_023443B4 + bl GenerateItemExplicit b _023444A0 _0234448C: ldr r3, [sp, #0x18] add r0, sp, #4 mov r1, r5 mov r2, r4 - bl ov29_023443B4 + bl GenerateItemExplicit _023444A0: add r0, sp, #0 add r1, sp, #4 mov r2, #1 - bl ov29_02345538 + bl SpawnItem ldr r0, _023444D0 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x3f00 @@ -14660,7 +14660,7 @@ _023444A0: ldmia sp!, {r4, r5, pc} .align 2, 0 _023444D0: .word 0x02353538 - arm_func_end ov29_02344430 + arm_func_end GenerateAndSpawnItem arm_func_start ov29_023444D4 ov29_023444D4: ; 0x023444D4 @@ -14671,7 +14671,7 @@ ov29_023444D4: ; 0x023444D4 add r0, r0, #0x7e add r0, r0, #0x700 bl MemZero - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar cmp r0, #0 ldmeqia sp!, {r3, pc} mov r0, #0 @@ -14684,7 +14684,7 @@ _02344508: .word 0x02353538 arm_func_start IsHiddenStairsFloor IsHiddenStairsFloor: ; 0x0234450C stmdb sp!, {r3, lr} - bl IsSecretBazaar__023385C4 + bl IsSecretBazaar cmp r0, #0 bne _02344528 bl IsSecretRoom @@ -14700,10 +14700,10 @@ _02344530: arm_func_start IsSecretBazaar__02344538 IsSecretBazaar__02344538: ; 0x02344538 - ldr ip, _02344540 ; =IsSecretBazaar__023385C4 + ldr ip, _02344540 ; =IsSecretBazaar bx ip .align 2, 0 -_02344540: .word IsSecretBazaar__023385C4 +_02344540: .word IsSecretBazaar arm_func_end IsSecretBazaar__02344538 arm_func_start ov29_02344544 @@ -14903,7 +14903,7 @@ _023447FC: add r0, sp, #0 mov r1, r6 mov r2, #2 - bl ov29_02344BD0 + bl GenerateStandardItem add r0, sp, #0 bl ov29_02345004 ldr r0, _02344AA8 ; =0x00000F3A diff --git a/asm/overlay_29_02344B1C.s b/asm/overlay_29_02344B1C.s index 6ee634db..88b81ad7 100644 --- a/asm/overlay_29_02344B1C.s +++ b/asm/overlay_29_02344B1C.s @@ -78,25 +78,25 @@ ov29_02344BA8: ; 0x02344BA8 _02344BCC: .word 0x023531BC arm_func_end ov29_02344BA8 - arm_func_start ov29_02344BD0 -ov29_02344BD0: ; 0x02344BD0 - ldr ip, _02344BE0 ; =ov29_023472C4 + arm_func_start GenerateStandardItem +GenerateStandardItem: ; 0x02344BD0 + ldr ip, _02344BE0 ; =GenerateItem mov r3, r2 mov r2, #0 bx ip .align 2, 0 -_02344BE0: .word ov29_023472C4 - arm_func_end ov29_02344BD0 +_02344BE0: .word GenerateItem + arm_func_end GenerateStandardItem - arm_func_start ov29_02344BE4 -ov29_02344BE4: ; 0x02344BE4 - ldr ip, _02344BF4 ; =ov29_023472C4 + arm_func_start GenerateCleanItem +GenerateCleanItem: ; 0x02344BE4 + ldr ip, _02344BF4 ; =GenerateItem mov r2, #0 mov r3, #2 bx ip .align 2, 0 -_02344BF4: .word ov29_023472C4 - arm_func_end ov29_02344BE4 +_02344BF4: .word GenerateItem + arm_func_end GenerateCleanItem arm_func_start ov29_02344BF8 ov29_02344BF8: ; 0x02344BF8 @@ -113,7 +113,7 @@ _02344C10: bne _02344C10 bl DungeonRand16Bit mov r1, #0xc - bl DivideInt + bl __divsi3 add r2, sp, #0 mov r0, #6 smlabb r0, r1, r0, r2 @@ -234,11 +234,11 @@ _02344DB0: b _02344DEC _02344DE0: mov r0, sl - bl ov29_022E7AC4 + bl GetItemIdToSpawn mov fp, r0 _02344DEC: mov r0, fp - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 moveq r0, #0 streq r0, [sp] @@ -246,7 +246,7 @@ _02344DEC: mov r1, fp add r0, sp, #0x14 mov r2, #0 - bl ov29_023472C4 + bl GenerateItem ldr r0, [sp] add r1, sp, #0x14 cmp r0, #0 @@ -255,7 +255,7 @@ _02344DEC: orrne r0, r0, #2 strneb r0, [sp, #0x14] add r0, sp, #0x1a - bl ov29_02345538 + bl SpawnItem cmp sl, #0 addeq r8, r8, #1 _02344E40: @@ -370,11 +370,11 @@ _02344FC0: mov r1, r6 mov r2, r5 mov r3, r4 - bl ov29_023472C4 + bl GenerateItem mov r1, r7 mov r2, fp add r0, sl, sb, lsl #2 - bl ov29_02345538 + bl SpawnItem add sb, sb, #1 _02344FE8: cmp sb, r8 @@ -413,8 +413,8 @@ _02345050: ldmia sp!, {r3, r4, r5, pc} arm_func_end ov29_02345004 - arm_func_start ov29_02345058 -ov29_02345058: ; 0x02345058 + arm_func_start TryLeaderItemPickUp +TryLeaderItemPickUp: ; 0x02345058 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x198 mov sl, r0 @@ -431,7 +431,7 @@ ov29_02345058: ; 0x02345058 ldr r1, [r0] cmp r1, #3 bne _02345508 - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r7, #0x4e] mov r5, r0 mov r0, r4 @@ -511,7 +511,7 @@ _0234515C: bl sub_02024FE8 mov r0, sl mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r1, _02345520 ; =0x00000BD6 mov r0, r4 bl LogMessageByIdWithPopupCheckUser @@ -607,7 +607,7 @@ _023452D8: bl sub_02024FE8 mov r0, sl mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r0, _02345528 ; =0x00001304 bl ov29_022EACCC add r0, sp, #0xcc @@ -692,7 +692,7 @@ _02345418: bl sub_02024FE8 mov r0, sl mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r1, _0234552C ; =0x00000BD4 mov r0, r4 bl LogMessageByIdWithPopupCheckUser @@ -722,7 +722,7 @@ _023454BC: bl sub_02024FE8 mov r0, sl mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem ldr r1, _02345530 ; =0x00000BD5 mov r0, r4 bl LogMessageByIdWithPopupCheckUser @@ -748,15 +748,15 @@ _02345528: .word 0x00001304 _0234552C: .word 0x00000BD4 _02345530: .word 0x00000BD5 _02345534: .word 0x00000BD7 - arm_func_end ov29_02345058 + arm_func_end TryLeaderItemPickUp - arm_func_start ov29_02345538 -ov29_02345538: ; 0x02345538 + arm_func_start SpawnItem +SpawnItem: ; 0x02345538 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r0 mov r6, r1 mov r5, r2 - bl ov29_022E2314 + bl SpawnItemEntity movs r4, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} @@ -795,7 +795,7 @@ _023455A8: tst r0, #0x20 beq _0234563C ldrsh r0, [r6, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _0234563C ldrb r0, [r6] @@ -845,4 +845,4 @@ _02345648: .align 2, 0 _02345690: .word 0x023537B0 _02345694: .word 0x02353538 - arm_func_end ov29_02345538 + arm_func_end SpawnItem diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 03506e91..f31697fe 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_023456BC -ov29_023456BC: ; 0x023456BC + arm_func_start RemoveGroundItem +RemoveGroundItem: ; 0x023456BC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r2, r0 mov r7, r1 @@ -21,13 +21,13 @@ ov29_023456BC: ; 0x023456BC movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6 - bl ov29_022E1610 + bl GetItemInfo ldrh r1, [r5] mov r4, r0 tst r1, #0x20 beq _02345770 ldrsh r0, [r4, #4] - bl sub_0200CCE0 + bl IsShoppableItem cmp r0, #0 beq _02345770 ldrb r0, [r4] @@ -76,7 +76,7 @@ _02345784: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _023457C4: .word 0x02353538 - arm_func_end ov29_023456BC + arm_func_end RemoveGroundItem arm_func_start ov29_023457C8 ov29_023457C8: ; 0x023457C8 @@ -102,7 +102,7 @@ ov29_023457C8: ; 0x023457C8 cmp r0, #2 moveq r4, #1 mov r0, r7 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -245,8 +245,8 @@ _02345A34: .word 0xFFFF000F _02345A38: .word 0x020AFC4C arm_func_end ov29_023457C8 - arm_func_start ov29_02345A3C -ov29_02345A3C: ; 0x02345A3C + arm_func_start SpawnDroppedItemWrapper +SpawnDroppedItemWrapper: ; 0x02345A3C stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0xc0 mov r5, r2 @@ -283,13 +283,13 @@ ov29_02345A3C: ; 0x02345A3C mov r2, r5 mov r3, #1 str r4, [sp, #4] - bl ov29_02345AD8 + bl SpawnDroppedItem add sp, sp, #0xc0 ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_02345A3C + arm_func_end SpawnDroppedItemWrapper - arm_func_start ov29_02345AD8 -ov29_02345AD8: ; 0x02345AD8 + arm_func_start SpawnDroppedItem +SpawnDroppedItem: ; 0x02345AD8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov r8, r1 @@ -377,7 +377,7 @@ _02345B8C: add r0, sp, #0xc mov r1, r7 mov r2, #1 - bl ov29_02345538 + bl SpawnItem cmp r0, #0 movne r5, #1 b _02345C44 @@ -396,7 +396,7 @@ _02345C44: beq _02345CF4 ldrsh r0, [sp, #0xc] ldrsh r1, [sp, #0xe] - bl ov29_023391EC + bl DrawMinimapTile ldrsh r0, [sp, #0xc] ldrsh r1, [sp, #0xe] bl GetTile @@ -475,7 +475,7 @@ _02345D74: .word 0x00000BDA _02345D78: .word 0x00000BDB _02345D7C: .word 0x00000BDF _02345D80: .word 0x00000BDC - arm_func_end ov29_02345AD8 + arm_func_end SpawnDroppedItem arm_func_start ov29_02345D84 ov29_02345D84: ; 0x02345D84 @@ -598,7 +598,7 @@ _02345EE0: ldr r1, [sp, #4] add r0, sp, #0x14 mov r2, #1 - bl ov29_02345538 + bl SpawnItem cmp r0, #0 movne r4, #1 b _02345F7C @@ -676,12 +676,12 @@ _02346058: .word 0x00000B74 _0234605C: .word 0x00000B75 arm_func_end ov29_02345D84 - arm_func_start ov29_02346060 -ov29_02346060: ; 0x02346060 + arm_func_start TryGenerateUnownStoneDrop +TryGenerateUnownStoneDrop: ; 0x02346060 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 mov r5, r1 - bl ov29_022E08A0 + bl IsMarowakTrainingMaze cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -705,12 +705,12 @@ ov29_02346060: ; 0x02346060 mov r1, r1, asr #0x10 mov r2, #0 mov r3, #2 - bl ov29_023472C4 + bl GenerateItem mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023460D8: .word 0x022C4474 - arm_func_end ov29_02346060 + arm_func_end TryGenerateUnownStoneDrop arm_func_start ov29_023460DC ov29_023460DC: ; 0x023460DC @@ -723,10 +723,10 @@ ov29_023460DC: ; 0x023460DC bl ov29_022FB51C cmp r0, #0 beq _02346134 - bl ov29_022E0880 + bl IsCurrentFixedRoomBossFight cmp r0, #0 bne _02346134 - bl ov29_022E08A0 + bl IsMarowakTrainingMaze cmp r0, #0 bne _02346134 mov r0, r4 @@ -873,7 +873,7 @@ _02346310: mov r0, r7 mov r2, r5 mov r3, #2 - bl ov29_023472C4 + bl GenerateItem mov r0, #1 _02346330: add sp, sp, #0x18 @@ -1034,7 +1034,7 @@ _023464C4: ldr r2, [r6, #0xc] add r0, r0, #4 rsb r0, r2, r0, lsl #8 - bl DivideInt + bl __divsi3 add r1, sp, #0x6c str r0, [r1, r8, lsl #3] add r0, fp, r8, lsl #2 @@ -1045,7 +1045,7 @@ _023464C4: ldr r2, [r6, #0x10] add r0, r0, #4 rsb r0, r2, r0, lsl #8 - bl DivideInt + bl __divsi3 add r1, sp, #0x6c add r1, r1, r8, lsl #3 str r0, [r1, #4] @@ -1182,12 +1182,12 @@ _02346784: mla r1, r8, r5, sl add r0, r6, r8, lsl #2 mov r2, #1 - bl ov29_02345538 + bl SpawnItem mov r0, r8, lsl #2 add r1, r6, r8, lsl #2 ldrsh r0, [r6, r0] ldrsh r1, [r1, #2] - bl ov29_023391EC + bl DrawMinimapTile add r0, r4, #1 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 @@ -1233,8 +1233,8 @@ HasHeldItem: ; 0x023467E4 bx lr arm_func_end HasHeldItem - arm_func_start ov29_02346834 -ov29_02346834: ; 0x02346834 + arm_func_start GenerateMoneyQuantity +GenerateMoneyQuantity: ; 0x02346834 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r0, #0x64 @@ -1259,7 +1259,7 @@ _02346870: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02346884: .word 0x020A1F20 - arm_func_end ov29_02346834 + arm_func_end GenerateMoneyQuantity arm_func_start ov29_02346888 ov29_02346888: ; 0x02346888 @@ -1283,7 +1283,7 @@ ov29_02346888: ; 0x02346888 mov r3, r0 mov r1, #0xbe0 str r0, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _023468F0 mov r0, #2 @@ -1420,7 +1420,7 @@ _02346A78: beq _02346AC4 ldr sb, [r8, #0xb4] add r0, sb, #0x62 - bl sub_0200CC38 + bl IsLosableItem cmp r0, #0 beq _02346AC4 mov r1, r7 @@ -1456,11 +1456,11 @@ _02346AE8: tst r0, #0xff beq _02346B5C ldrsh r0, [r8, #8] - bl IsMonsterIdInNormalRange__02056294 + bl IsMonsterIdInNormalRange cmp r0, #0 beq _02346B5C add r0, r8, #0x3e - bl sub_0200CC38 + bl IsLosableItem cmp r0, #0 beq _02346B5C mov r1, fp @@ -1483,7 +1483,7 @@ _02346B7C: ldr r0, [r0, #0x384] mla sb, r4, r5, r0 mov r0, sb - bl sub_0200CC38 + bl IsLosableItem cmp r0, #0 beq _02346BB8 mov r0, sb @@ -1506,8 +1506,8 @@ _02346BD0: .word 0x02353538 _02346BD4: .word 0x020AF6B8 arm_func_end ov29_02346A64 - arm_func_start ov29_02346BD8 -ov29_02346BD8: ; 0x02346BD8 + arm_func_start CheckTeamItemsFlags +CheckTeamItemsFlags: ; 0x02346BD8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr r1, _02346CB4 ; =0x020AF6B8 mov r7, #0 @@ -1572,7 +1572,7 @@ _02346CA4: .align 2, 0 _02346CB4: .word 0x020AF6B8 _02346CB8: .word 0x02353538 - arm_func_end ov29_02346BD8 + arm_func_end CheckTeamItemsFlags arm_func_start ov29_02346CBC ov29_02346CBC: ; 0x02346CBC @@ -1758,8 +1758,8 @@ _02346F0C: .word 0x02353538 _02346F10: .word 0x023531C8 arm_func_end ov29_02346EBC - arm_func_start ov29_02346F14 -ov29_02346F14: ; 0x02346F14 + arm_func_start AddHeldItemToBag +AddHeldItemToBag: ; 0x02346F14 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 bl GetCurrentBagCapacity @@ -1805,7 +1805,7 @@ _02346FA4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02346FB4: .word 0x020AF6B8 - arm_func_end ov29_02346F14 + arm_func_end AddHeldItemToBag arm_func_start ov29_02346FB8 ov29_02346FB8: ; 0x02346FB8 @@ -1852,13 +1852,13 @@ _02347018: _0234702C: .word 0x022C4CD8 arm_func_end ov29_02347000 - arm_func_start ov29_02347030 -ov29_02347030: ; 0x02347030 + arm_func_start RemoveEmptyItemsInBagWrapper +RemoveEmptyItemsInBagWrapper: ; 0x02347030 stmdb sp!, {r3, lr} bl RemoveEmptyItemsInBag bl ov29_022FB920 ldmia sp!, {r3, pc} - arm_func_end ov29_02347030 + arm_func_end RemoveEmptyItemsInBagWrapper arm_func_start ov29_02347040 ov29_02347040: ; 0x02347040 @@ -1926,13 +1926,13 @@ ov29_02347100: ; 0x02347100 mov r1, r0 mov r0, r4 mov r2, #0xa - bl ov29_022EB44C + bl GetItemToUseByIndex mov r4, r0 bl ov29_022EBB98 cmp r0, #0x90 bhs _0234717C mov r0, r4 - bl ov29_022EB5D8 + bl GetItemAction cmp r0, #0 beq _0234717C ldrb r0, [r4] @@ -1945,7 +1945,7 @@ ov29_02347100: ; 0x02347100 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} @@ -2013,7 +2013,7 @@ _02347224: beq _023472B8 bl DungeonRand16Bit mov r1, sb - bl DivideInt + bl __divsi3 mov r0, r1, lsl #0x10 add r1, sp, #0 mov r0, r0, asr #0x10 @@ -2048,8 +2048,8 @@ _023472B8: _023472C0: .word 0x02353538 arm_func_end ov29_02347184 - arm_func_start ov29_023472C4 -ov29_023472C4: ; 0x023472C4 + arm_func_start GenerateItem +GenerateItem: ; 0x023472C4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r3 mov r4, r1 @@ -2094,11 +2094,11 @@ _02347324: movne r3, #0x28 mul r1, r2, r3 mov r0, r5 - bl ov29_02346834 + bl GenerateMoneyQuantity ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02347374: .word 0x02353538 - arm_func_end ov29_023472C4 + arm_func_end GenerateItem arm_func_start ov29_02347378 ov29_02347378: ; 0x02347378 @@ -2135,12 +2135,12 @@ _023473BC: beq _023474CC ldr r5, [sl, #0xc] sub r0, r5, r8 - bl Abs + bl abs cmp r0, #0xc bge _02347410 ldr r0, [sl, #0x10] sub r0, r0, sb - bl Abs + bl abs cmp r0, #0xc blt _023474CC _02347410: @@ -2151,12 +2151,12 @@ _02347410: sub r0, r8, r5 mov r1, #0x18 mov r7, r6 - bl DivideInt + bl __divsi3 ldr r1, [sp, #0x10] str r0, [sp, #8] sub r0, sb, r1 mov r1, #0x18 - bl DivideInt + bl __divsi3 str r0, [sp, #4] mov r5, r6 _0234744C: @@ -2175,7 +2175,7 @@ _0234744C: str r1, [sl, #0x1c] mov r0, sl add r1, sp, #0xc - bl ov29_022E1A40 + bl UpdateEntityPixelPos mov r0, #0 str r0, [sp] mov r0, sl @@ -2375,7 +2375,7 @@ _02347750: add r0, r4, #0xcc mov r2, fp bl ov29_022E1A90 - bl ov29_02337E94 + bl IsWaterTileset cmp r0, #0 ldr r0, [r4, #0xd8] ldr r1, [r4, #0xdc] @@ -2465,7 +2465,7 @@ _02347894: bl InitMove ldr r0, [r7, #0xc] add r1, sp, #0x34 - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 ldr r0, [sp, #8] mov r1, #1 @@ -2627,7 +2627,7 @@ _02347AF4: add r1, r4, #0xcc mov r3, #1 str r5, [sp, #4] - bl ov29_02345AD8 + bl SpawnDroppedItem b _02347B34 _02347B1C: ldr r1, [sp, #8] @@ -2653,7 +2653,7 @@ ItemIsActive__02347B50: ; 0x02347B50 mov r4, r1 mov r1, #0x6f mov r5, r0 - bl AbilityIsActive2 + bl AbilityIsActiveVeneer cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} diff --git a/asm/overlay_29_02347BC8.s b/asm/overlay_29_02347BC8.s index 998365a9..0eaa6f7a 100644 --- a/asm/overlay_29_02347BC8.s +++ b/asm/overlay_29_02347BC8.s @@ -75,12 +75,12 @@ _02347C8C: str r0, [sp, #0xc] ldr r0, [sp, #0x10] sub r0, r1, r0 - bl Abs + bl abs mov r7, r0 ldrsh r1, [r4, #0xd2] ldr r0, [sp, #0xc] sub r0, r1, r0 - bl Abs + bl abs add r1, r7, r0 mov r0, #0xc mul fp, r1, r0 @@ -92,7 +92,7 @@ _02347C8C: mov r1, fp mov r0, #0x80000 mov r8, #0 - bl DivideInt + bl __divsi3 str r0, [sp, #0x18] ldrsh r0, [r6, #2] mov r1, #0x1800 @@ -103,14 +103,14 @@ _02347C8C: mul r1, r0, r1 sub r0, r1, r6 mov r1, fp - bl DivideInt + bl __divsi3 str r0, [sp, #0x20] ldr r0, [sp, #0xc] mov r1, #0x1800 mul r1, r0, r1 sub r0, r1, r7 mov r1, fp - bl DivideInt + bl __divsi3 str r0, [sp, #0x1c] mov r0, r8 str r0, [sp, #0x28] @@ -134,7 +134,7 @@ _02347D84: add r0, r4, #0xcc mov fp, r6, asr #8 bl ov29_022E1A84 - bl ov29_02337E94 + bl IsWaterTileset cmp r0, #0 ldr r1, [sp, #0x34] movne r2, #3 @@ -209,7 +209,7 @@ _02347EC8: bl InitMove ldr r0, [r6, #0xc] add r1, sp, #0x3c - bl ov29_02324854 + bl TwoTurnMoveForcedMiss cmp r0, #0 movne r7, #0 _02347EE8: @@ -289,7 +289,7 @@ _02347FE8: mov r0, sl add r1, r4, #0xcc str r3, [sp, #4] - bl ov29_02345AD8 + bl SpawnDroppedItem _02348004: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -861,7 +861,7 @@ _023487A0: bl IsGoldenChamber cmp r0, #0 beq _023487D4 - bl ov29_02336224 + bl TrySpawnGoldenChamber ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023487D4: ldr r1, _02348804 ; =0x02353538 @@ -1003,7 +1003,7 @@ _0234893C: ldreqb r1, [r0, #0x16] cmpeq r1, #5 bne _02348980 - bl ov29_023498A0 + bl GenerateMissionEggMonster _02348980: add r4, r4, #1 cmp r4, #8 @@ -1043,7 +1043,7 @@ _023489A8: cmp r0, #5 bne _02348A04 mov r0, r5 - bl ov29_023498A0 + bl GenerateMissionEggMonster _02348A04: add r4, r4, #1 cmp r4, #8 @@ -1070,7 +1070,7 @@ _02348A3C: mov r2, sb mov r3, r8 str sb, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _02348A90 mov r0, r7 @@ -1078,7 +1078,7 @@ _02348A3C: mov r2, r5 mov r3, r5 str r7, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _02348A3C mov r0, #2 @@ -1092,7 +1092,7 @@ _02348A90: mov r3, fp add r1, r6, #1 str r4, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _02348A3C mov r0, #0 @@ -1181,7 +1181,7 @@ ov29_02348BA0: ; 0x02348BA0 beq _02348BD8 mov r0, r5 mov r1, r4 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 bne _02348BE0 _02348BD8: @@ -1203,7 +1203,7 @@ ov29_02348BE8: ; 0x02348BE8 add r0, sp, #0 ldrsh r1, [r1, #4] mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 mov r2, #0 @@ -1258,7 +1258,7 @@ _02348C84: mov r0, r5 bl sub_02024FB8 add r1, sp, #0 - bl Strcpy + bl strcpy mov r0, r5 bl sub_02024FB8 mov r1, r0 @@ -1610,8 +1610,8 @@ _02349140: _02349148: .word 0x02353538 arm_func_end ov29_0234908C - arm_func_start ov29_0234914C -ov29_0234914C: ; 0x0234914C + arm_func_start CheckActiveChallengeRequest +CheckActiveChallengeRequest: ; 0x0234914C stmdb sp!, {r3, lr} ldr r0, _02349184 ; =0x02353538 mov r1, #5 @@ -1628,7 +1628,7 @@ ov29_0234914C: ; 0x0234914C ldmia sp!, {r3, pc} .align 2, 0 _02349184: .word 0x02353538 - arm_func_end ov29_0234914C + arm_func_end CheckActiveChallengeRequest arm_func_start ov29_02349188 ov29_02349188: ; 0x02349188 @@ -1642,15 +1642,15 @@ _0234919C: .word 0x02353538 _023491A0: .word ov29_023496EC arm_func_end ov29_02349188 - arm_func_start ov29_023491A4 -ov29_023491A4: ; 0x023491A4 + arm_func_start GetMissionDestination +GetMissionDestination: ; 0x023491A4 ldr r0, _023491B4 ; =0x02353538 ldr r0, [r0] add r0, r0, #0x760 bx lr .align 2, 0 _023491B4: .word 0x02353538 - arm_func_end ov29_023491A4 + arm_func_end GetMissionDestination arm_func_start ov29_023491B8 ov29_023491B8: ; 0x023491B8 @@ -1683,15 +1683,15 @@ _02349200: ldmia sp!, {r3, pc} arm_func_end IsOutlawOrChallengeRequestFloor - arm_func_start ov29_02349208 -ov29_02349208: ; 0x02349208 + arm_func_start IsDestinationFloor +IsDestinationFloor: ; 0x02349208 ldr r0, _02349218 ; =0x02353538 ldr r0, [r0] ldrb r0, [r0, #0x760] bx lr .align 2, 0 _02349218: .word 0x02353538 - arm_func_end ov29_02349208 + arm_func_end IsDestinationFloor arm_func_start IsCurrentMissionType IsCurrentMissionType: ; 0x0234921C diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index a906f793..765408dc 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -3,15 +3,15 @@ .text - arm_func_start ov29_023498A0 -ov29_023498A0: ; 0x023498A0 + arm_func_start GenerateMissionEggMonster +GenerateMissionEggMonster: ; 0x023498A0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x18 str r0, [sp] ldrb r0, [r0, #0x16] cmp r0, #5 bne _02349A54 - bl ov29_02337F98 + bl GetRandomSpawnMonsterID mov sb, r0 bl IsCastform cmp r0, #0 @@ -131,7 +131,7 @@ _02349A60: .word 0x000003D3 _02349A64: .word 0x00000424 _02349A68: .word 0x000001C1 _02349A6C: .word 0x00000418 - arm_func_end ov29_023498A0 + arm_func_end GenerateMissionEggMonster arm_func_start ov29_02349A70 ov29_02349A70: ; 0x02349A70 @@ -281,7 +281,7 @@ _02349C60: ldreqb r1, [r0, #0x16] cmpeq r1, #5 bne _02349C78 - bl ov29_023498A0 + bl GenerateMissionEggMonster _02349C78: bl ov29_022E8244 ldmia sp!, {r3, r4, r5, pc} @@ -293,11 +293,11 @@ _02349C80: .word 0x02353538 ov29_02349C84: ; 0x02349C84 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0xa0 - bl ov29_02349208 + bl IsDestinationFloor cmp r0, #0 moveq r0, #0 beq _0234A1F8 - bl ov29_023491A4 + bl GetMissionDestination ldr r1, _0234A200 ; =0x023537C8 mov r2, #0 mov r4, r0 @@ -364,7 +364,7 @@ _02349D38: add r0, sp, #0x10 mov r2, #0 mov r1, r5 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r5 mov r0, #1 bl ov29_0234B0CC @@ -393,7 +393,7 @@ _02349DC8: add r0, sp, #0 mov r2, #0 mov r1, r4 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -438,7 +438,7 @@ _02349E6C: add r0, sp, #0x20 mov r2, #0 mov r1, r4 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -486,10 +486,10 @@ _02349F1C: add r0, sp, #0x80 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x80 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -506,10 +506,10 @@ _02349FA4: add r0, sp, #0x70 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x70 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -526,10 +526,10 @@ _02349FF0: add r0, sp, #0x60 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x60 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -546,10 +546,10 @@ _0234A03C: add r0, sp, #0x50 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x50 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -566,10 +566,10 @@ _0234A088: add r0, sp, #0x40 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x40 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -586,10 +586,10 @@ _0234A0D4: add r0, sp, #0x30 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon add r0, sp, #0x30 mov r1, #0x12 - bl SetPortraitUnknownAttr + bl SetPortraitLayout mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -620,7 +620,7 @@ _0234A148: add r0, sp, #0x90 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -713,7 +713,7 @@ _0234A26C: _0234A2A0: mov r0, r5 mov r1, r4 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} ldr r1, _0234A2D0 ; =0x00000E2C @@ -761,7 +761,7 @@ _0234A32C: ldr r1, _0234A5B4 ; =0x00000E21 mov r2, r0 str r0, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _0234A5A8 mov r7, #0 @@ -849,7 +849,7 @@ _0234A47C: ldr r0, [r0, #0x384] add r0, r0, r4 bl ItemZInit - bl ov29_02347030 + bl RemoveEmptyItemsInBagWrapper ldr r1, _0234A5C4 ; =0x00000E1D mov r0, #0 mov r2, #1 @@ -864,7 +864,7 @@ _0234A47C: add r0, sp, #0x14 mov r2, #0 mov r1, r4 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -882,7 +882,7 @@ _0234A504: mov r2, r0 mov r1, #0xe20 str r0, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 bne _0234A5A8 ldr r1, _0234A5D4 ; =0x00000E1A @@ -893,7 +893,7 @@ _0234A504: add r0, sp, #4 mov r2, #0 mov r1, r4 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -990,7 +990,7 @@ _0234A65C: _0234A690: mov r0, r7 mov r1, r4 - bl ov29_022E274C + bl CanSeeTarget cmp r0, #0 mov r0, #0 mov r2, #1 @@ -1005,7 +1005,7 @@ _0234A6B8: add r0, sp, #0 mov r2, #0 mov r1, r5 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r5 mov r0, #1 bl ov29_0234B0CC @@ -1103,7 +1103,7 @@ _0234A7CC: ldrsh r6, [r1, #2] mov r2, #0 mov r1, r6 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r6 mov r0, #1 bl ov29_0234B0CC @@ -1219,7 +1219,7 @@ ov29_0234A980: ; 0x0234A980 mov r1, r5 mov r2, #0 mov r3, #1 - bl ov29_02305C28 + bl EndNegativeStatusConditionWrapper mov r1, r5 mov r0, #1 mov r2, #0 @@ -1242,7 +1242,7 @@ _0234A9DC: ldrsh r4, [r1, #4] mov r2, #0 mov r1, r4 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -1316,7 +1316,7 @@ _0234AAC4: ldrsh r5, [r1, #4] mov r2, #0 mov r1, r5 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r5 mov r0, #1 bl ov29_0234B0CC @@ -1330,7 +1330,7 @@ _0234AAC4: bl DisplayMessage add r0, r6, #4 mov r1, #1 - bl ov29_023456BC + bl RemoveGroundItem bl GetSpecialTargetItem mov r1, r0 mov r0, #0 @@ -1391,8 +1391,8 @@ ov29_0234ABB0: ; 0x0234ABB0 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] - bl ov29_022EAD00 - bl ov29_022EAE14 + bl MusicTableIdxToMusicId + bl ChangeDungeonMusic _0234AC38: mov r0, #0 bl ov29_022EAF34 @@ -1491,7 +1491,7 @@ _0234AD44: ldmeqia sp!, {r3, r4, r5, pc} ldrsh r0, [r4, #4] ldrsh r1, [r4, #6] - bl ov29_023363EC + bl PositionIsOnStairs cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, [r4, #0xb4] @@ -1562,7 +1562,7 @@ ov29_0234AE40: ; 0x0234AE40 add r0, sp, #0 mov r1, r4 mov r2, #0 - bl ov29_0234BAC0 + bl InitPortraitDungeon mov r1, r4 mov r0, #1 bl ov29_0234B0CC @@ -1617,8 +1617,8 @@ ov29_0234AEE8: ; 0x0234AEE8 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] - bl ov29_022EAD00 - bl ov29_022EAE14 + bl MusicTableIdxToMusicId + bl ChangeDungeonMusic _0234AF24: mov r0, #0 bl ov29_022EAF34 @@ -1654,7 +1654,7 @@ _0234AF64: bl HandleFaint _0234AF8C: mov r0, #1 - bl ov29_022E38E0 + bl AnimationDelayOrSomething mov r0, r4 bl ov29_02348A18 ldmia sp!, {r4, r5, r6, pc} @@ -1915,8 +1915,8 @@ _0234B1C4: _0234B24C: .word 0x023537CC arm_func_end ov29_0234B1A4 - arm_func_start ov29_0234B250 -ov29_0234B250: ; 0x0234B250 + arm_func_start LogMessageByIdWithPopupCheckParticipants +LogMessageByIdWithPopupCheckParticipants: ; 0x0234B250 stmdb sp!, {r3, lr} ldr ip, _0234B290 ; =0x023537CC cmp r1, #0 @@ -1936,7 +1936,7 @@ _0234B27C: ldmia sp!, {r3, pc} .align 2, 0 _0234B290: .word 0x023537CC - arm_func_end ov29_0234B250 + arm_func_end LogMessageByIdWithPopupCheckParticipants arm_func_start ov29_0234B294 ov29_0234B294: ; 0x0234B294 @@ -1953,7 +1953,7 @@ LogMessageByIdWithPopupCheckUser: ; 0x0234B2A4 mov r4, #0 mov r6, r0 mov r5, r1 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 cmp r4, #0 @@ -1973,7 +1973,7 @@ LogMessageWithPopupCheckUser: ; 0x0234B2E4 mov r4, #0 mov r6, r0 mov r5, r1 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 cmp r4, #0 @@ -2014,11 +2014,11 @@ LogMessageByIdWithPopupCheckUserTarget: ; 0x0234B350 mov r4, #0 mov r7, r0 mov r5, r2 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 mov r0, r6 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 cmp r4, #0 @@ -2039,11 +2039,11 @@ LogMessageWithPopupCheckUserTarget: ; 0x0234B3A4 mov r4, #0 mov r7, r0 mov r5, r2 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 mov r0, r6 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 cmp r4, #0 @@ -2062,11 +2062,11 @@ LogMessageByIdQuietCheckUserTarget: ; 0x0234B3F0 mov r4, #0 mov r7, r0 mov r5, r2 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 mov r0, r6 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 cmp r4, #0 @@ -2087,7 +2087,7 @@ LogMessageByIdWithPopupCheckUserUnknown: ; 0x0234B444 mov r4, #0 mov r7, r0 mov r5, r2 - bl ov29_022E272C + bl ShouldDisplayEntityWrapper cmp r0, #0 movne r4, #1 mov r0, r6 @@ -2237,11 +2237,11 @@ _0234B5D8: ldr r1, _0234B710 ; =0x02353214 add r0, r5, r8 mov r2, #3 - bl Strncmp + bl strncmp cmp r0, #0 bne _0234B654 ldr r0, _0234B710 ; =0x02353214 - bl Strlen + bl strlen add r8, r8, r0 b _0234B660 _0234B654: @@ -2265,7 +2265,7 @@ _0234B660: add r1, sp, #4 smlabb r0, r3, r0, sb mov r7, #1 - bl Strncpy + bl strncpy ldr r0, [r4, #4] add r0, r0, #0xc00 ldrsh r1, [r0, #0x8c] @@ -2581,8 +2581,8 @@ _0234BAB8: .word 0x023537CC _0234BABC: .word 0x0237C694 arm_func_end ov29_0234BA54 - arm_func_start ov29_0234BAC0 -ov29_0234BAC0: ; 0x0234BAC0 + arm_func_start InitPortraitDungeon +InitPortraitDungeon: ; 0x0234BAC0 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -2601,9 +2601,9 @@ ov29_0234BAC0: ; 0x0234BAC0 mov r0, r6 mov r1, #1 strb r2, [r6, #0xe] - bl sub_0204D894 + bl AllowPortraitDefault ldmia sp!, {r4, r5, r6, pc} - arm_func_end ov29_0234BAC0 + arm_func_end InitPortraitDungeon arm_func_start ov29_0234BB10 ov29_0234BB10: ; 0x0234BB10 @@ -3216,7 +3216,7 @@ ov29_0234C2F4: ; 0x0234C2F4 bl MemZero add r0, r5, #0x48 strb r4, [r5, #0x88] - bl sub_0201E730 + bl InitRender3dElement mov r0, #0x100 strh r0, [r5, #0x4c] mov r0, #0xc0 @@ -4211,7 +4211,7 @@ _0234CF94: arm_func_start ov29_0234CFA0 ov29_0234CFA0: ; 0x0234CFA0 stmdb sp!, {r3, lr} - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 movne r0, #2 ldmneia sp!, {r3, pc} @@ -4234,8 +4234,8 @@ _0234CFE0: _0234CFE8: .word 0x02353538 arm_func_end ov29_0234CFA0 - arm_func_start ov29_0234CFEC -ov29_0234CFEC: ; 0x0234CFEC + arm_func_start GetPersonalityIndex +GetPersonalityIndex: ; 0x0234CFEC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldrb r0, [r5, #0x48] @@ -4393,7 +4393,7 @@ _0234D224: .word 0x000004CC _0234D228: .word 0x023537E8 _0234D22C: .word 0x000004B8 _0234D230: .word 0x000004D3 - arm_func_end ov29_0234CFEC + arm_func_end GetPersonalityIndex arm_func_start ov29_0234D234 ov29_0234D234: ; 0x0234D234 @@ -4616,8 +4616,8 @@ ov29_0234D4BC: ; 0x0234D4BC ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_0234D4BC - arm_func_start ov29_0234D518 -ov29_0234D518: ; 0x0234D518 + arm_func_start YesNoMenu +YesNoMenu: ; 0x0234D518 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 @@ -4634,7 +4634,7 @@ ov29_0234D518: ; 0x0234D518 bl ov29_0234D4BC add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_0234D518 + arm_func_end YesNoMenu arm_func_start ov29_0234D558 ov29_0234D558: ; 0x0234D558 diff --git a/asm/overlay_29_0234DDF4.s b/asm/overlay_29_0234DDF4.s index 9b8aa715..1a3cc952 100644 --- a/asm/overlay_29_0234DDF4.s +++ b/asm/overlay_29_0234DDF4.s @@ -3,8 +3,8 @@ .text - arm_func_start ov29_0234DDF4 -ov29_0234DDF4: ; 0x0234DDF4 + arm_func_start OpenMenu +OpenMenu: ; 0x0234DDF4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x38 mov r0, #0x22 @@ -56,7 +56,7 @@ _0234DE78: bl GetLeader mov r1, #0 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster cmp sl, #0 mvnne r4, #0 bne _0234DEE8 @@ -107,11 +107,11 @@ _0234DF5C: bl GetLeader mov r1, #0 mov r2, #0xc - bl ov29_022EB54C + bl GetItemToUse ldrb r1, [r0] orr r1, r1, #4 strb r1, [r0] - bl ov29_022F0B8C + bl GetLeaderAction bl ov30_0238367C mov r0, #1 bl ov29_022EB398 @@ -123,7 +123,7 @@ _0234DF9C: bl GetLeader mov r1, #0 mov r2, #0xd - bl ov29_022EB54C + bl GetItemToUse mov r7, r0 bl GetLeader mov r1, r7 @@ -139,7 +139,7 @@ _0234DFD8: bl GetLeader mov r1, #0 mov r2, #0xe - bl ov29_022EB54C + bl GetItemToUse mov r7, r0 bl GetLeader mov r1, r7 @@ -155,7 +155,7 @@ _0234E014: bl GetLeader mov r1, #0 mov r2, #0xf - bl ov29_022EB54C + bl GetItemToUse mov r7, r0 bl GetLeader mov r1, r7 @@ -201,7 +201,7 @@ _0234E0B8: bl sub_0204AF20 cmp r0, #0 beq _0234E140 - bl ov29_022F0B8C + bl GetLeaderAction bl GetLeader bl ov29_022F0C1C cmp r0, #0 @@ -213,12 +213,12 @@ _0234E0EC: bl sub_0204AF20 cmp r0, #0 beq _0234E140 - bl ov29_022F0B8C + bl GetLeaderAction bl GetLeader mov r1, #0 mov r2, #0x15 mov r7, r0 - bl ov29_022EB54C + bl GetItemToUse ldrsh r0, [r0, #4] bl GetItemMoveId16 mov r1, r0 @@ -245,7 +245,7 @@ _0234E168: mov r0, #1 bl ov29_022EB398 bl GetLeader - bl ov31_0238704C + bl TeamMenu cmp r0, #0 ldrne r5, [sp, #0x10] bl ov29_022F0B9C @@ -266,29 +266,29 @@ _0234E1B0: beq _0234E1D8 b _0234E288 _0234E1BC: - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0 bl ov31_02387688 b _0234E28C _0234E1CC: - bl ov29_022F0B8C + bl GetLeaderAction bl ov29_022F5A0C b _0234E28C _0234E1D8: - bl ov29_022F0B8C + bl GetLeaderAction bl ov29_022F5DC0 b _0234E28C _0234E1E4: - bl ov29_022F0B8C + bl GetLeaderAction bl ov31_02387660 b _0234E28C _0234E1F0: - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #1 bl ov31_02387688 b _0234E28C _0234E200: - bl ov29_022F0B8C + bl GetLeaderAction bl ov30_023851C0 mov r7, #0 mov r8, r7 @@ -303,7 +303,7 @@ _0234E214: bl EntityIsValid__0234DDD0 cmp r0, #0 beq _0234E278 - bl ov29_022F0B8C + bl GetLeaderAction ldrb r0, [r0, #4] cmp r8, r0 bne _0234E274 @@ -315,7 +315,7 @@ _0234E214: ldr r0, [sp, #4] mov r1, #0 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster mov sb, #0 b _0234E28C _0234E274: @@ -404,14 +404,14 @@ _0234E38C: ldr r0, [sp, #0x24] mov r1, #0 mov r2, #1 - bl ov29_022F98B4 + bl TryPointCameraToMonster ldr r0, [sp, #0x24] mov r2, #1 add r0, r0, #4 mov r1, #0 mov r3, r2 - bl ov29_02337428 - bl ov29_022E9618 + bl DrawTileGrid + bl GetLeaderMonster strb r8, [r0, #0x4e] mov r0, #0 bl ov29_022EB398 @@ -431,14 +431,14 @@ _0234E3CC: bl ov29_022F0B9C cmp r0, #0x1d bne _0234E40C - bl ov29_022F0B8C + bl GetLeaderAction bl ov30_02385FE0 b _0234E3CC _0234E40C: bl ov29_022F0B9C cmp r0, #0x1e bne _0234E428 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0 bl ov31_023860A4 b _0234E3CC @@ -446,7 +446,7 @@ _0234E428: bl ov29_022F0B9C cmp r0, #0x33 bne _0234E444 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0 bl ov31_023860A4 b _0234E3CC @@ -454,7 +454,7 @@ _0234E444: bl ov29_022F0B9C cmp r0, #0x1f bne _0234E45C - bl ov29_022F0B8C + bl GetLeaderAction bl ov31_0238619C b _0234E3CC _0234E45C: @@ -474,7 +474,7 @@ _0234E48C: bl sub_0204AF20 cmp r0, #0 beq _0234E4CC - bl ov29_022F0B8C + bl GetLeaderAction ldrb r2, [r0, #4] ldr r3, [sb] ldrb r1, [r0, #0xa] @@ -491,8 +491,8 @@ _0234E4CC: bl GetLeader mov r1, #0 mov r2, #1 - bl ov29_022F98B4 - bl ov29_0233779C + bl TryPointCameraToMonster + bl HideTileGrid bl ov29_022F0B9C cmp r0, #0 bne _0234E890 @@ -550,11 +550,11 @@ _0234E5A4: bl GetLeader mov r1, #0 mov r2, #0x10 - bl ov29_022EB54C + bl GetItemToUse ldrb r1, [r0] orr r1, r1, #4 strb r1, [r0] - bl ov29_022F0B8C + bl GetLeaderAction bl ov30_0238367C mov r0, #1 bl ov29_022EB398 @@ -566,7 +566,7 @@ _0234E5E4: bl GetLeader mov r1, #0 mov r2, #0x11 - bl ov29_022EB54C + bl GetItemToUse mov r5, r0 bl GetLeader mov r1, r5 @@ -582,7 +582,7 @@ _0234E620: bl GetLeader mov r1, #0 mov r2, #0x12 - bl ov29_022EB54C + bl GetItemToUse mov r5, r0 bl GetLeader mov r1, r5 @@ -598,7 +598,7 @@ _0234E65C: bl GetLeader mov r1, #0 mov r2, #0x13 - bl ov29_022EB54C + bl GetItemToUse mov r5, r0 bl GetLeader mov r1, r5 @@ -616,7 +616,7 @@ _0234E698: bl sub_0204AF20 cmp r0, #0 beq _0234E720 - bl ov29_022F0B8C + bl GetLeaderAction bl GetLeader bl ov29_022F0C1C cmp r0, #0 @@ -628,12 +628,12 @@ _0234E6CC: bl sub_0204AF20 cmp r0, #0 beq _0234E720 - bl ov29_022F0B8C + bl GetLeaderAction bl GetLeader mov r1, #0 mov r2, #0x15 mov r7, r0 - bl ov29_022EB54C + bl GetItemToUse ldrsh r0, [r0, #4] bl GetItemMoveId16 mov r1, r0 @@ -712,7 +712,7 @@ _0234E800: mov r0, #2 mov r1, #0 bl ov29_022EA428 - bl ov29_0234FA24 + bl OthersMenu cmp r0, #0 bne _0234E890 bl ov29_022F0B9C @@ -723,7 +723,7 @@ _0234E800: _0234E834: cmp r4, #5 bne _0234E86C - bl ov31_0238878C + bl RestMenu ldr r0, _0234E8E8 ; =0x02353538 ldr r0, [r0] ldrb r0, [r0, #8] @@ -776,7 +776,7 @@ _0234E8E8: .word 0x02353538 _0234E8EC: .word 0x02382804 _0234E8F0: .word 0x0235352C _0234E8F4: .word 0x00000B6A - arm_func_end ov29_0234DDF4 + arm_func_end OpenMenu arm_func_start ov29_0234E8F8 ov29_0234E8F8: ; 0x0234E8F8 diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index a4814f5b..3f7682df 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -873,8 +873,8 @@ _0234F7B8: .word 0x0235342C _0234F7BC: .word 0x0235383C arm_func_end ov29_0234F77C - arm_func_start ov29_0234F7C0 -ov29_0234F7C0: ; 0x0234F7C0 + arm_func_start OthersMenuLoop +OthersMenuLoop: ; 0x0234F7C0 stmdb sp!, {r4, lr} sub sp, sp, #0x98 ldr r0, _0234F9C8 ; =0x0235383C @@ -904,7 +904,7 @@ _0234F7F8: ldreq r4, _0234F9CC ; =0x0235343C beq _0234F840 ldr r4, _0234F9D0 ; =0x02353474 - bl ov29_023361D4 + bl IsFullFloorFixedRoom cmp r0, #0 ldrne r0, _0234F9C8 ; =0x0235383C movne r1, #3 @@ -1034,7 +1034,7 @@ _0234F9D8: .word 0x0235341C _0234F9DC: .word 0x00001A33 _0234F9E0: .word ov29_0234F77C _0234F9E4: .word 0x02353538 - arm_func_end ov29_0234F7C0 + arm_func_end OthersMenuLoop arm_func_start ov29_0234F9E8 ov29_0234F9E8: ; 0x0234F9E8 @@ -1056,8 +1056,8 @@ ov29_0234F9E8: ; 0x0234F9E8 _0234FA20: .word 0x0235383C arm_func_end ov29_0234F9E8 - arm_func_start ov29_0234FA24 -ov29_0234FA24: ; 0x0234FA24 + arm_func_start OthersMenu +OthersMenu: ; 0x0234FA24 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r0, _0234FAE4 ; =0x0235383C mov r1, #9 @@ -1113,7 +1113,7 @@ _0234FADC: .align 2, 0 _0234FAE4: .word 0x0235383C _0234FAE8: .word 0x0238280C - arm_func_end ov29_0234FA24 + arm_func_end OthersMenu arm_func_start ov29_0234FAEC ov29_0234FAEC: ; 0x0234FAEC diff --git a/asm/overlay_30.s b/asm/overlay_30.s index ec7c886c..e035eb0f 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -446,7 +446,7 @@ _02382DC8: cmp r0, #3 bne _02382E60 mov r0, r8 - bl ov29_022E1610 + bl GetItemInfo mov r6, r0 mov r0, sl mov r1, r6 @@ -532,7 +532,7 @@ _02382EDC: cmp r0, #2 bne _02382F84 mov r0, r8 - bl ov29_022E1608 + bl GetTrapInfo mov r6, r0 mov r0, sl mov r1, r6 @@ -786,7 +786,7 @@ _0238329C: add r0, sp, #0x1c mov r1, #0 mov r2, #0x240 - bl Memset + bl memset add r1, sp, #0x18 mov r0, r8 mov r2, #1 @@ -2175,7 +2175,7 @@ _023846E8: add r0, r0, #0x138 add r4, r0, #0xcc00 mov r0, r4 - bl Memset + bl memset mov r0, sl mov r1, r4 mov r2, #1 @@ -2245,7 +2245,7 @@ ov30_0238483C: ; 0x0238483C mov r0, r4 mov r1, #0 mov r2, #0x14 - bl Memset + bl memset mov r0, r5 bl ov30_02385EC4 strh r0, [r4] @@ -2432,7 +2432,7 @@ _02384AC8: mov r0, r4 mov r1, r5 mov r2, r8 - bl ov29_02345538 + bl SpawnItem _02384B08: add r6, r6, #1 cmp r6, #0x40 @@ -2452,7 +2452,7 @@ ov30_02384B24: ; 0x02384B24 mov r0, r4 mov r1, #0 mov r2, #6 - bl Memset + bl memset mov r0, r5 mov r1, r4 mov r2, #1 @@ -2521,12 +2521,12 @@ _02384BAC: ldrb r2, [sp, #2] add r1, sp, #4 mov r3, #0 - bl ov29_022E2260 + bl SpawnTrap movs r1, r0 beq _02384C54 mov r0, r4 mov r2, r5 - bl ov29_022ED858 + bl BindTrapToTile _02384C54: add sb, sb, #1 cmp sb, #0x40 @@ -2671,7 +2671,7 @@ ov30_02384E28: ; 0x02384E28 add r0, sp, #0x18 mov r1, #0 mov r2, #0x240 - bl Memset + bl memset mov r0, sl bl ov30_02385EF4 mov r0, sl @@ -2697,7 +2697,7 @@ ov30_02384E28: ; 0x02384E28 add r0, sp, #0xe mov r1, #0 mov r2, #2 - bl Memset + bl memset mov r0, sl add r1, sp, #0xe mov r2, #2 @@ -2707,7 +2707,7 @@ ov30_02384E28: ; 0x02384E28 mov r1, #0 strh r2, [sp, #0x1c] mov r2, #2 - bl Memset + bl memset mov r0, sl add r1, sp, #0xc mov r2, #2 @@ -2815,7 +2815,7 @@ ov30_02384E28: ; 0x02384E28 add r0, sp, #8 mov r1, #0 mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #8 mov r2, #1 @@ -2825,7 +2825,7 @@ ov30_02384E28: ; 0x02384E28 mov r1, #0 strb r2, [sp, #0x76] mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #7 mov r2, #1 @@ -2835,7 +2835,7 @@ ov30_02384E28: ; 0x02384E28 mov r1, #0 strb r2, [sp, #0x77] mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #6 mov r2, #1 @@ -2845,7 +2845,7 @@ ov30_02384E28: ; 0x02384E28 mov r1, #0 strb r2, [sp, #0x78] mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #5 mov r2, #1 @@ -2858,7 +2858,7 @@ ov30_02384E28: ; 0x02384E28 add r0, sp, #0xa mov r1, #0 mov r2, #2 - bl Memset + bl memset add r1, sp, #0xa mov r0, sl mov r2, #2 @@ -2911,7 +2911,7 @@ ov30_023851C0: ; 0x023851C0 add r0, sp, #4 mov r1, #0 mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #4 mov r2, #1 @@ -2924,7 +2924,7 @@ ov30_023851C0: ; 0x023851C0 add r0, sp, #3 mov r1, #0 mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #3 mov r2, #1 @@ -3143,7 +3143,7 @@ ov30_023853E0: ; 0x023853E0 add r0, sp, #2 mov r1, #0 mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #2 mov r2, #1 @@ -3153,7 +3153,7 @@ ov30_023853E0: ; 0x023853E0 mov r1, #0 mov r2, #1 strb r3, [sp, #0x123] - bl Memset + bl memset add r1, sp, #1 mov r0, sl mov r2, #1 @@ -3163,7 +3163,7 @@ ov30_023853E0: ; 0x023853E0 mov r1, #0 strb r2, [sp, #0x124] mov r2, #4 - bl Memset + bl memset mov r0, sl add r1, sp, #0x10 mov r2, #4 @@ -3336,7 +3336,7 @@ _02385630: add r0, sp, #0 mov r1, #0 mov r2, #1 - bl Memset + bl memset mov r0, sl add r1, sp, #0 mov r2, #1 @@ -3427,7 +3427,7 @@ _023859BC: bl ov29_023021F0 mov r0, r7 mov r1, #0 - bl ov29_022E1A40 + bl UpdateEntityPixelPos _023859D0: add sp, sp, #0x258 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -3446,7 +3446,7 @@ ov30_023859DC: ; 0x023859DC bl ov29_022DEA10 mov r5, r0 mov r0, r8 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r4, r0 add r0, sp, #8 add r1, sp, #4 @@ -3529,7 +3529,7 @@ ov30_02385B10: ; 0x02385B10 bl ov29_022DEA10 mov r5, r0 mov r0, r8 - bl GetSpriteIndex__022F7388 + bl DungeonGetSpriteIndex mov r4, r0 add r0, sp, #8 add r1, sp, #4 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 776835ee..d53c2084 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -3,8 +3,8 @@ .text - arm_func_start ov31_02382820 -ov31_02382820: ; 0x02382820 + arm_func_start EntryOverlay31 +EntryOverlay31: ; 0x02382820 stmdb sp!, {r3, lr} ldr r0, _0238285C ; =0x02389DB4 bl sub_020348E4 @@ -23,7 +23,7 @@ ov31_02382820: ; 0x02382820 .align 2, 0 _0238285C: .word 0x02389DB4 _02382860: .word ov31_0238A260 - arm_func_end ov31_02382820 + arm_func_end EntryOverlay31 arm_func_start ov31_02382864 ov31_02382864: ; 0x02382864 @@ -206,8 +206,8 @@ _02382AB8: .word 0x02353538 _02382ABC: .word 0x000008B8 arm_func_end ov31_02382A34 - arm_func_start ov31_02382AC0 -ov31_02382AC0: ; 0x02382AC0 + arm_func_start DungeonMenuSwitch +DungeonMenuSwitch: ; 0x02382AC0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x54 ldr r1, _02382B4C ; =0x02353538 @@ -246,7 +246,7 @@ ov31_02382AC0: ; 0x02382AC0 .align 2, 0 _02382B4C: .word 0x02353538 _02382B50: .word 0x02389E14 - arm_func_end ov31_02382AC0 + arm_func_end DungeonMenuSwitch arm_func_start ov31_02382B54 ov31_02382B54: ; 0x02382B54 @@ -312,7 +312,7 @@ _02382BEC: ldr r0, _02382DA0 ; =0x02389DC4 bl sub_0202F8C4 ldr r2, _02382D8C ; =ov31_0238A260 - ldr r1, _02382DA4 ; =ov31_02382AC0 + ldr r1, _02382DA4 ; =DungeonMenuSwitch ldr r2, [r2] strb r0, [r2, #2] ldr r0, _02382DA8 ; =0x02389DA4 @@ -409,7 +409,7 @@ _02382D94: .word 0x00000233 _02382D98: .word 0x02389DD4 _02382D9C: .word ov31_02382864 _02382DA0: .word 0x02389DC4 -_02382DA4: .word ov31_02382AC0 +_02382DA4: .word DungeonMenuSwitch _02382DA8: .word 0x02389DA4 arm_func_end ov31_02382B54 @@ -995,7 +995,7 @@ _02383528: ldrsh r1, [r1, #6] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo mov r1, r0 ldrb r0, [r1] tst r0, #1 @@ -1018,7 +1018,7 @@ _02383528: _02383590: ldr r1, _02383650 ; =0x02389F5C mov r0, r8 - bl Strcpy + bl strcpy ldr r0, _02383644 ; =0x0238A26C mov r1, #3 ldr r0, [r0] @@ -1092,7 +1092,7 @@ ov31_0238367C: ; 0x0238367C bl GetLeader mov r1, #0 mov r2, #0xb - bl ov29_022EB54C + bl GetItemToUse ldrsh r1, [r0, #4] mov r2, #0 add lr, sp, #0xc @@ -1145,7 +1145,7 @@ ov31_0238372C: ; 0x0238372C cmp r1, #0 beq _0238375C add r0, r0, #4 - bl ov29_02337B2C + bl PositionHasItem cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -1692,12 +1692,12 @@ _02383F00: bl StringFromMessageId mov r1, r0 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _02383F34 _02383F28: ldr r1, _023848CC ; =0x02389F5C add r0, sp, #0x4c - bl Strcpy + bl strcpy _02383F34: mov r1, #2 mov r0, r8 @@ -1727,7 +1727,7 @@ _02383F7C: ldrsh r1, [r1, #6] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] tst r1, #1 movne r1, #1 @@ -1742,12 +1742,12 @@ _02383F7C: bl StringFromMessageId mov r1, r0 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _02383FF0 _02383FE4: ldr r1, _023848CC ; =0x02389F5C add r0, sp, #0x4c - bl Strcpy + bl strcpy _02383FF0: mov r0, r8 bl sub_02027B1C @@ -1848,7 +1848,7 @@ _02384138: ldrsh r1, [sl, #6] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] tst r1, #1 movne r1, #1 @@ -1932,7 +1932,7 @@ _02384278: ldrsh r1, [sl, #6] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] tst r1, #1 movne r1, #1 @@ -2029,7 +2029,7 @@ _023843D0: ldrsh r1, [sl, #6] bl GetTile ldr r0, [r0, #0x10] - bl ov29_022E1610 + bl GetItemInfo ldrb r1, [r0] mov r4, #1 tst r1, #1 @@ -2096,7 +2096,7 @@ _023844FC: mov r1, r0 mov r0, sl mov r2, #0xa - bl ov29_022EB44C + bl GetItemToUseByIndex mov r8, r0 ldr r0, [sl, #0xb4] str r0, [sp, #0x14] @@ -2109,7 +2109,7 @@ _023844FC: bne _02384598 ldrsh r1, [r8, #4] mov r0, #9 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrsh r0, [r8, #4] bl GetItemCategoryVeneer cmp r0, #6 @@ -2132,7 +2132,7 @@ _02384588: cmp r0, #0 beq _02384598 mov r0, #9 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384598: bl ov00_022EBB98 cmp r0, #0x80 @@ -2144,14 +2144,14 @@ _02384598: beq _023845C4 ldrsh r1, [r8, #4] mov r0, #0xa - bl ov29_022EB81C + bl AddDungeonSubMenuOption _023845C4: mov r0, r8 - bl ov29_022EB5D8 + bl GetItemAction movs r4, r0 beq _02384654 ldrsh r1, [r8, #4] - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrb r0, [r8] tst r0, #8 movne r0, #1 @@ -2159,17 +2159,17 @@ _023845C4: tst r0, #0xff beq _023845FC mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _023845FC: mov r0, r8 bl ov29_023468FC cmp r0, #0 bne _02384614 mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384614: mov r0, sl - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 bne _02384634 mov r0, r8 @@ -2178,14 +2178,14 @@ _02384614: beq _0238463C _02384634: mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _0238463C: mov r0, r8 - bl sub_0200CDF8 + bl IsItemUsableNow cmp r0, #0 bne _02384654 mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384654: bl ov00_022EBB98 cmp r0, #0x33 @@ -2207,11 +2207,11 @@ _0238468C: tst r0, #0x10 beq _023846A8 mov r0, #0x3d - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _023846B0 _023846A8: mov r0, #0x3c - bl ov29_022EB81C + bl AddDungeonSubMenuOption _023846B0: ldr r0, _023848A4 ; =0x020AF6B8 mov r3, #0 @@ -2237,9 +2237,9 @@ _023846C8: tst r1, #0xff beq _0238471C mov r0, #0x3c - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x3d - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _02384728 _0238471C: add r3, r3, #1 @@ -2257,7 +2257,7 @@ _02384728: mov r2, #0 mov r0, #0x36 str r2, [sp, #0x18] - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r4, #0 _02384758: ldr r0, _023848A8 ; =0x02353538 @@ -2303,7 +2303,7 @@ _023847EC: cmp r0, #0 bne _02384860 mov r0, #0x36 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _02384860 _02384804: ldr r0, _023848A8 ; =0x02353538 @@ -2313,23 +2313,23 @@ _02384804: beq _02384860 ldrsh r1, [r8, #4] mov r0, #0x37 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, r8 bl IsHeldItemInBag cmp r0, #0 beq _02384840 ldrsh r1, [r8, #4] mov r0, #0x3e - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02384840: mov r0, sl bl ov29_02300B40 cmp r0, #0 beq _02384860 mov r0, #0x37 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x3e - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384860: bl ov00_022EBB98 cmp r0, #0x33 @@ -2343,7 +2343,7 @@ _02384860: bne _023848D4 ldrsh r1, [r8, #4] mov r0, #8 - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _02384908 .align 2, 0 _02384898: .word 0x0238A26C @@ -2367,14 +2367,14 @@ _023848D4: bne _02384908 ldrsh r1, [r8, #4] mov r0, #0x3a - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldr r0, [r4, #0x10] bl ov29_022E1620 bl ov29_02348D00 cmp r0, #0 beq _02384908 mov r0, #0x3a - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384908: ldrsh r0, [r8, #4] bl GetItemCategoryVeneer @@ -2382,7 +2382,7 @@ _02384908: bne _02384928 ldrsh r1, [r8, #4] mov r0, #0x27 - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _02384950 _02384928: ldrsh r0, [r8, #4] @@ -2391,55 +2391,55 @@ _02384928: ldrsh r1, [r8, #4] bne _02384948 mov r0, #0x41 - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _02384950 _02384948: mov r0, #0xb - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02384950: ldr r0, [sp, #0x14] bl ov29_02302368 cmp r0, #0 bne _02384978 mov r0, #0x27 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x41 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0xb - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384978: mov r0, sl - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 beq _023849A0 mov r0, #0x27 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x41 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0xb - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _023849A0: mov r0, r8 bl ov29_02348D00 cmp r0, #0 beq _023849D8 mov r0, #0x27 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x41 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0xb - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0xa - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #9 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _023849D8: mov r0, r8 - bl sub_0200CDF8 + bl IsItemUsableNow cmp r0, #0 bne _02384C48 mov r0, #0xb - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _02384C48 _023849F4: bl ov00_022EBB98 @@ -2478,32 +2478,32 @@ _023849F4: beq _02384AC0 ldrsh r1, [r8, #4] mov r0, #0x37 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, r8 bl IsHeldItemInBag cmp r0, #0 beq _02384AA4 ldrsh r1, [r8, #4] mov r0, #0x3e - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02384AA4: ldr r0, [sp, #0x24] cmp r0, #0 beq _02384AC0 mov r0, #0x37 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x3e - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384AC0: ldrb r0, [fp, #7] cmp r0, #0 beq _02384BEC mov r0, r8 - bl ov29_022EB5D8 + bl GetItemAction movs r4, r0 beq _02384B5C ldrsh r1, [r8, #4] - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrb r0, [r8] tst r0, #8 movne r0, #1 @@ -2511,17 +2511,17 @@ _02384AC0: tst r0, #0xff beq _02384B04 mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384B04: mov r0, r8 bl ov29_023468FC cmp r0, #0 bne _02384B1C mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384B1C: ldr r0, [sp, #0x20] - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 bne _02384B3C mov r0, r8 @@ -2530,14 +2530,14 @@ _02384B1C: beq _02384B44 _02384B3C: mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384B44: mov r0, r8 - bl sub_0200CDF8 + bl IsItemUsableNow cmp r0, #0 bne _02384B5C mov r0, r4 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384B5C: ldrsh r0, [r8, #4] bl GetItemCategoryVeneer @@ -2545,7 +2545,7 @@ _02384B5C: bne _02384B7C ldrsh r1, [r8, #4] mov r0, #0x27 - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _02384B98 _02384B7C: ldrsh r0, [r8, #4] @@ -2554,42 +2554,42 @@ _02384B7C: bne _02384B98 ldrsh r1, [r8, #4] mov r0, #0x41 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02384B98: ldr r0, [sp, #0x14] bl ov29_02302368 cmp r0, #0 bne _02384BB8 mov r0, #0x27 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x41 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384BB8: mov r0, sl - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 bne _02384BD8 mov r0, sl - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 beq _02384C48 _02384BD8: mov r0, #0x27 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x41 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _02384C48 _02384BEC: ldrsh r1, [r8, #4] mov r0, #0x38 - bl ov29_022EB81C + bl AddDungeonSubMenuOption cmp r4, #0 beq _02384C08 mov r0, #0x38 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384C08: ldr r0, [sp, #0x20] - bl ov29_023186CC + bl MonsterHasEmbargoStatus cmp r0, #0 bne _02384C28 mov r0, r8 @@ -2598,18 +2598,18 @@ _02384C08: beq _02384C30 _02384C28: mov r0, #0x38 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384C30: mov r0, r8 - bl sub_0200CDF8 + bl IsItemUsableNow cmp r0, #0 bne _02384C48 mov r0, #0x38 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02384C48: ldrsh r1, [r8, #4] mov r0, #0xc - bl ov29_022EB81C + bl AddDungeonSubMenuOption bl ov29_022EB9A0 bl ov29_022EBA84 mov r2, #0 @@ -2922,7 +2922,7 @@ _023850D8: ldr r0, [r0] add r0, r0, #0x1a000 strb r1, [r0, #0x247] - bl ov29_0233779C + bl HideTileGrid bl ov31_023837C8 mov r0, #0x14 bl AdvanceFrame @@ -2987,8 +2987,8 @@ _02385190: _023851BC: .word 0x000008E8 arm_func_end ov31_0238513C - arm_func_start ov31_023851C0 -ov31_023851C0: ; 0x023851C0 + arm_func_start MovesMenu +MovesMenu: ; 0x023851C0 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc ldr r1, _023853B8 ; =0x02353538 @@ -3036,13 +3036,13 @@ _0238521C: add r0, sp, #8 mov r2, #1 str r1, [sp, #4] - bl ov31_02385404 + bl HandleMovesMenu cmp r0, #0 bne _023853B0 bl ov29_022F0B9C cmp r0, #0x1d bne _0238529C - bl ov29_022F0B8C + bl GetLeaderAction bl ov31_02385FE0 mov r0, #1 bl ov29_022EB398 @@ -3054,7 +3054,7 @@ _0238529C: mov r0, #0xb mov r1, #0 bl ov29_022EA428 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0 bl ov31_023860A4 mov r0, #1 @@ -3067,7 +3067,7 @@ _023852CC: mov r0, #0xb mov r1, #0 bl ov29_022EA428 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0 bl ov31_023860A4 mov r0, #1 @@ -3080,7 +3080,7 @@ _023852FC: mov r0, #0xb mov r1, #0 bl ov29_022EA428 - bl ov29_022F0B8C + bl GetLeaderAction bl ov31_0238619C mov r0, #1 bl ov29_022EB398 @@ -3092,7 +3092,7 @@ _02385328: mov r0, #0xb mov r1, #0 bl ov29_022EA428 - bl ov29_022F0B8C + bl GetLeaderAction bl ov31_02386204 mov r0, #1 bl ov29_022EB398 @@ -3104,7 +3104,7 @@ _02385354: mov r0, #0xb mov r1, #0 bl ov29_022EA428 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #1 bl ov31_02386308 mov r0, #1 @@ -3127,7 +3127,7 @@ _023853B0: ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _023853B8: .word 0x02353538 - arm_func_end ov31_023851C0 + arm_func_end MovesMenu arm_func_start ov31_023853BC ov31_023853BC: ; 0x023853BC @@ -3137,7 +3137,7 @@ ov31_023853BC: ; 0x023853BC mov ip, #0 str lr, [sp] str ip, [sp, #4] - bl ov31_02385404 + bl HandleMovesMenu add sp, sp, #8 ldmia sp!, {r3, pc} arm_func_end ov31_023853BC @@ -3150,13 +3150,13 @@ ov31_023853E0: ; 0x023853E0 mov ip, #1 str lr, [sp] str ip, [sp, #4] - bl ov31_02385404 + bl HandleMovesMenu add sp, sp, #8 ldmia sp!, {r3, pc} arm_func_end ov31_023853E0 - arm_func_start ov31_02385404 -ov31_02385404: ; 0x02385404 + arm_func_start HandleMovesMenu +HandleMovesMenu: ; 0x02385404 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x12c str r1, [sp, #4] @@ -3287,7 +3287,7 @@ _023855A8: ldr r0, [sp] ldr sl, [r6, #0xb4] str r6, [r0] - bl ov29_022E9618 + bl GetLeaderMonster strb sb, [r0, #0x4e] mov r0, r6 mov r1, #0 @@ -3396,7 +3396,7 @@ _02385738: beq _02385770 mov r0, #0x14 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02385770: ldrb r0, [sb, fp, lsl #3] tst r0, #1 @@ -3409,35 +3409,35 @@ _02385770: tst r0, #8 beq _023857A4 mov r0, #0x33 - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _023857BC _023857A4: mov r0, #0x1e - bl ov29_022EB81C + bl AddDungeonSubMenuOption b _023857BC _023857B0: mov r0, #0x1f mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _023857BC: ldr r0, [sp, #4] cmp r0, #0 beq _023857E0 mov r0, #0x20 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0x21 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _023857E0: mov r0, #0x1d mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldr r0, [sp, #4] cmp r0, #0 bne _02385804 mov r0, #0x20 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _0238595C _02385804: ldr r0, _02385F70 ; =0x0238A270 @@ -3529,7 +3529,7 @@ _0238592C: cmp r0, #0 bne _0238593C mov r0, #0x20 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _0238593C: ldr r1, _02385F70 ; =0x0238A270 mov r0, r8 @@ -3538,7 +3538,7 @@ _0238593C: cmp r0, #0 bne _0238595C mov r0, #0x21 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _0238595C: ldr r1, _02385F70 ; =0x0238A270 mov r0, r8 @@ -3547,7 +3547,7 @@ _0238595C: cmp r0, #0 bne _0238597C mov r0, #0x21 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _0238597C: ldr r0, [sp, #8] cmp r0, #0 @@ -3566,7 +3566,7 @@ _023859B0: cmp r8, #0 bne _023859C0 mov r0, #0x14 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _023859C0: bl ov29_022EB9A0 ldr r0, [sp, #0xc] @@ -3579,7 +3579,7 @@ _023859C0: cmp r0, #0 beq _02385A08 mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3594,7 +3594,7 @@ _02385A08: cmp r0, #0 beq _02385EFC mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3614,7 +3614,7 @@ _02385A40: cmp r0, #0 beq _02385A88 mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3628,7 +3628,7 @@ _02385A88: cmp r0, #0 beq _02385EFC mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3643,7 +3643,7 @@ _02385AC0: cmp r0, #0 beq _02385EFC mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3914,7 +3914,7 @@ _02385EAC: cmp r0, #0 beq _02385EF0 mov r0, r6 - bl ov29_022E2A38 + bl GetTeamMemberIndex mov r2, r0 mov r1, r5 add r0, r7, #0x4a @@ -3941,7 +3941,7 @@ _02385EFC: mov r0, #8 mov r1, #0x1e bl ov29_022EA370 - bl ov29_0233779C + bl HideTileGrid mov r0, #0x1b bl AdvanceFrame bl sub_020407C0 @@ -3954,7 +3954,7 @@ _02385EFC: mov r1, #0 str r1, [r0, #8] _02385F50: - bl ov29_022E9618 + bl GetLeaderMonster ldr r1, [sp, #0x10] add r2, sp, #0x2c ldr r1, [r2, r1, lsl #2] @@ -3977,7 +3977,7 @@ _02385F98: .word 0x0000099B _02385F9C: .word 0x000009A8 _02385FA0: .word 0x000009BA _02385FA4: .word 0x00003F07 - arm_func_end ov31_02385404 + arm_func_end HandleMovesMenu arm_func_start ov31_02385FA8 ov31_02385FA8: ; 0x02385FA8 @@ -4500,10 +4500,10 @@ _02386694: bl ov29_022EBA70 mov r0, #0x22 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0x21 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldr r0, [r7] mov r3, #0 add r1, r0, #1 @@ -4528,11 +4528,11 @@ _023866EC: tst r0, #0xff bne _02386708 mov r0, #0x21 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02386708: mov r0, #0x1d mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption add r0, sp, #0x18 str r0, [sp, #0x84] mov r0, fp @@ -4656,7 +4656,7 @@ _023868C8: mov r1, r5 add r0, r0, #0x124 mov r2, #0x22 - bl Memcpy + bl memcpy b _023864E0 _023868E8: cmp sl, #2 @@ -4713,14 +4713,14 @@ _02386950: ldr r1, _02386B20 ; =0x000008D6 mov r3, r0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu mov r7, r0 b _023869F4 _023869C0: ldr r1, _02386B24 ; =0x000008D7 mov r3, r0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu mov r7, r0 b _023869F4 _023869D8: @@ -4729,7 +4729,7 @@ _023869D8: ldr r1, _02386B24 ; =0x000008D7 mov r3, r0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu mov r7, r0 _023869F4: mov r0, #1 @@ -4938,10 +4938,10 @@ _02386C90: bl ov29_022EBA70 mov r0, #0x25 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0xc mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption bl ov29_022EB9A0 bl ov29_022EBA84 mov r1, #0 @@ -5019,7 +5019,7 @@ _02386D70: ldr r1, [r0] cmp r1, #2 bne _02386E68 - bl ov29_022E1608 + bl GetTrapInfo ldrb r3, [r0] add r2, sp, #0xc ldr r1, _02386F20 ; =0x00001013 @@ -5191,8 +5191,8 @@ _02387044: .word ov31_023899B8 _02387048: .word 0x0238A280 arm_func_end ov31_02387014 - arm_func_start ov31_0238704C -ov31_0238704C: ; 0x0238704C + arm_func_start TeamMenu +TeamMenu: ; 0x0238704C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x13c mov sl, r0 @@ -5300,10 +5300,10 @@ _023871B0: ldr r4, [r1, #0xb28] mov r1, #0 ldr r5, [r4, #0xb4] - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0x19 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrb r0, [r5, #7] cmp r0, #0 bne _02387278 @@ -5332,18 +5332,18 @@ _023871B0: _02387260: mov r0, #0x34 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _0238726C: mov r0, #0x1c mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption _02387278: mov r0, #0x30 mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0x1a mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrb r0, [r5, #7] cmp r0, #0 ldreq r0, _02387624 ; =0x02353538 @@ -5360,7 +5360,7 @@ _02387278: beq _02387320 mov r0, #0x3b mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption ldrsh r0, [r5, #0xc] mov r6, #1 cmp r0, #4 @@ -5380,22 +5380,22 @@ _023872FC: cmp r6, #0 bne _02387320 mov r0, #0x3b - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02387320: mov r0, r5 bl ov00_022FBAF0 cmp r0, #0 beq _0238735C mov r0, #0x19 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x3b - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x1a - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x30 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption mov r0, #0x34 - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption b _02387380 _0238735C: ldrb r0, [r5, #7] @@ -5406,7 +5406,7 @@ _0238735C: cmp r0, #0 bne _02387380 mov r0, #0x1a - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02387380: bl ov29_022EB9A0 cmp r8, #0 @@ -5593,7 +5593,7 @@ _0238762C: .word 0x00000A3C _02387630: .word 0x0238A024 _02387634: .word 0x00000233 _02387638: .word 0x0237C91C - arm_func_end ov31_0238704C + arm_func_end TeamMenu arm_func_start ov31_0238763C ov31_0238763C: ; 0x0238763C @@ -5827,7 +5827,7 @@ _023878D0: add r0, sp, #0x68 mov r1, r5 mov r2, #0x80 - bl Memset + bl memset mov r8, r5 ldr fp, _0238808C ; =0x000003E7 b _02387B80 @@ -5878,7 +5878,7 @@ _02387958: bgt _02387A18 ldr r1, _02388090 ; =0x0238A044 add r0, sp, #0xa8 - bl Strcpy + bl strcpy b _02387B20 _02387A18: cmp r1, fp @@ -5891,7 +5891,7 @@ _02387A18: bgt _02387A48 ldr r1, _02388094 ; =0x0238A04C add r0, sp, #0xa8 - bl Strcpy + bl strcpy b _02387B20 _02387A48: cmp r1, fp @@ -5904,11 +5904,11 @@ _02387A48: add r0, sp, #0xa8 bgt _02387A78 ldr r1, _02388098 ; =0x0238A054 - bl Strcpy + bl strcpy b _02387B20 _02387A78: ldr r1, _0238809C ; =0x0238A05C - bl Strcpy + bl strcpy b _02387B20 _02387A84: add r1, r1, r0 @@ -5922,7 +5922,7 @@ _02387A84: bgt _02387AB8 ldr r1, _023880A0 ; =0x0238A064 add r0, sp, #0xa8 - bl Strcpy + bl strcpy b _02387B20 _02387AB8: cmp r1, fp @@ -5935,7 +5935,7 @@ _02387AB8: bgt _02387AE8 ldr r1, _023880A4 ; =0x0238A06C add r0, sp, #0xa8 - bl Strcpy + bl strcpy b _02387B20 _02387AE8: cmp r1, fp @@ -5948,11 +5948,11 @@ _02387AE8: add r0, sp, #0xa8 bgt _02387B18 ldr r1, _023880A8 ; =0x0238A074 - bl Strcpy + bl strcpy b _02387B20 _02387B18: ldr r1, _023880AC ; =0x0238A07C - bl Strcpy + bl strcpy _02387B20: add r0, sp, #0xa8 str r0, [sp, #0x54] @@ -6270,7 +6270,7 @@ _02387F8C: bne _02387FEC cmp r4, #0 beq _0238800C - bl ov29_0233779C + bl HideTileGrid ldr r0, [sp, #8] cmp r0, #0 beq _0238800C @@ -6280,7 +6280,7 @@ _02387F8C: bl ov00_022F98B4 b _0238800C _02387FEC: - bl ov29_0233779C + bl HideTileGrid ldr r0, [sp, #8] cmp r0, #0 beq _0238800C @@ -6489,7 +6489,7 @@ _023882A0: ldrsh r5, [r6, #0xe] ldrsh r8, [r6, #0x10] ldrsh r0, [r6, #8] - bl CheckTeamMemberIdx__02056228 + bl CheckTeamMemberIdx str r0, [sp, #4] mov r1, r6 add r0, sp, #0xc @@ -6507,14 +6507,14 @@ _023882E8: bgt _02388320 ldr r1, _02388420 ; =0x0238A0A8 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _023883B8 _02388320: cmp r5, r0, lsl #1 bgt _02388338 ldr r1, _02388424 ; =0x0238A0B0 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _023883B8 _02388338: add r0, r0, r0, lsl #1 @@ -6522,11 +6522,11 @@ _02388338: add r0, sp, #0x4c bgt _02388354 ldr r1, _02388428 ; =0x0238A0B8 - bl Strcpy + bl strcpy b _023883B8 _02388354: ldr r1, _0238842C ; =0x0238A0C0 - bl Strcpy + bl strcpy b _023883B8 _02388360: cmp r5, r0, asr #2 @@ -6534,14 +6534,14 @@ _02388360: bgt _0238837C ldr r1, _02388430 ; =0x0238A0C8 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _023883B8 _0238837C: cmp r5, r0, lsl #1 bgt _02388394 ldr r1, _02388434 ; =0x0238A0D0 add r0, sp, #0x4c - bl Strcpy + bl strcpy b _023883B8 _02388394: add r0, r0, r0, lsl #1 @@ -6549,11 +6549,11 @@ _02388394: add r0, sp, #0x4c bgt _023883B0 ldr r1, _02388438 ; =0x0238A0D8 - bl Strcpy + bl strcpy b _023883B8 _023883B0: ldr r1, _0238843C ; =0x0238A0E0 - bl Strcpy + bl strcpy _023883B8: add r0, sp, #0x4c str r0, [sp, #0xc8] @@ -6774,7 +6774,7 @@ _023886BC: bl ov31_02388744 mov r0, #0x1b bl AdvanceFrame - bl ov29_0233779C + bl HideTileGrid ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end ov31_02388534 @@ -6850,8 +6850,8 @@ ov31_02388744: ; 0x02388744 ldmia sp!, {r4, pc} arm_func_end ov31_02388744 - arm_func_start ov31_0238878C -ov31_0238878C: ; 0x0238878C + arm_func_start RestMenu +RestMenu: ; 0x0238878C stmdb sp!, {r4, r5, lr} sub sp, sp, #0x9c ldr r0, _023889B8 ; =0x0238A284 @@ -6937,11 +6937,11 @@ _023888BC: mov r3, r2 mov r0, #0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 movne r0, #1 bne _023888F0 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0x2b bl SetMonsterActionFields mov r0, #0 @@ -6958,11 +6958,11 @@ _02388908: mov r3, r2 mov r0, #0 str r2, [sp] - bl ov29_0234D518 + bl YesNoMenu cmp r0, #1 movne r2, #1 bne _02388964 - bl ov29_022F0B8C + bl GetLeaderAction mov r1, #0x2e bl SetMonsterActionFields bl GetLeader @@ -7011,7 +7011,7 @@ _023889CC: .word 0x000008C5 _023889D0: .word 0x000008C6 _023889D4: .word 0x0000025A _023889D8: .word 0x02353538 - arm_func_end ov31_0238878C + arm_func_end RestMenu arm_func_start ov31_023889DC ov31_023889DC: ; 0x023889DC @@ -7165,8 +7165,8 @@ _02388BFC: .word 0x020A1870 _02388C00: .word 0x000003E7 arm_func_end ov31_023889DC - arm_func_start ov31_02388C04 -ov31_02388C04: ; 0x02388C04 + arm_func_start RecruitmentSearchMenuLoop +RecruitmentSearchMenuLoop: ; 0x02388C04 stmdb sp!, {r3, lr} sub sp, sp, #0xa0 ldr r0, _02388D30 ; =0x0238A288 @@ -7259,7 +7259,7 @@ _02388D44: .word 0x00000B46 _02388D48: .word 0x0238A134 _02388D4C: .word 0x00001813 _02388D50: .word ov31_02388D54 - arm_func_end ov31_02388C04 + arm_func_end RecruitmentSearchMenuLoop arm_func_start ov31_02388D54 ov31_02388D54: ; 0x02388D54 @@ -7346,7 +7346,7 @@ ov31_02388E60: ; 0x02388E60 bic r2, r2, #3 ldr r1, [sp, #0xc] add r2, r2, #4 - bl Vsprintf + bl vsprintf ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr @@ -7436,7 +7436,7 @@ _02388F94: mov r4, #0 beq _023890B4 mov r0, r8 - bl ov29_0230DB14 + bl SpecificRecruitCheck cmp r0, #0 beq _023890B4 mov r0, r8 @@ -7607,8 +7607,8 @@ ov31_023891A8: ; 0x023891A8 _023891F8: .word 0x0238A1A0 arm_func_end ov31_023891A8 - arm_func_start ov31_023891FC -ov31_023891FC: ; 0x023891FC + arm_func_start HelpMenuLoop +HelpMenuLoop: ; 0x023891FC stmdb sp!, {r4, lr} sub sp, sp, #0xa0 ldr r0, _023893FC ; =0x0238A28C @@ -7758,7 +7758,7 @@ _0238940C: .word 0x0238A1A0 _02389410: .word 0x0238A180 _02389414: .word 0x00009833 _02389418: .word ov31_023891A8 - arm_func_end ov31_023891FC + arm_func_end HelpMenuLoop arm_func_start ov31_0238941C ov31_0238941C: ; 0x0238941C @@ -7850,7 +7850,7 @@ ov31_0238948: ; 0x0238948C ldr r1, [r5, #0x524] add r0, r5, #0x78 ldr r1, [r1, #0xb4] - bl ov29_02300164 + bl GetMonsterName add r0, r5, #0x78 str r0, [sp, #0xe4] _02389560: @@ -7891,14 +7891,14 @@ _02389578: bl ov29_022EBA70 mov r0, #0x2f mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption mov r0, #0xc mov r1, #0 - bl ov29_022EB81C + bl AddDungeonSubMenuOption cmp r4, #0 beq _02389610 mov r0, #0x2f - bl ov29_022EB8F4 + bl DisableDungeonSubMenuOption _02389610: add r1, r5, #0x6c add r0, r5, #4 @@ -8234,7 +8234,7 @@ ov31_02389A78: ; 0x02389A78 mov sl, r0 ldrb r0, [r4, #7] strb r0, [sl, #0x528] - bl ov29_022E9618 + bl GetLeaderMonster ldrb r1, [r0, #0xa] add r0, sp, #0x14 bl sub_02058C4C @@ -8242,7 +8242,7 @@ ov31_02389A78: ; 0x02389A78 cmp r0, #0 beq _02389B64 mov r6, #0 - bl ov29_022E9618 + bl GetLeaderMonster ldrb r1, [r0, #0xa] add r0, sp, #8 bl sub_02058C4C diff --git a/asm/overlay_34.s b/asm/overlay_34.s index b733458c..80dfea54 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -724,7 +724,7 @@ ov34_022DCB64: ; 0x022DCB64 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #0 beq _022DCB8C @@ -742,7 +742,7 @@ ov34_022DCB98: ; 0x022DCB98 stmdb sp!, {r4, lr} mov r4, r0 mov r0, #1 - bl GetDebugFlag1 + bl GetDebugFlag cmp r0, #0 mov r0, #1 beq _022DCBC0 diff --git a/include/overlay_29_0232800C.h b/include/overlay_29_0232800C.h index d8afae92..0ce4bec6 100644 --- a/include/overlay_29_0232800C.h +++ b/include/overlay_29_0232800C.h @@ -3,6 +3,6 @@ #include "dungeon_mode.h" -u8 EntityIsValid__0232800C(struct entity *entity); +u8 EntityIsValidMoveEffects__0232800C(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232800C_H diff --git a/include/overlay_29_0232A3D8.h b/include/overlay_29_0232A3D8.h index 90414755..46aec519 100644 --- a/include/overlay_29_0232A3D8.h +++ b/include/overlay_29_0232A3D8.h @@ -3,6 +3,6 @@ #include "dungeon_mode.h" -u8 EntityIsValid__0232A3D8(struct entity *entity); +u8 EntityIsValidMoveEffects__0232A3D8(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232A3D8_H diff --git a/include/overlay_29_0232C500.h b/include/overlay_29_0232C500.h index 4591ddd4..9ebcc0e2 100644 --- a/include/overlay_29_0232C500.h +++ b/include/overlay_29_0232C500.h @@ -3,6 +3,6 @@ #include "dungeon_mode.h" -u8 EntityIsValid__0232C500(struct entity *entity); +u8 EntityIsValidMoveEffects__0232C500(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232C500_H diff --git a/include/overlay_29_0232E250.h b/include/overlay_29_0232E250.h index 5444c3c6..939c229d 100644 --- a/include/overlay_29_0232E250.h +++ b/include/overlay_29_0232E250.h @@ -3,6 +3,6 @@ #include "dungeon_mode.h" -u8 EntityIsValid__0232E250(struct entity *entity); +u8 EntityIsValidMoveEffects__0232E250(struct entity *entity); #endif //PMDSKY_OVERLAY_29_0232E250_H diff --git a/src/overlay_29_0232800C.c b/src/overlay_29_0232800C.c index af284b97..a5d4c651 100644 --- a/src/overlay_29_0232800C.c +++ b/src/overlay_29_0232800C.c @@ -1,6 +1,6 @@ #include "overlay_29_0232800C.h" -u8 EntityIsValid__0232800C(struct entity *entity) +u8 EntityIsValidMoveEffects__0232800C(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232A3D8.c b/src/overlay_29_0232A3D8.c index 5ff8cab3..d533086e 100644 --- a/src/overlay_29_0232A3D8.c +++ b/src/overlay_29_0232A3D8.c @@ -1,6 +1,6 @@ #include "overlay_29_0232A3D8.h" -u8 EntityIsValid__0232A3D8(struct entity *entity) +u8 EntityIsValidMoveEffects__0232A3D8(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232C500.c b/src/overlay_29_0232C500.c index 1b8133de..7807d824 100644 --- a/src/overlay_29_0232C500.c +++ b/src/overlay_29_0232C500.c @@ -1,6 +1,6 @@ #include "overlay_29_0232C500.h" -u8 EntityIsValid__0232C500(struct entity *entity) +u8 EntityIsValidMoveEffects__0232C500(struct entity *entity) { if (entity == NULL) { diff --git a/src/overlay_29_0232E250.c b/src/overlay_29_0232E250.c index 57757102..37c6daa5 100644 --- a/src/overlay_29_0232E250.c +++ b/src/overlay_29_0232E250.c @@ -1,6 +1,6 @@ #include "overlay_29_0232E250.h" -u8 EntityIsValid__0232E250(struct entity *entity) +u8 EntityIsValidMoveEffects__0232E250(struct entity *entity) { if (entity == NULL) {