diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-17 09:24:04 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-17 09:24:04 -0600 |
| commit | 50a39daa74a132397f7d389d1878158970e55bfc (patch) | |
| tree | 81797a997723332ca21829c78404c295e8432698 | |
| parent | 60bc4b9b9b9ed7c03e549a39d4f29998e951b01f (diff) | |
More idioms.
| -rw-r--r-- | constants/map_constants.asm | 4 | ||||
| -rw-r--r-- | data/mapObjects/beach_house.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/route19.asm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 4e4e314f..3703f6c5 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -246,4 +246,6 @@ TRADE_CENTER EQU $F0 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 diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index 2f836037..bad05ac9 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -12,7 +12,7 @@ BeachHouseObjects: ; 0xf23a4 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 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 935e11ed..c225ed29 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -3,7 +3,7 @@ Route19Object: ; 0x54e9a (size=87) IF DEF(_YELLOW) db $1 ; warps - db $9, $5, $0, $f8 ; BEACH_HOUSE + db $9, $5, $0, BEACH_HOUSE ELSE db $0 ; warps ENDC |