izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bigslime OK and Documented (#361)

Browse Source 
* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "d218cdf0"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "d218cdf0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48c"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
This commit is contained in:
engineer124
2021-12-27 04:24:45 +00:00
committed by GitHub
co-authored by Angie
parent 5455cbc0c8
commit f19571dfcd
58 changed files with 3472 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_bigslime.xml
+126 -110
View File
@@ -1,114 +1,130 @@
<Root>
<File Name="object_bigslime" Segment="6">
<Animation Name="object_bigslime_Anim_000994" Offset="0x994" />
<Animation Name="object_bigslime_Anim_0010F4" Offset="0x10F4" />
<Animation Name="object_bigslime_Anim_001B08" Offset="0x1B08" />
<Animation Name="object_bigslime_Anim_001E14" Offset="0x1E14" />
<Animation Name="object_bigslime_Anim_001F20" Offset="0x1F20" />
<Animation Name="object_bigslime_Anim_00225C" Offset="0x225C" />
<Animation Name="object_bigslime_Anim_00276C" Offset="0x276C" />
<Animation Name="object_bigslime_Anim_002E0C" Offset="0x2E0C" />
<Animation Name="object_bigslime_Anim_0030E4" Offset="0x30E4" />
<Animation Name="object_bigslime_Anim_00347C" Offset="0x347C" />
<Animation Name="object_bigslime_Anim_0039C4" Offset="0x39C4" />
<Animation Name="object_bigslime_Anim_003F28" Offset="0x3F28" />
<Animation Name="object_bigslime_Anim_004298" Offset="0x4298" />
<Animation Name="object_bigslime_Anim_004680" Offset="0x4680" />
<Animation Name="object_bigslime_Anim_004894" Offset="0x4894" />
<Animation Name="object_bigslime_Anim_004D50" Offset="0x4D50" />
<Animation Name="object_bigslime_Anim_0050B8" Offset="0x50B8" />
<Animation Name="object_bigslime_Anim_0052EC" Offset="0x52EC" />
<Animation Name="object_bigslime_Anim_005694" Offset="0x5694" />
<Animation Name="object_bigslime_Anim_005D54" Offset="0x5D54" />
<Animation Name="object_bigslime_Anim_0066B4" Offset="0x66B4" />
<Animation Name="object_bigslime_Anim_0069FC" Offset="0x69FC" />
<Animation Name="object_bigslime_Anim_0070C4" Offset="0x70C4" />
<Animation Name="object_bigslime_Anim_007790" Offset="0x7790" />
<DList Name="object_bigslime_DL_009D90" Offset="0x9D90" />
<DList Name="object_bigslime_DL_009FF0" Offset="0x9FF0" />
<DList Name="object_bigslime_DL_00A250" Offset="0xA250" />
<DList Name="object_bigslime_DL_00A510" Offset="0xA510" />
<DList Name="object_bigslime_DL_00AAF8" Offset="0xAAF8" />
<DList Name="object_bigslime_DL_00ABB0" Offset="0xABB0" />
<DList Name="object_bigslime_DL_00AC78" Offset="0xAC78" />
<DList Name="object_bigslime_DL_00AD88" Offset="0xAD88" />
<DList Name="object_bigslime_DL_00AE98" Offset="0xAE98" />
<DList Name="object_bigslime_DL_00AF50" Offset="0xAF50" />
<DList Name="object_bigslime_DL_00B030" Offset="0xB030" />
<DList Name="object_bigslime_DL_00B140" Offset="0xB140" />
<DList Name="object_bigslime_DL_00B250" Offset="0xB250" />
<DList Name="object_bigslime_DL_00B4D8" Offset="0xB4D8" />
<DList Name="object_bigslime_DL_00B660" Offset="0xB660" />
<DList Name="object_bigslime_DL_00B770" Offset="0xB770" />
<DList Name="object_bigslime_DL_00B880" Offset="0xB880" />
<DList Name="object_bigslime_DL_00B9A8" Offset="0xB9A8" />
<DList Name="object_bigslime_DL_00BB30" Offset="0xBB30" />
<DList Name="object_bigslime_DL_00BC40" Offset="0xBC40" />
<DList Name="object_bigslime_DL_00BD50" Offset="0xBD50" />
<DList Name="object_bigslime_DL_00BE78" Offset="0xBE78" />
<Texture Name="object_bigslime_TLUT_00C028" OutName="tlut_00C028" Format="rgba16" Width="16" Height="16" Offset="0xC028" />
<Texture Name="object_bigslime_TLUT_00C228" OutName="tlut_00C228" Format="rgba16" Width="16" Height="16" Offset="0xC228" />
<Texture Name="object_bigslime_TLUT_00C428" OutName="tlut_00C428" Format="rgba16" Width="16" Height="16" Offset="0xC428" />
<Texture Name="object_bigslime_Tex_00C628" OutName="tex_00C628" Format="rgba16" Width="8" Height="8" Offset="0xC628" />
<Texture Name="object_bigslime_Tex_00C6A8" OutName="tex_00C6A8" Format="rgba16" Width="16" Height="16" Offset="0xC6A8" />
<Texture Name="object_bigslime_Tex_00C8A8" OutName="tex_00C8A8" Format="rgba16" Width="16" Height="16" Offset="0xC8A8" />
<Texture Name="object_bigslime_Tex_00CAA8" OutName="tex_00CAA8" Format="rgba16" Width="16" Height="32" Offset="0xCAA8" />
<Texture Name="object_bigslime_Tex_00CEA8" OutName="tex_00CEA8" Format="ci8" Width="16" Height="32" Offset="0xCEA8" />
<Texture Name="object_bigslime_Tex_00D0A8" OutName="tex_00D0A8" Format="rgba16" Width="16" Height="16" Offset="0xD0A8" />
<Texture Name="object_bigslime_Tex_00D2A8" OutName="tex_00D2A8" Format="rgba16" Width="16" Height="8" Offset="0xD2A8" />
<Texture Name="object_bigslime_Tex_00D3A8" OutName="tex_00D3A8" Format="rgba16" Width="8" Height="8" Offset="0xD3A8" />
<Texture Name="object_bigslime_Tex_00D428" OutName="tex_00D428" Format="rgba16" Width="32" Height="16" Offset="0xD428" />
<Texture Name="object_bigslime_Tex_00D828" OutName="tex_00D828" Format="ci8" Width="32" Height="32" Offset="0xD828" />
<Texture Name="object_bigslime_Tex_00DC28" OutName="tex_00DC28" Format="ci8" Width="16" Height="32" Offset="0xDC28" />
<Limb Name="object_bigslime_Standardlimb_00DE28" Type="Standard" Offset="0xDE28" />
<Limb Name="object_bigslime_Standardlimb_00DE34" Type="Standard" Offset="0xDE34" />
<Limb Name="object_bigslime_Standardlimb_00DE40" Type="Standard" Offset="0xDE40" />
<Limb Name="object_bigslime_Standardlimb_00DE4C" Type="Standard" Offset="0xDE4C" />
<Limb Name="object_bigslime_Standardlimb_00DE58" Type="Standard" Offset="0xDE58" />
<Limb Name="object_bigslime_Standardlimb_00DE64" Type="Standard" Offset="0xDE64" />
<Limb Name="object_bigslime_Standardlimb_00DE70" Type="Standard" Offset="0xDE70" />
<Limb Name="object_bigslime_Standardlimb_00DE7C" Type="Standard" Offset="0xDE7C" />
<Limb Name="object_bigslime_Standardlimb_00DE88" Type="Standard" Offset="0xDE88" />
<Limb Name="object_bigslime_Standardlimb_00DE94" Type="Standard" Offset="0xDE94" />
<Limb Name="object_bigslime_Standardlimb_00DEA0" Type="Standard" Offset="0xDEA0" />
<Limb Name="object_bigslime_Standardlimb_00DEAC" Type="Standard" Offset="0xDEAC" />
<Limb Name="object_bigslime_Standardlimb_00DEB8" Type="Standard" Offset="0xDEB8" />
<Limb Name="object_bigslime_Standardlimb_00DEC4" Type="Standard" Offset="0xDEC4" />
<Limb Name="object_bigslime_Standardlimb_00DED0" Type="Standard" Offset="0xDED0" />
<Limb Name="object_bigslime_Standardlimb_00DEDC" Type="Standard" Offset="0xDEDC" />
<Limb Name="object_bigslime_Standardlimb_00DEE8" Type="Standard" Offset="0xDEE8" />
<Limb Name="object_bigslime_Standardlimb_00DEF4" Type="Standard" Offset="0xDEF4" />
<Limb Name="object_bigslime_Standardlimb_00DF00" Type="Standard" Offset="0xDF00" />
<Limb Name="object_bigslime_Standardlimb_00DF0C" Type="Standard" Offset="0xDF0C" />
<Limb Name="object_bigslime_Standardlimb_00DF18" Type="Standard" Offset="0xDF18" />
<Limb Name="object_bigslime_Standardlimb_00DF24" Type="Standard" Offset="0xDF24" />
<Limb Name="object_bigslime_Standardlimb_00DF30" Type="Standard" Offset="0xDF30" />
<Skeleton Name="object_bigslime_Skel_00DF98" Type="Flex" LimbType="Standard" Offset="0xDF98" />
<Animation Name="object_bigslime_Anim_00F048" Offset="0xF048" />
<Animation Name="object_bigslime_Anim_00F3F0" Offset="0xF3F0" />
<Animation Name="object_bigslime_Anim_00F990" Offset="0xF990" />
<DList Name="object_bigslime_DL_00F9D0" Offset="0xF9D0" />
<DList Name="object_bigslime_DL_00FB40" Offset="0xFB40" />
<Texture Name="object_bigslime_Tex_00FC28" OutName="tex_00FC28" Format="i4" Width="32" Height="64" Offset="0xFC28" />
<!-- <Blob Name="object_bigslime_zeroes_unk_00010028" Size="0x400" Offset="0x10028" /> -->
<Texture Name="object_bigslime_Tex_010428" OutName="tex_010428" Format="i4" Width="16" Height="16" Offset="0x10428" />
<!-- <Blob Name="object_bigslime_zeroes_unk_000104A8" Size="0x88" Offset="0x104A8" /> -->
<DList Name="object_bigslime_DL_010530" Offset="0x10530" />
<DList Name="object_bigslime_DL_0105E8" Offset="0x105E8" />
<DList Name="object_bigslime_DL_010B80" Offset="0x10B80" />
<TextureAnimation Name="object_bigslime_Matanimheader_010C48" Offset="0x10C48" />
<DList Name="object_bigslime_DL_010DB0" Offset="0x10DB0" />
<TextureAnimation Name="object_bigslime_Matanimheader_010EC8" Offset="0x10EC8" />
<DList Name="object_bigslime_DL_010F20" Offset="0x10F20" />
<DList Name="object_bigslime_DL_010FE0" Offset="0x10FE0" />
<TextureAnimation Name="object_bigslime_Matanimheader_011008" Offset="0x11008" />
<DList Name="object_bigslime_DL_011050" Offset="0x11050" />
<DList Name="object_bigslime_DL_0113B0" Offset="0x113B0" />
<Texture Name="object_bigslime_Tex_011580" OutName="tex_011580" Format="i4" Width="16" Height="16" Offset="0x11580" />
<Texture Name="object_bigslime_Tex_011600" OutName="tex_011600" Format="i8" Width="32" Height="32" Offset="0x11600" />
<Texture Name="object_bigslime_Tex_011A00" OutName="tex_011A00" Format="rgba16" Width="32" Height="32" Offset="0x11A00" />
<Texture Name="object_bigslime_Tex_012200" OutName="tex_012200" Format="i4" Width="64" Height="64" Offset="0x12200" />
<Texture Name="object_bigslime_Tex_012A00" OutName="tex_012A00" Format="i4" Width="64" Height="64" Offset="0x12A00" />
<Texture Name="object_bigslime_Tex_013200" OutName="tex_013200" Format="i4" Width="32" Height="32" Offset="0x13200" />
<Animation Name="gGekkoFullFistPumpAnim" Offset="0x994" />
<Animation Name="gGekkoSurpriseJumpAnim" Offset="0x10F4" />
<Animation Name="gGekkoCallAnim" Offset="0x1B08" />
<Animation Name="gGekkoCrawlAnim" Offset="0x1E14" />
<Animation Name="gGekkoFallInAirAnim" Offset="0x1F20" />
<Animation Name="gGekkoFloorIdleAnim" Offset="0x225C" />
<Animation Name="gGekkoDamagedAnim" Offset="0x276C" />
<Animation Name="gGekkoJumpUpAnim" Offset="0x2E0C" />
<Animation Name="gGekkoRecoverAnim" Offset="0x30E4" />
<Animation Name="gGekkoJabPunchAnim" Offset="0x347C" />
<Animation Name="gGekkoJumpForwardAnim" Offset="0x39C4" />
<Animation Name="gGekkoKickAnim" Offset="0x3F28" />
<Animation Name="gGekkoFallOnGroundAnim" Offset="0x4298" />
<Animation Name="gGekkoStandingIdleAnim" Offset="0x4680" />
<Animation Name="gGekkoJumpOnSnapperAnim" Offset="0x4894" />
<Animation Name="gGekkoQuickFistPumpAnim" Offset="0x4D50" />
<Animation Name="gGekkoSqueezeAnim" Offset="0x50B8" />
<Animation Name="gGekkoLandOnSnapperAnim" Offset="0x52EC" />
<Animation Name="gGekkoWiggleAnim" Offset="0x5694" />
<Animation Name="gGekkoKnockbackAnim" Offset="0x5D54" />
<Animation Name="gGekkoLookAroundAnim" Offset="0x66B4" />
<Animation Name="gGekkoNervousIdleAnim" Offset="0x69FC" />
<Animation Name="gGekkoHookPunchAnim" Offset="0x70C4" />
<Animation Name="gGekkoSwimForwardAnim" Offset="0x7790" />
<DList Name="gGekkoRightEyeDL" Offset="0x9D90" />
<DList Name="gGekkoLeftEyeDL" Offset="0x9FF0" />
<DList Name="gGekkoJawDL" Offset="0xA250" />
<DList Name="gGekkoHeadDL" Offset="0xA510" />
<DList Name="gGekkoRightHandDL" Offset="0xAAF8" />
<DList Name="gGekkoRightWristDL" Offset="0xABB0" />
<DList Name="gGekkoRightForearmDL" Offset="0xAC78" />
<DList Name="gGekkoRightUpperArmDL" Offset="0xAD88" />
<DList Name="gGekkoLeftHandDL" Offset="0xAE98" />
<DList Name="gGekkoLeftWristDL" Offset="0xAF50" />
<DList Name="gGekkoLeftForearmDL" Offset="0xB030" />
<DList Name="gGekkoLeftUpperArmDL" Offset="0xB140" />
<DList Name="gGekkoTorsoDL" Offset="0xB250" />
<DList Name="gGekkoRightFootDL" Offset="0xB4D8" />
<DList Name="gGekkoRightAnkleDL" Offset="0xB660" />
<DList Name="gGekkoRightShinDL" Offset="0xB770" />
<DList Name="gGekkoRightThighDL" Offset="0xB880" />
<DList Name="gGekkoLeftFootDL" Offset="0xB9A8" />
<DList Name="gGekkoLeftAnkleDL" Offset="0xBB30" />
<DList Name="gGekkoLeftShinDL" Offset="0xBC40" />
<DList Name="gGekkoLeftThighDL" Offset="0xBD50" />
<DList Name="gGekkoWaistDL" Offset="0xBE78" />
<Texture Name="gGekkoArmLegTLUT" OutName="gekko_arm_leg_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC028" />
<Texture Name="gGekkoBodyTLUT" OutName="gekko_body_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC228" />
<Texture Name="gGekkoHeadTLUT" OutName="gekko_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xC428" />
<Texture Name="gGekkoNostrilTex" OutName="gekko_nostril" Format="rgba16" Width="8" Height="8" Offset="0xC628" />
<Texture Name="gGekkoEyeTex" OutName="gekko_eye" Format="rgba16" Width="16" Height="16" Offset="0xC6A8" />
<Texture Name="gGekkoSpots1Tex" OutName="gekko_spots_1" Format="rgba16" Width="16" Height="16" Offset="0xC8A8" />
<Texture Name="gGekkoBellyTex" OutName="gekko_belly" Format="rgba16" Width="16" Height="32" Offset="0xCAA8" />
<Texture Name="gGekkoSpots2Tex" OutName="gekko_spots_2" Format="ci8" Width="16" Height="32" Offset="0xCEA8" />
<Texture Name="gGekkoToothTex" OutName="gekko_tooth" Format="rgba16" Width="16" Height="16" Offset="0xD0A8" />
<Texture Name="gGekkoMouthTex" OutName="gekko_mouth" Format="rgba16" Width="16" Height="8" Offset="0xD2A8" />
<Texture Name="gGekkoEyebrowTex" OutName="gekko_eyebrow" Format="rgba16" Width="8" Height="8" Offset="0xD3A8" />
<Texture Name="gGekkoFinTex" OutName="gekko_fin" Format="rgba16" Width="32" Height="16" Offset="0xD428" />
<Texture Name="gGekkoSpots3Tex" OutName="gekko_spots_3" Format="ci8" Width="32" Height="32" Offset="0xD828" />
<Texture Name="gGekkoSwirlTex" OutName="gekko_swirl" Format="ci8" Width="16" Height="32" Offset="0xDC28" />
<Limb Name="gGekkoRootLimb" Type="Standard" Offset="0xDE28" />
<Limb Name="gGekkoWaistLimb" Type="Standard" Offset="0xDE34" />
<Limb Name="gGekkoLeftThighLimb" Type="Standard" Offset="0xDE40" />
<Limb Name="gGekkoLeftShinLimb" Type="Standard" Offset="0xDE4C" />
<Limb Name="gGekkoLeftAnkleLimb" Type="Standard" Offset="0xDE58" />
<Limb Name="gGekkoLeftFootLimb" Type="Standard" Offset="0xDE64" />
<Limb Name="gGekkoRightThighLimb" Type="Standard" Offset="0xDE70" />
<Limb Name="gGekkoRightShinLimb" Type="Standard" Offset="0xDE7C" />
<Limb Name="gGekkoRightAnkleLimb" Type="Standard" Offset="0xDE88" />
<Limb Name="gGekkoRightFootLimb" Type="Standard" Offset="0xDE94" />
<Limb Name="gGekkoTorsoLimb" Type="Standard" Offset="0xDEA0" />
<Limb Name="gGekkoLeftUpperArmLimb" Type="Standard" Offset="0xDEAC" />
<Limb Name="gGekkoLeftForearmLimb" Type="Standard" Offset="0xDEB8" />
<Limb Name="gGekkoLeftWristLimb" Type="Standard" Offset="0xDEC4" />
<Limb Name="gGekkoLeftHandLimb" Type="Standard" Offset="0xDED0" />
<Limb Name="gGekkoRightUpperArmLimb" Type="Standard" Offset="0xDEDC" />
<Limb Name="gGekkoRightForearmLimb" Type="Standard" Offset="0xDEE8" />
<Limb Name="gGekkoRightWristLimb" Type="Standard" Offset="0xDEF4" />
<Limb Name="gGekkoRightHandLimb" Type="Standard" Offset="0xDF00" />
<Limb Name="gGekkoHeadLimb" Type="Standard" Offset="0xDF0C" />
<Limb Name="gGekkoJawLimb" Type="Standard" Offset="0xDF18" />
<Limb Name="gGekkoLeftEyeLimb" Type="Standard" Offset="0xDF24" />
<Limb Name="gGekkoRightEyeLimb" Type="Standard" Offset="0xDF30" />
<Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" Offset="0xDF98" />
<Animation Name="gGekkoWindupPunchAnim" Offset="0xF048" />
<Animation Name="gGekkoSwimUpAnim" Offset="0xF3F0" />
<Animation Name="gGekkoBoxingStanceAnim" Offset="0xF990" />
<DList Name="gBigslimeBubbleDL" Offset="0xF9D0" />
<DList Name="gBigslimeShockwaveDL" Offset="0xFB40" />
<Texture Name="gBigslimeShockwave1Tex" OutName="bigslime_shockwave_1" Format="i4" Width="32" Height="64" Offset="0xFC28" />
<Blob Name="object_bigslime_zeroes_Blob_010028" Size="0x400" Offset="0x10028" />
<Texture Name="gBigslimeShockwave2Tex" OutName="bigslime_shockwave_2" Format="i4" Width="16" Height="16" Offset="0x10428" />
<Blob Name="object_bigslime_zeroes_Blob_0104A8" Size="0x88" Offset="0x104A8" />
<DList Name="gBigslimeNormalDL" Offset="0x10530" />
<!-- Reads vtx from segment 9 set by sBigslimeDynamicVtx -->
<DList Name="gBigslimeVtxDL" Offset="0x105E8" />
<!-- Reads vtx from segment 9 set by sBigslimeTargetVtx -->
<DList Name="gBigslimeFrozenVtxDL" Offset="0x10B80" />
<TextureAnimation Name="gBigslimeFrozenTexAnim" Offset="0x10C48" />
<DList Name="gMinislimeFrozenDL" Offset="0x10DB0" />
<TextureAnimation Name="gMinislimeFrozenTexAnim" Offset="0x10EC8" />
<DList Name="gBigslimeIceShardDL" Offset="0x10F20" />
<DList Name="gBigslimeIceShardVtxDL" Offset="0x10FE0" />
<TextureAnimation Name="gBigslimeIceShardTexAnim" Offset="0x11008" />
<DList Name="gBigslimeShadowDL" Offset="0x11050" />
<DList Name="gMinislimeNormalDL" Offset="0x113B0" />
<Texture Name="gBigslimeBubbleTex" OutName="bigslime_bubble" Format="i4" Width="16" Height="16" Offset="0x11580" />
<Texture Name="gBigslimeShadowTex" OutName="bigslime_shadow" Format="i8" Width="32" Height="32" Offset="0x11600" />
<!-- Used also for minislime -->
<Texture Name="gBigslimeNormal1Tex" OutName="bigslime_normal_1" Format="rgba16" Width="32" Height="32" Offset="0x11A00" />
<Texture Name="gBigslimeNormal2Tex" OutName="bigslime_normal_2" Format="i4" Width="64" Height="64" Offset="0x12200" />
<Texture Name="gBigslimeFrozen1Tex" OutName="bigslime_frozen_1" Format="i4" Width="64" Height="64" Offset="0x12A00" />
<Texture Name="gBigslimeFrozen2Tex" OutName="bigslime_frozen_2" Format="i4" Width="32" Height="32" Offset="0x13200" />
</File>
</Root>
assets/xml/overlays/ovl_En_Bigslime.xml
+22
View File
@@ -0,0 +1,22 @@
<Root>
<File Name="ovl_En_Bigslime" OutName="gBigslimeStaticVtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeStaticVtx" Count="162" Offset="0x8680">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeDynamicState0Vtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeDynamicState0Vtx" Count="162" Offset="0x90A0">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeDynamicState1Vtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeDynamicState1Vtx" Count="162" Offset="0x9AC0">
<Vtx/>
</Array>
</File>
<File Name="ovl_En_Bigslime" OutName="gBigslimeTargetVtx" BaseAddress="0x808E4FC0" RangeStart="0x8680" RangeEnd="0xAF00">
<Array Name="sBigslimeTargetVtx" Count="162" Offset="0xA4E0">
<Vtx/>
</Array>
</File>
</Root>
include/variables.h
+4 -4
View File
@@ -1628,10 +1628,10 @@ extern PadMgr* padmgrContext;
// extern UNK_TYPE4 D_801D1538;
extern UNK_PTR D_801D1540;
// extern f32 sFactorialTbl[13];
extern Vec3f D_801D15B0;
extern Vec3s D_801D15BC;
extern Mtx D_801D1DE0;
extern MtxF D_801D1E20;
extern Vec3f gZeroVec3f;
extern Vec3s gZeroVec3s;
extern Mtx gIdentityMtx;
extern MtxF gIdentityMtxF;
// extern u64* initialgspUcodeText;
// extern u64* initialgspUcodeData;
// extern UNK_TYPE1 D_801D1E70;
spec
+1 -2
View File
@@ -1276,8 +1276,7 @@ beginseg
name "ovl_En_Bigslime"
compress
include "build/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.o"
include "build/data/ovl_En_Bigslime/ovl_En_Bigslime.data.o"
include "build/data/ovl_En_Bigslime/ovl_En_Bigslime.reloc.o"
include "build/src/overlays/actors/ovl_En_Bigslime/ovl_En_Bigslime_reloc.o"
endseg
beginseg
src/code/z_debug_display.c
+1 -1
View File
@@ -116,7 +116,7 @@ void func_800E992C(GlobalContext* globalCtx, s32 arg1) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C560(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &D_801D1DE0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, func_800E99B0(globalCtx->state.gfxCtx, arg1));
CLOSE_DISPS(globalCtx->state.gfxCtx);
src/code/z_eff_blure.c
+2 -2
View File
@@ -807,7 +807,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this,
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_XLU_DISP++, &vtx[j], 4, 0);
gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0);
gSPMatrix(POLY_XLU_DISP++, &D_801D1DE0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
}
}
@@ -934,7 +934,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &D_801D1DE0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->numElements != 0) {
if (this->flags == 0) {
src/code/z_eff_spark.c
+1 -1
View File
@@ -145,7 +145,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx);
if (this != NULL) {
gSPMatrix(POLY_XLU_DISP++, &D_801D1DE0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26);
gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE);
src/code/z_eff_tire_mark.c
+1 -1
View File
@@ -228,7 +228,7 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) {
vtx = GRAPH_ALLOC(gfxCtx, ALIGN16(this->numElements * sizeof(Vtx[2])));
if (vtx != NULL) {
gSPMatrix(POLY_OPA_DISP++, &D_801D1DE0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP++, 0x2C);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
src/code/z_effect_soft_sprite_old_init.c
+2 -2
View File
@@ -590,7 +590,7 @@ extern Vec3f D_801AE3E0;
void func_800B2364(GlobalContext* globalCtx, Vec3f* pos, Gfx* dList) {
Vec3f posVec = D_801AE3E0;
EffectSsHahen_Spawn(globalCtx, pos, &D_801D15B0, &posVec, 1, 5, 1, 10, dList);
EffectSsHahen_Spawn(globalCtx, pos, &gZeroVec3f, &posVec, 1, 5, 1, 10, dList);
}
// EffectSsStick Spawn Functions
@@ -1032,7 +1032,7 @@ void EffectSsDeadDs_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity,
}
void func_800B31BC(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha, s32 life) {
EffectSsDeadDs_Spawn(globalCtx, pos, &D_801D15B0, &D_801D15B0, scale, scaleStep, alpha, life);
EffectSsDeadDs_Spawn(globalCtx, pos, &gZeroVec3f, &gZeroVec3f, scale, scaleStep, alpha, life);
}
// EffectSsIceSmoke Spawn Functions
src/code/z_room.c
+2 -2
View File
@@ -18,14 +18,14 @@ void Room_DrawType0Mesh(GlobalContext* globalCtx, Room* room, u32 flags) {
func_800BCBF4(&D_801C1D10, globalCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment);
func_8012C268(globalCtx);
gSPMatrix(gfxCtx->polyOpa.p++, &D_801D1DE0, G_MTX_MODELVIEW | G_MTX_LOAD);
gSPMatrix(gfxCtx->polyOpa.p++, &gIdentityMtx, G_MTX_MODELVIEW | G_MTX_LOAD);
}
if (flags & 2) {
func_800BCC68(&D_801C1D10, globalCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, &D_801D1DE0, G_MTX_MODELVIEW | G_MTX_LOAD);
gSPMatrix(gfxCtx->polyXlu.p++, &gIdentityMtx, G_MTX_MODELVIEW | G_MTX_LOAD);
}
mesh = &room->mesh->type0;
src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+2 -2
View File
@@ -133,7 +133,7 @@ void BgGoronOyu_SpawnParticles(BgGoronOyu* this, GlobalContext* globalCtx) {
if (BgCheck_EntityRaycastFloor2(globalCtx, &globalCtx->colCtx, &poly, &pos1) < this->waterBoxPos.y) {
pos1.y = this->waterBoxPos.y + 10.0f;
EffectSsIceSmoke_Spawn(globalCtx, &pos1, &vel1, &D_801D15B0, scale);
EffectSsIceSmoke_Spawn(globalCtx, &pos1, &vel1, &gZeroVec3f, scale);
}
pos2.x = (Rand_ZeroOne() * this->waterBoxXLength) + this->waterBoxPos.x;
pos2.y = this->waterBoxPos.y + 100.0f;
@@ -145,7 +145,7 @@ void BgGoronOyu_SpawnParticles(BgGoronOyu* this, GlobalContext* globalCtx) {
if (BgCheck_EntityRaycastFloor2(globalCtx, &globalCtx->colCtx, &poly, &pos2) < this->waterBoxPos.y) {
pos2.y = this->waterBoxPos.y + 10.0f;
EffectSsIceSmoke_Spawn(globalCtx, &pos2, &vel2, &D_801D15B0, scale);
EffectSsIceSmoke_Spawn(globalCtx, &pos2, &vel2, &gZeroVec3f, scale);
}
}
}
src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+1 -1
View File
@@ -362,7 +362,7 @@ void func_80A9B554(BgHakuginPost* this, GlobalContext* globalCtx, BgHakuginPostU
spA0.x = Math_SinS(val) * temp_f20 + spB8.x;
spA0.y = (Rand_ZeroOne() * 1.2f - 0.1f) * spE4 + spB8.y;
spA0.z = Math_CosS(val) * temp_f20 + spB8.z;
func_800B0E48(globalCtx, &spA0, &D_801D15B0, &D_80A9D8EC, &D_80A9D8E4, &D_80A9D8E8,
func_800B0E48(globalCtx, &spA0, &gZeroVec3f, &D_80A9D8EC, &D_80A9D8E4, &D_80A9D8E8,
(Rand_Next() >> 0x1A) + 0x82, (Rand_Next() >> 0x1A) + 0x6E);
}
src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c
+1 -1
View File
@@ -149,7 +149,7 @@ void BgKin2Fence_SpawnEyeSparkles(BgKin2Fence* this, GlobalContext* globalCtx, s
for (i = 0; i < 2; i++) {
Matrix_MultiplyVector3fByState(&eyeSparkleSpawnPositions[mask][i], &sp58);
EffectSsKiraKira_SpawnDispersed(globalCtx, &sp58, &D_801D15B0, &D_801D15B0, &primColor, &envColor, 6000, -10);
EffectSsKiraKira_SpawnDispersed(globalCtx, &sp58, &gZeroVec3f, &gZeroVec3f, &primColor, &envColor, 6000, -10);
}
}
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+2 -2
View File
@@ -555,8 +555,8 @@ void func_809DA460(Boss02Effects* effects, Vec3f* vec) {
if ((effects->unk_24 == 0) || (effects->unk_24 == 3)) {
effects->unk_24 = 4;
effects->unk_00 = *vec;
Math_Vec3f_Copy(&effects->unk_0C, &D_801D15B0);
Math_Vec3f_Copy(&effects->unk_18, &D_801D15B0);
Math_Vec3f_Copy(&effects->unk_0C, &gZeroVec3f);
Math_Vec3f_Copy(&effects->unk_18, &gZeroVec3f);
effects->unk_2C = 0xFF;
effects->unk_34 = 0.0f;
break;
src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
+2 -2
View File
@@ -200,8 +200,8 @@ void EnBaguo_Idle(EnBaguo* this, GlobalContext* globalCtx) {
yaw = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
absoluteYaw = ABS_ALT(yaw);
Math_Vec3f_Copy(&this->targetRotation, &D_801D15B0);
Math_Vec3f_Copy(&this->currentRotation, &D_801D15B0);
Math_Vec3f_Copy(&this->targetRotation, &gZeroVec3f);
Math_Vec3f_Copy(&this->currentRotation, &gZeroVec3f);
if (absoluteYaw < 0x2000) {
this->targetRotation.x = 2000.0f;
} else {
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+4 -4
View File
@@ -707,13 +707,13 @@ void EnBigpo_BurnAwayDeath(EnBigpo* this, GlobalContext* globalCtx) {
// not sure what we're turning this into, but its based on the timer
modifiedTimer = ((f32)((this->idleTimer * 10) + 80) * 1.4000001f);
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &D_801D15B0, modifiedTimer, 0, 2);
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &gZeroVec3f, modifiedTimer, 0, 2);
tempVec.x = (2.0f * this->actor.world.pos.x) - tempVec.x;
tempVec.z = (2.0f * this->actor.world.pos.z) - tempVec.z;
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &D_801D15B0, modifiedTimer, 0, 2);
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &gZeroVec3f, modifiedTimer, 0, 2);
tempVec.x = this->actor.world.pos.x;
tempVec.z = this->actor.world.pos.z;
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &D_801D15B0, modifiedTimer, 0, 2);
func_800B3030(globalCtx, &tempVec, &D_80B6506C, &gZeroVec3f, modifiedTimer, 0, 2);
} else if (this->idleTimer >= 28) {
EnBigpo_SetupLanternDrop(this, globalCtx);
@@ -1378,7 +1378,7 @@ void EnBigpo_DrawLantern(Actor* thisx, GlobalContext* globalCtx) {
magnitude2 = (magnitude > 1.0f) ? (20.0f / magnitude) : (20.0f);
Math_Vec3f_Scale(&vec1, magnitude2);
} else {
Math_Vec3f_Copy(&vec1, &D_801D15B0);
Math_Vec3f_Copy(&vec1, &gZeroVec3f);
}
{
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+3119 -305
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
+9 -9
View File
@@ -63,7 +63,7 @@ typedef struct EnBigslime {
u8 minislimeCounter;
u8 numGekkoMeleeAttacks; // The Gekko will melee-attack link at 1-3 times at each position while engulfed in bigslime
};
/* 0x02B4 */ u8 iceShardAlpha;
/* 0x02B4 */ u8 shockwaveAlpha;
/* 0x02B5 */ u8 gekkoDrawEffect;
/* 0x02B6 */ s16 gekkoYaw;
/* 0x02B8 */ s16 cutscene;
@@ -95,16 +95,16 @@ typedef struct EnBigslime {
};
/* 0x02C2 */ s16 ceilingDropTimer; // Bigslime is still during this timer and shakes before dropping
/* 0x02C4 */ s16 numGekkoPosGrabPlayer; // The Gekko will melee-attack link at 6 positions while engulfed in bigslime
/* 0x02C6 */ s16 camId;
/* 0x02C8 */ s16 cameraYawGrabPlayer;
/* 0x02C6 */ s16 subCamId;
/* 0x02C8 */ s16 subCamYawGrabPlayer;
/* 0x02CA */ s16 rotation; // is always 0, used in Matrix_RotateY
/* 0x02CC */ s16 itemDropTimer; // items only drop when zero, Set to 40 then decrements, prevents itemDrop spam
/* 0x02CE */ Vec3s gekkoRot;
/* 0x02D4 */ Vec3f gekkoPosOffset; // Used when Bigslime grabs link
/* 0x02E0 */ Vec3f gekkoProjectedPos;
/* 0x02EC */ union {
Vec3f iceShardRefPos;
Vec3f eyeDistToFrog; // Used to zoom into frogs as Gekko despawns/Frog spawns
Vec3f frozenPos;
Vec3f subCamDistToFrog; // Used to zoom into frogs as Gekko despawns/Frog spawns
};
/* 0x02F8 */ Vec3f limbPos[12];
/* 0x0388 */ f32 unk_388; // used as arg to func_800BE680
@@ -114,14 +114,14 @@ typedef struct EnBigslime {
/* 0x0398 */ f32 vtxSurfacePerturbation[BIGSLIME_NUM_VTX];
/* 0x0620 */ f32 vtxScaleX;
/* 0x0624 */ f32 vtxScaleZ;
/* 0x0628 */ f32 iceShardScale;
/* 0x0628 */ f32 shockwaveScale;
/* 0x062C */ ColliderCylinder gekkoCollider;
/* 0x0678 */ ColliderCylinder bigslimeCollider[BIGSLIME_NUM_RING_FACES];
/* 0x0A14 */ EnMinislime* minislime[MINISLIME_NUM_SPAWN];
/* 0x0A44 */ EnMinislime* minislimeToThrow;
/* 0x0A48 */ AnimatedMaterial* bigslimeFrozenTex;
/* 0x0A4C */ AnimatedMaterial* minislimeFrozenTex;
/* 0x0A50 */ AnimatedMaterial* iceShardTex;
/* 0x0A48 */ AnimatedMaterial* bigslimeFrozenTexAnim;
/* 0x0A4C */ AnimatedMaterial* minislimeFrozenTexAnim;
/* 0x0A50 */ AnimatedMaterial* iceShardTexAnim;
/* 0x0A54 */ EnBigslimeIceShardEffect iceShardEffect[BIGSLIME_NUM_ICE_SHARD]; // 312 = 162 (bigslime) + 10 * 15 (minislime)
} EnBigslime; // size = 0x3634
src/overlays/actors/ovl_En_Dai/z_en_dai.c
+1 -1
View File
@@ -591,7 +591,7 @@ s32 func_80B3F598(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p
}
if (limbIndex == 11) {
Matrix_MultiplyVector3fByState(&D_801D15B0, &this->unk_1E4);
Matrix_MultiplyVector3fByState(&gZeroVec3f, &this->unk_1E4);
}
if (limbIndex == 10) {
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+1 -1
View File
@@ -547,7 +547,7 @@ void func_808BE4D4(EnDekunuts* this, GlobalContext* globalCtx) {
sp40.x = this->actor.world.pos.x;
sp40.y = this->actor.world.pos.y + 18.0f;
sp40.z = this->actor.world.pos.z;
EffectSsDeadDb_Spawn(globalCtx, &sp40, &D_801D15B0, &D_801D15B0, &D_808BEF90, &D_808BEF94, 200, 0, 13);
EffectSsDeadDb_Spawn(globalCtx, &sp40, &gZeroVec3f, &gZeroVec3f, &D_808BEF90, &D_808BEF94, 200, 0, 13);
Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 11, NA_SE_EN_EXTINCT);
sp40.y = this->actor.world.pos.y + 10.0f;
EffectSsHahen_SpawnBurst(globalCtx, &sp40, 3.0f, 0, 12, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL);

Some files were not shown because too many files have changed in this diff Show More