diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
| commit | b7ed43bd568045f265fc96abee480ff8bb8e2177 (patch) | |
| tree | 2fbfc9ff6bdd61ffc64ec0d94ee264a414f61f48 /yellow | |
| parent | Merge branch 'master' of https://github.com/luckytyphlosion/pokeyellow (diff) | |
| download | pokeyellow-b7ed43bd568045f265fc96abee480ff8bb8e2177.tar.gz pokeyellow-b7ed43bd568045f265fc96abee480ff8bb8e2177.tar.xz pokeyellow-b7ed43bd568045f265fc96abee480ff8bb8e2177.zip | |
Make pokeyellow build correctly.
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index bc3c79ef..3b8a2a85 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -95,8 +95,8 @@ ClearVariablesAfterLoadingMapData: ; c07c (3:407c) ld [hJoyPressed], a ld [hJoyReleased], a ld [hJoyHeld], a - ld [wcd6a], a - ld [wd5a3], a + ld [wActionResultOrTookBattleTurn], a + ld [wUnusedD5A3], a ld hl, wCardKeyDoorY ld [hli], a ld [hl], a @@ -399,6 +399,7 @@ TextBoxGraphics: INCBIN "gfx/text_box.2bpp" TextBoxGraphicsEnd: PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" +WorldMapTileGraphicsEnd: PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" dr $11468,$11875 |