pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,050 Commits 5 Branches 0 Tags 205 MiB
141626664f
Commit Graph

240 Commits

Author SHA1 Message Date
Ethan Roseman
eba9c356ed Update assist.py 2020-10-25 20:11:05 -04:00
Alex Bates
cba82f3608
remove star-rod 2020-10-25 00:49:09 +01:00
Ethan Roseman
6b8211bee1
Merge pull request #95 from nanaian/script-dsl 
Add script DSL
 2020-10-24 00:22:38 -04:00
Ethan Roseman
2f33cec82d
Merge pull request #89 from ethteck/cornucopia 
Cornucopia: The Squeakquel
 2020-10-24 00:18:12 -04:00
Ethan Roseman
5d64708640 Map headers 2020-10-23 21:09:49 -04:00
Alex Bates
1d2e46fcad
do..while -> loop.until 
astyle indented the `while` wrongly as there's no semicolon
 2020-10-23 21:07:25 +01:00
Alex Bates
52f5d3cc49
improve build time 2020-10-23 21:06:06 +01:00
Alex Bates
f08eab499c
fix warnings 2020-10-23 20:17:35 +01:00
Alex Bates
7c70208230
fix break statement 2020-10-23 20:14:58 +01:00
Alex Bates
d29496e6e0
add do..while psuedoinstruction 2020-10-23 19:35:45 +01:00
Alex Bates
652c52d3dd
use SCRIPT(...) everywhere 2020-10-23 18:39:38 +01:00
Ethan Roseman
98d8bdd789 map header WIP 2020-10-23 08:31:56 -04:00
Alex Bates
218961279b
merge make 2020-10-23 01:56:22 +01:00
Alex Bates
049022174c
new makefile 2020-10-23 01:28:24 +01:00
Ethan Roseman
2462200b48 Merge branch 'master' into cornucopia 2020-10-22 17:16:58 -04:00
Alex Bates
61665d1066
bump splat 2020-10-22 18:12:13 +01:00
Alex Bates
1abd55b4a1
fix build 2020-10-22 17:39:14 +01:00
Alex Bates
0ea4d24deb
merge master 2020-10-22 17:34:31 +01:00
Alex Bates
83153acb59
implement SCRIPT(...) dsl 2020-10-22 05:54:03 +01:00
Ethan Roseman
99d275d1a0 splat 2 2020-10-21 18:08:22 -04:00
Ethan Roseman
a659c1aeb4 big boy cleanup 2020-10-21 18:05:18 -04:00
Alex Bates
5e8f352090
fix BIND_PADLOCK disasm 2020-10-21 04:04:41 +01:00
Alex Bates
a85df352a4
use M(sym) in disasm_map 2020-10-21 03:54:40 +01:00
Alex Bates
9de4cebb79
map disassembly 2020-10-21 03:10:13 +01:00
Ethan Roseman
59d30300f5 GetItemName 2020-10-20 20:59:17 -04:00
Ethan Roseman
6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04:00
Ethan Roseman
89ae878f24 Merge branch 'master' into misc-improvements 2020-10-20 17:26:27 -04:00
Alex Bates
1e9843e549
remove _ prefix from filenames 2020-10-20 21:32:06 +01:00
Alex Bates
ca88a636e9
split maps further, clean asm 2020-10-20 20:47:10 +01:00
Alex Bates
ff7c3f333e
split all map files 2020-10-20 20:11:56 +01:00
Alex Bates
75ef09e046
fix start of .data/.rodata splits 2020-10-20 19:47:23 +01:00
Alex Bates
9e1613ebb9
split maps 2020-10-20 19:26:58 +01:00
alex
607dba0c58
Merge branch 'master' into misc-improvements 2020-10-20 18:51:56 +01:00
Ethan Roseman
ac244f4220
Merge pull request #84 from nanaian/scripts 
Script disassembly, match kmr_12
 2020-10-20 13:50:04 -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
Devon R
1514bd43fa
New distro support: openSUSE, Alpine Linux (#82) 
* Install scripts for openSUSE/Alpine, static cc1, mips-nintendo-nu64-as

* Update install.sh

only

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2020-10-20 00:07:04 -04:00
Alex Bates
136df602cd
update symbol_addrs 2020-10-20 04:41:23 +01:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01:00
Ethan Roseman
dfd9de4765 Beginning SpawnSunEffect 2020-10-19 19:48:16 -04:00
Alex Bates
dd72dfcd1f
fix kmr_12 split 2020-10-19 23:22:18 +01:00
Alex Bates
f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
Ethan Roseman
ad275eb02c Makefile cleanup, quieter splata, assist.py 2020-10-19 17:29:40 -04:00
Ethan Roseman
8e47ca56c4
Map code (#80) 
* split all map code

hype

* split area_table.bin properly

* fix coverage.py c_func_pattern to match multiline func signatures

* add src/world/* to makefile

* bump splat

* yikes

* splat maps without vram_lock

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2020-10-19 00:42:17 -04: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
78dc55f2f5 some of world_goompa 2020-10-18 20:24:43 -04:00
Ethan Roseman
b71a05cd97 world_goombaria 2020-10-18 20:04:18 -04:00
Ethan Roseman
37856b1b54 ⭐ 2020-10-18 19:27:14 -04:00
Ethan Roseman
fa589f28f1 more 🐟 2020-10-18 18:16:42 -04:00
Ethan Roseman
a15a282a08 Thy cornucopia hath return! 2020-10-18 17:04:40 -04:00
Alex Bates
5f87748ccf
merge master 2020-10-18 15:44:38 +01:00
Alex Bates
0167e3f581
bump n64splat 2020-10-18 15:43:23 +01:00
Alex Bates
59bc5dfa42
match fs.bin 2020-10-18 15:04:49 +01:00
Alex Bates
236aa9b718
decode assets fs 
encoding is wip
 2020-10-18 04:54:32 +01:00
Ethan Roseman
55e4a0df8f Nusys 1.0 -> 2.05, Makefile cleanup 2020-10-17 23:48:26 -04:00
Ethan Roseman
16a9ee0a7b Merge branch 'master' into new_splits 2020-10-17 22:41:09 -04:00
Ethan Roseman
a8e550dd9a yee 2020-10-17 22:27:25 -04:00
Ethan Roseman
3136a914c6
Merge pull request #75 from ethteck/Yay0 
Yay0
 2020-10-17 21:57:48 -04:00
Ethan Roseman
3e412377d9 si.c 2020-10-17 21:05:17 -04:00
Ethan Roseman
ebdc55d8b1 renaming func 2020-10-17 17:49:33 -04:00
Ethan Roseman
de8d3fd839 Yay0 matching compression OK! :nice: 2020-10-17 17:08:57 -04:00
Ethan Roseman
948697d3d8 Initial work 2020-10-17 16:37:46 -04:00
Ethan Roseman
890fd346e9 🌠 2020-10-16 23:47:10 -04:00
Ethan Roseman
36f2fc2f86 clover we miss you 2020-10-16 22:36:28 -04:00
Ethan Roseman
9866661518 Merge branch 'better-cornucopia' into cornucopia 2020-10-16 21:00:37 -04:00
Ethan Roseman
e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Ethan Roseman
9e9ce5bb29 👀 2020-10-16 14:49:18 -04:00
Alex Bates
c1fabdfad9
match and name create_part_shadow_by_ptr 2020-10-16 18:15:51 +01:00
dark-samus
57f56dd257 oops 2020-10-16 02:37:40 -04:00
dark-samus
361983e872 start on new splits 2020-10-16 02:24:04 -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
25e6443aad splat update 2020-10-15 00:46:55 -04:00
Ethan Roseman
a285afc756 Use all symbols in symbol_addrs.txt 2020-10-15 00:43:07 -04:00
Ethan Roseman
3b40b9b28d Asm update 2020-10-15 00:18:54 -04:00
Ethan Roseman
4ad8d4cf5c Splat update 2020-10-14 23:51:26 -04:00
Ethan Roseman
46f1d49601 Splitting remaining files 2020-10-14 23:49:49 -04:00
Ethan Roseman
12c8605fcf Split files 2020-10-14 23:20:51 -04:00
Ethan Roseman
84f211a2ae First pass 2020-10-14 22:56:47 -04: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
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
Alex Bates
a7defe6804
move windows_terminal.bat instructions 
Also fixed a number of typos in the process.
 2020-10-13 19:49:08 +01:00
dark-samus
bb8c62ad5e Really fix shtab issue. For good. Yes, I'm sure. Please don't ask again.... 2020-10-13 03:16:25 -04:00
dark-samus
6468819806 address final PR stuff 2020-10-12 22:54:27 -04:00
dark-samus
5af95eee3a fix some stuff 2020-10-12 22:28:19 -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
98df69cf80 Fixing master 2020-10-12 20:52:05 -04:00
Ethan Roseman
2323879ef1
Merge branch 'master' into Testing 2020-10-12 20:32:15 -04:00
Ethan Roseman
d971be57c9 Fixing shtab bug in assembler 2020-10-12 20:30:27 -04:00
Ethan Roseman
3aa854c0c5 splat update 2020-10-12 14:46:04 -04:00
Ethan Roseman
508df201dc Updating options format 2020-10-12 13:08:08 -04:00
Ethan Roseman
aa88847ff5 splat update 2020-10-10 14:51:39 -04:00
Ethan Roseman
e63aba8470 Fixing splat config 2020-10-08 15:11:17 -04:00
Ethan Roseman
011231df41 Many more functions decomped 2020-10-08 15:03:58 -04:00
Ethan Roseman
2f67a08a29 ASM round 2 + many decomped funcs 2020-10-06 15:16:17 -04:00
Ethan Roseman
926df66474 saving for later 2020-10-02 02:07:54 -04:00
sonicspiral
ab48495419 add comment for wsl --set-default <Distro> in bat file 2020-09-29 23:38:30 -07:00
sonicspiral
e28d7ac8b4 Merge branch 'master' of https://github.com/ethteck/papermario into tools-starter-windows-terminal 
# Conflicts:
#	README.md
 2020-09-29 22:07:32 -07:00
dark-samus
c79f950a04 big merg 2020-09-28 16:59:36 -04:00
JoshDuMan
4116524462 Fix build wholly 2020-09-28 01:05:09 -04:00
JoshDuMan
4c4ce1a4e0 Work on merge 2020-09-28 00:38:21 -04:00
JoshDuMan
84db54fce8 Merge in master 2020-09-28 00:00:10 -04:00
JoshDuMan
55dfeef1c8 Work on nuSched 2020-09-27 22:42:51 -04:00
Ethan Roseman
245f428066 splat update 2020-09-27 21:18:59 -04:00
Ethan Roseman
51c076bd8e symbols! 2020-09-27 21:13:56 -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
210e65c3bf More decomp + coverage fix 2020-09-25 21:51:54 -04:00
Ethan Roseman
8be527b2cf Splat update & one new code file 2020-09-23 23:38:08 -04:00
Ethan Roseman
e5de7baa7f a few changes 2020-09-23 23:16:13 -04:00
Ethan Roseman
196abe7db2 Addr file and macro fix 2020-09-22 18:54:01 -04:00
Ethan Roseman
11d7006656 Types in INCLUDE_ASM_T macro 2020-09-22 17:36:30 -04:00
Ethan Roseman
a9e5d79531 more 2020-09-21 23:10:53 -04:00
JoshDuMan
7e632e3ceb Decompile nuContRmbMgr 2020-09-21 00:37:52 -04:00
dark-samus
9627b687a8 add new assembler binary + binutils patch 2020-09-18 17:45:59 -04:00
JoshDuMan
5572f155bc Fix build 2020-09-18 17:37:08 -04:00
Ethan Roseman
4077c48a62 Update n64splat 2020-09-10 19:01:37 -04:00
sonicspiral
39d8a13f73 convert starter windows terminal to bat 
* note the requirement to run wsl --set-default <Distro> first
 2020-09-05 12:10:35 -07:00
sonicspiral
c56bd0cdcf add starter windows terminal 2020-09-05 11:39:03 -07:00
Ethan Roseman
7633f31d87 Update splat 2020-08-26 19:14:44 -04:00
Ethan Roseman
002b75f461 Data support 2020-08-21 23:32:59 -04:00
Ethan Roseman
dd080cbd38 Further LD improvements 2020-08-20 16:33:21 -04:00
Ethan Roseman
8c5aa0d027 Testing condensed ld 2020-08-20 14:22:11 -04:00
Ethan Roseman
51eca76be3 Update splat 2020-08-20 02:25:11 -04:00
Ethan Roseman
a7d8f6dd96 N64Splat added ;) 2020-08-20 01:42:31 -04:00
Ethan Roseman
5a000c5338 Fix terrible float issue (yay) 2020-08-18 01:12:41 -04:00
Alex Bates
46c2016bf1
rename enums 2020-08-16 05:24:20 +01:00
Alex Bates
a25b53a8a1 name and match resolve_npc 2020-08-15 05:25:36 +01:00
Ethan Roseman
81e3edffb4
Merge pull request #13 from pixel-stuck/master 
Fix assembler bug + misc other changes
 2020-08-14 23:08:36 -04:00
dark-samus
62827e8823 actually fix assembler bug, make sure it compiles. 2020-08-14 22:24:08 -04:00
dark-samus
50f8ca824b fix bug in assembler 2020-08-14 21:54:11 -04:00
Alex Bates
4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00
Alex Bates
5e6173f25b generate common_structs.h from star rod database 2020-08-14 21:10:34 +01:00
Alex Bates
e06fbbab51 match CountFortressKeys 
Also fixed typo in the function name ('Fortess').
 2020-08-14 03:22:41 +01:00
Ethan Roseman
7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Ethan Roseman
0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00