Maide and GitHub
a8e9b6c9b3
OBj_Fireshield ( #740 )
2022-03-29 18:08:50 +01:00
Maide and GitHub
37e82498df
Dm_Gm ( #739 )
...
* Dm_Gm
* PR
2022-03-29 17:55:32 +01:00
Maide and GitHub
ea3bbee803
Dm_An ( #737 )
...
* Dm_An
* Merge
2022-03-29 17:49:44 +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
Derek Hensley and GitHub
84dd09048e
EffectSsSibuki OK ( #735 )
...
* OK
* Small formating
* Fix merge
2022-03-29 17:26:46 +01:00
Maide and GitHub
26d7085ac2
Obj_Armos ( #734 )
...
* Obj_Armos
* PR
2022-03-29 17:16:28 +01:00
Maide and GitHub
348e87083b
Bg_Breakwall ( #733 )
...
* Bg_Breakwall
* PR and match (thanks petrie)
* PR
* Merge
2022-03-29 17:11:08 +01:00
Parker Burnett and GitHub
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
Maide and GitHub
f187471a33
En_Fu_Mato ( #675 )
...
* En_Fu_Mato
* A bit of fmt
* PR
* PR
* Merge
2022-03-29 16:46:40 +01:00
Maide and GitHub
b567c4ee68
En_Hs ( #746 )
...
* En_Hs
* Add limb switch
* Merge
2022-03-29 16:29:34 +01:00
Derek Hensley and GitHub
9582a3e79f
Update Readme ( #765 )
...
* Update
* Update MacOS instructions
* forgot .
* New python step
* typo
2022-03-29 16:19:59 +01:00
Anghelo Carvajal and GitHub
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
Maide and GitHub
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
engineer124
7658c3bffd
Match func_80115DB4 and func_8011BF70
2022-03-28 23:32:15 +11: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
engineer124 and GitHub
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
Maide and GitHub
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
Maide and GitHub
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
Maide and GitHub
ba1595b5ad
En_Hanabi ( #728 )
...
* En_Hanabi
* PR
2022-03-27 11:17:15 -03:00
MaideandGitHub
Parker BurnettandGitHub
engineer124
