diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /engine/overworld.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'engine/overworld.asm')
| -rwxr-xr-x | engine/overworld.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm index a1b4545a9..7941b74d7 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -202,11 +202,11 @@ GetSprite: ; 1423c call GetMonSprite ret c - ld hl, SpriteHeaders ; address + ld hl, OverworldSprites + SPRITEDATA_ADDR dec a ld c, a ld b, 0 - ld a, 6 + ld a, NUM_SPRITEDATA_FIELDS call AddNTimes ; load the address into de ld a, [hli] @@ -299,11 +299,11 @@ _DoesSpriteHaveFacings:: ; 142a7 push hl push bc - ld hl, SpriteHeaders + SPRITEHEADER_TYPE ; type + ld hl, OverworldSprites + SPRITEDATA_TYPE dec a ld c, a ld b, 0 - ld a, NUM_SPRITEHEADER_FIELDS + ld a, NUM_SPRITEDATA_FIELDS call AddNTimes ld a, [hl] pop bc @@ -324,11 +324,11 @@ _GetSpritePalette:: ; 142c4 call GetMonSprite jr c, .is_pokemon - ld hl, SpriteHeaders + 5 ; palette + ld hl, OverworldSprites + SPRITEDATA_PALETTE dec a ld c, a ld b, 0 - ld a, 6 + ld a, NUM_SPRITEDATA_FIELDS call AddNTimes ld c, [hl] ret @@ -691,8 +691,8 @@ endr LoadEmote:: ; 1442f ; Get the address of the pointer to emote c. ld a, c - ld bc, 6 - ld hl, EmotesPointers + ld bc, 6 ; sizeof(emote) + ld hl, Emotes call AddNTimes ; Load the emote address into de ld e, [hl] @@ -719,10 +719,10 @@ LoadEmote:: ; 1442f ; 1444d -INCLUDE "data/emote_headers.asm" +INCLUDE "data/emotes.asm" INCLUDE "data/sprite_mons.asm" INCLUDE "data/maps/outdoor_sprites.asm" -INCLUDE "gfx/sprite_headers.asm" +INCLUDE "data/sprites.asm" |