diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /data/menu_cursor.s | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'data/menu_cursor.s')
| -rw-r--r-- | data/menu_cursor.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/menu_cursor.s b/data/menu_cursor.s index 0e12c519c..f3c5fe956 100644 --- a/data/menu_cursor.s +++ b/data/menu_cursor.s @@ -134,11 +134,11 @@ gUnknown_0842F1C0:: @ 842F1C0 .align 2 gUnknown_0842F240:: @ 842F240 - obj_pal 0x0203a360, 0xfff0 + obj_pal gUnknown_0203A360, 0xfff0 .align 2 gUnknown_0842F248:: @ 842F248 - obj_pal 0x0203a360, 0xfff1 + obj_pal gUnknown_0203A360, 0xfff1 .align 2 gSpriteTemplate_842F250:: @ 842F250 |