Alex Bates
c43d15e8cf
Clean up map filenames ( #1175 )
...
Co-authored-by: Ethan <ethteck@gmail.com>
2024-03-24 15:43:34 +09:00
Alex Bates
37f59877e5
Doxygen ( #1142 )
...
* use doxygen
* add documenting guide based on https://github.com/zeldaret/oot/blob/main/docs/Documenting.md
* exclude stdlib readme from doxygen
* refuse to configure matching iQue on macOS (EGCS compiler is not built for macOS, so iQue won't build. We still enable iQue builds on macOS by using gcc-papermario via --non-matching.)
* use proper doxygen bug comment style
* document common EVT API funcs nicely
* add doxygen ci
* add \vars command
2024-01-09 23:56:08 +00:00
Ethan Roseman
6da232df36
Image asset rework ( #1141 )
...
* poc
* A bit
* 19 files to go
* ique fixed this took me hours omg
* 4 more
* dead vines
* fixules
* drop .bin from needed macro
2024-01-08 01:36:59 +09:00
Ethan Roseman
262428c68a
Splat update ( #1136 )
...
* Remove splat from repo
* refactor scraps
* requirements update
2024-01-03 02:16:18 +09:00
Ethan Roseman
746a42af64
Debugging PR warning silliness ( #1132 )
...
* Debugging PR warning silliness
* by gorsh I think I've nabbed it
2023-12-04 18:22:06 +09:00
lshamis
ae66312d8c
Add Python linter to github actions ( #1100 )
...
* Add Python linter to github actions
* wip
* Add back splat_ext
* Format files
* C++ -> C
* format 2 files
* split workflow into separate file, line length 120, fix excludes
* -l 120 in ci
* update black locally and apply formatting changes
* pyproject.toject
---------
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-30 02:03:17 +09:00
Ethan Roseman
4f77ffbc3e
more pal funcs & npc sprites improvement ( #1079 )
...
* cod changes and fixes for npc sprites
* 6 mo
* Cleanup
2023-07-10 14:57:27 +09:00
Ethan Roseman
8837fbdf65
Player sprites & more ( #1055 )
...
* WIP work on sprites (sprite_stuff.py)
* cleanup of various stuff
* separate compiler installation into separate script
* wipz
* more
* renames, bugfixes
* more
* very grood
* cleanin
* goods and services
* oopth
* oopth2
* Parse palette data from xml
* more work
* more wipperz
* more
* it working
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e72a868f9f"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e72a868f9f"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fix symbol_addrs for new splat
* upd8s
* Use generated header, other versions, fixes
* fixes & formatting
* wip fusing npc + player extraction & cleanup
* remove npc_files
* buildin
* fix some bugs
* Cleanup, yay0s separately
* cleen
* cleanup
* Respect stack during build
* jp spritz
* dun
* fix c files
---------
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2023-06-26 19:27:37 +09:00
Alex Bates
4680a74e0b
Introduce clang-format ( #1004 )
...
* add basic .clang-format
* configure vscode clang-format modified lines on save
* update clang-format to only run on C files
* add ci action to print clang-format diff
* use GITHUB_BASE_REF
* --binary
* clang-format-14
* move workflow to pr.yaml
* oops
* checkout fetch-depth 0
* use cpp-linter-action
* test
* fail if step fails
* log depth
* fetch main
* set fetch-depth
* limit diff and run clang-format
* use versioned clang-format
* untiy actual code
* fix argument order
* colorize output
* Clean up #989
* move cpp lint job to lint.yaml
* disable vscode autoformat
* add git hook to make sure assets/$version has been gitignored (#1006 )
* add git hook to make sure assets/ hasn't been gitignored
* echo to stderr
* quiet git check-ignore
* add .v64 and .n64 to gitignore
* Changed some variable names in state_title_screen (#1003 )
* Changed some variable names in state_title_screen.c
* resolving pull request items
* changed TitleData to TitleScreenGfxData across sys
* replace gbi names with understandable ones
* accidentally switched logo and pressStart
* changed GfxData to ImgList
* Renaming and b32
* Doing this but more
* pause menu cleanup (#1008 )
* minor pause cleanup
* macro
* comments
* second macro
* delete macros
* hm
* pause message names
* unused tutorial messages
* oops
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* fold doc 1 (#1009 )
* minor fold cleanup
* fold doc I
* enough
* rename
* last
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* appendGfx_shading_palette (#1010 )
* cleanup & warnings for modern gcc
* clean
* stuff
* diff.py update
* Fix offset problem in struct
* Fix texture issue in chapter_change
* appendGfx_shading_palette
* Convert tabs to spaces (#1012 )
* Add .git-blame-ignore-revs (#1014 )
# 1213a4adf0aa515d0c7c7e37db396363914fda2egit-blame
* func_E02000AC (#1013 )
* draw_image_with_clipping (#1016 )
* draw_image_with_clipping
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* tiny fix
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* npc_do_player_collision (#1017 )
* appendGfx_animator_node (#1018 )
* appendGfx_animator_node
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
* find_similar_areas improvements
* oopz
---------
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
* lol 100% (#1019 )
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* image fx (#1015 )
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Pal pause (#1011 )
* PAL pause segment
* PAL pause_gfx_en segment
* Apply name changes
* Merge gPauseBadgesElements
* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE
* Split PAL and monolingual arrays
* Nix support (#1020 )
Very hacky
Will be maintained by @NotNite
* use ARRAY_COUNT(ExtraDoubleRecipes) (#1023 )
* Replace python-githooks with manual command (#1027 )
* ui_images (#1021 )
* ui_images
* Move French assets to their own folder
* imgfx data (#1029 )
* various cleanup (#1030 )
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
* misc
* btl msg
* 3 combine modes
* 3 more
* many more
* screen overlays
* stencil types
* all screen transitions
* jp build fix
* another jp fix
* iq fix
* mystery battle enum added oOoOoOoOooo
* DMG_SRC
* starting battle cam presets
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* btl cam modes (#1035 )
* some btl cam
* couple things
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Add version option to diff.py (#1037 )
* Clean trailing whitespace (#1038 )
* Add missing newlines
* Remove trailing whitepace
* split em (#1040 )
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Update .git-blame-ignore-revs (#1039 )
* standardized battle script names (#1043 )
* damage intensity
* standardized battle script names
* few more
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Dump PAL filemenu section (#1036 )
* Dump PAL filemenu section
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* Clean up numbers
* Use more constants
* Find more constants
* Clean up a bit
* eth cleanup
* Clean up
* Fix brace style
* rename new file & funcs
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* revert test change
* update clang-format config
* indent case labels
---------
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: CreateSource <72283721+abnormalhare@users.noreply.github.com>
Co-authored-by: HailSanta <53960937+HailSanta@users.noreply.github.com>
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Julian <hi@notnite.com>
Co-authored-by: Devon R <Gorialis@users.noreply.github.com>
2023-05-02 05:07:31 +09:00
Ethan Roseman
a37f30dc94
Modern gcc + shiftability work ( #942 )
...
* wip changes for modern gcc
* more
* wip
* blah
* Define explicit size for symbol
* Clean up evt_handle_exec1
* wip
* .
* fixes & VLA macro
* VLA innit
* wipz
* Fix potential UB
* meowp
* meowp2
* fixies
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e1f0b17917"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e1f0b17917"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fixules
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "3ba3277e57"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "3ba3277e57"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* more shiftability + symbols work
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "02879e52a7"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "02879e52a7"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* more
* revert bss changes for now, new heaps overlay for aligning stuff to 0x1000 (not sure how necessary that is, so maybe will revert later on)
* 'fixing' jp shift build
* more
* more syms
* more progress
* more
* ididid
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "de54da38f5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "de54da38f5"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a27dc436a6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a27dc436a6"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* blah
* stuff's broken, but at least it's maybe cleaner
* modern gcc back
* revert
* shifting all overlays - works so far
* progs
* another
* modern gcc flag, re-enabled all ifdef shift stuff
* fixies
* progress
* fixes, matching build
* heaps3 overlay and some symbol names
* changies
* PR comments & cleanup
2023-02-14 22:14:14 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 ( #859 )
...
* obk_07 funcs
* 2 mo
* sprite_shading_profiles
* tiny clean
* PR comments
2022-11-15 23:55:59 +09:00
Ethan Roseman
59217b8cf8
A few battle/partner funcs ( #804 )
...
* 5 battle partner funcs
* 3 battle funcs
* rodata fix for the fish
* PR comments
2022-10-06 09:06:09 +09:00
Alex Bates
1ad0f7b149
Fix 'badly punctuated parameter list in define' issues ( #777 )
...
* remove defines of old SCRIPT macro
* get rid of uses of unnamed ...
2022-09-16 08:27:35 -10:00
Ethan Roseman
d0a7655779
Various dompin ( #672 )
...
* partner funcs
* land.c
* filemenu_update
* 190A10.c
* hammer.c dun
* prog rock
* various funcs
* moving
* update_item_entities
* filemenu_yesno_handle_input
* cleanin
* sweeping
* PR comments
2022-03-30 21:07:13 +09:00
Ethan Roseman
9cd911765d
File menu & more ( #658 )
2022-03-10 09:55:38 +00:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp ( #420 )
...
* remove some warnings, improve build speed on master
* update Camera
* update_camera_zone_interp not matching but close :/
* cleanup
* configure fix
* cleanup, better gbi macros
* decomp and syms
* a couple more
* 2 more and stuff
* more naming
* 3
* syms
* mdl_get_child_count
* more stuff
* get_model_list_index_from_tree_index
* 5 more
* header org
* update_entity_shadow_position
* fog color funcs
* more color stuff
* display lists
* create_shadow_from_data
* 4 evt shtuffsh
* func_80117D00
* func_80111790
* some BSS
* entity_raycast_down
* MakeEntity and almost step_entity_commandList
* step_current_game_mode
* filemenu stuff
* lots more filemenu stuff
* cleanup
* formatting
* fixes
* 1 more
* more fixes
2021-09-22 20:17:46 +09:00
alex
683d0857ff
Fix many compiler & linker warnings ( #281 )
...
* fix ld warnings
* fix NpcSettings warn
* get_screen_coords
* various
* bloop
* update INSTALL.md for versioned baseroms
2021-04-25 03:56:22 +09:00
Ethan Roseman
a1f7a21114
Rodata migration + other goodz ( #208 )
...
* rodata migration
* a5dd0 rodata migration
* e79b0 rodata migration
* more rodata migration
* more migration
* goombario rodata
* SetNpcCollision32
* removing old stuff
* oops
* UnkBackgroundFunc
* removing unnecessary files
* UnkBackgroundFunc2
* UnkStarFuncs
* .
* misc star decomp and AddHP
* oops
* AddFP
* fix offset, update symbol_addrs
* .
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "f602284b3e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "f602284b3e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* re-disasm
* fix effect disasm
* oops
* fix lullaby
2021-03-13 00:53:11 +09:00
Ethan Roseman
698cf99458
jp cod (Created the first segment's c files for jp) ( #194 )
...
* jp cod
* just have less code and it works
* oops
* removing splat cause subrepo is being dumb
* git subrepo clone https://github.com/ethteck/splat.git tools/splat
subrepo:
subdir: "tools/splat"
merged: "d7281bae6a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d7281bae6a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* move jp stuff + revert configure
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "c56195a9c5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c56195a9c5"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
2021-02-27 00:36:33 +09:00
alex
a4e1c2f522
Add versioning ( #187 )
...
* fix vscode cpp extension messing with files.associations
* move stuff
* it builds!
* symlink papermario.us.z64
* ci: put baserom in right place
* add jp
* fix splat dir
* ignore starrod dump
* .s deps
* update jenkins
* add dsl back
* configure.py versions
* wups
* fine ethan
* fix paths
* configure: default to only the version(s) with existing baseroms
* fix coverage
* fix progress.py
* progress.py verisoning
* remove format.sh from CONTRIBUTING
* update CONTRIBUTING
* fix first_diff
* diff.py: use ver/current/
* update splat.yaml
* trying to fix subrepo
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "06a737f02d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "06a737f02d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* configure fix
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "41786effd3"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "41786effd3"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-02-22 18:21:23 +09:00
Ethan Roseman
6d66d5fedb
Odds and Ends ( #189 )
...
* fixing segment
* redoing subtree
* git subrepo clone https://github.com/ethteck/splat.git tools/splat
subrepo:
subdir: "tools/splat"
merged: "99cf514297"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "99cf514297"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix symbol_addrs
* sweet victory
* reformat collision_main_lateral.s
* Lots of matches, fixed diff.py issue, improved coverage.py
* some more
* update symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "c46026725a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c46026725a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* update symbol_addrs
* fix disasm
* 2 mo
* Jenkinsfile
* PR comments
* check_input_status_menu, removing some macros
* a few funcs
* assist updates
* UnkAlphaFunc
* UnkPartnerPosFuncs
* Deleting stuff
* oopz
* dead_syms.txt, UnkNpcAIFunc14
* update symbol_addrs
* cleanup
* symbol_addrs
* cleanup
2021-02-20 23:41:30 +09:00
Ethan Roseman
8afd8bf1f1
Various meta work and some decomp ( #184 )
...
* some
* DeadUnkTexturePanFunc
* DeadUnkTexturePanFunc2
* move guOrthoF to os
* up
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "ae2cce951d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ae2cce951d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Updating bin dir
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5517f520e4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5517f520e4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe48dc3b3a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe48dc3b3a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* revert garbage
* :OK:
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8c86e4b95b"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8c86e4b95b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* data migration
* 3
* .rodata migration and a buncha funcs
* 2 mo
* some decomp, a file boundary fix
* cleanup
* UnkNpaAIFunc13s
* Update symbol_addrs
* remove sublist
* deleted asm
* data fix
* fix data
* wtf?!
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "88ce6b44a6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "88ce6b44a6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* symbol_addrs update
* blah
* PR comments
2021-02-16 19:32:34 +09:00
Ethan Roseman
bbac3d905b
match nuContRmbMgr.c
2021-02-09 03:02:14 +09:00
Ethan Roseman
398fa6c695
gfxRetrace_Callback
2021-02-09 00:53:44 +09:00
Alex Bates
cf745c85cb
clean up coconut
2021-02-06 05:26:27 +00:00
Alex Bates
9b881b8309
match coconut.png
2021-02-05 13:49:50 +00:00
Ethan Roseman
f7cef0ab6c
Move naming + disasm
2021-02-03 20:55:35 +09:00
Ethan Roseman
78411d2270
more decomp and 🍀 symbols
2021-01-21 00:45:03 +09:00
Ethan Roseman
b8edd71cd8
42e0
2021-01-20 01:31:43 +09:00
Ethan Roseman
545a655d40
2 funcz
2021-01-17 23:40:02 +09:00
Ethan Roseman
c42debe758
M -> N, StartRumbleWithParams dup
2020-12-28 16:09:39 +09:00
Alex Bates
94ca7f82c0
update script syntax
2020-12-24 11:15:05 +00:00
Ethan Roseman
80856cef14
map funcs rename soln
2020-11-29 11:52:16 -05:00
Alex Bates
87cc5ed999
match npc sprites
2020-11-11 13:52:04 +00:00
Alex Bates
87023d8be2
vscode: don't clang-tidy include/PR/*.h
2020-11-10 11:25:36 +00:00
Alex Bates
44fd38f4f8
add image splits
2020-10-31 18:30:16 +00:00
Alex Bates
5ddfce7824
improve ld script & asset building
...
makefile go brrrr
2020-10-28 20:58:11 +00:00
Alex Bates
218961279b
merge make
2020-10-23 01:56:22 +01:00
Alex Bates
83153acb59
implement SCRIPT(...) dsl
2020-10-22 05:54:03 +01:00
Ethan Roseman
89ae878f24
Merge branch 'master' into misc-improvements
2020-10-20 17:26:27 -04:00
Ethan Roseman
02aa37c31d
Fix coverage.py
2020-10-15 18:42:54 -04:00
Ethan Roseman
2eb876fccf
fully matched code_e940_len_290.c
2020-10-09 14:26:17 -04:00
Ethan Roseman
210e65c3bf
More decomp + coverage fix
2020-09-25 21:51:54 -04:00
Ethan Roseman
ddb9f77fc1
Misc 42e0 funcs, new SQ macro, removing no-builtin
2020-09-11 16:29:52 -04:00
Alex Bates
1012d8de77
add clang-tidy vscode extension
2020-08-19 01:12:55 +01:00
Alex Bates
b5256e31ee
add astyle, update clang-tidy config
2020-08-19 01:11:25 +01:00
Alex Bates
c897d5caa3
add vscode editor settings and build tasks
2020-08-15 17:27:08 +01:00