diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
| commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
| tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/MountMoonSquare.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/MountMoonSquare.asm')
| -rw-r--r-- | maps/MountMoonSquare.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 7937653f2..9ab259580 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -91,7 +91,7 @@ MapMountMoonSquareSignpost1Script: ; 0x7711b jumptext UnknownText_0x7713b ; 0x7711e -UnknownScript_0x7711e: ; 0x7711e +RockScript_0x7711e: ; 0x7711e jumpstd $000f ; 0x77121 @@ -174,8 +174,8 @@ MountMoonSquare_MapEventHeader: ; 0x77158 ; people-events db 3 - person_event $4d, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event $4d, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event $59, 11, 11, $18, $0, 255, 255, $0, 0, UnknownScript_0x7711e, $0778 + person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 + person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 + person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, RockScript_0x7711e, $0778 ; 0x771a6 |