| Age | Commit message (Collapse) | Author |
|
|
|
* Pause docs: "InfoPanel" quads
* bss
* rename infoPanelVtx to decorVtx
* rename to uiOverlayVtx / UI_OVERLAY_QUAD_
* fixup
|
|
|
|
|
|
|
|
`item_name_static` (#2562)
* commit icon_item_24_static
* commit icon_item_LANG_static for LANG in fra,ger,jpn,nes
* commit item_name_static
|
|
|
|
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "e8543312d"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "e8543312d"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* ique-cn OK
* Review suggestions
* Most suggestions
* git subrepo pull tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "81595ed1c"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "81595ed1c"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* Fix other versions
|
|
* iQue text extraction
* More consistent terminology
* Fixes for jpn, split each encoding into a separate charmap file, merge enc.nes.h and enc.chn.h
* Merge nes and chn in DEFINE_MESSAGE macros
* Remove redundant defines in nes_message_data_static
|
|
* Set up build system for ique-cn
* Fix size of fbdemo_circle assets
* Treat iQue as NTSC and Use "NES" for Chinese text
* Revert z_kanfont
|
|
* [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1
* Fix merge with pal-1.0/1.1
|
|
* [PAL N64] Match file select language selection
* sInitialLanguageInputTimerY -> sInitialLanguageInputTimerX
|
|
* [PAL N64] Set up build system and extract assets
* TOOD -> TODO
* Apparently this is what the formatter wants
|
|
|
|
* Pause doc: World map points
* bss
* `WORLD_MAP_POINT_HYLIA_LAKESIDE` -> `_LAKE_HYLIA`
|
|
* Pause docs: WorldMapArea enum and related data
* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`
* bss
|
|
* Match the remaining GC retail versions
* Fix BSS ordering for existing versions
* Disable clang-format for #pragma increment_block_number
* sramResetCode -> sSramResetCode
* Replace 0xFF3F with or-ing all buttons together
* Revert "Disable clang-format for #pragma increment_block_number"
This reverts commit 406b6d26c92911c676a7ea9f07a1612211760e11.
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
|
|
* Match NTSC z_kaleido_scope.c
* Use new REGs everywhere
* Add comments for YREG initialization
* Use new REGs everywhere for real
* Fix merge
|
|
* Match NTSC z_parameter.c and z_construct.c
* Comment which REG collide
* Use new REGs everywhere
* Use new REGs everywhere for real
|
|
* Build gc-us
* Set up gc-us disassembly
* Don't disasm unchanged overlays
* Fix gc-eu-mq BSS
* romalign link_animetion for NTSC
* Explicitly set CPP defines to 0/1
* Add #ifs to segment_symbols.h
* Add sButtonTextures now
* Fix message _SHIFTL usage
* Don't ifdef LANGUAGE_MAX
|
|
* Extract NTSC assets for gc-us
* Extract kanji
https://github.com/zeldaret/mm/pull/1536
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
|
|
To match the other asset names.
|
|
* Some cleanup/doc on the item enum and icons
* `gItemIconBigBottlePoeTex` -> `gItemIconBottleBigPoeTex`
* Biggoron sword / giant knife items (?)
* `SPSTONE_` -> `SPIRITUAL_` ?
* `gItemIconBrokenBiggoronSwordTex` -> `gItemIconBrokenGoronsSwordTex`
* `gQuestIcon...MedallionTex` -> `gQuestIconMedallion...Tex`
* `ITEM_MAGIC_` -> `ITEM_MAGIC_JAR_`small/big
* `ITEM_BOW_ARROW_` -> `ITEM_BOW_`
* `MASK_BUNNY` -> `MASK_BUNNY_HOOD`
* Update `GID_` enum from `ITEM_` enum
* ITEM/GID`_ARROW_`small/medium/large -> 5/10/30
* Run formatter
* .
* fix regressions and revert bad ideas
* chicken
* obey the newline police and also prevent the range police from intervening
* fixups
* dimensions -> dimension (singular)
* Note on inconsequential oddities about the `gItemIcons` mapping
|
|
* two more ABS
* fixup item_name_static texs outnames
* fixup CollisionCheck_SetOCvsOC docs
* Cleanup int comments alignments
* collsion -> collision
* `SQ*` macros fixup
* use `LERP` more
* static -> `s` prefix
* grammar: dont -> don't
* 3
|
|
* Replace tabs in exceptasm.s source
* Replace tabs with \t in strings
* Fix grammar in various comments
* Fix "initalize" typos in code
* (fix typo) `__osMallocIsInitalized` -> `__osMallocIsInitialized`
* Some Link -> Player
* Use `EXCH_ITEM_` more
* "bgm music" -> "background music"
* Fix typos in `place_title_cards.xml`
* `SkelAnime_Update` returns a boolean
* Run formatter
|
|
* Some TlutOffset stuff
* make unknown-format texture I8
* Fix object_ani TLUT stuff
* Add some missing `TlutOffset`
* object_owl eyes TLUTs
* fix dims and TlutOffset on unused mido textures
* Add missing `TlutOffset`
|
|
* Prioritize using clang-tidy 6 and improve format.sh
* Use clang-tidy-6.0 when available since it's better at applying 'readability-inconsistent-declaration-parameter-name'
* Add -m32 and -Wno-everything to compiler options to avoid unwanted errors and warnings
* Remove -fsyntax-only since it serves no purpose in the context of clang-tidy
* Apply clang-tidy fixes for argument names
* Run format.sh again
* Use 'Strict' option instead of relying on clang-tidy 6
* Run format script
* Add --fix-notes to clang-tidy options for version 13+
|
|
* xmls
* cleanups
* final cleanups
* tlut -> TLUT
* remove number 0
Co-authored-by: fig02 <fig02srl@gmail.com>
|
|
* Magic docs WIP
* More docs, first round finished
* Better docs
* More renaming
* Simpler name
* Another small adjustment
* rm if(1)
* Better names again after in-game testing
* Change comments
* change comment
* Big rename based on all the suggestions
* Small touch-up
* More PR Suggestions
* RESTORE_IDLE -> RESET
* More docs
* Capitalization
* PR suggestions
* Make declaration consistent
* Health_ChangeBy (amount)
* PR Suggestions
* Missed one
* More PR Suggestions
* Change comment
* Add another clarity comment
* Discord discussions on `magicFillTarget`
* Comments
* grammar
* More comment clarity
* Another bad comment
* PR suggestions, improved comments
* One more comment
* one more thing
* bar -> meter
|
|
* add offsets
* add offsets
|
|
* Misc parameter cleanup
* More cleanup
* More cleanup
* ia4, more readable
* More comments
* PR Suggestion
|
|
* Cleanup `UNK_TYPE`, `UNK_PTR` usage
* Add some missing empty lines after declarations
* Remove some legacy comments from non-matching times
* Fix some grammar (mostly "it's"/"its")
* Use proper names for two symbols after ZAPD bugfix
* Cleanup `place_title_cards.xml`
* Use `NULL` to check against `D_8012D260` pointer
* Parentheses around some macro arguments
* wip proofread headers up to z64animation.h
|
|
* matching split
* migrate progress
* split done and rodata migrated
* all data migrated to c
* start init
* progress
* progress
* progress
* progress
* progress
* progress
* copy done
* progress
* erase and settings done
* progress
* progress
* progress
* start keyboard
* progress
* progress
* progress
* progress
* Minor progress
* fix z_magic_dark issue
* func_80806F34 decomp'd
* verified equivalence
* one fix
* format
* merge petries work
* reorganizing
* lots of reorganizing and wraning fixing
* rename file
* remove language enum
* unwanted changes
* some symbol replacement, organization, and some names
* all symbols replaced, some organization
* some more cleanup
* continue docs
* Match the remaining functions in file_choose
* merge master
* select mode documented, all functions in file_choose.c named
* nameset functions named, some other cleaning
* some more general cleanup
* stub comments for cm, name a few things
* fix data and sizeof
* copy/erase functions and modes named
* rename assets, format
* change some struct members
* fixes
* review1
* fix maching error
* extract VTX data
* re add werror to ZAPD
* review 2
* fix
* remove file boundary padding
* remove zeroes
* review3
* change skybox stuff
* changes to vs etc
Co-authored-by: KrimtonZ <krimtonz@gmail.com>
Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <romanlasnier@hotmail.com>
Co-authored-by: Louis <louist103@gmail.com>
|
|
* Automatic XML for link_animetion
* Make sure tutorial images are not gitignored
* OK
* Correct ovl_Boss_Sst RangeEnd
* ExternalFiles
* Remove Segment="128"
* Remove segments from place_title_cards
* format, newlines, remove previous xml
|
|
* symbol cleanup
* run formatter
* run formatter
* remove duplicate z_demo_ik symbols
* run formatter
|
|
* .
* remove tools/ZAP2 from origin master
* object_spot04_objects
* remove accidentally added xml
* object_spot00_objects
* object_bombf ok
* object_dy_obj
* object_masterzoora
* object_mastergolon and object_masterkokirihead
* object_aob
* object_gt
* object_gt
* object_geff
* object_mag kinda
* object_gjyo_objects OK
* object_ani OK
* object_door_gerudo
* object_md and object_trap
* object_js OK
* object_goroiwa
* object_gs
* object_nwc
* object_niw
* object_ane
* object_os_anime OK
* object_d_hsblock OK
* object_fz OK
* object_ru2 OK
* fixed object_mag
* object_cow OK
* object_spot01_objects OK
* object_spot15_obj
* object_umajump OK
* object_spot18_obj
* object_spot12_obj
* fix symbols in z_item_b_heart
* object_bdan_objects & object_bowl
* object_ddan_objects
* object_owl OK
* object_spot01_matoyab.xml OK
* object_haka OK
* object_heavy_object
* object_ingate and objet_menkuri_objects
* objet_spot00_break & object_relay_objects OK
* object_spot01_matoya OK
* object_spot06_objects OK
* undefined_syms
* object_spot08_obj OK
* object_efc_doughnut & object_zg
* object_ik OK
* object_vm
* object_ei OK
* object_ds OK
* updated spec
* map_48x85_static OK
* object_zl1 & object_peehat ok
* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK
* object_bubble & object_fw ok
* object_shopnuts
* restore delete file
* object_timeblock OK
* object_d_lift OK
* object_kibako2 OK
* object_mamenoki OK
* matches
* remove unused asm
* object_mag ok now
* fixed object_ani
* done for now, im tired
* object_bdan_objects fixed up
* fix bdan
* object_bombf fixed
* object_bowl fixed up
* object_cow fixed
* did more, im tired
* fixed some stuff in object_ddan_objects
* fix object_ddan_object
* object_door_gerudo fixed
* object_ds fix
* object_dy progress
* fixed great fairy
* some more
* more
* object_haka fix
* progress
* ingo_gate fixed
* object_js
* forgot collision
* object_relay_objects fixed
* object_kibako2
* object_mag fixed
* u64* to void*
* more u64* to void*
* object_mamenoki fix
* object_mastergolon & object_masterkokirihead fix
* mido is weird
* fixed build
* fix object_menkuri_objects
* add missing textures in object_menkuri_objects
* object_ms
* fixed object_peehat
* some cleanup stuff
* object_zg fix
* object_spot00_break fix
* object_niw fix
* object_nwc fixed
* object_ru2 object_rr and some of object_owl fix
* object_spot15_obj fix
* business scrub
* object_spot01_matoya fixed
* object_spot18_obj fix
* object_spot01_objects fix
* object_spot04_objects fix
* object_spot04_objects actually fixed
* object_spot12_obj fix
* object_timeblock fix
* object_spot06_objects fixed
* object_spot08_obj fix
* spot01_matoyab fix
* object_trap fix
* object_umajump fix
* object_vm fix
* z_en_niw_lady fix
* object_yukabyun fix
* object_zl1 fixed
* added offsets to object_os_anime
* object_md fix
* object_ane fix
* object_aob fix
* add palette comment
* object_spot00_objects fix
* spot00 fix
* remove unused asm
* updates
* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815
* Updated object_bdan_objects, ran format.sh
* Change rgb5a1 to rgba16 in my object xmls
* Addressed Anghelo's comments
* review
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
|
|
* copy over the xml
* Rename anims
* A bunch of renames
* minor extract_assets fixes
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "820678b4e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "820678b4e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change rgb5a1 to rgba16
* eye and eyebrows
* some dlists
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6be9af65d"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6be9af65d"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
|
|
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* Fra -> FRA and cleanup map_name_static
* map_name_static
* DONE
* SHould be it
* Done done done done
* vector
* remove another pr
* ?
|
|
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* (Re) fix case
* segment 0
* Fix map name static conflict
* Comment about ZAPD
* number 0
* Update place_title_cards.xml
* Update spec
|
|
* renames
* format
* format functions.h
* clean
* arg name
* remove asm
|
|
* Add symbols, does NOT build OK
* parameter OK with syms
* Use `static` more and inline arrays
* wip docs
* Start on Interface_Draw, NOT OK yet
* rename variables since interface dev is weird
* nonmatching for now
* kaleido
* Update src/code/z_parameter.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Make most texture rectangles use shifts
* fix symbols for all interface things
* done with interface_draw for now
* Update z_parameter.c
* format files
* fix wrong function calls
* fix bss
* improvements in matching
* remove button enum for now
* (void)0 to fix warning
* make conditional look nicer
* fix
* fix wrong combiner
* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
* remove "HUD" naming
* review suggestions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
|
|
* renames
* change digits and control pad names
* Add codepoints, rename blank char 0x7F
|
|
* it's crashing
* fix stuff
* fix xmls
* problematic objects
* fix tabs
* Fix suffixes
* add missing new lines
* Add comments to the problematic objects
* Find and replace fixes
* Add Fig's objects
* I forgot to add a Name in a cutscene, so I'm adding it here
* Update object decomp tutorial a little bit
* Update problematic objects
* Update docs/tutorial/object_decomp.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Change comments
* comment out a few blobs
* dammit tluts
* Change a bunch of objects
* update the last bunch
* update comments on oA11 and oB2
* Ninja-edit to fix compatibility with ZAPD's PR 142
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
|
|
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
|
|
* fix hidan door
Signed-off-by: angie <angheloalf95@gmail.com>
* doors and lens of truth in gameplaykeep
Signed-off-by: angie <angheloalf95@gmail.com>
* other minor fixes
Signed-off-by: angie <angheloalf95@gmail.com>
* Fix a typo
Signed-off-by: Angie <angheloalf95@gmail.com>
|
|
* .
* remove tools/ZAP2 from origin master
* Some texture files
* fix tabs in new texture files
* map_i_static
* some updates
* update names
* update more names
* nintendo_rogo_static
* title_static ok
* Added segment= to the texture files
* do_action_static update
* Made suggested changes
* Made suggested changes
* Fixed spec
|
|
* First batch of files
* Add missing folders back
* Fix missing folders again
* Finish fixing existing texture files
* Gameplay_Keep XML finished
* Most actor gameplay_keep undefined syms removed
* Only ~200 gkeep symbols remain
* All gkeep symbols that ZAP supports are fixed
* Cleanup, and make gkeep names more accurate
* Starting to figure out what some unknown blobs are, merge zeldaret in
* fix a few more things
* refactor gkeep
* Change how gitkeep is handled
* gkeep xml cleanup
* Gkeep finished, now just waiting up ZAP updates
* 100 link animations finished
* 150 link animations finished
* 200 link animations finished
* 250 link animations finished
* 350 link animations finished
* 400 link animations finished
* 450 link animations finished
* 500 link animations finished
* 550 link animations finished
* All Link animations finished
cannot build yet because ZAP doesn't have LinkAnimationHeader yet
* xml changes for new zap stuff
* finish gameplay_keep
* fixing existing objects
* ready for pr besides zap padding issue
* mostly ready for pr
* format all c files
* all conflicts fixed
* make changes that roman requested
* fix thing i didn't mean to change
* some animation symbols renamed
* fixed roman's stuff
* lifemeter hardcoded pointers removed
* fix issue with incorrect data in gameplay_keep
* removed unused asm
* fixed most of fig's comments
* fix all of fig's comments
* reformat files
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* fixed stuff
* fixed most of roman's comments
* remove leading zeroes
* should build now
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "f84d8337b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "f84d8337b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* all of gkeep symbols fixed
* compiler error fixed
* format files
* final changes
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
|
|
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Fixed newline issue with ZAPD
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Fixed merge issues.
* Fixed makefile merge error
* Fixed additional merge error
* Fixed several more merge issues
* Commented out gameplay_keep and sk2 extraction, since currently unused.
* Reenabled gameplay_keep extraction since it's used in the spec
* Fixed build error
* Removed test struct
* Fixed makefile error that would happen on fresh builds
* Fixed merge issue
* Removed relative paths
* Multithreading on extraction, spec uses numbers, few changes to XMLs
* Removed redundant code from the extract_assets script
* object_sk2 and object_spot09_obj OK
* object_spot11_obj OK
* object_spot17_obj OK
* Test: One of the gameplay_keep dlists given a proper symbol
* Updated asset symbol names based on new naming scheme
* XMLs use "Offset" instead of "Address" now
* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file
* Updated to use latest build of ZAPD
* Updated ZAPD again
* Updated ZAP to remove assimp dependency
* Jenkins Test: Added .gitkeep file
* Updated ZAP once more
* Updated png file name to comply with new naming scheme.
* Fixed bad include
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
|