summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-05-24 15:04:10 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-05-24 15:04:10 -0400
commitcd170d676e2180cdd75446a4fa575be8fa584749 (patch)
tree944259242af7dc40fc4c3028f9ab20e7c63dc5a2
parentcf577ca3a75dc8da6da2a58812171a83757409ab (diff)
Minor fixes here and there.
Typos, moving around, new HRAM stuff.
-rw-r--r--home/overworld.asm2
-rw-r--r--hram.asm4
-rwxr-xr-xmain.asm10
3 files changed, 4 insertions, 12 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 22789ece..508e243a 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1453,7 +1453,7 @@ AdvancePlayerSprite:: ; 0b7f (0:0b7f)
push af
ld a,$FF
ld [wUpdateSpritesEnabled],a
- ld hl, _AdvancePlayerSorite ; 3c:410c
+ ld hl, _AdvancePlayerSprite ; 3c:410c
ld b, BANK(_AdvancePlayerSprite)
call Bankswitch
pop af
diff --git a/hram.asm b/hram.asm
index e9f38c5d..d203a727 100644
--- a/hram.asm
+++ b/hram.asm
@@ -159,6 +159,8 @@ hJoyInput EQU $FFF5
; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
; bit 1: menu is double spaced
-hFlags_0xFFF6 EQU $FFF6
+hFlags_0xFFF6 EQU $FFFA
+
+hFlags_0xFFFA EQU $FFFA
hGBC EQU $FFFE ; 0 if DMG, 1 if GBC
diff --git a/main.asm b/main.asm
index 3bbb41c8..a9a7e1b2 100755
--- a/main.asm
+++ b/main.asm
@@ -6669,16 +6669,6 @@ INCLUDE "engine/overworld/elevator.asm"
INCLUDE "engine/items/tm_prices.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-SECTION "bank3C",ROMX[$4314],BANK[$3C]
-
-BeachHouse_GFX:
- INCBIN "gfx/tilesets/beachhouse.2bpp"
-
-BeachHouse_Block:
- INCBIN "gfx/blocksets/beachhouse.bst"
-ENDC
-
SECTION "bank3d",ROMX,BANK[$3D]
INCLUDE "engine/random.asm"