232b901ccf
En_Bbfall (Red Bubble) OK and documented ( #780 )
...
* EnBbfall_Init OK
* EnBbfall_Destroy, func_808BF5E0, and func_808BF734 OK
* func_808BF578 and func_808BF7A0 OK
* func_808BF4B4, func_808BF830, and func_808BF894 OK
* func_808BF438, func_808BF514, func_808BF8DC OK
* func_808BFA18 and func_808BFA3C OK
* EnBbfall_Draw OK, thanks Tharo, Anon, and Maide!
* LimbDraw functions OK
* All functions OK, thanks Anon for the loop in Update!
* Migrate data to C
* Use generated reloc and object symbols
* Port over a ton of documentation from EnBb
* Use ARRAY_COUNT for all loops
* Do a ton more documentation
* Name unused animation in object_bb
* Copy "floorType" variable name from OoT
* Use enum values for collider type
* Respond to reviews
* Add comment explaining EnBbfall_IsTouchingLava
2022-04-22 02:04:37 +01:00
f4bb821b56
EffectSsSbn OK ( #751 )
...
* Ok
* Cleanup and document
* File header description
* rename scroll related regs
* undef syms
* Cleanup for PR
* Move comment
* Add todo
2022-04-17 19:07:25 +01:00
bbc6dd77ea
Obj_Nozoki ( #704 )
...
* Obj_Nozoki
* GID
* PR
* Merge
* PR
2022-04-17 11:08:16 -04:00
06412c070f
Cleanup 3 ( #778 )
...
* lights
* D_801D88A0 -> gScarecrowSpawnSongPtr
* Misc fixes
* CHECK_FLAG_ALL
* Trailing commas in enums
* matches
* Remove todo from lights bss
* Update src/overlays/actors/ovl_En_In/z_en_in.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* thisx -> this2
* fix
* Todos
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-04-07 20:39:11 +01:00
c2f4572d13
Document EnKujiya (Lottery Shop) ( #777 )
...
* 7
* 7
* Update assets/xml/objects/object_kujiya.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-04-07 20:27:24 +01:00
8a0b0b7ec8
En_Syateki_Okuta (Shooting Gallery Octorok) OK ( #772 )
...
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK
* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK
* func_80A361F4 OK
* Decomp a bunch of functions
* Better match for func_80A368E0
* func_80A36CB0 OK
* Draw functions OK
* All functions OK
* Import data to C
* Use object symbols
* Final cleanup and generated spec
* Remove something I missed
* char -> UNK_TYPE1
* Respond to reviews
* Remove static from unnamed variables, whoops
2022-04-07 19:23:13 +01:00
50c5ab0fc7
En_Dragon (Deep Python) OK and documented. object_utubo documented ( #771 )
...
* EnDragon_Init OK
* func_80B5EDF0 OK
* func_80B5EAA0 OK
* EnDragon_Destroy OK
* EnDragon_Update OK
* func_80B60138 OK
* func_80B5EE3C OK
* func_80B5EF88 OK
* func_80B5F418 OK
* func_80B5ED90 OK
* func_80B5EB40 OK (commented out because data is not imported yet)
* Import data into C
* Uncomment func_80B5EB40
* func_80B5EFD0 OK
* func_80B5F3A4 OK
* func_80B5F888 OK
* func_80B5FCC0 OK
* Draw functions OK
* func_80B5FD68 OK
* func_80B5F508 OK
* func_80B5F8D8 OK
* Better match on func_80B5FD68
* Use generated reloc
* Remove undefined_syms for this actor
* Some minor cleanup
* Make the data like Anghelo said
* Document object_utubo
* Name a bunch of stuff
* Name some more stuff
* Some documentation around death
* Documentation for actions
* Name a bunch of junk
* Use regs instead of directly accessing gGameInfo
* Name the player position vars
* Update weekEventReg references
* Name and list out states
* Name timer
* Document extend stuff
* Finish documentation
* Respond to Anghelo's review
* Respond to hensldm's review
* The thing Anghelo suggested *actually* matches
2022-04-06 21:03:27 -04:00
15dfaf0862
ABI FPR names ( #767 )
...
* Add o32 to disassembler and update macro.inc
* Add a variable for asm processor to makefile
and improve objdump flags
* Update diff settings
* git subrepo pull --force tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "1236288d1"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "1236288d1"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Remove * import and implement option
* Fix some stuff in the makefile
* Update asm-processor
* Review
* Fix old var name
2022-03-31 18:22:19 +01:00
6faf186a95
En_Wallmas (Wallmaster) OK and documented. object_wallmaster documented ( #731 )
...
* EnWallmas_Init and EnWallmas_Destroy OK
* func_80874B88 OK
* func_80874BE4 OK
* func_80874D1C OK
* func_80874DE8 OK
* func_80874F14 OK
* A bunch of small functions OK
* A bunch of smaller functions OK again
* func_808752CC OK
* func_808758C8 OK
* func_80875910 and func_8087596C OK
* func_808756AC and func_8087571C OK
* EnWallmas_Update OK
* func_80875A74 OK
* func_80874A88 and func_80874B04 OK
* A bunch of functions OK
* func_808759B8 and func_80875A0C
* EnWallmas_Draw OK
* func_808760A4 and func_80876118 OK
* func_80875F04 OK
* Use object symbols
* Import data to C
* Use generated reloc
* Document object_wallmaster
* Misc cleanup
* Name the DrawDamageEffects variables
* Name draw functions
* Enum for damage values
* Port function names from OoT
* Last cleanup before PR
* Respond to Elliptic's review
* Respond to Elliptic's second review
* gWallmasterWaitAnim -> gWallmasterIdleAnim
* Change all EnWallmas to Wallmaster (except the actor's name itself)
* Respond to hensldm's review
* Fix merge conflicts
2022-03-29 22:33:32 +01:00
7280d10404
En_Horse (2 non-matching) ( #413 )
...
* En_Horse
* a
* Warnings
* Warnigns 2
* PR
* Formats
* Fix
* PR
* Merge
* Merge
* Merge
2022-03-29 22:15:26 +01:00
72bae2b6ba
`z_kaleido_setup` ( #768 )
...
* KaleidoSetup_Init
* func_800F4C0C
* func_800F4A10 NON_EQUIVALENT
* fixes
* func_800F4A10
* import data
* Rename Play_InCsMode
* Name KaleidoSetup_Update
* minor cleanup
* Update src/code/z_play.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/code/z_kaleido_setup.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c
* unname D_801BDB00
* format
* a
* actorfixer
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:04:41 +01:00
486e7cbe83
SubS General Pathing Helpers ( #760 )
...
* Brought code over and cleanup
* cleanup functions.h and format
* add comment
* Whitespace
* Format
* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Format
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 21:37:58 +01:00
98143afb1c
En_Test ( #756 )
...
* En_Test
* PR
* PR
* PR
* Fix
2022-03-29 21:14:29 +01:00
036a68cb3e
Effects Stick and Kakera cleanup ( #752 )
...
* cleanup
* cleanup
* idx -> index
2022-03-29 20:52:37 +01:00
ec9909c65c
Boot_800862E0 OK ( #769 )
...
* boot_800862E0 OK
* Ran format.sh
* attempt at fixing bss reordering
* boot_800862E0 OK (for real this time)
* Run formatter
* Changes u32 pointers to uintptr_t and sizes to size_t
* Run formatter
* Fix bss reordering
* Delete baserom.mm.us.rev1.z64:Zone.Identifier
* Cleanup and some notes
* Try my best to document
* remove comments
* Remove D_80097508 from variables.h
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 20:42:44 +01:00
afec1c56a6
EnNeoReeba OK and documented, object_rb mostly doc'd ( #750 )
...
* match some functions
* finish decompiling
* mostly document except some dmgeffs
* Document object_rb
* update functions.txt, damagetable
* remove number comments
* suggestions
* format and fix enum names
* comment object_rb.xml
2022-03-29 19:12:35 +01:00
275f13881b
`EffectEnIceBlock` OK, `object_ice_block` documented (and minor `Obj_Iceblock` documented) ( #748 )
...
* EffIceBlock: OK
* object_ice_block: documented
* EffectIceBlock: matching gfxCtx in the draw function
* Iceblock: removed undefined sym
Co-authored-by: Isghj8 <isghj8@gmail.com>
2022-03-29 18:28:19 +01:00
cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) ( #747 )
...
* EnWarpTag: OK
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* WarpTag: move macros
* WarpTag: format
* WarpTag: fix save entrance index
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 18:21:36 +01:00
37e82498df
Dm_Gm ( #739 )
...
* Dm_Gm
* PR
2022-03-29 17:55:32 +01:00
78acaef73d
`ovl_Boss_03`: Gyorg OK ( #736 )
...
* Boss03_Init NON_EQUIVALENT
* rand functions
* Boss03_Draw
* match the limb draws
* Match Boss03_Init by Synray and Engineer
* A bit of cleanup
* a bunch of functions
* another bunch of functions
* func_809E299C and GyorgEffect
* import data
* A bit of cleanup
* effects related functions
* func_809E2DA0
* func_809E34B8 NON_EQUIVALENT
* func_809E3968 NON_EQUIVALENT
* func_809E3D98
* func_809E421C NON_EQUIVALENT
* func_809E475C
* func_809E497C
* func_809E4C90
* func_809E6640 NON_MATCHING
* func_809E6A38
* Match func_809E6640 by Tharo
* func_809E7D00
* func_809E8810
* func_809E4E80 NON_EQUIVALENT
* func_809E5B64
* func_809E6CB4
* Boss03_Update NON_EQUIVALENT
* func_809E81E4 attempt
* Boss03_Update improvement thanks to Petrie
* func_809E81E4 NON_MATCHING
* func_809E34B8 is at least equivalent
* cleanups
* format
* import bss
* more cleanup and minor renames
* Match func_809E81E4
* cleanup effect functions
* a few more renames
* func_809E4E80 matched by Maide
* documentation pass
* name workTimer
* macros
* More renames
* Improve func_809E34B8 a bit and match Boss03_ChewPlayer
* defines placeholders for work timer, enum for effects and other minor renames
* actorfixer
* some cleanups
* effects named
* Some more renames and cleanups
* more cleanups
* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw
* Rename more actionfuncs
* cleanup undefined syms
* collision stuff and run formatter
* more cleanups
* more cleanups i forgot to commit
* and yet more clenaup
* Add notes
* Remove debugging stuff
* format
* Match the last 3 functions by Anon58
* bit of cleaning
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* PR
* format
* Remove some if (1) from Boss03_IntroCutscene
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* PR
* address pr
* prevent_bss_reordering
* Anon review
* seaweed stuff thanks to elliptic
* format
* whoops
* huh
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Address PR
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Sectioning
* whoops
* a
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* a
* kinda
* ,
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* remove redundant comment
* actorfixer
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-03-29 17:41:44 +01:00
348e87083b
Bg_Breakwall ( #733 )
...
* Bg_Breakwall
* PR and match (thanks petrie)
* PR
* Merge
2022-03-29 17:11:08 +01:00
e19705f7eb
En_crow OK and Documented ( #698 )
...
* this is the guay
* do you know the guay?
* No guay!
* got too excited to pr lol, fixes are here
* Majoras Mask: No Guay Home
* fixing objects
* 4mattt
2022-03-29 16:55:29 +01:00
b567c4ee68
En_Hs ( #746 )
...
* En_Hs
* Add limb switch
* Merge
2022-03-29 16:29:34 +01:00
1ff183bc05
En_Test7 ( #628 )
...
* En_Test7
* Clean some stuff
* I hate BSS
* PR
* Fix
* Merge
* Fix
* Match (thanks Anon)
* PR
* PR
* PR
* Fix
2022-03-28 21:25:08 -04:00
b08880f7a7
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs ( #531 )
...
* Rename Sram_InitDebugSave
* Sram_InitDebugSave
* err
* Sram_IncrementDay
* non_matchings
* func_80146F5C and protos
* func_80146EE8
* func_80145698
* func_80143A54
* Split SaveContext
* problems with bss
* Fix bss
* more
* a small bunch
* Fix warnings
* almost everything
* two attempts
* at least compiles
* import data
* bss
* format
* stuff?
* Progress?
* More progress
* clean up data a little
* More progress
* disaster
* re split data
* A bit less of a disaster
* Fix renamed stuff
* data stuff
* fix conflicts
* format
* CycleSceneFlags
* some enums
* cleanup
* Fix merge issues
* format
* some changes
* format
* Lots of progress on z_sram_NES, but no matches yet
* SaveContent Documentation
* Oops
* Oops2
* Document more SaveContext
* Oops, don't need that anymore
* add small comment
* Another comment
* dekuPlaygroundPlayerName
* Fix merge issues
* format
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* remove magic number
* format
* fix merge issues
* bss
* format
* macro cleanup
* review
* merge issues
* review
* cleanup
* UNK_TYPE1
* Fix
* Remove comment
* small change
* conflicts
* review
* fix
* fixes
* format
* Update actorCtx renames part
* Match func_80143B0C thanks to Petrie and Anon
* minor cleaning pass
* format
* cleanup
* more minor cleanups
* Macros for accessing gSaveContext.save.stolenItems
* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_
* format
* Update include/macros.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sram_NES.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* @hensldm review
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Rename QUEST_SONG_NEW_WAVE
* Add scene name comments to D_801C5FC0
* rename horseData.yaw
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_sram_NES.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* // = CUR_UPG_VALUE(UPG_WALLET);
* run actorfixer and format
* fix bss
* Fix merge problems and run format
* Some improvements to func_801457CC by anon
* bss
* format
* run actorfixer
* actorfixer, bss and format
* Use original names for the RESPAWN_MODE enum because the current ones are bad
* QUEST_SONG_BOSSA_NOVA
* some minor fixes on the SaveContext struct according to the debug rom
* Merge Inventory.items and Inventory.masks
* a
* simplify saveBuf accesses
* A few func renames
* actorfixer
* bss
* fixes
* bss
* actorfixer
* actorfixer and format
* actorfixer
* whoops
* whops
* bss
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-03-27 12:37:02 -03:00
4f3202fd7e
z_message progress ( #701 )
...
* 8 functions matching, 1 non-matching, 45 untouched
* match func_801518B0
* match func_8014CC14
* matching 8 func, 1 non-matching
* matched func_80148CBC
* matched func_80156758
* matched func_80147564
* matched func_80151BB4
* matched func80152EC0/Message_Spawn_Song_Effect
* matched func_80151C9C
* WIP func_80148B98
* WIP func_80151938
* matched func_80151938
* matched func_80148B98
* matched func_80147734
* matched func_80147624
* WIP func_8014EBC
* match func_801518B0
* matched func_80147564
* matched func80152EC0/Message_Spawn_Song_Effect
* matched func_80151C9C
* WIP func_80148B98
* matched func_80151938
* matched func_80148B98
* matched func_80147734
* matched func_80147624
* WIP#2 func_8014EBC
* matched func_80149EBC
* WIP func_8014CCB4
* matched func_8014CCB4
* matched func_80151A68
* WIP func_8014D62C
* fix func_8015A68 signature
* z_message_nes & z_message_staff progress
* z_message_nes & z_message_staff renaming
* documenting z_message
* cleaning & renaming
* documenting MessageContext
* matched func_80151A68
* format
* naming convention fix
* re-add func_80147564
* apply renaming of Message_ShouldAdvanceSilent on the whole project
* re-format, add clang-format off/on in z_message.c needed for matching
* rename staff => credits; add renames in actorfixer.
* change rupees array to ascii
* remove useless comments
* change MessageContext.decodedBuffer to a union
* remove decodedBuffer from actorfixer
* applied AngheloAlf suggestions & ran sfxconvert on z_message.c
* rename message_struct => message_data_static; revert decodedBuffer as union creating differences.
* use true/false instead of 1/0
* use SET_FULLSCREEN_VIEWPORT macro in func_80152c64
* AngheloAlf suggestions.
* extract assign from dayTime calculation for readability in Message_LoadTimeNES
* remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union.
* remove useless casts
* Changes hexa to ascii chars when it's meaningful;
add comments to func_8014CCB4 to show what hexa constant means.
* Hensldm suggestions
* ran actorfixer on new changes; fix new bss reordering error introduced with rebase
* use new TIME_TO_MINUTES_F macro
* re-ran format.sh
* hensldm suggestions #2 + overall cleaning
* remove useless parenthesis
* Update include/message_data_static.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* actorfixer and format
* more fixes
Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: abaud <adrien.baud@inria.fr>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 12:09:47 -03:00
02cb971616
En_Gakufu OK and Documented + Related Audio Functions ( #662 )
...
* Gakufu OK, copy progress from audio WIP
* Extraction
* import wip in prep for audio data import
* Add in `code_8019AF00.c` functions
* Finish docs
* Spacing
* Add enum
* Many PR suggestions
* Another enum
* PR Suggestions
* Fix bss
* Move comment higher
* Fix bss
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
928acac500
Bombers2 OK ( #721 )
...
* OK
* OK
* cleanups
* restore makefile
* format
* format
* format
* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update object_cs.xml
* fixes
* format
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:47:34 -03:00
f1d1173558
River_Sound OK and Documented + River_Sound Related `z_actor`/`Audio` Functions ( #661 )
...
* First pass of `func_800BCCDC`
* river_sound OK (copy progress from audio WIP)
* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)
* More docs
* feedback
* Add in `code_8019AF00.c` functions
* format
* params
* Minor cleanup
* Small fix
* one more
* Better names
* Add comment, cleanup Idx
* Fix bss
* Fix BSS
2022-03-27 11:42:19 -03:00
9e13859495
En_Tru_Mt ( #726 )
...
* En_Tru_Mt
* PR
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 11:32:08 -03:00
38eef9252e
En_Kbt ( #732 )
...
* En_Kbt
* PR
* a
2022-03-27 11:27:09 -03:00
ba1595b5ad
En_Hanabi ( #728 )
...
* En_Hanabi
* PR
2022-03-27 11:17:15 -03:00
145b2f6a61
En_Jgame_Tsn ( #722 )
...
* En_Jgame_Tsn
* Merge
2022-03-27 11:01:23 -03:00
061ebc3b12
z_obj_chan OK ( #591 )
...
* z_obj_chan OK
* update Obj_Chan
* Obj_Chan updates
* Update for name changes. gameplay_keep object header is needed
* format
* more updates
* more changes
* Simplify floats
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 10:56:20 -03:00
36391bee46
En_Mk ( #711 )
...
* En_Mk
* PR
2022-03-27 10:44:55 -03:00
3986732c5d
En_Syateki_Dekunuts (Shooting Gallery Deku Scrub) OK ( #716 )
...
* Import data to C
* EnSyatekiDekunuts_Init OK
* EnSyatekiDekunuts_Destroy OK
* func_80A2BE54 OK
* func_80A2BF18 OK
* func_80A2BFC4 OK
* func_80A2C0F8 OK
* func_80A2C150 and func_80A2C168 OK
* func_80A2C1AC OK and better match on func_80A2BFC4
* func_80A2C208 OK
* func_80A2C27C OK
* func_80A2C2E0 and func_80A2C33C OK
* func_80A2C3F0 OK
* func_80A2C478 and func_80A2C48C OK
* EnSyatekiDekunuts_Update OK
* func_80A2C4D0 OK
* func_80A2C5DC OK
* EnSyatekiDekunuts_Draw OK
* func_80A2C8A0 OK
* Use generated reloc and minor cleanup
* Use object symbols
* Last bit of cleanup
* Use limb enum values for all syateki actors I've worked on
* M_PI / 4
2022-03-26 03:07:25 +00:00
acd84bda77
En_Bb (Blue Bubble) OK and documented. object_bb documented ( #713 )
...
* EnBb_Init OK
* EnBb_Destroy OK
* func_808C20D4 OK
* func_808C2238 OK
* func_808C1FF4 OK
* func_808C1E94 OK
* func_808C2344 OK
* func_808C23EC OK
* EnBb_Update OK
* func_808C2E34 OK
* func_808C254C OK
* func_808C272C OK
* func_808C2B94 OK
* func_808C2A00 OK
* func_808C1F00 OK
* func_808C1F74 OK
* func_808C25E0 OK
* func_808C28CC OK
* func_808C2B1C OK
* func_808C2BD0 OK
* func_808C2C38 OK
* func_808C2CB4 OK
* func_808C2CF0 OK
* func_808C2D78 OK
* EnBb_Draw OK
* func_808C32EC OK
* func_808C3324 OK
* Migrate data to C
* Use generated reloc
* Object symbols and misc cleanup
* Name struct vars that are used with Actor_DrawDamageEffects
* Name most things in the object
* Name attackRange
* Good enough names for limbs for now
* Might as well name the limb draw stuff for now
* Name flame width/height
* Enum for damage effects
* Name some more stuff from OoT
* Name a lot more stuff
* First pass names on all functions
* Name jinxTimer on gSaveContext
* Name sLimbIndexToLimbPos
* First pass name to the rest of the limb draw system
* More cleanup
* Last cleanup before PR
* Incorporate Actor_DrawDamageEffect stuff
* Respond to hensldm's review
2022-03-26 02:57:18 +00:00
7d4aaef0cd
Fire and Light arrows ( #710 )
...
* fire arrow OK
* Light arrows OK
* Format
* Assets
* Mtx Mode
* PR fixes
* pr fixes
* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
* Update src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
2022-03-26 02:51:41 +00:00
9a41b76f35
SubS ActorPathing ( #689 )
...
* Bring code over
* Clean up
* Renames
* Cleanup
* Split SubS stuff from z64 into z64subs
* newline
* Bss
* Name callbacks
* bss
* bss
2022-03-26 02:43:14 +00:00
e43a92de18
En_Attack_Niw ( #707 )
...
* En_Attack_Niw
* PR
* newline
2022-03-26 02:23:06 +00:00
9362fee5e8
En_kusa OK and Documented ( #640 )
...
* matched one function
* More matches
* more matches
* cleaning up some stuff
* making some progress
* two new matches, and a partial match
* meh...i'll come back to this
* fixing ctx names
* more matches
* OK and documented
* fixing data stuff
* PR suggestions
* fixing name and DL issues
* fixing pr suggestions
* PR feedback
* ....format....
* PR fix
* fixes
* dang format
* fixing name
* I'm blind
* fixing obj_grass
2022-03-26 02:10:25 +00:00
69c0e15a45
EffectSsBubble OK ( #702 )
...
* Decompile eff_ss_bubble
* Document effBubble stuff in gameplay keep
* newline
* Formatting is hard
* PR suggestions
* Amplitude -> Max
2022-03-26 01:54:05 +00:00
b7639a7c6f
En_Wood02 ( #697 )
...
* En_Wood02
* statics£
* PR
* PR
2022-03-26 01:39:33 +00:00
ce7aa87454
Oceff wipe6 ( #686 )
...
* Uncorrupted; Not OK
* Merged upstream -- actually OK
* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* - Removed Extra 0 characters; clang-format-11
* Removed new warnings.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
80cbdb956d
En_Tanron4 OK (seagulls) ( #714 )
...
* Seagull OK
* small fixes
* review 1
* review 2
2022-03-24 23:39:34 -03:00
9a54ec9e0b
En_Bombers ( #684 )
...
* En_Bombers
* No need for this >:
* Override
* PR
2022-03-24 23:21:14 -03:00
984a5061c2
ObjectFsn documented ( #680 )
...
* Cleanup some shopkeepers
* More cleanup
* Document animations
* General cleanup
* Animation enums
* Limb maxes
* More Cleanup
* Some more minor stuff
* fsn cutscene state
* Parens and postlimbdraw
* Ossan Limbs
* Remove ENFSN_LIMB_MAX
* SI_MAX
* Compound macro
* Document gameplayKeep textures used by shopkeepers
* Ani Limbs in Ossan
* Format
* PR suggestion
* Remove trueTmp from EnFsn
2022-03-24 23:14:14 -03:00
d5e692d0e1
En_Bom_Chu (Bombchu) OK and documented ( #679 )
...
* EnBomChu_Init OK
* EnBomChu_Destroy OK
* func_808F7868 OK
* func_808F79D4 OK
* func_808F7E74 OK
* func_808F7FA0 OK
* func_808F77E4 OK
* func_808F75D0 OK
* func_808F7944 OK
* func_808F7A84 OK
* func_808F818C OK
* func_808F8080 OK
* func_808F7FD0 OK
* EnBomChu_Update OK
* EnBomChu_Draw OK
* Drop unnecessary cast in Update
* Import data into C
* Object symbol
* Use generated reloc
* Port over OoT struct var names
* Name all statics
* Misc cleanup
* Name some of the new struct vars introduced in MM
* Port over most OoT function names
* Name movingSpeed based on in-game observation
* Name final param in EnBomChu_SpawnRipplesAndSplashes
* More cleanup and OOT port
* Some more names
* More docs
* Name last function
* Final little cleanup
* First round of review fixes
* Change the name of that one function
* More precise comment
2022-03-24 23:07:59 -03:00
5684b342b6
En_Vm ( #678 )
...
* En_Vm
* Hidden funcs >:
* PR
* PR
2022-03-24 22:55:58 -03:00
950f3a247e
En_guard_nuts OK and Partially documented ( #668 )
...
* guard_nuts OK
* doing some documenting
* more docs
* more docs
* minor changes
* touch ups
* format
* pr feedback
* fixing a name
* ran actor_fixer
2022-03-24 22:34:50 -03:00
Tom Overton