pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	maps/KrissHouse2F.asm
This commit is contained in:
Rangi 2018-02-15 21:21:58 -05:00
commit 612fd7cb96
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/trainers/palettes.asm
View File

@ -1,7 +1,7 @@
TrainerPalettes: ; b0ce TrainerPalettes: ; b0ce
; entries correspond to trainer classes ; 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" INCLUDE "gfx/trainers/cal.pal"
KrisPalette: ; Kris shares Falkner's palette KrisPalette: ; Kris shares Falkner's palette
INCLUDE "gfx/trainers/falkner.pal" INCLUDE "gfx/trainers/falkner.pal"

2
engine/color.asm
View File

@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer:
ret ret
.male .male
ld hl, wPlayerPalette ld hl, PlayerPalette
ret ret
GetFrontpicPalettePointer: GetFrontpicPalettePointer:

8
engine/overworld.asm
View File

@ -220,9 +220,9 @@ GetMonSprite: ; 14259
cp SPRITE_POKEMON cp SPRITE_POKEMON
jr c, .Normal jr c, .Normal
cp SPRITE_DAY_CARE_MON_1 cp SPRITE_DAY_CARE_MON_1
jr z, .wBreedMon1 jr z, .BreedMon1
cp SPRITE_DAY_CARE_MON_2 cp SPRITE_DAY_CARE_MON_2
jr z, .wBreedMon2 jr z, .BreedMon2
cp SPRITE_VARS cp SPRITE_VARS
jr nc, .Variable jr nc, .Variable
jr .Icon jr .Icon
@ -240,11 +240,11 @@ GetMonSprite: ; 14259
ld a, [hl] ld a, [hl]
jr .Mon jr .Mon
.wBreedMon1 .BreedMon1
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
jr .Mon jr .Mon
.wBreedMon2 .BreedMon2
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
.Mon: .Mon:

4
engine/pack.asm
View File

@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb
; entries correspond to *_POCKET constants ; entries correspond to *_POCKET constants
dw .Items dw .Items
dw .Balls dw .Balls
dw .wKeyItems dw .KeyItems
dw .TMHM dw .TMHM
.Items: ; 107e9 (4:47e9) .Items: ; 107e9 (4:47e9)
@ -1174,7 +1174,7 @@ TutorialPack: ; 107bb
dba UpdateItemDescription dba UpdateItemDescription
; 10807 ; 10807
.wKeyItems: ; 10807 (4:4807) .KeyItems: ; 10807 (4:4807)
ld a, KEY_ITEM_POCKET ld a, KEY_ITEM_POCKET
ld hl, .KeyItemsMenuHeader ld hl, .KeyItemsMenuHeader
jr .DisplayPocket jr .DisplayPocket

4
home/serial.asm
View File

@ -200,7 +200,7 @@ Serial_ExchangeByte:: ; 78a
cp SERIAL_NO_DATA_BYTE cp SERIAL_NO_DATA_BYTE
ret nz ret nz
call CheckwLinkTimeoutFramesNonzero call CheckwLinkTimeoutFramesNonzero
jr z, .wLinkTimeoutFrames_zero jr z, .linkTimeoutFrames_zero
push hl push hl
ld hl, wLinkTimeoutFrames + 1 ld hl, wLinkTimeoutFrames + 1
ld a, [hl] ld a, [hl]
@ -215,7 +215,7 @@ Serial_ExchangeByte:: ; 78a
call CheckwLinkTimeoutFramesNonzero call CheckwLinkTimeoutFramesNonzero
jr z, SerialDisconnected jr z, SerialDisconnected
.wLinkTimeoutFrames_zero .linkTimeoutFrames_zero
ld a, [rIE] ld a, [rIE]
and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
cp 1 << SERIAL cp 1 << SERIAL

8
mobile/mobile_5b.asm
View File

@ -200,7 +200,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, 20 ld bc, 20
xor a xor a
call ByteFill call ByteFill
ld hl, .wTileMap ld hl, .TileMap
decoord 0, 1 decoord 0, 1
ld bc, $0154 ld bc, $0154
call CopyBytes call CopyBytes
@ -212,7 +212,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
xor a xor a
call ByteFill call ByteFill
ld hl, .wAttrMap ld hl, .AttrMap
decoord 0, 1, wAttrMap decoord 0, 1, wAttrMap
ld bc, 17 * SCREEN_WIDTH ld bc, 17 * SCREEN_WIDTH
call CopyBytes call CopyBytes
@ -222,10 +222,10 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
.Tiles: .Tiles:
INCBIN "gfx/mobile/mobile_splash.2bpp" INCBIN "gfx/mobile/mobile_splash.2bpp"
.wTileMap: .TileMap:
INCBIN "gfx/mobile/mobile_splash.tilemap" INCBIN "gfx/mobile/mobile_splash.tilemap"
.wAttrMap: .AttrMap:
INCBIN "gfx/mobile/mobile_splash.attrmap" INCBIN "gfx/mobile/mobile_splash.attrmap"
UnknownMobilePalettes_16c903: ; 16c903 UnknownMobilePalettes_16c903: ; 16c903