Commit Graph

88 Commits

Author SHA1 Message Date
Alex Bates
3d9127a340
match world table .data 2020-10-30 17:43:12 +00:00
Alex Bates
debc0016fd
use ld_addrs.h in load_world_script_api
Renamed from load_map_script_lib
2020-10-30 16:07:33 +00:00
Alex Bates
db1ee14d8f
match get_song_variation_override_for_cur_map
This was previously called get_default_variation_for_song, but its more of an override than a default.
2020-10-29 22:41:43 +00:00
Alex Bates
631afbe477
match many small funcs, rename symbols 2020-10-29 03:48:04 +00:00
Alex Bates
9c5338c04b
match func_8014AA54 2020-10-29 02:54:01 +00:00
Alex Bates
e0c8108543
match _set_music_track 2020-10-29 01:34:00 +00:00
Alex Bates
9eef0b0273
match set_music_track
rewrite flag as NOT


clean up set_music_track temps
2020-10-29 01:34:00 +00:00
Alex Bates
85f7331004
match func_80055050 2020-10-29 00:29:30 +00:00
Ethan Roseman
86087faf8f GetCurrentFloor (less than 10k funcs now) 2020-10-24 18:25:25 -04:00
Ethan Roseman
6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04:00
Ethan Roseman
dbd8e0b1ee Merge branch 'misc-improvements' into cornucopia 2020-10-20 12:44:50 -04:00
Alex Bates
99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates
f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
sonicspiral
a82d662627
Decomp func_8013A854 from code_d0a70_len_4fe0 and add UnkStructFromfunc8013A854 (#78)
* inisital docs of asm logic and mips_to_c output

* add temp unknown struct for this func
* remove comments from asm, will keep them local only.

* moved UnkSructFromfunc8013A854 to common_sructs.h
* added it's pointer to undefined_syms
* fixed struct pointer and size
* this is a new struct, no others that are `0x7C` in size

* pulled upstream. testing more code.

* fix func_8013A854 to represent latest upstream

* remove unknown struct from common structs to this func

* this is a void func

* unknown struct should be an array with size based on mipstoc outpute a0 < 0x5A

* correct number of lines of asm output from diff, but all code does not match

* fix data types in UnkStructFromfunc8013A854

* temp_v0's logical shift needs to go after UnkStructFromfunc8013A854

* remove unneeded variables

* remove unneeded variables and adding inline sll multiple calc

* add UnkStructFromfunc8013A854 back to common structs

* add UnkStructFromfunc8013A854 back to common structs

* pull latest n64 splat

* analyzing func_8013AA9C to construct UnkStructFromfunc8013A854

* may need unions to represent sub structs in this unk

* roll back struct changes and focus on regalloc

* not an array of pointers looks like there's an array of 90 structs, each struct of size 0x7C

* got OK, now need to cleanup code

* Merge branch 'master' of https://github.com/ethteck/papermario into code_d0a70_len_4fe0-func_8013A854

# Conflicts:
#	tools/n64splat

* fix comment

* remove func_8013AA9C comment used during debug

* add placeholders unks in UnkStructFromfunc8013A854 based on func_8013AA9C

* add first 6 unks in D_80156954

* update todo, add some padding

* adding padding

* adjusting padding

* finished first implementation of padding for UnkStructFromfunc8013A854

* run ./coverage.py --delete-matched

* git checkout -f master && git pull for tools/star-rod

* several changes to UnkStruct8013A854:
* change name from UnkStructFromfunc8013A854 to UnkStruct8013A854
* only include known member data
* add list typedef since this is any arracy of structs

* fix UNKSTRUCT8013A854_SIZE const

* fix スプラトゥーン n64splat

* implement UnkStruct8013A854List to track which array we are pointing to in this unknown struct

* resolve PR feedback. todo resolve splat, review alex optimization:
* move unkstruct extern, struct, and size to code_d0a70_len_4fe0.c
* format void func_8013A854 variable spacing
* add unknown symbol D_80156954;0x80156954 to tools/symbol_addrs.txt

* try fix スプラトn64 with git checkout master && git pull

* fix lint

* move var declaration to inside if and format code

* remove todo comment

Co-authored-by: sonicspiral <>
Co-authored-by: sonicspiral <mru@plusultra.localdomain>
2020-10-19 00:15:04 -04:00
Ethan Roseman
a15a282a08 Thy cornucopia hath return! 2020-10-18 17:04:40 -04:00
Ethan Roseman
16a9ee0a7b Merge branch 'master' into new_splits 2020-10-17 22:41:09 -04:00
Ethan Roseman
4f85d2dcea cleanup 2020-10-17 22:39:30 -04:00
Ethan Roseman
a8e550dd9a yee 2020-10-17 22:27:25 -04:00
Ethan Roseman
890fd346e9 🌠 2020-10-16 23:47:10 -04:00
Ethan Roseman
e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Ethan Roseman
369cb32bbc hey rain 2020-10-16 02:09:20 -04:00
Ethan Roseman
5bc8e56a91 treats 2020-10-15 22:05:04 -04:00
Ethan Roseman
f45c24f7c8 Some shtuff 2020-10-15 18:11:56 -04:00
Ethan Roseman
a285afc756 Use all symbols in symbol_addrs.txt 2020-10-15 00:43:07 -04:00
Alex Bates
0a2b3780a3
rename curtain globals 2020-10-15 00:16:44 +01:00
Alex Bates
ff3fbdfa8f
near-match begin_state_intro 2020-10-14 23:22:43 +01:00
Ethan Roseman
3dc2c9fe67 Merge branch 'master' into in-progress 2020-10-14 16:02:26 -04:00
Ethan Roseman
9510d4fff6
Merge pull request #54 from JoshDuMan/Testing
Begin decompiling nusys
2020-10-14 15:59:53 -04:00
JoshDuMan
656eb98424 Merge branch 'Testing' of https://github.com/JoshDuMan/papermario into Testing 2020-10-14 13:37:04 -04:00
JoshDuMan
230597b4ee Fix PR requests 2020-10-14 13:36:34 -04:00
Alex Bates
e068d2848b
match func_80028838 2020-10-14 17:11:59 +01:00
Ethan Roseman
7cd481c1a2 Merge branch 'master' into in-progress 2020-10-13 21:57:58 -04:00
Ethan Roseman
d7360e4bf7 Some stuff 2020-10-13 21:55:04 -04:00
dark-samus
8384a8cdbd fix multiple symbol defs 2020-10-12 22:34:05 -04:00
dark-samus
733b591d5f merge master 2020-10-12 22:16:00 -04:00
dark-samus
430ff41bc6 lots of stuff 2020-10-12 21:28:01 -04:00
Ethan Roseman
2323879ef1
Merge branch 'master' into Testing 2020-10-12 20:32:15 -04:00
Ethan Roseman
011231df41 Many more functions decomped 2020-10-08 15:03:58 -04:00
Ethan Roseman
5794cdf6fc Some more 2020-10-03 16:04:49 -04:00
Ethan Roseman
926df66474 saving for later 2020-10-02 02:07:54 -04:00
dark-samus
c79f950a04 big merg 2020-09-28 16:59:36 -04:00
JoshDuMan
84db54fce8 Merge in master 2020-09-28 00:00:10 -04:00
JoshDuMan
37565257e6 Merge branch 'Testing' of https://github.com/JoshDuMan/papermario into Testing 2020-09-27 22:43:04 -04:00
JoshDuMan
55dfeef1c8 Work on nuSched 2020-09-27 22:42:51 -04:00
Ethan Roseman
164c6e76d3 curtains 2020-09-27 14:13:50 -04:00
Ethan Roseman
36c5bde376 more goods 2020-09-26 21:02:29 -04:00
Ethan Roseman
677ec4f4e5 more 2020-09-25 22:49:59 -04:00
Ethan Roseman
210e65c3bf More decomp + coverage fix 2020-09-25 21:51:54 -04:00
Ethan Roseman
bbca99bd94 ASM macro fix, decomp of many 2020-09-25 17:18:09 -04:00
Ethan Roseman
a9e5d79531 more 2020-09-21 23:10:53 -04:00