diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 50 | ||||
| -rw-r--r-- | data/graphics/title_screen/lg_border_bg.bin | 1 | ||||
| -rw-r--r-- | data/graphics/title_screen/unk_lg_83bf764.pal | 19 | ||||
| -rw-r--r-- | data/graphics/title_screen/unk_lg_83bf784.png | bin | 0 -> 350 bytes | |||
| -rw-r--r-- | data/graphics/title_screen/unk_lg_83bf89c.png | bin | 0 -> 135 bytes | |||
| -rw-r--r-- | data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc | 59 | ||||
| -rw-r--r-- | data/strings.s | 2 |
7 files changed, 130 insertions, 1 deletions
diff --git a/data/graphics.s b/data/graphics.s index 570b73636..9d4464654 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" @@ -16532,6 +16551,30 @@ gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 .incbin "graphics/title_screen/unk_8eae094.gbapal" + .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" + +gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 + .incbin "graphics/title_screen/unk_lg_8eae388.gbapal" + .endif + .endif gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" @@ -16539,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" 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 Binary files differnew file mode 100644 index 000000000..d4f7dd622 --- /dev/null +++ b/data/graphics/title_screen/unk_lg_83bf784.png diff --git a/data/graphics/title_screen/unk_lg_83bf89c.png b/data/graphics/title_screen/unk_lg_83bf89c.png Binary files differnew file mode 100644 index 000000000..d783c1204 --- /dev/null +++ b/data/graphics/title_screen/unk_lg_83bf89c.png 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 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 |
