From f1ea15bbfe8528143ace793b050891a9b1f99d03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:13:57 +0100 Subject: Consolidate Special function names --- engine/overworld.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld.asm') diff --git a/engine/overworld.asm b/engine/overworld.asm index 68b8adaed..78f40e4b1 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -23,7 +23,7 @@ Function14146: ; mobile push af res 7, [hl] set 6, [hl] - call MapCallbackSprites_LoadUsedSpritesGFX + call Special_MapCallbackSprites_LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -35,7 +35,7 @@ Function14157: ; mobile push af set 7, [hl] res 6, [hl] - call MapCallbackSprites_LoadUsedSpritesGFX + call Special_MapCallbackSprites_LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -43,7 +43,7 @@ Function14157: ; mobile RefreshSprites:: ; 14168 call .Refresh - call MapCallbackSprites_LoadUsedSpritesGFX + call Special_MapCallbackSprites_LoadUsedSpritesGFX ret ; 1416f @@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee ; 14209 -MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 +Special_MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 ld a, MAPCALLBACK_SPRITES call RunMapCallback call GetUsedSprites -- cgit v1.2.3 From b4a49351c18dcef7f4493670058ad2833206f016 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:47:58 +0100 Subject: Finish consistent Special function names --- engine/overworld.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/overworld.asm') diff --git a/engine/overworld.asm b/engine/overworld.asm index 78f40e4b1..4b330efb1 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -41,7 +41,7 @@ Function14157: ; mobile ret ; 14168 -RefreshSprites:: ; 14168 +Special_RefreshSprites:: ; 14168 call .Refresh call Special_MapCallbackSprites_LoadUsedSpritesGFX ret -- cgit v1.2.3 From 91f97f08f06923e3548797133275df53e240d894 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Wed, 3 Jan 2018 14:58:08 +0100 Subject: Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX --- engine/overworld.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld.asm') diff --git a/engine/overworld.asm b/engine/overworld.asm index 4b330efb1..67c2f25c6 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -23,7 +23,7 @@ Function14146: ; mobile push af res 7, [hl] set 6, [hl] - call Special_MapCallbackSprites_LoadUsedSpritesGFX + call Special_LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -35,7 +35,7 @@ Function14157: ; mobile push af set 7, [hl] res 6, [hl] - call Special_MapCallbackSprites_LoadUsedSpritesGFX + call Special_LoadUsedSpritesGFX pop af ld [wSpriteFlags], a ret @@ -43,7 +43,7 @@ Function14157: ; mobile Special_RefreshSprites:: ; 14168 call .Refresh - call Special_MapCallbackSprites_LoadUsedSpritesGFX + call Special_LoadUsedSpritesGFX ret ; 1416f @@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee ; 14209 -Special_MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 +Special_LoadUsedSpritesGFX: ; 14209 ld a, MAPCALLBACK_SPRITES call RunMapCallback call GetUsedSprites -- cgit v1.2.3 From d91e42ca5e3796108b01df9e6535e84892cbf9cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 18:10:01 -0500 Subject: Group some mutually edited files in data/sprites/ --- engine/overworld.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/overworld.asm') diff --git a/engine/overworld.asm b/engine/overworld.asm index 68b8adaed..bd373db66 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -719,10 +719,10 @@ LoadEmote:: ; 1442f ; 1444d -INCLUDE "data/emotes.asm" +INCLUDE "data/sprites/emotes.asm" -INCLUDE "data/sprite_mons.asm" +INCLUDE "data/sprites/sprite_mons.asm" INCLUDE "data/maps/outdoor_sprites.asm" -INCLUDE "data/sprites.asm" +INCLUDE "data/sprites/sprites.asm" -- cgit v1.2.3 From 0a3b251dcb710a8319d6633122d92a983bcefd1c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 22:53:42 -0500 Subject: Arrays end with -1, not $ff --- engine/overworld.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/overworld.asm') diff --git a/engine/overworld.asm b/engine/overworld.asm index bd373db66..b4825290c 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -77,7 +77,7 @@ GetPlayerSprite: ; 14183 cp c jr z, .good inc hl - cp $ff + cp -1 jr nz, .loop ; Any player state not in the array defaults to Chris's sprite. @@ -100,14 +100,14 @@ GetPlayerSprite: ; 14183 db PLAYER_BIKE, SPRITE_CHRIS_BIKE db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db $ff + db -1 ; end .Kris: db PLAYER_NORMAL, SPRITE_KRIS db PLAYER_BIKE, SPRITE_KRIS_BIKE db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db $ff + db -1 ; end ; 141c9 -- cgit v1.2.3