diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 12:50:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 12:50:32 -0500 |
| commit | 24f0e7d04501ddb000dfc1d06e716efca387bce8 (patch) | |
| tree | bfa176d5634f0211ffcf7f313a7ec2078e3b612d /engine | |
| parent | b5a8e3b3b32b2734d8fc642c77d96a0d4ef9c6d1 (diff) | |
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_setup.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld.asm | 20 | ||||
| -rwxr-xr-x | engine/warp_connection.asm | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 01f3d05d7..20faecb5d 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -91,7 +91,7 @@ MapSetupScript_Connection: ; 153bf db map_change_callback db map_player_coord db map_load_blocks - db map_load_tileset_header + db map_load_tileset db map_save_screen db map_load_objects db map_fade_music @@ -253,7 +253,7 @@ MapSetupCommands: ; 15440 dba SaveScreen ; 0c dba BufferScreen ; 0d dba LoadGraphics ; 0e - dba LoadTilesetHeader ; 0f + dba LoadTileset ; 0f dba LoadMapTimeOfDay ; 10 dba LoadMapPalettes ; 11 dba LoadWildMonData ; 12 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" diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 13a624d7f..ca0daae73 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -292,8 +292,8 @@ LoadMapTimeOfDay: ; 104750 ret LoadGraphics: ; 1047cf - call LoadTilesetHeader call LoadTileset + call LoadTilesetGFX xor a ld [hMapAnims], a xor a |