From 9734b2fe95172f2fa946efac30fcf69967a02f39 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 17 Sep 2023 00:04:25 -0400 Subject: [PATCH] Defined pointers for overlay 14 --- asm/include/overlay_14.inc | 127 ++++++++-------- asm/main_0200C4CC.s | 5 +- asm/overlay_14.s | 292 +++++++++++++++++++++++++------------ 3 files changed, 264 insertions(+), 160 deletions(-) diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index cb9a2c6e..b222a104 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -1,69 +1,70 @@ #pragma once -.public AnimRelatedFunction__022F7064 -.public ov11_022F6F08 -.public GetPartner -.public IsNormalMenuActive -.public InitPortraitBoxWithMonsterId -.public GetPartnerMemberIdx -.public ov11_022F4990 -.public sub_02027B58 -.public sub_02017C80 -.public sub_0202F954 -.public sub_02017B70 -.public sub_02027AF0 -.public GetNormalMenuResult -.public ShowMessageInDBox -.public RandRange -.public ov11_022F5BBC -.public strlen -.public ov11_022F7058 -.public ShowDBox -.public InitPortraitBox -.public CreatePortraitBox -.public ov11_022F6FE0 -.public AnimRelatedFunction__022F6F14 -.public sub_0202BCBC -.public sub_02026214 -.public MemFree -.public FemaleToMaleForm -.public sub_0202BC60 -.public ShowPortraitBox -.public SetPortraitLayout -.public sub_02017B58 -.public InitPreprocessorArgs -.public SetPortraitEmotion -.public sub_0202F8C4 .public __divsi3 -.public ov11_022F6EFC -.public GetPressedButtons -.public SetAnimDataFieldsWrapper -.public SetAnimDataFields2 -.public FreePortraitBox -.public sub_02017B7C -.public FreeDBox -.public sub_020063F4 -.public sub_0202F334 -.public GetHeroMemberIdx -.public sub_0204AE60 -.public sub_0202F66C -.public ov11_022E6E8C -.public sub_0202FB9C -.public FreeAdvancedMenu -.public MemAlloc -.public IsDBoxActive -.public FreeNormalMenu -.public CreateNormalMenu +.public _020A1BB0 +.public AnimRelatedFunction__022F6F14 +.public AnimRelatedFunction__022F7064 .public CreateAdvancedMenu -.public sub_0202F8FC .public CreateDBox -.public LoadObjectAnimData -.public GetSentryDutyGamePoints -.public PreprocessString -.public GetHero -.public GetReleasedStylus -.public GetNameRaw -.public SetSentryDutyGamePoints -.public StringFromMessageId -.public HidePortraitBox +.public CreateNormalMenu +.public CreatePortraitBox .public DebugPrint0 +.public FemaleToMaleForm +.public FreeAdvancedMenu +.public FreeDBox +.public FreeNormalMenu +.public FreePortraitBox +.public GetHero +.public GetHeroMemberIdx +.public GetNameRaw +.public GetNormalMenuResult +.public GetPartner +.public GetPartnerMemberIdx +.public GetPressedButtons +.public GetReleasedStylus +.public GetSentryDutyGamePoints +.public HidePortraitBox +.public InitPortraitBox +.public InitPortraitBoxWithMonsterId +.public InitPreprocessorArgs +.public IsDBoxActive +.public IsNormalMenuActive +.public LoadObjectAnimData +.public MemAlloc +.public MemFree +.public ov11_022E6E8C +.public ov11_022F4990 +.public ov11_022F5BBC +.public ov11_022F6EFC +.public ov11_022F6F08 +.public ov11_022F6FE0 +.public ov11_022F7058 +.public PreprocessString +.public RandRange +.public SetAnimDataFields2 +.public SetAnimDataFieldsWrapper +.public SetPortraitEmotion +.public SetPortraitLayout .public SetPortraitOffset +.public SetSentryDutyGamePoints +.public ShowDBox +.public ShowMessageInDBox +.public ShowPortraitBox +.public StringFromMessageId +.public strlen +.public sub_020063F4 +.public sub_02017B58 +.public sub_02017B70 +.public sub_02017B7C +.public sub_02017C80 +.public sub_02026214 +.public sub_02027AF0 +.public sub_02027B58 +.public sub_0202BC60 +.public sub_0202BCBC +.public sub_0202F334 +.public sub_0202F66C +.public sub_0202F8C4 +.public sub_0202F8FC +.public sub_0202F954 +.public sub_0202FB9C +.public sub_0204AE60 diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 5d8d6a85..6766b18a 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -170030,7 +170030,10 @@ _020A1AE8: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x01, 0x9F, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 + .global _020A1BB0 +_020A1BB0: + .byte 0x1B, 0x01, 0x9F, 0x00 .byte 0x85, 0x00, 0xFE, 0x00, 0x48, 0x01, 0x49, 0x01, 0xAE, 0x01, 0xA0, 0x00, 0xFB, 0x00, 0x7F, 0x00 .byte 0xEC, 0x01, 0x8F, 0x00, 0x08, 0x00, 0x09, 0x00, 0x18, 0x01, 0x80, 0x00, 0xAB, 0x01, 0x41, 0x01 .byte 0xE8, 0x01, 0x6A, 0x00, 0x6B, 0x01, 0x1C, 0x00, 0x1A, 0x01, 0x19, 0x01, 0x7B, 0x00, 0x07, 0x00 diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 1f3d2c93..09a91003 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -741,7 +741,7 @@ ov14_0238ABA0: ; 0x0238ABA0 str r0, [sp, #0x3c] add r0, sp, #4 str r0, [sp] - ldr r2, _0238ABFC ; =0x0238DAE8 + ldr r2, _0238ABFC ; =ov14_0238DAE8 ldr r3, _0238AC00 ; =0x0000C402 mov r0, r5 mov r1, #0x400 @@ -750,7 +750,7 @@ ov14_0238ABA0: ; 0x0238ABA0 add sp, sp, #0x54 ldmia sp!, {r4, r5, pc} .align 2, 0 -_0238ABFC: .word 0x0238DAE8 +_0238ABFC: .word ov14_0238DAE8 _0238AC00: .word 0x0000C402 arm_func_end ov14_0238ABA0 @@ -759,7 +759,7 @@ ov14_0238AC04: ; 0x0238AC04 stmdb sp!, {r3, lr} rsb ip, r0, #0x10 mov r3, #1 - ldr r0, _0238AC3C ; =0x0238DB84 + ldr r0, _0238AC3C ; =ov14_0238DB84 mov r1, r3 mov r2, #2 _0238AC1C: @@ -772,7 +772,7 @@ _0238AC1C: blt _0238AC1C ldmia sp!, {r3, pc} .align 2, 0 -_0238AC3C: .word 0x0238DB84 +_0238AC3C: .word ov14_0238DB84 arm_func_end ov14_0238AC04 arm_func_start ov14_0238AC40 @@ -907,7 +907,7 @@ _0238ADF8: .word ov14_0238DB80 SentryUpdateDisplay: ; 0x0238ADFC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x6c - ldr r1, _0238B690 ; =0x0238D970 + ldr r1, _0238B690 ; =ov14_0238D970 ldr r0, _0238B694 ; =ov14_0238DB80 ldr r2, [r1, #0x14] ldr r1, [r1, #0x10] @@ -934,7 +934,7 @@ SentryUpdateDisplay: ; 0x0238ADFC mov r5, #0 cmp r1, #2 moveq r1, #3 - ldr r4, _0238B698 ; =0x0238DA40 + ldr r4, _0238B698 ; =ov14_0238DA40 ldr r7, _0238B694 ; =ov14_0238DB80 streq r1, [r0, #0x540] add sb, sp, #0x14 @@ -967,7 +967,7 @@ _0238AECC: beq _0238AFDC ldr r0, _0238B69C ; =0x00000806 mov r4, #0xc4 - ldr r8, _0238B698 ; =0x0238DA40 + ldr r8, _0238B698 ; =ov14_0238DA40 mov sl, #0 sub sb, r0, #2 mov r5, r4 @@ -1165,7 +1165,7 @@ _0238B1A8: cmp r1, #1 beq _0238B1DC ldr r1, [r0, #0x878] - ldr r2, _0238B698 ; =0x0238DA40 + ldr r2, _0238B698 ; =ov14_0238DA40 add r0, r3, #0x1b4 add r0, r0, #0x2800 add r1, r2, r1, lsl #3 @@ -1173,8 +1173,8 @@ _0238B1A8: bl AnimRelatedFunction__022F6F14 _0238B1DC: mov sl, #0 - ldr r8, _0238B6B0 ; =0x0238DB84 - ldr r7, _0238B6B4 ; =0x0238DA60 + ldr r8, _0238B6B0 ; =ov14_0238DB84 + ldr r7, _0238B6B4 ; =ov14_0238DA60 ldr r5, _0238B694 ; =ov14_0238DB80 mov fp, sl mov r6, #0xa000 @@ -1221,7 +1221,7 @@ _0238B1F8: str r0, [sp, #0x40] cmp r0, #6 add r0, r2, #0x570 - ldr r2, _0238B6BC ; =0x0238DB0C + ldr r2, _0238B6BC ; =ov14_0238DB0C str r1, [sp, #0x44] strgt r1, [sp, #0x40] add r4, sp, #0x1c @@ -1232,7 +1232,7 @@ _0238B1F8: mov r1, r4 str r1, [sp] ldr r0, _0238B694 ; =ov14_0238DB80 - ldr r2, _0238B6C0 ; =0x0238DB18 + ldr r2, _0238B6C0 ; =ov14_0238DB18 ldr r0, [r0] ldr r3, _0238B6B8 ; =0x0000C402 add r0, r0, #0x670 @@ -1260,7 +1260,7 @@ _0238B2E4: str r4, [sp] bl ov14_0238D828 mov r4, #0 - ldr r0, _0238B6C4 ; =0x0238DB24 + ldr r0, _0238B6C4 ; =ov14_0238DB24 add r1, sp, #0x10 add r2, sp, #0xc mov r3, #0x16 @@ -1292,7 +1292,7 @@ _0238B374: add r0, r2, #0x770 str r1, [sp, #0x40] add r4, sp, #0x1c - ldr r2, _0238B6BC ; =0x0238DB0C + ldr r2, _0238B6BC ; =ov14_0238DB0C add r0, r0, #0x3000 mov r1, #0x400 str r4, [sp] @@ -1318,7 +1318,7 @@ _0238B3C4: str r4, [sp] bl ov14_0238D828 mov r4, #0 - ldr r0, _0238B6C8 ; =0x0238DB28 + ldr r0, _0238B6C8 ; =ov14_0238DB28 add r1, sp, #8 add r2, sp, #4 mov r3, #0x18 @@ -1443,7 +1443,7 @@ _0238B5BC: ble _0238B688 mov sl, #0 mov r4, #0xc4 - ldr sb, _0238B698 ; =0x0238DA40 + ldr sb, _0238B698 ; =ov14_0238DA40 add r8, sp, #0x14 mov fp, sl mov r7, sl @@ -1494,21 +1494,21 @@ _0238B688: add sp, sp, #0x6c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0238B690: .word 0x0238D970 +_0238B690: .word ov14_0238D970 _0238B694: .word ov14_0238DB80 -_0238B698: .word 0x0238DA40 +_0238B698: .word ov14_0238DA40 _0238B69C: .word 0x00000806 _0238B6A0: .word 0x00001005 _0238B6A4: .word 0x00000801 _0238B6A8: .word 0x00001002 _0238B6AC: .word 0x00000802 -_0238B6B0: .word 0x0238DB84 -_0238B6B4: .word 0x0238DA60 +_0238B6B0: .word ov14_0238DB84 +_0238B6B4: .word ov14_0238DA60 _0238B6B8: .word 0x0000C402 -_0238B6BC: .word 0x0238DB0C -_0238B6C0: .word 0x0238DB18 -_0238B6C4: .word 0x0238DB24 -_0238B6C8: .word 0x0238DB28 +_0238B6BC: .word ov14_0238DB0C +_0238B6C0: .word ov14_0238DB18 +_0238B6C4: .word ov14_0238DB24 +_0238B6C8: .word ov14_0238DB28 _0238B6CC: .word 0x00001004 _0238B6D0: .word 0x00001003 _0238B6D4: .word 0x00002C05 @@ -1629,7 +1629,7 @@ _0238B84C: mov r1, #0 str r1, [r2, #0x10c] ldr r1, [r0] - ldr r0, _0238C130 ; =0x0238DB94 + ldr r0, _0238C130 ; =ov14_0238DB94 ldr r1, [r1, #0x108] ldr r0, [r0, r1, lsl #2] blx r0 @@ -1644,7 +1644,7 @@ _0238B84C: bne _0238B8A4 str r2, [r3, #0x108] ldr r1, [r0] - ldr r0, _0238C130 ; =0x0238DB94 + ldr r0, _0238C130 ; =ov14_0238DB94 ldr r1, [r1, #0x108] ldr r0, [r0, r1, lsl #2] blx r0 @@ -1683,7 +1683,7 @@ _0238B8BC: cmp r0, #2 str r4, [sp] beq _0238B94C - ldr r0, _0238C138 ; =0x0238D9C8 + ldr r0, _0238C138 ; =ov14_0238D9C8 ldr r3, _0238C13C ; =ov14_0238ABA0 add r2, r2, #0xc str r4, [sp, #4] @@ -1693,7 +1693,7 @@ _0238B8BC: strb r0, [r1] b _0238B96C _0238B94C: - ldr r0, _0238C140 ; =0x0238D9D8 + ldr r0, _0238C140 ; =ov14_0238D9D8 ldr r3, _0238C13C ; =ov14_0238ABA0 add r2, r2, #0xc str r4, [sp, #4] @@ -1716,7 +1716,7 @@ _0238B96C: ldr r4, _0238C144 ; =0x00003018 cmp r1, r0 bne _0238B9B8 - ldr r0, _0238C148 ; =0x0238D9B8 + ldr r0, _0238C148 ; =ov14_0238D9B8 bl CreateDBox ldr r1, _0238C12C ; =ov14_0238DB80 ldr r1, [r1] @@ -2049,7 +2049,7 @@ _0238BE30: mvn r0, #1 cmp r1, r0 bne _0238BE6C - ldr r0, _0238C1A4 ; =0x0238D9F8 + ldr r0, _0238C1A4 ; =ov14_0238D9F8 ldr r1, _0238C1A8 ; =ov14_0238ACEC bl sub_0202F8C4 ldr r1, _0238C12C ; =ov14_0238DB80 @@ -2065,7 +2065,7 @@ _0238BE6C: mvn r0, #1 cmp r1, r0 bne _0238BEA8 - ldr r0, _0238C1AC ; =0x0238D988 + ldr r0, _0238C1AC ; =ov14_0238D988 ldr r1, _0238C1B0 ; =ov14_0238AD04 bl sub_0202F8C4 ldr r1, _0238C12C ; =ov14_0238DB80 @@ -2081,7 +2081,7 @@ _0238BEA8: mvn r0, #1 cmp r1, r0 bne _0238BEE4 - ldr r0, _0238C1B4 ; =0x0238D998 + ldr r0, _0238C1B4 ; =ov14_0238D998 ldr r1, _0238C1B0 ; =ov14_0238AD04 bl sub_0202F8C4 ldr r1, _0238C12C ; =ov14_0238DB80 @@ -2165,9 +2165,9 @@ _0238BFE4: mvn r0, #1 cmp r1, r0 bne _0238C030 - ldr r0, _0238C1B8 ; =0x0238D9A8 + ldr r0, _0238C1B8 ; =ov14_0238D9A8 mov r4, #8 - ldr r3, _0238C1BC ; =0x0238DAA0 + ldr r3, _0238C1BC ; =ov14_0238DAA0 mov r1, #0x13 mov r2, #0 str r4, [sp] @@ -2185,9 +2185,9 @@ _0238C030: mvn r0, #1 cmp r1, r0 bne _0238C07C - ldr r0, _0238C1C0 ; =0x0238D9E8 + ldr r0, _0238C1C0 ; =ov14_0238D9E8 mov r4, #2 - ldr r3, _0238C1C4 ; =0x0238DA08 + ldr r3, _0238C1C4 ; =ov14_0238DA08 mov r1, #0x13 mov r2, #0 str r4, [sp] @@ -2250,13 +2250,13 @@ _0238C124: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0238C12C: .word ov14_0238DB80 -_0238C130: .word 0x0238DB94 +_0238C130: .word ov14_0238DB94 _0238C134: .word 0x04080800 -_0238C138: .word 0x0238D9C8 +_0238C138: .word ov14_0238D9C8 _0238C13C: .word ov14_0238ABA0 -_0238C140: .word 0x0238D9D8 +_0238C140: .word ov14_0238D9D8 _0238C144: .word 0x00003018 -_0238C148: .word 0x0238D9B8 +_0238C148: .word ov14_0238D9B8 _0238C14C: .word 0x00000142 _0238C150: .word 0x000006D9 _0238C154: .word 0x000006D8 @@ -2279,15 +2279,15 @@ _0238C194: .word 0x000006F4 _0238C198: .word 0x000001E3 _0238C19C: .word 0x000006F5 _0238C1A0: .word 0x000006F6 -_0238C1A4: .word 0x0238D9F8 +_0238C1A4: .word ov14_0238D9F8 _0238C1A8: .word ov14_0238ACEC -_0238C1AC: .word 0x0238D988 +_0238C1AC: .word ov14_0238D988 _0238C1B0: .word ov14_0238AD04 -_0238C1B4: .word 0x0238D998 -_0238C1B8: .word 0x0238D9A8 -_0238C1BC: .word 0x0238DAA0 -_0238C1C0: .word 0x0238D9E8 -_0238C1C4: .word 0x0238DA08 +_0238C1B4: .word ov14_0238D998 +_0238C1B8: .word ov14_0238D9A8 +_0238C1BC: .word ov14_0238DAA0 +_0238C1C0: .word ov14_0238D9E8 +_0238C1C4: .word ov14_0238DA08 arm_func_end SentryRunState arm_func_start SentrySetStateIntermediate @@ -2605,7 +2605,7 @@ _0238C564: mov r1, #0x65 bl RandRange ldr r2, _0238CA54 ; =ov14_0238DB80 - ldr r3, _0238CA60 ; =0x020A1BB0 + ldr r3, _0238CA60 ; =_020A1BB0 ldr r1, [r2] add r1, r1, #0x3000 str r0, [r1, #0x880] @@ -2678,7 +2678,7 @@ _0238C670: ldr r0, [r0, #0x87c] cmp sb, r0 beq _0238C72C - ldr r4, _0238CA60 ; =0x020A1BB0 + ldr r4, _0238CA60 ; =_020A1BB0 ldr fp, _0238CA64 ; =0x00000119 _0238C690: mov r0, #0 @@ -2729,16 +2729,16 @@ _0238C72C: mov sb, r0, asr #0x10 cmp sb, #4 blt _0238C670 - ldr r0, _0238CA68 ; =0x0238DB2C + ldr r0, _0238CA68 ; =ov14_0238DB2C bl DebugPrint0 ldr r1, _0238CA54 ; =ov14_0238DB80 - ldr r0, _0238CA6C ; =0x0238DB44 + ldr r0, _0238CA6C ; =ov14_0238DB44 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x880] bl DebugPrint0 ldr r1, _0238CA54 ; =ov14_0238DB80 - ldr r0, _0238CA70 ; =0x0238DB58 + ldr r0, _0238CA70 ; =ov14_0238DB58 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x87c] @@ -2800,7 +2800,7 @@ _0238C72C: ldr r4, _0238CA54 ; =ov14_0238DB80 mov sb, #0 ldr r0, [r4] - ldr r1, _0238CA84 ; =0x0238D970 + ldr r1, _0238CA84 ; =ov14_0238D970 add r0, r0, #0x3000 str sb, [r0, #0x53c] ldr r0, [r4] @@ -2939,16 +2939,16 @@ _0238CA10: _0238CA54: .word ov14_0238DB80 _0238CA58: .word 0x000003FA _0238CA5C: .word 0x000005DC -_0238CA60: .word 0x020A1BB0 +_0238CA60: .word _020A1BB0 _0238CA64: .word 0x00000119 -_0238CA68: .word 0x0238DB2C -_0238CA6C: .word 0x0238DB44 -_0238CA70: .word 0x0238DB58 +_0238CA68: .word ov14_0238DB2C +_0238CA6C: .word ov14_0238DB44 +_0238CA70: .word ov14_0238DB58 _0238CA74: .word 0x880A0000 _0238CA78: .word 0x00001001 _0238CA7C: .word 0x00001003 _0238CA80: .word 0x48140000 -_0238CA84: .word 0x0238D970 +_0238CA84: .word ov14_0238D970 _0238CA88: .word 0x08120000 _0238CA8C: .word 0x00000807 _0238CA90: .word 0x00002C04 @@ -3006,7 +3006,7 @@ SentryStateGetUserChoice: ; 0x0238CA94 ldr r2, [sp, #8] ldr r3, [sp, #0xc] mov r1, r4 - ldr r0, _0238CFA8 ; =0x0238DA20 + ldr r0, _0238CFA8 ; =ov14_0238DA20 b _0238CBC4 _0238CB64: ldr r6, [r0, r1, lsl #3] @@ -3228,8 +3228,8 @@ _0238CE0C: mov sb, #0 mov r1, #2 add r0, r0, #0x3000 - ldr r6, _0238CFB8 ; =0x0238D96C - ldr r5, _0238CFBC ; =0x0238DA80 + ldr r6, _0238CFB8 ; =ov14_0238D96C + ldr r5, _0238CFBC ; =ov14_0238DA80 str r1, [r0, #0x540] add r7, sp, #0x28 mov sl, sb @@ -3331,12 +3331,12 @@ _0238CF9C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0238CFA4: .word ov14_0238DB80 -_0238CFA8: .word 0x0238DA20 +_0238CFA8: .word ov14_0238DA20 _0238CFAC: .word 0x00003F02 _0238CFB0: .word 0x00003F03 _0238CFB4: .word 0x00003F01 -_0238CFB8: .word 0x0238D96C -_0238CFBC: .word 0x0238DA80 +_0238CFB8: .word ov14_0238D96C +_0238CFBC: .word ov14_0238DA80 _0238CFC0: .word 0x00002C06 arm_func_end ov14_0238CCF0 @@ -3388,7 +3388,7 @@ SentryStateFinalizeRound: ; 0x0238CFC4 add r0, r0, #0x2800 bl ov11_022F6EFC _0238D078: - ldr r0, _0238D300 ; =0x0238D970 + ldr r0, _0238D300 ; =ov14_0238D970 ldr r4, _0238D2FC ; =ov14_0238DB80 ldr r6, [r0, #8] ldr r5, [r0, #0xc] @@ -3563,7 +3563,7 @@ _0238D2F4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0238D2FC: .word ov14_0238DB80 -_0238D300: .word 0x0238D970 +_0238D300: .word ov14_0238D970 _0238D304: .word 0x00001B58 arm_func_end SentryStateFinalizeRound @@ -4092,49 +4092,149 @@ _0238D968: .word 0x0000080F arm_func_end ov14_0238D828 ; 0x0238D96C - .byte 0x03, 0x03, 0x03, 0x03, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x07, 0x1A, 0x02, 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x10, 0x1A, 0x02, 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x13, 0x1C, 0x04, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x06, 0x10, 0x0B, 0x01, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x04, 0x10, 0x0B, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x1D, 0x05, 0x01, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0x06, 0x00, 0x00 + .global ov14_0238D96C +ov14_0238D96C: + .byte 0x03, 0x03, 0x03, 0x03 + .global ov14_0238D970 +ov14_0238D970: + .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D988 +ov14_0238D988: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x07, 0x1A, 0x02, 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D998 +ov14_0238D998: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x10, 0x1A, 0x02, 0x00, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9A8 +ov14_0238D9A8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9B8 +ov14_0238D9B8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x13, 0x1C, 0x04, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9C8 +ov14_0238D9C8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x06, 0x10, 0x0B, 0x01, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9D8 +ov14_0238D9D8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x04, 0x10, 0x0B, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9E8 +ov14_0238D9E8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238D9F8 +ov14_0238D9F8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x1D, 0x05, 0x01, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238DA08 +ov14_0238DA08: + .byte 0xD6, 0x06, 0x00, 0x00 .byte 0x08, 0x00, 0x00, 0x00, 0xD7, 0x06, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + .global ov14_0238DA20 +ov14_0238DA20: + .byte 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00 .byte 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00 - .byte 0x68, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00 + .byte 0x68, 0x00, 0x00, 0x00 + .global ov14_0238DA40 +ov14_0238DA40: + .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00 .byte 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00 - .byte 0x00, 0x68, 0x00, 0x00, 0x20, 0x00, 0x2C, 0x00, 0x38, 0x00, 0x44, 0x00, 0x50, 0x00, 0x5C, 0x00 + .byte 0x00, 0x68, 0x00, 0x00 + .global ov14_0238DA60 +ov14_0238DA60: + .byte 0x20, 0x00, 0x2C, 0x00, 0x38, 0x00, 0x44, 0x00, 0x50, 0x00, 0x5C, 0x00 .byte 0x68, 0x00, 0x74, 0x00, 0x80, 0x00, 0x8C, 0x00, 0x98, 0x00, 0xA4, 0x00, 0xB0, 0x00, 0xBC, 0x00 - .byte 0xC8, 0x00, 0xD4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 + .byte 0xC8, 0x00, 0xD4, 0x00 + .global ov14_0238DA80 +ov14_0238DA80: + .byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0xCE, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0x06, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov14_0238DAA0 +ov14_0238DAA0: + .byte 0xCE, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0x06, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xD0, 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD1, 0x06, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0xD2, 0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xD3, 0x06, 0x00, 0x00 .byte 0x05, 0x00, 0x00, 0x00, 0xD4, 0x06, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xD5, 0x06, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x73, 0x74, 0x72 + .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238DAE8 +ov14_0238DAE8: + .byte 0x5B, 0x73, 0x74, 0x72 .byte 0x69, 0x6E, 0x67, 0x30, 0x5D, 0x5B, 0x43, 0x4C, 0x55, 0x4D, 0x5F, 0x53, 0x45, 0x54, 0x3A, 0x36 .byte 0x34, 0x5D, 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x38, 0x5D, 0x00, 0x00, 0x00 - .byte 0x5B, 0x64, 0x69, 0x67, 0x69, 0x74, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x5B, 0x64, 0x69, 0x67 - .byte 0x69, 0x74, 0x73, 0x3A, 0x31, 0x5D, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00 + .global ov14_0238DB0C +ov14_0238DB0C: + .byte 0x5B, 0x64, 0x69, 0x67, 0x69, 0x74, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00 + .global ov14_0238DB18 +ov14_0238DB18: + .byte 0x5B, 0x64, 0x69, 0x67 + .byte 0x69, 0x74, 0x73, 0x3A, 0x31, 0x5D, 0x00, 0x00 + .global ov14_0238DB24 +ov14_0238DB24: + .byte 0x2F, 0x00, 0x00, 0x00 + .global ov14_0238DB28 +ov14_0238DB28: + .byte 0x50, 0x00, 0x00, 0x00 + .global ov14_0238DB2C +ov14_0238DB2C: .byte 0x2D, 0x2D, 0x2D, 0x2D, 0x20, 0x46, 0x6F, 0x6F, 0x74, 0x70, 0x72, 0x69, 0x6E, 0x74, 0x20, 0x2D - .byte 0x2D, 0x2D, 0x2D, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x46, 0x6F, 0x6F, 0x72, 0x70, 0x72, 0x69, 0x6E - .byte 0x74, 0x4E, 0x6F, 0x20, 0x3D, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x41, 0x6E, 0x73, 0x77 + .byte 0x2D, 0x2D, 0x2D, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov14_0238DB44 +ov14_0238DB44: + .byte 0x46, 0x6F, 0x6F, 0x72, 0x70, 0x72, 0x69, 0x6E + .byte 0x74, 0x4E, 0x6F, 0x20, 0x3D, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00 + .global ov14_0238DB58 +ov14_0238DB58: + .byte 0x41, 0x6E, 0x73, 0x77 .byte 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3D, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00 .data .global ov14_0238DB80 ov14_0238DB80: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xE8, 0xC1, 0x38, 0x02, 0x0C, 0xC2, 0x38, 0x02 - .byte 0x64, 0xC2, 0x38, 0x02, 0x88, 0xC2, 0x38, 0x02, 0xB0, 0xC3, 0x38, 0x02, 0xD4, 0xC3, 0x38, 0x02 - .byte 0xE0, 0xC3, 0x38, 0x02, 0x04, 0xC4, 0x38, 0x02, 0x1C, 0xC4, 0x38, 0x02, 0x40, 0xC4, 0x38, 0x02 - .byte 0x64, 0xC4, 0x38, 0x02, 0x7C, 0xC4, 0x38, 0x02, 0x94, 0xC4, 0x38, 0x02, 0x94, 0xCA, 0x38, 0x02 - .byte 0xC4, 0xCF, 0x38, 0x02, 0x08, 0xD3, 0x38, 0x02, 0x20, 0xD3, 0x38, 0x02, 0x98, 0xD3, 0x38, 0x02 - .byte 0xB0, 0xD3, 0x38, 0x02, 0xE8, 0xD3, 0x38, 0x02, 0x10, 0xD4, 0x38, 0x02, 0x28, 0xD4, 0x38, 0x02 - .byte 0x68, 0xD4, 0x38, 0x02, 0xC0, 0xD4, 0x38, 0x02, 0x38, 0xD5, 0x38, 0x02, 0x70, 0xD5, 0x38, 0x02 - .byte 0x88, 0xD5, 0x38, 0x02, 0xC8, 0xD5, 0x38, 0x02, 0x58, 0xD6, 0x38, 0x02, 0x9C, 0xD6, 0x38, 0x02 - .byte 0x00, 0xD7, 0x38, 0x02, 0x18, 0xD7, 0x38, 0x02, 0x94, 0xD7, 0x38, 0x02, 0xAC, 0xD7, 0x38, 0x02 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov14_0238DB84 +ov14_0238DB84: + .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .global ov14_0238DB94 +ov14_0238DB94: + .word SentryState0 + .word SentryState1 + .word SentryState2 + .word SentryState3 + .word SentryState4 + .word SentryStateExit + .word SentryState6 + .word SentryState7 + .word SentryState8 + .word SentryState9 + .word SentryStateA + .word SentryStateB + .word SentryStateGenerateChoices + .word SentryStateGetUserChoice + .word SentryStateFinalizeRound + .word SentryStateF + .word SentryState10 + .word SentryState11 + .word SentryState12 + .word SentryState13 + .word SentryState14 + .word SentryState15 + .word SentryState16 + .word SentryState17 + .word SentryState18 + .word SentryState19 + .word SentryState1A + .word SentryStateFinalizePoints + .word SentryState1C + .word SentryState1D + .word SentryState1E + .word SentryState1F + .word SentryState20 + .word SentryState21