Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers

2020-01-26 12:23:08 -05:00
parent 4c12ad00d2 9a6c2c25d0
commit 9c934c9664
228 changed files with 440 additions and 717 deletions
--- a/graphics/door_anims/00/0.png
+++ b/graphics/door_anims/00/0.png
--- a/graphics/door_anims/00/1.png
+++ b/graphics/door_anims/00/1.png
--- a/graphics/door_anims/00/2.png
+++ b/graphics/door_anims/00/2.png
--- a/graphics/door_anims/01/0.png
+++ b/graphics/door_anims/01/0.png
--- a/graphics/door_anims/01/1.png
+++ b/graphics/door_anims/01/1.png
--- a/graphics/door_anims/01/2.png
+++ b/graphics/door_anims/01/2.png
--- a/graphics/door_anims/02/0.png
+++ b/graphics/door_anims/02/0.png
--- a/graphics/door_anims/02/1.png
+++ b/graphics/door_anims/02/1.png
--- a/graphics/door_anims/02/2.png
+++ b/graphics/door_anims/02/2.png
--- a/graphics/door_anims/03/0.png
+++ b/graphics/door_anims/03/0.png
--- a/graphics/door_anims/03/1.png
+++ b/graphics/door_anims/03/1.png
--- a/graphics/door_anims/03/2.png
+++ b/graphics/door_anims/03/2.png
--- a/graphics/door_anims/04/0.png
+++ b/graphics/door_anims/04/0.png
--- a/graphics/door_anims/04/1.png
+++ b/graphics/door_anims/04/1.png
--- a/graphics/door_anims/04/2.png
+++ b/graphics/door_anims/04/2.png
--- a/graphics/door_anims/05/0.png
+++ b/graphics/door_anims/05/0.png
--- a/graphics/door_anims/05/1.png
+++ b/graphics/door_anims/05/1.png
--- a/graphics/door_anims/05/2.png
+++ b/graphics/door_anims/05/2.png
--- a/graphics/door_anims/06/0.png
+++ b/graphics/door_anims/06/0.png
--- a/graphics/door_anims/06/1.png
+++ b/graphics/door_anims/06/1.png
--- a/graphics/door_anims/06/2.png
+++ b/graphics/door_anims/06/2.png
--- a/graphics/door_anims/07/0.png
+++ b/graphics/door_anims/07/0.png
--- a/graphics/door_anims/07/1.png
+++ b/graphics/door_anims/07/1.png
--- a/graphics/door_anims/07/2.png
+++ b/graphics/door_anims/07/2.png
--- a/graphics/door_anims/08/0.png
+++ b/graphics/door_anims/08/0.png
--- a/graphics/door_anims/08/1.png
+++ b/graphics/door_anims/08/1.png
--- a/graphics/door_anims/08/2.png
+++ b/graphics/door_anims/08/2.png
--- a/graphics/door_anims/09/0.png
+++ b/graphics/door_anims/09/0.png
--- a/graphics/door_anims/09/1.png
+++ b/graphics/door_anims/09/1.png
--- a/graphics/door_anims/09/2.png
+++ b/graphics/door_anims/09/2.png
--- a/graphics/door_anims/10/0.png
+++ b/graphics/door_anims/10/0.png
--- a/graphics/door_anims/10/1.png
+++ b/graphics/door_anims/10/1.png
--- a/graphics/door_anims/10/2.png
+++ b/graphics/door_anims/10/2.png
--- a/graphics/door_anims/11/0.png
+++ b/graphics/door_anims/11/0.png
--- a/graphics/door_anims/11/1.png
+++ b/graphics/door_anims/11/1.png
--- a/graphics/door_anims/11/2.png
+++ b/graphics/door_anims/11/2.png
--- a/graphics/door_anims/12/0.png
+++ b/graphics/door_anims/12/0.png
--- a/graphics/door_anims/12/1.png
+++ b/graphics/door_anims/12/1.png
--- a/graphics/door_anims/12/2.png
+++ b/graphics/door_anims/12/2.png
--- a/graphics/door_anims/13/0.png
+++ b/graphics/door_anims/13/0.png
--- a/graphics/door_anims/13/1.png
+++ b/graphics/door_anims/13/1.png
--- a/graphics/door_anims/13/2.png
+++ b/graphics/door_anims/13/2.png
--- a/graphics/door_anims/14/0.png
+++ b/graphics/door_anims/14/0.png
--- a/graphics/door_anims/14/1.png
+++ b/graphics/door_anims/14/1.png
--- a/graphics/door_anims/14/2.png
+++ b/graphics/door_anims/14/2.png
--- a/graphics/door_anims/15/0.png
+++ b/graphics/door_anims/15/0.png
--- a/graphics/door_anims/15/1.png
+++ b/graphics/door_anims/15/1.png
--- a/graphics/door_anims/15/2.png
+++ b/graphics/door_anims/15/2.png
--- a/graphics/door_anims/16/0.png
+++ b/graphics/door_anims/16/0.png
--- a/graphics/door_anims/16/1.png
+++ b/graphics/door_anims/16/1.png
--- a/graphics/door_anims/16/2.png
+++ b/graphics/door_anims/16/2.png
--- a/graphics/door_anims/17/0.png
+++ b/graphics/door_anims/17/0.png
--- a/graphics/door_anims/17/1.png
+++ b/graphics/door_anims/17/1.png
--- a/graphics/door_anims/17/2.png
+++ b/graphics/door_anims/17/2.png
--- a/graphics/door_anims/18/0.png
+++ b/graphics/door_anims/18/0.png
--- a/graphics/door_anims/18/1.png
+++ b/graphics/door_anims/18/1.png
--- a/graphics/door_anims/18/2.png
+++ b/graphics/door_anims/18/2.png
--- a/graphics/door_anims/19/0.png
+++ b/graphics/door_anims/19/0.png
--- a/graphics/door_anims/19/1.png
+++ b/graphics/door_anims/19/1.png
--- a/graphics/door_anims/19/2.png
+++ b/graphics/door_anims/19/2.png
--- a/graphics/door_anims/20/0.png
+++ b/graphics/door_anims/20/0.png
--- a/graphics/door_anims/20/1.png
+++ b/graphics/door_anims/20/1.png
--- a/graphics/door_anims/20/2.png
+++ b/graphics/door_anims/20/2.png
--- a/graphics/door_anims/21/0.png
+++ b/graphics/door_anims/21/0.png
--- a/graphics/door_anims/21/1.png
+++ b/graphics/door_anims/21/1.png
--- a/graphics/door_anims/21/2.png
+++ b/graphics/door_anims/21/2.png
--- a/graphics/door_anims/22/0.png
+++ b/graphics/door_anims/22/0.png
--- a/graphics/door_anims/22/1.png
+++ b/graphics/door_anims/22/1.png
--- a/graphics/door_anims/22/2.png
+++ b/graphics/door_anims/22/2.png
--- a/graphics/door_anims/23/0.png
+++ b/graphics/door_anims/23/0.png
--- a/graphics/door_anims/23/1.png
+++ b/graphics/door_anims/23/1.png
--- a/graphics/door_anims/23/2.png
+++ b/graphics/door_anims/23/2.png
--- a/graphics/door_anims/24/0.png
+++ b/graphics/door_anims/24/0.png
--- a/graphics/door_anims/24/1.png
+++ b/graphics/door_anims/24/1.png
--- a/graphics/door_anims/24/2.png
+++ b/graphics/door_anims/24/2.png
--- a/graphics/door_anims/25/0.png
+++ b/graphics/door_anims/25/0.png
--- a/graphics/door_anims/25/1.png
+++ b/graphics/door_anims/25/1.png
--- a/graphics/door_anims/25/2.png
+++ b/graphics/door_anims/25/2.png
--- a/graphics/door_anims/26/0.png
+++ b/graphics/door_anims/26/0.png
--- a/graphics/door_anims/26/1.png
+++ b/graphics/door_anims/26/1.png
--- a/graphics/door_anims/26/2.png
+++ b/graphics/door_anims/26/2.png
--- a/graphics/door_anims/27/0.png
+++ b/graphics/door_anims/27/0.png
--- a/graphics/door_anims/27/1.png
+++ b/graphics/door_anims/27/1.png
--- a/graphics/door_anims/27/2.png
+++ b/graphics/door_anims/27/2.png
--- a/graphics/door_anims/28/0.png
+++ b/graphics/door_anims/28/0.png
--- a/graphics/door_anims/28/1.png
+++ b/graphics/door_anims/28/1.png
--- a/graphics/door_anims/28/2.png
+++ b/graphics/door_anims/28/2.png
--- a/graphics/door_anims/29/0.png
+++ b/graphics/door_anims/29/0.png
--- a/graphics/door_anims/29/1.png
+++ b/graphics/door_anims/29/1.png
--- a/graphics/door_anims/29/2.png
+++ b/graphics/door_anims/29/2.png
--- a/graphics/door_anims/30/0.png
+++ b/graphics/door_anims/30/0.png
--- a/graphics/door_anims/30/1.png
+++ b/graphics/door_anims/30/1.png
--- a/graphics/door_anims/30/2.png
+++ b/graphics/door_anims/30/2.png
--- a/graphics/door_anims/31/0.png
+++ b/graphics/door_anims/31/0.png
--- a/graphics/door_anims/31/1.png
+++ b/graphics/door_anims/31/1.png
--- a/graphics/door_anims/31/2.png
+++ b/graphics/door_anims/31/2.png
--- a/graphics/door_anims/32/0.png
+++ b/graphics/door_anims/32/0.png
--- a/graphics/door_anims/32/1.png
+++ b/graphics/door_anims/32/1.png
--- a/graphics/door_anims/32/2.png
+++ b/graphics/door_anims/32/2.png
--- a/graphics/door_anims/33/0.png
+++ b/graphics/door_anims/33/0.png
--- a/Show More
+++ b/Show More