Commit Graph

1697 Commits

Author SHA1 Message Date
Ethan Roseman
79e8904cd6
Merge pull request #174 from nanaian/data
move some battle data to c
2021-02-10 09:54:35 -05:00
Ethan Roseman
af5415006e
Merge pull request #177 from nanaian/srmsg
Modify message syntax to match Star Rod
2021-02-10 09:51:26 -05:00
Alex Bates
1523b3ad36 convert floats 2021-02-10 14:45:55 +00:00
Alex Bates
8a64d45fc5 undefined syms 2021-02-10 14:42:36 +00:00
Alex Bates
addfc799f6 use tabs in msg files 2021-02-10 14:26:58 +00:00
Alex Bates
b2d0b2c6c8 MESSAGE_ID macro: 0x10 -> 16 2021-02-10 13:45:00 +00:00
Alex Bates
f28218a6f1 complain if [end] is missing 2021-02-10 13:44:43 +00:00
Alex Bates
676d6d9a16 require that msg files go in assets/msg/* 2021-02-10 02:36:46 +00:00
Alex Bates
87652e8abb add message naming to splat.yaml 2021-02-10 01:36:01 +00:00
Alex Bates
46d7a144e7 fix message headers 2021-02-10 00:53:14 +00:00
Alex Bates
d687f84d35 use star rod-style message syntax 2021-02-10 00:13:09 +00:00
Ethan Roseman
e8fd7efc5b
Merge pull request #175 from Alto1772/nuke-unincluded
Delete nonmatchings that aren't included in c files
2021-02-09 10:00:49 -05:00
Alto1772
0d67c4462c delete func_80246B2C.s from code_16F740 2021-02-09 22:32:31 +08:00
Alto1772
762e3b4b67 delete non included asm 2021-02-09 22:28:14 +08:00
Alto1772
2bb3634e82 deleted asm code referenced on nonexistent c file 2021-02-09 22:26:48 +08:00
Alto1772
06a19c619e delete non included asm (battle/area_kmr_part_1) 2021-02-09 22:25:37 +08:00
Alto1772
7aeb287f63 delete non included asm (os) 2021-02-09 22:24:48 +08:00
Alex Bates
297eac0fdd add all to symbol_addrs.txt 2021-02-09 10:39:22 +00:00
Alex Bates
7cb10dce7e Merge branch 'master' of github.com:pmret/papermario into data 2021-02-09 10:25:25 +00:00
Ethan Roseman
c4102d350a
Merge pull request #170 from nanaian/star-rod-0-4-0
Name many funcs to match upcoming Star Rod 0.4.0 release
2021-02-08 22:33:12 -05:00
Ethan Roseman
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
Alex Bates
7f4785cc98 match code_16c8e0, code_190B20 data 2021-02-09 02:09:57 +00:00
Ethan Roseman
a3d563e660
Merge pull request #173 from pmret/splat-update
Splat update
2021-02-08 20:48:34 -05:00
Ethan Roseman
8401f88fd5 undo comment 2021-02-09 10:43:04 +09:00
alex
1d45aae386
Merge branch 'master' into star-rod-0-4-0 2021-02-09 01:42:35 +00:00
Ethan Roseman
064963aca7
Merge pull request #169 from nanaian/data
clean up coconut
2021-02-08 20:40:07 -05:00
Alex Bates
9e9374109d rename coconutEntity 2021-02-08 20:07:01 +00:00
Alex Bates
f6b2e78ea6 rm func_8014989B8.s 2021-02-08 19:49:10 +00:00
Ethan Roseman
3190775358 oopz 2021-02-09 03:25:17 +09:00
Ethan Roseman
eb4ea01b3e cleanup 2021-02-09 03:20:27 +09:00
Ethan Roseman
bbac3d905b match nuContRmbMgr.c 2021-02-09 03:02:14 +09:00
Alex Bates
f8c4ba3003 place message headers in builddir 2021-02-08 16:38:13 +00:00
Alex Bates
bed88dce89 fix diff.py continuous rebuilding 2021-02-08 16:21:33 +00:00
Alex Bates
93828ea8b9 fix sprite deps 2021-02-08 16:17:11 +00:00
Ethan Roseman
398fa6c695 gfxRetrace_Callback 2021-02-09 00:53:44 +09:00
Ethan Roseman
4ae0a926a3 Cleanup 2021-02-08 23:31:00 +09:00
Ethan Roseman
59fa2033fc more splits 2021-02-08 22:58:51 +09:00
Ethan Roseman
676c7ac343 more splitting 2021-02-08 22:45:37 +09:00
Ethan Roseman
0f2f6705e5 file splits 2021-02-08 21:13:38 +09:00
Ethan Roseman
ce8f88b43a changing configure for splat update 2021-02-08 20:04:29 +09:00
Ethan Roseman
27d7bea8ee git subrepo pull tools/splat
subrepo:
  subdir:   "tools/splat"
  merged:   "e8f7675322"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e8f7675322"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-02-08 20:03:30 +09:00
Ethan Roseman
39ea4c7a86 git subrepo pull tools/splat
subrepo:
  subdir:   "tools/splat"
  merged:   "3a66565988"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "3a66565988"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-02-08 19:57:56 +09:00
Ethan Roseman
e578b7d90a Splat update with symbol fixes 2021-02-08 19:45:19 +09:00
Ethan Roseman
aae3b1a085 gitignore 2021-02-08 17:28:28 +09:00
Alex Bates
2e1d9cd240 fix build 2021-02-07 15:38:57 +00:00
Alex Bates
cea2a69c8d gitignore more star rod directories 2021-02-07 00:41:23 +00:00
Alex Bates
de8d909f57 Merge branch 'star-rod-0-4-0' of github.com:nanaian/papermario into star-rod-0-4-0 2021-02-06 22:27:34 +00:00
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
e9951c7daf extract configuration to build.cfg 2021-02-06 22:14:01 +00:00