Marijn van der Werf
0d70e3ecac
Build main segment in JP ( #939 )
...
* Remove JP dump
* Add new JP dump
* Fix sort_symbol_addrs to only look at one version
* Deduplicate and sort symbol_addrs
* Clean up JP rom if conditions
* Use /current dir for diffing
* Fix state_step_logos
* Add todo comments for unsplitted segments
* Fix draw_merlee_message
* rename background_gfx
* Fix background_gfx
* Fix JP build
* Set unused data offsets to auto
2023-02-17 11:06:56 +09:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc ( #790 )
...
* more goods
* move dead map data to dir
* data migration / splatification
* new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "d93b6550c4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d93b6550c4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat fix
* dead_sqrtf bye bye
* fix
* Clover comments
* comment
2022-09-29 05:52:12 +09:00
Ethan Roseman
2b40121739
Shiftability work ( #778 )
...
* move data includes
* splat yaml comments
* 8a160 data + funcs
* naming things
* 801b0 funcs
* data stuff
* BSS temp removal + new splat accommodations
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e1abb4ece0"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e1abb4ece0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat accommodations
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "20bffc4ffc"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "20bffc4ffc"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* set vram for seg
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "c95002b315"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c95002b315"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* more goods
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "470c358834"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "470c358834"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "df424333da"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "df424333da"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "18eb9cb2e6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "18eb9cb2e6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "285a549bc6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "285a549bc6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "c523ce1a3a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c523ce1a3a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* hawaii push
* shiftability work
* DEG_TO_RAD
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "6c02ec5ecd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6c02ec5ecd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2022-09-17 15:10:37 -04:00
Ethan Roseman
d31e0b8936
Engine cod ( #738 )
...
* a couplez
* func & data cleaning
* sig
* move data and fix nonmatching
* Finish 17D6A0
* Don't use backticks in progress.py
* func_8025995C and clean
* 2 sprite funcs and cleanup
* 3 sprite funcs
* gather_magic_main
* 3 sprite funcs
* more sprite work and cleanup
* sprite funcs
* more clean
* UnkFloatFunc005
* warnings
* cleaning and os stuff
* 2 more funcs + warnings
* yaml work, move map data metadata to separate yml file
* apply_transform_to_children
* cleaningz
* PR comment
2022-07-08 21:57:08 +09:00
Ethan Roseman
bae34c46ed
Upgrade to splat 0.9.0 ( #730 )
...
* changes for splat 0.9.0
* wip
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "2ff7357501"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "2ff7357501"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* OK
* big_snowflakes gfx data
* Jenkins?
* cleanup
* debuff effect gfx data
* fix
* more effect gfx data
* dlabel
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "1365775e09"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "1365775e09"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* .
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6bd9fe1c4e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "6bd9fe1c4e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* flower splash/trail gfx
* throw_spiny gfx
* disable_x and butterflies gfx data
* draw_coin_sparkles
* Warnings, cleanup
* cleanin
* attempt at test_item_player_collision
* more gfx + cleanup
* more effect gfx
* func_8002D160
* update update_symbol_addrs and symbol_addrs
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4914dc9029"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "4914dc9029"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --branch=master --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "aa71299594"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "aa71299594"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix
* fix regression
* Add rabbitizer to requirements
* warnings
* symbol_addrs fixes
2022-06-13 00:33:32 +09:00
Alex Bates
a8c85b377a
Share 1370.c across versions ( #509 )
...
* split jp gfxRetrace_Callback
* func_80025F70
* use 1370_len_7d0 on jp
* rename 1370_len_7d0 to main
* coverage.py
2021-10-31 03:53:55 +09:00
Alex Bates
8a380bf6ea
use is_debug.c on jp ( #507 )
2021-10-29 23:07:59 -04:00
Alexander Faßbender
109db7c43a
Merge jp and us source directories ( #390 )
...
* match last bow fumction
* decomp more partner functions
* :)
* :)
* resolve merge conflict and style conflicts
* fix
* decomp :)
* :(
* :(((
* :)
* :(
* :)
* :)))))
* :(
* :/
* idk
* :/
* What
* Done.
* PR comments
* :(
* decompile dead funcs
* find_duplicates.py +x
* rename dead functions and resolve PR
* :)
* .
* .
* decompile duplicate functions
* :(
* decompile several dupliacte funcions
* decompile several dupliacte funcions
* .
* --
* resolve coverage issue
* rename include-file to specify original use-case
* upload broken splat/configure
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-26 01:56:26 +09:00
alex
fcf84633a7
Split jp map_data ( #313 )
...
* split jp mapfs
* fix us pm_map_data
* jp title_data
* oops
* avoid placing build files in assets/
* match load_hit_asset
* match load_stage_collision
* name gMapConfig and gMap
2021-07-16 20:08:22 +09:00
Ethan Roseman
3315d6010f
Splat refactor ( #257 )
...
* all non-world rodata migrated
* data disasm
* kinda working
* updated yaml
* bloop
* linker header
* configure 2.0
* bin
* mass rename to remove code_
* pause rename
* battle partner stuff
* whew
* more renames
* more renames
* more renaming
* it builds!
* updates
* remove main prefix
* one more thing
* crc, yay0
* .data, .rodata, .bss
* img
* dead_atan2
* it buildsgit add -A
* split battle/partner/6FAD10
* rm &s on sleepy_sheep syms
* sha1sum ninja rule description
* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites
* uncomment
* fix mapfs
* match func_8003CFB4
* .
* clean up and name npc_iter_no_op
* npc.c
* enable cc warnings
* name npc_find_near
* use singular options.asset_path
* smores
* cc_dsl only when needed
* kinda fix configure for splat refactor2
* ok!
* new msg format
* remove old msg format docs
* slight bug fixes, splat adjustment
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cfc140bb76"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cfc140bb76"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "85349befcd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "85349befcd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Update symbol addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "a44631e194"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a44631e194"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-04-13 16:47:52 +09:00
Ethan Roseman
ab79244991
JP rom beginnings ( #197 )
...
* data, splat fixes
* fix .gitrepo?
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fb8315b319"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fb8315b319"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* audio updates (thanks Clover)
* 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"
* work on jp rom
* remove comment
* fix duplicate asm labels
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "db51ae16c2"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db51ae16c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix configure and delete grub
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "97e51bdf21"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "97e51bdf21"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* file split, moving things into os
* header
2021-03-04 18:00:56 +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
