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/DayCare.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/DayCare.asm')
| -rw-r--r-- | maps/DayCare.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/DayCare.asm b/maps/DayCare.asm index d9328ace1..a3799b9fe 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -24,7 +24,7 @@ UnknownScript_0x62f88: ; 0x62f88 return ; 0x62f8f -UnknownScript_0x62f8f: ; 0x62f8f +GrampsScript_0x62f8f: ; 0x62f8f faceplayer loadfont checkbit1 $033e @@ -61,7 +61,7 @@ UnknownScript_0x62fbd: ; 0x62fbd end ; 0x62fc3 -UnknownScript_0x62fc3: ; 0x62fc3 +GrannyScript_0x62fc3: ; 0x62fc3 faceplayer loadfont checkbit2 $0005 @@ -169,8 +169,8 @@ DayCare_MapEventHeader: ; 0x63250 ; people-events db 2 - person_event $2f, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x62f8f, $06e5 - person_event $30, 7, 9, $8, $0, 255, 255, $80, 0, UnknownScript_0x62fc3, $ffff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5 + person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff ; 0x6328e |