diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-23 08:31:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 08:31:32 -0400 |
| commit | 1c7c4c021d386b175b9081060896f001f1c19422 (patch) | |
| tree | bd93d10b1f46c4985abc3db063d2255665bf016d /src/rock.c | |
| parent | 543434ea2df1c325487ddec075f937ae0c3c6d2e (diff) | |
| parent | 5bae643f67eab0912046842bbf48f2b55b097fe8 (diff) | |
Merge pull request #331 from fieldy101/decomp-water-2
Decompile water.s
Diffstat (limited to 'src/rock.c')
| -rw-r--r-- | src/rock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rock.c b/src/rock.c index a2d28d057..565ce9461 100644 --- a/src/rock.c +++ b/src/rock.c @@ -100,7 +100,7 @@ const struct SpriteTemplate gUnknown_83E7420 = .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_AffineNormal_ObjBlend_16x16, - .anims = gUnknown_83E5958, + .anims = gAnims_WaterMudOrb, .images = NULL, .affineAnims = gUnknown_83E741C, .callback = sub_80B477C, @@ -310,7 +310,7 @@ const struct SpriteTemplate gUnknown_83E7590 = .anims = gUnknown_83E74B0, .images = NULL, .affineAnims = gUnknown_83E7540, - .callback = sub_8077350, + .callback = AnimWeatherBallDown, }; static void sub_80B4634(struct Sprite *sprite) |