diff --git a/asm/ov00/Map/Course.s b/asm/ov00/Map/Course.s index 8995602a..a54df401 100644 --- a/asm/ov00/Map/Course.s +++ b/asm/ov00/Map/Course.s @@ -56,7 +56,7 @@ _ZN6Course18func_ov00_0207ca78Eici: ; 0x0207ca78 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r2 - bl _ZN6Course11Find_Unk_ccEj + bl _ZN6Course11FindMapDataEj movs r1, r0 ldmeqia sp!, {r3, r4, r5, pc} strb r4, [r1] @@ -161,14 +161,14 @@ _0207cb90: ldmia sp!, {r3, r4, r5, pc} arm_func_end _ZN6Course14FindMapGridPosEP5Vec2bPS_j - .global _ZN6Course14Find_Unk_cc_14Ei - arm_func_start _ZN6Course14Find_Unk_cc_14Ei -_ZN6Course14Find_Unk_cc_14Ei: ; 0x0207cbd8 + .global _ZN6Course13FindMapCenterEi + arm_func_start _ZN6Course13FindMapCenterEi +_ZN6Course13FindMapCenterEi: ; 0x0207cbd8 stmdb sp!, {r3, lr} - bl _ZN6Course11Find_Unk_ccEj + bl _ZN6Course11FindMapDataEj add r0, r0, #0x14 ldmia sp!, {r3, pc} - arm_func_end _ZN6Course14Find_Unk_cc_14Ei + arm_func_end _ZN6Course13FindMapCenterEi .global _ZN6Course18func_ov00_0207cbe8Ei arm_func_start _ZN6Course18func_ov00_0207cbe8Ei @@ -213,16 +213,16 @@ _ZN6Course18func_ov00_0207cc24Ei: ; 0x0207cc24 ldmia sp!, {r3, pc} arm_func_end _ZN6Course18func_ov00_0207cc24Ei - .global _ZN6Course14Find_Unk_cc_08Ev - arm_func_start _ZN6Course14Find_Unk_cc_08Ev -_ZN6Course14Find_Unk_cc_08Ev: ; 0x0207cc6c + .global _ZN6Course18FindMapData_Unk_08Ei + arm_func_start _ZN6Course18FindMapData_Unk_08Ei +_ZN6Course18FindMapData_Unk_08Ei: ; 0x0207cc6c stmdb sp!, {r3, lr} - bl _ZN6Course11Find_Unk_ccEj + bl _ZN6Course11FindMapDataEj cmp r0, #0 moveq r0, #0 ldrne r0, [r0, #8] ldmia sp!, {r3, pc} - arm_func_end _ZN6Course14Find_Unk_cc_08Ev + arm_func_end _ZN6Course18FindMapData_Unk_08Ei .global _ZN6Course14GetMCSFilePathEiii arm_func_start _ZN6Course14GetMCSFilePathEiii @@ -1064,44 +1064,44 @@ _0207d770: bx lr arm_func_end _ZN6Course15GetAdjacentMapYEi - .global _ZN6Course21FindCurrent_Unk_cc_04Ev - arm_func_start _ZN6Course21FindCurrent_Unk_cc_04Ev -_ZN6Course21FindCurrent_Unk_cc_04Ev: ; 0x0207d778 + .global _ZN6Course25FindCurrentMapData_Unk_04Ev + arm_func_start _ZN6Course25FindCurrentMapData_Unk_04Ev +_ZN6Course25FindCurrentMapData_Unk_04Ev: ; 0x0207d778 stmdb sp!, {r3, lr} - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv ldrh r0, [r0, #4] ldmia sp!, {r3, pc} - arm_func_end _ZN6Course21FindCurrent_Unk_cc_04Ev + arm_func_end _ZN6Course25FindCurrentMapData_Unk_04Ev - .global _ZN6Course14Find_Unk_cc_04Ei - arm_func_start _ZN6Course14Find_Unk_cc_04Ei -_ZN6Course14Find_Unk_cc_04Ei: ; 0x0207d788 + .global _ZN6Course18FindMapData_Unk_04Ei + arm_func_start _ZN6Course18FindMapData_Unk_04Ei +_ZN6Course18FindMapData_Unk_04Ei: ; 0x0207d788 stmdb sp!, {r3, lr} - bl _ZN6Course11Find_Unk_ccEj + bl _ZN6Course11FindMapDataEj cmp r0, #0 ldreq r0, _0207d7a0 ; =0x0000ffff ldrneh r0, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end _ZN6Course14Find_Unk_cc_04Ei + arm_func_end _ZN6Course18FindMapData_Unk_04Ei _0207d7a0: .word 0x0000ffff - .global _ZN6Course14Find_Unk_cc_0cEi - arm_func_start _ZN6Course14Find_Unk_cc_0cEi -_ZN6Course14Find_Unk_cc_0cEi: ; 0x0207d7a4 + .global _ZN6Course18FindMapData_Unk_0cEi + arm_func_start _ZN6Course18FindMapData_Unk_0cEi +_ZN6Course18FindMapData_Unk_0cEi: ; 0x0207d7a4 stmdb sp!, {r3, lr} - bl _ZN6Course11Find_Unk_ccEj + bl _ZN6Course11FindMapDataEj cmp r0, #0 moveq r0, #0 ldrne r0, [r0, #0xc] ldmia sp!, {r3, pc} - arm_func_end _ZN6Course14Find_Unk_cc_0cEi + arm_func_end _ZN6Course18FindMapData_Unk_0cEi .global _ZN6Course18func_ov00_0207d7bcEv arm_func_start _ZN6Course18func_ov00_0207d7bcEv _ZN6Course18func_ov00_0207d7bcEv: ; 0x0207d7bc stmdb sp!, {r3, lr} - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv ldr r2, _0207d7d8 ; =data_027e103c ldrh r1, [r0, #4] ldr r0, [r2] @@ -1187,129 +1187,129 @@ _ZN6Course8SetFlag1Ej: ; 0x0207d894 bx lr arm_func_end _ZN6Course8SetFlag1Ej - .global _ZN6Course15SetFlag0_Unk_ccEib - arm_func_start _ZN6Course15SetFlag0_Unk_ccEib -_ZN6Course15SetFlag0_Unk_ccEib: ; 0x0207d8b4 + .global _ZN6Course15SetMapDataFlag0Eib + arm_func_start _ZN6Course15SetMapDataFlag0Eib +_ZN6Course15SetMapDataFlag0Eib: ; 0x0207d8b4 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r5 mov r2, r4 bl func_ov00_0209740c ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN6Course15SetFlag0_Unk_ccEib + arm_func_end _ZN6Course15SetMapDataFlag0Eib - .global _ZN6Course15GetFlag0_Unk_ccEi - arm_func_start _ZN6Course15GetFlag0_Unk_ccEi -_ZN6Course15GetFlag0_Unk_ccEi: ; 0x0207d8d4 + .global _ZN6Course15GetMapDataFlag0Ei + arm_func_start _ZN6Course15GetMapDataFlag0Ei +_ZN6Course15GetMapDataFlag0Ei: ; 0x0207d8d4 stmdb sp!, {r4, lr} mov r4, r1 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r4 bl func_ov00_02097458 ldmia sp!, {r4, pc} - arm_func_end _ZN6Course15GetFlag0_Unk_ccEi + arm_func_end _ZN6Course15GetMapDataFlag0Ei - .global _ZN6Course15SetFlag1_Unk_ccEib - arm_func_start _ZN6Course15SetFlag1_Unk_ccEib -_ZN6Course15SetFlag1_Unk_ccEib: ; 0x0207d8ec + .global _ZN6Course15SetMapDataFlag1Eib + arm_func_start _ZN6Course15SetMapDataFlag1Eib +_ZN6Course15SetMapDataFlag1Eib: ; 0x0207d8ec stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r5 mov r2, r4 bl func_ov00_02097478 ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN6Course15SetFlag1_Unk_ccEib + arm_func_end _ZN6Course15SetMapDataFlag1Eib - .global _ZN6Course15GetFlag1_Unk_ccEi - arm_func_start _ZN6Course15GetFlag1_Unk_ccEi -_ZN6Course15GetFlag1_Unk_ccEi: ; 0x0207d90c + .global _ZN6Course15GetMapDataFlag1Ei + arm_func_start _ZN6Course15GetMapDataFlag1Ei +_ZN6Course15GetMapDataFlag1Ei: ; 0x0207d90c stmdb sp!, {r4, lr} mov r4, r1 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r4 bl func_ov00_020974c4 ldmia sp!, {r4, pc} - arm_func_end _ZN6Course15GetFlag1_Unk_ccEi + arm_func_end _ZN6Course15GetMapDataFlag1Ei - .global _ZN6Course15SetFlag2_Unk_ccEib - arm_func_start _ZN6Course15SetFlag2_Unk_ccEib -_ZN6Course15SetFlag2_Unk_ccEib: ; 0x0207d924 + .global _ZN6Course15SetMapDataFlag2Eib + arm_func_start _ZN6Course15SetMapDataFlag2Eib +_ZN6Course15SetMapDataFlag2Eib: ; 0x0207d924 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r5 mov r2, r4 bl func_ov00_020974e4 ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN6Course15SetFlag2_Unk_ccEib + arm_func_end _ZN6Course15SetMapDataFlag2Eib - .global _ZN6Course15GetFlag2_Unk_ccEi - arm_func_start _ZN6Course15GetFlag2_Unk_ccEi -_ZN6Course15GetFlag2_Unk_ccEi: ; 0x0207d944 + .global _ZN6Course15GetMapDataFlag2Ei + arm_func_start _ZN6Course15GetMapDataFlag2Ei +_ZN6Course15GetMapDataFlag2Ei: ; 0x0207d944 stmdb sp!, {r4, lr} mov r4, r1 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r4 bl func_ov00_02097530 ldmia sp!, {r4, pc} - arm_func_end _ZN6Course15GetFlag2_Unk_ccEi + arm_func_end _ZN6Course15GetMapDataFlag2Ei - .global _ZN6Course15SetFlag3_Unk_ccEib - arm_func_start _ZN6Course15SetFlag3_Unk_ccEib -_ZN6Course15SetFlag3_Unk_ccEib: ; 0x0207d95c + .global _ZN6Course15SetMapDataFlag3Eib + arm_func_start _ZN6Course15SetMapDataFlag3Eib +_ZN6Course15SetMapDataFlag3Eib: ; 0x0207d95c stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r5 mov r2, r4 bl func_ov00_02097550 ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN6Course15SetFlag3_Unk_ccEib + arm_func_end _ZN6Course15SetMapDataFlag3Eib - .global _ZN6Course18func_ov00_0207d97cEi - arm_func_start _ZN6Course18func_ov00_0207d97cEi -_ZN6Course18func_ov00_0207d97cEi: ; 0x0207d97c + .global _ZN6Course15GetMapDataFlag3Ei + arm_func_start _ZN6Course15GetMapDataFlag3Ei +_ZN6Course15GetMapDataFlag3Ei: ; 0x0207d97c stmdb sp!, {r4, lr} mov r4, r1 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r4 bl func_ov00_0209759c ldmia sp!, {r4, pc} - arm_func_end _ZN6Course18func_ov00_0207d97cEi + arm_func_end _ZN6Course15GetMapDataFlag3Ei - .global _ZN6Course18func_ov00_0207d994Eii - arm_func_start _ZN6Course18func_ov00_0207d994Eii -_ZN6Course18func_ov00_0207d994Eii: ; 0x0207d994 + .global _ZN6Course15SetMapDataFlag4Eii + arm_func_start _ZN6Course15SetMapDataFlag4Eii +_ZN6Course15SetMapDataFlag4Eii: ; 0x0207d994 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r5 mov r2, r4 bl func_ov00_020975bc ldmia sp!, {r3, r4, r5, pc} - arm_func_end _ZN6Course18func_ov00_0207d994Eii + arm_func_end _ZN6Course15SetMapDataFlag4Eii - .global _ZN6Course15GetFlag3_Unk_ccEi - arm_func_start _ZN6Course15GetFlag3_Unk_ccEi -_ZN6Course15GetFlag3_Unk_ccEi: ; 0x0207d9b4 + .global _ZN6Course15GetMapDataFlag4Ei + arm_func_start _ZN6Course15GetMapDataFlag4Ei +_ZN6Course15GetMapDataFlag4Ei: ; 0x0207d9b4 stmdb sp!, {r4, lr} mov r4, r1 - bl _ZN6Course18FindCurrent_Unk_ccEv + bl _ZN6Course18FindCurrentMapDataEv mov r1, r4 bl func_ov00_02097608 ldmia sp!, {r4, pc} - arm_func_end _ZN6Course15GetFlag3_Unk_ccEi + arm_func_end _ZN6Course15GetMapDataFlag4Ei - .global _ZN6Course11Find_Unk_ccEj - arm_func_start _ZN6Course11Find_Unk_ccEj -_ZN6Course11Find_Unk_ccEj: ; 0x0207d9cc + .global _ZN6Course11FindMapDataEj + arm_func_start _ZN6Course11FindMapDataEj +_ZN6Course11FindMapDataEj: ; 0x0207d9cc ldrb r2, [r0, #0xb0] mov ip, #0 cmp r2, #0 @@ -1331,22 +1331,22 @@ _0207d9fc: _0207da0c: mov r0, #0 bx lr - arm_func_end _ZN6Course11Find_Unk_ccEj + arm_func_end _ZN6Course11FindMapDataEj - .global _ZN6Course18FindCurrent_Unk_ccEv - arm_func_start _ZN6Course18FindCurrent_Unk_ccEv -_ZN6Course18FindCurrent_Unk_ccEv: ; 0x0207da14 + .global _ZN6Course18FindCurrentMapDataEv + arm_func_start _ZN6Course18FindCurrentMapDataEv +_ZN6Course18FindCurrentMapDataEv: ; 0x0207da14 ldrb r3, [r0, #0x1c] mov r1, #0xa ldrb r2, [r0, #0x1d] mla r1, r3, r1, r0 add r1, r1, r2 - ldr ip, _0207da34 ; =_ZN6Course11Find_Unk_ccEj + ldr ip, _0207da34 ; =_ZN6Course11FindMapDataEj ldrb r1, [r1, #0x20] bx ip .align 2, 0 - arm_func_end _ZN6Course18FindCurrent_Unk_ccEv -_0207da34: .word _ZN6Course11Find_Unk_ccEj + arm_func_end _ZN6Course18FindCurrentMapDataEv +_0207da34: .word _ZN6Course11FindMapDataEj .data .global data_ov00_020e2058 diff --git a/asm/ov00/Map/MapManager.inc b/asm/ov00/Map/MapManager.inc index e6197a44..ea805c5b 100644 --- a/asm/ov00/Map/MapManager.inc +++ b/asm/ov00/Map/MapManager.inc @@ -9,10 +9,10 @@ .extern _ZN6Course18func_ov00_0207caa8EiPiPc .extern _ZN6Course18func_ov00_0207cb30Ei .extern _ZN6Course14FindMapGridPosEP5Vec2bPS_j -.extern _ZN6Course14Find_Unk_cc_14Ei +.extern _ZN6Course13FindMapCenterEi .extern _ZN6Course18func_ov00_0207cbe8Ei .extern _ZN6Course18func_ov00_0207cc24Ei -.extern _ZN6Course14Find_Unk_cc_08Ev +.extern _ZN6Course18FindMapData_Unk_08Ei .extern _ZN6Course18func_ov00_0207ce20EiiPci .extern _ZN6Course18func_ov00_0207d404Eiii .extern _ZN6Course22IsCurrentMapInMainGridEv @@ -21,23 +21,23 @@ .extern _ZN6Course21GetScreenMapCellSizeXEv .extern _ZN6Course21GetScreenMapCellSizeYEv .extern _ZN6Course13Get_Unk_c8_00Ev -.extern _ZN6Course21FindCurrent_Unk_cc_04Ev -.extern _ZN6Course14Find_Unk_cc_04Ei +.extern _ZN6Course25FindCurrentMapData_Unk_04Ev +.extern _ZN6Course18FindMapData_Unk_04Ei .extern _ZN6Course18func_ov00_0207d7bcEv .extern _ZN6Course8SetFlag0Ejb .extern _ZN6Course8GetFlag0Ej .extern _ZN6Course8SetFlag1Ejb .extern _ZN6Course8SetFlag1Ej -.extern _ZN6Course15SetFlag0_Unk_ccEib -.extern _ZN6Course15GetFlag0_Unk_ccEi -.extern _ZN6Course15SetFlag1_Unk_ccEib -.extern _ZN6Course15GetFlag1_Unk_ccEi -.extern _ZN6Course15SetFlag2_Unk_ccEib -.extern _ZN6Course15GetFlag2_Unk_ccEi -.extern _ZN6Course15SetFlag3_Unk_ccEib -.extern _ZN6Course18func_ov00_0207d97cEi -.extern _ZN6Course18func_ov00_0207d994Eii -.extern _ZN6Course15GetFlag3_Unk_ccEi +.extern _ZN6Course15SetMapDataFlag0Eib +.extern _ZN6Course15GetMapDataFlag0Ei +.extern _ZN6Course15SetMapDataFlag1Eib +.extern _ZN6Course15GetMapDataFlag1Ei +.extern _ZN6Course15SetMapDataFlag2Eib +.extern _ZN6Course15GetMapDataFlag2Ei +.extern _ZN6Course15SetMapDataFlag3Eib +.extern _ZN6Course15GetMapDataFlag3Ei +.extern _ZN6Course15SetMapDataFlag4Eii +.extern _ZN6Course15GetMapDataFlag4Ei .extern _ZN9SysObjectnwEmPjj .extern __register_global_object .extern data_027e077c diff --git a/asm/ov00/Map/MapManager.s b/asm/ov00/Map/MapManager.s index 983ea98f..ac7be99f 100644 --- a/asm/ov00/Map/MapManager.s +++ b/asm/ov00/Map/MapManager.s @@ -981,11 +981,11 @@ _02082bac: ldrb r7, [r5, #0x12] ldr r0, [r6] mov r4, #0 - bl _ZN6Course21FindCurrent_Unk_cc_04Ev + bl _ZN6Course25FindCurrentMapData_Unk_04Ev mov r1, r7 mov r7, r0 ldr r0, [r6] - bl _ZN6Course14Find_Unk_cc_04Ei + bl _ZN6Course18FindMapData_Unk_04Ei cmp r7, r0 ldrb r2, [sp] ldr r1, [r6] @@ -1738,7 +1738,7 @@ _ZN10MapManager18func_ov00_020834bcEP5Vec3pii: ; 0x020834bc add r2, r4, r3 mov r4, r1 ldrb r1, [r2, #0x20] - bl _ZN6Course14Find_Unk_cc_14Ei + bl _ZN6Course13FindMapCenterEi ldr r1, [r0] str r1, [r4] ldr r1, [r0, #4] @@ -1768,7 +1768,7 @@ _ZN10MapManager18func_ov00_02083524EP5Vec3pii: ; 0x02083524 add r2, ip, r3 mov r4, r1 ldrb r1, [r2, #0x20] - bl _ZN6Course14Find_Unk_cc_14Ei + bl _ZN6Course13FindMapCenterEi ldr r1, [r0] str r1, [r4] ldr r1, [r0, #4] @@ -1807,7 +1807,7 @@ _ZN10MapManager18func_ov00_02083588Ev: ; 0x02083588 bl _ZN10MapManager18func_ov00_02082d08Ev mov r1, r0 ldr r0, [r4] - bl _ZN6Course14Find_Unk_cc_08Ev + bl _ZN6Course18FindMapData_Unk_08Ei ldmia sp!, {r4, pc} arm_func_end _ZN10MapManager18func_ov00_02083588Ev @@ -3771,7 +3771,7 @@ _02084b8c: _02084bb0: ldr r0, [r0] mov r2, r3 - bl _ZN6Course15SetFlag0_Unk_ccEib + bl _ZN6Course15SetMapDataFlag0Eib ldmia sp!, {r3, pc} _02084bc0: ldr r0, [r0] @@ -3812,7 +3812,7 @@ _02084c0c: ldmia sp!, {r3, pc} _02084c30: ldr r0, [r0] - bl _ZN6Course15GetFlag0_Unk_ccEi + bl _ZN6Course15GetMapDataFlag0Ei ldmia sp!, {r3, pc} _02084c3c: ldr r0, [r0] @@ -3830,22 +3830,22 @@ _02084c54: .global _ZN10MapManager18func_ov00_02084c5cEii arm_func_start _ZN10MapManager18func_ov00_02084c5cEii _ZN10MapManager18func_ov00_02084c5cEii: ; 0x02084c5c - ldr ip, _02084c68 ; =_ZN6Course15SetFlag1_Unk_ccEib + ldr ip, _02084c68 ; =_ZN6Course15SetMapDataFlag1Eib ldr r0, [r0] bx ip .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_02084c5cEii -_02084c68: .word _ZN6Course15SetFlag1_Unk_ccEib +_02084c68: .word _ZN6Course15SetMapDataFlag1Eib .global _ZN10MapManager18func_ov00_02084c6cEi arm_func_start _ZN10MapManager18func_ov00_02084c6cEi _ZN10MapManager18func_ov00_02084c6cEi: ; 0x02084c6c - ldr ip, _02084c78 ; =_ZN6Course15GetFlag1_Unk_ccEi + ldr ip, _02084c78 ; =_ZN6Course15GetMapDataFlag1Ei ldr r0, [r0] bx ip .align 2, 0 arm_func_end _ZN10MapManager18func_ov00_02084c6cEi -_02084c78: .word _ZN6Course15GetFlag1_Unk_ccEi +_02084c78: .word _ZN6Course15GetMapDataFlag1Ei .global _ZN10MapManager18func_ov00_02084c7cEi arm_func_start _ZN10MapManager18func_ov00_02084c7cEi @@ -3854,7 +3854,7 @@ _ZN10MapManager18func_ov00_02084c7cEi: ; 0x02084c7c cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course15SetFlag2_Unk_ccEib + bl _ZN6Course15SetMapDataFlag2Eib ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084c7cEi @@ -3866,7 +3866,7 @@ _ZN10MapManager18func_ov00_02084c94Ei: ; 0x02084c94 movlt r0, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course15GetFlag2_Unk_ccEi + bl _ZN6Course15GetMapDataFlag2Ei ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084c94Ei @@ -3877,7 +3877,7 @@ _ZN10MapManager18func_ov00_02084cb0Ei: ; 0x02084cb0 cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course15SetFlag3_Unk_ccEib + bl _ZN6Course15SetMapDataFlag3Eib ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084cb0Ei @@ -3889,7 +3889,7 @@ _ZN10MapManager18func_ov00_02084cc8Ei: ; 0x02084cc8 movlt r0, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course18func_ov00_0207d97cEi + bl _ZN6Course15GetMapDataFlag3Ei ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084cc8Ei @@ -3900,7 +3900,7 @@ _ZN10MapManager18func_ov00_02084ce4Ei: ; 0x02084ce4 cmp r1, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course18func_ov00_0207d994Eii + bl _ZN6Course15SetMapDataFlag4Eii ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084ce4Ei @@ -3912,7 +3912,7 @@ _ZN10MapManager18func_ov00_02084cfcEi: ; 0x02084cfc movlt r0, #0 ldmltia sp!, {r3, pc} ldr r0, [r0] - bl _ZN6Course15GetFlag3_Unk_ccEi + bl _ZN6Course15GetMapDataFlag4Ei ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager18func_ov00_02084cfcEi diff --git a/asm/ov00/ov00_0207da38.inc b/asm/ov00/ov00_0207da38.inc index 2834f6a1..5632b1cb 100644 --- a/asm/ov00/ov00_0207da38.inc +++ b/asm/ov00/ov00_0207da38.inc @@ -1,7 +1,7 @@ #pragma once .extern Divide .extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p -.extern _ZN6Course14Find_Unk_cc_14Ei +.extern _ZN6Course13FindMapCenterEi .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern data_027e0618 diff --git a/asm/ov00/ov00_0207da38.s b/asm/ov00/ov00_0207da38.s index c8342dc2..d366c90b 100644 --- a/asm/ov00/ov00_0207da38.s +++ b/asm/ov00/ov00_0207da38.s @@ -222,7 +222,7 @@ func_ov00_0207dce4: ; 0x0207dce4 mov r2, r3, lsl #0xc str r5, [sp] str r2, [sp, #4] - bl _ZN6Course14Find_Unk_cc_14Ei + bl _ZN6Course13FindMapCenterEi mov ip, r5 add r5, sp, #0x20 ldmia r0, {r0, r1, r2} diff --git a/asm/ov04.inc b/asm/ov04.inc index df85ac98..c9b31fdb 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -57,10 +57,10 @@ .extern _ZN14OverlayManager6UnloadEj .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev -.extern _ZN6Course11Find_Unk_ccEj +.extern _ZN6Course11FindMapDataEj .extern _ZN6Course13SetCourseNameEPc .extern _ZN6Course14FindMapGridPosEP5Vec2bPS_j -.extern _ZN6Course14Find_Unk_cc_0cEi +.extern _ZN6Course18FindMapData_Unk_0cEi .extern _ZN6Course14GetMCSFilePathEiii .extern _ZN6Course14GetMRCFilePathEiii .extern _ZN6Course15IsMapInMainGridEj diff --git a/asm/ov04.s b/asm/ov04.s index 5b66ffcb..6645d10b 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -24951,7 +24951,7 @@ func_ov04_0210cc58: ; 0x0210cc58 bne _0210cc72 add r0, r1, #0 add r1, r2, #0 - blx _ZN6Course14Find_Unk_cc_0cEi + blx _ZN6Course18FindMapData_Unk_0cEi add r1, r0, #0 ldr r0, _0210cc78 ; =gOverlayManager bl func_ov03_020faa64 @@ -29104,7 +29104,7 @@ func_ov04_0210f07c: ; 0x0210f07c ldrb r1, [r4] cmp r1, #0xff beq _0210f0f4 - blx _ZN6Course11Find_Unk_ccEj + blx _ZN6Course11FindMapDataEj cmp r0, #0 bne _0210f0f4 ldr r1, _0210f0f8 ; =data_027e0ce0 diff --git a/include/Map/CameraViewpoint.hpp b/include/Map/CameraViewpoint.hpp index 0fde9bdc..c952078b 100644 --- a/include/Map/CameraViewpoint.hpp +++ b/include/Map/CameraViewpoint.hpp @@ -9,7 +9,7 @@ class CameraViewpoint : public SysObject { /* 00 */ unk32 mUnk_00; - /* 04 */ unk8 mUnk_04 + /* 04 */ unk8 mUnk_04; /* 05 */ unk8 mUnk_05[3]; /* 08 */ Vec3p mPos; /* 14 */ unk16 mUnk_14; diff --git a/include/Map/Course.hpp b/include/Map/Course.hpp index a266fd3e..1768ae85 100644 --- a/include/Map/Course.hpp +++ b/include/Map/Course.hpp @@ -4,7 +4,7 @@ #include "types.h" #include "Map/Course_Unk_c8.hpp" -#include "Map/Course_Unk_cc.hpp" +#include "Map/MapData.hpp" #include "Physics/AABB.hpp" #include "System/SysNew.hpp" @@ -67,10 +67,10 @@ class Course : public SysObject { bool func_ov00_0207caa8(s32 param_2, unk32 *param_3, unk8 *param_4); unk32 func_ov00_0207cb30(s32 param_2); static void FindMapGridPos(Vec2b *pos, Course *param_2, u32 map); - Vec3p* Find_Unk_cc_14(unk32 param_2); + Vec3p* FindMapCenter(unk32 map); void func_ov00_0207cbe8(s32 param_2); unk8 func_ov00_0207cc24(s32 param_2); - unk32 Find_Unk_cc_08(); + unk32 FindMapData_Unk_08(unk32 map); void GetMCSFilePath(unk32 buf, s32 fileIndex, unk32 fileType); void GetMRCFilePath(unk32 param_2, unk32 buf, unk32 param_4); void func_ov00_0207ce20(unk32 param_2, unk32 param_3, char *param_4, unk32 param_5); @@ -89,24 +89,24 @@ class Course : public SysObject { unk8 GetAdjacentMap(unk32 dir); u32 GetAdjacentMapX(s32 ir); u32 GetAdjacentMapY(s32 dir); - u16 FindCurrent_Unk_cc_04(); - u32 Find_Unk_cc_04(unk32 param_2); - unk32 Find_Unk_cc_0c(unk32 map); + u16 FindCurrentMapData_Unk_04(); + u32 FindMapData_Unk_04(unk32 param_2); + unk32 FindMapData_Unk_0c(unk32 map); void func_ov00_0207d7bc(); void SetFlag0(u32 index, bool value); bool GetFlag0(u32 index); void SetFlag1(u32 index, bool value); bool SetFlag1(u32 index); - void SetFlag0_Unk_cc(unk32 index, bool value); - bool GetFlag0_Unk_cc(unk32 param_2); - void SetFlag1_Unk_cc(unk32 param_2, bool param_3); - bool GetFlag1_Unk_cc(unk32 param_2); - void SetFlag2_Unk_cc(unk32 param_2, bool param_3); - bool GetFlag2_Unk_cc(unk32 param_2); - void SetFlag3_Unk_cc(unk32 param_2, bool param_3); - bool func_ov00_0207d97c(unk32 param_2); - void func_ov00_0207d994(unk32 param_2, unk32 param_3); - bool GetFlag3_Unk_cc(unk32 param_2); - Course_Unk_cc* Find_Unk_cc(u32 map); - Course_Unk_cc* FindCurrent_Unk_cc(); + void SetMapDataFlag0(unk32 index, bool value); + bool GetMapDataFlag0(unk32 param_2); + void SetMapDataFlag1(unk32 param_2, bool param_3); + bool GetMapDataFlag1(unk32 param_2); + void SetMapDataFlag2(unk32 param_2, bool param_3); + bool GetMapDataFlag2(unk32 param_2); + void SetMapDataFlag3(unk32 param_2, bool param_3); + bool GetMapDataFlag3(unk32 param_2); + void SetMapDataFlag4(unk32 param_2, unk32 param_3); + bool GetMapDataFlag4(unk32 param_2); + MapData* FindMapData(u32 map); + MapData* FindCurrentMapData(); }; diff --git a/src/00_Core/Map/Course.cpp b/src/00_Core/Map/Course.cpp index 28fe2330..560169e8 100644 --- a/src/00_Core/Map/Course.cpp +++ b/src/00_Core/Map/Course.cpp @@ -9,10 +9,10 @@ void Course::func_ov00_0207ca78(unk32 param_2, unk8 param_3, unk32 param_4) {} bool Course::func_ov00_0207caa8(s32 param_2, unk32 *param_3, unk8 *param_4) {} unk32 Course::func_ov00_0207cb30(s32 param_2) {} void Course::FindMapGridPos(Vec2b *pos, Course *param_2, u32 map) {} -Vec3p* Course::Find_Unk_cc_14(unk32 param_2) {} +Vec3p* Course::FindMapCenter(unk32 map) {} void Course::func_ov00_0207cbe8(s32 param_2) {} unk8 Course::func_ov00_0207cc24(s32 param_2) {} -unk32 Course::Find_Unk_cc_08() {} +unk32 Course::FindMapData_Unk_08(unk32 map) {} void Course::GetMCSFilePath(unk32 buf, s32 fileIndex, unk32 fileType) {} void Course::GetMRCFilePath(unk32 param_2, unk32 buf, unk32 param_4) {} void Course::func_ov00_0207ce20(unk32 param_2, unk32 param_3, char *param_4, unk32 param_5) {} @@ -31,25 +31,25 @@ bool Course::HasGridMap(s32 x, s32 y) {} unk8 Course::GetAdjacentMap(unk32 dir) {} u32 Course::GetAdjacentMapX(s32 ir) {} u32 Course::GetAdjacentMapY(s32 dir) {} -u16 Course::FindCurrent_Unk_cc_04() {} -u32 Course::Find_Unk_cc_04(unk32 param_2) {} -unk32 Course::Find_Unk_cc_0c(unk32 map) {} +u16 Course::FindCurrentMapData_Unk_04() {} +u32 Course::FindMapData_Unk_04(unk32 param_2) {} +unk32 Course::FindMapData_Unk_0c(unk32 map) {} void Course::func_ov00_0207d7bc() {} void Course::SetFlag0(u32 index, bool value) {} bool Course::GetFlag0(u32 index) {} void Course::SetFlag1(u32 index, bool value) {} bool Course::SetFlag1(u32 index) {} -void Course::SetFlag0_Unk_cc(unk32 index, bool value) {} -bool Course::GetFlag0_Unk_cc(unk32 param_2) {} -void Course::SetFlag1_Unk_cc(unk32 param_2, bool param_3) {} -bool Course::GetFlag1_Unk_cc(unk32 param_2) {} -void Course::SetFlag2_Unk_cc(unk32 param_2, bool param_3) {} -bool Course::GetFlag2_Unk_cc(unk32 param_2) {} -void Course::SetFlag3_Unk_cc(unk32 param_2, bool param_3) {} -bool Course::func_ov00_0207d97c(unk32 param_2) {} -void Course::func_ov00_0207d994(unk32 param_2, unk32 param_3) {} -bool Course::GetFlag3_Unk_cc(unk32 param_2) {} -Course_Unk_cc* Course::Find_Unk_cc(u32 map) {} -Course_Unk_cc* Course::FindCurrent_Unk_cc() {} +void Course::SetMapDataFlag0(unk32 index, bool value) {} +bool Course::GetMapDataFlag0(unk32 param_2) {} +void Course::SetMapDataFlag1(unk32 param_2, bool param_3) {} +bool Course::GetMapDataFlag1(unk32 param_2) {} +void Course::SetMapDataFlag2(unk32 param_2, bool param_3) {} +bool Course::GetMapDataFlag2(unk32 param_2) {} +void Course::SetMapDataFlag3(unk32 param_2, bool param_3) {} +bool Course::GetMapDataFlag3(unk32 param_2) {} +void Course::SetMapDataFlag4(unk32 param_2, unk32 param_3) {} +bool Course::GetMapDataFlag4(unk32 param_2) {} +MapData* Course::FindMapData(u32 map) {} +MapData* Course::FindCurrentMapData() {} #endif