Commit Graph

25 Commits

Author SHA1 Message Date
dark-samus
0b5afedb5e merge master 2.0: electric boogaloo 2020-08-22 03:45:12 -04:00
dark-samus
f02ad05c4f merge master 2020-08-22 03:43:30 -04:00
Ethan Roseman
002b75f461 Data support 2020-08-21 23:32:59 -04:00
Josh
7e4d7f9085
Merge branch 'master' into master 2020-08-19 19:26:09 -07:00
Jdog
bc8080788a Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed 2020-08-19 15:48:15 -07:00
Alex Bates
728c879b9f
resolve clang-tidy errors 2020-08-19 01:35:11 +01:00
Alex Bates
b5256e31ee
add astyle, update clang-tidy config 2020-08-19 01:11:25 +01:00
Alex Bates
f762aa1139
add misc global vars from SR database 2020-08-17 13:40:21 +01:00
Alex Bates
95e6bddaf8
use StaticX for static table entry structs
Change prompted by Clover.
2020-08-16 15:19:33 +01:00
Alex Bates
e39d02e55e
rename Script to ScriptInstance 2020-08-16 06:55:30 +01:00
Alex Bates
e40b05d9c5
rename types (#20) 2020-08-16 04:19:00 +01:00
Jdog
7beaf4c461 Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related) 2020-08-15 14:51:44 -07:00
Josh
541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Jdog
760e1351fb Working more on script-related functions 2020-08-14 15:05:05 -07: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
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
9eb74da229 use char[] type for string externs 2020-08-14 05:25:13 +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
0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00