Commit Graph

245 Commits

Author SHA1 Message Date
Alex Bates 2bd2a1c97c fix float constant 2020-08-15 19:03:29 +01:00
Jdog 19b143fdd3 Match DeleteNpc 2020-08-15 09:57:33 -07:00
Alex Bates 25025e4c4d style: add newline at eof 2020-08-15 17:37:11 +01:00
Alex Bates 946680f312 match most functions in f8f60 2020-08-15 15:32:48 +01:00
Alex Bates cbc5f2fe40 match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D 2020-08-15 13:00:13 +01:00
Alex Bates b6f7087c82 match GetAngleToNPC and GetAngleToPlayer 2020-08-15 06:04:54 +01:00
Alex Bates 0f34468a77 match GetAngleBetweenNPCs 2020-08-15 05:55:20 +01:00
Alex Bates a25b53a8a1 name and match resolve_npc 2020-08-15 05:25:36 +01:00
Ethan Roseman 1d3c037d9a fixing header format 2020-08-14 23:54:29 -04:00
Josh 541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Alex Bates 97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Ethan Roseman 81e3edffb4
Merge pull request #13 from pixel-stuck/master
Fix assembler bug + misc other changes
2020-08-14 23:08:36 -04:00
Ethan Roseman a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04: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
Jdog 73a39e0747 undo change to script_context struct that was experimental 2020-08-14 16:33:44 -07: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 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 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
Ethan Roseman bc5fa0f5bf fix master 2020-08-14 11:05:28 -04: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
Alex Bates 9eb74da229 use `char[]` type for string externs 2020-08-14 05:25:13 +01:00
Alex Bates 357220cf92 fix some mis-sized unknown fields 2020-08-14 05:22:59 +01:00
dark-samus 84ecb71d07 add fairly close to matching is_ability_active commented 2020-08-14 00:20:11 -04: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
Alex Bates 15f3d1a565 use bg_header type for gBackgroundImage 2020-08-14 04:37:24 +01: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
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 430e6dff98 Adding macro.inc include to macro 2020-08-12 22:46:59 -04:00
Ethan Roseman 0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00