diff options
| author | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
| commit | 382fd4b50e27cea7e0f97839363235ea2eac14fa (patch) | |
| tree | d9836c547ac68f14a4b1766453334812380d050b /macros | |
| parent | d26c5f6937518f891d7cb699e237e172588f4a26 (diff) | |
| parent | 2dfc7fc635b13291588ba8aae65fd0ece7211799 (diff) | |
Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master
And that's the last of the manual merges for now! Hooray!
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/wram.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index da67ba5..4433267 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -275,8 +275,8 @@ object_struct: MACRO \1Facing:: ds 1 \1StandingTile:: ds 1 ; collision \1LastTile:: ds 1 ; collision -\1StandingMapX:: ds 1 -\1StandingMapY:: ds 1 +\1NextMapX:: ds 1 +\1NextMapY:: ds 1 \1LastMapX:: ds 1 \1LastMapY:: ds 1 \1ObjectInitX:: ds 1 |