thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more from the beach house.

Browse source
This commit is contained in:
IIMarckus 2014-10-17 08:13:51 -06:00
parent a3d3f8324a
commit 7db2fe99f8
9 changed files with 255 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
constants/map_dimensions.asm
View file

@ -890,4 +890,9 @@ BRUNOS_ROOM_WIDTH EQU $05
; Agatha_h map_id=247
AGATHAS_ROOM_HEIGHT EQU $06
AGATHAS_ROOM_WIDTH EQU $05
AGATHAS_ROOM_WIDTH EQU $05
IF DEF(_YELLOW)
BEACH_HOUSE_HEIGHT EQU 4
BEACH_HOUSE_WIDTH EQU 7
ENDC

4
constants/tilesets.asm
View file

@ -22,4 +22,6 @@ LAB EQU 20
CLUB EQU 21
FACILITY EQU 22
PLATEAU EQU 23
IF DEF(_YELLOW)
BEACH_HOUSE_TILESET EQU 24
ENDC

6
data/mapHeaders/beach_house.asm Normal file
View file

@ -0,0 +1,6 @@
BeachHouse_h:
db BEACH_HOUSE_TILESET
dw BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts
db 0 ; connections
dw BeachHouseObjects ; objects

20
data/mapObjects/beach_house.asm Normal file
View file

@ -0,0 +1,20 @@
BeachHouseObjects: ; 0xf23a4
db $a ; border block
db 2 ; warps
db 7,2,0,$ff
db 7,3,0,$ff
db 4 ; signs
db 0,3,3
db 0,7,4,
db 0,$b,5
db 1,$d,6
db 2 ; people
db $27, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude
db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu
; warp-to
EVENT_DISP BEACH_HOUSE_WIDTH,7,2
EVENT_DISP BEACH_HOUSE_WIDTH,7,3

3
main.asm
View file

@ -5715,6 +5715,9 @@ CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk"
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"
IF DEF(_YELLOW)
INCLUDE "scripts/beach_house.asm"
ENDC
INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"

1
maps/beach_house.blk Normal file
View file

@ -0,0 +1 @@
     

195
scripts/beach_house.asm Normal file
View file

@ -0,0 +1,195 @@
BeachHouseScript:
call $3c29
ret
BeachHouseTextPointers:
dw SurfinDudeText
dw BeachHousePikachuText
dw BeachHouseSign1Text
dw BeachHouseSign2Text
dw BeachHouseSign3Text
dw BeachHouseSign4Text
SurfinDudeText:
db 8
ld a,[$d471]
bit 6,a
jr nz,.next
ld hl,.SurfinDudeText4
call PrintText
jr .xf2271
.next
ld hl,$d492
bit 0,[hl]
set 0,[hl]
jr nz,.next2
ld hl,.SurfinDudeText1
jr .next3
.next2
ld hl,.SurfinDudeText3
.next3
call PrintText
call $35ef
ld a,[$cc26]
and a
jr nz,.xf226b
ld a,1
ld [$cc3c],a
ld b,$3e
ld hl,$4000
call $3e84
ld hl,$d492
set 1,[hl]
jr .xf2271
.xf226b
ld hl,.SurfinDudeText2
call PrintText
.xf2271
jp TextScriptEnd
.SurfinDudeText1
TX_FAR _SurfinDudeText1
db "@"
.SurfinDudeText2
TX_FAR _SurfinDudeText2
db "@"
.SurfinDudeText3
TX_FAR _SurfinDudeText3
db "@"
.SurfinDudeText4
TX_FAR _SurfinDudeText4
db "@"
BeachHousePikachuText:
db 8
ld hl,.BeachHousePikachuText
call PrintText
ld a,PIKACHU
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
.BeachHousePikachuText
TX_FAR _BeachHousePikachuText
db "@"
BeachHouseSign1Text:
db 8
ld hl,.BeachHouseSign1Text2
ld a,[$d471]
bit 6,a
jr z,.next
ld hl,.BeachHouseSign1Text1
.next
call PrintText
jp TextScriptEnd
.BeachHouseSign1Text1
TX_FAR _BeachHouseSign1Text1
db "@"
.BeachHouseSign1Text2
TX_FAR _BeachHouseSign1Text2
db "@"
BeachHouseSign2Text:
db 8
ld hl,.BeachHouseSign2Text2
ld a,[$d471]
bit 6,a
jr z,.next
ld hl,.BeachHouseSign2Text1
.next
call PrintText
jp TextScriptEnd
.BeachHouseSign2Text1
TX_FAR _BeachHouseSign2Text1
db "@"
.BeachHouseSign2Text2
TX_FAR _BeachHouseSign2Text2
db "@"
BeachHouseSign3Text:
db 8
ld hl,$62f4
ld a,[$d471]
bit 6,a
jr z,.next
ld hl,.BeachHouseSign3Text1
.next
call PrintText
jp TextScriptEnd
.BeachHouseSign3Text1
TX_FAR _BeachHouseSign3Text1
db "@"
.BeachHouseSign3Text2
TX_FAR _BeachHouseSign3Text2
db "@"
BeachHouseSign4Text:
db 8
ld a,1
ld [$cc3c],a
ld a,[$d471]
bit 6,a
jr z,.xf2369
ld hl,$d492
bit 1,[hl]
jr z,.next2
ld a,0
ld [$cc3c],a
.next2
ld hl,.BeachHousePrinterText2
call PrintText
ld a,[$d492]
bit 1,a
jr z,.xf236f
ld a,1
ld [$cc3c],a
ld hl,.BeachHousePrinterText3
call PrintText
call $35ef
ld a,[$cc26]
and a
jp z,$63d0 ; 0xf23d0
call $36ec
ld hl,$d72f
set 6,[hl]
xor a
ld [$cfca],a
ld hl,$510a
ld b,$3a
call $3e84
call $3852
ld hl,$d72f
res 6,[hl]
call $3dd8
call $2f83
call $3dc2
call $36f8
call $3ddb
call $3de0
ld a,1
ld [$cfca],a
jr .xf236f
.xf2369
ld hl,.BeachHousePrinterText1
call PrintText
.xf236f
jp TextScriptEnd
.BeachHousePrinterText1
TX_FAR _BeachHousePrinterText1
db $d,"@"
.BeachHousePrinterText2
TX_FAR _BeachHousePrinterText2
db $d,"@"
.BeachHousePrinterText3
TX_FAR _BeachHousePrinterText3
db "@"
.xf2383
TX_FAR _BeachHousePrinterText4
db "@"

2
text.asm
View file

@ -2136,7 +2136,7 @@ INCLUDE "text/maps/route_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.asm"
IF DEF(_YELLOW)
INCLUDE "text/maps/surf_house.asm"
INCLUDE "text/maps/beach_house.asm"
ENDC
INCLUDE "text/maps/pokemon_league_gate.asm"
INCLUDE "text/maps/victory_road_2f.asm"

36
text/maps/surf_house.asm → text/maps/beach_house.asm
View file

@ -1,4 +1,4 @@
SurfinDudeText1::
_SurfinDudeText1::
text "Whoa!"
para "Your PIKACHU knows"
@ -12,25 +12,25 @@ SurfinDudeText1::
para "Give it a go?"
done
SurfinDudeText2::
_SurfinDudeText2::
text "Come SURF anytime,"
line "my friend!"
done
SurfinDudeText3::
_SurfinDudeText3::
text "Wanna go SURF?"
done
SurfinDudeText4::
_SurfinDudeText4::
text "Dogs and burgers"
line "on special today!"
done
BeachHousePikachuText::
_BeachHousePikachuText::
text "PIKACHU: Pikaa."
done
BeachHouseSign1Text1::
_BeachHouseSign1Text1::
text "SURFIN' DUDE's"
line "scribbles..."
@ -39,12 +39,12 @@ BeachHouseSign1Text1::
cont "hit the groove!"
done
BeachHouseSign1Text2::
_BeachHouseSign1Text2::
text "30 years of waves!"
line "SURFIN' DUDE"
done
BeachHouseSign2Text1::
_BeachHouseSign2Text1::
text "SURFING TIP 1!"
para "After flips, line"
@ -53,12 +53,12 @@ BeachHouseSign2Text1::
cont "effect!"
done
BeachHouseSign2Text2::
_BeachHouseSign2Text2::
text "SUMMER BEACH HOUSE"
line "#MON welcome!"
done
BeachHouseSign3Text1::
_BeachHouseSign3Text1::
text "SURFING TIP 2!"
para "Pulling flips in"
@ -66,23 +66,27 @@ BeachHouseSign3Text1::
cont "rad!"
done
BeachHouseSign3Text2::
_BeachHouseSign3Text2::
text "The sea unites"
line "all in surfdom!"
done
BeachHousePrinterText1::
_BeachHousePrinterText1::
text "It's some sort of"
line "a machine...@@"
_BeachHousePrinterText2::
text "SUMMER BEACH HOUSE"
line "PRINTER, it says.@@"
BeachHousePrinterText2::
_BeachHousePrinterText3::
text "The Hi.Score is"
line "shown."
para "PRINT it out?"
done
BeachHousePrinterText3::
_BeachHousePrinterText4::
text "SUMMER BEACH HOUSE"
line "PRINTER, it says."
@ -92,8 +96,8 @@ BeachHousePrinterText3::
para "PRINT it out?"
done
BeachHousePrinterText4::
_BeachHousePrinterText5::
text "PRINT completed.@@"
BeachHousePrinterText5::
_BeachHousePrinterText6::
text "PRINT error!@@"