pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 20:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,876 Commits 4 Branches 0 Tags 206 MiB
f02743e1cb
Commit Graph

569 Commits

Author SHA1 Message Date
dark-samus
e2c8066302 finish data migration for code_104730 2021-01-16 15:08:08 -05:00
Ethan Roseman
a2f7a80eaf
Merge pull request #160 from pmret/arm 
Arm support (raspberry pi)
 2021-01-17 02:27:25 +09:00
alex
7fcffc1b38
Merge pull request #154 from pmret/ninja 
Use Ninja build system
 2021-01-16 17:19:09 +00:00
dark-samus
a4b5d8f200 some stuff 2021-01-16 01:34:36 -05:00
Ethan Roseman
dad8c48dfb arm support (raspberry pi) 2021-01-16 06:34:21 +00:00
Ethan Roseman
919dd605b2 Merge branch 'master' into entity_funcs 2021-01-16 12:49:56 +09:00
Ethan Roseman
2e774ac081 add permuter settings 2021-01-16 11:15:17 +09:00
dark-samus
2cbb8e5712 OK 2021-01-15 12:14:26 -05:00
dark-samus
bfebc525a5 merge master 2021-01-15 12:06:43 -05:00
dark-samus
816279c3d5 more stuff 2021-01-15 12:05:05 -05:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Alex Bates
2eae138610 ninjatō 2021-01-15 16:28:05 +00:00
Alex Bates
2275b4d3ec ninja cc tools/n64crc 2021-01-15 11:36:53 +00:00
Ethan Roseman
a890c93736 Merge branch 'master' into ninja 2021-01-15 16:17:03 +09:00
Ethan Roseman
20bea3dfe9 more 2021-01-15 13:10:40 +09:00
Ethan Roseman
6fba19fd96
Merge pull request #155 from Zelllll/testfile 
code_7345A0 OK and other misc functions
 2021-01-14 22:22:29 -05:00
Ethan Roseman
8a0c80413c Merge branch 'master' into gfx 2021-01-15 10:43:15 +09:00
Ethan Roseman
978c891054 removing splat 2021-01-15 10:43:09 +09:00
Ethan Roseman
5e12a46dd4 git subrepo clone (merge) https://github.com/ethteck/n64splat.git tools/n64splat 
subrepo:
  subdir:   "tools/n64splat"
  merged:   "7574db712"
upstream:
  origin:   "https://github.com/ethteck/n64splat.git"
  branch:   "master"
  commit:   "7574db712"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-01-15 10:26:06 +09:00
Ethan Roseman
86760369a5 removed submodules 2021-01-15 10:24:28 +09:00
Ethan Roseman
642f99bf32 WIP (broken) 2021-01-15 10:20:04 +09:00
Zelllll
f670e0e7fa code_7345A0 OK 2021-01-14 18:49:15 -06:00
Alex Bates
39f48335ff ninja assets, clean up configure.py ux 2021-01-14 23:55:05 +00:00
Alex Bates
d2eb186682 ninja messages + improved msg generated headers 2021-01-14 19:17:14 +00:00
Alex Bates
5ac16f969a ninja tools/Yay0compress 2021-01-14 12:49:50 +00:00
Alex Bates
c2c49b191e ninja include/sprite/**/*.h 2021-01-14 11:57:39 +00:00
Alex Bates
84b6ae8152 move ninja build.py to ./configure.py & auto-splat 2021-01-14 11:22:38 +00:00
Alex Bates
e70b3b814f ninja image flags 2021-01-14 11:13:33 +00:00
Alex Bates
4bba67aed2 ninja img/*.png 2021-01-14 10:59:55 +00:00
Alex Bates
c6d305b07c ninja asm 2021-01-14 10:49:14 +00:00
Alex Bates
1e6af39797 ninja *.bin 2021-01-14 10:25:55 +00:00
Ethan Roseman
734f177307 new file splits, one decomp or two 2021-01-14 17:06:56 +09:00
Alex Bates
c6fe6eee00 fix .s dependency generation 2021-01-14 04:16:42 +00:00
Alex Bates
63aa87446b ninja src/**/*.c 2021-01-14 03:56:02 +00:00
Ethan Roseman
70135c6bb2 some gfx funcs 2021-01-13 19:48:54 +09:00
dark-samus
17add9b58d merge master 2021-01-13 00:18:43 -05:00
dark-samus
5b4f8d90d1 merge master 2021-01-12 15:11:10 -05:00
dark-samus
dcbb258e45 misc work 2021-01-12 14:45:50 -05:00
Ethan Roseman
5a95cec4c0 OK 2021-01-13 03:07:28 +09:00
Ethan Roseman
84f05d2378 not working - jtbl wip 2021-01-13 00:42:27 +09:00
Ethan Roseman
77db21cb41 more data disasm 2021-01-12 14:05:01 +09:00
Ethan Roseman
29a07b4fd3 some data 2021-01-12 13:42:16 +09:00
Ethan Roseman
b5a8262503 splat update with double support 2021-01-11 21:38:33 +09:00
Ethan Roseman
00959ac19c config comments 2021-01-11 21:23:35 +09:00
Ethan Roseman
5de12f375a sfx name to comment 2021-01-11 21:10:43 +09:00
Ethan Roseman
c7a383997f Remaining segments 2021-01-11 18:34:10 +09:00
Ethan Roseman
3bf7788bc4 some new 🐟 2021-01-11 15:58:17 +09:00
Ethan Roseman
8a29eaabcc split everything up 2021-01-11 15:03:45 +09:00
Ethan Roseman
74350fd145 more splitting of stuff 2021-01-11 13:10:31 +09:00
Ethan Roseman
42768fc40b gfx syms (thanks 🍀) 2021-01-11 12:52:08 +09:00
Ethan Roseman
f9a786bf69 remove temp file 2021-01-11 02:59:50 +09:00
Ethan Roseman
f069c32967 manual splitting of a remaining blob 2021-01-11 02:59:12 +09:00
Ethan Roseman
724b7be71e a snibblet 2021-01-11 02:32:53 +09:00
Ethan Roseman
bae802854e a bunch more 2021-01-11 01:38:51 +09:00
Ethan Roseman
761eef6130 update codescan 2021-01-11 00:30:41 +09:00
Ethan Roseman
6a18fb8862 ⛰️ 2021-01-10 23:52:28 +09:00
Ethan Roseman
39c2c200e3 🐱 2021-01-10 23:36:33 +09:00
Ethan Roseman
b1f531d062 mini 2021-01-10 23:04:46 +09:00
Ethan Roseman
a2625b01b7 🐟 🐟 🐟 🐟 2021-01-10 22:41:06 +09:00
Ethan Roseman
eccd9cf39a offset update 2021-01-10 21:11:39 +09:00
Ethan Roseman
d5018e6a9f 🐟 🐟 🐟 2021-01-10 21:00:17 +09:00
Ethan Roseman
a9a3ae4682 another 🐟 2021-01-10 19:43:17 +09:00
Ethan Roseman
eadbf1bc01 more 🐟 (2) 2021-01-10 19:05:49 +09:00
Ethan Roseman
8be70ed254 splat update 2021-01-10 17:56:43 +09:00
Ethan Roseman
0fb3ecb9ec more 🐟 2021-01-10 17:27:00 +09:00
Ethan Roseman
7d2f052403 added code_316C00 2021-01-10 13:06:27 +09:00
Ethan Roseman
7e338567d7 fixed bug 2021-01-10 02:34:40 +09:00
Ethan Roseman
8cd9185b27 oops 2021-01-10 01:45:58 +09:00
Ethan Roseman
17a02b4ceb update splat 2021-01-10 01:39:59 +09:00
Ethan Roseman
e59c265cfc fixing rodata 2021-01-09 21:21:46 +09:00
Ethan Roseman
b8c5795951 many fixes 2021-01-09 18:49:15 +09:00
Ethan Roseman
765e59e020 blah 2021-01-09 16:55:31 +09:00
dark-samus
6f304364c6 merge master 2021-01-07 14:59:49 -05:00
Ethan Roseman
00df60c66b update splat 2021-01-08 00:20:14 +09:00
Ethan Roseman
6148a26ab4 Effect C files 2021-01-07 19:43:17 +09:00
Ethan Roseman
dfdfcc112a Splat update 2021-01-07 17:14:08 +09:00
Ethan Roseman
4cff1ee468 File split and some decomp 2021-01-06 22:57:16 +09:00
Ethan Roseman
bdbe0c5e65 a few 2021-01-03 18:34:04 +09:00
Ethan Roseman
a0d1324d2c UnkNpcAIFunc12 2021-01-02 16:51:14 +09:00
Ethan Roseman
4e029982ac Cleanup 2021-01-01 10:49:46 +09:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
a030622f29 improving assist 2020-12-30 20:31:04 +09:00
Ethan Roseman
926737d3cb a lot more 2020-12-30 20:08:27 +09:00
Ethan Roseman
1ca57773cf UnkBattleFunc1 2020-12-30 15:53:40 +09:00
Alex Bates
9855c6202d dsl: change flag set operator to & 2020-12-29 11:37:19 +00:00
Alex Bates
92ccbd1cf6 Merge branch 'battles' of github.com:nanaian/papermario into battles 2020-12-29 02:17:52 +00:00
Alex Bates
724a15c99d i did it 2020-12-29 02:17:34 +00:00
Ethan Roseman
c42debe758 M -> N, StartRumbleWithParams dup 2020-12-28 16:09:39 +09:00
Ethan Roseman
b70f74279a Battle funcs 2020-12-28 14:34:30 +09:00
Ethan Roseman
8e96d92a59 Merge branch 'master' into misc-decomp 2020-12-28 11:45:34 +09:00
Ethan Roseman
3cb8153d9d Merge branch 'audio-ext' into misc-decomp 2020-12-28 11:45:29 +09:00
Ethan Roseman
60b8b69f1a
Merge branch 'master' into battles 2020-12-27 20:46:17 -05:00
Alex Bates
efee13f686 add data disassembly tool 2020-12-27 17:11:33 +00:00
Ethan Roseman
a7e0a2fb87
Merge branch 'master' into battles 2020-12-27 09:48:26 -05:00
Ethan Roseman
4df725f451 Fix many asm warnings 2020-12-27 22:06:28 +09:00
Ethan Roseman
1f868bbaa4 All functions in the project are not static now 2020-12-27 21:30:24 +09:00
Alex Bates
67d0f32c8f match battle/area_kmr_part_1/battles.c 2020-12-27 12:11:14 +00:00
alex
40ca6c9563
Merge pull request #138 from nanaian/worldpartners 
match world partner table
 2020-12-26 12:42:49 +00:00
Alex Bates
2793aecebe Merge branch 'master' into battles 2020-12-26 12:02:44 +00:00
Alex Bates
10e54d9070 match 2020-12-26 12:02:19 +00:00
Alex Bates
94ca7f82c0 update script syntax 2020-12-24 11:15:05 +00:00
Alex Bates
e3f570fd1a add syntax to script dsl 2020-12-23 15:12:02 +00:00
Alex Bates
17437b94bb twink data 2020-12-23 12:40:20 +00:00
Alex Bates
70cac1a479 goombaria data 2020-12-23 12:25:43 +00:00
Alex Bates
fd7fc4c44a goompa data 2020-12-23 12:21:17 +00:00
Alex Bates
7aca81daad goombario data 2020-12-23 12:07:47 +00:00
Alex Bates
f4dd1420b6 move partner source files 2020-12-23 11:18:47 +00:00
Alex Bates
dc57215491 fix style=choice arg order 2020-12-23 11:09:49 +00:00
Ethan Roseman
584ec0c615 New C file, cleanup 2020-12-23 16:08:16 +09:00
Alex Bates
64dbc07d56 match world partner table 2020-12-22 15:53:16 +00:00
Ethan Roseman
1c52052c12 Merge branch 'master' into audio 2020-12-22 18:13:24 +09:00
Alex Bates
d326dba298 fix typo (paradA_kolorados) 2020-12-22 00:16:16 +00:00
Alex Bates
36233280d6 add sprite editor gui 2020-12-22 00:09:55 +00:00
Alex Bates
09e7228e1d fix sprite component xyz signedness 2020-12-21 23:47:17 +00:00
Ethan Roseman
052f201f6e more progz 2020-12-18 11:29:35 +09:00
Ethan Roseman
2e3fe28750 data disasm / migration for some files 2020-12-15 22:27:58 +09:00
Ethan Roseman
a3add6c1a9 uhhhh here we go 2020-12-12 21:29:07 +09:00
Ethan Roseman
fb48afaf4b 5 more 2020-12-12 17:12:45 +09:00
Ethan Roseman
02654be743 some progrs 2020-12-12 15:56:00 +09:00
Ethan Roseman
0286743ae5 asm update 2020-12-10 16:11:43 +09:00
Ethan Roseman
55a37ba673 nuAuDmaNew 2020-12-10 15:39:32 +09:00
Ethan Roseman
f9d084937f asm update 2020-12-10 08:58:58 +09:00
Ethan Roseman
8243e81b2e Audio header 2020-12-10 07:53:35 +09:00
Ethan Roseman
bec22c22e4 consolidate data 2020-12-09 15:49:49 +09:00
Ethan Roseman
a9c6fd694e 10400+ data 2020-12-09 15:28:31 +09:00
Ethan Roseman
dcdab9710c 1 more 2020-12-09 13:24:00 +09:00
Ethan Roseman
bba92dd7d2 condensing some structs! :) 2020-12-08 19:50:14 +09:00
Ethan Roseman
6201aca296 data disasm 2020-12-07 08:50:02 +09:00
Ethan Roseman
3762983408 Merge branch 'mac-support' into audio 2020-12-05 19:57:10 -05:00
Ethan Roseman
56c8d5adb9 removing dumb 2020-12-05 17:29:42 -05:00
Ethan Roseman
41898d2c0b MacOS test 2020-12-05 17:17:55 -05:00
Alex Bates
e56bcae805 bump splat 2020-12-03 21:07:44 +00:00
Alex Bates
c9e556a00f change 'make clean' behaviour 2020-12-03 21:06:15 +00:00
Alex Bates
cfd0e92cff tidy up splat 2020-12-02 22:26:08 +00:00
Alex Bates
dfcb98ec0b bump splat 2020-12-02 18:13:24 +00:00
Alex Bates
dd9df5438d use area_xxx names for battle section dirs 2020-12-02 15:37:24 +00:00
Alex Bates
cdeb8b5683 decode battle data (wip rodata) 2020-12-02 15:13:17 +00:00
Ethan Roseman
9e5a9710be fix splat regression, cleanup 2020-12-02 01:23:13 -05:00
Ethan Roseman
5062328c73 new file 2020-12-01 19:13:24 -05:00
Ethan Roseman
0da876ff13 Statistics 2020-11-30 00:55:28 -05:00
Ethan Roseman
0a2a1f1662 removing unnecessary syms 2020-11-29 23:52:12 -05:00
Ethan Roseman
1911d1ba99 Faster Yay0 decompression 2020-11-29 23:11:14 -05:00
Ethan Roseman
174c920323 fee30 data 2020-11-29 14:57:23 -05:00
Ethan Roseman
b7e649c1e1 improve data disasm, si.c rodata 2020-11-29 14:37:53 -05:00
Ethan Roseman
0a38d165d2 offset goodness 2020-11-29 13:32:02 -05:00
Ethan Roseman
f344e6ef95 Merge branch 'cornucopia' into symbols-galore 2020-11-29 12:05:24 -05:00
Ethan Roseman
535a1cbc47 undefined_funcs_auto 2020-11-29 12:00:52 -05:00
Ethan Roseman
80856cef14 map funcs rename soln 2020-11-29 11:52:16 -05:00
Ethan Roseman
df6c0891bd working 2020-11-29 02:51:42 -05:00
Ethan Roseman
4b8a276c35 more syms 2020-11-29 02:36:00 -05:00
Ethan Roseman
1e2436bebc update 2020-11-29 02:15:56 -05:00
Ethan Roseman
5b8cc80e2a More symbol insns 2020-11-29 01:42:43 -05:00
Ethan Roseman
b4856126b8 more debug 2020-11-29 00:56:43 -05:00
Ethan Roseman
3766d727ae debug symbol info 2020-11-29 00:49:32 -05:00
Ethan Roseman
c5dec63567 data disassembly! 2020-11-29 00:22:33 -05:00
Ethan Roseman
71dde79186 asm update 2020-11-27 01:39:15 -05:00
Ethan Roseman
def7b12a2d e0b30 2020-11-27 01:14:28 -05:00
Ethan Roseman
1e02c566ad a few more 2020-11-26 16:19:34 -05:00
Ethan Roseman
8271cb5636 3251D0 OK 2020-11-23 13:48:34 -05:00
Ethan Roseman
4400966849 Merge branch 'master' into cornucopia 2020-11-22 10:07:20 -05:00
Alex Bates
bf9a32751a merge master 2020-11-22 10:59:30 +00:00
Ethan Roseman
36e421710d UnkNpcAIFunc5 2020-11-21 23:32:54 -05:00
Ethan Roseman
a82d6893ed UnkNpcAIFunc4 2020-11-21 23:25:13 -05:00
dark-samus
63429d6ad2 split code_106ef0 and match most funcs 2020-11-21 04:28:02 -05:00
dark-samus
48487dbab0 merge master 2020-11-21 02:45:11 -05:00
Ethan Roseman
fb85b1d269 another 2020-11-20 00:16:08 -05:00
Ethan Roseman
4b8af37c35 UnkNpcAIFunc1 2020-11-19 23:08:05 -05:00
Alex Bates
744b12ebe6
split 0x1E00000 extra sprites bin 2020-11-19 09:54:54 +00:00
Alex Bates
b5f0c2588a
merge master 2020-11-19 09:31:10 +00:00
dark-samus
87ec701223 Merge branch 'master' of https://github.com/ethteck/papermario into entity_funcs 2020-11-19 03:32:34 -05:00
dark-samus
141626664f decompile more entity funcs, split new file 2020-11-19 03:31:22 -05:00
Ethan Roseman
e682166792 Merge remote-tracking branch 'origin/master' into cornucopia 2020-11-18 14:10:14 -05:00
Alex Bates
3c7ebe536d
fix fallback lambdas 2020-11-18 11:16:23 +00:00
Alex Bates
a35b085c17
fix credits font 2020-11-18 10:56:56 +00:00
Alex Bates
a7f5ed8a36
remove vmprof stuff 2020-11-18 10:45:01 +00:00
Alex Bates
ec96845074
SPEED 2020-11-18 10:37:02 +00:00
Alex Bates
f558d0faa6
sonic 2020-11-18 10:25:55 +00:00
dark-samus
d68a3e84a6 merge master 2020-11-18 00:35:50 -05:00
Ethan Roseman
f1279977bd various decomp, cleaning splat.yaml 2020-11-18 00:20:28 -05:00
Ethan Roseman
cb23fa9a5a Splat update 2020-11-17 17:01:31 -05:00
Ethan Roseman
f616532137 osSiDeviceBusy 2020-11-13 01:36:13 -05:00
Ethan Roseman
f6f56a8a5f libultra organization 2020-11-13 01:17:53 -05:00
Ethan Roseman
89132f5cc1 partner c file 2020-11-12 00:22:50 -05:00
Ethan Roseman
e723afa31c
Merge pull request #122 from ethteck/splat-extensions 
n64splat extensions
 2020-11-11 16:36:04 -05:00
Ethan Roseman
76134074ab n64splat extensions 2020-11-11 16:21:25 -05:00
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
Alex Bates
87cc5ed999 match npc sprites 2020-11-11 13:52:04 +00:00
Ethan Roseman
698f1feee9 :( 2020-11-10 15:54:36 -05:00
Ethan Roseman
43f11633a3 more syms, file split 2020-11-10 10:11:43 -05:00
Ethan Roseman
b78de19ffb random progress 2020-11-09 22:48:47 -05:00
Ethan Roseman
e1626030ff some libultra organization 2020-11-09 21:51:33 -05:00
Ethan Roseman
47f464a17e Merge branch 'master' into cornucopia 2020-11-08 17:00:39 -05:00
Ethan Roseman
0628fac4a2 fix offset 2020-11-08 16:11:02 -05:00
Ethan Roseman
f55cace9a3 more EF070 2020-11-08 16:05:39 -05:00
Ethan Roseman
cdd2d6bd15 ASM update and types 2020-11-08 15:40:26 -05:00
Alex Bates
70032a1123 rename si funcs 2020-11-08 19:20:09 +00:00
Alex Bates
c13ca4392b use ScriptOpcode enum instead of macros 2020-11-08 19:07:10 +00:00
Ethan Roseman
9b26bd68ad more syms 2020-11-08 14:02:08 -05:00
Ethan Roseman
680cead360 gAnimatedMeshesPtr 2020-11-08 13:39:23 -05:00
Alex Bates
c794134d08 allow user-controlled label allocation 
Required to match some scripts
 2020-11-08 15:45:52 +00:00