pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
pikalaxalt 2016-04-10 13:39:55 -04:00
commit 552febffe8
288 changed files with 927 additions and 1140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/map_constants.asm
View File

@ -10,7 +10,7 @@ MAP_NONE EQU 0
mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1
mapgroup OLIVINE_GYM, 8, 5 ; 2
mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 ; 3
mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3
mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4
mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5
mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6
@ -144,7 +144,7 @@ MAP_NONE EQU 0
mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1
mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2
mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3
mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 ; 4
mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4
mapgroup BLACKTHORN_MART, 4, 6 ; 5
mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6
mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7
@ -233,7 +233,7 @@ MAP_NONE EQU 0
mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7
mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8
mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9
mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 ; 10
mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10
mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11
mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12
mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13

6
maps.asm
View File

@ -33,7 +33,7 @@ INCLUDE "maps/GoldenrodBillsHouse.asm"
INCLUDE "maps/GoldenrodMagnetTrainStation.asm"
INCLUDE "maps/GoldenrodFlowerShop.asm"
INCLUDE "maps/GoldenrodPPSpeechHouse.asm"
INCLUDE "maps/GoldenrodNameRatersHouse.asm"
INCLUDE "maps/GoldenrodNameRater.asm"
INCLUDE "maps/GoldenrodDeptStore1F.asm"
INCLUDE "maps/GoldenrodDeptStore2F.asm"
INCLUDE "maps/GoldenrodDeptStore3F.asm"
@ -241,7 +241,7 @@ SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12]
INCLUDE "maps/OlivinePokeCenter1F.asm"
INCLUDE "maps/OlivineGym.asm"
INCLUDE "maps/OlivineVoltorbHouse.asm"
INCLUDE "maps/OlivineTimsHouse.asm"
INCLUDE "maps/OlivineHouseBeta.asm"
INCLUDE "maps/OlivinePunishmentSpeechHouse.asm"
INCLUDE "maps/OlivineGoodRodHouse.asm"
@ -380,7 +380,7 @@ INCLUDE "maps/FuchsiaCity.asm"
INCLUDE "maps/BlackthornGym1F.asm"
INCLUDE "maps/BlackthornGym2F.asm"
INCLUDE "maps/BlackthornDragonSpeechHouse.asm"
INCLUDE "maps/BlackthornDodrioTradeHouse.asm"
INCLUDE "maps/BlackthornEmysHouse.asm"
INCLUDE "maps/BlackthornMart.asm"
INCLUDE "maps/BlackthornPokeCenter1F.asm"
INCLUDE "maps/MoveDeletersHouse.asm"

8
maps/BlackthornCity.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const BLACKTHORNCITY_BLACK_BELT
const BLACKTHORNCITY_COOLTRAINER_F1
const BLACKTHORNCITY_YOUNGSTER1
const BLACKTHORNCITY_YOUNGSTER2
const BLACKTHORNCITY_SANTOS
const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScriptHeader:
@ -27,11 +27,11 @@ BlackthornCity_MapScriptHeader:
.Santos
checkcode VAR_WEEKDAY
if_equal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_YOUNGSTER2
disappear BLACKTHORNCITY_SANTOS
return
.SantosAppears
appear BLACKTHORNCITY_YOUNGSTER2
appear BLACKTHORNCITY_SANTOS
return
BlackthornSuperNerdScript:
@ -322,7 +322,7 @@ BlackthornCity_MapEventHeader:
db 8
warp_def $b, $12, 1, BLACKTHORN_GYM_1F
warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_HOUSE
warp_def $17, $1d, 1, BLACKTHORN_EMYS_HOUSE
warp_def $1d, $f, 2, BLACKTHORN_MART
warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F
warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE

1
maps/BlackthornDodrioTradeHouse.blk
View File

@ -1 +0,0 @@
  

12
maps/BlackthornDragonSpeechHouse.asm
View File

@ -12,18 +12,18 @@ BlackthornDragonSpeechHouse_MapScriptHeader:
GrannyScript_0x195949:
jumptextfaceplayer UnknownText_0x19595c
EkansScript_0x19594c:
Dratini:
opentext
writetext UnknownText_0x1959ee
writetext DratiniText
cry DRATINI
waitbutton
closetext
end
UnknownScript_0x195956:
; unused
jumpstd picturebookshelf
UnknownScript_0x195959:
; unused
jumpstd magazinebookshelf
UnknownText_0x19595c:
@ -41,7 +41,7 @@ UnknownText_0x19595c:
line "this town."
done
UnknownText_0x1959ee:
DratiniText:
text "DRATINI: Draa!"
done
@ -63,4 +63,4 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1
person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, EkansScript_0x19594c, -1
person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1

1
maps/BlackthornDragonSpeechHouse.blk
View File

@ -1 +0,0 @@
  

6
maps/BlackthornDodrioTradeHouse.asm → maps/BlackthornEmysHouse.asm
View File

@ -1,7 +1,7 @@
const_value set 2
const BLACKTHORNDODRIOTRADEHOUSE_LASS
const BLACKTHORNEMYSHOUSE_EMY
BlackthornDodrioTradeHouse_MapScriptHeader:
BlackthornEmysHouse_MapScriptHeader:
.MapTriggers:
db 0
@ -19,7 +19,7 @@ Emy:
EmysHouseBookshelf:
jumpstd magazinebookshelf
BlackthornDodrioTradeHouse_MapEventHeader:
BlackthornEmysHouse_MapEventHeader:
; filler
db 0, 0

1
maps/BlackthornMart.blk
View File

@ -1 +0,0 @@
'+"++++)(+*+++#

1
maps/BlackthornPokeCenter1F.blk
View File

@ -1 +0,0 @@
 ./'./

1
maps/BluesHouse.blk
View File

@ -1 +0,0 @@
  

10
maps/BurnedTower1F.asm
View File

@ -1,6 +1,6 @@
const_value set 2
const BURNEDTOWER1F_ROCK
const BURNEDTOWER1F_SUPER_NERD
const BURNEDTOWER1F_EUSINE
const BURNEDTOWER1F_SILVER
const BURNEDTOWER1F_MORTY
const BURNEDTOWER1F_POKE_BALL
@ -43,14 +43,14 @@ BurnedTower1F_MapScriptHeader:
return
.EusineTrigger:
spriteface BURNEDTOWER1F_SUPER_NERD, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15
applymovement BURNEDTOWER1F_SUPER_NERD, BurnedTower1FEusineMovement
spriteface BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
opentext
writetext BurnedTower1FEusineIntroText
waitbutton
closetext
moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e
moveperson BURNEDTOWER1F_EUSINE, $9, $e
dotrigger $1
end

58
maps/BurnedTowerB1F.asm
View File

@ -7,7 +7,7 @@ const_value set 2
const BURNEDTOWERB1F_ENTEI2
const BURNEDTOWERB1F_SUICUNE2
const BURNEDTOWERB1F_POKE_BALL
const BURNEDTOWERB1F_SUPER_NERD
const BURNEDTOWERB1F_EUSINE
BurnedTowerB1F_MapScriptHeader:
.MapTriggers:
@ -22,7 +22,7 @@ BurnedTowerB1F_MapScriptHeader:
; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x186160
dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
UnknownScript_0x18615e:
end
@ -30,14 +30,14 @@ UnknownScript_0x18615e:
UnknownScript_0x18615f:
end
UnknownScript_0x186160:
BurnedTowerB1FLadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x18616a
iftrue .NoChange
changeblock $6, $e, $2
UnknownScript_0x18616a:
.NoChange
return
UnknownScript_0x18616b:
ReleaseTheBeasts:
playmusic MUSIC_NONE
pause 30
appear BURNEDTOWERB1F_RAIKOU1
@ -61,27 +61,27 @@ UnknownScript_0x18616b:
pause 15
playsound SFX_WARP_FROM
spriteface PLAYER, LEFT
applymovement BURNEDTOWERB1F_RAIKOU1, MovementData_0x186236
applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
disappear BURNEDTOWERB1F_RAIKOU1
waitsfx
playsound SFX_WARP_FROM
spriteface PLAYER, RIGHT
applymovement BURNEDTOWERB1F_ENTEI1, MovementData_0x18623b
applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
disappear BURNEDTOWERB1F_ENTEI1
waitsfx
pause 15
playsound SFX_WARP_FROM
spriteface PLAYER, UP
applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186241
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
playsound SFX_WARP_FROM
spriteface PLAYER, DOWN
applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186248
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
spriteface PLAYER, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186253
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
spriteface PLAYER, DOWN
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
@ -96,7 +96,7 @@ UnknownScript_0x18616b:
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
setevent EVENT_BURNED_TOWER_MORTY
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear BURNEDTOWERB1F_SUPER_NERD
appear BURNEDTOWERB1F_EUSINE
refreshscreen $0
changeblock $6, $e, $1b
reloadmappart
@ -104,21 +104,21 @@ UnknownScript_0x18616b:
dotrigger $1
end
SuperNerdScript_0x186212:
BurnedTowerB1FEusine:
faceplayer
opentext
writetext UnknownText_0x18626a
writetext BurnedTowerB1FEusineText
waitbutton
closetext
checkcode VAR_FACING
if_equal $1, UnknownScript_0x186226
applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x186263
if_equal $1, .Movement
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump UnknownScript_0x18622a
UnknownScript_0x186226:
applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x18625c
.Movement
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2
UnknownScript_0x18622a:
disappear BURNEDTOWERB1F_SUPER_NERD
disappear BURNEDTOWERB1F_EUSINE
playsound SFX_EXIT_BUILDING
waitsfx
end
@ -129,14 +129,14 @@ BurnedTowerB1FTMEndure:
BurnedTowerB1FBoulder:
jumpstd strengthboulder
MovementData_0x186236:
BurnedTowerRaikouMovement:
set_sliding
fast_jump_step_down
fast_jump_step_left
remove_sliding
step_end
MovementData_0x18623b:
BurnedTowerEnteiMovement:
set_sliding
fast_jump_step_right
fast_jump_step_down
@ -144,7 +144,7 @@ MovementData_0x18623b:
remove_sliding
step_end
MovementData_0x186241:
BurnedTowerSuicuneMovement1:
set_sliding
fast_jump_step_right
fast_jump_step_down
@ -153,7 +153,7 @@ MovementData_0x186241:
remove_sliding
step_end
MovementData_0x186248:
BurnedTowerSuicuneMovement2:
set_sliding
fast_jump_step_left
fast_jump_step_up
@ -168,7 +168,7 @@ MovementData_0x18624f:
remove_sliding
step_end
MovementData_0x186253:
BurnedTowerSuicuneMovement3:
set_sliding
big_step_up
fast_jump_step_right
@ -179,7 +179,7 @@ MovementData_0x186253:
remove_sliding
step_end
MovementData_0x18625c:
BurnedTowerB1FEusineMovement2:
step_left
step_left
step_down
@ -188,7 +188,7 @@ MovementData_0x18625c:
step_down
step_end
MovementData_0x186263:
BurnedTowerB1FEusineMovement1:
step_down
step_left
step_left
@ -197,7 +197,7 @@ MovementData_0x186263:
step_down
step_end
UnknownText_0x18626a:
BurnedTowerB1FEusineText:
text "EUSINE: I dug a"
line "hole here, too…"
@ -255,7 +255,7 @@ BurnedTowerB1F_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 0, $6, $a, $0, UnknownScript_0x18616b, $0, $0
xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0
.Signposts:
db 0
@ -270,4 +270,4 @@ BurnedTowerB1F_MapEventHeader:
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER

1
maps/CeladonDeptStoreElevator.asm
View File

@ -1,4 +1,3 @@
CeladonDeptStoreElevator_MapScriptHeader:
.MapTriggers:
db 0

1
maps/CeladonMansion2F.asm
View File

@ -1,4 +1,3 @@
CeladonMansion2F_MapScriptHeader:
.MapTriggers:
db 0

1
maps/CeladonMansionRoofHouse.blk
View File

@ -1 +0,0 @@
  

44
maps/CeladonPokeCenter1F.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const CELADONPOKECENTER1F_GENTLEMAN
const CELADONPOKECENTER1F_PHARMACIST
const CELADONPOKECENTER1F_COOLTRAINER_F
const CELADONPOKECENTER1F_SUPER_NERD
const CELADONPOKECENTER1F_EUSINE
CeladonPokeCenter1F_MapScriptHeader:
.MapTriggers:
@ -24,40 +24,40 @@ CooltrainerFScript_0x71e28:
PharmacistScript_0x71e2b:
jumptextfaceplayer UnknownText_0x71ec1
SuperNerdScript_0x71e2e:
CeladonEusine:
faceplayer
opentext
writetext UnknownText_0x71f22
writetext CeladonEusineText1
buttonsound
writebyte SUICUNE
special SpecialMonCheck
iffalse UnknownScript_0x71e46
iffalse .NoSuicune
special SpecialBeastsCheck
iftrue UnknownScript_0x71e48
writetext UnknownText_0x7201a
iftrue .HoOh
writetext NoBeastsText
waitbutton
UnknownScript_0x71e46:
.NoSuicune
closetext
end
UnknownScript_0x71e48:
writetext UnknownText_0x71f65
.HoOh
writetext EusineLeavesCeladonText
waitbutton
closetext
checkcode VAR_FACING
if_equal $1, UnknownScript_0x71e5a
applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e6b
jump UnknownScript_0x71e5e
if_equal $1, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue
UnknownScript_0x71e5a:
applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e65
UnknownScript_0x71e5e:
disappear CELADONPOKECENTER1F_SUPER_NERD
.Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement2
.Continue
disappear CELADONPOKECENTER1F_EUSINE
playsound SFX_EXIT_BUILDING
waitsfx
end
MovementData_0x71e65:
.Movement2
step_left
step_down
step_down
@ -65,7 +65,7 @@ MovementData_0x71e65:
step_down
step_end
MovementData_0x71e6b:
.Movement1
step_down
step_down
step_down
@ -92,7 +92,7 @@ UnknownText_0x71ec1:
line "three years ago."
done
UnknownText_0x71f22:
CeladonEusineText1:
text "EUSINE: Hi!"
para "I'm back visiting"
@ -102,7 +102,7 @@ UnknownText_0x71f22:
line "while."
done
UnknownText_0x71f65:
EusineLeavesCeladonText:
text "<PLAYER>, have you"
line "heard?"
@ -123,7 +123,7 @@ UnknownText_0x71f65:
line "you, <PLAYER>!"
done
UnknownText_0x7201a:
NoBeastsText:
text "Oh, by the way,"
line "<PLAYER>."
@ -167,4 +167,4 @@ CeladonPokeCenter1F_MapEventHeader:
person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1
person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH

1
maps/CeladonPokeCenter1F.blk
View File

@ -1 +0,0 @@
 ./'./

1
maps/CeladonPokeCenter2FBeta.asm
View File

@ -1,4 +1,3 @@
CeladonPokeCenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0

2
maps/CeladonPokeCenter2FBeta.blk
View File

@ -1,2 +0,0 @@
1+
28(8-)-)

1
maps/CeruleanGymBadgeSpeechHouse.blk
View File

@ -1 +0,0 @@
  

Some files were not shown because too many files have changed in this diff Show More