diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-14 08:15:57 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-14 08:15:57 +0200 |
| commit | 2324abcbee3e40d8c4f950c1cdb98c6fe37bd622 (patch) | |
| tree | e01f040e63d035247fbe7c72df9b525d629352e8 /data | |
| parent | bf0f2e4a0ba447abf50340586045f3567ab7a9b8 (diff) | |
| parent | 3f0250648efc347ce6fab48e8bb814000c847b77 (diff) | |
Merge branch 'master' into decompile_berry_blender
Diffstat (limited to 'data')
| -rw-r--r-- | data/intro_credits_graphics.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s index 82931f6ee..8c096e1cd 100644 --- a/data/intro_credits_graphics.s +++ b/data/intro_credits_graphics.s @@ -338,11 +338,11 @@ gSpriteAnimTable_8416D28:: @ 8416D28 .4byte gSpriteAnim_8416D14 .align 2 -gSpriteTemplate_8416D2C:: @ 8416D2C +gSpriteTemplate_Brendan:: @ 8416D2C spr_template 1001, 1002, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0 .align 2 -gSpriteTemplate_8416D44:: @ 8416D44 +gSpriteTemplate_May:: @ 8416D44 spr_template 1001, 1003, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0 .align 2 |