Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #593 from mid-kid/temp 

More patches
This commit is contained in:
Rangi 2019-01-24 21:42:44 -05:00 committed by GitHub
parent 79ea091ff6 e288ef20d5
commit 9ecc991814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/sfx_constants.asm
View File

@ -189,10 +189,10 @@
const SFX_TRAIN_ARRIVED ; b9 const SFX_TRAIN_ARRIVED ; b9
const SFX_STOP_SLOT ; ba const SFX_STOP_SLOT ; ba
const SFX_2_BOOPS ; bb const SFX_2_BOOPS ; bb
const SFX_GLASS_TING ; bc
const SFX_GLASS_TING_2 ; bd
; new to Crystal ; new to Crystal
const SFX_GLASS_TING ; bc
const SFX_GLASS_TING_2 ; bd
const SFX_INTRO_UNOWN_1 ; be const SFX_INTRO_UNOWN_1 ; be
const SFX_INTRO_UNOWN_2 ; bf const SFX_INTRO_UNOWN_2 ; bf
const SFX_INTRO_UNOWN_3 ; c0 const SFX_INTRO_UNOWN_3 ; c0

2
engine/events/map_name_sign.asm
View File

@ -242,7 +242,7 @@ PlaceMapNameFrame:
ret ret
.FillTopBottom: .FillTopBottom:
ld c, 5 ld c, (SCREEN_WIDTH - 2) / 4 + 1
jr .enterloop jr .enterloop
.continueloop .continueloop

2
engine/events/mom_phone.asm
View File

@ -1,7 +1,7 @@
NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)" NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)" NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
const_value = 1 const_def 1
const MOM_ITEM const MOM_ITEM
const MOM_DOLL const MOM_DOLL

4
engine/gfx/pic_animation.asm
View File

@ -892,12 +892,12 @@ GetMonAnimPointer:
call PokeAnim_IsEgg call PokeAnim_IsEgg
jr z, .egg jr z, .egg
ld c, BANK(UnownAnimations) ld c, BANK(UnownAnimationPointers) ; aka BANK(UnownAnimationIdlePointers)
ld hl, UnownAnimationPointers ld hl, UnownAnimationPointers
ld de, UnownAnimationIdlePointers ld de, UnownAnimationIdlePointers
call PokeAnim_IsUnown call PokeAnim_IsUnown
jr z, .unown jr z, .unown
ld c, BANK(PicAnimations) ld c, BANK(AnimationPointers) ; aka BANK(AnimationIdlePointers)
ld hl, AnimationPointers ld hl, AnimationPointers
ld de, AnimationIdlePointers ld de, AnimationIdlePointers
.unown .unown

4
engine/movie/title.asm
View File

@ -208,7 +208,7 @@ _TitleScreen:
ldh [hBGMapMode], a ldh [hBGMapMode], a
xor a xor a
ld [wd002], a ld [wSuicuneFrame], a
; Play starting sound effect ; Play starting sound effect
call SFXChannelsOff call SFXChannelsOff
@ -218,7 +218,7 @@ _TitleScreen:
ret ret
SuicuneFrameIterator: SuicuneFrameIterator:
ld hl, wd002 ld hl, wSuicuneFrame
ld a, [hl] ld a, [hl]
ld c, a ld c, a
inc [hl] inc [hl]

2
gfx/pokemon/anims.asm
View File

@ -1,5 +1,3 @@
PicAnimations: ; used only for BANK(PicAnimations)
BulbasaurAnimation: INCLUDE "gfx/pokemon/bulbasaur/anim.asm" BulbasaurAnimation: INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
IvysaurAnimation: INCLUDE "gfx/pokemon/ivysaur/anim.asm" IvysaurAnimation: INCLUDE "gfx/pokemon/ivysaur/anim.asm"
VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm" VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm"

2
gfx/pokemon/unown_anims.asm
View File

@ -1,5 +1,3 @@
UnownAnimations: ; used only for BANK(UnownAnimations)
UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm" UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm" UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm" UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"

2
maps/LakeOfRage.asm
View File

@ -87,7 +87,7 @@ RedGyarados:
loadwildmon GYARADOS, 30 loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle startbattle
ifequal $1, .NotBeaten ifequal LOSE, .NotBeaten
disappear LAKEOFRAGE_GYARADOS disappear LAKEOFRAGE_GYARADOS
.NotBeaten: .NotBeaten:
reloadmapafterbattle reloadmapafterbattle

2
maps/Route36.asm
View File

@ -77,7 +77,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
loadwildmon SUDOWOODO, 20 loadwildmon SUDOWOODO, 20
startbattle startbattle
setevent EVENT_FOUGHT_SUDOWOODO setevent EVENT_FOUGHT_SUDOWOODO
ifequal $2, DidntCatchSudowoodo ifequal DRAW, DidntCatchSudowoodo
disappear ROUTE36_WEIRD_TREE disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
reloadmapafterbattle reloadmapafterbattle

1
wram.asm
View File

@ -1710,6 +1710,7 @@ NEXTU ; d002
wTempDayOfWeek:: wTempDayOfWeek::
wApricorns:: wApricorns::
wKeepSevenBiasChance:: ; used in the slots to handle the favoring of 7 symbol streaks wKeepSevenBiasChance:: ; used in the slots to handle the favoring of 7 symbol streaks
wSuicuneFrame::
db db
ds 2 ds 2
wStartFlypoint:: db wStartFlypoint:: db