You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Merge pull request #685 from mid-kid/master
Moshi moshi? minoru enhansumentsu desu
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
DisplayCaughtContestMonStats:
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearTilemap
|
||||
call ClearSprites
|
||||
call LoadFontsBattleExtra
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ CelebiShrineEvent:
|
||||
call LoadCelebiGFX
|
||||
depixel 0, 10, 7, 0
|
||||
ld a, SPRITE_ANIM_INDEX_CELEBI
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], SPECIALCELEBIEVENT_CELEBI
|
||||
@@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf:
|
||||
ld d, a
|
||||
ld e, $0
|
||||
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], $80
|
||||
|
||||
@@ -5,7 +5,7 @@ _Diploma:
|
||||
|
||||
PlaceDiplomaOnScreen:
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearTilemap
|
||||
call ClearSprites
|
||||
call DisableLCD
|
||||
ld hl, DiplomaGFX
|
||||
|
||||
@@ -33,7 +33,7 @@ ShakeHeadbuttTree:
|
||||
call Request2bpp
|
||||
call Cut_Headbutt_GetPixelFacing
|
||||
ld a, SPRITE_ANIM_INDEX_HEADBUTT
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_TREE
|
||||
@@ -92,7 +92,7 @@ HideHeadbuttTree:
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
|
||||
ld a, $5
|
||||
ld a, $05 ; grass block
|
||||
ld [hli], a
|
||||
ld [hld], a
|
||||
ld bc, SCREEN_WIDTH
|
||||
@@ -174,7 +174,7 @@ OWCutJumptable:
|
||||
Cut_SpawnAnimateTree:
|
||||
call Cut_Headbutt_GetPixelFacing
|
||||
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_TREE
|
||||
@@ -227,7 +227,7 @@ Cut_SpawnLeaf:
|
||||
push de
|
||||
push af
|
||||
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_GRASS
|
||||
@@ -314,7 +314,7 @@ FlyFromAnim:
|
||||
call FlyFunction_InitGFX
|
||||
depixel 10, 10, 4, 0
|
||||
ld a, SPRITE_ANIM_INDEX_RED_WALK
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_FLY
|
||||
@@ -348,7 +348,7 @@ FlyToAnim:
|
||||
call FlyFunction_InitGFX
|
||||
depixel 31, 10, 4, 0
|
||||
ld a, SPRITE_ANIM_INDEX_RED_WALK
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_FLY
|
||||
@@ -447,7 +447,7 @@ FlyFunction_FrameTimer:
|
||||
ld d, a
|
||||
ld e, $0
|
||||
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], FIELDMOVE_GRASS
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
RepelWoreOffScript::
|
||||
opentext
|
||||
writetext .RepelWoreOffText
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
.RepelWoreOffText:
|
||||
text_far _RepelWoreOffText
|
||||
text_end
|
||||
|
||||
HiddenItemScript::
|
||||
opentext
|
||||
readmem wHiddenItemID
|
||||
@@ -70,7 +70,7 @@ MagnetTrain:
|
||||
ld [wRequested2bppDest], a
|
||||
ld [wRequested2bppDest + 1], a
|
||||
ld [wRequested2bpp], a
|
||||
call ClearTileMap
|
||||
call ClearTilemap
|
||||
|
||||
pop af
|
||||
ldh [hSCY], a
|
||||
@@ -313,7 +313,7 @@ MagnetTrain_Jumptable:
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ld a, b
|
||||
call _InitSpriteAnimStruct
|
||||
call InitSpriteAnimStruct
|
||||
ld hl, SPRITEANIMSTRUCT_TILE_ID
|
||||
add hl, bc
|
||||
ld [hl], 0
|
||||
|
||||
@@ -135,7 +135,7 @@ InitMapNameFrame:
|
||||
hlcoord 0, 0
|
||||
ld b, 2
|
||||
ld c, 18
|
||||
call InitMapSignAttrMap
|
||||
call InitMapSignAttrmap
|
||||
call PlaceMapNameFrame
|
||||
ret
|
||||
|
||||
@@ -171,8 +171,8 @@ PlaceMapNameCenterAlign:
|
||||
pop hl
|
||||
ret
|
||||
|
||||
InitMapSignAttrMap:
|
||||
ld de, wAttrMap - wTileMap
|
||||
InitMapSignAttrmap:
|
||||
ld de, wAttrmap - wTilemap
|
||||
add hl, de
|
||||
inc b
|
||||
inc b
|
||||
|
||||
@@ -273,7 +273,7 @@ CheckOverworldTileArrays:
|
||||
|
||||
INCLUDE "data/events/field_move_blocks.asm"
|
||||
|
||||
OWFlash:
|
||||
FlashFunction:
|
||||
call .CheckUseFlash
|
||||
and $7f
|
||||
ld [wFieldMoveSucceeded], a
|
||||
|
||||
@@ -15,7 +15,7 @@ _UnownPrinter:
|
||||
set NO_TEXT_SCROLL, a
|
||||
ld [wOptions], a
|
||||
call ClearBGPalettes
|
||||
call ClearTileMap
|
||||
call ClearTilemap
|
||||
|
||||
ld de, UnownDexATile
|
||||
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
|
||||
|
||||
10
engine/events/repel.asm
Normal file
10
engine/events/repel.asm
Normal file
@@ -0,0 +1,10 @@
|
||||
RepelWoreOffScript::
|
||||
opentext
|
||||
writetext .RepelWoreOffText
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
.RepelWoreOffText:
|
||||
text_far _RepelWoreOffText
|
||||
text_end
|
||||
@@ -139,7 +139,7 @@ DisplayUnownWords:
|
||||
jr nz, .loop2
|
||||
.copy
|
||||
call _DisplayUnownWords_CopyWord
|
||||
ld bc, wAttrMap - wTileMap
|
||||
ld bc, wAttrmap - wTilemap
|
||||
add hl, bc
|
||||
call _DisplayUnownWords_FillAttr
|
||||
call WaitBGMap2
|
||||
|
||||
Reference in New Issue
Block a user