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/DiglettsCave.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/DiglettsCave.asm')
| -rw-r--r-- | maps/DiglettsCave.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 6c8ee5b5b..9d583f741 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -6,7 +6,7 @@ DiglettsCave_MapScriptHeader: ; 0x74000 db 0 ; 0x74002 -UnknownScript_0x74002: ; 0x74002 +PokefanMScript_0x74002: ; 0x74002 jumptextfaceplayer UnknownText_0x74008 ; 0x74005 @@ -45,6 +45,6 @@ DiglettsCave_MapEventHeader: ; 0x74049 ; people-events db 1 - person_event $2d, 35, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x74002, $ffff + person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff ; 0x7407f |