diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-21 17:37:36 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-21 17:37:36 -0500 |
| commit | 7e0a4968b35c3f76dee9570ce2113ee1070a653c (patch) | |
| tree | 76bdaa63c5c1a751c305fb935fc72ac032b3ce70 /yellow/main.asm | |
| parent | db8741635917237d6bc96d5260034953b7344b8e (diff) | |
LoadPokedexTilePatterns and engine/overworld/map_sprites.asm
Also replace dummy sprites and fix replace.sh to only parse .asm files
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index b0e5ce7e..1915cf7b 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -3522,6 +3522,7 @@ NineTile: INCBIN "gfx/9_tile.2bpp" TextBoxGraphics: INCBIN "gfx/text_box.2bpp" TextBoxGraphicsEnd: PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" +PokedexTileGraphicsEnd: WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" WorldMapTileGraphicsEnd: PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" @@ -3576,11 +3577,8 @@ INCLUDE "engine/battle/moveEffects/haze_effect.asm" SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] - dr $14000,$1401b -_InitMapSprites: ; 1401b (5:401b) - dr $1401b,$140d2 -Func_140d2: ; 140d2 (5:40d2) - dr $140d2,$143f1 +INCLUDE "engine/load_pokedex_tiles.asm" +INCLUDE "engine/overworld/map_sprites.asm" RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" |