From 1f4cbf7cb8d1351de18e0dd8e77caee00b9945ab Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 5 Apr 2025 10:06:19 -0500 Subject: [PATCH] Fix Victreebel typos --- data/mon_gfx/mon_billboard_palette_maps_1.asm | 2 +- data/mon_gfx/mon_billboard_palettes_5.asm | 4 ++-- data/mon_gfx/mon_billboard_pics_10.asm | 8 ++++---- data/mon_gfx/mon_gfx_pointers.asm | 6 +++--- .../mon_pics/{victreebell.png => victreebel.png} | Bin .../{victreebell.png => victreebel.png} | Bin text/pokedex_descriptions.asm | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename gfx/billboard/mon_pics/{victreebell.png => victreebel.png} (100%) rename gfx/billboard/mon_silhouettes/{victreebell.png => victreebel.png} (100%) diff --git a/data/mon_gfx/mon_billboard_palette_maps_1.asm b/data/mon_gfx/mon_billboard_palette_maps_1.asm index e471e02..f30a3aa 100644 --- a/data/mon_gfx/mon_billboard_palette_maps_1.asm +++ b/data/mon_gfx/mon_billboard_palette_maps_1.asm @@ -230,7 +230,7 @@ WeepinbellBillboardBGPaletteMap: ; 0xd7a78 db $7, $7, $7, $6, $6, $6 db $7, $7, $7, $6, $6, $6 -VictreebellBillboardBGPaletteMap: ; 0xd7a90 +VictreebelBillboardBGPaletteMap: ; 0xd7a90 db $6, $6, $6, $6, $6, $6 db $6, $6, $7, $6, $6, $6 db $6, $6, $7, $7, $7, $7 diff --git a/data/mon_gfx/mon_billboard_palettes_5.asm b/data/mon_gfx/mon_billboard_palettes_5.asm index 4bc40b1..7712298 100644 --- a/data/mon_gfx/mon_billboard_palettes_5.asm +++ b/data/mon_gfx/mon_billboard_palettes_5.asm @@ -768,12 +768,12 @@ WeepinbellBillboardBGPalette2: ; 0xdc558 RGB 31, 11, 8 RGB 0, 0, 0 -VictreebellBillboardBGPalette1: ; 0xdc560 +VictreebelBillboardBGPalette1: ; 0xdc560 RGB 31, 31, 31 RGB 29, 31, 9 RGB 11, 20, 0 RGB 0, 0, 0 -VictreebellBillboardBGPalette2: ; 0xdc568 +VictreebelBillboardBGPalette2: ; 0xdc568 RGB 31, 31, 31 RGB 29, 31, 9 RGB 31, 11, 8 diff --git a/data/mon_gfx/mon_billboard_pics_10.asm b/data/mon_gfx/mon_billboard_pics_10.asm index d00d934..e7e9415 100644 --- a/data/mon_gfx/mon_billboard_pics_10.asm +++ b/data/mon_gfx/mon_billboard_pics_10.asm @@ -22,10 +22,10 @@ WeepinbellPic: ; 0x98f00 INCBIN "gfx/billboard/mon_pics/weepinbell.2bpp" WeepinbellSilhouettePic: ; 0x97080 INCBIN "gfx/billboard/mon_silhouettes/weepinbell.2bpp" -VictreebellPic: ; 0x97200 - INCBIN "gfx/billboard/mon_pics/victreebell.2bpp" -VictreebellSilhouettePic: ; 0x97380 - INCBIN "gfx/billboard/mon_silhouettes/victreebell.2bpp" +VictreebelPic: ; 0x97200 + INCBIN "gfx/billboard/mon_pics/victreebel.2bpp" +VictreebelSilhouettePic: ; 0x97380 + INCBIN "gfx/billboard/mon_silhouettes/victreebel.2bpp" TentacoolPic: ; 0x97500 INCBIN "gfx/billboard/mon_pics/tentacool.2bpp" TentacoolSilhouettePic: ; 0x97680 diff --git a/data/mon_gfx/mon_gfx_pointers.asm b/data/mon_gfx/mon_gfx_pointers.asm index bf780b5..525a065 100644 --- a/data/mon_gfx/mon_gfx_pointers.asm +++ b/data/mon_gfx/mon_gfx_pointers.asm @@ -69,7 +69,7 @@ MonBillboardPicPointers: ; 0x12b50 dwb MachampPic, Bank(MachampPic) dwb BellsproutPic, Bank(BellsproutPic) dwb WeepinbellPic, Bank(WeepinbellPic) - dwb VictreebellPic, Bank(VictreebellPic) + dwb VictreebelPic, Bank(VictreebelPic) dwb TentacoolPic, Bank(TentacoolPic) dwb TentacruelPic, Bank(TentacruelPic) dwb GeodudePic, Bank(GeodudePic) @@ -222,7 +222,7 @@ MonBillboardPaletteMapPointers: ; 0x12d15 dwb MachampBillboardBGPaletteMap, Bank(MachampBillboardBGPaletteMap) dwb BellsproutBillboardBGPaletteMap, Bank(BellsproutBillboardBGPaletteMap) dwb WeepinbellBillboardBGPaletteMap, Bank(WeepinbellBillboardBGPaletteMap) - dwb VictreebellBillboardBGPaletteMap, Bank(VictreebellBillboardBGPaletteMap) + dwb VictreebelBillboardBGPaletteMap, Bank(VictreebelBillboardBGPaletteMap) dwb TentacoolBillboardBGPaletteMap, Bank(TentacoolBillboardBGPaletteMap) dwb TentacruelBillboardBGPaletteMap, Bank(TentacruelBillboardBGPaletteMap) dwb GeodudeBillboardBGPaletteMap, Bank(GeodudeBillboardBGPaletteMap) @@ -375,7 +375,7 @@ MonBillboardPalettePointers: ; 0x12eda dwb MachampBillboardBGPalette1, Bank(MachampBillboardBGPalette1) dwb BellsproutBillboardBGPalette1, Bank(BellsproutBillboardBGPalette1) dwb WeepinbellBillboardBGPalette1, Bank(WeepinbellBillboardBGPalette1) - dwb VictreebellBillboardBGPalette1, Bank(VictreebellBillboardBGPalette1) + dwb VictreebelBillboardBGPalette1, Bank(VictreebelBillboardBGPalette1) dwb TentacoolBillboardBGPalette1, Bank(TentacoolBillboardBGPalette1) dwb TentacruelBillboardBGPalette1, Bank(TentacruelBillboardBGPalette1) dwb GeodudeBillboardBGPalette1, Bank(GeodudeBillboardBGPalette1) diff --git a/gfx/billboard/mon_pics/victreebell.png b/gfx/billboard/mon_pics/victreebel.png similarity index 100% rename from gfx/billboard/mon_pics/victreebell.png rename to gfx/billboard/mon_pics/victreebel.png diff --git a/gfx/billboard/mon_silhouettes/victreebell.png b/gfx/billboard/mon_silhouettes/victreebel.png similarity index 100% rename from gfx/billboard/mon_silhouettes/victreebell.png rename to gfx/billboard/mon_silhouettes/victreebel.png diff --git a/text/pokedex_descriptions.asm b/text/pokedex_descriptions.asm index c509e9e..340a2fa 100644 --- a/text/pokedex_descriptions.asm +++ b/text/pokedex_descriptions.asm @@ -73,7 +73,7 @@ PokedexDescriptionPointers: ; 0x2c002 dw MachampPokedexDescription dw BellsproutPokedexDescription dw WeepinbellPokedexDescription - dw VictreebellPokedexDescription + dw VictreebelPokedexDescription dw TentacoolPokedexDescription dw TentacruelPokedexDescription dw GeodudePokedexDescription @@ -1505,7 +1505,7 @@ WeepinbellPokedexDescription: ; 0x2f87e dex_line "a spray of ACID." dex_end -VictreebellPokedexDescription: ; 0x2f8d8 +VictreebelPokedexDescription: ; 0x2f8d8 dex_text "Said to live in" dex_line "huge colonies" dex_line "deep in jungles,"