mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # maps/KrissHouse2F.asm
This commit is contained in:
commit
612fd7cb96
@ -1,7 +1,7 @@
|
||||
TrainerPalettes: ; b0ce
|
||||
; entries correspond to trainer classes
|
||||
|
||||
wPlayerPalette: ; Chris uses the same colors as Cal
|
||||
PlayerPalette: ; Chris uses the same colors as Cal
|
||||
INCLUDE "gfx/trainers/cal.pal"
|
||||
KrisPalette: ; Kris shares Falkner's palette
|
||||
INCLUDE "gfx/trainers/falkner.pal"
|
||||
|
@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer:
|
||||
ret
|
||||
|
||||
.male
|
||||
ld hl, wPlayerPalette
|
||||
ld hl, PlayerPalette
|
||||
ret
|
||||
|
||||
GetFrontpicPalettePointer:
|
||||
|
@ -220,9 +220,9 @@ GetMonSprite: ; 14259
|
||||
cp SPRITE_POKEMON
|
||||
jr c, .Normal
|
||||
cp SPRITE_DAY_CARE_MON_1
|
||||
jr z, .wBreedMon1
|
||||
jr z, .BreedMon1
|
||||
cp SPRITE_DAY_CARE_MON_2
|
||||
jr z, .wBreedMon2
|
||||
jr z, .BreedMon2
|
||||
cp SPRITE_VARS
|
||||
jr nc, .Variable
|
||||
jr .Icon
|
||||
@ -240,11 +240,11 @@ GetMonSprite: ; 14259
|
||||
ld a, [hl]
|
||||
jr .Mon
|
||||
|
||||
.wBreedMon1
|
||||
.BreedMon1
|
||||
ld a, [wBreedMon1Species]
|
||||
jr .Mon
|
||||
|
||||
.wBreedMon2
|
||||
.BreedMon2
|
||||
ld a, [wBreedMon2Species]
|
||||
|
||||
.Mon:
|
||||
|
@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb
|
||||
; entries correspond to *_POCKET constants
|
||||
dw .Items
|
||||
dw .Balls
|
||||
dw .wKeyItems
|
||||
dw .KeyItems
|
||||
dw .TMHM
|
||||
|
||||
.Items: ; 107e9 (4:47e9)
|
||||
@ -1174,7 +1174,7 @@ TutorialPack: ; 107bb
|
||||
dba UpdateItemDescription
|
||||
; 10807
|
||||
|
||||
.wKeyItems: ; 10807 (4:4807)
|
||||
.KeyItems: ; 10807 (4:4807)
|
||||
ld a, KEY_ITEM_POCKET
|
||||
ld hl, .KeyItemsMenuHeader
|
||||
jr .DisplayPocket
|
||||
|
@ -200,7 +200,7 @@ Serial_ExchangeByte:: ; 78a
|
||||
cp SERIAL_NO_DATA_BYTE
|
||||
ret nz
|
||||
call CheckwLinkTimeoutFramesNonzero
|
||||
jr z, .wLinkTimeoutFrames_zero
|
||||
jr z, .linkTimeoutFrames_zero
|
||||
push hl
|
||||
ld hl, wLinkTimeoutFrames + 1
|
||||
ld a, [hl]
|
||||
@ -215,7 +215,7 @@ Serial_ExchangeByte:: ; 78a
|
||||
call CheckwLinkTimeoutFramesNonzero
|
||||
jr z, SerialDisconnected
|
||||
|
||||
.wLinkTimeoutFrames_zero
|
||||
.linkTimeoutFrames_zero
|
||||
ld a, [rIE]
|
||||
and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
|
||||
cp 1 << SERIAL
|
||||
|
@ -200,7 +200,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
|
||||
ld bc, 20
|
||||
xor a
|
||||
call ByteFill
|
||||
ld hl, .wTileMap
|
||||
ld hl, .TileMap
|
||||
decoord 0, 1
|
||||
ld bc, $0154
|
||||
call CopyBytes
|
||||
@ -212,7 +212,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
|
||||
ld bc, SCREEN_WIDTH
|
||||
xor a
|
||||
call ByteFill
|
||||
ld hl, .wAttrMap
|
||||
ld hl, .AttrMap
|
||||
decoord 0, 1, wAttrMap
|
||||
ld bc, 17 * SCREEN_WIDTH
|
||||
call CopyBytes
|
||||
@ -222,10 +222,10 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
|
||||
.Tiles:
|
||||
INCBIN "gfx/mobile/mobile_splash.2bpp"
|
||||
|
||||
.wTileMap:
|
||||
.TileMap:
|
||||
INCBIN "gfx/mobile/mobile_splash.tilemap"
|
||||
|
||||
.wAttrMap:
|
||||
.AttrMap:
|
||||
INCBIN "gfx/mobile/mobile_splash.attrmap"
|
||||
|
||||
UnknownMobilePalettes_16c903: ; 16c903
|
||||
|
Loading…
Reference in New Issue
Block a user