From e18732f7edb3e2ca69a574f2311ebe896b567338 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Nov 2024 22:41:00 -0500 Subject: [PATCH] Fixed rebase --- asm/include/main_0207F894.inc | 169 ++++++---------------------------- 1 file changed, 30 insertions(+), 139 deletions(-) diff --git a/asm/include/main_0207F894.inc b/asm/include/main_0207F894.inc index c3a9edfe..b76e7a8f 100644 --- a/asm/include/main_0207F894.inc +++ b/asm/include/main_0207F894.inc @@ -1,4 +1,22 @@ #pragma once +.public ArrayCopy32 +.public ArrayFill32 +.public ArrayFill32Fast +.public EnableIrqFlag +.public FileInit +.public GetIrqFlag +.public MIi_UncompressBackward +.public MemcpyFast +.public MemsetFast +.public OS_GetLockID +.public OSi_ReferSymbol +.public SVC_CpuSet +.public SVC_WaitByLoop +.public SetIrqFlag +.public StartThread +.public ThreadExit +.public WaitForInterrupt +.public WaitForever2 .public _02000BC4 .public _020AEC5C .public _020AECB0 @@ -65,124 +83,15 @@ .public _022BC698 .public _022BCA70 .public _022BCA74 -.public ACTOR_LIST -.public ARM9_UNKNOWN_DATA__NA_209EAAC -.public ArrayCopy32 -.public ArrayFill32 -.public ArrayFill32Fast -.public BaseFormsEqual -.public DseTrackEvent_Dummy1Byte -.public DseTrackEvent_Dummy2Bytes -.public DseTrackEvent_Dummy2Bytes2 -.public DseTrackEvent_EndTrack -.public DseTrackEvent_ForceLfoEnvelopeLevel -.public DseTrackEvent_Invalid -.public DseTrackEvent_MainLoopBegin -.public DseTrackEvent_OctaveDelta -.public DseTrackEvent_PanDelta -.public DseTrackEvent_PanFade -.public DseTrackEvent_RestoreEnvelopeDefaults -.public DseTrackEvent_SetBank -.public DseTrackEvent_SetBankLsb -.public DseTrackEvent_SetBankMsb -.public DseTrackEvent_SetBpm -.public DseTrackEvent_SetBpm2 -.public DseTrackEvent_SetEnvelopeAttackBegin -.public DseTrackEvent_SetEnvelopeAttackTime -.public DseTrackEvent_SetEnvelopeDecayTimeAndSustainLevel -.public DseTrackEvent_SetEnvelopeHoldTime -.public DseTrackEvent_SetEnvelopeReleaseTime -.public DseTrackEvent_SetEnvelopeSustainTime -.public DseTrackEvent_SetExpression -.public DseTrackEvent_SetFlagBit1Unknown -.public DseTrackEvent_SetHoldNotes -.public DseTrackEvent_SetInstrument -.public DseTrackEvent_SetKeyBend -.public DseTrackEvent_SetKeyBendRange -.public DseTrackEvent_SetLfoParameter -.public DseTrackEvent_SetNoteDurationMultiplier -.public DseTrackEvent_SetNoteRandomRegion -.public DseTrackEvent_SetOctave -.public DseTrackEvent_SetOptionalVolume -.public DseTrackEvent_SetPan -.public DseTrackEvent_SetTuning -.public DseTrackEvent_SetTuningJitterAmplitude -.public DseTrackEvent_SetUnknown2 -.public DseTrackEvent_SetupKeyBendLfo -.public DseTrackEvent_SetupKeyBendLfoEnvelope -.public DseTrackEvent_SetupLfo -.public DseTrackEvent_SetupLfoEnvelope -.public DseTrackEvent_SetupPanLfo -.public DseTrackEvent_SetupPanLfoEnvelope -.public DseTrackEvent_SetupVolumeLfo -.public DseTrackEvent_SetupVolumeLfoEnvelope -.public DseTrackEvent_SetVolume -.public DseTrackEvent_Signal -.public DseTrackEvent_SongVolumeFade -.public DseTrackEvent_SubLoopBegin -.public DseTrackEvent_SubLoopBreakOnLastIteration -.public DseTrackEvent_SubLoopEnd -.public DseTrackEvent_TuningDeltaCoarse -.public DseTrackEvent_TuningDeltaFine -.public DseTrackEvent_TuningDeltaFull -.public DseTrackEvent_TuningFade -.public DseTrackEvent_UseKeyBendLfo -.public DseTrackEvent_UseLfo -.public DseTrackEvent_UsePanLfo -.public DseTrackEvent_UseVolumeLfo -.public DseTrackEvent_VolumeDelta -.public DseTrackEvent_VolumeFade -.public DseTrackEvent_Wait16 -.public DseTrackEvent_Wait24 -.public DseTrackEvent_Wait8 -.public DseTrackEvent_WaitDelta -.public DseTrackEvent_WaitSame -.public DseTrackEvent_WaitUntilFadeout -.public EnableIrqFlag -.public FileInit -.public GetIrqFlag -.public GetKeyM2N -.public GetKeyM2NBaseForm -.public GetKeyN2M -.public GetKeyN2MBaseForm -.public IsAOrBPressed -.public LEVEL_LIST -.public MemcpyFast -.public MemsetFast -.public MIi_UncompressBackward -.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_1 -.public MISSION_FLOOR_RANKS_AND_ITEM_LISTS_2 -.public OS_GetLockID -.public OSi_ReferSymbol -.public RANK_STRINGS_1 -.public RANK_STRINGS_2 -.public RANK_STRINGS_3 -.public REMOTE_STRINGS -.public Render3d64Nothing -.public Render3d64Quadrilateral -.public Render3d64Rectangle -.public Render3d64RectangleMulticolor -.public Render3d64Texture -.public Render3d64Texture0x7 -.public Render3d64Tiling -.public Render3d64WindowFrame -.public SetIrqFlag -.public SoundLfoWave_FullNoiseFunc -.public SoundLfoWave_FullSquareFunc -.public SoundLfoWave_FullTriangleFunc -.public SoundLfoWave_HalfNoiseFunc -.public SoundLfoWave_HalfSquareFunc -.public SoundLfoWave_HalfTriangleFunc -.public SoundLfoWave_InvalidFunc -.public SoundLfoWave_ReverseSawFunc -.public SoundLfoWave_SawFunc -.public StartThread -.public STRING_BALANCE_M_LEVEL_BIN -.public STRING_DUNGEON_DUNGEON_BIN -.public STRING_EFFECT_EFFECT_BIN -.public STRING_MONSTER_M_ATTACK_BIN -.public STRING_MONSTER_M_GROUND_BIN -.public STRING_MONSTER_MONSTER_BIN +.public _deq +.public _dls +.public _f2d +.public _ll_udiv +.public _u32_div_f +.public _ull_mod +.public strchr +.public strlen +.public strncpy .public sub_01FF8000 .public sub_02078A98 .public sub_02078C3C @@ -231,24 +140,6 @@ .public sub_0207F654 .public sub_0207F70C .public sub_0207F818 -.public SVC_CpuSet -.public SVC_WaitByLoop -.public ThreadExit -.public UNOWN_SPECIES_ADDITIONAL_CHARS -.public UpdateAdvancedMenu -.public UpdateAdvancedTextBox -.public UpdateAlertBox -.public UpdateAreaNameBox -.public UpdateCollectionMenu -.public UpdateControlsChart -.public UpdateDebugMenu -.public UpdateDialogueBox -.public UpdateOptionsMenu -.public UpdateParentMenu -.public UpdatePortraitBox -.public UpdateScrollBox -.public UpdateSimpleMenu -.public UpdateTeamSelectionMenu -.public UpdateTextBox -.public WaitForever2 -.public WaitForInterrupt +.public sub_0208B374 +.public sub_0208C5B4 +.public sub_0208D638