ref: 9ecc991814986fdadecd83247adf13e10eaf77ed
parent: 79ea091ff627d5e3613799698b5bf1ea95f45148
parent: e288ef20d539a04042c5e91cc562db04bb33b707
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Thu Jan 24 16:42:44 EST 2019
Merge pull request #593 from mid-kid/temp More patches
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -189,10 +189,10 @@
const SFX_TRAIN_ARRIVED ; b9
const SFX_STOP_SLOT ; ba
const SFX_2_BOOPS ; bb
- const SFX_GLASS_TING ; bc
- const SFX_GLASS_TING_2 ; bd
; new to Crystal
+ const SFX_GLASS_TING ; bc
+ const SFX_GLASS_TING_2 ; bd
const SFX_INTRO_UNOWN_1 ; be
const SFX_INTRO_UNOWN_2 ; bf
const SFX_INTRO_UNOWN_3 ; c0
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -242,7 +242,7 @@
ret
.FillTopBottom:
- ld c, 5
+ ld c, (SCREEN_WIDTH - 2) / 4 + 1
jr .enterloop
.continueloop
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -1,7 +1,7 @@
NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
-const_value = 1
+ const_def 1
const MOM_ITEM
const MOM_DOLL
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -892,12 +892,12 @@
call PokeAnim_IsEgg
jr z, .egg
- ld c, BANK(UnownAnimations)
+ ld c, BANK(UnownAnimationPointers) ; aka BANK(UnownAnimationIdlePointers)
ld hl, UnownAnimationPointers
ld de, UnownAnimationIdlePointers
call PokeAnim_IsUnown
jr z, .unown
- ld c, BANK(PicAnimations)
+ ld c, BANK(AnimationPointers) ; aka BANK(AnimationIdlePointers)
ld hl, AnimationPointers
ld de, AnimationIdlePointers
.unown
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -208,7 +208,7 @@
ldh [hBGMapMode], a
xor a
- ld [wd002], a
+ ld [wSuicuneFrame], a
; Play starting sound effect
call SFXChannelsOff
@@ -218,7 +218,7 @@
ret
SuicuneFrameIterator:
- ld hl, wd002
+ ld hl, wSuicuneFrame
ld a, [hl]
ld c, a
inc [hl]
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@@ -1,5 +1,3 @@
-PicAnimations: ; used only for BANK(PicAnimations)
-
BulbasaurAnimation: INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
IvysaurAnimation: INCLUDE "gfx/pokemon/ivysaur/anim.asm"
VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm"
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -1,5 +1,3 @@
-UnownAnimations: ; used only for BANK(UnownAnimations)
-
UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -87,7 +87,7 @@
loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle
- ifequal $1, .NotBeaten
+ ifequal LOSE, .NotBeaten
disappear LAKEOFRAGE_GYARADOS
.NotBeaten:
reloadmapafterbattle
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -77,7 +77,7 @@
loadwildmon SUDOWOODO, 20
startbattle
setevent EVENT_FOUGHT_SUDOWOODO
- ifequal $2, DidntCatchSudowoodo
+ ifequal DRAW, DidntCatchSudowoodo
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
reloadmapafterbattle
--- a/wram.asm
+++ b/wram.asm
@@ -1710,6 +1710,7 @@
wTempDayOfWeek::
wApricorns::
wKeepSevenBiasChance:: ; used in the slots to handle the favoring of 7 symbol streaks
+wSuicuneFrame::
db
ds 2
wStartFlypoint:: db