diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 13:37:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-03 13:37:21 -0400 |
| commit | 9824a5762008d083ea149af477a3093b89d269a7 (patch) | |
| tree | 84359c2f08878986c4b7486f576c8b9280840f7e /macros | |
| parent | 75e4f784924393ccedb27f2831e5a36fe11bada5 (diff) | |
| parent | 3fab27f221a8d5400d4b203809ff9b13355d55a3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokegold-spaceworld
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 |