diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc index a8fbbc90..f52f71ac 100644 --- a/asm/include/overlay_13.inc +++ b/asm/include/overlay_13.inc @@ -5,7 +5,7 @@ .public PreprocessString .public sub_0202F8FC .public sub_0202F2C4 -.public sub_02018428 +.public sub_02017CB4 .public GetKeyboardStatus .public sub_02017B7C .public sub_02037468 @@ -37,13 +37,13 @@ .public SetPortraitUnknownAttr .public FreePortraitBox .public sub_020348E4 -.public sub_0207BA08 +.public sub_02004F74 .public GetNameRaw .public sub_02048794 .public GetKeyboardStringResult .public InitPortraitBoxWithMonsterId .public ov11_022E6E8C -.public sub_0207B9EC +.public sub_0204A198 .public IsDBoxActive .public SaveScriptVariableValue .public GetDebugFlag1 @@ -56,7 +56,7 @@ .public FreeDBox .public sub_0203931C .public sub_02027AF0 -.public sub_020182B8 +.public sub_02017C74 .public ov11_023039D4 .public sub_0202836C .public sub_02027B1C diff --git a/asm/include/overlay_16.inc b/asm/include/overlay_16.inc index f70dce7d..14ab0f2b 100644 --- a/asm/include/overlay_16.inc +++ b/asm/include/overlay_16.inc @@ -29,7 +29,7 @@ .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public sub_02010260 -.public sub_02018428 +.public sub_02017CB4 .public CreatePortraitBox .public GetNameString .public IsMainCharacter diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 5fb3a1e5..630db472 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -1,6 +1,6 @@ #pragma once .public sub_020572EC -.public sub_020182B8 +.public sub_02017C74 .public sub_02041424 .public sub_0202F66C .public sub_0202F334 diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index 9f291db3..aba7cfdf 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -14,7 +14,6 @@ .public sub_02046C30 .public HidePortraitBox .public sub_02056094 -.public sub_020182B8 .public sub_020308A0 .public sub_0203F990 .public sub_02017CCC diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc index b42f270d..b56a996e 100644 --- a/asm/include/overlay_24.inc +++ b/asm/include/overlay_24.inc @@ -57,7 +57,7 @@ .public DivideInt .public InitPreprocessorArgs .public sub_020107C4 -.public sub_02018428 +.public sub_02017CB4 .public IncrementNbEggsHatched .public sub_020107DC .public GetAdventureLogCompleted diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 25e37a2a..5f7a2883 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -25,7 +25,7 @@ .public ov11_0230BA64 .public ShowMessageInDBox .public ov11_0230B9BC -.public sub_020182B8 +.public sub_02017C74 .public sub_0202E3CC .public MemAlloc .public sub_0202F2C4 diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 4891c922..a6884d37 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -31,7 +31,6 @@ .public sub_0203FD44 .public sub_02027B1C .public ov29_022EBAB0 -.public sub_020182B8 .public ov29_022EBB68 .public IsHeldItemInBag .public ov29_0234FBD4 diff --git a/asm/overlay_13.s b/asm/overlay_13.s index 72499f74..23f16cc2 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -401,7 +401,7 @@ _0238A6B4: cmp r0, #0x4b blt _0238A6E0 add r0, sp, #0x14 - bl sub_0207B9EC + bl sub_0204A198 ldrb r1, [sp, #0x19] ldr r0, _0238B4F8 ; =0x0238CEA0 ldr r0, [r0] @@ -409,7 +409,7 @@ _0238A6B4: b _0238A6F4 _0238A6E0: add r0, sp, #0xd4 - bl sub_0207BA08 + bl sub_02004F74 ldr r0, _0238B4F8 ; =0x0238CEA0 ldrb r1, [sp, #0xd5] ldr r0, [r0] @@ -987,7 +987,7 @@ _0238AF38: b _0238BD74 _0238AF44: ldr r0, _0238B534 ; =0x00002208 - bl sub_02018428 + bl sub_02017CB4 ldr r0, _0238B4F8 ; =0x0238CEA0 mov r2, #3 ldr r1, [r0] @@ -1020,7 +1020,7 @@ _0238AFA0: b _0238BD74 _0238AFBC: ldr r0, _0238B534 ; =0x00002208 - bl sub_02018428 + bl sub_02017CB4 ldr r0, _0238B4F8 ; =0x0238CEA0 mov r2, #2 ldr r1, [r0] @@ -1442,7 +1442,7 @@ _0238B5A4: ldr r2, [r3, #0x20] add r2, r2, #1 str r2, [r3, #0x20] - bl sub_020182B8 + bl sub_02017C74 b _0238BD74 _0238B608: ldr r1, [r0, #0x28] diff --git a/asm/overlay_16.s b/asm/overlay_16.s index d2f201cd..0619a406 100644 --- a/asm/overlay_16.s +++ b/asm/overlay_16.s @@ -854,7 +854,7 @@ _0238AD8C: bl sub_02010260 _0238ADA0: ldr r0, _0238B124 ; =0x00003F01 - bl sub_02018428 + bl sub_02017CB4 mov r0, #8 bl sub_0201820C ldr r0, _0238B0CC ; =0x0238CE40 @@ -1952,7 +1952,7 @@ _0238BD8C: bl sub_02010260 _0238BDA0: ldr r0, _0238C124 ; =0x00003F01 - bl sub_02018428 + bl sub_02017CB4 mov r0, #8 bl sub_0201820C ldr r0, _0238C0CC ; =0x0238CE40 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 55004ed2..01ee3c64 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -1741,7 +1741,7 @@ _0238C570: ; jump table _0238C5AC: ldr r0, _0238C718 ; =0x00003F07 mov r1, #0x100 - bl sub_020182B8 + bl sub_02017C74 mov r0, r5 mov r4, #1 bl sub_02041000 @@ -1770,7 +1770,7 @@ _0238C5EC: _0238C614: ldr r0, _0238C718 ; =0x00003F07 mov r1, #0x100 - bl sub_020182B8 + bl sub_02017C74 _0238C620: mov r0, r5 bl sub_020412B0 @@ -1787,7 +1787,7 @@ _0238C638: beq _0238C664 ldr r0, _0238C718 ; =0x00003F07 mov r1, #0x100 - bl sub_020182B8 + bl sub_02017C74 mov r0, r5 bl sub_02041394 b _0238C6E4 diff --git a/asm/overlay_24.s b/asm/overlay_24.s index 8d6c4624..b65c85f0 100644 --- a/asm/overlay_24.s +++ b/asm/overlay_24.s @@ -675,7 +675,7 @@ _0238AA5C: b _0238B37C _0238AAD8: ldr r0, _0238B3B0 ; =0x0000220F - bl sub_02018428 + bl sub_02017CB4 bl ov24_0238C47C ldr r0, _0238B384 ; =0x0238C600 mov r3, #1 @@ -811,7 +811,7 @@ _0238AC80: b _0238B37C _0238ACE0: ldr r0, _0238B3B0 ; =0x0000220F - bl sub_02018428 + bl sub_02017CB4 ldr r0, _0238B384 ; =0x0238C600 ldr r2, _0238B3C4 ; =0x00000715 ldr r1, [r0] @@ -1610,7 +1610,7 @@ _0238B838: b _0238C158 _0238B8B4: ldr r0, _0238C18C ; =0x0000220F - bl sub_02018428 + bl sub_02017CB4 bl ov24_0238C47C ldr r0, _0238C164 ; =0x0238C600 mov r3, #1 @@ -1746,7 +1746,7 @@ _0238BA5C: b _0238C158 _0238BABC: ldr r0, _0238C18C ; =0x0000220F - bl sub_02018428 + bl sub_02017CB4 ldr r0, _0238C164 ; =0x0238C600 ldr r2, _0238C1A0 ; =0x00000715 ldr r1, [r0] diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 34e560fd..778bd03a 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -95,7 +95,7 @@ _0238A260: beq _0238A674 ldr r0, _0238A680 ; =0x00003F02 mov r1, #0x100 - bl sub_020182B8 + bl sub_02017C74 ldr r0, _0238A67C ; =0x0238B5E0 ldr r0, [r0] add r0, r0, #0xc