Commit Graph

77 Commits

Author SHA1 Message Date
Ethan Roseman
934bd5a415
Merge pull request #18 from nanaian/f8f60
split and match most functions at f8f60
2020-08-15 22:37:35 -04:00
Alex Bates
1b6d31e6ee
Merge #21 into f8f60 2020-08-16 02:51:54 +01:00
Jdog
7544d4686e Add extra info to comment about file splitting issue 2020-08-15 18:51:51 -07:00
Jdog
01ecc1dd24 Added proper return types to a few script functions. Use ptrReadPos++ in places where it's not stricly necessary, but good practice. 2020-08-15 15:26:14 -07:00
Jdog
7beaf4c461 Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related) 2020-08-15 14:51:44 -07:00
Jdog
98e5db0630 Match EndSpeech, ContinueSpeech, SpeakToNpc, SetMessageImages, func_802D0C94, SetMessageString. WIP SetMessageValue (issue with extra NOP) 2020-08-15 13:54:06 -07:00
Jdog
23de219c07 Match SpeakToPlayer, remove uneccessary comment, add WIP SetNpcSpeed 2020-08-15 13:11:31 -07:00
Alex Bates
66d6883188 update get_variable, get_npc signatures 2020-08-15 19:49:26 +01:00
Alex Bates
3c8f57089b remove redundancy comments 2020-08-15 19:03:29 +01:00
Alex Bates
2bd2a1c97c fix float constant 2020-08-15 19:03:29 +01:00
Jdog
7d20b29129 Match GetNpcPointer 2020-08-15 10:59:48 -07: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
5f588bca92 match EnableStatusMenu, ShowStatusMenu 2020-08-15 13:00:51 +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
Josh
541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Alex Bates
dd80b5a957 match RandInt 2020-08-15 04:25:48 +01:00
Alex Bates
97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Alex Bates
2a169dc34a remove redundant casts 2020-08-15 04:12:30 +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
Jdog
9496d860e4 Dumb mistake 2020-08-14 19:55:54 -07:00
Ethan Roseman
9a518db863 Fix hard-coded loop counter 2020-08-14 22:55:19 -04:00
Ethan Roseman
8b703053de Add TODO 2020-08-14 22:51:23 -04:00
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