diff --git a/asm/include/main_02000C6C.inc b/asm/include/main_02000C6C.inc index d93370ea..71a05236 100644 --- a/asm/include/main_02000C6C.inc +++ b/asm/include/main_02000C6C.inc @@ -187,11 +187,15 @@ .public DecompressAtFromMemoryPointer .public FatalError .public FileInit +.public GetOverlayInfo .public InitDebug +.public InitOverlay .public LOADED_OVERLAY_GROUP_0 +.public LoadOverlayInternal .public MainLoop .public MEMORY_ALLOCATION_ARENA_GETTERS .public NATURAL_LOG_VALUE_TABLE +.public OS_IRQTable .public PRNG_SEQUENCE_NUM .public sprintf .public sqrtf @@ -310,9 +314,6 @@ .public sub_0207F70C .public sub_0207F818 .public sub_0207F828 -.public sub_0207FC9C -.public sub_0207FD98 -.public sub_0207FEBC .public sub_020800B0 .public sub_020811EC .public sub_02081264 @@ -335,4 +336,3 @@ .public sub_02085180 .public vsprintf .public WaitForInterrupt -.public OS_IRQTable diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index ed3017fa..40a6beb8 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -21,8 +21,8 @@ .public IsNormalMenuActive .public MemAlloc .public MemFree -.public ov11_022E6E68 .public ov11_022DC504 +.public ov11_022E6E68 .public ov11_0238A08C .public PrintIqSkillsMenu .public SetPortraitEmotion @@ -81,7 +81,6 @@ .public sub_020564B0 .public sub_02056554 .public sub_020566C4 -.public sub_02056754 .public sub_02056F60 .public sub_02057180 .public sub_020572EC @@ -89,3 +88,4 @@ .public sub_02058138 .public sub_0205B028 .public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 47e5d02e..ecc26f48 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -1,6 +1,5 @@ #pragma once .public __divsi3 -.public BAG_ITEMS_PTR_MIRROR .public _020AFC4C .public abs .public AddHeldItemToBag @@ -9,6 +8,7 @@ .public AddMoneyCarried .public AdvanceFrame .public AnimationDelayOrSomething +.public BAG_ITEMS_PTR_MIRROR .public CanMonsterMoveInDirection .public CanSeeTarget .public CeilFixedPoint @@ -24,7 +24,6 @@ .public GetDirectionTowardsPosition .public GetEntityMoveTargetAndRange .public GetEquippedThrowableItem -.public GetMoneyCarried .public GetHero .public GetItemCategoryVeneer .public GetItemIndex @@ -32,6 +31,7 @@ .public GetItemToUse .public GetLeader .public GetLeaderMonster +.public GetMoneyCarried .public GetMonsterGenderVeneer .public GetPressedButtons .public GetSleepAnimationId @@ -168,7 +168,9 @@ .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public RemoveGroundItem +.public RemoveHolderForItemInBag .public SetActionUseMovePlayer +.public SetHolderForItemInBag .public SetLeaderActionFields .public SetMonsterActionFields .public ShouldMonsterRunAway @@ -176,8 +178,6 @@ .public SpawnItem .public sub_02001AB0 .public sub_02006B70 -.public RemoveHolderForItemInBag -.public SetHolderForItemInBag .public sub_02017C80 .public sub_02017CCC .public sub_0201B9F8 @@ -194,8 +194,8 @@ .public sub_0204AF10 .public sub_0204AF20 .public sub_0204AF78 -.public sub_02056754 .public SubstitutePlaceholderStringTags +.public TryAddMonsterToActiveTeam .public TryLeaderItemPickUp .public TryPointCameraToMonster .public TryTriggerMonsterHouse diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index 4c654bfa..2402ceec 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -4423,7 +4423,7 @@ _02004270: ldr r2, _020047D8 ; =0x00000000 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4433,7 +4433,7 @@ _02004294: ldr r2, _020047DC ; =0x0000000A add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4443,7 +4443,7 @@ _020042B8: ldr r2, _020047E0 ; =0x00000023 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4453,7 +4453,7 @@ _020042DC: ldr r2, _020047E4 ; =0x00000001 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4463,7 +4463,7 @@ _02004300: ldr r2, _020047E8 ; =0x00000002 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4473,7 +4473,7 @@ _02004324: ldr r2, _020047EC ; =0x00000003 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4483,7 +4483,7 @@ _02004348: ldr r2, _020047F0 ; =0x00000006 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4493,7 +4493,7 @@ _0200436C: ldr r2, _020047F4 ; =0x00000004 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4503,7 +4503,7 @@ _02004390: ldr r2, _020047F8 ; =0x00000005 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4513,7 +4513,7 @@ _020043B4: ldr r2, _020047FC ; =0x00000007 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4523,7 +4523,7 @@ _020043D8: ldr r2, _02004800 ; =0x00000008 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4533,7 +4533,7 @@ _020043FC: ldr r2, _02004804 ; =0x00000009 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4543,7 +4543,7 @@ _02004420: ldr r2, _02004808 ; =0x0000000B add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4553,7 +4553,7 @@ _02004444: ldr r2, _0200480C ; =0x0000001D add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4563,7 +4563,7 @@ _02004468: ldr r2, _02004810 ; =0x00000022 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4573,7 +4573,7 @@ _0200448C: ldr r2, _02004814 ; =0x0000000C add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4583,7 +4583,7 @@ _020044B0: ldr r2, _02004818 ; =0x0000000D add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4593,7 +4593,7 @@ _020044D4: ldr r2, _0200481C ; =0x0000000E add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4603,7 +4603,7 @@ _020044F8: ldr r2, _02004820 ; =0x0000000F add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4613,7 +4613,7 @@ _0200451C: ldr r2, _02004824 ; =0x00000010 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4623,7 +4623,7 @@ _02004540: ldr r2, _02004828 ; =0x00000011 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4633,7 +4633,7 @@ _02004564: ldr r2, _0200482C ; =0x00000012 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4643,7 +4643,7 @@ _02004588: ldr r2, _02004830 ; =0x00000013 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4653,7 +4653,7 @@ _020045AC: ldr r2, _02004834 ; =0x00000014 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4663,7 +4663,7 @@ _020045D0: ldr r2, _02004838 ; =0x00000015 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4673,7 +4673,7 @@ _020045F4: ldr r2, _0200483C ; =0x00000016 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4683,7 +4683,7 @@ _02004618: ldr r2, _02004840 ; =0x00000017 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4693,7 +4693,7 @@ _0200463C: ldr r2, _02004844 ; =0x00000018 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4703,7 +4703,7 @@ _02004660: ldr r2, _02004848 ; =0x00000019 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4713,7 +4713,7 @@ _02004684: ldr r2, _0200484C ; =0x0000001A add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4723,7 +4723,7 @@ _020046A8: ldr r2, _02004850 ; =0x0000001B add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4733,7 +4733,7 @@ _020046CC: ldr r2, _02004854 ; =0x0000001C add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4743,7 +4743,7 @@ _020046F0: ldr r2, _02004858 ; =0x0000001E add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4753,7 +4753,7 @@ _02004714: ldr r2, _0200485C ; =0x0000001F add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4763,7 +4763,7 @@ _02004738: ldr r2, _02004860 ; =0x00000020 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4773,7 +4773,7 @@ _0200475C: ldr r2, _02004864 ; =0x00000021 add r0, sp, #0x10 mov r1, #0 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 bne _020047A0 mov r0, #1 @@ -4790,14 +4790,14 @@ _02004780: bl FatalError _020047A0: add r0, sp, #0x10 - bl sub_0207FD98 + bl LoadOverlayInternal cmp r0, #0 bne _020047B8 mov r0, #1 bl CardPullOutWithStatus _020047B8: add r0, sp, #0x10 - bl sub_0207FEBC + bl InitOverlay bl DataTransferStop _020047C4: add sp, sp, #0x3c diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 2521a75a..010c2671 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -90215,7 +90215,7 @@ _02055C7C: cmpne r7, #2 mov r0, r7 bne _02055CAC - bl sub_02056754 + bl TryAddMonsterToActiveTeam b _02055CB0 _02055CAC: bl sub_02056554 @@ -91106,8 +91106,8 @@ _02056748: _02056750: .word TEAM_MEMBER_TABLE_PTR arm_func_end sub_020566C4 - arm_func_start sub_02056754 -sub_02056754: ; 0x02056754 + arm_func_start TryAddMonsterToActiveTeam +TryAddMonsterToActiveTeam: ; 0x02056754 stmdb sp!, {r4, lr} mvn r1, #0 cmp r0, r1 @@ -91171,7 +91171,7 @@ _02056824: ldmia sp!, {r4, pc} .align 2, 0 _0205682C: .word TEAM_MEMBER_TABLE_PTR - arm_func_end sub_02056754 + arm_func_end TryAddMonsterToActiveTeam arm_func_start sub_02056830 sub_02056830: ; 0x02056830 @@ -91274,8 +91274,8 @@ sub_02056914: ; 0x02056914 _0205695C: .word TEAM_MEMBER_TABLE_PTR arm_func_end sub_02056914 - arm_func_start sub_02056960 -sub_02056960: ; 0x02056960 + arm_func_start RemoveActiveMembersFromMainTeam +RemoveActiveMembersFromMainTeam: ; 0x02056960 stmdb sp!, {r3, r4, r5, lr} mov r0, #0 ldr r2, _020569C8 ; =TEAM_MEMBER_TABLE_PTR @@ -91305,7 +91305,7 @@ _02056978: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _020569C8: .word TEAM_MEMBER_TABLE_PTR - arm_func_end sub_02056960 + arm_func_end RemoveActiveMembersFromMainTeam arm_func_start SetTeamSetupHeroAndPartnerOnly SetTeamSetupHeroAndPartnerOnly: ; 0x020569CC @@ -91344,12 +91344,12 @@ _02056A40: cmp sl, #4 add sb, sb, #0x68 blt _02056A08 - bl sub_02056960 + bl RemoveActiveMembersFromMainTeam mvn r0, #0 cmp r5, r0 beq _02056A68 mov r0, r5 - bl sub_02056754 + bl TryAddMonsterToActiveTeam _02056A68: mvn r0, #0 cmp r6, r0 @@ -91406,12 +91406,12 @@ _02056B10: cmp sl, #4 add sb, sb, #0x68 blt _02056AE0 - bl sub_02056960 + bl RemoveActiveMembersFromMainTeam mvn r0, #0 cmp r7, r0 beq _02056B38 mov r0, r7 - bl sub_02056754 + bl TryAddMonsterToActiveTeam _02056B38: ldr r0, _02056B54 ; =TEAM_MEMBER_TABLE_PTR ldr r0, [r0] @@ -91470,9 +91470,9 @@ sub_02056BD4: ; 0x02056BD4 ldrb r0, [r0, #0x877] cmp r0, #2 ldmneia sp!, {r3, pc} - bl sub_02056960 + bl RemoveActiveMembersFromMainTeam bl GetHeroMemberIdx - bl sub_02056754 + bl TryAddMonsterToActiveTeam bl GetPartnerMemberIdx bl sub_02056554 ldr r0, _02056C1C ; =TEAM_MEMBER_TABLE_PTR @@ -92604,7 +92604,7 @@ _02057B10: moveq r0, #0 and r7, r0, #0xff bl sub_02057C40 - bl sub_02056960 + bl RemoveActiveMembersFromMainTeam mov sb, #0 ldr r0, _02057C3C ; =TEAM_MEMBER_TABLE_PTR mov r6, #1 @@ -92639,7 +92639,7 @@ _02057B50: tst r0, #0xff ldrsh r0, [r8, #8] beq _02057BB8 - bl sub_02056754 + bl TryAddMonsterToActiveTeam b _02057BBC _02057BB8: bl sub_02056554 @@ -142204,8 +142204,8 @@ _0207FC3C: ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} arm_func_end sub_0207FBA4 - arm_func_start sub_0207FC9C -sub_0207FC9C: ; 0x0207FC9C + arm_func_start GetOverlayInfo +GetOverlayInfo: ; 0x0207FC9C stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x60 movs r4, r1 @@ -142271,10 +142271,10 @@ _0207FD88: .word _022BB604 _0207FD8C: .word _022BB60C _0207FD90: .word 0x027FFE50 _0207FD94: .word _022BB614 - arm_func_end sub_0207FC9C + arm_func_end GetOverlayInfo - arm_func_start sub_0207FD98 -sub_0207FD98: ; 0x0207FD98 + arm_func_start LoadOverlayInternal +LoadOverlayInternal: ; 0x0207FD98 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x50 mov r5, r0 @@ -142312,7 +142312,7 @@ _0207FE18: mov r0, #1 add sp, sp, #0x50 ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0207FD98 + arm_func_end LoadOverlayInternal arm_func_start sub_0207FE28 sub_0207FE28: ; 0x0207FE28 @@ -142358,8 +142358,8 @@ _0207FEA4: _0207FEB8: .word _020B2BB8 arm_func_end sub_0207FE28 - arm_func_start sub_0207FEBC -sub_0207FEBC: ; 0x0207FEBC + arm_func_start InitOverlay +InitOverlay: ; 0x0207FEBC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl sub_0207FB24 @@ -142427,7 +142427,7 @@ _0207FFA0: .word 0x027FFC40 _0207FFA4: .word _020B3364 _0207FFA8: .word _020B3364 _0207FFAC: .word 0x66666667 - arm_func_end sub_0207FEBC + arm_func_end InitOverlay arm_func_start sub_0207FFB0 sub_0207FFB0: ; 0x0207FFB0 @@ -142520,7 +142520,7 @@ sub_020800B0: ; 0x020800B0 mov r2, r1 add r0, sp, #0 mov r1, r3 - bl sub_0207FC9C + bl GetOverlayInfo cmp r0, #0 beq _020800E4 add r0, sp, #0 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 0f190226..2f7041b7 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -685,7 +685,7 @@ ov11_022DCAB0: ; 0x022DCAB0 mov r5, r0 mov r0, r4 mov r1, r2 - bl ov11_022E7FB8 + bl GetCoroutineInfo mov r0, #1 strh r0, [r4, #0x18] cmp r5, #0 @@ -1180,8 +1180,8 @@ _022DD128: bx lr arm_func_end ov11_022DD0EC - arm_func_start ov11_022DD130 -ov11_022DD130: ; 0x022DD130 + arm_func_start UnlockScriptingLock +UnlockScriptingLock: ; 0x022DD130 stmdb sp!, {r3, lr} ldr ip, _022DD158 ; =ov11_02324EB4 mov lr, #1 @@ -1196,10 +1196,10 @@ ov11_022DD130: ; 0x022DD130 _022DD158: .word ov11_02324EB4 _022DD15C: .word ov11_02324E80 _022DD160: .word ov11_02324F1C - arm_func_end ov11_022DD130 + arm_func_end UnlockScriptingLock - arm_func_start FuncThatCallsCommandParsing -FuncThatCallsCommandParsing: ; 0x022DD164 + arm_func_start FuncThatCallsRunNextOpcode +FuncThatCallsRunNextOpcode: ; 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 ScriptCommandParsing + bl RunNextOpcode 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 FuncThatCallsCommandParsing + arm_func_end FuncThatCallsRunNextOpcode arm_func_start ov11_022DD2C0 ov11_022DD2C0: ; 0x022DD2C0 @@ -1408,7 +1408,7 @@ _022DD414: b _022DDD00 _022DD424: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam add r1, sp, #8 bl ov11_022E68E4 cmp r0, #0 @@ -1426,13 +1426,13 @@ _022DD424: b _022DDD00 _022DD468: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 str r5, [sp] mov r0, #2 @@ -1476,7 +1476,7 @@ _022DD50C: b _022DDD00 _022DD524: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F25A4 @@ -1485,7 +1485,7 @@ _022DD524: b _022DDD00 _022DD544: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mvn r1, #0 cmp r1, r0, asr #16 @@ -1610,16 +1610,16 @@ _022DD6D0: b _022DDD00 _022DD700: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #8] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022DDD18 ; =ov11_02324E80 mov r6, r0 strh r7, [r1, #6] @@ -1714,7 +1714,7 @@ _022DD860: _022DD880: ldrh r0, [r6, #2] add r8, r6, #2 - bl ov11_022E48AC + bl ProcessScriptParam ldrsh r1, [r4, #0x44] add r6, r6, #6 cmp r0, r1 @@ -1809,7 +1809,7 @@ _022DD990: cmp r7, #0xab addeq r6, r6, #2 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam ldrh r0, [r6, #4] ldr r2, [r4, #0x14] ldr r1, _022DDD54 ; =ov11_023193BC @@ -1827,7 +1827,7 @@ _022DDA04: mov r2, #0 mov r0, #1 str r2, [r1] - bl ov11_022DD130 + bl UnlockScriptingLock mov r0, #2 strh r0, [r4, #0xe] b _022DDD00 @@ -1965,7 +1965,7 @@ _022DDBE8: cmp r0, #1 bne _022DDC18 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam bl ov11_022E9558 mov r0, r4 mov r1, #0 @@ -1990,7 +1990,7 @@ _022DDC18: b _022DDD00 _022DDC4C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam bl ov11_022E958C mov r0, r4 mov r1, #1 @@ -1999,10 +1999,10 @@ _022DDC4C: b _022DDD00 _022DDC6C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0 ldr r1, _022DDD5C ; =ov11_023193D4 add r0, sp, #0x20 @@ -2067,8 +2067,8 @@ _022DDD5C: .word ov11_023193D4 _022DDD60: .word 0x0000030F arm_func_end ov11_022DD2C0 - arm_func_start ScriptCommandParsing -ScriptCommandParsing: ; 0x022DDD64 + arm_func_start RunNextOpcode +RunNextOpcode: ; 0x022DDD64 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c8 mov r4, r0 @@ -2087,7 +2087,7 @@ ScriptCommandParsing: ; 0x022DDD64 addge r0, r1, r0, lsl #1 bge _022DDDCC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r2, [r4, #0x38] add r1, r0, #2 add r2, r2, #2 @@ -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 ScriptCommandParsing + arm_func_end RunNextOpcode arm_func_start ov11_022DE3AC ov11_022DE3AC: ; 0x022DE3AC @@ -2487,7 +2487,7 @@ ov11_022DE3AC: ; 0x022DE3AC addge r0, r2, r0, lsl #1 bge _022DE3E4 ldrh r0, [r2, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4, #0x1c] add r0, r0, #2 add r0, r1, r0, lsl #1 @@ -2500,7 +2500,7 @@ _022DE3E4: arm_func_start ov11_022DE3F0 ov11_022DE3F0: ; 0x022DE3F0 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldr r1, _022DED10 ; =ov11_023193EC mov r2, r5 @@ -2534,11 +2534,11 @@ ov11_022DE448: ; 0x022DE448 arm_func_start ov11_022DE458 ov11_022DE458: ; 0x022DE458 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldrh r0, [r6, #2] mov r4, r1, asr #0x10 - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0 mov r0, r4 mov r1, #0 @@ -2549,14 +2549,14 @@ ov11_022DE458: ; 0x022DE458 arm_func_start ov11_022DE484 ov11_022DE484: ; 0x022DE484 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldrh r0, [r6, #2] mov r5, r1, asr #0x10 - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0 mov r0, r5 mov r2, r4 @@ -2567,7 +2567,7 @@ ov11_022DE484: ; 0x022DE484 arm_func_start ov11_022DE4BC ov11_022DE4BC: ; 0x022DE4BC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 mov r2, r4 @@ -2585,7 +2585,7 @@ ov11_022DE4BC: ; 0x022DE4BC b _022E2474 _022DE500: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 strh r0, [r1, #8] ldrsh r2, [r1, #8] @@ -2634,7 +2634,7 @@ _022DE554: b _022E2478 _022DE5BC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x18 mov r0, r0, asr #0x18 bl ov11_022E7E84 @@ -2642,7 +2642,7 @@ _022DE5BC: b _022E2478 _022DE5D8: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 strh r0, [r1, #2] ldrsh r2, [r1, #2] @@ -2674,7 +2674,7 @@ _022DE62C: b _022E2478 _022DE650: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 bl ov11_022F1710 ldr r1, _022DED18 ; =ov11_02324E80 @@ -2702,7 +2702,7 @@ _022DE6AC: b _022E2478 _022DE6B4: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0 mov r0, #1 bl ov11_022E7F28 @@ -2715,10 +2715,10 @@ _022DE6D0: str r1, [sp, #0x154] str r0, [sp, #0x150] ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam str r0, [sp, #0x150] ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam str r0, [sp, #0x154] cmp r5, #0x13 bgt _022DE728 @@ -2753,7 +2753,7 @@ _022DE758: b _022E2474 _022DE764: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 and r0, r4, #0xff bl ov11_022F1DA8 @@ -2774,23 +2774,23 @@ _022DE794: b _022E2474 _022DE7B0: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0 mov r0, #2 bl ov11_022E7F28 b _022E2474 _022DE7C8: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam and r0, r0, #0xff bl ov11_022F26DC b _022E2474 _022DE7DC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0 mov r1, r1, lsr #0x10 @@ -2799,10 +2799,10 @@ _022DE7DC: b _022E2474 _022DE808: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0 mov r1, r1, lsr #0x10 @@ -2814,7 +2814,7 @@ _022DE808: arm_func_start ov11_022DE834 ov11_022DE834: ; 0x022DE834 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, r0, asr #24 @@ -2892,7 +2892,7 @@ _022DE928: arm_func_start ov11_022DE934 ov11_022DE934: ; 0x022DE934 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r1, #0 @@ -2937,7 +2937,7 @@ ov11_022DE9B0: ; 0x022DE9B0 arm_func_start ov11_022DE9B8 ov11_022DE9B8: ; 0x022DE9B8 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mvn r1, #0 cmp r1, r0, asr #16 @@ -2962,11 +2962,11 @@ _022DE9E8: arm_func_start ov11_022DEA08 ov11_022DEA08: ; 0x022DEA08 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0, lsl #0x10 ldrh r0, [r6, #2] mov r6, r7, asr #0x10 - bl ov11_022E48AC + bl ProcessScriptParam mvn r1, #0 mov r0, r0, lsl #0x18 cmp r1, r7, asr #16 @@ -3014,7 +3014,7 @@ _022DEAA0: arm_func_start ov11_022DEAC4 ov11_022DEAC4: ; 0x022DEAC4 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -3022,7 +3022,7 @@ ov11_022DEAC4: ; 0x022DEAC4 bl ov11_022E4248 mov r8, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, sb, asr #16 @@ -3075,7 +3075,7 @@ _022DEB80: arm_func_start ov11_022DEBA4 ov11_022DEBA4: ; 0x022DEBA4 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -3083,7 +3083,7 @@ ov11_022DEBA4: ; 0x022DEBA4 bl ov11_022E4248 mov r8, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, sb, asr #16 @@ -3133,7 +3133,7 @@ ov11_022DEBA4: ; 0x022DEBA4 arm_func_start ov11_022DEC7C ov11_022DEC7C: ; 0x022DEC7C ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -3161,7 +3161,7 @@ ov11_022DEC7C: ; 0x022DEC7C arm_func_start ov11_022DECDC ov11_022DECDC: ; 0x022DECDC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r0, r4 @@ -3193,17 +3193,17 @@ _022DED44: .word 0x0000012D arm_func_start ov11_022DED48 ov11_022DED48: ; 0x022DED48 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 - bl ov11_022DD130 + bl UnlockScriptingLock b _022E2474 arm_func_end ov11_022DED48 arm_func_start ov11_022DED60 ov11_022DED60: ; 0x022DED60 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3214,7 +3214,7 @@ ov11_022DED60: ; 0x022DED60 arm_func_start ov11_022DED7C ov11_022DED7C: ; 0x022DED7C ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3225,10 +3225,10 @@ ov11_022DED7C: ; 0x022DED7C arm_func_start ov11_022DED98 ov11_022DED98: ; 0x022DED98 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r2, r0 add r0, r4, #0x6c @@ -3240,13 +3240,13 @@ ov11_022DED98: ; 0x022DED98 arm_func_start ov11_022DEDC4 ov11_022DEDC4: ; 0x022DEDC4 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r3, r5 @@ -3259,13 +3259,13 @@ ov11_022DEDC4: ; 0x022DEDC4 arm_func_start ov11_022DEE00 ov11_022DEE00: ; 0x022DEE00 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r3, r5 @@ -3280,13 +3280,13 @@ ov11_022DEE00: ; 0x022DEE00 arm_func_start ov11_022DEE44 ov11_022DEE44: ; 0x022DEE44 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r2, r5, lsl #0x10 @@ -3300,13 +3300,13 @@ ov11_022DEE44: ; 0x022DEE44 arm_func_start ov11_022DEE84 ov11_022DEE84: ; 0x022DEE84 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r5, lsl #0x10 mov r2, r0 mov r1, r4 @@ -3318,7 +3318,7 @@ ov11_022DEE84: ; 0x022DEE84 arm_func_start ov11_022DEEBC ov11_022DEEBC: ; 0x022DEEBC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, #0 mov r2, r1 @@ -3330,10 +3330,10 @@ ov11_022DEEBC: ; 0x022DEEBC arm_func_start ov11_022DEEDC ov11_022DEEDC: ; 0x022DEEDC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0 mov r0, r4 and r1, r1, #0xff @@ -3357,10 +3357,10 @@ ov11_022DEF04: ; 0x022DEF04 arm_func_start ov11_022DEF28 ov11_022DEF28: ; 0x022DEF28 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 mov r2, r7 add r0, r4, #0x6c @@ -3376,10 +3376,10 @@ ov11_022DEF28: ; 0x022DEF28 arm_func_start ov11_022DEF64 ov11_022DEF64: ; 0x022DEF64 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r4, lsl #0x10 mov r1, r0 mov r0, r2, asr #0x10 @@ -3390,7 +3390,7 @@ ov11_022DEF64: ; 0x022DEF64 arm_func_start ov11_022DEF8C ov11_022DEF8C: ; 0x022DEF8C ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 cmp r4, #0x3e8 blt _022DEFC0 @@ -3409,10 +3409,10 @@ _022DEFC0: b _022E2474 _022DEFD0: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r2, r0 add r0, r4, #0x6c @@ -3427,13 +3427,13 @@ _022DEFD0: b _022E2474 _022DF014: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r1, r1, asr #0x10 @@ -3448,13 +3448,13 @@ _022DF014: b _022E2474 _022DF064: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r0, r0, lsl #0x10 mov r2, r0, asr #0x10 @@ -3470,10 +3470,10 @@ _022DF064: b _022E2474 _022DF0B8: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0, lsl #0x10 mov r1, r5, lsl #0x10 add r0, r4, #0x6c @@ -3488,13 +3488,13 @@ _022DF0B8: b _022E2474 _022DF0FC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 mov r1, r1, asr #0x10 @@ -3511,13 +3511,13 @@ _022DF0FC: b _022E2474 _022DF154: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3531,13 +3531,13 @@ _022DF154: b _022E2474 _022DF1A0: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3551,13 +3551,13 @@ _022DF1A0: b _022E2474 _022DF1EC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3571,13 +3571,13 @@ _022DF1EC: b _022E2474 _022DF238: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3591,13 +3591,13 @@ _022DF238: b _022E2474 _022DF284: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3611,10 +3611,10 @@ _022DF284: b _022E2474 _022DF2D0: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 mov r0, r7 bl GetPerformanceFlagWithChecks @@ -3626,7 +3626,7 @@ _022DF2D0: b _022E2474 _022DF308: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 ldreqh r0, [r6, #2] ldreq r1, [r4, #0x14] @@ -3635,7 +3635,7 @@ _022DF308: b _022E2474 _022DF328: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 ldreqh r0, [r6, #2] ldreq r1, [r4, #0x14] @@ -3644,7 +3644,7 @@ _022DF328: b _022E2474 _022DF348: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 mov r0, #0xb bl GetDebugFlag @@ -3679,7 +3679,7 @@ _022DF388: ; jump table b _022DF424 ; case 12 _022DF3BC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3688,13 +3688,13 @@ _022DF3BC: b _022DF6FC _022DF3DC: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 add r0, r4, #0x6c @@ -3707,13 +3707,13 @@ _022DF3DC: b _022DF6FC _022DF424: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 add r0, r4, #0x6c @@ -3732,7 +3732,7 @@ _022DF424: b _022DF6FC _022DF484: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam bl RandInt mov r7, r0 b _022DF6FC @@ -3741,7 +3741,7 @@ _022DF498: b _022DF6FC _022DF4A0: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, #0 mov r2, r0 @@ -3751,7 +3751,7 @@ _022DF4A0: b _022DF6FC _022DF4C4: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r0, #0 @@ -3761,7 +3761,7 @@ _022DF4C4: b _022DF6FC _022DF4E8: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl GetDungeonMode @@ -3769,7 +3769,7 @@ _022DF4E8: b _022DF6FC _022DF504: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_02065974 @@ -3810,7 +3810,7 @@ _022DF53C: b _022DF6FC _022DF59C: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -3853,7 +3853,7 @@ _022DF638: b _022DF6FC _022DF640: ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -3932,7 +3932,7 @@ ov11_022DF728: ; 0x022DF728 arm_func_start ov11_022DF740 ov11_022DF740: ; 0x022DF740 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam orr r2, r0, #0x10000 ldr r1, _022DFE18 ; =ov11_02324ECC ldr r0, _022DFE1C ; =ov11_02324EA4 @@ -3944,13 +3944,13 @@ ov11_022DF740: ; 0x022DF740 arm_func_start ov11_022DF760 ov11_022DF760: ; 0x022DF760 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r4, r0 mov r0, r1, asr #0x10 @@ -3975,13 +3975,13 @@ ov11_022DF760: ; 0x022DF760 arm_func_start ov11_022DF7CC ov11_022DF7CC: ; 0x022DF7CC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r4, r0 ldr r2, _022DFE18 ; =ov11_02324ECC @@ -4005,13 +4005,13 @@ ov11_022DF7CC: ; 0x022DF7CC arm_func_start ov11_022DF834 ov11_022DF834: ; 0x022DF834 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r4, r0 ldr r2, _022DFE18 ; =ov11_02324ECC @@ -4035,7 +4035,7 @@ ov11_022DF834: ; 0x022DF834 arm_func_start ov11_022DF89C ov11_022DF89C: ; 0x022DF89C ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0 ldr r0, _022DFE1C ; =ov11_02324EA4 and r1, r1, #0xff @@ -4051,10 +4051,10 @@ ov11_022DF8B8: ; 0x022DF8B8 str r1, [sp, #0xd4] str r0, [sp, #0xd0] ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam str r0, [sp, #0xd0] ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam str r0, [sp, #0xd4] ldr r0, _022DFE1C ; =ov11_02324EA4 add r1, sp, #0xd0 @@ -4065,11 +4065,11 @@ ov11_022DF8B8: ; 0x022DF8B8 arm_func_start ov11_022DF8F4 ov11_022DF8F4: ; 0x022DF8F4 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 str r0, [r1, #0xc] ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r2, _022DED18 ; =ov11_02324E80 mov r1, r0 str r1, [r2, #0x10] @@ -4188,7 +4188,7 @@ ov11_022DFA50: ; 0x022DFA50 arm_func_start ov11_022DFA78 ov11_022DFA78: ; 0x022DFA78 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -4205,7 +4205,7 @@ ov11_022DFA78: ; 0x022DFA78 arm_func_start ov11_022DFAAC ov11_022DFAAC: ; 0x022DFAAC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldr r1, _022DFE28 ; =ov11_023194C0 mov r0, #2 @@ -4340,7 +4340,7 @@ _022DFC64: ov11_022DFC94: ; 0x022DFC94 ldrh r0, [r6] ldr r5, [r4, #0x1c] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 mov r1, r6, lsl #0x10 add r0, r4, #0x6c @@ -4357,7 +4357,7 @@ ov11_022DFC94: ; 0x022DFC94 b _022DFD0C _022DFCD8: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 mov r0, r7 mov r1, r6 @@ -4402,7 +4402,7 @@ ov11_022DFD44: ; 0x022DFD44 str r2, [r0, #4] bne _022DFD88 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 _022DFD88: @@ -4463,7 +4463,7 @@ _022DFE50: .word ov11_02319534 _022DFE54: .word ov11_02319554 _022DFE58: ldrh r0, [r7, #2] - bl ov11_022E48AC + bl ProcessScriptParam add sl, sp, #0x178 mov r1, r0 mov r0, sl @@ -4513,10 +4513,10 @@ _022DFED8: cmp r1, #0 ble _022DFFAC ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldr r1, _022DFE54 ; =ov11_02319554 mov r2, r5 @@ -4560,10 +4560,10 @@ _022DFFAC: arm_func_start ov11_022DFFC0 ov11_022DFFC0: ; 0x022DFFC0 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam bl ov11_022E9B0C cmp r4, #0 beq _022E2474 @@ -4574,10 +4574,10 @@ ov11_022DFFC0: ; 0x022DFFC0 arm_func_start ov11_022DFFE8 ov11_022DFFE8: ; 0x022DFFE8 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xdb bne _022E000C bl ov11_022E9B24 @@ -4594,16 +4594,16 @@ _022E0010: arm_func_start ov11_022E0020 ov11_022E0020: ; 0x022E0020 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xd7 bne _022E0078 sub r1, r8, #0x100 @@ -4634,10 +4634,10 @@ _022E0098: arm_func_start ov11_022E00A8 ov11_022E00A8: ; 0x022E00A8 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam bl ov11_022E9B84 cmp r4, #0 beq _022E2474 @@ -4648,10 +4648,10 @@ ov11_022E00A8: ; 0x022E00A8 arm_func_start ov11_022E00D0 ov11_022E00D0: ; 0x022E00D0 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xdc bne _022E00F4 bl ov11_022E9BD0 @@ -4668,16 +4668,16 @@ _022E00F8: arm_func_start ov11_022E0108 ov11_022E0108: ; 0x022E0108 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xd8 bne _022E0160 sub r1, r8, #0x100 @@ -4708,10 +4708,10 @@ _022E0180: arm_func_start ov11_022E0190 ov11_022E0190: ; 0x022E0190 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam bl ov11_022E9C98 cmp r4, #0 beq _022E2474 @@ -4722,10 +4722,10 @@ ov11_022E0190: ; 0x022E0190 arm_func_start ov11_022E01B8 ov11_022E01B8: ; 0x022E01B8 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xea bne _022E01DC bl ov11_022E9CB0 @@ -4742,16 +4742,16 @@ _022E01E0: arm_func_start ov11_022E01F0 ov11_022E01F0: ; 0x022E01F0 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam cmp r5, #0xe6 bne _022E0248 sub r1, r8, #0x100 @@ -4782,22 +4782,22 @@ _022E0268: arm_func_start ov11_022E0278 ov11_022E0278: ; 0x022E0278 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0 ldrh r0, [r6, #8] - bl ov11_022E48AC + bl ProcessScriptParam mov sl, r0 ldrh r0, [r6, #0xa] - bl ov11_022E48AC + bl ProcessScriptParam ldr r6, _022E1218 ; =ov11_02316A44 add r3, sp, #0xcc mov r2, #4 @@ -4857,7 +4857,7 @@ _022E0368: arm_func_start ov11_022E0378 ov11_022E0378: ; 0x022E0378 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 @@ -4866,10 +4866,10 @@ ov11_022E0378: ; 0x022E0378 arm_func_start ov11_022E038C ov11_022E038C: ; 0x022E038C ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam sub r0, r0, r5 bl RandInt add r0, r5, r0 @@ -4954,7 +4954,7 @@ _022E0424: arm_func_start ov11_022E0434 ov11_022E0434: ; 0x022E0434 ldrh r0, [r6] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldr r1, _022E121C ; =ov11_0231956C mov r2, r5 @@ -4963,7 +4963,7 @@ ov11_022E0434: ; 0x022E0434 mov r1, r5, lsl #0x10 add r0, sp, #0x15c mov r1, r1, asr #0x10 - bl ov11_022E7FB8 + bl GetCoroutineInfo cmp r0, #0 beq _022E0484 ldr r0, [sp, #0x160] @@ -5324,7 +5324,7 @@ _022E091C: b _022E199C _022E092C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r2, [r4] mov r1, r0 ldr r0, [r4, #4] @@ -5333,7 +5333,7 @@ _022E092C: b _022E246C _022E094C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 tst r5, #0x10 beq _022E0974 @@ -5351,7 +5351,7 @@ _022E0974: b _022E246C _022E098C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5361,7 +5361,7 @@ _022E098C: b _022E246C _022E09B0: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5371,7 +5371,7 @@ _022E09B0: b _022E246C _022E09D4: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5381,7 +5381,7 @@ _022E09D4: b _022E246C _022E09F8: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5391,7 +5391,7 @@ _022E09F8: b _022E246C _022E0A1C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5401,7 +5401,7 @@ _022E0A1C: b _022E246C _022E0A40: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5411,7 +5411,7 @@ _022E0A40: b _022E246C _022E0A64: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5429,13 +5429,13 @@ _022E0A64: b _022E246C _022E0AA8: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r6, r0 ldr r2, [r1, #0x38] @@ -5485,10 +5485,10 @@ _022E0B5C: b _022E2478 _022E0B78: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0 cmp r2, #0 ldr r1, [r4] @@ -5516,10 +5516,10 @@ _022E0BC8: b _022E246C _022E0BEC: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 cmp r5, #0 beq _022E0C2C @@ -5542,7 +5542,7 @@ _022E0C2C: b _022E246C _022E0C4C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldr r2, [r4] ldr r0, [r4, #4] @@ -5554,7 +5554,7 @@ _022E0C4C: b _022E246C _022E0C78: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldr r2, [r4] ldr r0, [r4, #4] @@ -5584,7 +5584,7 @@ _022E0CA4: b _022E246C _022E0CE8: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022E122C ; =ov11_02316A44 mov r5, r0 mov r0, r5, lsl #0x10 @@ -5635,7 +5635,7 @@ _022E0CE8: b _022E246C _022E0DB0: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -5734,10 +5734,10 @@ _022E0F14: ldr r1, [r1, #0x30] str r2, [sp, #0x50] str r1, [sp, #0x54] - bl ov11_022E48AC + bl ProcessScriptParam str r0, [sp, #0x50] ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, _022E122C ; =ov11_02316A44 str r0, [sp, #0x54] ldr r2, [r1, #0x48] @@ -5760,7 +5760,7 @@ _022E0F14: b _022E246C _022E0F8C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -5834,7 +5834,7 @@ _022E1094: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [r4, #0x46] ldrsh r2, [r4, #0x3c] mov r1, #0x100 @@ -5847,7 +5847,7 @@ _022E1094: b _022E2478 _022E10D0: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam strb r0, [r4, #0x42] ldr r2, [r4] ldrsb r1, [r4, #0x42] @@ -5857,14 +5857,14 @@ _022E10D0: b _022E246C _022E10F4: ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 movs r7, r0 bmi _022E246C ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 add r1, sp, #9 mov r0, r7 @@ -5881,7 +5881,7 @@ _022E10F4: b _022E246C _022E1150: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5910,7 +5910,7 @@ _022E1198: b _022E126C _022E11BC: ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -5960,7 +5960,7 @@ _022E126C: cmp r5, #0 beq _022E246C ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6010,7 +6010,7 @@ _022E130C: b _022E246C _022E1334: ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam strb r0, [r4, #0x69] mov r0, #0 strh r0, [r4, #0x46] @@ -6018,7 +6018,7 @@ _022E1334: b _022E2478 _022E1350: ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -6045,13 +6045,13 @@ _022E13A0: b _022E2478 _022E13B0: ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #8] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -6074,7 +6074,7 @@ _022E13B0: b _022E2478 _022E1420: ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam strb r0, [r4, #0x42] ldr r2, [r4] ldrsb r1, [r4, #0x42] @@ -6085,13 +6085,13 @@ _022E1420: bl ov11_022E48E0 str r0, [r4, #0x4c] ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 _022E1460: ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -6111,16 +6111,16 @@ _022E1460: bl ov11_022E48E0 str r0, [r4, #0x4c] ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 _022E14C4: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #8] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, r4 strh r5, [r4, #0x46] @@ -6142,13 +6142,13 @@ _022E14F8: b _022E2478 _022E1520: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam and r1, r7, #0xff mov r2, r5 mov r3, r0 @@ -6158,13 +6158,13 @@ _022E1520: b _022E2478 _022E155C: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 cmp r7, #0x49 moveq r0, #0 @@ -6374,7 +6374,7 @@ _022E1858: blx r1 mov r4, r0 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 mov r0, r5 mov r1, r7 @@ -6384,7 +6384,7 @@ _022E1858: b _022E2478 _022E18A8: ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r0 cmp r7, #0x3e moveq r0, #0 @@ -6400,7 +6400,7 @@ _022E18D4: ldr r1, [r1, #4] blx r1 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6422,7 +6422,7 @@ _022E1928: ldr r1, [r1, #4] blx r1 ldrh r0, [r6, #2] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6617,11 +6617,11 @@ _022E1BD0: b _022E2464 _022E1BE0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0, lsl #0x10 ldrh r0, [r5, #4] mov r5, r6, asr #0x10 - bl ov11_022E48AC + bl ProcessScriptParam mvn r1, #0 mov r7, r0 cmp r1, r6, asr #16 @@ -6662,11 +6662,11 @@ _022E1C5C: b _022E2464 _022E1C88: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0, lsl #0x10 ldrh r0, [r5, #4] mov r8, r7, asr #0x10 - bl ov11_022E48AC + bl ProcessScriptParam mvn r0, #0 cmp r0, r7, asr #16 bne _022E1CF8 @@ -6775,7 +6775,7 @@ _022E1E20: b _022E2478 _022E1E28: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 mov r0, r4 mov r1, #1 @@ -6786,12 +6786,12 @@ _022E1E28: b _022E2464 _022E1E50: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam bl WorldMapSetMode b _022E2464 _022E1E60: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 @@ -6802,7 +6802,7 @@ _022E1E60: b _022E2464 _022E1E88: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 @@ -6813,7 +6813,7 @@ _022E1E88: b _022E2464 _022E1EB0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x10 mov r0, r0, asr #0x10 @@ -6825,7 +6825,7 @@ _022E1EB0: b _022E2464 _022E1EDC: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x10 mov r0, r0, asr #0x10 @@ -6837,7 +6837,7 @@ _022E1EDC: b _022E2464 _022E1F08: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F1EC @@ -6848,14 +6848,14 @@ _022E1F20: b _022E2464 _022E1F2C: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl WorldMapSetCamera b _022E2464 _022E1F44: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F0EC @@ -6866,20 +6866,20 @@ _022E1F5C: b _022E2464 _022E1F68: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F21C b _022E2464 _022E1F80: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r6, lsl #0x10 strh r0, [sp, #0xca] add r1, sp, #0xc8 @@ -6892,10 +6892,10 @@ _022E1FBC: b _022E2478 _022E1FC4: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 mov r1, r5, lsl #0x10 add r0, r4, #0x6c @@ -6916,10 +6916,10 @@ _022E1FC4: b _022E2464 _022E2020: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r6, lsl #0x10 mov r5, r0 add r1, sp, #0xc0 @@ -6943,7 +6943,7 @@ _022E207C: b _022E2464 _022E2084: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -6952,7 +6952,7 @@ _022E2084: b _022E2464 _022E20A4: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 ldr r1, _022E229C ; =0x000003E7 mov r0, r0, lsr #0x10 @@ -6965,13 +6965,13 @@ _022E20C8: b _022E2464 _022E20D0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0 ldr r2, _022E229C ; =0x000003E7 @@ -6992,7 +6992,7 @@ _022E2128: b _022E2464 _022E2130: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -7001,10 +7001,10 @@ _022E2130: b _022E2464 _022E2150: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -7013,7 +7013,7 @@ _022E2150: b _022E2464 _022E217C: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 ldr r1, _022E229C ; =0x000003E7 mov r0, r0, lsr #0x10 @@ -7026,13 +7026,13 @@ _022E21A0: b _022E2464 _022E21A8: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0 ldr r2, _022E229C ; =0x000003E7 @@ -7053,7 +7053,7 @@ _022E2200: b _022E2464 _022E2208: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -7062,10 +7062,10 @@ _022E2208: b _022E2464 _022E2228: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -7074,7 +7074,7 @@ _022E2228: b _022E2464 _022E2254: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C50 @@ -7096,17 +7096,17 @@ _022E2298: .word 0x00000295 _022E229C: .word 0x000003E7 _022E22A0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C80 b _022E2464 _022E22B8: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -7115,10 +7115,10 @@ _022E22B8: b _022E2464 _022E22E4: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0, lsl #0x10 mov r1, r4, lsl #0x10 mov r0, r1, lsr #0x10 @@ -7129,13 +7129,13 @@ _022E22E4: b _022E2464 _022E2318: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r2, r4, lsl #0x10 mov r2, r2, lsr #0x10 @@ -7148,13 +7148,13 @@ _022E2318: b _022E2464 _022E2360: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0, lsl #0x10 mov r2, r4, lsl #0x10 @@ -7165,13 +7165,13 @@ _022E2360: b _022E2464 _022E23A0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0, lsl #0x10 mov r2, r4, lsl #0x10 @@ -7182,17 +7182,17 @@ _022E23A0: b _022E2464 _022E23E0: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017CB4 b _022E2464 _022E23F8: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r1, r4, lsl #0x10 @@ -7209,7 +7209,7 @@ _022E242C: b _022E2464 _022E2440: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_0206C0EC @@ -7546,7 +7546,7 @@ _022E2690: ; jump table b _022E2BF0 ; case 162 _022E291C: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7586,7 +7586,7 @@ _022E29A8: b _022E3C5C _022E29B4: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7614,7 +7614,7 @@ _022E2A10: b _022E3C5C _022E2A1C: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7707,7 +7707,7 @@ _022E2B30: b _022E3C5C _022E2B60: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017B18 @@ -7718,7 +7718,7 @@ _022E2B60: b _022E3C5C _022E2B88: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017B94 @@ -7736,7 +7736,7 @@ _022E2BB0: b _022E3C5C _022E2BC8: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C10 @@ -7747,7 +7747,7 @@ _022E2BC8: b _022E3C5C _022E2BF0: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C68 @@ -7962,7 +7962,7 @@ _022E2EF8: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -7981,7 +7981,7 @@ _022E2F40: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -7998,7 +7998,7 @@ _022E2F40: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [sb, #0x46] b _022E2FE4 _022E2FA0: @@ -8014,7 +8014,7 @@ _022E2FA0: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [sb, #0x46] ldrsh r0, [sb, #0x3c] sub r0, r0, #5 @@ -8241,13 +8241,13 @@ _022E3300: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [sb, #0x38] mov r6, r0 add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [sb] mov r4, r0 ldr r0, [sb, #4] @@ -8274,7 +8274,7 @@ _022E3380: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8362,7 +8362,7 @@ _022E34C8: b _022E3564 _022E34D0: ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8432,7 +8432,7 @@ _022E35BC: streqh r0, [sb, #0xe] beq _022E3C5C ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r2, r0 ldrsb r0, [sp, #0xc] mov r1, r6 @@ -8445,7 +8445,7 @@ _022E35BC: ldr r2, [r2, #0x2c] blx r2 ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [sb, #0x46] b _022E3C5C _022E361C: @@ -8456,10 +8456,10 @@ _022E361C: movgt r5, #0 bgt _022E3C5C ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r1, [sb] mov r4, r0 ldr r2, [r1, #0x14] @@ -8542,7 +8542,7 @@ _022E376C: cmp r0, #0 bgt _022E3884 ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8608,7 +8608,7 @@ _022E3840: blx r2 _022E3874: ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam strh r0, [sb, #0x48] b _022E388C _022E3884: @@ -8673,13 +8673,13 @@ _022E3938: b _022E3C5C _022E395C: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r7, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam ldr r2, [sb] mov r4, r0 ldr r0, [sb, #4] @@ -8997,13 +8997,13 @@ _022E3DC0: cmp r0, #0 bne _022E3E18 ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r6, lsl #0x10 mov r2, r0 mov r1, r5 @@ -9033,13 +9033,13 @@ _022E3E38: cmp r0, #0 bne _022E3E9C ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #6] - bl ov11_022E48AC + bl ProcessScriptParam mov r3, r6, lsl #0x10 mov r2, r0 mov r1, r5 @@ -9074,7 +9074,7 @@ _022E3ED4: b _022E4238 _022E3EEC: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F88A0 @@ -9085,7 +9085,7 @@ _022E3EEC: b _022E4238 _022E3F14: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022FC67C @@ -9096,7 +9096,7 @@ _022E3F14: b _022E4238 _022E3F3C: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022FDE1C @@ -9107,7 +9107,7 @@ _022E3F3C: b _022E4238 _022E3F64: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F75F0 @@ -9118,10 +9118,10 @@ _022E3F64: b _022E4238 _022E3F8C: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -9134,10 +9134,10 @@ _022E3F8C: b _022E4238 _022E3FC8: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -9150,10 +9150,10 @@ _022E3FC8: b _022E4238 _022E4004: ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -9194,7 +9194,7 @@ _022E4078: cmp r5, #5 bne _022E40D4 ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -9207,17 +9207,17 @@ _022E40D4: cmp r5, #8 ldrh r0, [r4, #2] bne _022E4104 - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 and r0, r5, #0xff mov r1, r1, asr #0x10 bl ov11_022F2790 b _022E4124 _022E4104: - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -9249,7 +9249,7 @@ _022E4140: strneh r0, [r7, #0xe] bne _022E4238 ldrh r0, [r4, #0xa] - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #0xc] add r0, r7, #0x14 @@ -9274,7 +9274,7 @@ _022E41A8: cmp r0, #2 bne _022E421C ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -9331,7 +9331,7 @@ ov11_022E425C: ; 0x022E425C cmp r0, #0x72 bne _022E42BC ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r0, r0, lsl #0x18 mov r4, r0, asr #0x18 mov r0, r7 @@ -9348,15 +9348,15 @@ _022E42BC: cmp r0, #0x73 bne _022E430C ldrh r0, [r4, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, r7 mov r1, r1, asr #0x10 - bl ov11_022E7FB8 + bl GetCoroutineInfo cmp r0, #0 beq _022E4344 ldrh r0, [r4, #4] - bl ov11_022E48AC + bl ProcessScriptParam strb r0, [r7, #0x16] ldrsh r1, [r8, #0x10] mov r0, #1 @@ -9387,8 +9387,8 @@ _022E4348: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end ov11_022E425C - arm_func_start ov11_022E4350 -ov11_022E4350: ; 0x022E4350 + arm_func_start HandleUnlocks +HandleUnlocks: ; 0x022E4350 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldr r0, _022E43DC ; =ov11_02324E80 ldrb r1, [r0, #1] @@ -9430,7 +9430,7 @@ _022E43CC: _022E43DC: .word ov11_02324E80 _022E43E0: .word ov11_023195EC _022E43E4: .word ov11_02324EB4 - arm_func_end ov11_022E4350 + arm_func_end HandleUnlocks arm_func_start ov11_022E43E8 ov11_022E43E8: ; 0x022E43E8 @@ -9462,7 +9462,7 @@ _022E442C: ; jump table b _022E4514 ; case 6 _022E4448: ldrh r0, [r5, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0 mov r0, r4 mov r1, sl @@ -9489,7 +9489,7 @@ _022E44A0: b _022E4418 _022E44AC: ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0 ldrh r2, [r5, #2] ldr r1, _022E45B4 ; =ov11_02319640 @@ -9517,7 +9517,7 @@ _022E4508: b _022E4418 _022E4514: ldrh r0, [r5, #4] - bl ov11_022E48AC + bl ProcessScriptParam mov sb, r0 ldrh r2, [r5, #2] ldr r1, _022E45B8 ; =ov11_02319658 @@ -9815,8 +9815,8 @@ _022E48A4: .word ov11_02319694 _022E48A8: .word ov11_02324F70 arm_func_end SsbLoad2 - arm_func_start ov11_022E48AC -ov11_022E48AC: ; 0x022E48AC + arm_func_start ProcessScriptParam +ProcessScriptParam: ; 0x022E48AC tst r0, #0x4000 movne r1, #0x8000 rsbne r1, r1, #0 @@ -9831,7 +9831,7 @@ ov11_022E48AC: ; 0x022E48AC bx lr .align 2, 0 _022E48DC: .word 0x00003FFF - arm_func_end ov11_022E48AC + arm_func_end ProcessScriptParam arm_func_start ov11_022E48E0 ov11_022E48E0: ; 0x022E48E0 @@ -9855,10 +9855,10 @@ ov11_022E490C: ; 0x022E490C mov r7, r0 ldrh r0, [r7] mov r4, r1 - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [r7, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 tst r5, #4 bne _022E4958 @@ -9892,10 +9892,10 @@ ov11_022E4984: ; 0x022E4984 mov sb, r1 mov r8, r2 mov r7, r3 - bl ov11_022E48AC + bl ProcessScriptParam mov r5, r0 ldrh r0, [sl, #2] - bl ov11_022E48AC + bl ProcessScriptParam mov r6, r0 ldrh r0, [sl, #8] bl ov11_022E48E0 @@ -13931,8 +13931,8 @@ ov11_022E7FA8: ; 0x022E7FA8 _022E7FB4: .word C_ROUTINES arm_func_end ov11_022E7FA8 - arm_func_start ov11_022E7FB8 -ov11_022E7FB8: ; 0x022E7FB8 + arm_func_start GetCoroutineInfo +GetCoroutineInfo: ; 0x022E7FB8 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 mov r5, r1 @@ -13961,7 +13961,7 @@ ov11_022E7FB8: ; 0x022E7FB8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022E8020: .word ov11_02324CA4 - arm_func_end ov11_022E7FB8 + arm_func_end GetCoroutineInfo arm_func_start ov11_022E8024 ov11_022E8024: ; 0x022E8024 @@ -15331,7 +15331,7 @@ ov11_022E9258: ; 0x022E9258 bl ov11_022FAE58 bl ov11_022FD47C bl ov11_022FE838 - bl ov11_022E4350 + bl HandleUnlocks bl ov11_022DC81C bl ov11_022EA024 bl sub_02003990 @@ -17587,7 +17587,7 @@ _022EAF10: mov r1, #1 mov r0, #2 str r1, [sb] - bl ov11_022DD130 + bl UnlockScriptingLock b _022EAF40 _022EAF2C: mov r0, sb @@ -27885,7 +27885,7 @@ _022F3A98: bl ov14_0238CCA8 bl FemaleToMaleForm ldr r1, _022F3E60 ; =0x00000807 - bl ov11_022F5D50 + bl GetIdleAnimationType mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 ldr r0, _022F3E48 ; =ov11_02324CE0 @@ -28294,7 +28294,7 @@ _022F40D0: mov r0, r0, asr #0x10 bl FemaleToMaleForm ldr r1, _022F4354 ; =0x00000807 - bl ov11_022F5D50 + bl GetIdleAnimationType ldrh r2, [r4, #0x10] ldr r1, _022F434C ; =ov11_02324CE0 mov r2, r2, lsr #2 @@ -30405,8 +30405,8 @@ _022F5D48: ldmia sp!, {r4, r5, r6, r7, pc} arm_func_end ov11_022F5C94 - arm_func_start ov11_022F5D50 -ov11_022F5D50: ; 0x022F5D50 + arm_func_start GetIdleAnimationType +GetIdleAnimationType: ; 0x022F5D50 ldr r2, _022F6CF4 ; =0x000002C6 cmp r0, r2 bgt _022F6824 @@ -31620,7 +31620,7 @@ _022F6E50: .word 0x0000044B _022F6E54: .word 0x00000457 _022F6E58: .word 0x00000807 _022F6E5C: .word 0x00000307 - arm_func_end ov11_022F5D50 + arm_func_end GetIdleAnimationType arm_func_start LoadObjectAnimData LoadObjectAnimData: ; 0x022F6E60 @@ -32499,7 +32499,7 @@ _022F7960: ; jump table _022F7988: ldrsh r1, [r3, #0xf8] add r0, sp, #4 - bl ov11_022E7FB8 + bl GetCoroutineInfo cmp r0, #0 beq _022F79D4 ldr r0, _022F7BB8 ; =ov11_02324CF4 @@ -32638,7 +32638,7 @@ _022F7B80: ldr r1, [r0, #0xf0] cmp r1, #0 bne _022F7B98 - bl FuncThatCallsCommandParsing + bl FuncThatCallsRunNextOpcode _022F7B98: ldr r0, _022F7BB8 ; =ov11_02324CF4 ldr r0, [r0] @@ -34459,8 +34459,8 @@ _022F93BC: _022F93C4: .word ov11_02321684 arm_func_end ov11_022F921C - arm_func_start ov11_022F93C8 -ov11_022F93C8: ; 0x022F93C8 + arm_func_start ChangeActorAnimation +ChangeActorAnimation: ; 0x022F93C8 stmdb sp!, {r4, lr} and r2, r1, #0x700 mov r2, r2, lsl #0x10 @@ -34510,10 +34510,10 @@ _022F9450: bgt _022F9498 ldrsh r0, [r4, #0xa] ldrsh r1, [r2, #0x80] - bl ov11_022F5D50 + bl GetIdleAnimationType b _022F9498 _022F948C: - ldr r0, _022F9524 ; =ov11_023218CC + ldr r0, _022F9524 ; =SETANIMATION_TABLE mov r1, r3, lsl #1 ldrsh r0, [r0, r1] _022F9498: @@ -34557,8 +34557,8 @@ _022F9518: ldmia sp!, {r4, pc} .align 2, 0 _022F9520: .word 0x00000807 -_022F9524: .word ov11_023218CC - arm_func_end ov11_022F93C8 +_022F9524: .word SETANIMATION_TABLE + arm_func_end ChangeActorAnimation arm_func_start ov11_022F9528 ov11_022F9528: ; 0x022F9528 @@ -36188,11 +36188,11 @@ ov11_022FAB84: ; 0x022FAB84 movhs r1, r1, lsl #0x10 movhs r1, r1, lsr #0x10 _022FABC0: - ldr ip, _022FABCC ; =ov11_022F93C8 + ldr ip, _022FABCC ; =ChangeActorAnimation bx ip .align 2, 0 _022FABC8: .word 0x00000119 -_022FABCC: .word ov11_022F93C8 +_022FABCC: .word ChangeActorAnimation arm_func_end ov11_022FAB84 arm_func_start ov11_022FABD0 @@ -36444,7 +36444,7 @@ _022FAED4: cmpne r0, #0 beq _022FB894 add r0, r5, #0x38 - bl FuncThatCallsCommandParsing + bl FuncThatCallsRunNextOpcode cmp r0, #0 beq _022FAF24 mov r1, #1 @@ -37293,7 +37293,7 @@ ov11_022FBAF0: ; 0x022FBAF0 cmp r0, #1 bhi _022FBB20 mov r0, sl - bl ov11_022F93C8 + bl ChangeActorAnimation _022FBB20: add r0, sl, #0x200 ldrsh r1, [r0, #0x1e] @@ -39260,7 +39260,7 @@ _022FD494: cmpne r0, #0 beq _022FD4F0 add r0, r5, #0x3c - bl FuncThatCallsCommandParsing + bl FuncThatCallsRunNextOpcode cmp r0, #0 beq _022FD4CC cmp r0, #6 @@ -40799,7 +40799,7 @@ _022FE850: cmpne r0, #0 beq _022FE8AC add r0, r5, #0x3c - bl FuncThatCallsCommandParsing + bl FuncThatCallsRunNextOpcode cmp r0, #0 beq _022FE888 cmp r0, #6 @@ -79006,8 +79006,8 @@ ov11_0232187C: .word ov11_022FAC64 .word ov11_022FABE4 .word ov11_022FAC04 - .global ov11_023218CC -ov11_023218CC: + .global SETANIMATION_TABLE +SETANIMATION_TABLE: .byte 0xFF, 0xFF, 0x00, 0x08, 0x00, 0x03, 0x00, 0x03, 0x07, 0x08, 0x00, 0x08, 0x05, 0x08, 0x02, 0x03 .byte 0x06, 0x03, 0x0B, 0x08, 0x07, 0x03, 0x06, 0x10, 0x02, 0x10, 0x01, 0x10, 0x06, 0x08, 0x00, 0x03 .byte 0x00, 0x03, 0x0A, 0x10, 0x03, 0x10, 0x04, 0x10, 0x03, 0x08, 0x04, 0x08, 0x0D, 0x10, 0x0E, 0x10 diff --git a/asm/overlay_17.s b/asm/overlay_17.s index 08545428..7a69273e 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -1521,7 +1521,7 @@ ov17_0238B534: ; 0x0238B534 ldr r0, [r0] add r0, r0, #0x200 ldrsh r0, [r0, #0x58] - bl sub_02056754 + bl TryAddMonsterToActiveTeam bl sub_02057444 bl ov11_022DC504 ldr r0, _0238B578 ; =ov17_0238BE00 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index ed28a5b7..f3d1e1ea 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -3712,7 +3712,7 @@ _022F39D8: cmp r8, r4 beq _022F3A40 mov r0, r8 - bl sub_02056754 + bl TryAddMonsterToActiveTeam b _022F3A40 _022F3A38: mov r0, #0