84dd09048e
EffectSsSibuki OK ( #735 )
...
* OK
* Small formating
* Fix merge
2022-03-29 17:26:46 +01:00
26d7085ac2
Obj_Armos ( #734 )
...
* Obj_Armos
* PR
2022-03-29 17:16:28 +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
f187471a33
En_Fu_Mato ( #675 )
...
* En_Fu_Mato
* A bit of fmt
* PR
* PR
* Merge
2022-03-29 16:46:40 +01:00
b567c4ee68
En_Hs ( #746 )
...
* En_Hs
* Add limb switch
* Merge
2022-03-29 16:29:34 +01:00
9582a3e79f
Update Readme ( #765 )
...
* Update
* Update MacOS instructions
* forgot .
* New python step
* typo
2022-03-29 16:19:59 +01:00
84d9efda92
ZAPD update: Cutscene extraction ( #770 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "89a0b2628"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "89a0b2628"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "efae567d3"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "efae567d3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2022-03-29 16:13:24 +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
95c6ddbcc8
Decompile obj_wturn ( #564 )
...
* Decompile obj_wturn
* Format
* Rename struct member
* Make suggestions
* Format
* Fix warning
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-03-27 12:14:55 -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
9e230005b0
En_Fu_Kago ( #729 )
...
* En_Fu_Kago
* PR
2022-03-27 11:36:59 -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
35bc48de54
En_Maruta ( #725 )
...
* En_Maruta
* Match (thanks petrie)
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 11:22:16 -03:00
ba1595b5ad
En_Hanabi ( #728 )
...
* En_Hanabi
* PR
2022-03-27 11:17:15 -03:00
47cc65e134
Bg_Dblue_Balance ( #724 )
...
* Bg_Dblue_Balance
* PR
2022-03-27 11:12:00 -03:00
e6ca183a88
Bg_Dblue_Waterfall ( #723 )
...
* Bg_Dblue_Waterfall
* UNK
2022-03-27 11:07:03 -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
c0979dcb07
Obj_Vspinyroll (1 non-matching) ( #712 )
...
* Obj_Vspinyroll
* PR
2022-03-27 10:51:15 -03:00
36391bee46
En_Mk ( #711 )
...
* En_Mk
* PR
2022-03-27 10:44:55 -03:00
5649458e2f
Bg_Hakugin_Bombwall ( #709 )
2022-03-27 10:23:46 -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
36e48fcd91
En_Tanron1 ( #708 )
...
* En_Tanron1
* PR
* Fmt
* PR and match (thanks petrie)
2022-03-26 02:33:02 +00:00
e43a92de18
En_Attack_Niw ( #707 )
...
* En_Attack_Niw
* PR
* newline
2022-03-26 02:23:06 +00:00
7c624422de
En_Horse_Game_Check ( #706 )
...
* En_Horse_Game_Check
* PR
2022-03-26 02:16:28 +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
2746266881
En_Hidden_Nuts ( #705 )
...
* En_Hidden_Nuts
* PR
2022-03-26 02:04:42 +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
59ec3f721a
Obj_Driftice (2 non-matching) ( #700 )
...
* Obj_Driftice
* PR
2022-03-26 01:46:13 +00:00
b7639a7c6f
En_Wood02 ( #697 )
...
* En_Wood02
* statics£
* PR
* PR
2022-03-26 01:39:33 +00:00
844b5efb6f
En_Sda ( #691 )
...
* En_Sda
* Format hello?
* PR
2022-03-26 01:33:42 +00:00
ad6d314422
Obj_Kendo_Kanban (1 non-matching) ( #687 )
...
* Obj_Kendo_Kanban
* PR
2022-03-26 01:25:35 +00:00
10995051e0
En_Tanron5 ( #653 )
...
* En_Tanron5
* Stuff
* PR
* Fix
* Use x/z instead of x/y
* BSS
* Merge
* bss
2022-03-26 01:19:14 +00:00
863d6b9378
Document object_dog ( #720 )
2022-03-26 01:05:38 +00:00
ad9e6e2ae5
ovl_Obj_Yasi ( #719 )
...
* parking
* z_obj_yasi successfully decompiled and matched
* removed commented code.
* more cleanup..
* Code Styling changes.
* Swapped to use BINANG_SUB macro.
* Formatting.
* addressing PR comments
* formatting
2022-03-26 01:00:21 +00:00
fa8c723da8
Fix two small things in Bg_F40_Switch ( #717 )
2022-03-26 00:53:19 +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
ecb4afd822
Bg_Spdweb (1 non-matching) ( #685 )
...
* Bg_Spdweb
* PR
2022-03-24 23:30:02 -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
Derek Hensley