diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index c1c4d8f4..2456d442 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -110,9 +110,9 @@ .public ov29_023529B0 .public ov29_02353324 .public ov29_02353538 -.public ov30_023853BC -.public ov30_023853E0 -.public ov30_02385FE0 +.public ov31_023853BC +.public ov31_023853E0 +.public ov31_02385FE0 .public ov31_023860A4 .public ov31_0238619C .public ov31_02386204 diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc index a40e0bd3..0faf022f 100644 --- a/asm/include/overlay_29_0234DDF4.inc +++ b/asm/include/overlay_29_0234DDF4.inc @@ -4,6 +4,7 @@ .public DrawTileGrid .public EntityIsValid__0234DDD0 .public EntityIsValid__0234EC14 +.public EntryOverlay31 .public GetActiveTeamMember .public GetItemMoveId16 .public GetItemToUse @@ -14,6 +15,7 @@ .public HideTileGrid .public InitMove .public LoadOverlay +.public MovesMenu .public OthersMenu .public ov29_022E0B44 .public ov29_022E2A78 @@ -39,14 +41,12 @@ .public ov29_0235352C .public ov29_02353538 .public ov29_02382804 -.public ov30_02382820 -.public ov30_02382E08 -.public ov30_02382E18 -.public ov30_0238367C -.public ov30_023838E4 -.public ov30_023851C0 -.public ov30_023853BC -.public ov30_02385FE0 +.public ov31_02382E08 +.public ov31_02382E18 +.public ov31_0238367C +.public ov31_023838E4 +.public ov31_023853BC +.public ov31_02385FE0 .public ov31_023860A4 .public ov31_0238619C .public ov31_02386C6C diff --git a/asm/include/overlay_29_0234EC38.inc b/asm/include/overlay_29_0234EC38.inc index 70e30cdd..1ad3a590 100644 --- a/asm/include/overlay_29_0234EC38.inc +++ b/asm/include/overlay_29_0234EC38.inc @@ -7,6 +7,7 @@ .public DungeonGoesUp .public DungeonRequestsDoneWrapper .public EntityIsValid__0234EC14 +.public EntryOverlay31 .public GetAcceptedMission .public GetActiveTeamMember .public GetDungeonMode @@ -69,9 +70,8 @@ .public ov29_0234EB28 .public ov29_0234EBAC .public ov29_0234EBCC -.public ov30_02382820 -.public ov30_023833D8 -.public ov30_02383434 +.public ov31_023833D8 +.public ov31_02383434 .public ov31_0238647C .public ov31_02388114 .public ov31_02388444 diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 6ffb95da..eb3fcf62 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -1369,14 +1369,14 @@ _0231DE6C: mov r1, r8 mov r3, r2 str r8, [sp] - bl ov30_023853BC + bl ov31_023853BC b _0231DEB0 _0231DE9C: mov r0, r7 mov r1, fp mov r3, r2 str fp, [sp] - bl ov30_023853E0 + bl ov31_023853E0 _0231DEB0: cmp r0, #0 beq _0231DF1C @@ -1411,7 +1411,7 @@ _0231DF1C: cmp r0, #0x1d bne _0231DF34 add r0, r4, #0x4a - bl ov30_02385FE0 + bl ov31_02385FE0 b _0231DE6C _0231DF34: cmp r0, #0x20 diff --git a/asm/overlay_29_0234DDF4.s b/asm/overlay_29_0234DDF4.s index 06adc10c..684f27ad 100644 --- a/asm/overlay_29_0234DDF4.s +++ b/asm/overlay_29_0234DDF4.s @@ -60,12 +60,12 @@ _0234DE78: cmp sl, #0 mvnne r4, #0 bne _0234DEE8 - bl ov30_02382820 + bl EntryOverlay31 mov r5, #0x1d _0234DED0: mov r0, r5 bl AdvanceFrame - bl ov30_02382E08 + bl ov31_02382E08 mov r4, r0 cmp r4, #0xa beq _0234DED0 @@ -86,7 +86,7 @@ _0234DEF8: str r8, [sp, #0x18] bl GetLeader add r1, sp, #0x14 - bl ov30_023838E4 + bl ov31_023838E4 cmp r0, #0 add r0, sp, #0x14 movne r5, r7 @@ -95,7 +95,7 @@ _0234DEF8: beq _0234DF5C bl GetLeader add r1, sp, #0x14 - bl ov30_023838E4 + bl ov31_023838E4 cmp r0, #0 beq _0234DF5C mov r0, #1 @@ -112,7 +112,7 @@ _0234DF5C: orr r1, r1, #4 strb r1, [r0] bl GetLeaderAction - bl ov30_0238367C + bl ov31_0238367C mov r0, #1 bl ov29_022EB398 mov r4, #1 @@ -289,7 +289,7 @@ _0234E1F0: b _0234E28C _0234E200: bl GetLeaderAction - bl ov30_023851C0 + bl MovesMenu mov r7, #0 mov r8, r7 b _0234E27C @@ -425,14 +425,14 @@ _0234E3CC: mov r1, #0 mov r2, #1 str r7, [sp] - bl ov30_023853BC + bl ov31_023853BC cmp r0, #0 movne r5, r8 bl ov29_022F0B9C cmp r0, #0x1d bne _0234E40C bl GetLeaderAction - bl ov30_02385FE0 + bl ov31_02385FE0 b _0234E3CC _0234E40C: bl ov29_022F0B9C @@ -529,7 +529,7 @@ _0234E4F0: str r0, [sp, #0x2c] bl GetLeader add r1, sp, #0x28 - bl ov30_023838E4 + bl ov31_023838E4 cmp r0, #0 add r0, sp, #0x28 movne r5, r7 @@ -538,7 +538,7 @@ _0234E4F0: beq _0234E5A4 bl GetLeader add r1, sp, #0x28 - bl ov30_023838E4 + bl ov31_023838E4 cmp r0, #0 beq _0234E5A4 mov r0, #1 @@ -555,7 +555,7 @@ _0234E5A4: orr r1, r1, #4 strb r1, [r0] bl GetLeaderAction - bl ov30_0238367C + bl ov31_0238367C mov r0, #1 bl ov29_022EB398 mov r4, #4 @@ -668,7 +668,7 @@ _0234E75C: bl ov29_022EB398 bl GetLeader mov r1, #1 - bl ov30_02382E18 + bl ov31_02382E18 bl ov29_022F0B9C cmp r0, #0 beq _0234E7F8 @@ -682,7 +682,7 @@ _0234E78C: bl ov29_022EB398 bl GetLeader mov r1, #1 - bl ov30_02382E18 + bl ov31_02382E18 bl ov29_022F0B9C cmp r0, #0 beq _0234E7F8 @@ -787,7 +787,7 @@ ov29_0234E8F8: ; 0x0234E8F8 bl LoadOverlay mov r0, r5 mov r1, r4 - bl ov30_02382E18 + bl ov31_02382E18 mov r0, #0x22 bl OverlayIsLoaded cmp r0, #0 diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index e151f704..2d40e491 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -978,11 +978,11 @@ _0234F910: ; jump table b _0234F9A4 ; case 8 _0234F934: ldr r0, _0234F9E0 ; =ov29_0234F77C - bl ov30_023833D8 + bl ov31_023833D8 b _0234F9B4 _0234F940: ldr r0, _0234F9E0 ; =ov29_0234F77C - bl ov30_02383434 + bl ov31_02383434 b _0234F9B4 _0234F94C: mov r0, #2 @@ -1013,7 +1013,7 @@ _0234F998: str r0, [r1] b _0234F9B4 _0234F9A4: - bl ov30_02382820 + bl EntryOverlay31 ldr r0, _0234F9C8 ; =ov29_0235383C mov r1, #8 str r1, [r0]