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

567 Commits

Author SHA1 Message Date
Alex Bates
592ffd4e48 a 2021-02-06 22:26:35 +00:00
Alex Bates
1f8f92e276 Merge branch 'master' into star-rod-0-4-0 2021-02-06 22:25:26 +00:00
Alex Bates
191e027e6a fix build 2021-02-06 21:55:52 +00:00
root
90d7f0381d add goombario kooper and bombette splat info for palettes/anims 2021-02-06 21:50:00 +00:00
Alex Bates
ffe1f285a1 update splat 2021-02-06 19:05:57 +00:00
Alex Bates
67ee8c754d git subrepo pull --force tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "7e40c55d56"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7e40c55d56"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
 2021-02-06 18:45:20 +00:00
Alex Bates
11fd404d5b add funcs to symbol_addrs.txt 2021-02-06 15:37:43 +00:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00:00
Alex Bates
68e927503b aux.c -> lib.c 2021-02-06 13:02:16 +00:00
Alex Bates
3e2a5c20f9 dsl: add 'int ;' declarations 2021-02-06 05:20:19 +00:00
Ethan Roseman
5c5c0cc410 git subrepo pull (merge) tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "9304f9415"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "733546fea"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-02-06 13:05:39 +09:00
Alex Bates
ce7c13b5b1 assets_dir 2021-02-06 03:36:46 +00:00
Alex Bates
8b3db7109a generate image header 2021-02-05 22:11:18 +00:00
Alex Bates
45b3ed2a18 gBattleItemTable 2021-02-05 14:22:43 +00:00
Alex Bates
9b881b8309 match coconut.png 2021-02-05 13:49:50 +00:00
Alex Bates
f35cca8b0b build images 2021-02-05 10:02:53 +00:00
Alex Bates
c46c637c31 ci8 in code segments 2021-02-05 09:07:38 +00:00
Alex Bates
d72e0079e8 ok 2021-02-04 18:48:19 +00:00
Ethan Roseman
6b1367d212 welp 2021-02-05 02:29:21 +09:00
Ethan Roseman
e52cc15d4d Merge branch 'data' of https://github.com/nanaian/papermario into data 2021-02-05 01:16:57 +09:00
Ethan Roseman
0a8b4f3757 goods 2021-02-05 01:16:02 +09:00
Alex Bates
0c8c308133 func_802D3474 2021-02-04 15:41:12 +00:00
Alex Bates
1041c62a7a disasm_script.py: error if api func not in symbol_addrs.txt 2021-02-04 15:35:34 +00:00
Alex Bates
68fe856234 permuter 2021-02-04 13:54:08 +00:00
Ethan Roseman
51dbb6e5d7 improve coconut 2021-02-04 20:29:44 +09:00
Alex Bates
8a1ba58aac move coconut data to c 2021-02-03 20:04:37 +00:00
Ethan Roseman
8302565710 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "6898b0a98"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "6898b0a98"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-04 00:14:54 +09:00
Ethan Roseman
f8a344e713 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "b426daf02"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b426daf02"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-04 00:09:01 +09:00
Ethan Roseman
43f3a6fa5f Data improvement 2021-02-04 00:06:31 +09:00
Ethan Roseman
251cc995c5 symbol 2021-02-03 22:31:15 +09:00
Ethan Roseman
56cd871a00 fixing peach dash 2021-02-03 21:50:11 +09:00
Ethan Roseman
7cf7b16795 migrate some stuff to os 2021-02-03 21:35:12 +09:00
Ethan Roseman
e5e89e86cf Star spirit ability naming + disasm 2021-02-03 21:28:39 +09:00
Ethan Roseman
f7cef0ab6c Move naming + disasm 2021-02-03 20:55:35 +09:00
Ethan Roseman
9ba2da5977 Item naming + disasm 2021-02-03 20:35:19 +09:00
Ethan Roseman
a19de2273e Naming battle partner segments + disasm 2021-02-03 19:43:57 +09:00
Ethan Roseman
20a99f4037 OK 2021-02-03 15:40:16 +09:00
Ethan Roseman
1d75ab46ae symbol_addrs 2021-02-02 01:18:51 +09:00
Ethan Roseman
c400654907 updating tools 2021-01-25 00:45:29 +09:00
Ethan Roseman
195a99c796 git subrepo pull --force tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "e2b731ab1"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e2b731ab1"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:44:11 +09:00
Ethan Roseman
4201a08a28 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "42786d2a7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "42786d2a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:41:31 +09:00
Ethan Roseman
15de829b58 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "687885c4d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "687885c4d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:19:56 +09:00
Ethan Roseman
dc72859546 rename 2021-01-25 00:19:48 +09:00
Ethan Roseman
f274ebe21a extension updates for splat update 2021-01-24 23:45:43 +09:00
Ethan Roseman
b8ddf7761a Some data migration 2021-01-21 01:14:27 +09:00
Ethan Roseman
78411d2270 more decomp and 🍀 symbols 2021-01-21 00:45:03 +09:00
Ethan Roseman
e2e4c86b9c some rodata migration, decomp 2021-01-20 02:27:48 +09:00
dark-samus
af694484f7 Merge branch 'master' of https://github.com/pmret/papermario into entity_funcs 2021-01-16 15:12:49 -05:00
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