ref: 612fd7cb96746cf122b0d500991ea17122f0d90c
parent: 62d6f72bb35ed75574bb74b2edca120f8d80a628
parent: 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Thu Feb 15 16:21:58 EST 2018
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # maps/KrissHouse2F.asm
--- a/data/trainers/palettes.asm
+++ b/data/trainers/palettes.asm
@@ -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"
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -716,7 +716,7 @@
ret
.male
- ld hl, wPlayerPalette
+ ld hl, PlayerPalette
ret
GetFrontpicPalettePointer:
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -220,9 +220,9 @@
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 @@
ld a, [hl]
jr .Mon
-.wBreedMon1
+.BreedMon1
ld a, [wBreedMon1Species]
jr .Mon
-.wBreedMon2
+.BreedMon2
ld a, [wBreedMon2Species]
.Mon:
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1148,7 +1148,7 @@
; entries correspond to *_POCKET constants
dw .Items
dw .Balls
- dw .wKeyItems
+ dw .KeyItems
dw .TMHM
.Items: ; 107e9 (4:47e9)
@@ -1174,7 +1174,7 @@
dba UpdateItemDescription
; 10807
-.wKeyItems: ; 10807 (4:4807)
+.KeyItems: ; 10807 (4:4807)
ld a, KEY_ITEM_POCKET
ld hl, .KeyItemsMenuHeader
jr .DisplayPocket
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -200,7 +200,7 @@
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 @@
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
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -200,7 +200,7 @@
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 @@
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 @@
.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