diff options
32 files changed, 437 insertions, 24 deletions
@@ -72,7 +72,7 @@ include castform.mk include tilesets.mk include fonts.mk include generated.mk -include menu.mk +include misc.mk %.png: ; %.pal: ; diff --git a/asm/rom4.s b/asm/rom4.s index 5dfecb2a1..3f6a94894 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -48184,7 +48184,7 @@ TryGetFieldMoveScript: @ 80686F4 b _0806876A .align 2, 0 _08068724: .4byte 0x0000080b -_08068728: .4byte gUnknown_081A0117 +_08068728: .4byte UseSurfScript _0806872C: adds r0, r4, 0 bl MetatileBehavior_IsWaterfall @@ -48207,12 +48207,12 @@ _0806872C: b _0806876A .align 2, 0 _08068758: .4byte 0x0000080e -_0806875C: .4byte gUnknown_081B115A +_0806875C: .4byte UseWaterfallScript _08068760: ldr r0, _08068764 b _0806876A .align 2, 0 -_08068764: .4byte gUnknown_081B1194 +_08068764: .4byte WaterfallScript _08068768: movs r0, 0 _0806876A: diff --git a/data/data1.s b/data/data1.s index b9a4e49ad..7f489f35d 100644 --- a/data/data1.s +++ b/data/data1.s @@ -3193,10 +3193,22 @@ Route109_EventScript_1A010C:: @ 81A010C setvar 0x4096, 0 return - .global gUnknown_081A0117 -gUnknown_081A0117: @ 81A0117 - - .incbin "baserom.gba", 0x1a0117, 0x37 +UseSurfScript:: @ 81A0117 + checkattack MOVE_SURF + compare RESULT, 6 + jumpeq UseSurfScript_NoMon + bufferpartypoke 0, RESULT + setanimation 0, RESULT + lockall + msgbox UseSurfPromptText, 5 + compare RESULT, 0 + jumpeq UseSurfScript_No + msgbox UsedSurfText, 4 + doanimation 0x9 +UseSurfScript_No: @ 81A014C + releaseall +UseSurfScript_NoMon: @ 81A014D + end EverGrandeCity_ChampionsRoom_EventScript_1A014E:: @ 81A014E LavaridgeTown_EventScript_1A014E:: @ 81A014E @@ -4459,7 +4471,12 @@ OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275 .string "While infected, POKéMON are said to\n" .string "grow exceptionally well.$" - .incbin "baserom.gba", 0x1a1344, 0x47 +UseSurfPromptText: @ 81A1344 + .string "The water is dyed a deep blue...\n" + .string "Would you like to SURF?$" + +UsedSurfText: @ 81A137D + .string "{STR_VAR_1} used SURF!$" .include "data/maps/text/SealedChamber_InnerRoom.s" .include "data/maps/text/AncientTomb.s" @@ -9890,13 +9907,39 @@ FieryPath_EventScript_1B103A:: @ 81B103A end .include "data/maps/text/FieryPath.s" - .global gUnknown_081B115A -gUnknown_081B115A: @ 81B115A - .incbin "baserom.gba", 0x001b115a, 0x3a - .global gUnknown_081B1194 -gUnknown_081B1194: @ 81B1194 - .incbin "baserom.gba", 0x001b1194, 0x8c +UseWaterfallScript:: @ 81B115A + lockall + checkattack MOVE_WATERFALL + compare RESULT, 6 + jumpeq UseWaterfallScript_NoMon + bufferpartypoke 0, RESULT + setanimation 0, RESULT + msgbox UseWaterfallPromptText, 5 + compare RESULT, 0 + jumpeq WaterfallScript_Done + msgbox UsedWaterfallText, 4 + doanimation 0x2B + jump WaterfallScript_Done + +WaterfallScript:: @ 81B1194 + lockall +UseWaterfallScript_NoMon: @ 81B1195 + msgbox WaterfallText, 4 +WaterfallScript_Done: @ 81B119D + releaseall + end + +WaterfallText: @ 81B119F + .string "A wall of water is crashing down with\n" + .string "a mighty roar.$" + +UseWaterfallPromptText: @ 81B11D4 + .string "It’s a large waterfall.\n" + .string "Would you like to use WATERFALL?$" + +UsedWaterfallText: @ 81B120D + .string "{STR_VAR_1} used WATERFALL.$" .global gUnknown_081B1220 gUnknown_081B1220: @ 81B1220 diff --git a/data/data2.s b/data/data2.s index d83c82127..7d8a78d47 100644 --- a/data/data2.s +++ b/data/data2.s @@ -13186,11 +13186,27 @@ gUnknown_08406334: @ 8406334 .global gUnknown_0840633A gUnknown_0840633A: @ 840633A - .incbin "baserom.gba", 0x0040633a, 0x63a + .incbin "baserom.gba", 0x0040633a, 0x46 + .incbin "graphics/intro/intro.4bpp.lz" .global gUnknown_08406974 gUnknown_08406974: @ 8406974 - .incbin "baserom.gba", 0x00406974, 0x200 + .incbin "graphics/intro/intro1_bgpal1.gbapal" + .incbin "graphics/intro/intro1_bgpal2.gbapal" + .incbin "graphics/intro/intro1_bgpal3.gbapal" + .incbin "graphics/intro/intro1_bgpal4.gbapal" + .incbin "graphics/intro/intro1_bgpal5.gbapal" + .incbin "graphics/intro/intro1_bgpal6.gbapal" + .incbin "graphics/intro/intro1_bgpal7.gbapal" + .incbin "graphics/intro/intro1_bgpal8.gbapal" + .incbin "graphics/intro/intro1_bgpal9.gbapal" + .incbin "graphics/intro/intro1_bgpal10.gbapal" + .incbin "graphics/intro/intro1_bgpal11.gbapal" + .incbin "graphics/intro/intro1_bgpal12.gbapal" + .incbin "graphics/intro/intro1_bgpal13.gbapal" + .incbin "graphics/intro/intro1_bgpal14.gbapal" + .incbin "graphics/intro/intro1_bgpal15.gbapal" + .incbin "graphics/intro/intro1_bgpal16.gbapal" .global gUnknown_08406B74 gUnknown_08406B74: @ 8406B74 @@ -13210,7 +13226,8 @@ gUnknown_0840754C: @ 840754C .global gUnknown_08407764 gUnknown_08407764: @ 8407764 - .incbin "baserom.gba", 0x00407764, 0x2170 +@ replacing .incbin "baserom.gba", 0x00407764, 0x2170 + .incbin "graphics/intro/introgfx.4bpp.lz" .global gUnknown_084098D4 gUnknown_084098D4: @ 84098D4 diff --git a/data/graphics.s b/data/graphics.s index 717007b9b..a8f2cdf68 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -122,7 +122,9 @@ gInterfacePal_PremierBall: .global gUnknown_08D030D0 gUnknown_08D030D0: @ 8D030D0 - .incbin "baserom.gba", 0xD030D0, 0x6B78 + .incbin "graphics/interface/ball_open.4bpp.lz" + .incbin "graphics/interface/blank.4bpp.lz" + .incbin "baserom.gba", 0x00d03248, 0x6A00 .global gUnknown_08D09C48 gUnknown_08D09C48: @ 8D09C48 diff --git a/graphics/interface/blank.png b/graphics/interface/blank.png Binary files differnew file mode 100755 index 000000000..3a4ba289c --- /dev/null +++ b/graphics/interface/blank.png diff --git a/graphics/intro/intro.pal b/graphics/intro/intro.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1.png b/graphics/intro/intro1.png Binary files differnew file mode 100755 index 000000000..13dd3e216 --- /dev/null +++ b/graphics/intro/intro1.png diff --git a/graphics/intro/intro1_bg.png b/graphics/intro/intro1_bg.png Binary files differnew file mode 100755 index 000000000..14b3cb5ec --- /dev/null +++ b/graphics/intro/intro1_bg.png diff --git a/graphics/intro/intro1_bgpal1.pal b/graphics/intro/intro1_bgpal1.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal10.pal b/graphics/intro/intro1_bgpal10.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal11.pal b/graphics/intro/intro1_bgpal11.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal12.pal b/graphics/intro/intro1_bgpal12.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal13.pal b/graphics/intro/intro1_bgpal13.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal13.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal14.pal b/graphics/intro/intro1_bgpal14.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal14.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal15.pal b/graphics/intro/intro1_bgpal15.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal15.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal16.pal b/graphics/intro/intro1_bgpal16.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal16.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal2.pal b/graphics/intro/intro1_bgpal2.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal3.pal b/graphics/intro/intro1_bgpal3.pal new file mode 100755 index 000000000..8a1fb05a5 --- /dev/null +++ b/graphics/intro/intro1_bgpal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +0 16 0 +8 41 0 +16 57 0 +123 197 16 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal4.pal b/graphics/intro/intro1_bgpal4.pal new file mode 100755 index 000000000..9761c8fac --- /dev/null +++ b/graphics/intro/intro1_bgpal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +8 24 8 +8 41 0 +16 57 0 +148 205 98 +98 172 74 +238 255 238 diff --git a/graphics/intro/intro1_bgpal5.pal b/graphics/intro/intro1_bgpal5.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal6.pal b/graphics/intro/intro1_bgpal6.pal new file mode 100755 index 000000000..c242494ac --- /dev/null +++ b/graphics/intro/intro1_bgpal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +246 246 238 +238 246 230 +230 246 222 +205 238 222 +180 230 230 +172 213 238 +131 205 238 +180 180 156 +213 213 230 +205 197 213 +189 230 115 +156 213 98 +222 230 222 +115 172 98 diff --git a/graphics/intro/intro1_bgpal7.pal b/graphics/intro/intro1_bgpal7.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_bgpal8.pal b/graphics/intro/intro1_bgpal8.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro1_bgpal8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1_bgpal9.pal b/graphics/intro/intro1_bgpal9.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal9.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/intro/intro1_gamefreak.pal b/graphics/intro/intro1_gamefreak.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro1_gamefreak.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1_gamefreak.png b/graphics/intro/intro1_gamefreak.png Binary files differnew file mode 100755 index 000000000..fe734a591 --- /dev/null +++ b/graphics/intro/intro1_gamefreak.png diff --git a/graphics/intro/intro1_leaves.png b/graphics/intro/intro1_leaves.png Binary files differnew file mode 100755 index 000000000..38c442b24 --- /dev/null +++ b/graphics/intro/intro1_leaves.png diff --git a/graphics/intro/intro1_waterdrops.png b/graphics/intro/intro1_waterdrops.png Binary files differnew file mode 100755 index 000000000..13dd3e216 --- /dev/null +++ b/graphics/intro/intro1_waterdrops.png diff --git a/graphics/intro/intro2.png b/graphics/intro/intro2.png Binary files differnew file mode 100755 index 000000000..fe734a591 --- /dev/null +++ b/graphics/intro/intro2.png diff --git a/menu.mk b/menu.mk deleted file mode 100755 index b4135ad72..000000000 --- a/menu.mk +++ /dev/null @@ -1,5 +0,0 @@ -MENUGFXDIR := graphics/interface - -$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal - - @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
\ No newline at end of file diff --git a/misc.mk b/misc.mk new file mode 100755 index 000000000..b0c3c7a66 --- /dev/null +++ b/misc.mk @@ -0,0 +1,14 @@ +MENUGFXDIR := graphics/interface +INTROGFXDIR := graphics/intro + +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal + + @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ + +$(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp + + @cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@ + +$(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp + + @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ |
