ovl_player_actor: Dawn of a new PR (#1227)

* Rename Player_UpdateBottleHeld

* Match func_808497A0

* func_80852290 NON_MATCHING

* Match func_8083B3B4

* Params cleanup

* Match func_8083FBC4

* sfxId cleanups and others

* Fix declaration of functions from D_8085D990

* Change D_8085BE84 to be a 2D array

* ARRAY_COUNT_2D

* Match func_8085ADA0

* func_808426F0 nonmatching

* Match func_80852290

* Match func_808426F0

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* Add notes to Player_SetDoAction

* Name putAwayCountdown

* rebase

* Match func_80856918

* format

* func_8084933C nonmatching
small amount of boomerang documentation

* Progress on moving data near where it is used

* finish moving data

* format

* cleanup up remaining data

* more match

* Some minor cleanups

* PlayerCsMode enum

* func_80851F18 nonmatching

* Fix unk_B10

* Purge ExchangeItemID enum

* Rename `targetActor` to `talkActor`

* Name `targetedActor`

* PLAYER_LIMB_BUF_SIZE

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Change SkelAnime Player functions to take a void pointer for the corresponding buffers

* Use PlayerAnimationFrame on Player_DrawImpl

* Match func_8082F1AC

* Match func_8083D23C

* cleanup

* Match and clean up func_808373F8

* Match and document func_8083A98C

* PLAYER_PARAMS macro and PlayerInitMode enum

* Preliminary names for InitMode functions

* Match func_8083C8E8

* remove redundant externs

* Match func_8084933C

* cleanup func_8084933C

* Access D_8085BE84 directly instead of using a macro

* Match func_8084AC84

* Fix boomearng typo

* OK boomerang

* cleanup func_8083D168

* untargetedRotY

* this->unk_14E = ABS_ALT(var_v1);

* GIFIELD macros

* sort of a match

* Match func_8084C16C

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Use the same trick to match func_808573A4

* Add note on Deku spinning

* Match func_8084D18C

* Match func_80850D68

* Improve func_80832660

* Match func_80854EFC

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* Rename unk_B2A to getItemDrawId

* Some cleanup

* fix merge issues

* format

* minor anim docs

* Match func_808553F4

* Cleanup func_808553F4

* func_8083D860 nonmatching

* Match func_8083D860

* Defake func_80859BA8

* ()

* Add notes to PlayerAnimGroup enum

* underwaterTimer

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* some stateFlags cleaning

* more stateFlags cleaning

* some notes and minor cleanups

* more general cleanups

* Slightly less fake func_80832CAC

* Document some melee weapon damage stuff

* Mark lunge storage

* Note PCS patch

* match

* add notes to bss

* yeet extra indentation

* add reloc as nonmatching to spec

* floorSfxOffset

* Player_GetFloorSfx

* Player_GetFloorSfxByAge

* Comments for AnimSfx dunctions

* Name some AnimSfx functions

* Name AnimSfx stuff

* Some PlayerAgeProperties notes

* use animflag defines

* Player_SpawnExplosive

* fix enum and some other minor fixes

* Bit more misc. cleanup

* Use OoT's version of func_808333CC

* Note on quickspin buffer

* Final nonmatching, func_80851F18

Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>

* RIP player.c

* Name Player_StopHorizontalMovement

* misc fixes

* Actor_DeactivateLens

* fixes

* typos and tweaks

* minor stuff

* add names as comments on the animgoup array

* Correct some function names and data type

* add anim commets to ageproperties

* some notes

* De-fake func_80840F90

* Defake & clean up func_8085ADA0

* Improve func_80859BA8

* Enums in func_80852B28

* Name some secret-related things

* 3 small things

* stuff

* Player_TalkWithPlayer

* SurfaceType_GetFloorType

* SurfaceType_GetWallFlags

* and more bgcheck stuff

* more bss naming

* sPlayerControlInput

* clean up func_80836F10 a bit

* name the parameters of func_80835BF8

* door stuff

* remove NON_MATCHING

* remove D_8085D2B0 padding

* Name some Player_Cutscene_ functions

* various cleanups

* format

* remainingHopsCounter

* some cleanups on the struct

* Actor_RequestRumble

* this->exchangeItemId = PLAYER_AP_NONE;

* fix merge stuff

* format

* PlayerUnkAA5

* Name two cylinder-related functions

* BSS

* Add MagicConsume's enum, treat lensActive as bool

* Update func_808332A0 based on better info

* fix merge

* fix merge issues

* remove redundant comments

* Name Player_AddQuake

* ANIM_FLAG_UPDATE*_*Y

* Format

* AT_TYPE_ENEMY

* fix merge issues

* format

* fix uintptr_ts

* Rename

* Name leftHandMf

* fix merge issues

* format

* exchangeItemId <= PLAYER_IA_MINUS1

* getItemDrawIdPlusOne

* currentActorCsIndex

* <= PLAYER_IA_MINUS1

* fix merge issues

* format

* namefixer and bss

* fix build

* bombs parameters cleanup

* bss

* Fix building

* fix building

* Fix building

* Fix building and cleanups

* Pre-PR cleanup

* really...

* format

* review

* stateFlag Mistakes

* 268 * 0.1f

* z64door.h

* fix cutscene stuff

* bss

* Update include/z64player.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update include/z64player.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* reiew

* PR Review

* collision

* review

* format and a few stuff i missed

* EnBomExplosiveType

* weekeventregconvert and eventinfconvert

* more review

* review

* bss

* review

* re format sGetItemTable

* Entangle PlayerMask and PlayerItemAction

* a few extra cases i missed

* bss

* review

* EnArrow stuff

* ARROW_MAGIC_DEKU_BUBBLE

* minor format

* merge

* fix bss

* review

* !ARROW_IS_ARROW

* review

* bool cleanup

* fix merge

* review

* Player_StopCutscene

* Player_RequestQuake

* quakeIndex

* Player_RequestQuakeAndRumble

* knobDoor and slidingDoor

* bss

* fix

* review

* dog and float

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal
2023-05-28 17:41:37 -04:00
committed by GitHub
co-authored by Elliptic Ellipsis engineer124 petrie911 petrie911 Synray
parent 20f7e2199a
commit efc9df3f56
87 changed files with 22423 additions and 2223 deletions
+2 -2
View File
@@ -186,9 +186,9 @@ def proper_name(symbol, in_data=False, is_symbol=True):
# bg_ikana_mirror symbol with large addend folded into %lo
elif symbol == 0x80B80248:
return variables_ast[0x80B801A8][0] + f" + 0x{0x80B80248 - 0x80B801A8:X}"
# player symbol with very large addend folded into %lo, since we don't know the real symbol just use the first data symbol for now
# player symbol with very large addend folded into %lo
elif symbol == 0x8084D2FC:
return variables_ast[0x8085B9F0][0] + f" - 0x{0x8085B9F0 - 0x8084D2FC:X}"
return variables_ast[0x8085D0FA][0] + f" - 0x{0x8085D0FA - 0x8084D2FC:X}"
# OS_K0_TO_PHYSICAL on rspS2DEX text and data symbols
elif symbol == 0x001ABAB0 or symbol == 0x001E3BB0:
return variables_ast[symbol + 0x80000000][0] + " - 0x80000000"
+70 -70
View File
@@ -4245,14 +4245,14 @@
0x80828788:("KaleidoScope_UpdateOpening",),
0x8082895C:("KaleidoScope_Update",),
0x8082DA90:("func_8082DA90",),
0x8082DABC:("func_8082DABC",),
0x8082DABC:("Player_StopHorizontalMovement",),
0x8082DAD4:("func_8082DAD4",),
0x8082DAFC:("func_8082DAFC",),
0x8082DB18:("func_8082DB18",),
0x8082DB3C:("func_8082DB3C",),
0x8082DB18:("Player_AnimationPlayOnce",),
0x8082DB3C:("Player_AnimationPlayLoop",),
0x8082DB60:("func_8082DB60",),
0x8082DB90:("func_8082DB90",),
0x8082DBC0:("func_8082DBC0",),
0x8082DBC0:("Player_AnimationPlayOnceReverse",),
0x8082DC28:("func_8082DC28",),
0x8082DC38:("func_8082DC38",),
0x8082DC64:("func_8082DC64",),
@@ -4262,18 +4262,18 @@
0x8082DE50:("func_8082DE50",),
0x8082DE88:("func_8082DE88",),
0x8082DF2C:("func_8082DF2C",),
0x8082DF48:("func_8082DF48",),
0x8082DF8C:("func_8082DF8C",),
0x8082DF48:("Player_RequestRumble",),
0x8082DF8C:("Player_AnimSfx_PlayVoice",),
0x8082E00C:("func_8082E00C",),
0x8082E078:("func_8082E078",),
0x8082E094:("func_8082E094",),
0x8082E0CC:("func_8082E0CC",),
0x8082E0F4:("func_8082E0F4",),
0x8082E12C:("func_8082E12C",),
0x8082E188:("func_8082E188",),
0x8082E1BC:("func_8082E1BC",),
0x8082E078:("Player_GetFloorSfx",),
0x8082E094:("Player_AnimSfx_PlayFloor",),
0x8082E0CC:("Player_GetFloorSfxByAge",),
0x8082E0F4:("Player_AnimSfx_PlayFloorByAge",),
0x8082E12C:("Player_AnimSfx_PlayFloorWalk",),
0x8082E188:("Player_AnimSfx_PlayFloorJump",),
0x8082E1BC:("Player_AnimSfx_PlayFloorLand",),
0x8082E1F0:("func_8082E1F0",),
0x8082E224:("func_8082E224",),
0x8082E224:("Player_PlayAnimSfx",),
0x8082E438:("func_8082E438",),
0x8082E4A4:("func_8082E4A4",),
0x8082E514:("func_8082E514",),
@@ -4309,22 +4309,22 @@
0x8082EF9C:("func_8082EF9C",),
0x8082EFE4:("func_8082EFE4",),
0x8082F02C:("func_8082F02C",),
0x8082F09C:("func_8082F09C",),
0x8082F0E4:("func_8082F0E4",),
0x8082F09C:("Player_ResetCylinder",),
0x8082F0E4:("Player_SetCylinderForAttack",),
0x8082F164:("func_8082F164",),
0x8082F1AC:("func_8082F1AC",),
0x8082F43C:("func_8082F43C",),
0x8082F470:("func_8082F470",),
0x8082F524:("func_8082F524",),
0x8082F524:("Player_ItemToItemAction",),
0x8082F594:("func_8082F594",),
0x8082F5A4:("func_8082F5A4",),
0x8082F5C0:("func_8082F5C0",),
0x8082F5FC:("func_8082F5FC",),
0x8082F62C:("func_8082F62C",),
0x8082F62C:("Player_SpawnExplosive",),
0x8082F7F4:("func_8082F7F4",),
0x8082F8A0:("func_8082F8A0",),
0x8082F8BC:("func_8082F8BC",),
0x8082F938:("func_8082F938",),
0x8082F938:("Player_OverrideBlureColors",),
0x8082FA5C:("func_8082FA5C",),
0x8082FB68:("func_8082FB68",),
0x8082FBE8:("func_8082FBE8",),
@@ -4359,7 +4359,7 @@
0x808313A8:("func_808313A8",),
0x808313F0:("func_808313F0",),
0x80831454:("func_80831454",),
0x80831494:("func_80831494",),
0x80831494:("Player_SetAction",),
0x8083172C:("func_8083172C",),
0x80831760:("func_80831760",),
0x808317C4:("func_808317C4",),
@@ -4420,16 +4420,16 @@
0x808354A4:("func_808354A4",),
0x808355D8:("func_808355D8",),
0x8083562C:("func_8083562C",),
0x80835BC8:("func_80835BC8",),
0x80835BC8:("Player_TranslateAndRotateY",),
0x80835BF8:("func_80835BF8",),
0x80835C64:("func_80835C64",),
0x80835C64:("Player_SpawnFairy",),
0x80835CD8:("func_80835CD8",),
0x80835D2C:("func_80835D2C",),
0x80835D58:("func_80835D58",),
0x80835DF8:("func_80835DF8",),
0x80835EAC:("func_80835EAC",),
0x8083604C:("func_8083604C",),
0x80836258:("func_80836258",),
0x80835EAC:("Player_Door_Staircase",),
0x8083604C:("Player_Door_Sliding",),
0x80836258:("Player_Door_Knob",),
0x808365DC:("func_808365DC",),
0x80836888:("func_80836888",),
0x8083692C:("func_8083692C",),
@@ -4442,7 +4442,7 @@
0x80836C70:("func_80836C70",),
0x80836D8C:("func_80836D8C",),
0x80836DC0:("func_80836DC0",),
0x80836EA0:("func_80836EA0",),
0x80836EA0:("Player_RequestQuake",),
0x80836F10:("func_80836F10",),
0x808370D4:("func_808370D4",),
0x80837134:("func_80837134",),
@@ -4464,7 +4464,7 @@
0x808381F8:("func_808381F8",),
0x8083827C:("func_8083827C",),
0x8083868C:("func_8083868C",),
0x80838760:("func_80838760",),
0x80838760:("Player_StopCutscene",),
0x808387A0:("func_808387A0",),
0x80838830:("func_80838830",),
0x808388B8:("func_808388B8",),
@@ -4500,11 +4500,11 @@
0x8083A844:("func_8083A844",),
0x8083A878:("func_8083A878",),
0x8083A98C:("func_8083A98C",),
0x8083AD04:("func_8083AD04",),
0x8083AD8C:("func_8083AD8C",),
0x8083ADB8:("func_8083ADB8",),
0x8083AD04:("Player_InitMode_Telescope",),
0x8083AD8C:("Player_InitMode_B",),
0x8083ADB8:("Player_InitMode_D",),
0x8083ADF0:("func_8083ADF0",),
0x8083AE38:("func_8083AE38",),
0x8083AE38:("Player_InitMode_F",),
0x8083AECC:("func_8083AECC",),
0x8083AF30:("func_8083AF30",),
0x8083AF8C:("func_8083AF8C",),
@@ -4557,7 +4557,7 @@
0x8083E958:("func_8083E958",),
0x8083E9C4:("func_8083E9C4",),
0x8083EA44:("func_8083EA44",),
0x8083EBD0:("func_8083EBD0",),
0x8083EBD0:("Player_ChooseIdleAnim",),
0x8083EE60:("func_8083EE60",),
0x8083F144:("func_8083F144",),
0x8083F190:("func_8083F190",),
@@ -4571,7 +4571,7 @@
0x8083FCF0:("func_8083FCF0",),
0x8083FD80:("func_8083FD80",),
0x8083FE38:("func_8083FE38",),
0x8083FE90:("func_8083FE90",),
0x8083FE90:("Player_RequestQuakeAndRumble",),
0x8083FEF4:("func_8083FEF4",),
0x8083FF30:("func_8083FF30",),
0x8083FFEC:("func_8083FFEC",),
@@ -4590,33 +4590,33 @@
0x80840F34:("func_80840F34",),
0x80840F90:("func_80840F90",),
0x808411D4:("func_808411D4",),
0x808412A0:("func_808412A0",),
0x808412BC:("func_808412BC",),
0x808412A0:("Player_InitMode_0",),
0x808412BC:("Player_InitMode_2",),
0x80841358:("func_80841358",),
0x80841408:("func_80841408",),
0x808414E0:("func_808414E0",),
0x80841528:("func_80841528",),
0x808415A0:("func_808415A0",),
0x808415E4:("func_808415E4",),
0x80841624:("func_80841624",),
0x80841408:("Player_InitMode_1",),
0x808414E0:("Player_InitMode_3",),
0x80841528:("Player_InitMode_4",),
0x808415A0:("Player_InitMode_7",),
0x808415E4:("Player_InitMode_5",),
0x80841624:("Player_InitMode_6",),
0x80841744:("func_80841744",),
0x8084182C:("func_8084182C",),
0x8084182C:("Player_InitCommon",),
0x80841A50:("func_80841A50",),
0x80841AC4:("Player_Init",),
0x80842510:("func_80842510",),
0x808425B4:("func_808425B4",),
0x808426F0:("func_808426F0",),
0x808426F0:("Player_SetDoAction",),
0x808430E0:("func_808430E0",),
0x80843178:("func_80843178",),
0x80843EC0:("func_80843EC0",),
0x80843EC0:("Player_UpdateCamAndSeqModes",),
0x808442D8:("func_808442D8",),
0x808445C4:("func_808445C4",),
0x808446F4:("func_808446F4",),
0x808446F4:("Player_DetectSecrets",),
0x80844784:("func_80844784",),
0x80844D80:("func_80844D80",),
0x80844EF8:("func_80844EF8",),
0x80844EF8:("Player_UpdateCommon",),
0x808460B8:("Player_Update",),
0x808463C0:("func_808463C0",),
0x808463C0:("Player_DrawGameplay",),
0x80846460:("func_80846460",),
0x80846528:("Player_Draw",),
0x808470D4:("Player_Destroy",),
@@ -4834,7 +4834,7 @@
0x80859AF8:("func_80859AF8",),
0x80859B28:("func_80859B28",),
0x80859B54:("func_80859B54",),
0x80859BA8:("func_80859BA8",),
0x80859BA8:("Player_Cutscene_Translate",),
0x80859C60:("func_80859C60",),
0x80859CA0:("func_80859CA0",),
0x80859CE0:("func_80859CE0",),
@@ -4845,7 +4845,7 @@
0x80859F4C:("func_80859F4C",),
0x80859FCC:("func_80859FCC",),
0x80859FF4:("func_80859FF4",),
0x8085A04C:("func_8085A04C",),
0x8085A04C:("Player_Cutscene_TranslateReverse",),
0x8085A120:("func_8085A120",),
0x8085A144:("func_8085A144",),
0x8085A19C:("func_8085A19C",),
@@ -4869,19 +4869,19 @@
0x8085AA60:("func_8085AA60",),
0x8085AA84:("func_8085AA84",),
0x8085AACC:("func_8085AACC",),
0x8085AB58:("func_8085AB58",),
0x8085ABA8:("func_8085ABA8",),
0x8085AB58:("Player_Cutscene_SetPosAndYawToStart",),
0x8085ABA8:("Player_Cutscene_8085ABA8",),
0x8085AC9C:("func_8085AC9C",),
0x8085AD5C:("func_8085AD5C",),
0x8085ADA0:("func_8085ADA0",),
0x8085B08C:("func_8085B08C",),
0x8085B134:("func_8085B134",),
0x8085B134:("Player_StartFishing",),
0x8085B170:("func_8085B170",),
0x8085B1F0:("func_8085B1F0",),
0x8085B1F0:("Player_GrabPlayer",),
0x8085B28C:("func_8085B28C",),
0x8085B384:("func_8085B384",),
0x8085B3E0:("func_8085B3E0",),
0x8085B460:("func_8085B460",),
0x8085B3E0:("Player_InflictDamage",),
0x8085B460:("Player_TalkWithPlayer",),
0x8085B74C:("func_8085B74C",),
0x8085B820:("func_8085B820",),
0x8085B854:("func_8085B854",),
@@ -8591,24 +8591,24 @@
0x8099BE48:("EnCrow_OverrideLimbDraw",),
0x8099BF20:("EnCrow_PostLimbDraw",),
0x8099BFA4:("EnCrow_Draw",),
0x8099C290:("func_8099C290",),
0x8099C328:("func_8099C328",),
0x8099C41C:("func_8099C41C",),
0x8099C290:("EnCow_RotatePoint",),
0x8099C328:("EnCow_SetColliderPos",),
0x8099C41C:("EnCow_SetTailPos",),
0x8099C498:("EnCow_Init",),
0x8099C834:("EnCow_Destroy",),
0x8099C880:("func_8099C880",),
0x8099CAA8:("func_8099CAA8",),
0x8099CB20:("func_8099CB20",),
0x8099CB68:("func_8099CB68",),
0x8099CBCC:("func_8099CBCC",),
0x8099CC68:("func_8099CC68",),
0x8099CCF8:("func_8099CCF8",),
0x8099CDA0:("func_8099CDA0",),
0x8099CFAC:("func_8099CFAC",),
0x8099C880:("EnCow_UpdateAnimation",),
0x8099CAA8:("EnCow_TalkEnd",),
0x8099CB20:("EnCow_GiveMilkEnd",),
0x8099CB68:("EnCow_GiveMilkWait",),
0x8099CBCC:("EnCow_GiveMilk",),
0x8099CC68:("EnCow_CheckForEmptyBottle",),
0x8099CCF8:("EnCow_Talk",),
0x8099CDA0:("EnCow_Idle",),
0x8099CFAC:("EnCow_DoTail",),
0x8099D144:("EnCow_Update",),
0x8099D3C0:("func_8099D3C0",),
0x8099D4AC:("func_8099D4AC",),
0x8099D4FC:("func_8099D4FC",),
0x8099D3C0:("EnCow_UpdateTail",),
0x8099D4AC:("EnCow_OverrideLimbDraw",),
0x8099D4FC:("EnCow_PostLimbDraw",),
0x8099D53C:("EnCow_Draw",),
0x8099D59C:("func_8099D59C",),
0x8099D780:("OceffWipe4_Init",),
+60 -125
View File
@@ -4941,52 +4941,9 @@
0x8085B9F0:("D_8085B9F0","UNK_TYPE1","",0x1),
0x8085BA08:("D_8085BA08","UNK_TYPE1","",0x1),
0x8085BA20:("D_8085BA20","UNK_TYPE1","",0x1),
0x8085BA38:("D_8085BA38","UNK_TYPE1","",0x1),
0x8085BE84:("D_8085BE84","UNK_TYPE1","",0x1),
0x8085BE9C:("D_8085BE9C","UNK_TYPE1","",0x1),
0x8085BEB4:("D_8085BEB4","UNK_TYPE1","",0x1),
0x8085BECC:("D_8085BECC","UNK_TYPE1","",0x1),
0x8085BEE4:("D_8085BEE4","UNK_TYPE1","",0x1),
0x8085BEFC:("D_8085BEFC","UNK_TYPE1","",0x1),
0x8085BF14:("D_8085BF14","UNK_TYPE1","",0x1),
0x8085BF44:("D_8085BF44","UNK_TYPE1","",0x1),
0x8085BF5C:("D_8085BF5C","UNK_TYPE1","",0x1),
0x8085BF74:("D_8085BF74","UNK_TYPE1","",0x1),
0x8085BF8C:("D_8085BF8C","UNK_TYPE1","",0x1),
0x8085BFA4:("D_8085BFA4","UNK_TYPE1","",0x1),
0x8085BFBC:("D_8085BFBC","UNK_TYPE1","",0x1),
0x8085BFD4:("D_8085BFD4","UNK_TYPE1","",0x1),
0x8085BFEC:("D_8085BFEC","UNK_TYPE1","",0x1),
0x8085C004:("D_8085C004","UNK_TYPE1","",0x1),
0x8085C01C:("D_8085C01C","UNK_TYPE1","",0x1),
0x8085C034:("D_8085C034","UNK_TYPE1","",0x1),
0x8085C04C:("D_8085C04C","UNK_TYPE1","",0x1),
0x8085C064:("D_8085C064","UNK_TYPE1","",0x1),
0x8085C07C:("D_8085C07C","UNK_TYPE1","",0x1),
0x8085C094:("D_8085C094","UNK_TYPE1","",0x1),
0x8085C0C4:("D_8085C0C4","UNK_TYPE1","",0x1),
0x8085C0DC:("D_8085C0DC","UNK_TYPE1","",0x1),
0x8085C0F4:("D_8085C0F4","UNK_TYPE1","",0x1),
0x8085C10C:("D_8085C10C","UNK_TYPE1","",0x1),
0x8085C124:("D_8085C124","UNK_TYPE1","",0x1),
0x8085C13C:("D_8085C13C","UNK_TYPE1","",0x1),
0x8085C154:("D_8085C154","UNK_TYPE1","",0x1),
0x8085C16C:("D_8085C16C","UNK_TYPE1","",0x1),
0x8085C184:("D_8085C184","UNK_TYPE1","",0x1),
0x8085C19C:("D_8085C19C","UNK_TYPE1","",0x1),
0x8085C1B4:("D_8085C1B4","UNK_TYPE1","",0x1),
0x8085C1CC:("D_8085C1CC","UNK_TYPE1","",0x1),
0x8085C1E4:("D_8085C1E4","UNK_TYPE1","",0x1),
0x8085C1FC:("D_8085C1FC","UNK_TYPE1","",0x1),
0x8085C214:("D_8085C214","UNK_TYPE1","",0x1),
0x8085C22C:("D_8085C22C","UNK_TYPE1","",0x1),
0x8085C244:("D_8085C244","UNK_TYPE1","",0x1),
0x8085C25C:("D_8085C25C","UNK_TYPE1","",0x1),
0x8085C274:("D_8085C274","UNK_TYPE1","",0x1),
0x8085C28C:("D_8085C28C","UNK_TYPE1","",0x1),
0x8085C2A4:("D_8085C2A4","UNK_TYPE4","",0x4),
0x8085C2A8:("D_8085C2A8","UNK_TYPE4","",0x4),
0x8085C2AC:("D_8085C2AC","UNK_TYPE4","",0x4),
0x8085BA38:("sPlayerAgeProperties","UNK_TYPE1","",0x1),
0x8085BE84:("D_8085BE84","LinkAnimationHeader*","[264]",0x420),
0x8085C2A4:("D_8085C2A4","struct_8085C2A4","[6]",0x48),
0x8085C2EC:("D_8085C2EC","UNK_TYPE1","",0x1),
0x8085C318:("D_8085C318","UNK_TYPE1","",0x1),
0x8085C344:("D_8085C344","UNK_TYPE1","",0x1),
@@ -4994,9 +4951,8 @@
0x8085C3E4:("D_8085C3E4","f32","",0x4),
0x8085C3E8:("D_8085C3E8","f32","",0x4),
0x8085C3EC:("D_8085C3EC","UNK_TYPE2","",0x2),
0x8085C3F4:("D_8085C3F4","UNK_TYPE1","",0x1),
0x8085C84C:("D_8085C84C","UNK_TYPE4","",0x4),
0x8085C850:("D_8085C850","UNK_TYPE4","",0x4),
0x8085C3F4:("sGetItemTable","GetItemEntry","[0xB9]",0x456),
0x8085C84C:("sPlayerIdleAnimations","UNK_TYPE4","",0x78),
0x8085C8C4:("D_8085C8C4","UNK_TYPE1","",0x1),
0x8085C8C8:("D_8085C8C8","UNK_TYPE1","",0x1),
0x8085C8CC:("D_8085C8CC","UNK_TYPE1","",0x1),
@@ -5007,19 +4963,17 @@
0x8085C90C:("D_8085C90C","UNK_TYPE1","",0x1),
0x8085C91C:("D_8085C91C","UNK_TYPE1","",0x1),
0x8085C924:("D_8085C924","UNK_TYPE1","",0x1),
0x8085C928:("D_8085C928","UNK_TYPE1","",0x1),
0x8085C938:("D_8085C938","UNK_TYPE1","",0x1),
0x8085C928:("D_8085C928","UNK_TYPE1","",0x14),
0x8085C93C:("D_8085C93C","UNK_TYPE1","",0x1),
0x8085C96C:("D_8085C96C","UNK_TYPE1","",0x1),
0x8085C98C:("D_8085C98C","UNK_TYPE1","",0x1),
0x8085C99C:("D_8085C99C","UNK_TYPE1","",0x1),
0x8085C99C:("sItemActionParams","UNK_TYPE1","",0x1),
0x8085C9F0:("D_8085C9F0","UNK_PTR","",0x4),
0x8085CB3C:("D_8085CB3C","UNK_PTR","",0x4),
0x8085CC88:("D_8085CC88","UNK_TYPE1","",0x1),
0x8085CD00:("D_8085CD00","UNK_TYPE1","",0x1),
0x8085CD24:("D_8085CD24","UNK_TYPE1","",0x1),
0x8085CD30:("D_8085CD30","UNK_TYPE1","",0x1),
0x8085CE30:("D_8085CE30","UNK_TYPE1","",0x1),
0x8085CE60:("D_8085CE60","UNK_TYPE1","",0x1),
0x8085CD00:("D_8085CD00","s8","[36]",0x24),
0x8085CD24:("sPlayerExplosiveInfo","UNK_TYPE1","",0x1),
0x8085CD30:("sMeleeAttackAnimInfo","UNK_TYPE1","",0x220),
0x8085CF50:("D_8085CF50","UNK_TYPE1","",0x1),
0x8085CF58:("D_8085CF58","UNK_TYPE1","",0x1),
0x8085CF60:("D_8085CF60","UNK_TYPE1","",0x1),
@@ -5028,10 +4982,10 @@
0x8085CF78:("D_8085CF78","UNK_TYPE1","",0x1),
0x8085CF80:("D_8085CF80","UNK_TYPE1","",0x1),
0x8085CF84:("D_8085CF84","UNK_TYPE1","",0x1),
0x8085CF88:("D_8085CF88","UNK_TYPE1","",0x1),
0x8085CFA8:("D_8085CFA8","UNK_TYPE2","",0x2),
0x8085CFAE:("D_8085CFAE","UNK_TYPE1","",0x1),
0x8085CFB8:("D_8085CFB8","UNK_TYPE1","",0x1),
0x8085CF88:("D_8085CF88","BlureColors","[2]",0x20),
0x8085CFA8:("D_8085CFA8","u16","[4]",0x8),
0x8085CFB0:("D_8085CFB0","UNK_TYPE1","",0x1),
0x8085CFB8:("sMagicArrowCosts","u8","[4]",0x4),
0x8085CFBC:("D_8085CFBC","UNK_TYPE1","",0x1),
0x8085CFC4:("D_8085CFC4","UNK_TYPE1","",0x1),
0x8085CFCC:("D_8085CFCC","UNK_TYPE1","",0x1),
@@ -5051,47 +5005,42 @@
0x8085D050:("D_8085D050","UNK_TYPE1","",0x1),
0x8085D054:("D_8085D054","UNK_PTR","",0x4),
0x8085D090:("D_8085D090","UNK_TYPE1","",0x1),
0x8085D094:("D_8085D094","UNK_TYPE1","",0x1),
0x8085D097:("D_8085D097","UNK_TYPE1","",0x1),
0x8085D094:("D_8085D094","UNK_TYPE1","",0x6),
0x8085D09C:("D_8085D09C","UNK_TYPE4","",0x4),
0x8085D0D4:("D_8085D0D4","UNK_TYPE1","",0x1),
0x8085D0E4:("D_8085D0E4","UNK_TYPE1","",0x1),
0x8085D0F4:("D_8085D0F4","UNK_TYPE4","",0x4),
0x8085D0F8:("D_8085D0F8","UNK_TYPE1","",0x1),
0x8085D0F8:("sReturnEntranceGroupData","s16","[1]",0x2),
0x8085D0FA:("sReturnEntranceGroupIndices","u8","[1]",0x1),
0x8085D100:("D_8085D100","UNK_TYPE1","",0x1),
0x8085D10C:("D_8085D10C","f32","",0x4),
0x8085D114:("D_8085D114","f32","",0x4),
0x8085D10C:("D_8085D10C","Vec3f","",0xC),
0x8085D118:("D_8085D118","UNK_TYPE1","",0x1),
0x8085D124:("D_8085D124","UNK_TYPE1","",0x1),
0x8085D130:("D_8085D130","UNK_TYPE1","",0x1),
0x8085D134:("D_8085D134","f32","",0x4),
0x8085D13C:("D_8085D13C","UNK_TYPE1","",0x1),
0x8085D130:("D_8085D130","Vec3f","",0xC),
0x8085D13C:("sFallImpactInfos","UNK_TYPE1","",0x1),
0x8085D148:("D_8085D148","UNK_TYPE1","",0x1),
0x8085D154:("D_8085D154","UNK_TYPE1","",0x1),
0x8085D160:("D_8085D160","UNK_TYPE1","",0x1),
0x8085D174:("D_8085D174","UNK_TYPE1","",0x1),
0x8085D174:("sPlayerMass","u8","[5]",0x5),
0x8085D17C:("D_8085D17C","UNK_TYPE1","",0x1),
0x8085D190:("D_8085D190","UNK_TYPE1","",0x1),
0x8085D1A4:("D_8085D1A4","UNK_TYPE1","",0x1),
0x8085D1F8:("D_8085D1F8","UNK_TYPE1","",0x1),
0x8085D200:("D_8085D200","UNK_TYPE4","",0x4),
0x8085D218:("D_8085D218","UNK_TYPE1","",0x1),
0x8085D224:("D_8085D224","UNK_TYPE1","",0x1),
0x8085D23C:("D_8085D23C","UNK_TYPE1","",0x1),
0x8085D252:("D_8085D252","UNK_TYPE1","",0x1),
0x8085D224:("D_8085D224","UNK_TYPE1","",0x30),
0x8085D254:("D_8085D254","u16","[4]",0x8),
0x8085D25C:("D_8085D25C","UNK_TYPE1","",0x1),
0x8085D264:("D_8085D264","UNK_TYPE1","",0x1),
0x8085D26C:("D_8085D26C","UNK_TYPE1","",0x1),
0x8085D270:("D_8085D270","UNK_TYPE1","",0x1),
0x8085D27C:("D_8085D27C","f32","",0x4),
0x8085D284:("D_8085D284","f32","",0x4),
0x8085D288:("D_8085D288","UNK_TYPE1","",0x1),
0x8085D28C:("D_8085D28C","f32","",0x4),
0x8085D27C:("D_8085D27C","Vec3f","",0xC),
0x8085D288:("D_8085D288","Vec3f","",0xC),
0x8085D294:("D_8085D294","UNK_TYPE1","",0x1),
0x8085D2A4:("D_8085D2A4","UNK_TYPE1","",0x1),
0x8085D2B0:("D_8085D2B0","UNK_TYPE1","",0x1),
0x8085D2B4:("D_8085D2B4","UNK_TYPE1","",0x1),
0x8085D2C0:("D_8085D2C0","ActorInitVar","",0x4),
0x8085D2C0:("sInitChain","ActorInitVar","",0x4),
0x8085D2C4:("D_8085D2C4","UNK_TYPE4","",0x4),
0x8085D2CC:("D_8085D2CC","UNK_PTR","",0x4),
0x8085D30C:("D_8085D30C","EffectBlureInit2","",0x24),
@@ -5101,9 +5050,7 @@
0x8085D340:("D_8085D340","UNK_TYPE1","",0x1),
0x8085D34C:("D_8085D34C","UNK_TYPE1","",0x1),
0x8085D354:("D_8085D354","UNK_TYPE1","",0x1),
0x8085D358:("D_8085D358","UNK_TYPE1","",0x1),
0x8085D35C:("D_8085D35C","f32","",0x4),
0x8085D360:("D_8085D360","f32","",0x4),
0x8085D358:("D_8085D358","Vec3f","",0xC),
0x8085D364:("D_8085D364","UNK_TYPE1","",0x1),
0x8085D370:("D_8085D370","UNK_TYPE1","",0x1),
0x8085D37C:("D_8085D37C","UNK_TYPE1","",0x1),
@@ -5113,8 +5060,8 @@
0x8085D3F4:("D_8085D3F4","UNK_TYPE1","",0x1),
0x8085D3F8:("D_8085D3F8","UNK_TYPE1","",0x1),
0x8085D3FC:("D_8085D3FC","UNK_TYPE4","",0x4),
0x8085D404:("D_8085D404","UNK_TYPE1","",0x1),
0x8085D410:("D_8085D410","UNK_TYPE1","",0x1),
0x8085D404:("sWaterConveyorSpeeds","UNK_TYPE1","",0x1),
0x8085D410:("sFloorConveyorSpeeds","UNK_TYPE1","",0x1),
0x8085D41C:("D_8085D41C","UNK_TYPE1","",0x1),
0x8085D428:("D_8085D428","UNK_TYPE1","",0x1),
0x8085D450:("D_8085D450","UNK_TYPE1","",0x1),
@@ -5132,32 +5079,28 @@
0x8085D574:("D_8085D574","UNK_TYPE4","",0x4),
0x8085D580:("D_8085D580","UNK_TYPE1","",0x1),
0x8085D584:("D_8085D584","UNK_TYPE1","",0x1),
0x8085D588:("D_8085D588","UNK_TYPE1","",0x1),
0x8085D5A0:("D_8085D5A0","UNK_TYPE1","",0x1),
0x8085D5B8:("D_8085D5B8","UNK_TYPE1","",0x1),
0x8085D588:("D_8085D588","Vec3f","[2]",0x18),
0x8085D5A0:("D_8085D5A0","Vec3f","[2]",0x18),
0x8085D5B8:("D_8085D5B8","Vec3f","[2]",0x18),
0x8085D5D0:("D_8085D5D0","UNK_TYPE1","",0x1),
0x8085D5DC:("D_8085D5DC","UNK_TYPE1","",0x1),
0x8085D5E0:("D_8085D5E0","UNK_TYPE1","",0x1),
0x8085D5E4:("D_8085D5E4","UNK_TYPE1","",0x1),
0x8085D5F0:("D_8085D5F0","UNK_TYPE1","",0x1),
0x8085D5FA:("D_8085D5FA","UNK_TYPE1","",0x1),
0x8085D604:("D_8085D604","UNK_TYPE1","",0x1),
0x8085D60C:("D_8085D60C","UNK_TYPE1","",0x1),
0x8085D61C:("D_8085D61C","UNK_TYPE1","",0x1),
0x8085D62C:("D_8085D62C","f32","",0x4),
0x8085D630:("D_8085D630","f32","",0x4),
0x8085D634:("D_8085D634","f32","",0x4),
0x8085D638:("D_8085D638","f32","",0x4),
0x8085D640:("D_8085D640","f32","",0x4),
0x8085D644:("D_8085D644","UNK_TYPE1","",0x1),
0x8085D64C:("D_8085D64C","f32","",0x4),
0x8085D5F0:("D_8085D5F0","UNK_TYPE1","",0xC),
0x8085D5FC:("D_8085D5FC","UNK_TYPE1","",0x1),
0x8085D604:("D_8085D604","UNK_TYPE1","",0x8),
0x8085D60C:("D_8085D60C","UNK_TYPE1","",0x10),
0x8085D61C:("D_8085D61C","UNK_TYPE1","",0x10),
0x8085D62C:("D_8085D62C","Vec3f","",0xC),
0x8085D638:("D_8085D638","Vec3f","",0xC),
0x8085D644:("D_8085D644","Vec3f","",0xC),
0x8085D650:("D_8085D650","UNK_TYPE1","",0x1),
0x8085D658:("D_8085D658","UNK_TYPE1","",0x1),
0x8085D660:("D_8085D660","UNK_TYPE1","",0x1),
0x8085D66C:("D_8085D66C","UNK_TYPE4","",0x4),
0x8085D674:("D_8085D674","UNK_TYPE4","",0x4),
0x8085D67C:("D_8085D67C","UNK_TYPE1","",0x1),
0x8085D680:("D_8085D680","UNK_TYPE1","",0x1),
0x8085D67C:("D_8085D67C","UNK_TYPE1","",0xC),
0x8085D688:("D_8085D688","UNK_TYPE1","",0x1),
0x8085D6A4:("D_8085D6A4","UNK_TYPE1","",0x1),
0x8085D6D0:("D_8085D6D0","UNK_PTR","",0x4),
0x8085D6DC:("D_8085D6DC","UNK_TYPE1","",0x1),
@@ -5168,18 +5111,16 @@
0x8085D73C:("D_8085D73C","UNK_TYPE1","",0x1),
0x8085D74C:("D_8085D74C","UNK_TYPE1","",0x1),
0x8085D75C:("D_8085D75C","UNK_TYPE1","",0x1),
0x8085D764:("D_8085D764","UNK_TYPE1","",0x1),
0x8085D76D:("D_8085D76D","UNK_TYPE1","",0x1),
0x8085D764:("D_8085D764","Vec3f","",0xC),
0x8085D770:("D_8085D770","UNK_TYPE1","",0x1),
0x8085D77C:("D_8085D77C","UNK_TYPE1","",0x1),
0x8085D788:("D_8085D788","UNK_TYPE1","",0x1),
0x8085D78C:("D_8085D78C","UNK_TYPE1","",0x1),
0x8085D797:("D_8085D797","UNK_TYPE1","",0x1),
0x8085D78C:("D_8085D78C","Color_RGBA8","",0x4),
0x8085D790:("D_8085D790","u8","[6]",0x6),
0x8085D798:("D_8085D798","UNK_TYPE2","",0x2),
0x8085D7EC:("D_8085D7EC","UNK_TYPE1","",0x1),
0x8085D7F8:("D_8085D7F8","UNK_TYPE1","",0x1),
0x8085D800:("D_8085D800","f32","",0x4),
0x8085D804:("D_8085D804","UNK_TYPE1","",0x1),
0x8085D7EC:("D_8085D7EC","Vec3f","",0xC),
0x8085D7F8:("D_8085D7F8","Vec3f","",0xC),
0x8085D804:("D_8085D804","s8","[5]",0x5),
0x8085D80C:("D_8085D80C","UNK_TYPE1","",0x1),
0x8085D838:("D_8085D838","UNK_TYPE1","",0x1),
0x8085D840:("D_8085D840","UNK_TYPE1","",0x1),
@@ -5189,18 +5130,14 @@
0x8085D904:("D_8085D904","UNK_TYPE1","",0x1),
0x8085D908:("D_8085D908","UNK_TYPE1","",0x1),
0x8085D910:("D_8085D910","UNK_TYPE1","",0x1),
0x8085D918:("D_8085D918","UNK_TYPE1","",0x1),
0x8085D91C:("D_8085D91C","f32","",0x4),
0x8085D924:("D_8085D924","UNK_TYPE1","",0x1),
0x8085D928:("D_8085D928","f32","",0x4),
0x8085D918:("D_8085D918","Vec3f","",0xC),
0x8085D924:("D_8085D924","Vec3f","",0xC),
0x8085D930:("D_8085D930","UNK_TYPE1","",0x1),
0x8085D934:("D_8085D934","UNK_TYPE1","",0x1),
0x8085D938:("D_8085D938","UNK_TYPE4","",0x4),
0x8085D93C:("D_8085D93C","UNK_TYPE4","",0x4),
0x8085D940:("D_8085D940","f32","",0x4),
0x8085D948:("D_8085D948","f32","",0x4),
0x8085D94C:("D_8085D94C","f32","",0x4),
0x8085D954:("D_8085D954","f32","",0x4),
0x8085D940:("D_8085D940","Vec3f","",0xC),
0x8085D94C:("D_8085D94C","Vec3f","",0xC),
0x8085D958:("D_8085D958","UNK_TYPE1","",0x1),
0x8085D960:("D_8085D960","UNK_TYPE1","",0x1),
0x8085D96C:("D_8085D96C","UNK_TYPE1","",0x1),
@@ -5444,20 +5381,18 @@
0x8085E6EC:("D_8085E6EC","f32","",0x4),
0x8085E6F0:("D_8085E6F0","f32","",0x4),
0x8085E6F4:("D_8085E6F4","f32","",0x4),
0x80862AF0:("D_80862AF0","UNK_TYPE1","",0x1),
0x80862AF4:("D_80862AF4","f32","",0x4),
0x80862AF8:("D_80862AF8","f32","",0x4),
0x80862AF0:("sDogSpawnPos","Vec3f","",0xC),
0x80862AFC:("D_80862AFC","f32","",0x4),
0x80862B00:("D_80862B00","UNK_TYPE1","",0x1),
0x80862B02:("D_80862B02","UNK_TYPE1","",0x1),
0x80862B04:("D_80862B04","UNK_TYPE1","",0x1),
0x80862B08:("D_80862B08","UNK_TYPE1","",0x1),
0x80862B0C:("D_80862B0C","UNK_TYPE1","",0x1),
0x80862B10:("D_80862B10","UNK_TYPE1","",0x1),
0x80862B14:("D_80862B14","UNK_TYPE1","",0x1),
0x80862B08:("sPlayerCurrentFloorType","UNK_TYPE1","",0x1),
0x80862B0C:("sPlayerCurrentWallFlags","UNK_TYPE1","",0x1),
0x80862B10:("sPlayerConveyorSpeedIndex","UNK_TYPE1","",0x1),
0x80862B14:("sPlayerIsOnFloorConveyor","UNK_TYPE1","",0x1),
0x80862B16:("D_80862B16","UNK_TYPE1","",0x1),
0x80862B18:("D_80862B18","f32","",0x4),
0x80862B1C:("D_80862B1C","UNK_TYPE1","",0x1),
0x80862B1C:("sPlayerPrevFloorProperty","UNK_TYPE1","",0x1),
0x80862B20:("D_80862B20","UNK_TYPE1","",0x1),
0x80862B24:("D_80862B24","UNK_TYPE1","",0x1),
0x80862B28:("D_80862B28","UNK_TYPE1","",0x1),
@@ -5465,7 +5400,7 @@
0x80862B30:("D_80862B30","UNK_TYPE1","",0x1),
0x80862B3C:("D_80862B3C","f32","",0x4),
0x80862B40:("D_80862B40","UNK_TYPE1","",0x1),
0x80862B44:("D_80862B44","UNK_TYPE1","",0x1),
0x80862B44:("sPlayerControlInput","UNK_TYPE1","",0x1),
0x80862B48:("D_80862B48","UNK_TYPE1","",0x1),
0x80862B4C:("D_80862B4C","UNK_TYPE1","",0x1),
0x80862B50:("D_80862B50","UNK_TYPE1","",0x1),
+1171
View File
File diff suppressed because it is too large Load Diff
+5
View File
@@ -222,6 +222,7 @@ wordReplace = {
"SkelAnime_InitLink": "SkelAnime_InitPlayer",
"LinkAnimation_SetUpdateFunction": "PlayerAnimation_SetUpdateFunction",
"LinkAnimation_Update": "PlayerAnimation_Update",
"LinkAnimation_AnimateFrame": "PlayerAnimation_AnimateFrame",
"SkelAnime_SetTransition": "Animation_SetMorph",
"LinkAnimation_Change": "PlayerAnimation_Change",
"LinkAnimation_PlayOnce": "PlayerAnimation_PlayOnce",
@@ -903,6 +904,7 @@ wordReplace = {
"player->swordInfo": "player->meleeWeaponInfo",
"player->itemActionParam": "player->heldItemAction",
"player->heldItemActionParam": "player->itemAction",
"player->unk_A86": "player->currentActorCsIndex",
"player->unk_A9C": "player->secretRumbleCharge",
"player->unk_AA0": "player->closestSecretDistSq",
"player->unk_AAC": "player->headLimbRot",
@@ -911,6 +913,8 @@ wordReplace = {
"player->getItemDrawId": "player->getItemDrawIdPlusOne",
"player->unk_B68": "player->fallStartHeight",
"player->unk_B6A": "player->fallDistance",
"player->unk_B80": "player->pushedSpeed",
"player->unk_B84": "player->pushedYaw",
"player->targetActor": "player->talkActor",
"player->targetActorDistance": "player->talkActorDistance",
"player->unk_730": "player->targetedActor",
@@ -991,6 +995,7 @@ wordReplace = {
"play->sceneLoadFlag": "play->transitionTrigger",
"play->unk_18B4A": "play->transitionMode",
"play->unk_1887F": "play->transitionType",
"play->roomCtx.currRoom": "play->roomCtx.curRoom",
"gSaveContext.nextTransition": "gSaveContext.nextTransitionType",
"gSaveContext.unk_3F48": "gSaveContext.cutsceneTransitionControl",
"gSaveContext.fadeDuration": "gSaveContext.transFadeDuration",