Squashed commit of the following:

commit fabad02201
Merge: 087244104 eb07617a2
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Thu Feb 10 16:03:45 2022 -0800

    Merge branch 'pret:master' into master

commit eb07617a20
Merge: 7d2344c07 a86a27918
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 9 08:34:10 2022 -0500

    Merge pull request #1623 from kiliwily/master

    Update money.c

commit a86a279184
Author: kiliwily <69381603+kiliwily@users.noreply.github.com>
Date:   Sun Feb 6 16:25:56 2022 +0100

    Update money.c

commit 7d2344c07b
Merge: f494238a9 dc7d86f02
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 2 22:09:36 2022 -0500

    Merge pull request #1616 from GriffinRichards/missing-req

    Add missing :req, remove old macros

commit f494238a9d
Merge: e30b16f0f 1ff0b0efa
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 30 23:00:05 2022 -0500

    Merge pull request #1621 from GriffinRichards/constants-collision

    Add missing collision constant usage

commit 1ff0b0efa9
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 29 21:13:46 2022 -0500

    Add missing collision constant usage

commit e30b16f0fd
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 21:50:15 2022 -0500

    Fix Swap_HandleQuitSwappingResposne typo

commit 2efbd5f549
Merge: 4188dd405 3d0326106
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:51:56 2022 -0500

    Merge pull request #1608 from GriffinRichards/fix-fieldmap

    Fix some incorrect fieldmap names

commit 4188dd405c
Merge: 9f2b6ab2f 6470b0d00
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:44:26 2022 -0500

    Merge pull request #1620 from LOuroboros/gBallSpriteTemplates

    Used ball constants in gBallSpriteTemplates

commit 6470b0d004
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Wed Jan 26 18:36:21 2022 -0300

    Used ball constants in gBallSpriteTemplates

commit dc7d86f026
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 19:26:22 2022 -0500

    Add new macro comments

commit 2495d18132
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 18:51:56 2022 -0500

    Add missing :req, remove old macros

commit 9f2b6ab2f2
Merge: 79dfac92c 2cc301603
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 22 21:41:37 2022 -0500

    Merge pull request #1613 from Kurausukun/m4asymbols

    Move M4A Track Definitions

commit 2cc301603e
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 21:30:39 2022 -0500

    lmao whitespace

commit 0872441048
Merge: 3c46f3194 79dfac92c
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 22 18:28:09 2022 -0800

    Merge branch 'pret:master' into master

commit 3b756bfb3d
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 20:38:41 2022 -0500

    fix compilation on modern

commit 317e302147
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:43:11 2022 -0500

    fix inconsistent indentation

commit 04013fbdf2
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:41:31 2022 -0500

    forgot we could do this

commit a83e41b2cc
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:37:46 2022 -0500

    move m4a track definitions

commit 3d0326106e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 12:48:19 2022 -0500

    Z coord / height -> elevation

commit 79dfac92c9
Merge: 874317268 30d970441
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 09:55:43 2022 -0500

    Merge pull request #1604 from GriffinRichards/clean-spinda

    Document Spinda spot algorithm

commit fb81d9ad4a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 23:26:39 2022 -0500

    Correct map data comment

commit 8743172686
Merge: 062cdbe01 7d75e1631
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 12:11:27 2022 -0500

    Merge pull request #1612 from AsparagusEduardo/pret_misc

    Small documentation and cleanup

commit 7d75e16312
Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date:   Thu Jan 20 12:25:48 2022 -0300

    Small documentation and cleanup

commit 062cdbe01c
Merge: a7e6045d7 bd43b905b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 08:53:44 2022 -0500

    Merge pull request #1599 from GriffinRichards/fix-tilemaps

    Break up graphics/interface and graphics/misc

commit a7e6045d71
Merge: 69759b2d1 f899a02ac
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 22:17:37 2022 -0500

    Merge pull request #1597 from GriffinRichards/misc-cleanup

    Miscellaneous fixes

commit c4f33f2b2b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:54:55 2022 -0500

    TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE

commit e682c12519
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:39:11 2022 -0500

    sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE

commit e3b49604d4
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:59:37 2022 -0500

    Use metatile layer constants in shop

commit 8200fda14e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:56:54 2022 -0500

    Fix decorations metatile attribute names

commit a8b466dc80
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:15:32 2022 -0500

    Disambiguate fieldmap names

commit f127e64a3c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 09:37:12 2022 -0500

    Name overworld tilemaps for their bg, add layer type constants

commit 30d9704418
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:27:17 2022 -0500

    Specify unsigned in spot comment

commit 313f14ed63
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:00:18 2022 -0500

    Add Spinda spot color constants

commit 177863da47
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 16:04:02 2022 -0500

    Fix typo

commit 225147a94f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 13:19:52 2022 -0500

    Document Spinda spot algorithm

commit 69759b2d12
Merge: 14a11899c 8b920691e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:44:58 2022 -0500

    Merge pull request #1601 from GriffinRichards/fix-decor-flag

    Fix FLAG_DECORATION_0 name

commit 14a11899cf
Merge: dad413276 a4d31da92
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:37:26 2022 -0500

    Merge pull request #1603 from LOuroboros/patch-2

    Updated the value of MAX_MAP_DATA_SIZE

commit a4d31da923
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Sun Jan 16 19:22:28 2022 -0300

    Updated the value of MAX_MAP_DATA_SIZE

commit dad4132762
Merge: 60162a98b 429d53b95
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 14:03:20 2022 -0500

    Merge pull request #1596 from GriffinRichards/player-avatar-arr-const

    Add missing array constants in field_player_avatar

commit 60162a98b9
Merge: 755d9143a 6d6ff9126
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 13:55:16 2022 -0500

    Merge pull request #1602 from GriffinRichards/charmap-quote

    Allow right single quotation mark in charmap

commit 6d6ff91268
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 10:29:15 2022 -0500

    Allow right single quotation mark in charmap

commit 755d9143a6
Merge: 9ded1eb14 fd7457b05
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 15 12:20:22 2022 -0500

    Merge pull request #1600 from GriffinRichards/remove-berry-fix

    Remove berry fix

commit bd43b905b7
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:39:00 2022 -0500

    Apply palettes to some field effect pngs

commit 4dec9b83a3
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:29:30 2022 -0500

    Move more graphics out of misc

commit 9ded1eb14e
Merge: fa2d25d36 1a33187ba
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 09:12:05 2022 -0500

    Merge pull request #1598 from atasro2/master

    Give sensical names to Unused_AdjustBgMosaic

commit 1a33187bad
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:48:46 2022 +0330

    Move enum to bg.h

commit 998900bd1b
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:37:27 2022 +0330

    Give sensical names to Unused_AdjustBgMosaic

commit fd7457b05a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 13 15:26:20 2022 -0500

    Remove berry fix

commit f899a02ac6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 12 18:34:21 2022 -0500

    Use MON_GIVEN_TO_ constants for givemon

commit 01af8e877f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 14:18:22 2022 -0500

    Move starter choose out of interface/misc

commit 694aa3c65d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:59:24 2022 -0500

    Move balls, shop, link, map popups, and bag out of interface

commit fa2d25d366
Merge: 4024b3f1b ca9bc34be
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 12:26:02 2022 -0500

    Merge pull request #1594 from GriffinRichards/pokestorage-clean

    Misc pokemon_storage_system cleanup

commit d782d3544d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:46:58 2022 -0500

    Move pokeblock graphics out of interface

commit 565dd24309
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:37:13 2022 -0500

    Move party menu graphics out of interface

commit 7103839a61
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:14:59 2022 -0500

    Move summary screen graphics out of interface, fix some names

commit fde18b4774
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:42:00 2022 -0500

    Fix berry crusher graphics name

commit 0a78cb5c9e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:04:47 2022 -0500

    Fix some battle dome graphics names

commit 49418f8c01
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:19:20 2022 -0500

    Add missing commas

commit 3a6c633905
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:16:25 2022 -0500

    Add seteventmon

commit 110fbc559c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:08:14 2022 -0500

    Make item optional for givemon and setwildbattle

commit 4024b3f1b3
Merge: ded202136 d4111d552
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 10 14:56:26 2022 -0500

    Merge pull request #1590 from GriffinRichards/dex-enum

    Convert pokedex defines to enums

commit 3c46f3194e
Merge: 4375a8014 ded202136
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sun Jan 9 13:54:52 2022 -0800

    Merge branch 'pret:master' into master

commit 429d53b95c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 11:12:35 2022 -0500

    Use runningState directly in CheckMovementInputNotOnBike

commit 8b920691e6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 01:31:42 2022 -0500

    Fix FLAG_DECORATION_0 name

commit 4375a80142
Merge: a499e8dc7 30dbf3f85
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 8 21:47:19 2022 -0800

    Merge branch 'pret:master' into master

commit 8f1a760937
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 8 23:53:55 2022 -0500

    Add missing array constants in field_player_avatar

commit ca9bc34bea
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:26:23 2022 -0500

    Clean up pokemon_storage_system graphics

commit 5cbe572607
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:02:12 2022 -0500

    Add window constants in pokemon_storage_system

commit d4111d5520
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 14:50:19 2022 -0500

    Add comment about pokedex reordering

commit 5d033c2e4d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 12:18:49 2022 -0500

    Convert pokedex defines to enums

commit ce55e58ad8
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 4 10:09:42 2022 -0500

    Misc cleanup

src/event_object_movement.c

@@ -2246,7 +2246,7 @@ u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate)
     return TrySpawnObjectEventTemplate(objectEventTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
 }
 
-u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
+u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 elevation)
 {
     struct ObjectEventTemplate objectEventTemplate;
 
@@ -2257,7 +2257,7 @@ u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8
     objectEventTemplate.inConnection = 0;
     objectEventTemplate.x = x;
     objectEventTemplate.y = y;
-    objectEventTemplate.elevation = z;
+    objectEventTemplate.elevation = elevation;
     objectEventTemplate.movementType = movementBehavior;
     objectEventTemplate.movementRangeX = 0;
     objectEventTemplate.movementRangeY = 0;
@@ -2336,7 +2336,7 @@ u8 CreateObjectGraphicsSprite(u16 graphicsId, void (*callback)(struct Sprite *),
 // A unique id is given as an argument and stored in the sprite data to allow referring back to the same virtual object.
 // They can be turned (and, in the case of the Union Room, animated teleporting in and out) but do not have movement types
 // or any of the other data normally associated with object events.
-u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 z, u8 direction)
+u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevation, u8 direction)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -2363,7 +2363,7 @@ u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 z, u8 d
 
         sprite->coordOffsetEnabled = TRUE;
         sprite->sVirtualObjId = virtualObjId;
-        sprite->sVirtualObjElev = z;
+        sprite->sVirtualObjElev = elevation;
         if (graphicsInfo->paletteSlot == 10)
             LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
         else if (graphicsInfo->paletteSlot >= 16)
@@ -2374,8 +2374,8 @@ u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 z, u8 d
             SetSubspriteTables(sprite, subspriteTables);
             sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         }
-        InitObjectPriorityByElevation(sprite, z);
-        SetObjectSubpriorityByElevation(z, sprite, 1);
+        InitObjectPriorityByElevation(sprite, elevation);
+        SetObjectSubpriorityByElevation(elevation, sprite, 1);
         StartSpriteAnim(sprite, GetFaceDirectionAnimNum(direction));
     }
     return spriteId;