Commit Graph

1867 Commits

Author SHA1 Message Date
Ethan Roseman
929f0c2515 Merge branch 'master' into tool-work 2021-02-11 01:25:06 +09:00
Ethan Roseman
3bcffcafb7
Merge pull request #176 from nanaian/werror
Partner-related things
2021-02-10 10:49:02 -05:00
Alex Bates
c0b150b782 D_800F7B70 2021-02-10 15:31:22 +00:00
Alex Bates
b0f0aaeda8 more undefined syms 2021-02-10 15:30:33 +00:00
Alex Bates
e449d4d448 undefined syms 2021-02-10 15:26:26 +00:00
Alex Bates
e07dcb4da6 Merge branch 'master' of github.com:pmret/papermario into werror 2021-02-10 15:05:49 +00:00
Ethan Roseman
b1e0e80da2 Merge branch 'master' into tool-work 2021-02-11 00:05:22 +09:00
Ethan Roseman
41d5fd1610 Updates 2021-02-11 00:04:58 +09:00
Alex Bates
b398df1a48 put code_7bb60 back 2021-02-10 15:02:46 +00:00
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
583b109ea7 Progress on tools 2021-02-10 02:45:46 +09:00
Alex Bates
7a1ce92e55 use extern in headers 2021-02-09 17:16:18 +00:00
Alex Bates
6a62ea9a7b code_838b0_len_5900 -> world/partners 2021-02-09 17:16:12 +00:00
Alex Bates
62e04bccc4 clean up wPartners 2021-02-09 16:49:45 +00:00
Alex Bates
0075864560 remove ld addrs from undefined_syms 2021-02-09 16:46:16 +00:00
Alex Bates
b53e85cc16 move code_90FE0 to c files, new splits 2021-02-09 16:32:35 +00:00
Alex Bates
3ff2542b67 steal diff.py
Stolen from https://github.com/zeldaret/oot/blob/master/first_diff.py
2021-02-09 16:17:15 +00:00
Alex Bates
7d34a06136 match load_partner_npc 2021-02-09 15:03:21 +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
78c2615e58 match create_partner_npc 2021-02-09 13:07:46 +00:00
Alex Bates
8084c67967 Bandit_DropCoin.inc.c pointers 2021-02-09 11:59:42 +00:00
Alex Bates
d46e65757d fix Matrix4f-related warnings 2021-02-09 11:07:05 +00: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