Skip to content

Commit 0c7a963

Browse files
AsiernAsiern
authored
Merge branch 'zeldaret:main' into d_t_harp
2 parents 5b6f0df + a67ebab commit 0c7a963

39 files changed

+2420
-235
lines changed

‎config/SOUE01/rels/d_a_obj_doorNP/symbols.txt‎

Lines changed: 86 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2,98 +2,94 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
44
dAcOdoor_c_classInit__Fv = .text:0x00000070; // type:function size:0x110
5-
fn_572_180 = .text:0x00000180; // type:function size:0x68
6-
fn_572_1F0 = .text:0x000001F0; // type:function size:0x4C
7-
fn_572_240 = .text:0x00000240; // type:function size:0x4C
8-
fn_572_290 = .text:0x00000290; // type:function size:0x58
9-
fn_572_2F0 = .text:0x000002F0; // type:function size:0x4C
10-
getDoorTalk = .text:0x00000340; // type:function size:0xC
11-
fn_572_350 = .text:0x00000350; // type:function size:0x7C
12-
fn_572_3D0 = .text:0x000003D0; // type:function size:0x40
13-
fn_572_410 = .text:0x00000410; // type:function size:0x7C
14-
fn_572_490 = .text:0x00000490; // type:function size:0x68
15-
fn_572_500 = .text:0x00000500; // type:function size:0x1EC
16-
AcODoor__init = .text:0x000006F0; // type:function size:0x34C
17-
AcODoor__init2 = .text:0x00000A40; // type:function size:0x7D4
18-
fn_572_1220 = .text:0x00001220; // type:function size:0x24
19-
fn_572_1250 = .text:0x00001250; // type:function size:0x16C4
20-
fn_572_2920 = .text:0x00002920; // type:function size:0x1C
21-
AcODoor__update = .text:0x00002940; // type:function size:0x808
22-
fn_572_3150 = .text:0x00003150; // type:function size:0x98
5+
getDoorMapping__26@unnamed@d_a_obj_door_cpp@FUlRPCQ226@unnamed@d_a_obj_door_cpp@15DoorFileMapping = .text:0x00000180; // type:function size:0x68
6+
getDoorResName__26@unnamed@d_a_obj_door_cpp@FUlRPCc = .text:0x000001F0; // type:function size:0x4C
7+
getDoorMdlName__26@unnamed@d_a_obj_door_cpp@FUlRPCc = .text:0x00000240; // type:function size:0x4C
8+
getDoorCallbackTypeMapped__26@unnamed@d_a_obj_door_cpp@FUcRUc = .text:0x00000290; // type:function size:0x58
9+
isDoubleDoorType__26@unnamed@d_a_obj_door_cpp@Fl = .text:0x000002F0; // type:function size:0x4C
10+
getDoorInteractionName__26@unnamed@d_a_obj_door_cpp@Fv = .text:0x00000340; // type:function size:0xC
11+
isInSandshipBoss__26@unnamed@d_a_obj_door_cpp@Fv = .text:0x00000350; // type:function size:0x7C
12+
isInEvent__26@unnamed@d_a_obj_door_cpp@FPCc = .text:0x000003D0; // type:function size:0x40
13+
isInTimeDoorEvent__26@unnamed@d_a_obj_door_cpp@Fv = .text:0x00000410; // type:function size:0x7C
14+
checkRoom__26@unnamed@d_a_obj_door_cpp@FScRb = .text:0x00000490; // type:function size:0x68
15+
createHeap__10dAcOdoor_cFv = .text:0x00000500; // type:function size:0x1EC
16+
actorCreate__10dAcOdoor_cFv = .text:0x000006F0; // type:function size:0x34C
17+
actorPostCreate__10dAcOdoor_cFv = .text:0x00000A40; // type:function size:0x7D4
18+
doDelete__10dAcOdoor_cFv = .text:0x00001220; // type:function size:0x24
19+
actorExecuteInEvent__10dAcOdoor_cFv = .text:0x00001250; // type:function size:0x16C4
20+
calcTimer<Uc>__4sLibFPUc_Uc = .text:0x00002920; // type:function size:0x1C
21+
actorExecute__10dAcOdoor_cFv = .text:0x00002940; // type:function size:0x808
22+
draw__10dAcOdoor_cFv = .text:0x00003150; // type:function size:0x98
2323
isLocked__10dAcOdoor_cFv = .text:0x000031F0; // type:function size:0x158
24-
fn_572_3350 = .text:0x00003350; // type:function size:0x84
25-
fn_572_33E0 = .text:0x000033E0; // type:function size:0xC
26-
fn_572_33F0 = .text:0x000033F0; // type:function size:0x78
27-
fn_572_3470 = .text:0x00003470; // type:function size:0x7C
28-
fn_572_34F0 = .text:0x000034F0; // type:function size:0x78
29-
fn_572_3570 = .text:0x00003570; // type:function size:0x7C
30-
AcODoor__handleDoorPullEvent = .text:0x000035F0; // type:function size:0x20
31-
fn_572_3610 = .text:0x00003610; // type:function size:0x4
32-
AcODoor__handlePushEvent = .text:0x00003620; // type:function size:0x20
33-
fn_572_3640 = .text:0x00003640; // type:function size:0x4
34-
AcODoor__handleNormalEvent = .text:0x00003650; // type:function size:0xB0
35-
fn_572_3700 = .text:0x00003700; // type:function size:0x4
36-
fn_572_3710 = .text:0x00003710; // type:function size:0x4
37-
AcODoor__handleLockedPullEvent = .text:0x00003720; // type:function size:0x70
38-
AcODoor__handleLockedPushEvent = .text:0x00003790; // type:function size:0x70
39-
AcODoor__handleLockedEvent = .text:0x00003800; // type:function size:0x5C
40-
AcODoor__pullLockedCallback = .text:0x00003860; // type:function size:0x68
41-
AcODoor__lockedPushCallback = .text:0x000038D0; // type:function size:0x68
42-
AcODoor__handleShutterUnlockEvent = .text:0x00003940; // type:function size:0x6C
43-
fn_572_39B0 = .text:0x000039B0; // type:function size:0x1EC
44-
fn_572_3BA0 = .text:0x00003BA0; // type:function size:0x148
45-
fn_572_3CF0 = .text:0x00003CF0; // type:function size:0x3C
46-
fn_572_3D30 = .text:0x00003D30; // type:function size:0x4
47-
AcODoor__performInteraction = .text:0x00003D40; // type:function size:0x1EC
48-
AcODoor__isKeyLocked = .text:0x00003F30; // type:function size:0xC
49-
AcODoor__getSubtype2 = .text:0x00003F40; // type:function size:0xC
50-
AcODoor__getParamSceneflag = .text:0x00003F50; // type:function size:0xC
51-
fn_572_3F60 = .text:0x00003F60; // type:function size:0xC
52-
fn_572_3F70 = .text:0x00003F70; // type:function size:0xC
53-
fn_572_3F80 = .text:0x00003F80; // type:function size:0xC
54-
fn_572_3F90 = .text:0x00003F90; // type:function size:0x24
55-
fn_572_3FC0 = .text:0x00003FC0; // type:function size:0xC
56-
fn_572_3FD0 = .text:0x00003FD0; // type:function size:0xC
57-
fn_572_3FE0 = .text:0x00003FE0; // type:function size:0xC
58-
fn_572_3FF0 = .text:0x00003FF0; // type:function size:0xC
59-
fn_572_4000 = .text:0x00004000; // type:function size:0xC
60-
fn_572_4010 = .text:0x00004010; // type:function size:0xC
61-
fn_572_4020 = .text:0x00004020; // type:function size:0xC
62-
fn_572_4030 = .text:0x00004030; // type:function size:0xC
63-
AcODoor__setRoomId = .text:0x00004040; // type:function size:0x8
64-
fn_572_4050 = .text:0x00004050; // type:function size:0x8
65-
fn_572_4060 = .text:0x00004060; // type:function size:0x8
66-
fn_572_4070 = .text:0x00004070; // type:function size:0x8
67-
fn_572_4080 = .text:0x00004080; // type:function size:0x8
68-
fn_572_4090 = .text:0x00004090; // type:function size:0xC
69-
fn_572_40A0 = .text:0x000040A0; // type:function size:0xC
70-
fn_572_40B0 = .text:0x000040B0; // type:function size:0xC
71-
fn_572_40C0 = .text:0x000040C0; // type:function size:0xC
72-
fn_572_40D0 = .text:0x000040D0; // type:function size:0xC
73-
fn_572_40E0 = .text:0x000040E0; // type:function size:0xC
74-
fn_572_40F0 = .text:0x000040F0; // type:function size:0xC
75-
fn_572_4100 = .text:0x00004100; // type:function size:0xC
76-
fn_572_4110 = .text:0x00004110; // type:function size:0xC
77-
fn_572_4120 = .text:0x00004120; // type:function size:0xC
78-
fn_572_4130 = .text:0x00004130; // type:function size:0xC
79-
fn_572_4140 = .text:0x00004140; // type:function size:0xC
80-
fn_572_4150 = .text:0x00004150; // type:function size:0x90
81-
AcODoor__triggerExit = .text:0x000041E0; // type:function size:0x7C
82-
AcODoor__isThisTheDoorFromSealedTempleToSpiralAfterSkykeep = .text:0x00004260; // type:function size:0xAC
83-
fn_572_4310 = .text:0x00004310; // type:function size:0x28
84-
fn_572_4338 = .text:0x00004338; // type:function size:0x4
85-
fn_572_4340 = .text:0x00004340; // type:function size:0x28
86-
fn_572_4368 = .text:0x00004368; // type:function size:0x4
87-
fn_572_4370 = .text:0x00004370; // type:function size:0x84
88-
AcODoor__getOpenedDoorSide = .text:0x00004400; // type:function size:0x10
89-
AcODoor__hasFlowEntrypoint = .text:0x00004410; // type:function size:0x18
90-
fn_572_4430 = .text:0x00004430; // type:function size:0xC
91-
fn_572_4440 = .text:0x00004440; // type:function size:0xE4
92-
AcODoor__playerInInteractRange = .text:0x00004530; // type:function size:0xD0
93-
fn_572_4600 = .text:0x00004600; // type:function size:0xE4
94-
AcODoor__triggerDoorTalk = .text:0x000046F0; // type:function size:0x68
24+
canOpen__10dAcOdoor_cFv = .text:0x00003350; // type:function size:0x84
25+
fn_572_33E0__10dAcOdoor_cFv = .text:0x000033E0; // type:function size:0xC
26+
startPullEventWithoutCallback__10dAcOdoor_cFPv = .text:0x000033F0; // type:function size:0x78
27+
startPullEventWithCallback__10dAcOdoor_cFPv = .text:0x00003470; // type:function size:0x7C
28+
startPushEventWithoutCallback__10dAcOdoor_cFPv = .text:0x000034F0; // type:function size:0x78
29+
startPushEventWithCallback__10dAcOdoor_cFPv = .text:0x00003570; // type:function size:0x7C
30+
startPullEvent__10dAcOdoor_cFPv = .text:0x000035F0; // type:function size:0x24
31+
startPushEvent__10dAcOdoor_cFPv = .text:0x00003620; // type:function size:0x24
32+
startOpenEvent__10dAcOdoor_cFPv = .text:0x00003650; // type:function size:0xB0
33+
doorPullEventCallback__10dAcOdoor_cFPv = .text:0x00003700; // type:function size:0x4
34+
doorPushEventCallback__10dAcOdoor_cFPv = .text:0x00003710; // type:function size:0x4
35+
startDoorPullLockedEvent__10dAcOdoor_cFPv = .text:0x00003720; // type:function size:0x70
36+
startDoorPushLockedEvent__10dAcOdoor_cFPv = .text:0x00003790; // type:function size:0x70
37+
startLockedEvent__10dAcOdoor_cFPv = .text:0x00003800; // type:function size:0x5C
38+
pullLockedEventCallback__10dAcOdoor_cFPv = .text:0x00003860; // type:function size:0x68
39+
pushLockedEventCallback__10dAcOdoor_cFPv = .text:0x000038D0; // type:function size:0x68
40+
startUnlockEvent__10dAcOdoor_cFv = .text:0x00003940; // type:function size:0x6C
41+
unlockEventCallback__10dAcOdoor_cFPv = .text:0x000039B0; // type:function size:0x1EC
42+
openCallbackCommon__10dAcOdoor_cFPv = .text:0x00003BA0; // type:function size:0x148
43+
registerInEvent__10dAcOdoor_cFv = .text:0x00003CF0; // type:function size:0x3C
44+
unkVirtFunc_0x6C__10dAcOdoor_cFv = .text:0x00003D30; // type:function size:0x4
45+
doInteraction__10dAcOdoor_cFl = .text:0x00003D40; // type:function size:0x1EC
46+
getLockParameter__10dAcOdoor_cFv = .text:0x00003F30; // type:function size:0xC
47+
getLockBehavior__10dAcOdoor_cFv = .text:0x00003F40; // type:function size:0xC
48+
getSceneflag__10dAcOdoor_cFv = .text:0x00003F50; // type:function size:0xC
49+
getDoorCallbackType__10dAcOdoor_cFv = .text:0x00003F60; // type:function size:0xC
50+
getFrontRoomParam__10dAcOdoor_cFv = .text:0x00003F70; // type:function size:0xC
51+
getBackRoomParam__10dAcOdoor_cFv = .text:0x00003F80; // type:function size:0xC
52+
getFailedToOpenFlag__10dAcOdoor_cFv = .text:0x00003F90; // type:function size:0x24
53+
getInteractionMinX__10dAcOdoor_cFv = .text:0x00003FC0; // type:function size:0xC
54+
getInteractionMaxX__10dAcOdoor_cFv = .text:0x00003FD0; // type:function size:0xC
55+
getInteractionMinZ__10dAcOdoor_cFv = .text:0x00003FE0; // type:function size:0xC
56+
getInteractionMaxZ__10dAcOdoor_cFv = .text:0x00003FF0; // type:function size:0xC
57+
getInteractionLockMinX__10dAcOdoor_cFv = .text:0x00004000; // type:function size:0xC
58+
getInteractionLockMaxX__10dAcOdoor_cFv = .text:0x00004010; // type:function size:0xC
59+
getInteractionLockMinZ__10dAcOdoor_cFv = .text:0x00004020; // type:function size:0xC
60+
getInteractionLockMaxZ__10dAcOdoor_cFv = .text:0x00004030; // type:function size:0xC
61+
setRoomId__10dAcOdoor_cFSc = .text:0x00004040; // type:function size:0x8
62+
setFlag__10dAcOdoor_cFUl = .text:0x00004050; // type:function size:0x8
63+
setEventCallbackType__10dAcOdoor_cFUc = .text:0x00004060; // type:function size:0x8
64+
setFrontRoom__10dAcOdoor_cFSc = .text:0x00004070; // type:function size:0x8
65+
setBackRoom__10dAcOdoor_cFSc = .text:0x00004080; // type:function size:0x8
66+
setDoubleDoor__10dAcOdoor_cFv = .text:0x00004090; // type:function size:0xC
67+
setNotDoubleDoor__10dAcOdoor_cFv = .text:0x000040A0; // type:function size:0xC
68+
setSingleDoor__10dAcOdoor_cFv = .text:0x000040B0; // type:function size:0xC
69+
setNotSingleDoor__10dAcOdoor_cFv = .text:0x000040C0; // type:function size:0xC
70+
setInSandshipBoss__10dAcOdoor_cFv = .text:0x000040D0; // type:function size:0xC
71+
isTimeDoorEventActive__10dAcOdoor_cCFv = .text:0x000040E0; // type:function size:0xC
72+
setTimeDoorEventActive__10dAcOdoor_cFv = .text:0x000040F0; // type:function size:0xC
73+
setTimeDoorEventInactive__10dAcOdoor_cFv = .text:0x00004100; // type:function size:0xC
74+
setTimeEffected__10dAcOdoor_cFv = .text:0x00004110; // type:function size:0xC
75+
setTimeStatic__10dAcOdoor_cFv = .text:0x00004120; // type:function size:0xC
76+
checkFrontRoom__10dAcOdoor_cCFRb = .text:0x00004130; // type:function size:0xC
77+
checkBackRoom__10dAcOdoor_cCFRb = .text:0x00004140; // type:function size:0xC
78+
checkRooms__10dAcOdoor_cCFRb = .text:0x00004150; // type:function size:0x90
79+
triggerExit__10dAcOdoor_cFv = .text:0x000041E0; // type:function size:0x7C
80+
isLeavingSealedTempleSideDoorPostSkyKeep__10dAcOdoor_cCFv = .text:0x00004260; // type:function size:0xAC
81+
transitionPushRoomFlags__10dAcOdoor_cCFv = .text:0x00004310; // type:function size:0x2C
82+
transitionPullRoomFlags__10dAcOdoor_cCFv = .text:0x00004340; // type:function size:0x2C
83+
isPositionInFrontOfDoor__10dAcOdoor_cCFRC7mVec3_c = .text:0x00004370; // type:function size:0x84
84+
checkPullDoor__10dAcOdoor_cCFv = .text:0x00004400; // type:function size:0x10
85+
hasFlowEntryPoint__10dAcOdoor_cFv = .text:0x00004410; // type:function size:0x18
86+
isTimeEffected__10dAcOdoor_cCFv = .text:0x00004430; // type:function size:0xC
87+
setDoorKnobPosition__10dAcOdoor_cFv = .text:0x00004440; // type:function size:0xE4
88+
isPlayerInteractable__10dAcOdoor_cCFv = .text:0x00004530; // type:function size:0xD0
89+
isPlayerInteractableLocked__10dAcOdoor_cCFv = .text:0x00004600; // type:function size:0xE4
90+
playInteractionLocked__10dAcOdoor_cFv = .text:0x000046F0; // type:function size:0x68
9591
__dt__10dAcOdoor_cFv = .text:0x00004760; // type:function size:0xE8
96-
fn_572_4850 = .text:0x00004850; // type:function size:0x144
92+
__sinit_\d_a_obj_door_cpp = .text:0x00004850; // type:function size:0x144 scope:local
9793
_ctors = .ctors:0x00000000; // type:label scope:global
9894
_dtors = .dtors:0x00000000; // type:label scope:global
9995
lbl_572_rodata_0 = .rodata:0x00000000; // type:object size:0x20 data:float

‎config/SOUE01/rels/d_a_obj_fenceNP/symbols.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ getStateID__80sStateMgr_c<11dAcOFence_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13
2121
fn_550_D30 = .text:0x00000D30; // type:function size:0x304
2222
fn_550_1040 = .text:0x00001040; // type:function size:0x13C
2323
fn_550_1180 = .text:0x00001180; // type:function size:0x28
24-
fn_550_11B0 = .text:0x000011B0; // type:function size:0xA0
25-
fn_550_1250 = .text:0x00001250; // type:function size:0x50
24+
fn_550_11B0__11dAcOFence_cCFv = .text:0x000011B0; // type:function size:0xA0
25+
fn_550_1250__11dAcOFence_cFv = .text:0x00001250; // type:function size:0x50
2626
changeState__80sStateMgr_c<11dAcOFence_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000012A0; // type:function size:0x10
27-
fn_550_12B0 = .text:0x000012B0; // type:function size:0x10
28-
fn_550_12C0 = .text:0x000012C0; // type:function size:0x10
27+
fn_550_12B0__11dAcOFence_cFv = .text:0x000012B0; // type:function size:0x10
28+
fn_550_12C0__11dAcOFence_cFv = .text:0x000012C0; // type:function size:0x10
2929
initializeState_WaitOpen__11dAcOFence_cFv = .text:0x000012D0; // type:function size:0x94
3030
executeState_WaitOpen__11dAcOFence_cFv = .text:0x00001370; // type:function size:0x168
3131
finalizeState_WaitOpen__11dAcOFence_cFv = .text:0x000014E0; // type:function size:0x4
@@ -142,4 +142,4 @@ lbl_550_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte
142142
lbl_550_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte
143143
lbl_550_bss_198 = .bss:0x00000198; // type:object size:0x40 data:4byte
144144
lbl_550_bss_1D8 = .bss:0x000001D8; // type:object size:0x40 data:4byte
145-
lbl_550_bss_218 = .bss:0x00000218; // type:object size:0x30
145+
StateID_RequestConfineEvent__11dAcOFence_c = .bss:0x00000218; // type:object size:0x30

‎config/SOUE01/rels/d_a_obj_windmillNP/symbols.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ lbl_374_data_190 = .data:0x00000190; // type:object size:0x198 scope:local
8080
__vt__29sFStateID_c<14dAcOwindmill_c> = .data:0x00000328; // type:object size:0x34
8181
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
8282
lbl_374_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local data:4byte
83-
AcOwindmill__STATE_WAIT = .bss:0x00000018; // type:object size:0x40 data:4byte
83+
StateID_Wait__14dAcOwindmill_c = .bss:0x00000018; // type:object size:0x40 data:4byte
8484
AcOwindmill__STATE_CAMERA_MOVE = .bss:0x00000058; // type:object size:0x40 data:4byte
8585
AcOwindmill__STATE_MOVE = .bss:0x00000098; // type:object size:0x80 data:4byte
8686
AcOwindmill__STATE_COLLECT_STICK = .bss:0x00000118; // type:object size:0x30 data:4byte

0 commit comments

Comments
 (0)