diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-10 01:47:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 01:47:10 -0500 |
| commit | 94c7def4883fbdbcd3987a067443a2069b8bb610 (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/overworld.asm | |
| parent | 89b9292db0898f8ad2b6ea8513a3190762eb58c8 (diff) | |
| parent | d554b997c590825f030bd1be71989653b16a2ae0 (diff) | |
Merge pull request #409 from roukaour/master
Document constants with comments, actual names, and more thorough usage
Diffstat (limited to 'engine/overworld.asm')
| -rwxr-xr-x | engine/overworld.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm index 4d22e55b6..5bbd70a85 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -181,7 +181,7 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 callba LoadEmote call GetMapPermission call CheckOutdoorMap - ld c, EMOTE_0B + ld c, EMOTE_GRASS_RUSTLE jr z, .outdoor ld c, EMOTE_BOULDER_DUST .outdoor @@ -723,10 +723,8 @@ emote_header: MACRO ENDM EmotesPointers: ; 144d -; dw source address -; db length, bank -; dw dest address - +; entries correspond to EMOTE_* constants +; graphics address, length, starting tile emote_header ShockEmote, 4, $78 emote_header QuestionEmote, 4, $78 emote_header HappyEmote, 4, $78 @@ -736,9 +734,9 @@ EmotesPointers: ; 144d emote_header SleepEmote, 4, $78 emote_header FishEmote, 4, $78 emote_header JumpShadowGFX, 1, $7c - emote_header FishingRodGFX2, 2, $7c + emote_header FishingRodGFX, 2, $7c emote_header BoulderDustGFX, 2, $7e - emote_header FishingRodGFX4, 1, $7e + emote_header GrassRustleGFX, 1, $7e ; 14495 |