ref: 50a39daa74a132397f7d389d1878158970e55bfc
parent: 60bc4b9b9b9ed7c03e549a39d4f29998e951b01f
author: IIMarckus <iimarckus@gmail.com>
date: Fri Oct 17 05:24:04 EDT 2014
More idioms.
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -246,4 +246,6 @@
LORELEIS_ROOM EQU $F5
BRUNOS_ROOM EQU $F6
AGATHAS_ROOM EQU $F7
-BEACH_HOUSE EQU $F8 ; Yellow only
\ No newline at end of file
+IF DEF(_YELLOW)
+BEACH_HOUSE EQU $F8
+ENDC
--- a/data/mapObjects/beach_house.asm
+++ b/data/mapObjects/beach_house.asm
@@ -12,7 +12,7 @@
db 1,$d,6
db 2 ; people
- db $27, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude
+ db SPRITE_FISHER, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude
db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu
; warp-to
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -3,7 +3,7 @@
IF DEF(_YELLOW)
db $1 ; warps
- db $9, $5, $0, $f8 ; BEACH_HOUSE
+ db $9, $5, $0, BEACH_HOUSE
ELSE
db $0 ; warps
ENDC