Commit Graph

321 Commits

Author SHA1 Message Date
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 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
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