diff options
| -rw-r--r-- | data/trainers/palettes.asm | 2 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld.asm | 8 | ||||
| -rw-r--r-- | engine/pack.asm | 4 | ||||
| -rw-r--r-- | home/serial.asm | 4 | ||||
| -rwxr-xr-x | mobile/mobile_5b.asm | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index ba546e417..c502846c4 100644 --- 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" diff --git a/engine/color.asm b/engine/color.asm index 1a38c3651..b0bc653b0 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer: ret .male - ld hl, wPlayerPalette + ld hl, PlayerPalette ret GetFrontpicPalettePointer: diff --git a/engine/overworld.asm b/engine/overworld.asm index be8fa44af..381c2d89f 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -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: diff --git a/engine/pack.asm b/engine/pack.asm index 91a76ee32..150f1805a 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -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 diff --git a/home/serial.asm b/home/serial.asm index 7fdf1fc03..c32e559dd 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -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 diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index a1bd0ae35..3ebe1736c 100755 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -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 |