alex
8dc3d81a84
Fix battle/partner/lakilester split ( #317 )
...
* near-match func_800279B4
* fix lakilester split
* match func_8023A1B0_70DEC0
2021-07-18 00:06:16 +09:00
alex
31b0c3f685
Merge 4DF30 into battle/battle ( #309 )
...
* merge 4DF30 into battle/battle
* nomatching load_battle
* oops
2021-07-13 21:33:29 +09:00
alex
da6fd773bb
Disassemble battle/partner/goombario.c ( #308 )
...
* name battle/partner/ segments
* name battle_goombario sprites
* battle/partner/goombario data
* update
2021-07-12 22:00:45 +09:00
Ethan Roseman
7cb1790789
Fix alignment of many data sections ( #305 )
...
* generate c includes for img segments
* flatten battle/item/dusty_hammer.c
needs custom splat
* use .inc.c for c incbins
* fixy
* new stuff
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6120d18600"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6120d18600"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove dumb
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8a179e74ba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8a179e74ba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* yaml cleaning
* Further yaml cleanup & battle item refactor
* remove rawptr
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe30b60b75"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe30b60b75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* further cleanup
* Further cleanup & match gfx_draw_background
* clean & wip
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-12 18:15:00 +09:00
Ethan Roseman
647db26552
Mass function rename from Star Rod + a couple funcs ( #298 )
...
* .
* yaml update
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cd690f725d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cd690f725d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* separate main bss syms
* renames and one match
* SR symbol rename
* fix symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5fa8aa24ca"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5fa8aa24ca"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove old artifacts
2021-06-30 11:27:12 +09:00
Ethan Roseman
ad80f13149
Battle Area + Effect Data ( #289 )
...
* part 2 dun
* DivActorLevel4
* Dist3D
* SetBackgroundAlpha & FreeIcon
* update symbol_addrs
* UnkBackgroundFunc3
* anudder
* UnkFogFunc2
* Disasm most remaining data
* model stuff and renames
* update symbol_addrs
2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas ( #287 )
...
* fix BSS bs
* more shop stuff
* gamestatus stuff
* name and some nonmatchings
* cleanup
* clean
* battle area data
* DeadUnkFloatFuncAbs
* symz
* removing stuff
* Battle Area Deduplication
* UnkFogFunc
2021-04-30 02:38:02 +09:00
Ethan Roseman
1c0d26e6c6
Tidying and Shops ( #282 )
...
* render_curtains
* cleanup
* more cleanup
* cleanup
* update symbol addrs
* asm update
* shop progress
* more cleanup
* update symbol_addrs
* asm cleanup
* .
* new data splits
* rename stuff
* .
* .
* PR stuff
2021-04-27 02:47:38 +09:00
Alto1772
df646f1d30
correct some paths ( #279 )
...
* rename files to correct src paths
* remove npc/func_8003E338.s
2021-04-25 00:38:15 +09:00
alex
df3ef58ba1
Crystal Palace reflection include & name some segments ( #274 )
...
* src/evt section
* evt data
* entity
* update entity func names
* names
* reflection wip
* lol
* ~pra_01
* nabbed em
* match func_80240500_D4D540
* match func_802402F0_D4D330
* last pra include func git add -A
* gCurrentCamID
* reflection.inc.c for pra_01
* reflection.inc.c
* rm
* match a few in tst_11
* use npc flags
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-21 23:19:31 -04:00
Ethan Roseman
8422d41f35
sorry bombette ( #258 )
2021-04-13 18:15:46 +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
4ace4bb0d9
415D90 and Audio ( #229 )
...
* 415D90 decomp
* code_415D90 rodata migration
* data migration, decomp
* .
* .
* .
* 4 funcs
* non-matching
* audio part 1
* audio work
* end of snd
* update_symbol_addrs
* .
* 🐔
* .
* sfx func names
* bgm
* more audio
* .
* a few audio funcs
2021-03-26 10:46:45 -04:00
Maide
bc383f3485
Fix some functions ( #226 )
...
* Bed time
* Fixes 2
2021-03-25 17:56:12 +09:00
Maide
f03f08a38f
Battle items ( #222 )
...
* a
* Dizzy Dial
* Dried shroom
* Dusty Hammer
* Egg Missile
* Electro Pop
* Fire Flower
* Food
* Fright Jar
* Hustle Drink
* Insecticide Herb
* Life Shroom
* Mushroom
* Mystery (partial)
* Pebble
* Please Come Back
* POW Block
* Repel Gel
* Shooting Star
* Sleepy Sheep
* Snowman Doll
* Stone Cap
* Stop Watch
* Strange Cake
* Strange Cake fixed
* Stone Cap broked
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "db0b6f0cba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db0b6f0cba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Static all the things
* Tasty Tonic
* Thunder Bolt
* Thunder Rage
* Ultra Shroom
* Unknown Item
* Volt Shroom
Format & coverage
* Item Ids
Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-24 04:39:43 -04:00
Ethan Roseman
8a734c15cd
matched a fire flower func to explain decomp to a friend so here's a PR ( #211 )
...
* matched a fire flower func to explain decomp to a friend so here's a PR
* remove unnecessary line
2021-03-13 15:59:26 +00: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
Tashi
c1d0cb9cea
Matched chill_out functions ( #199 )
...
* matched functions in chill_out
* ran coverage.py
* removed redundant temp variables
2021-03-10 13:18:32 +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
alex
9e6cf181bd
Several partner-related functions ( #196 )
...
* decompile bombette and bow related functions
* decompile bombette and bow related functions
* decompile bombette and bow related functions
* decompile partner function - mainly bombette and bow
* decompile Goombario functions
* OK
* resolve my comments on #190
* rename IsPartnerImmobile funcs
* rm old asm
Co-authored-by: brotenko@gmail.com <brotenko@gmail.com>
2021-02-27 20:05:02 -05:00
Ethan Roseman
96af288878
Splat update ( #195 )
...
* 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"
2021-02-27 01:10:11 +09:00
Ethan Roseman
68792f4331
Misc decomp ( #193 )
...
* 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
* Set80071270_0_16
* UnkFloatFunc2
* fix watt data start
* UnkNpcAIFunc15
* 🐱
* 🐱 🐱
* symbol_addrs
* fix assist.py
* delete unnecessary data file
* fix diff.py, remove parens
* parens
2021-02-22 22:00:49 +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
