diff options
| author | IIMarckus <iimarckus@gmail.com> | 2012-01-05 22:36:06 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2012-01-05 22:36:06 -0700 |
| commit | faa63c870ba783a0026c381d5676f3860c984386 (patch) | |
| tree | d05ab5ec0f07b0dd21e2cea6720f6547c3a1495b /constants.asm | |
| parent | Give this sprite a better name. (diff) | |
| parent | a script to insert map object data into pokered.asm (diff) | |
| download | pokeyellow-faa63c870ba783a0026c381d5676f3860c984386.tar.gz pokeyellow-faa63c870ba783a0026c381d5676f3860c984386.tar.xz pokeyellow-faa63c870ba783a0026c381d5676f3860c984386.zip | |
Merge.
hg-commit-id: c6f5d5a99ac0
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants.asm b/constants.asm index b45e0961..fa23c0da 100644 --- a/constants.asm +++ b/constants.asm @@ -1257,8 +1257,8 @@ SPRITE_PAPER_SHEET EQU $40 SPRITE_BOOK_MAP_DEX EQU $41 SPRITE_CLIPBOARD EQU $42 SPRITE_SNORLAX EQU $43 -SPRITE_OLD_AMBER EQU $44 -SPRITE_OLD_AMBER_COPY EQU $45 +SPRITE_OLD_AMBER_COPY EQU $44 +SPRITE_OLD_AMBER EQU $45 SPRITE_LYING_OLD_MAN_UNUSED_1 EQU $46 SPRITE_LYING_OLD_MAN_UNUSED_2 EQU $47 SPRITE_LYING_OLD_MAN EQU $48 |