From 8b007e8d51ec86992d97fa4b1c05b762e0916427 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 4 Feb 2018 22:45:04 -0500 Subject: [PATCH] Fix more w-izing edge cases. --- data/trainers/palettes.asm | 2 +- engine/color.asm | 2 +- engine/overworld.asm | 8 ++++---- engine/pack.asm | 4 ++-- home/serial.asm | 4 ++-- maps/KrissHouse2F.asm | 20 ++++++++++---------- mobile/mobile_5b.asm | 8 ++++---- 7 files changed, 24 insertions(+), 24 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 21842b7b3..4f07d0fdb 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 7e3a69c6f..79c6ed526 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -233,9 +233,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 @@ -253,11 +253,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 dfe30612d..e900c75b8 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, .KeyItemsMenuDataHeader 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/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f250d2cec..f1dcc7e2f 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -34,19 +34,19 @@ KrissHouse2F_MapScripts: db 0, 0, 0 ; filler -Doll1: +DecoDoll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2: +DecoDoll2Script: describedecoration DECODESC_RIGHT_DOLL -wDecoBigDoll: +DecoBigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsole: +DecoGameConsoleScript: describedecoration DECODESC_CONSOLE -KrissHousePoster: +DecoPosterScript: conditional_event EVENT_KRISS_ROOM_POSTER, .Script .Script: @@ -131,11 +131,11 @@ KrissHouse2F_MapEvents: bg_event 2, 1, BGEVENT_UP, KrissHousePC bg_event 3, 1, BGEVENT_READ, KrissHouseRadio bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster + bg_event 6, 0, BGEVENT_IFSET, DecoPosterScript .ObjectEvents: db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, wDecoBigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoGameConsoleScript, EVENT_KRISS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll1Script, EVENT_KRISS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll2Script, EVENT_KRISS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoBigDollScript, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index a35c85641..c5cc54a50 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