falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
530 Commits 7 Branches 0 Tags 278 MiB
Commit Graph

200 Commits

Author SHA1 Message Date
Jdog 58b2a01a58 Remove WIP function 2020-08-14 19:51:02 -07:00
Ethan Roseman a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00
Jdog d1898f1903 Tweaks 2020-08-14 19:50:21 -07:00
dark-samus 62827e8823 actually fix assembler bug, make sure it compiles. 2020-08-14 22:24:08 -04:00
dark-samus 50f8ca824b fix bug in assembler 2020-08-14 21:54:11 -04:00
Alex Bates dae676c8af match UpdateLerp 2020-08-15 01:49:33 +01:00
Alex Bates 0d8d3e50a9 clean up MakeLerp 2020-08-15 01:17:20 +01:00
Jdog 1a4f01fe7b Fixing some issues and including removal of .s files 2020-08-14 16:31:50 -07:00
Alex Bates eb3ef759d7 Merge remote-tracking branch 'origin/master' into sr-structs 2020-08-14 23:59:42 +01:00
Alex Bates a2ab091516 Merge remote-tracking branch 'origin/sr-structs-ethan' into sr-structs 2020-08-14 23:55:03 +01:00
Alex Bates 4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00
Alex Bates 6c59c2fca7 swap bg_header raster/palette fields 2020-08-14 23:53:01 +01:00
Jdog c6058a8227 Fix so everything matches 2020-08-14 15:11:48 -07:00
Jdog 760e1351fb Working more on script-related functions 2020-08-14 15:05:05 -07:00
Ethan Roseman 6e44a205e9 OK 2020-08-14 17:53:45 -04:00
Alex Bates 5e6173f25b generate common_structs.h from star rod database 2020-08-14 21:10:34 +01:00
Ethan Roseman 6ad4581788 fix 2020-08-14 11:24:31 -04:00
Ethan Roseman 32a69b688a fix 2020-08-14 11:24:05 -04:00
Ethan Roseman 56ef80de67 Merge remote-tracking branch 'origin/master' into si 2020-08-14 11:23:15 -04:00
Ethan Roseman 7e0880dfdd Work on script interpreter 2020-08-14 11:18:05 -04:00
Ethan Roseman 1620b367ee
Merge pull request #6 from JoshW-7/master 
Added gCurrentScriptList and some more matching funcs
 2020-08-14 11:09:37 -04:00
Jdog 27407e07f8 Remove WIP function 2020-08-14 08:01:23 -07:00
Ethan Roseman 4dbaf81ed2
Merge pull request #7 from nanaian/load_map_bg 
match load_map_bg
 2020-08-14 10:58:16 -04:00
Jdog c179e51a88 Change to use ARRAY_COUNT for script list stuff 2020-08-14 07:50:44 -07:00
Jdog 73e1eff76e more refinements on script list stuff 2020-08-14 07:25:33 -07:00
Alex Bates 652d2ada46 match game_status 2020-08-14 12:47:54 +01:00
Jdog a2f9747112 Some tidying and more functions 2020-08-13 22:22:16 -07:00
Alex Bates 9eb74da229 use `char[]` type for string externs 2020-08-14 05:25:13 +01:00
dark-samus 84ecb71d07 add fairly close to matching is_ability_active commented 2020-08-14 00:20:11 -04:00
Alex Bates d041f520ab explicitly check for NULL 2020-08-14 05:15:00 +01:00
Alex Bates 78d23805e0 wip: update game_status struct 
Non-matching right now, I probably made an alignment/sizing error somewhere - proofreading would be appreciated.
 2020-08-14 05:08:55 +01:00
Ethan Roseman afc0415a2c
Merge pull request #5 from nanaian/items 
match FindItem, RemoveItem, CountFortressKeys, RemoveFortressKeys
 2020-08-13 23:28:29 -04:00
Alex Bates 86c2917cc0 match load_map_bg 
Also added three new symbols to `undefined_syms.h`. Two of these are almost certainly string literals in `load_map_bg`, but we don't have rodata capability yet so they have to be declared in a different way.
 2020-08-14 04:25:16 +01:00
Jdog 6aa628f3ac Added gCurrentScriptList and some more matching funcs 2020-08-13 19:53:38 -07:00
Alex Bates 29db02ea7d match RemoveFortressKeys 2020-08-14 03:24:21 +01:00
Alex Bates e06fbbab51 match CountFortressKeys 
Also fixed typo in the function name ('Fortess').
 2020-08-14 03:22:41 +01:00
Alex Bates f813b9ba42 add missing initialCall params 2020-08-14 03:15:33 +01:00
Alex Bates 55c38e4343 fix RemoveItem ADDU operand order 
...with evil pointer math
 2020-08-14 03:07:24 +01:00
Alex Bates 707d25f656 match RemoveItem, almost 
The generated addu instruction on the line marked with FIXME has its operands in a different order.
 2020-08-14 02:55:06 +01:00
Alex Bates 31cabbeeff match FindItem 2020-08-14 02:43:04 +01:00
Ethan Roseman 7f83b2c881
Merge pull request #4 from nanaian/battle_heap_create 
match battle_heap_create
 2020-08-13 21:23:08 -04:00
Alex Bates dfa7b096c5 match battle_heap_create 
Just flipped the condition.
 2020-08-14 01:38:16 +01:00
Jdog ef4f2e34ec blorp 2020-08-13 17:31:27 -07:00
Jdog dea08446d3 random stuff 2020-08-13 17:29:25 -07:00
Jdog 09f13acf95 Tweaks 2020-08-13 11:37:53 -07:00
Jdog ff2be1cbef Fixed some warnings 2020-08-12 22:12:32 -07:00
Jdog 56391da10c Merge remote-tracking branch 'upstream/master' 2020-08-12 22:07:53 -07:00
Ethan Roseman 7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Jdog 9b60b24cb7 removed uneccessary global vars 2020-08-12 21:10:41 -07:00
Ethan Roseman 0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00