From d5c4f4429a4bdab6708efa05bac8399aabb074f7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 19 Dec 2019 15:27:35 -0500 Subject: More LG matching --- data/graphics/title_screen/lg_border_bg.bin | 1 + data/graphics/title_screen/unk_lg_83bf764.pal | 19 +++++++++++++++++++ data/graphics/title_screen/unk_lg_83bf784.png | Bin 0 -> 350 bytes data/graphics/title_screen/unk_lg_83bf89c.png | Bin 0 -> 135 bytes 4 files changed, 20 insertions(+) create mode 100644 data/graphics/title_screen/lg_border_bg.bin create mode 100644 data/graphics/title_screen/unk_lg_83bf764.pal create mode 100644 data/graphics/title_screen/unk_lg_83bf784.png create mode 100644 data/graphics/title_screen/unk_lg_83bf89c.png (limited to 'data') diff --git a/data/graphics/title_screen/lg_border_bg.bin b/data/graphics/title_screen/lg_border_bg.bin new file mode 100644 index 000000000..108680bc3 --- /dev/null +++ b/data/graphics/title_screen/lg_border_bg.bin @@ -0,0 +1 @@ +àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààððððàððàààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/data/graphics/title_screen/unk_lg_83bf764.pal b/data/graphics/title_screen/unk_lg_83bf764.pal new file mode 100644 index 000000000..9a13f7dad --- /dev/null +++ b/data/graphics/title_screen/unk_lg_83bf764.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 123 90 +16 164 74 +148 255 57 +98 222 57 +57 189 65 +230 255 230 +148 255 205 +82 246 131 +180 180 115 +255 205 148 +246 172 123 +238 148 106 +0 0 0 +0 0 0 +0 0 0 +230 123 90 diff --git a/data/graphics/title_screen/unk_lg_83bf784.png b/data/graphics/title_screen/unk_lg_83bf784.png new file mode 100644 index 000000000..d4f7dd622 Binary files /dev/null and b/data/graphics/title_screen/unk_lg_83bf784.png differ diff --git a/data/graphics/title_screen/unk_lg_83bf89c.png b/data/graphics/title_screen/unk_lg_83bf89c.png new file mode 100644 index 000000000..d783c1204 Binary files /dev/null and b/data/graphics/title_screen/unk_lg_83bf89c.png differ -- cgit v1.2.3 From 3770909be050ae93c5f83ac8b1e9deb2ef3f4ca6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Dec 2019 09:39:55 -0500 Subject: Finish aligning assets in LG --- data/graphics.s | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 570b73636..35c729824 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -11885,7 +11885,13 @@ gMonFootprint_Jirachi:: @ 8E3956C .align 2 gMonFrontPic_Deoxys:: @ 8E3958C + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/front.4bpp.lz" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/front_def.4bpp.lz" + .endif + .endif .align 2 gMonPalette_Deoxys:: @ 8E39D48 @@ -11893,7 +11899,13 @@ gMonPalette_Deoxys:: @ 8E39D48 .align 2 gMonBackPic_Deoxys:: @ 8E39D70 + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/back.4bpp.lz" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/back_def.4bpp.lz" + .endif + .endif .align 2 gMonShinyPalette_Deoxys:: @ 8E3A360 @@ -11903,7 +11915,13 @@ gMonShinyPalette_Deoxys:: @ 8E3A360 gMonIcon_Deoxys:: @ 8E3A388 .incbin "graphics/pokemon/deoxys/icon.4bpp" @ Referenced as part of the same array as normal deoxys + .ifdef FIRERED .incbin "graphics/pokemon/deoxys/icon_attack.4bpp" + .else + .ifdef LEAFGREEN + .incbin "graphics/pokemon/deoxys/icon_defense.4bpp" + .endif + .endif .align 2 gMonFootprint_Deoxys:: @ 8E3AB88 @@ -16512,6 +16530,7 @@ gCreditsPokeballBgGfxMap:: @ 8EAB30C .incbin "graphics/credits/unk_8EAB30C.bin.lz" @ title_screen + .ifdef FIRERED gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 .incbin "graphics/title_screen/unk_8eab6c4.gbapal" @@ -16529,6 +16548,27 @@ gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_8eadee4.bin.lz" + .else + .ifdef LEAFGREEN +gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 + .incbin "graphics/title_screen/unk_lg_8eab744.gbapal" + +gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 + .incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz" + +gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 + .incbin "graphics/title_screen/unk_lg_8ead508.bin.lz" + +gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 + .incbin "graphics/title_screen/unk_lg_8ead768.gbapal" + +gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 + .incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz" + +gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 + .incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz" + .endif + .endif gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 .incbin "graphics/title_screen/unk_8eae094.gbapal" -- cgit v1.2.3 From ba5861e45266fb0b32a5e5da10acd534838ccafd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Dec 2019 10:05:25 -0500 Subject: leafgreen match .text --- data/strings.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index e36f52553..c42765c68 100644 --- a/data/strings.s +++ b/data/strings.s @@ -12,7 +12,7 @@ gExpandedPlaceholder_Kun:: @ 8415A21 gExpandedPlaceholder_Chan:: @ 8415A22 .string "$" -gUnknown_8415A23:: @ 0x8415A23 +gExpandedPlaceholder_Sapphire:: @ 0x8415A23 .string "SAPPHIRE$" gExpandedPlaceholder_Ruby:: @ 8415A2C -- cgit v1.2.3 From 6ba9836ca1efaa3b36d8db3b089f5927dcea8954 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Dec 2019 10:23:32 -0500 Subject: Match leafgreen script_data --- .../CeladonCity_GameCorner_PrizeRoom/scripts.inc | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'data') diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 01ad2b414..33f5da4bb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -42,32 +42,67 @@ EventScript_16CC10:: @ 816CC10 end EventScript_16CC15:: @ 816CC15 + .ifdef FIRERED setvar VAR_0x4001, SPECIES_ABRA setvar VAR_0x4002, 180 + .else + .ifdef LEAFGREEN + setvar VAR_0x4001, SPECIES_ABRA + setvar VAR_0x4002, 120 + .endif + .endif goto EventScript_16CC65 end EventScript_16CC25:: @ 816CC25 + .ifdef FIRERED setvar VAR_0x4001, SPECIES_CLEFAIRY setvar VAR_0x4002, 500 + .else + .ifdef LEAFGREEN + setvar VAR_0x4001, SPECIES_CLEFAIRY + setvar VAR_0x4002, 750 + .endif + .endif goto EventScript_16CC65 end EventScript_16CC35:: @ 816CC35 + .ifdef FIRERED setvar VAR_0x4001, SPECIES_DRATINI setvar VAR_0x4002, 2800 + .else + .ifdef LEAFGREEN + setvar VAR_0x4001, SPECIES_PINSIR + setvar VAR_0x4002, 2500 + .endif + .endif goto EventScript_16CC65 end EventScript_16CC45:: @ 816CC45 + .ifdef FIRERED setvar VAR_0x4001, SPECIES_SCYTHER setvar VAR_0x4002, 5500 + .else + .ifdef LEAFGREEN + setvar VAR_0x4001, SPECIES_DRATINI + setvar VAR_0x4002, 4600 + .endif + .endif goto EventScript_16CC65 end EventScript_16CC55:: @ 816CC55 + .ifdef FIRERED setvar VAR_0x4001, SPECIES_PORYGON setvar VAR_0x4002, 9999 + .else + .ifdef LEAFGREEN + setvar VAR_0x4001, SPECIES_PORYGON + setvar VAR_0x4002, 6500 + .endif + .endif goto EventScript_16CC65 end @@ -90,17 +125,35 @@ EventScript_16CC65:: @ 816CC65 end EventScript_16CCD4:: @ 816CCD4 + .ifdef FIRERED givemon VAR_0x4001, 9, ITEM_NONE, 0, 0, 0 + .else + .ifdef LEAFGREEN + givemon VAR_0x4001, 7, ITEM_NONE, 0, 0, 0 + .endif + .endif goto EventScript_16CD52 end EventScript_16CCE9:: @ 816CCE9 + .ifdef FIRERED givemon VAR_0x4001, 8, ITEM_NONE, 0, 0, 0 + .else + .ifdef LEAFGREEN + givemon VAR_0x4001, 12, ITEM_NONE, 0, 0, 0 + .endif + .endif goto EventScript_16CD52 end EventScript_16CCFE:: @ 816CCFE + .ifdef FIRERED givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + .else + .ifdef LEAFGREEN + givemon VAR_0x4001, 24, ITEM_NONE, 0, 0, 0 + .endif + .endif goto EventScript_16CD52 end @@ -110,7 +163,13 @@ EventScript_16CD13:: @ 816CD13 end EventScript_16CD28:: @ 816CD28 + .ifdef FIRERED givemon VAR_0x4001, 26, ITEM_NONE, 0, 0, 0 + .else + .ifdef LEAFGREEN + givemon VAR_0x4001, 18, ITEM_NONE, 0, 0, 0 + .endif + .endif goto EventScript_16CD52 end -- cgit v1.2.3 From 32c41f0ec016e9684bc394e6c73b27e5535b4bae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Dec 2019 14:19:13 -0500 Subject: MILESTONE: Match LeafGreen 1.0 and 1.1 --- data/graphics.s | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 35c729824..9d4464654 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16548,6 +16548,9 @@ gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_8eadee4.bin.lz" + +gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 + .incbin "graphics/title_screen/unk_8eae094.gbapal" .else .ifdef LEAFGREEN gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 @@ -16567,11 +16570,11 @@ gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz" - .endif - .endif gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 - .incbin "graphics/title_screen/unk_8eae094.gbapal" + .incbin "graphics/title_screen/unk_lg_8eae388.gbapal" + .endif + .endif gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" @@ -16579,8 +16582,15 @@ gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374 .incbin "graphics/title_screen/unk_8eae374.bin.lz" + .ifdef FIRERED gGraphics_TitleScreen_FirePals:: @ 8EAE488 .incbin "graphics/title_screen/unk_8eae488.gbapal" + .else + .ifdef LEAFGREEN +gGraphics_TitleScreen_FirePals:: @ 8EAE488 + .incbin "graphics/title_screen/unk_lg_8eae77c.gbapal" + .endif + .endif gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8 .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" -- cgit v1.2.3 From d6741335d61fe61cfbfff5f7ae88059502d1f63b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Dec 2019 15:35:40 -0500 Subject: Rename title screen assets and remove dummied standalone pal --- data/graphics.s | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 9d4464654..cea2a0ab3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16531,44 +16531,44 @@ gCreditsPokeballBgGfxMap:: @ 8EAB30C @ title_screen .ifdef FIRERED -gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 +gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4 .incbin "graphics/title_screen/unk_8eab6c4.gbapal" -gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 +gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4 .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz" -gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 +gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390 .incbin "graphics/title_screen/unk_8ead390.bin.lz" -gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 +gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8 .incbin "graphics/title_screen/unk_8ead5e8.gbapal" -gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 +gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608 .incbin "graphics/title_screen/unk_8ead608.4bpp.lz" -gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 +gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_8eadee4.bin.lz" gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 .incbin "graphics/title_screen/unk_8eae094.gbapal" .else .ifdef LEAFGREEN -gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 +gGraphics_TitleScreen_GameTitleLogoPals:: @ 8EAB6C4 .incbin "graphics/title_screen/unk_lg_8eab744.gbapal" -gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 +gGraphics_TitleScreen_GameTitleLogoTiles:: @ 8EAB8C4 .incbin "graphics/title_screen/unk_lg_8eab944.8bpp.lz" -gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 +gGraphics_TitleScreen_GameTitleLogoMap:: @ 8EAD390 .incbin "graphics/title_screen/unk_lg_8ead508.bin.lz" -gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 +gGraphics_TitleScreen_BoxArtMonPals:: @ 8EAD5E8 .incbin "graphics/title_screen/unk_lg_8ead768.gbapal" -gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 +gGraphics_TitleScreen_BoxArtMonTiles:: @ 8EAD608 .incbin "graphics/title_screen/unk_lg_8ead788.4bpp.lz" -gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 +gGraphics_TitleScreen_BoxArtMonMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_lg_8eae1ec.bin.lz" gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 @@ -16583,11 +16583,11 @@ gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374 .incbin "graphics/title_screen/unk_8eae374.bin.lz" .ifdef FIRERED -gGraphics_TitleScreen_FirePals:: @ 8EAE488 +gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488 .incbin "graphics/title_screen/unk_8eae488.gbapal" .else .ifdef LEAFGREEN -gGraphics_TitleScreen_FirePals:: @ 8EAE488 +gGraphics_TitleScreen_FireOrLeafPals:: @ 8EAE488 .incbin "graphics/title_screen/unk_lg_8eae77c.gbapal" .endif .endif -- cgit v1.2.3