From 95ea0e92e7e24de9ad77dfa0a3224718cd1564c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Aug 2020 17:49:42 -0400 Subject: Start documenting rayquaza_scene --- data/maps/SootopolisCity/scripts.inc | 8 +- graphics/rayquaza_scene/chase.pal | 67 ------ graphics/rayquaza_scene/chase_bg.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/chase_bg.png | Bin 336 -> 0 bytes graphics/rayquaza_scene/chase_streaks.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/chase_streaks.png | Bin 279 -> 0 bytes graphics/rayquaza_scene/clouds.pal | 35 --- graphics/rayquaza_scene/clouds.png | Bin 964 -> 0 bytes graphics/rayquaza_scene/clouds1.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/clouds2.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/clouds3.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/groudon.png | Bin 1578 -> 0 bytes graphics/rayquaza_scene/groudon_claw.png | Bin 445 -> 0 bytes graphics/rayquaza_scene/groudon_left.png | Bin 1153 -> 0 bytes graphics/rayquaza_scene/groudon_shoulder.png | Bin 259 -> 0 bytes graphics/rayquaza_scene/groudon_tail.png | Bin 168 -> 0 bytes graphics/rayquaza_scene/hush_bg.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/hush_bg.pal | 51 ----- graphics/rayquaza_scene/hush_bg.png | Bin 339 -> 0 bytes graphics/rayquaza_scene/hush_ring.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/hush_ring.png | Bin 385 -> 0 bytes graphics/rayquaza_scene/hush_ring_map.bin | Bin 256 -> 0 bytes graphics/rayquaza_scene/kyogre.png | Bin 1110 -> 0 bytes graphics/rayquaza_scene/kyogre_fin.png | Bin 261 -> 0 bytes graphics/rayquaza_scene/kyogre_right.png | Bin 505 -> 0 bytes graphics/rayquaza_scene/kyogre_shoulder.png | Bin 179 -> 0 bytes graphics/rayquaza_scene/overcast.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/overcast.png | Bin 3705 -> 0 bytes graphics/rayquaza_scene/overcast2.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/overcast2.pal | 35 --- graphics/rayquaza_scene/overcast2.png | Bin 2408 -> 0 bytes graphics/rayquaza_scene/rayquaza.bin | Bin 1024 -> 0 bytes graphics/rayquaza_scene/rayquaza.png | Bin 3187 -> 0 bytes graphics/rayquaza_scene/rayquaza_chase.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/rayquaza_chase.png | Bin 2184 -> 0 bytes graphics/rayquaza_scene/rayquaza_chase2.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/rayquaza_fly1.png | Bin 815 -> 0 bytes graphics/rayquaza_scene/rayquaza_flyin.png | Bin 391 -> 0 bytes graphics/rayquaza_scene/rayquaza_hover.png | Bin 2370 -> 0 bytes graphics/rayquaza_scene/rayquaza_light.bin | Bin 2048 -> 0 bytes graphics/rayquaza_scene/rayquaza_light.png | Bin 534 -> 0 bytes graphics/rayquaza_scene/rayquaza_tail.png | Bin 264 -> 0 bytes graphics/rayquaza_scene/scene_1/clouds.pal | 35 +++ graphics/rayquaza_scene/scene_1/clouds.png | Bin 0 -> 964 bytes graphics/rayquaza_scene/scene_1/clouds1.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_1/clouds2.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_1/clouds3.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_1/groudon.png | Bin 0 -> 1578 bytes graphics/rayquaza_scene/scene_1/groudon_claw.png | Bin 0 -> 445 bytes .../rayquaza_scene/scene_1/groudon_shoulder.png | Bin 0 -> 259 bytes graphics/rayquaza_scene/scene_1/kyogre.png | Bin 0 -> 1110 bytes graphics/rayquaza_scene/scene_1/kyogre_fin.png | Bin 0 -> 261 bytes .../rayquaza_scene/scene_1/kyogre_shoulder.png | Bin 0 -> 179 bytes graphics/rayquaza_scene/scene_2/bg.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_2/bg.png | Bin 0 -> 3705 bytes graphics/rayquaza_scene/scene_2/rayquaza.bin | Bin 0 -> 1024 bytes graphics/rayquaza_scene/scene_2/rayquaza.png | Bin 0 -> 3187 bytes graphics/rayquaza_scene/scene_2/smoke.png | Bin 0 -> 242 bytes graphics/rayquaza_scene/scene_3/bg.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_3/bg.pal | 35 +++ graphics/rayquaza_scene/scene_3/bg.png | Bin 0 -> 2408 bytes graphics/rayquaza_scene/scene_3/light.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_3/light.png | Bin 0 -> 534 bytes graphics/rayquaza_scene/scene_3/rayquaza.png | Bin 0 -> 815 bytes graphics/rayquaza_scene/scene_3/rayquaza_tail.png | Bin 0 -> 264 bytes graphics/rayquaza_scene/scene_4/bg.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_4/bg.pal | 67 ++++++ graphics/rayquaza_scene/scene_4/bg.png | Bin 0 -> 336 bytes graphics/rayquaza_scene/scene_4/rayquaza.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_4/rayquaza.png | Bin 0 -> 2184 bytes graphics/rayquaza_scene/scene_4/rayquaza2.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_4/streaks.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_4/streaks.png | Bin 0 -> 279 bytes graphics/rayquaza_scene/scene_5/bg.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_5/bg.pal | 51 +++++ graphics/rayquaza_scene/scene_5/bg.png | Bin 0 -> 339 bytes graphics/rayquaza_scene/scene_5/groudon.png | Bin 0 -> 1153 bytes graphics/rayquaza_scene/scene_5/groudon_tail.png | Bin 0 -> 168 bytes graphics/rayquaza_scene/scene_5/kyogre.png | Bin 0 -> 505 bytes graphics/rayquaza_scene/scene_5/kyogre_splash.png | Bin 0 -> 205 bytes graphics/rayquaza_scene/scene_5/rayquaza.png | Bin 0 -> 2370 bytes graphics/rayquaza_scene/scene_5/rayquaza_tail.png | Bin 0 -> 391 bytes graphics/rayquaza_scene/scene_5/ring.bin | Bin 0 -> 2048 bytes graphics/rayquaza_scene/scene_5/ring.png | Bin 0 -> 385 bytes graphics/rayquaza_scene/scene_5/ring_map.bin | Bin 0 -> 256 bytes graphics/rayquaza_scene/smoke.png | Bin 242 -> 0 bytes graphics/rayquaza_scene/splash.png | Bin 205 -> 0 bytes graphics_file_rules.mk | 12 +- include/graphics.h | 4 +- include/rayquaza_scene.h | 13 +- include/rom_8011DC0.h | 4 - src/contest_painting.c | 13 +- src/data/graphics/rayquaza_scene.h | 135 ++++++------ src/field_specials.c | 4 +- src/rayquaza_scene.c | 236 ++++++++++++--------- src/start_menu.c | 1 - src/trade.c | 1 - 97 files changed, 413 insertions(+), 394 deletions(-) delete mode 100644 graphics/rayquaza_scene/chase.pal delete mode 100644 graphics/rayquaza_scene/chase_bg.bin delete mode 100644 graphics/rayquaza_scene/chase_bg.png delete mode 100644 graphics/rayquaza_scene/chase_streaks.bin delete mode 100644 graphics/rayquaza_scene/chase_streaks.png delete mode 100644 graphics/rayquaza_scene/clouds.pal delete mode 100644 graphics/rayquaza_scene/clouds.png delete mode 100644 graphics/rayquaza_scene/clouds1.bin delete mode 100644 graphics/rayquaza_scene/clouds2.bin delete mode 100644 graphics/rayquaza_scene/clouds3.bin delete mode 100644 graphics/rayquaza_scene/groudon.png delete mode 100644 graphics/rayquaza_scene/groudon_claw.png delete mode 100644 graphics/rayquaza_scene/groudon_left.png delete mode 100644 graphics/rayquaza_scene/groudon_shoulder.png delete mode 100644 graphics/rayquaza_scene/groudon_tail.png delete mode 100644 graphics/rayquaza_scene/hush_bg.bin delete mode 100644 graphics/rayquaza_scene/hush_bg.pal delete mode 100644 graphics/rayquaza_scene/hush_bg.png delete mode 100644 graphics/rayquaza_scene/hush_ring.bin delete mode 100644 graphics/rayquaza_scene/hush_ring.png delete mode 100644 graphics/rayquaza_scene/hush_ring_map.bin delete mode 100644 graphics/rayquaza_scene/kyogre.png delete mode 100644 graphics/rayquaza_scene/kyogre_fin.png delete mode 100644 graphics/rayquaza_scene/kyogre_right.png delete mode 100644 graphics/rayquaza_scene/kyogre_shoulder.png delete mode 100644 graphics/rayquaza_scene/overcast.bin delete mode 100644 graphics/rayquaza_scene/overcast.png delete mode 100644 graphics/rayquaza_scene/overcast2.bin delete mode 100644 graphics/rayquaza_scene/overcast2.pal delete mode 100644 graphics/rayquaza_scene/overcast2.png delete mode 100644 graphics/rayquaza_scene/rayquaza.bin delete mode 100644 graphics/rayquaza_scene/rayquaza.png delete mode 100644 graphics/rayquaza_scene/rayquaza_chase.bin delete mode 100644 graphics/rayquaza_scene/rayquaza_chase.png delete mode 100644 graphics/rayquaza_scene/rayquaza_chase2.bin delete mode 100644 graphics/rayquaza_scene/rayquaza_fly1.png delete mode 100644 graphics/rayquaza_scene/rayquaza_flyin.png delete mode 100644 graphics/rayquaza_scene/rayquaza_hover.png delete mode 100644 graphics/rayquaza_scene/rayquaza_light.bin delete mode 100644 graphics/rayquaza_scene/rayquaza_light.png delete mode 100644 graphics/rayquaza_scene/rayquaza_tail.png create mode 100644 graphics/rayquaza_scene/scene_1/clouds.pal create mode 100644 graphics/rayquaza_scene/scene_1/clouds.png create mode 100644 graphics/rayquaza_scene/scene_1/clouds1.bin create mode 100644 graphics/rayquaza_scene/scene_1/clouds2.bin create mode 100644 graphics/rayquaza_scene/scene_1/clouds3.bin create mode 100644 graphics/rayquaza_scene/scene_1/groudon.png create mode 100644 graphics/rayquaza_scene/scene_1/groudon_claw.png create mode 100644 graphics/rayquaza_scene/scene_1/groudon_shoulder.png create mode 100644 graphics/rayquaza_scene/scene_1/kyogre.png create mode 100644 graphics/rayquaza_scene/scene_1/kyogre_fin.png create mode 100644 graphics/rayquaza_scene/scene_1/kyogre_shoulder.png create mode 100644 graphics/rayquaza_scene/scene_2/bg.bin create mode 100644 graphics/rayquaza_scene/scene_2/bg.png create mode 100644 graphics/rayquaza_scene/scene_2/rayquaza.bin create mode 100644 graphics/rayquaza_scene/scene_2/rayquaza.png create mode 100644 graphics/rayquaza_scene/scene_2/smoke.png create mode 100644 graphics/rayquaza_scene/scene_3/bg.bin create mode 100644 graphics/rayquaza_scene/scene_3/bg.pal create mode 100644 graphics/rayquaza_scene/scene_3/bg.png create mode 100644 graphics/rayquaza_scene/scene_3/light.bin create mode 100644 graphics/rayquaza_scene/scene_3/light.png create mode 100644 graphics/rayquaza_scene/scene_3/rayquaza.png create mode 100644 graphics/rayquaza_scene/scene_3/rayquaza_tail.png create mode 100644 graphics/rayquaza_scene/scene_4/bg.bin create mode 100644 graphics/rayquaza_scene/scene_4/bg.pal create mode 100644 graphics/rayquaza_scene/scene_4/bg.png create mode 100644 graphics/rayquaza_scene/scene_4/rayquaza.bin create mode 100644 graphics/rayquaza_scene/scene_4/rayquaza.png create mode 100644 graphics/rayquaza_scene/scene_4/rayquaza2.bin create mode 100644 graphics/rayquaza_scene/scene_4/streaks.bin create mode 100644 graphics/rayquaza_scene/scene_4/streaks.png create mode 100644 graphics/rayquaza_scene/scene_5/bg.bin create mode 100644 graphics/rayquaza_scene/scene_5/bg.pal create mode 100644 graphics/rayquaza_scene/scene_5/bg.png create mode 100644 graphics/rayquaza_scene/scene_5/groudon.png create mode 100644 graphics/rayquaza_scene/scene_5/groudon_tail.png create mode 100644 graphics/rayquaza_scene/scene_5/kyogre.png create mode 100644 graphics/rayquaza_scene/scene_5/kyogre_splash.png create mode 100644 graphics/rayquaza_scene/scene_5/rayquaza.png create mode 100644 graphics/rayquaza_scene/scene_5/rayquaza_tail.png create mode 100644 graphics/rayquaza_scene/scene_5/ring.bin create mode 100644 graphics/rayquaza_scene/scene_5/ring.png create mode 100644 graphics/rayquaza_scene/scene_5/ring_map.bin delete mode 100644 graphics/rayquaza_scene/smoke.png delete mode 100644 graphics/rayquaza_scene/splash.png delete mode 100644 include/rom_8011DC0.h diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 2979f104d..97081c250 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -235,7 +235,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft @@ -335,7 +335,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather - setvar VAR_0x8004, 0 + setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene special Script_DoRayquazaScene waitstate applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft @@ -528,7 +528,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E removeobject LOCALID_GROUDON removeobject LOCALID_KYOGRE addobject LOCALID_RAYQUAZA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate playse SE_T_KAMI @@ -581,7 +581,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE removeobject LOCALID_GROUDON removeobject LOCALID_KYOGRE addobject LOCALID_RAYQUAZA - setvar VAR_0x8004, 1 + setvar VAR_0x8004, TRUE special Script_DoRayquazaScene waitstate special SpawnCameraObject diff --git a/graphics/rayquaza_scene/chase.pal b/graphics/rayquaza_scene/chase.pal deleted file mode 100644 index 960724b94..000000000 --- a/graphics/rayquaza_scene/chase.pal +++ /dev/null @@ -1,67 +0,0 @@ -JASC-PAL -0100 -64 -156 156 255 -57 82 57 -65 131 65 -74 148 123 -90 189 139 -148 222 180 -98 90 106 -172 41 57 -230 74 49 -246 98 98 -197 148 98 -222 213 238 -255 255 255 -222 205 0 -255 238 0 -24 24 24 -156 156 255 -0 106 222 -57 148 230 -123 180 238 -189 222 246 -230 255 255 -255 255 255 -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 131 148 -255 255 246 -16 98 222 -115 255 230 -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 131 148 -255 255 246 -255 205 0 -255 255 148 -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/rayquaza_scene/chase_bg.bin b/graphics/rayquaza_scene/chase_bg.bin deleted file mode 100644 index c2daff206..000000000 Binary files a/graphics/rayquaza_scene/chase_bg.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/chase_bg.png b/graphics/rayquaza_scene/chase_bg.png deleted file mode 100644 index 896c0b046..000000000 Binary files a/graphics/rayquaza_scene/chase_bg.png and /dev/null differ diff --git a/graphics/rayquaza_scene/chase_streaks.bin b/graphics/rayquaza_scene/chase_streaks.bin deleted file mode 100644 index cabc53fec..000000000 Binary files a/graphics/rayquaza_scene/chase_streaks.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/chase_streaks.png b/graphics/rayquaza_scene/chase_streaks.png deleted file mode 100644 index a7e216259..000000000 Binary files a/graphics/rayquaza_scene/chase_streaks.png and /dev/null differ diff --git a/graphics/rayquaza_scene/clouds.pal b/graphics/rayquaza_scene/clouds.pal deleted file mode 100644 index 4b1a354ce..000000000 --- a/graphics/rayquaza_scene/clouds.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -164 205 180 -82 82 90 -255 0 255 -205 115 0 -156 98 16 -98 82 32 -49 65 49 -0 49 65 -24 57 65 -49 65 74 -49 49 57 -74 74 82 -98 98 106 -115 115 131 -139 148 148 -0 0 0 -32 90 115 -131 131 131 -148 148 148 -172 172 172 -197 197 197 -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/rayquaza_scene/clouds.png b/graphics/rayquaza_scene/clouds.png deleted file mode 100644 index a253f47cc..000000000 Binary files a/graphics/rayquaza_scene/clouds.png and /dev/null differ diff --git a/graphics/rayquaza_scene/clouds1.bin b/graphics/rayquaza_scene/clouds1.bin deleted file mode 100644 index 57a939ad8..000000000 Binary files a/graphics/rayquaza_scene/clouds1.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/clouds2.bin b/graphics/rayquaza_scene/clouds2.bin deleted file mode 100644 index 073c45ac7..000000000 Binary files a/graphics/rayquaza_scene/clouds2.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/clouds3.bin b/graphics/rayquaza_scene/clouds3.bin deleted file mode 100644 index 9b9eb4611..000000000 Binary files a/graphics/rayquaza_scene/clouds3.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/groudon.png b/graphics/rayquaza_scene/groudon.png deleted file mode 100644 index 5ac84d51a..000000000 Binary files a/graphics/rayquaza_scene/groudon.png and /dev/null differ diff --git a/graphics/rayquaza_scene/groudon_claw.png b/graphics/rayquaza_scene/groudon_claw.png deleted file mode 100644 index c960a9779..000000000 Binary files a/graphics/rayquaza_scene/groudon_claw.png and /dev/null differ diff --git a/graphics/rayquaza_scene/groudon_left.png b/graphics/rayquaza_scene/groudon_left.png deleted file mode 100644 index 582336d46..000000000 Binary files a/graphics/rayquaza_scene/groudon_left.png and /dev/null differ diff --git a/graphics/rayquaza_scene/groudon_shoulder.png b/graphics/rayquaza_scene/groudon_shoulder.png deleted file mode 100644 index c4c5f08b6..000000000 Binary files a/graphics/rayquaza_scene/groudon_shoulder.png and /dev/null differ diff --git a/graphics/rayquaza_scene/groudon_tail.png b/graphics/rayquaza_scene/groudon_tail.png deleted file mode 100644 index 38f6a41b2..000000000 Binary files a/graphics/rayquaza_scene/groudon_tail.png and /dev/null differ diff --git a/graphics/rayquaza_scene/hush_bg.bin b/graphics/rayquaza_scene/hush_bg.bin deleted file mode 100644 index b9e86b907..000000000 Binary files a/graphics/rayquaza_scene/hush_bg.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/hush_bg.pal b/graphics/rayquaza_scene/hush_bg.pal deleted file mode 100644 index b0b0602dd..000000000 --- a/graphics/rayquaza_scene/hush_bg.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -156 156 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 164 197 -8 172 180 -24 189 156 -41 197 131 -57 205 106 -82 230 90 -115 255 82 -164 255 139 -213 255 197 -255 255 255 -0 0 0 -156 156 255 -74 74 189 -82 82 197 -90 90 197 -98 98 205 -106 106 205 -115 115 213 -131 131 213 -139 139 222 -148 148 222 -156 156 230 -164 164 230 -172 172 238 -180 180 238 -197 197 246 -0 0 0 -156 156 255 -57 82 57 -65 131 65 -74 148 123 -90 189 139 -148 222 180 -98 90 106 -172 41 57 -230 74 49 -246 98 98 -197 148 98 -222 213 238 -255 255 255 -222 205 0 -255 238 0 -24 24 24 diff --git a/graphics/rayquaza_scene/hush_bg.png b/graphics/rayquaza_scene/hush_bg.png deleted file mode 100644 index 7ead765b9..000000000 Binary files a/graphics/rayquaza_scene/hush_bg.png and /dev/null differ diff --git a/graphics/rayquaza_scene/hush_ring.bin b/graphics/rayquaza_scene/hush_ring.bin deleted file mode 100644 index 22f5530ba..000000000 Binary files a/graphics/rayquaza_scene/hush_ring.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/hush_ring.png b/graphics/rayquaza_scene/hush_ring.png deleted file mode 100644 index 93d734e03..000000000 Binary files a/graphics/rayquaza_scene/hush_ring.png and /dev/null differ diff --git a/graphics/rayquaza_scene/hush_ring_map.bin b/graphics/rayquaza_scene/hush_ring_map.bin deleted file mode 100644 index 812fda11d..000000000 Binary files a/graphics/rayquaza_scene/hush_ring_map.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/kyogre.png b/graphics/rayquaza_scene/kyogre.png deleted file mode 100644 index 0f2e27e4e..000000000 Binary files a/graphics/rayquaza_scene/kyogre.png and /dev/null differ diff --git a/graphics/rayquaza_scene/kyogre_fin.png b/graphics/rayquaza_scene/kyogre_fin.png deleted file mode 100644 index 9d4f62da9..000000000 Binary files a/graphics/rayquaza_scene/kyogre_fin.png and /dev/null differ diff --git a/graphics/rayquaza_scene/kyogre_right.png b/graphics/rayquaza_scene/kyogre_right.png deleted file mode 100644 index d5e1749e9..000000000 Binary files a/graphics/rayquaza_scene/kyogre_right.png and /dev/null differ diff --git a/graphics/rayquaza_scene/kyogre_shoulder.png b/graphics/rayquaza_scene/kyogre_shoulder.png deleted file mode 100644 index 16b221f97..000000000 Binary files a/graphics/rayquaza_scene/kyogre_shoulder.png and /dev/null differ diff --git a/graphics/rayquaza_scene/overcast.bin b/graphics/rayquaza_scene/overcast.bin deleted file mode 100644 index 82b9e5067..000000000 Binary files a/graphics/rayquaza_scene/overcast.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/overcast.png b/graphics/rayquaza_scene/overcast.png deleted file mode 100644 index 4ad9be8d2..000000000 Binary files a/graphics/rayquaza_scene/overcast.png and /dev/null differ diff --git a/graphics/rayquaza_scene/overcast2.bin b/graphics/rayquaza_scene/overcast2.bin deleted file mode 100644 index 0c2e5ec45..000000000 Binary files a/graphics/rayquaza_scene/overcast2.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/overcast2.pal b/graphics/rayquaza_scene/overcast2.pal deleted file mode 100644 index 6987c2cc1..000000000 --- a/graphics/rayquaza_scene/overcast2.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -164 205 180 -255 255 255 -197 197 197 -106 164 197 -98 148 172 -82 123 148 -74 106 123 -49 82 90 -139 148 148 -49 65 74 -49 49 57 -74 74 82 -98 98 106 -115 115 131 -156 164 164 -0 0 0 -164 205 180 -255 255 255 -197 255 222 -139 255 180 -82 255 148 -24 246 106 -24 205 82 -32 164 57 -41 123 41 -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/rayquaza_scene/overcast2.png b/graphics/rayquaza_scene/overcast2.png deleted file mode 100644 index c9dea2002..000000000 Binary files a/graphics/rayquaza_scene/overcast2.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza.bin b/graphics/rayquaza_scene/rayquaza.bin deleted file mode 100644 index 1a6d89234..000000000 Binary files a/graphics/rayquaza_scene/rayquaza.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza.png b/graphics/rayquaza_scene/rayquaza.png deleted file mode 100644 index 6198b945d..000000000 Binary files a/graphics/rayquaza_scene/rayquaza.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_chase.bin b/graphics/rayquaza_scene/rayquaza_chase.bin deleted file mode 100644 index 51307a4c1..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_chase.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_chase.png b/graphics/rayquaza_scene/rayquaza_chase.png deleted file mode 100644 index 154a105a8..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_chase.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_chase2.bin b/graphics/rayquaza_scene/rayquaza_chase2.bin deleted file mode 100644 index 37416ac1b..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_chase2.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_fly1.png b/graphics/rayquaza_scene/rayquaza_fly1.png deleted file mode 100644 index 40dd0a6e3..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_fly1.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_flyin.png b/graphics/rayquaza_scene/rayquaza_flyin.png deleted file mode 100644 index f1b44c104..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_flyin.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_hover.png b/graphics/rayquaza_scene/rayquaza_hover.png deleted file mode 100644 index 269d7dd2d..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_hover.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_light.bin b/graphics/rayquaza_scene/rayquaza_light.bin deleted file mode 100644 index 97808b8b9..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_light.bin and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_light.png b/graphics/rayquaza_scene/rayquaza_light.png deleted file mode 100644 index 4640149f3..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_light.png and /dev/null differ diff --git a/graphics/rayquaza_scene/rayquaza_tail.png b/graphics/rayquaza_scene/rayquaza_tail.png deleted file mode 100644 index 7e0577df1..000000000 Binary files a/graphics/rayquaza_scene/rayquaza_tail.png and /dev/null differ diff --git a/graphics/rayquaza_scene/scene_1/clouds.pal b/graphics/rayquaza_scene/scene_1/clouds.pal new file mode 100644 index 000000000..4b1a354ce --- /dev/null +++ b/graphics/rayquaza_scene/scene_1/clouds.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +164 205 180 +82 82 90 +255 0 255 +205 115 0 +156 98 16 +98 82 32 +49 65 49 +0 49 65 +24 57 65 +49 65 74 +49 49 57 +74 74 82 +98 98 106 +115 115 131 +139 148 148 +0 0 0 +32 90 115 +131 131 131 +148 148 148 +172 172 172 +197 197 197 +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/rayquaza_scene/scene_1/clouds.png b/graphics/rayquaza_scene/scene_1/clouds.png new file mode 100644 index 000000000..a253f47cc Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/clouds.png differ diff --git a/graphics/rayquaza_scene/scene_1/clouds1.bin b/graphics/rayquaza_scene/scene_1/clouds1.bin new file mode 100644 index 000000000..57a939ad8 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/clouds1.bin differ diff --git a/graphics/rayquaza_scene/scene_1/clouds2.bin b/graphics/rayquaza_scene/scene_1/clouds2.bin new file mode 100644 index 000000000..073c45ac7 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/clouds2.bin differ diff --git a/graphics/rayquaza_scene/scene_1/clouds3.bin b/graphics/rayquaza_scene/scene_1/clouds3.bin new file mode 100644 index 000000000..9b9eb4611 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/clouds3.bin differ diff --git a/graphics/rayquaza_scene/scene_1/groudon.png b/graphics/rayquaza_scene/scene_1/groudon.png new file mode 100644 index 000000000..5ac84d51a Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/groudon.png differ diff --git a/graphics/rayquaza_scene/scene_1/groudon_claw.png b/graphics/rayquaza_scene/scene_1/groudon_claw.png new file mode 100644 index 000000000..c960a9779 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/groudon_claw.png differ diff --git a/graphics/rayquaza_scene/scene_1/groudon_shoulder.png b/graphics/rayquaza_scene/scene_1/groudon_shoulder.png new file mode 100644 index 000000000..c4c5f08b6 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/groudon_shoulder.png differ diff --git a/graphics/rayquaza_scene/scene_1/kyogre.png b/graphics/rayquaza_scene/scene_1/kyogre.png new file mode 100644 index 000000000..0f2e27e4e Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/kyogre.png differ diff --git a/graphics/rayquaza_scene/scene_1/kyogre_fin.png b/graphics/rayquaza_scene/scene_1/kyogre_fin.png new file mode 100644 index 000000000..9d4f62da9 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/kyogre_fin.png differ diff --git a/graphics/rayquaza_scene/scene_1/kyogre_shoulder.png b/graphics/rayquaza_scene/scene_1/kyogre_shoulder.png new file mode 100644 index 000000000..16b221f97 Binary files /dev/null and b/graphics/rayquaza_scene/scene_1/kyogre_shoulder.png differ diff --git a/graphics/rayquaza_scene/scene_2/bg.bin b/graphics/rayquaza_scene/scene_2/bg.bin new file mode 100644 index 000000000..82b9e5067 Binary files /dev/null and b/graphics/rayquaza_scene/scene_2/bg.bin differ diff --git a/graphics/rayquaza_scene/scene_2/bg.png b/graphics/rayquaza_scene/scene_2/bg.png new file mode 100644 index 000000000..4ad9be8d2 Binary files /dev/null and b/graphics/rayquaza_scene/scene_2/bg.png differ diff --git a/graphics/rayquaza_scene/scene_2/rayquaza.bin b/graphics/rayquaza_scene/scene_2/rayquaza.bin new file mode 100644 index 000000000..1a6d89234 Binary files /dev/null and b/graphics/rayquaza_scene/scene_2/rayquaza.bin differ diff --git a/graphics/rayquaza_scene/scene_2/rayquaza.png b/graphics/rayquaza_scene/scene_2/rayquaza.png new file mode 100644 index 000000000..6198b945d Binary files /dev/null and b/graphics/rayquaza_scene/scene_2/rayquaza.png differ diff --git a/graphics/rayquaza_scene/scene_2/smoke.png b/graphics/rayquaza_scene/scene_2/smoke.png new file mode 100644 index 000000000..4aaa6ae75 Binary files /dev/null and b/graphics/rayquaza_scene/scene_2/smoke.png differ diff --git a/graphics/rayquaza_scene/scene_3/bg.bin b/graphics/rayquaza_scene/scene_3/bg.bin new file mode 100644 index 000000000..0c2e5ec45 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/bg.bin differ diff --git a/graphics/rayquaza_scene/scene_3/bg.pal b/graphics/rayquaza_scene/scene_3/bg.pal new file mode 100644 index 000000000..6987c2cc1 --- /dev/null +++ b/graphics/rayquaza_scene/scene_3/bg.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +164 205 180 +255 255 255 +197 197 197 +106 164 197 +98 148 172 +82 123 148 +74 106 123 +49 82 90 +139 148 148 +49 65 74 +49 49 57 +74 74 82 +98 98 106 +115 115 131 +156 164 164 +0 0 0 +164 205 180 +255 255 255 +197 255 222 +139 255 180 +82 255 148 +24 246 106 +24 205 82 +32 164 57 +41 123 41 +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/rayquaza_scene/scene_3/bg.png b/graphics/rayquaza_scene/scene_3/bg.png new file mode 100644 index 000000000..c9dea2002 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/bg.png differ diff --git a/graphics/rayquaza_scene/scene_3/light.bin b/graphics/rayquaza_scene/scene_3/light.bin new file mode 100644 index 000000000..97808b8b9 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/light.bin differ diff --git a/graphics/rayquaza_scene/scene_3/light.png b/graphics/rayquaza_scene/scene_3/light.png new file mode 100644 index 000000000..4640149f3 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/light.png differ diff --git a/graphics/rayquaza_scene/scene_3/rayquaza.png b/graphics/rayquaza_scene/scene_3/rayquaza.png new file mode 100644 index 000000000..40dd0a6e3 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/rayquaza.png differ diff --git a/graphics/rayquaza_scene/scene_3/rayquaza_tail.png b/graphics/rayquaza_scene/scene_3/rayquaza_tail.png new file mode 100644 index 000000000..7e0577df1 Binary files /dev/null and b/graphics/rayquaza_scene/scene_3/rayquaza_tail.png differ diff --git a/graphics/rayquaza_scene/scene_4/bg.bin b/graphics/rayquaza_scene/scene_4/bg.bin new file mode 100644 index 000000000..c2daff206 Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/bg.bin differ diff --git a/graphics/rayquaza_scene/scene_4/bg.pal b/graphics/rayquaza_scene/scene_4/bg.pal new file mode 100644 index 000000000..960724b94 --- /dev/null +++ b/graphics/rayquaza_scene/scene_4/bg.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +156 156 255 +57 82 57 +65 131 65 +74 148 123 +90 189 139 +148 222 180 +98 90 106 +172 41 57 +230 74 49 +246 98 98 +197 148 98 +222 213 238 +255 255 255 +222 205 0 +255 238 0 +24 24 24 +156 156 255 +0 106 222 +57 148 230 +123 180 238 +189 222 246 +230 255 255 +255 255 255 +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 131 148 +255 255 246 +16 98 222 +115 255 230 +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 131 148 +255 255 246 +255 205 0 +255 255 148 +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/rayquaza_scene/scene_4/bg.png b/graphics/rayquaza_scene/scene_4/bg.png new file mode 100644 index 000000000..896c0b046 Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/bg.png differ diff --git a/graphics/rayquaza_scene/scene_4/rayquaza.bin b/graphics/rayquaza_scene/scene_4/rayquaza.bin new file mode 100644 index 000000000..51307a4c1 Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/rayquaza.bin differ diff --git a/graphics/rayquaza_scene/scene_4/rayquaza.png b/graphics/rayquaza_scene/scene_4/rayquaza.png new file mode 100644 index 000000000..154a105a8 Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/rayquaza.png differ diff --git a/graphics/rayquaza_scene/scene_4/rayquaza2.bin b/graphics/rayquaza_scene/scene_4/rayquaza2.bin new file mode 100644 index 000000000..37416ac1b Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/rayquaza2.bin differ diff --git a/graphics/rayquaza_scene/scene_4/streaks.bin b/graphics/rayquaza_scene/scene_4/streaks.bin new file mode 100644 index 000000000..cabc53fec Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/streaks.bin differ diff --git a/graphics/rayquaza_scene/scene_4/streaks.png b/graphics/rayquaza_scene/scene_4/streaks.png new file mode 100644 index 000000000..a7e216259 Binary files /dev/null and b/graphics/rayquaza_scene/scene_4/streaks.png differ diff --git a/graphics/rayquaza_scene/scene_5/bg.bin b/graphics/rayquaza_scene/scene_5/bg.bin new file mode 100644 index 000000000..b9e86b907 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/bg.bin differ diff --git a/graphics/rayquaza_scene/scene_5/bg.pal b/graphics/rayquaza_scene/scene_5/bg.pal new file mode 100644 index 000000000..b0b0602dd --- /dev/null +++ b/graphics/rayquaza_scene/scene_5/bg.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +156 156 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 164 197 +8 172 180 +24 189 156 +41 197 131 +57 205 106 +82 230 90 +115 255 82 +164 255 139 +213 255 197 +255 255 255 +0 0 0 +156 156 255 +74 74 189 +82 82 197 +90 90 197 +98 98 205 +106 106 205 +115 115 213 +131 131 213 +139 139 222 +148 148 222 +156 156 230 +164 164 230 +172 172 238 +180 180 238 +197 197 246 +0 0 0 +156 156 255 +57 82 57 +65 131 65 +74 148 123 +90 189 139 +148 222 180 +98 90 106 +172 41 57 +230 74 49 +246 98 98 +197 148 98 +222 213 238 +255 255 255 +222 205 0 +255 238 0 +24 24 24 diff --git a/graphics/rayquaza_scene/scene_5/bg.png b/graphics/rayquaza_scene/scene_5/bg.png new file mode 100644 index 000000000..7ead765b9 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/bg.png differ diff --git a/graphics/rayquaza_scene/scene_5/groudon.png b/graphics/rayquaza_scene/scene_5/groudon.png new file mode 100644 index 000000000..582336d46 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/groudon.png differ diff --git a/graphics/rayquaza_scene/scene_5/groudon_tail.png b/graphics/rayquaza_scene/scene_5/groudon_tail.png new file mode 100644 index 000000000..38f6a41b2 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/groudon_tail.png differ diff --git a/graphics/rayquaza_scene/scene_5/kyogre.png b/graphics/rayquaza_scene/scene_5/kyogre.png new file mode 100644 index 000000000..d5e1749e9 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/kyogre.png differ diff --git a/graphics/rayquaza_scene/scene_5/kyogre_splash.png b/graphics/rayquaza_scene/scene_5/kyogre_splash.png new file mode 100644 index 000000000..406af9da3 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/kyogre_splash.png differ diff --git a/graphics/rayquaza_scene/scene_5/rayquaza.png b/graphics/rayquaza_scene/scene_5/rayquaza.png new file mode 100644 index 000000000..269d7dd2d Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/rayquaza.png differ diff --git a/graphics/rayquaza_scene/scene_5/rayquaza_tail.png b/graphics/rayquaza_scene/scene_5/rayquaza_tail.png new file mode 100644 index 000000000..f1b44c104 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/rayquaza_tail.png differ diff --git a/graphics/rayquaza_scene/scene_5/ring.bin b/graphics/rayquaza_scene/scene_5/ring.bin new file mode 100644 index 000000000..22f5530ba Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/ring.bin differ diff --git a/graphics/rayquaza_scene/scene_5/ring.png b/graphics/rayquaza_scene/scene_5/ring.png new file mode 100644 index 000000000..93d734e03 Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/ring.png differ diff --git a/graphics/rayquaza_scene/scene_5/ring_map.bin b/graphics/rayquaza_scene/scene_5/ring_map.bin new file mode 100644 index 000000000..812fda11d Binary files /dev/null and b/graphics/rayquaza_scene/scene_5/ring_map.bin differ diff --git a/graphics/rayquaza_scene/smoke.png b/graphics/rayquaza_scene/smoke.png deleted file mode 100644 index 4aaa6ae75..000000000 Binary files a/graphics/rayquaza_scene/smoke.png and /dev/null differ diff --git a/graphics/rayquaza_scene/splash.png b/graphics/rayquaza_scene/splash.png deleted file mode 100644 index 406af9da3..000000000 Binary files a/graphics/rayquaza_scene/splash.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 019f382eb..630aaa3fc 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -457,23 +457,23 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_2/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_3/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/scene_3/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png diff --git a/include/graphics.h b/include/graphics.h index 4c98bee47..1c8a52b69 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3310,8 +3310,8 @@ extern const u32 gBerryTag_Pal[]; // rayquaza scene gfx extern const u32 gRaySceneGroudon_Gfx[]; -extern const u32 gRaySceneGroudon2_Gfx[]; -extern const u32 gRaySceneGroudon3_Gfx[]; +extern const u32 gRaySceneGroudonShoulder_Gfx[]; +extern const u32 gRaySceneGroudonClaw_Gfx[]; extern const u32 gRaySceneKyogre_Gfx[]; extern const u32 gRaySceneKyogre2_Gfx[]; extern const u32 gRaySceneKyogre3_Gfx[]; diff --git a/include/rayquaza_scene.h b/include/rayquaza_scene.h index fe66b3df0..5aa21981e 100644 --- a/include/rayquaza_scene.h +++ b/include/rayquaza_scene.h @@ -1,17 +1,6 @@ #ifndef GUARD_RAYQUAZA_SCENE_H #define GUARD_RAYQUAZA_SCENE_H -void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void)); - -enum -{ - RAY_ANIM_DUO_FIGHT_PRE, - RAY_ANIM_DUO_FIGHT, - RAY_ANIM_TAKES_FLIGHT, - RAY_ANIM_DESCENDS, - RAY_ANIM_CHARGES, - RAY_ANIM_CHACES_AWAY, - RAY_ANIM_END -}; +void DoRayquazaScene(u8 animId, bool8 endEarly, void (*callback)(void)); #endif // GUARD_RAYQUAZA_SCENE_H diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h deleted file mode 100644 index ee7397320..000000000 --- a/include/rom_8011DC0.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef GUARD_rom_8011DC0_H -#define GUARD_rom_8011DC0_H - -#endif //GUARD_rom_8011DC0_H diff --git a/src/contest_painting.c b/src/contest_painting.c index 5dd4a70a5..f4d0ac6bf 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -384,7 +384,7 @@ static void InitContestMonPixels(u16 species, u8 whichSprite) } } -#ifdef NONMATCHING +//#ifdef NONMATCHING // functionally equivalent. static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64]) { @@ -399,23 +399,22 @@ static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels) { for (pixelX = 0; pixelX < 8; pixelX++) { - int offset = 32 * (8 * tileY + tileX) + (pixelY * 4 + pixelX / 2); - colorIndex = spriteGfx[offset]; + colorIndex = spriteGfx[(((tileY * 8) + tileX) * 32) + (pixelY << 2) + (pixelX >> 1)]; if (pixelX & 1) colorIndex >>= 4; else colorIndex &= 0xF; if (colorIndex == 0) // transparent pixel - (*destPixels)[8 * tileY + pixelY][tileX * 8 + pixelX] = 0x8000; + (*destPixels)[tileY * 8 + pixelY][tileX * 8 + pixelX] = 0x8000; else - (*destPixels)[8 * tileY + pixelY][tileX * 8 + pixelX] = palette[colorIndex]; + (*destPixels)[tileY * 8 + pixelY][tileX * 8 + pixelX] = palette[colorIndex]; } } } } } -#else +/*#else NAKED static void _InitContestMonPixels(u8 *spriteGfx, u16 *palette, u16 (*destPixels)[64][64]) { @@ -517,7 +516,7 @@ _081303F8:\n\ pop {r0}\n\ bx r0"); } -#endif +#endif*/ #define VRAM_PICTURE_DATA(x, y) (((u16 *)(BG_SCREEN_ADDR(12)))[(y) * 32 + (x)]) diff --git a/src/data/graphics/rayquaza_scene.h b/src/data/graphics/rayquaza_scene.h index d0269980c..508b83f1a 100644 --- a/src/data/graphics/rayquaza_scene.h +++ b/src/data/graphics/rayquaza_scene.h @@ -1,73 +1,62 @@ -const u32 gRaySceneGroudon_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon.4bpp.lz"); -const u32 gRaySceneGroudon2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_shoulder.4bpp.lz"); -const u32 gRaySceneGroudon3_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_claw.4bpp.lz"); - -const u32 gRaySceneKyogre_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre.4bpp.lz"); -const u32 gRaySceneKyogre2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_shoulder.4bpp.lz"); -const u32 gRaySceneKyogre3_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_fin.4bpp.lz"); - -const u32 gRaySceneGroudon_Pal[] = INCBIN_U32("graphics/rayquaza_scene/groudon.gbapal.lz"); -const u32 gRaySceneKyogre_Pal[] = INCBIN_U32("graphics/rayquaza_scene/kyogre.gbapal.lz"); - -const u32 gRaySceneClouds_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/clouds.4bpp.lz"); -const u32 gRaySceneClouds_Pal[] = INCBIN_U32("graphics/rayquaza_scene/clouds.gbapal.lz"); // pal 1 clouds, pal 2 rain -const u32 gRaySceneClouds1_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds1.bin.lz"); -const u32 gRaySceneClouds2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds2.bin.lz"); -const u32 gRaySceneClouds3_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/clouds3.bin.lz"); - -const u32 gRaySceneSmoke_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/smoke.4bpp.lz"); -const u32 gRaySceneSmoke_Pal[] = INCBIN_U32("graphics/rayquaza_scene/smoke.gbapal.lz"); - -const u32 gRaySceneRayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.8bpp.lz"); -const u32 gRaySceneRayquaza_Pal[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.gbapal.lz"); -const u32 gRaySceneRayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza.bin.lz"); - -const u32 gRaySceneOvercast_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/overcast.4bpp.lz"); // uses pal 2 of gRaySceneRayquaza_Pal -const u32 gRaySceneOvercast_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/overcast.bin.lz"); - -const u32 gRaySceneRayquazaFly1_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_fly1.4bpp.lz"); -const u32 gRaySceneRayquazaTail_Gfx[] = INCBIN_U32( "graphics/rayquaza_scene/rayquaza_tail_fix.4bpp.lz"); // for some reason there are an extra 0xC bytes at the end of the original 4bpp, so in order to produce the correct lz, we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. - -const u32 gRaySceneOvercast2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.4bpp.lz"); - -const u32 gRaySceneRayquazaLight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_light.4bpp.lz"); // uses pal 2 of gRaySceneOvercast2_Pal - -const u32 gRaySceneOvercast2_Pal[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.gbapal.lz"); -const u32 gRaySceneOvercast2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/overcast2.bin.lz"); - -const u32 gRaySceneRayquazaLight_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_light.bin.lz"); - -const u32 gRaySceneChaseBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/chase_bg.4bpp.lz"); -const u32 gRaySceneChaseBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/chase_bg.bin.lz"); - -const u32 gRaySceneChaseStreaks_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/chase_streaks.4bpp.lz"); -const u32 gRaySceneChaseStreaks_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/chase_streaks.bin.lz"); - -const u32 gRaySceneRayquazaChase_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase.4bpp.lz"); -const u32 gRayChaseRayquazaChase_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase.bin.lz"); -const u32 gRayChaseRayquazaChase2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_chase2.bin.lz"); - -const u32 gRaySceneChase_Pal[] = INCBIN_U32("graphics/rayquaza_scene/chase.gbapal.lz"); - -const u32 gRaySceneGroudonLeft_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_left.4bpp.lz"); -const u32 gRaySceneGroudonTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/groudon_tail.4bpp.lz"); - -const u32 gRaySceneKyogreRight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_right.4bpp.lz"); - -const u32 gRaySceneRayquazaHover_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_hover.4bpp.lz"); -const u32 gRaySceneRayquazaFlyIn_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_flyin.4bpp.lz"); - -const u32 gRaySceneSplash_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/splash.4bpp.lz"); - -const u32 gRaySceneGroudonLeft_Pal[] = INCBIN_U32("graphics/rayquaza_scene/groudon_left.gbapal.lz"); -const u32 gRaySceneKyogreRight_Pal[] = INCBIN_U32("graphics/rayquaza_scene/kyogre_right.gbapal.lz"); -const u32 gRaySceneRayquazaHover_Pal[] = INCBIN_U32("graphics/rayquaza_scene/rayquaza_hover.gbapal.lz"); - -const u32 gRaySceneSplash_Pal[] = INCBIN_U32("graphics/rayquaza_scene/splash.gbapal.lz"); - -const u32 gRaySceneHushBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.4bpp.lz"); -const u32 gRaySceneHushRing_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring.8bpp.lz"); -const u32 gRaySceneHushBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.bin.lz"); -const u32 gRaySceneHushRing_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring.bin.lz"); -const u32 gRaySceneHushRing_Map[] = INCBIN_U32("graphics/rayquaza_scene/hush_ring_map.bin.lz"); -const u32 gRaySceneHushBg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/hush_bg.gbapal.lz"); +// Scene 1 (RAY_ANIM_DUO_FIGHT / RAY_ANIM_DUO_FIGHT_PRE) +const u32 gRaySceneGroudon_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon.4bpp.lz"); +const u32 gRaySceneGroudonShoulder_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon_shoulder.4bpp.lz"); +const u32 gRaySceneGroudonClaw_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon_claw.4bpp.lz"); +const u32 gRaySceneKyogre_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre.4bpp.lz"); +const u32 gRaySceneKyogre2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre_shoulder.4bpp.lz"); +const u32 gRaySceneKyogre3_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre_fin.4bpp.lz"); +const u32 gRaySceneGroudon_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/groudon.gbapal.lz"); +const u32 gRaySceneKyogre_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/kyogre.gbapal.lz"); +const u32 gRaySceneClouds_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds.4bpp.lz"); +const u32 gRaySceneClouds_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds.gbapal.lz"); // pal 1 clouds, pal 2 rain +const u32 gRaySceneClouds1_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds1.bin.lz"); +const u32 gRaySceneClouds2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds2.bin.lz"); +const u32 gRaySceneClouds3_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_1/clouds3.bin.lz"); + +// Scene 2 (RAY_ANIM_TAKES_FLIGHT) +const u32 gRaySceneSmoke_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/smoke.4bpp.lz"); +const u32 gRaySceneSmoke_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/smoke.gbapal.lz"); +const u32 gRaySceneRayquaza_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.8bpp.lz"); +const u32 gRaySceneRayquaza_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.gbapal.lz"); +const u32 gRaySceneRayquaza_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/rayquaza.bin.lz"); +const u32 gRaySceneOvercast_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/bg.4bpp.lz"); // uses pal 2 of gRaySceneRayquaza_Pal +const u32 gRaySceneOvercast_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_2/bg.bin.lz"); + +// Scene 3 (RAY_ANIM_DESCENDS) +const u32 gRaySceneRayquazaFly1_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza.4bpp.lz"); +// for some reason there are an extra 0xC bytes at the end of the original 4bpp, so in order to produce the correct lz, +// we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. +const u32 gRaySceneRayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza_tail_fix.4bpp.lz"); +const u32 gRaySceneOvercast2_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.4bpp.lz"); +const u32 gRaySceneRayquazaLight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.4bpp.lz"); // uses pal 2 of gRaySceneOvercast2_Pal +const u32 gRaySceneOvercast2_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.gbapal.lz"); +const u32 gRaySceneOvercast2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.bin.lz"); +const u32 gRaySceneRayquazaLight_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/light.bin.lz"); + +// Scene 4 (RAY_ANIM_CHARGES) +const u32 gRaySceneChaseBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.4bpp.lz"); +const u32 gRaySceneChaseBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.bin.lz"); +const u32 gRaySceneChaseStreaks_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/streaks.4bpp.lz"); +const u32 gRaySceneChaseStreaks_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/streaks.bin.lz"); +const u32 gRaySceneRayquazaChase_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza.4bpp.lz"); +const u32 gRayChaseRayquazaChase_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza.bin.lz"); +const u32 gRayChaseRayquazaChase2_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/rayquaza2.bin.lz"); +const u32 gRaySceneChase_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_4/bg.gbapal.lz"); + +// Scene 5 (RAY_ANIM_CHASES_AWAY) +const u32 gRaySceneGroudonLeft_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon.4bpp.lz"); +const u32 gRaySceneGroudonTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon_tail.4bpp.lz"); +const u32 gRaySceneKyogreRight_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre.4bpp.lz"); +const u32 gRaySceneRayquazaHover_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza.4bpp.lz"); +const u32 gRaySceneRayquazaFlyIn_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza_tail.4bpp.lz"); +const u32 gRaySceneSplash_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre_splash.4bpp.lz"); +const u32 gRaySceneGroudonLeft_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/groudon.gbapal.lz"); +const u32 gRaySceneKyogreRight_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre.gbapal.lz"); +const u32 gRaySceneRayquazaHover_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/rayquaza.gbapal.lz"); +const u32 gRaySceneSplash_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/kyogre_splash.gbapal.lz"); +const u32 gRaySceneHushBg_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.4bpp.lz"); +const u32 gRaySceneHushRing_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring.8bpp.lz"); +const u32 gRaySceneHushBg_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.bin.lz"); +const u32 gRaySceneHushRing_Tilemap[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring.bin.lz"); +const u32 gRaySceneHushRing_Map[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/ring_map.bin.lz"); +const u32 gRaySceneHushBg_Pal[] = INCBIN_U32("graphics/rayquaza_scene/scene_5/bg.gbapal.lz"); diff --git a/src/field_specials.c b/src/field_specials.c index 7c6ef37d7..ebb36cbea 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3888,12 +3888,14 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId) void Script_DoRayquazaScene(void) { - if (gSpecialVar_0x8004 == 0) + if (!gSpecialVar_0x8004) { + // Groudon/Kyogre fight scene DoRayquazaScene(0, TRUE, CB2_ReturnToFieldContinueScriptPlayMapMusic); } else { + // Rayquaza arrives scene DoRayquazaScene(1, FALSE, CB2_ReturnToFieldContinueScriptPlayMapMusic); } } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 986a2d3a2..7490668d2 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -18,84 +18,129 @@ #include "constants/rgb.h" #include "random.h" -struct RaySceneStruct -{ - MainCallback callback; - u8 tilemapBuffers[4][0x800]; - u16 field_2004; // set but unused +/* + This file handles the cutscene showing Rayquaza arriving to settle the Groudon/Kyogre fight + It consists of 5 separate scenes: + - Groudon and Kyogre facing one another in a thunderstorm (RAY_ANIM_DUO_FIGHT) + - Over the shoulder of Rayquaza flying (RAY_ANIM_TAKES_FLIGHT) + - Rayquaza emerging from a spotlight down through the clouds (RAY_ANIM_DESCENDS) + - A close-up of Rayquaza flying down (RAY_ANIM_CHARGES) + - Rayquaza floating above Groudon/Kyogre as they back away offscreen (RAY_ANIM_CHASES_AWAY) + + Notably this is re-used to show the Groudon/Kyogre fight when the player first arrives + in Sootopolis during the conflict, which uses a shortened version of the first scene + This is indicated by the endEarly argument to DoRayquazaScene +*/ + +enum +{ + RAY_ANIM_DUO_FIGHT_PRE, + RAY_ANIM_DUO_FIGHT, + RAY_ANIM_TAKES_FLIGHT, + RAY_ANIM_DESCENDS, + RAY_ANIM_CHARGES, + RAY_ANIM_CHASES_AWAY, + RAY_ANIM_END +}; + +#define GFXTAG_GROUDON 30505 +#define GFXTAG_GROUDON_SHOULDER 30506 +#define GFXTAG_GROUDON_CLAW 30507 +#define GFXTAG_KYOGRE1 30508 +#define GFXTAG_KYOGRE2 30509 +#define GFXTAG_KYOGRE3 30510 +#define GFXTAG_SMOKE 30555 +#define GFXTAG_GROUDON_SIDE 30565 + +#define PALTAG_GROUDON 30505 +#define PALTAG_KYOGRE 30508 +#define PALTAG_SMOKE 30555 + +struct RayquazaScene +{ + MainCallback exitCallback; + u8 tilemapBuffers[4][BG_SCREEN_SIZE]; + u16 unk; // never read u8 animId; - bool8 onlyOneAnim; + bool8 endEarly; s16 field_2008; s16 field_200A; - u8 unusedFields[12]; // completely unused + u8 unused[12]; }; -// EWRAM vars -static EWRAM_DATA struct RaySceneStruct *sRayScene = NULL; +static EWRAM_DATA struct RayquazaScene *sRayScene = NULL; + +static void CB2_InitRayquazaScene(void); +static void CB2_RayquazaScene(void); +static void Task_EndAfterFadeScreen(u8 taskId); -// this file's functions +// RAY_ANIM_DUO_FIGHT_PRE / RAY_ANIM_DUO_FIGHT static void Task_DuoFightAnim(u8 taskId); -static void Task_RayTakesFlightAnim(u8 taskId); -static void Task_RayDescendsAnim(u8 taskId); -static void Task_RayChargesAnim(u8 taskId); -static void Task_RayChasesAwayAnim(u8 taskId); -static void Task_HandleRayDescends(u8 taskId); -static void Task_RayDescendsEnd(u8 taskId); -static void Task_HandleRayCharges(u8 taskId); -static void sub_81D8AD8(u8 taskId); -static void sub_81D8B2C(u8 taskId); -static void Task_RayChargesEnd(u8 taskId); -static void Task_HandleRayChasesAway(u8 taskId); -static void sub_81D8FB0(u8 taskId); -static void sub_81D7228(u8 taskId); static void Task_HandleDuoFight(u8 taskId); -static void sub_81D752C(u8 taskId); static void Task_DuoFightEnd(u8 taskId); -static void Task_HandleRayTakesFlight(u8 taskId); -static void sub_81D81A4(u8 taskId); -static void Task_RayTakesFlightEnd(u8 taskId); -static void sub_81D94D4(u8 taskId); -static void sub_81D93D8(u8 taskId); -static void Task_RayChasesAwayEnd(u8 taskId); -static void sub_81D90A8(u8 taskId); -static void sub_81D98B4(u8 taskId); -static void Task_EndAfterFadeScreen(u8 taskId); -static void CB2_InitRayquazaScene(void); -static void CB2_RayquazaScene(void); +static void DuoFightEnd(u8 taskId, s8 palDelay); +static void sub_81D7228(u8 taskId); +static void sub_81D752C(u8 taskId); static void sub_81D750C(void); static void sub_81D7438(void); static void sub_81D7480(void); static void sub_81D74C8(void); -static void sub_81D8BB4(void); static void sub_81D6A20(struct Sprite *sprite); static void sub_81D6D20(struct Sprite *sprite); static void sub_81D7860(struct Sprite *sprite); static void sub_81D7D14(struct Sprite *sprite); static void sub_81D7700(struct Sprite *sprite); static void sub_81D7A60(struct Sprite *sprite); +static u8 sub_81D7664(void); +static u8 sub_81D78BC(void); + +// RAY_ANIM_TAKES_FLIGHT +static void Task_RayTakesFlightAnim(u8 taskId); +static void Task_HandleRayTakesFlight(u8 taskId); +static void Task_RayTakesFlightEnd(u8 taskId); +static void sub_81D81A4(u8 taskId); +static void sub_81D8260(struct Sprite *sprite); + +// RAY_ANIM_DESCENDS +static void Task_RayDescendsAnim(u8 taskId); +static void Task_HandleRayDescends(u8 taskId); +static void Task_RayDescendsEnd(u8 taskId); static void sub_81D874C(struct Sprite *sprite); -static void sub_81D9338(struct Sprite *sprite); +static u8 sub_81D86CC(void); + +// RAY_ANIM_CHARGES +static void Task_RayChargesAnim(u8 taskId); +static void Task_HandleRayCharges(u8 taskId); +static void Task_RayChargesEnd(u8 taskId); +static void sub_81D8AD8(u8 taskId); +static void sub_81D8B2C(u8 taskId); +static void sub_81D8BB4(void); + +// RAY_ANIM_CHASES_AWAY +static void Task_RayChasesAwayAnim(u8 taskId); +static void Task_HandleRayChasesAway(u8 taskId); +static void Task_RayChasesAwayEnd(u8 taskId); +static void sub_81D8FB0(u8 taskId); +static void sub_81D94D4(u8 taskId); +static void sub_81D93D8(u8 taskId); +static void sub_81D90A8(u8 taskId); +static void sub_81D98B4(u8 taskId); static void sub_81D9420(struct Sprite *sprite); -static void sub_81D8260(struct Sprite *sprite); -static void sub_81D961C(struct Sprite *sprite); static void sub_81D97E0(struct Sprite *sprite); static void sub_81D9528(struct Sprite *sprite); -static u8 sub_81D7664(void); -static u8 sub_81D78BC(void); -static u8 sub_81D86CC(void); -static void DuoFightEnd(u8 taskId, s8 palDelay); +static void sub_81D961C(struct Sprite *sprite); +static void sub_81D9338(struct Sprite *sprite); static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y); -// const rom data static const TaskFunc sTasksForAnimations[] = { [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim, - [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, - [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, - [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, - [RAY_ANIM_CHARGES] = Task_RayChargesAnim, - [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim, - [RAY_ANIM_END] = Task_EndAfterFadeScreen, + [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, + [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, + [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, + [RAY_ANIM_CHARGES] = Task_RayChargesAnim, + [RAY_ANIM_CHASES_AWAY] = Task_RayChasesAwayAnim, + [RAY_ANIM_END] = Task_EndAfterFadeScreen, }; static const struct OamData sOamData_862A6BC = @@ -260,8 +305,8 @@ static const union AnimCmd *const sSpriteAnimTable_862A724[] = static const struct SpriteTemplate sUnknown_0862A72C = { - .tileTag = 30505, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6BC, .anims = sSpriteAnimTable_862A724, .images = NULL, @@ -282,8 +327,8 @@ static const union AnimCmd *const sSpriteAnimTable_862A74C[] = static const struct SpriteTemplate sUnknown_0862A750 = { - .tileTag = 30506, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON_SHOULDER, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6C4, .anims = sSpriteAnimTable_862A74C, .images = NULL, @@ -304,8 +349,8 @@ static const union AnimCmd *const sSpriteAnimTable_862A770[] = static const struct SpriteTemplate sUnknown_0862A774 = { - .tileTag = 30507, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON_CLAW, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6CC, .anims = sSpriteAnimTable_862A770, .images = NULL, @@ -391,8 +436,8 @@ static const union AnimCmd *const sSpriteAnimTable_862A7F8[] = static const struct SpriteTemplate sUnknown_0862A81C = { - .tileTag = 30508, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE1, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6D4, .anims = sSpriteAnimTable_862A7F8, .images = NULL, @@ -416,8 +461,8 @@ static const union AnimCmd *const sSpriteAnimTable_862A848[] = static const struct SpriteTemplate sUnknown_0862A84C = { - .tileTag = 30509, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE2, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6DC, .anims = sSpriteAnimTable_862A848, .images = NULL, @@ -427,8 +472,8 @@ static const struct SpriteTemplate sUnknown_0862A84C = static const struct SpriteTemplate sUnknown_0862A864 = { - .tileTag = 30510, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE3, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6C4, .anims = sSpriteAnimTable_862A74C, .images = NULL, @@ -500,18 +545,18 @@ static const union AnimCmd *const sSpriteAnimTable_862A8BC[] = static const struct CompressedSpriteSheet sUnknown_0862A8C4 = { - gRaySceneGroudon_Gfx, 0x3000, 30505 + gRaySceneGroudon_Gfx, 0x3000, GFXTAG_GROUDON }; static const struct CompressedSpritePalette sUnknown_0862A8CC = { - gRaySceneGroudon_Pal, 30505 + gRaySceneGroudon_Pal, PALTAG_GROUDON }; static const struct SpriteTemplate sUnknown_0862A8D4 = { - .tileTag = 30505, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6BC, .anims = sSpriteAnimTable_862A8BC, .images = NULL, @@ -532,13 +577,13 @@ static const union AnimCmd *const sSpriteAnimTable_862A8F4[] = static const struct CompressedSpriteSheet sUnknown_0862A8F8 = { - gRaySceneGroudon2_Gfx, 0x200, 30506 + gRaySceneGroudonShoulder_Gfx, 0x200, GFXTAG_GROUDON_SHOULDER }; static const struct SpriteTemplate sUnknown_0862A900 = { - .tileTag = 30506, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON_SHOULDER, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6C4, .anims = sSpriteAnimTable_862A8F4, .images = NULL, @@ -559,13 +604,13 @@ static const union AnimCmd *const sSpriteAnimTable_862A920[] = static const struct CompressedSpriteSheet sUnknown_0862A924 = { - gRaySceneGroudon3_Gfx, 0x400, 30507 + gRaySceneGroudonClaw_Gfx, 0x400, GFXTAG_GROUDON_CLAW }; static const struct SpriteTemplate sUnknown_0862A92C = { - .tileTag = 30507, - .paletteTag = 30505, + .tileTag = GFXTAG_GROUDON_CLAW, + .paletteTag = PALTAG_GROUDON, .oam = &sOamData_862A6CC, .anims = sSpriteAnimTable_862A920, .images = NULL, @@ -651,18 +696,18 @@ static const union AnimCmd *const sSpriteAnimTable_862A9B0[] = static const struct CompressedSpriteSheet sUnknown_0862A9D4 = { - gRaySceneKyogre_Gfx, 0xF00, 30508 + gRaySceneKyogre_Gfx, 0xF00, GFXTAG_KYOGRE1 }; static const struct CompressedSpritePalette sUnknown_0862A9DC = { - gRaySceneKyogre_Pal, 30508 + gRaySceneKyogre_Pal, PALTAG_KYOGRE }; static const struct SpriteTemplate sUnknown_0862A9E4 = { - .tileTag = 30508, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE1, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6D4, .anims = sSpriteAnimTable_862A9B0, .images = NULL, @@ -686,13 +731,13 @@ static const union AnimCmd *const sSpriteAnimTable_862AA10[] = static const struct CompressedSpriteSheet sUnknown_0862AA14 = { - gRaySceneKyogre2_Gfx, 0xC0, 30509 + gRaySceneKyogre2_Gfx, 0xC0, GFXTAG_KYOGRE2 }; static const struct SpriteTemplate sUnknown_0862AA1C = { - .tileTag = 30509, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE2, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6DC, .anims = sSpriteAnimTable_862AA10, .images = NULL, @@ -702,13 +747,13 @@ static const struct SpriteTemplate sUnknown_0862AA1C = static const struct CompressedSpriteSheet sUnknown_0862AA34 = { - gRaySceneKyogre3_Gfx, 0x200, 30510 + gRaySceneKyogre3_Gfx, 0x200, GFXTAG_KYOGRE3 }; static const struct SpriteTemplate sUnknown_0862AA3C = { - .tileTag = 30510, - .paletteTag = 30508, + .tileTag = GFXTAG_KYOGRE3, + .paletteTag = PALTAG_KYOGRE, .oam = &sOamData_862A6C4, .anims = sSpriteAnimTable_862A8F4, .images = NULL, @@ -773,18 +818,18 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] = static const struct CompressedSpriteSheet sUnknown_0862AA90 = { - gRaySceneSmoke_Gfx, 0x100, 30555 + gRaySceneSmoke_Gfx, 0x100, GFXTAG_SMOKE }; static const struct CompressedSpritePalette sUnknown_0862AA98 = { - gRaySceneSmoke_Pal, 30555 + gRaySceneSmoke_Pal, PALTAG_SMOKE }; static const struct SpriteTemplate sUnknown_0862AAA0 = { - .tileTag = 30555, - .paletteTag = 30555, + .tileTag = GFXTAG_SMOKE, + .paletteTag = PALTAG_SMOKE, .oam = &sOamData_862A6D4, .anims = sSpriteAnimTable_862AA68, .images = NULL, @@ -1086,7 +1131,7 @@ static const union AnimCmd *const sSpriteAnimTable_862AC24[] = static const struct CompressedSpriteSheet sUnknown_0862AC28 = { - gRaySceneGroudonLeft_Gfx, 0x1800, 30565 + gRaySceneGroudonLeft_Gfx, 0x1800, GFXTAG_GROUDON_SIDE }; static const struct CompressedSpriteSheet sUnknown_0862AC30 = @@ -1116,7 +1161,7 @@ static const struct CompressedSpriteSheet sUnknown_0862AC50 = static const struct CompressedSpritePalette sUnknown_0862AC58 = { - gRaySceneGroudonLeft_Pal, 30565 + gRaySceneGroudonLeft_Pal, GFXTAG_GROUDON_SIDE }; static const struct CompressedSpritePalette sUnknown_0862AC60 = @@ -1136,7 +1181,7 @@ static const struct CompressedSpritePalette sUnknown_0862AC70 = static const struct SpriteTemplate sUnknown_0862AC78 = { - .tileTag = 30565, + .tileTag = GFXTAG_GROUDON_SIDE, .paletteTag = 30565, .oam = &sOamData_862A6BC, .anims = sSpriteAnimTable_862AB70, @@ -1232,12 +1277,12 @@ static const struct BgTemplate sUnknown_0862AD08[] = }; // code -void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void)) +void DoRayquazaScene(u8 animId, bool8 endEarly, void (*exitCallback)(void)) { sRayScene = AllocZeroed(sizeof(*sRayScene)); sRayScene->animId = animId; - sRayScene->callback = callback; - sRayScene->onlyOneAnim = onlyOneAnim; + sRayScene->exitCallback = exitCallback; + sRayScene->endEarly = endEarly; SetMainCallback2(CB2_InitRayquazaScene); } @@ -1277,7 +1322,7 @@ static void Task_EndAfterFadeScreen(u8 taskId) { ResetSpriteData(); FreeAllSpritePalettes(); - SetMainCallback2(sRayScene->callback); + SetMainCallback2(sRayScene->exitCallback); Free(sRayScene); DestroyTask(taskId); } @@ -1287,14 +1332,14 @@ static void Task_SetNextAnim(u8 taskId) { if (!gPaletteFade.active) { - if (sRayScene->onlyOneAnim == TRUE) + if (sRayScene->endEarly == TRUE) { gTasks[taskId].func = Task_EndAfterFadeScreen; } else { sRayScene->animId++; - sRayScene->field_2004 = 0; + sRayScene->unk = 0; gTasks[taskId].func = sTasksForAnimations[sRayScene->animId]; } } @@ -2405,6 +2450,7 @@ static void Task_HandleRayCharges(u8 taskId) } } +// These two, BG scrolling for Rayquaza charge static void sub_81D8AD8(u8 taskId) { s16 *data = gTasks[taskId].data; diff --git a/src/start_menu.c b/src/start_menu.c index 68a316185..f470a58b2 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -43,7 +43,6 @@ #include "trainer_card.h" #include "window.h" #include "constants/songs.h" -#include "rom_8011DC0.h" #include "union_room.h" #include "constants/rgb.h" diff --git a/src/trade.c b/src/trade.c index 17967733a..49e7637a1 100644 --- a/src/trade.c +++ b/src/trade.c @@ -30,7 +30,6 @@ #include "pokemon_summary_screen.h" #include "pokemon_storage_system.h" #include "random.h" -#include "rom_8011DC0.h" #include "save.h" #include "script.h" #include "sound.h" -- cgit v1.2.3