From a64b074e7dd28a88719515ebe3ea152d42dbf1ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 11:34:38 -0400 Subject: Rename palette tags and files --- graphics/field_effects/pics/shadow_extra_large.png | Bin 98 -> 165 bytes graphics/field_effects/pics/shadow_large.png | Bin 89 -> 157 bytes graphics/field_effects/pics/shadow_medium.png | Bin 88 -> 156 bytes graphics/field_effects/pics/shadow_small.png | Bin 86 -> 156 bytes graphics/object_events/palettes/0.pal | 19 ---- graphics/object_events/palettes/1.pal | 19 ---- graphics/object_events/palettes/10.pal | 19 ---- graphics/object_events/palettes/16.pal | 19 ---- graphics/object_events/palettes/17.pal | 19 ---- graphics/object_events/palettes/19.pal | 19 ---- graphics/object_events/palettes/2.pal | 19 ---- graphics/object_events/palettes/20.pal | 19 ---- graphics/object_events/palettes/21.pal | 19 ---- graphics/object_events/palettes/3.pal | 19 ---- graphics/object_events/palettes/4.pal | 19 ---- graphics/object_events/palettes/5.pal | 19 ---- graphics/object_events/palettes/6.pal | 19 ---- graphics/object_events/palettes/7.pal | 19 ---- graphics/object_events/palettes/8.pal | 19 ---- graphics/object_events/palettes/9.pal | 19 ---- graphics/object_events/palettes/meteorite.pal | 19 ++++ graphics/object_events/palettes/npc_blue.pal | 19 ++++ .../object_events/palettes/npc_blue_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_green.pal | 19 ++++ .../palettes/npc_green_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_pink.pal | 19 ++++ .../object_events/palettes/npc_pink_reflection.pal | 19 ++++ graphics/object_events/palettes/npc_white.pal | 19 ++++ .../palettes/npc_white_reflection.pal | 19 ++++ graphics/object_events/palettes/player.pal | 19 ++++ .../object_events/palettes/player_reflection.pal | 19 ++++ .../palettes/player_reflection_dummy.pal | 19 ++++ graphics/object_events/palettes/seagallop.pal | 19 ++++ graphics/object_events/palettes/ss_anne.pal | 19 ++++ include/event_object_movement.h | 2 +- src/data/object_events/object_event_graphics.h | 28 ++--- .../object_events/object_event_graphics_info.h | 26 ++--- src/event_object_movement.c | 120 ++++++++++----------- src/overworld.c | 12 +-- 39 files changed, 360 insertions(+), 398 deletions(-) delete mode 100644 graphics/object_events/palettes/0.pal delete mode 100644 graphics/object_events/palettes/1.pal delete mode 100644 graphics/object_events/palettes/10.pal delete mode 100644 graphics/object_events/palettes/16.pal delete mode 100644 graphics/object_events/palettes/17.pal delete mode 100644 graphics/object_events/palettes/19.pal delete mode 100644 graphics/object_events/palettes/2.pal delete mode 100644 graphics/object_events/palettes/20.pal delete mode 100644 graphics/object_events/palettes/21.pal delete mode 100644 graphics/object_events/palettes/3.pal delete mode 100644 graphics/object_events/palettes/4.pal delete mode 100644 graphics/object_events/palettes/5.pal delete mode 100644 graphics/object_events/palettes/6.pal delete mode 100644 graphics/object_events/palettes/7.pal delete mode 100644 graphics/object_events/palettes/8.pal delete mode 100644 graphics/object_events/palettes/9.pal create mode 100644 graphics/object_events/palettes/meteorite.pal create mode 100644 graphics/object_events/palettes/npc_blue.pal create mode 100644 graphics/object_events/palettes/npc_blue_reflection.pal create mode 100644 graphics/object_events/palettes/npc_green.pal create mode 100644 graphics/object_events/palettes/npc_green_reflection.pal create mode 100644 graphics/object_events/palettes/npc_pink.pal create mode 100644 graphics/object_events/palettes/npc_pink_reflection.pal create mode 100644 graphics/object_events/palettes/npc_white.pal create mode 100644 graphics/object_events/palettes/npc_white_reflection.pal create mode 100644 graphics/object_events/palettes/player.pal create mode 100644 graphics/object_events/palettes/player_reflection.pal create mode 100644 graphics/object_events/palettes/player_reflection_dummy.pal create mode 100644 graphics/object_events/palettes/seagallop.pal create mode 100644 graphics/object_events/palettes/ss_anne.pal diff --git a/graphics/field_effects/pics/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png index 567c63948..e632205e7 100644 Binary files a/graphics/field_effects/pics/shadow_extra_large.png and b/graphics/field_effects/pics/shadow_extra_large.png differ diff --git a/graphics/field_effects/pics/shadow_large.png b/graphics/field_effects/pics/shadow_large.png index 8cf80f166..e11f5e0bf 100644 Binary files a/graphics/field_effects/pics/shadow_large.png and b/graphics/field_effects/pics/shadow_large.png differ diff --git a/graphics/field_effects/pics/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png index 264230afd..59cf53206 100644 Binary files a/graphics/field_effects/pics/shadow_medium.png and b/graphics/field_effects/pics/shadow_medium.png differ diff --git a/graphics/field_effects/pics/shadow_small.png b/graphics/field_effects/pics/shadow_small.png index 204d6afad..b231fc083 100644 Binary files a/graphics/field_effects/pics/shadow_small.png and b/graphics/field_effects/pics/shadow_small.png differ diff --git a/graphics/object_events/palettes/0.pal b/graphics/object_events/palettes/0.pal deleted file mode 100644 index 3097a6556..000000000 --- a/graphics/object_events/palettes/0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 123 164 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -65 65 213 -57 57 123 -115 164 197 -106 41 41 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -189 156 57 -0 0 0 diff --git a/graphics/object_events/palettes/1.pal b/graphics/object_events/palettes/1.pal deleted file mode 100644 index 5537faa0f..000000000 --- a/graphics/object_events/palettes/1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 255 246 -238 189 180 -255 255 230 -255 230 197 -205 148 148 -123 164 238 -115 131 197 -172 213 255 -172 123 98 -255 255 255 -222 222 255 -255 230 172 -255 172 172 -255 255 172 -230 205 115 -82 82 82 diff --git a/graphics/object_events/palettes/10.pal b/graphics/object_events/palettes/10.pal deleted file mode 100644 index ae8272ec4..000000000 --- a/graphics/object_events/palettes/10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -230 205 131 -205 180 106 -164 139 65 -255 197 139 -246 156 106 -205 115 90 -222 222 230 -180 180 180 -139 139 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/16.pal b/graphics/object_events/palettes/16.pal deleted file mode 100644 index 3097a6556..000000000 --- a/graphics/object_events/palettes/16.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -131 123 164 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -65 65 213 -57 57 123 -115 164 197 -106 41 41 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -189 156 57 -0 0 0 diff --git a/graphics/object_events/palettes/17.pal b/graphics/object_events/palettes/17.pal deleted file mode 100644 index 5537faa0f..000000000 --- a/graphics/object_events/palettes/17.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -197 255 246 -238 189 180 -255 255 230 -255 230 197 -205 148 148 -123 164 238 -115 131 197 -172 213 255 -172 123 98 -255 255 255 -222 222 255 -255 230 172 -255 172 172 -255 255 172 -230 205 115 -82 82 82 diff --git a/graphics/object_events/palettes/19.pal b/graphics/object_events/palettes/19.pal deleted file mode 100644 index c20bacb57..000000000 --- a/graphics/object_events/palettes/19.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 156 197 -32 32 32 -82 82 82 -139 139 139 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -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/object_events/palettes/2.pal b/graphics/object_events/palettes/2.pal deleted file mode 100644 index 0cebd6c4d..000000000 --- a/graphics/object_events/palettes/2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 -74 115 172 diff --git a/graphics/object_events/palettes/20.pal b/graphics/object_events/palettes/20.pal deleted file mode 100644 index c25501332..000000000 --- a/graphics/object_events/palettes/20.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -65 123 180 -238 246 255 -222 230 238 -189 205 230 -156 164 189 -139 139 156 -98 98 123 -57 57 106 -197 98 98 -172 65 106 -32 74 156 -197 148 0 -246 213 24 -222 238 255 -255 255 255 -74 106 139 diff --git a/graphics/object_events/palettes/21.pal b/graphics/object_events/palettes/21.pal deleted file mode 100644 index cf19fedfa..000000000 --- a/graphics/object_events/palettes/21.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 115 180 -49 131 197 -65 65 82 -139 106 57 -32 82 139 -189 90 32 -222 156 49 -246 205 74 -172 148 90 -82 82 106 -213 213 238 -106 106 139 -131 139 172 -205 180 123 -255 255 255 -16 16 24 diff --git a/graphics/object_events/palettes/3.pal b/graphics/object_events/palettes/3.pal deleted file mode 100644 index c62e8ce06..000000000 --- a/graphics/object_events/palettes/3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 222 74 -213 172 32 -131 98 0 -164 139 238 -106 82 189 -65 57 98 -238 115 65 -172 65 57 -74 49 49 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/4.pal b/graphics/object_events/palettes/4.pal deleted file mode 100644 index e245ba013..000000000 --- a/graphics/object_events/palettes/4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -255 164 180 -213 106 123 -139 65 82 -148 197 238 -98 131 205 -57 57 74 -197 197 213 -139 139 148 -74 74 90 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/5.pal b/graphics/object_events/palettes/5.pal deleted file mode 100644 index 0c60b08a5..000000000 --- a/graphics/object_events/palettes/5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -222 189 65 -164 131 32 -82 82 32 -131 205 49 -57 139 0 -32 65 16 -222 148 189 -164 74 131 -82 32 65 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/6.pal b/graphics/object_events/palettes/6.pal deleted file mode 100644 index 1646e805e..000000000 --- a/graphics/object_events/palettes/6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 213 180 -246 189 148 -222 148 115 -123 65 65 -205 172 98 -123 115 65 -57 57 24 -230 106 74 -148 57 41 -82 16 0 -197 197 213 -139 139 148 -74 74 90 -255 255 255 -0 0 0 diff --git a/graphics/object_events/palettes/7.pal b/graphics/object_events/palettes/7.pal deleted file mode 100644 index 9fdd95ccc..000000000 --- a/graphics/object_events/palettes/7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 255 139 -246 230 65 -238 197 32 -197 222 238 -156 180 230 -131 148 205 -255 197 139 -246 156 106 -205 115 90 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/8.pal b/graphics/object_events/palettes/8.pal deleted file mode 100644 index d0e386c7c..000000000 --- a/graphics/object_events/palettes/8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -255 222 238 -255 180 205 -238 164 172 -205 255 255 -180 230 255 -123 164 213 -222 222 230 -180 180 180 -139 139 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/9.pal b/graphics/object_events/palettes/9.pal deleted file mode 100644 index ae24bbfe4..000000000 --- a/graphics/object_events/palettes/9.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -98 172 238 -255 255 255 -255 255 230 -255 230 197 -205 148 148 -238 222 98 -222 197 74 -197 172 65 -164 238 148 -131 205 123 -106 172 74 -246 156 213 -213 131 189 -189 115 148 -255 255 255 -82 82 82 diff --git a/graphics/object_events/palettes/meteorite.pal b/graphics/object_events/palettes/meteorite.pal new file mode 100644 index 000000000..c20bacb57 --- /dev/null +++ b/graphics/object_events/palettes/meteorite.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 156 197 +32 32 32 +82 82 82 +139 139 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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/object_events/palettes/npc_blue.pal b/graphics/object_events/palettes/npc_blue.pal new file mode 100644 index 000000000..c62e8ce06 --- /dev/null +++ b/graphics/object_events/palettes/npc_blue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 222 74 +213 172 32 +131 98 0 +164 139 238 +106 82 189 +65 57 98 +238 115 65 +172 65 57 +74 49 49 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_blue_reflection.pal b/graphics/object_events/palettes/npc_blue_reflection.pal new file mode 100644 index 000000000..9fdd95ccc --- /dev/null +++ b/graphics/object_events/palettes/npc_blue_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 255 139 +246 230 65 +238 197 32 +197 222 238 +156 180 230 +131 148 205 +255 197 139 +246 156 106 +205 115 90 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_green.pal b/graphics/object_events/palettes/npc_green.pal new file mode 100644 index 000000000..0c60b08a5 --- /dev/null +++ b/graphics/object_events/palettes/npc_green.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +222 189 65 +164 131 32 +82 82 32 +131 205 49 +57 139 0 +32 65 16 +222 148 189 +164 74 131 +82 32 65 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_green_reflection.pal b/graphics/object_events/palettes/npc_green_reflection.pal new file mode 100644 index 000000000..ae24bbfe4 --- /dev/null +++ b/graphics/object_events/palettes/npc_green_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +238 222 98 +222 197 74 +197 172 65 +164 238 148 +131 205 123 +106 172 74 +246 156 213 +213 131 189 +189 115 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_pink.pal b/graphics/object_events/palettes/npc_pink.pal new file mode 100644 index 000000000..e245ba013 --- /dev/null +++ b/graphics/object_events/palettes/npc_pink.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +255 164 180 +213 106 123 +139 65 82 +148 197 238 +98 131 205 +57 57 74 +197 197 213 +139 139 148 +74 74 90 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_pink_reflection.pal b/graphics/object_events/palettes/npc_pink_reflection.pal new file mode 100644 index 000000000..d0e386c7c --- /dev/null +++ b/graphics/object_events/palettes/npc_pink_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +255 222 238 +255 180 205 +238 164 172 +205 255 255 +180 230 255 +123 164 213 +222 222 230 +180 180 180 +139 139 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/npc_white.pal b/graphics/object_events/palettes/npc_white.pal new file mode 100644 index 000000000..1646e805e --- /dev/null +++ b/graphics/object_events/palettes/npc_white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +246 189 148 +222 148 115 +123 65 65 +205 172 98 +123 115 65 +57 57 24 +230 106 74 +148 57 41 +82 16 0 +197 197 213 +139 139 148 +74 74 90 +255 255 255 +0 0 0 diff --git a/graphics/object_events/palettes/npc_white_reflection.pal b/graphics/object_events/palettes/npc_white_reflection.pal new file mode 100644 index 000000000..ae8272ec4 --- /dev/null +++ b/graphics/object_events/palettes/npc_white_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 172 238 +255 255 255 +255 255 230 +255 230 197 +205 148 148 +230 205 131 +205 180 106 +164 139 65 +255 197 139 +246 156 106 +205 115 90 +222 222 230 +180 180 180 +139 139 148 +255 255 255 +82 82 82 diff --git a/graphics/object_events/palettes/player.pal b/graphics/object_events/palettes/player.pal new file mode 100644 index 000000000..3097a6556 --- /dev/null +++ b/graphics/object_events/palettes/player.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 123 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/object_events/palettes/player_reflection.pal b/graphics/object_events/palettes/player_reflection.pal new file mode 100644 index 000000000..5537faa0f --- /dev/null +++ b/graphics/object_events/palettes/player_reflection.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 255 246 +238 189 180 +255 255 230 +255 230 197 +205 148 148 +123 164 238 +115 131 197 +172 213 255 +172 123 98 +255 255 255 +222 222 255 +255 230 172 +255 172 172 +255 255 172 +230 205 115 +82 82 82 diff --git a/graphics/object_events/palettes/player_reflection_dummy.pal b/graphics/object_events/palettes/player_reflection_dummy.pal new file mode 100644 index 000000000..0cebd6c4d --- /dev/null +++ b/graphics/object_events/palettes/player_reflection_dummy.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 +74 115 172 diff --git a/graphics/object_events/palettes/seagallop.pal b/graphics/object_events/palettes/seagallop.pal new file mode 100644 index 000000000..c25501332 --- /dev/null +++ b/graphics/object_events/palettes/seagallop.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 123 180 +238 246 255 +222 230 238 +189 205 230 +156 164 189 +139 139 156 +98 98 123 +57 57 106 +197 98 98 +172 65 106 +32 74 156 +197 148 0 +246 213 24 +222 238 255 +255 255 255 +74 106 139 diff --git a/graphics/object_events/palettes/ss_anne.pal b/graphics/object_events/palettes/ss_anne.pal new file mode 100644 index 000000000..cf19fedfa --- /dev/null +++ b/graphics/object_events/palettes/ss_anne.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 115 180 +49 131 197 +65 65 82 +139 106 57 +32 82 139 +189 90 32 +222 156 49 +246 205 74 +172 148 90 +82 82 106 +213 213 238 +106 106 139 +131 139 172 +205 180 123 +255 255 255 +16 16 24 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index c1a9787f3..119fa7f07 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); -void sub_805EDF0(s16, s16); +void ReloadMapObjectsWithOffset(s16 x, s16 y); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8063AD4(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index c39bf1672..50f0b8bc1 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -1,4 +1,4 @@ -const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/0.gbapal"); +const u16 gObjectEventPal_Player[] = INCBIN_U16("graphics/object_events/palettes/player.gbapal"); const u16 gUnknown_835B988[] = INCBIN_U16("graphics/object_events/palettes/unk_835B988.gbapal"); const u16 gObjectEventPaletteNull1[16] = {}; const u16 gObjectEventPaletteNull2[16] = {}; @@ -18,8 +18,8 @@ const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/ const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp"); const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); -const u16 gObjectEventPal_9[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); -const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); +const u16 gObjectEventPal_PlayerReflection[] = INCBIN_U16("graphics/object_events/palettes/player_reflection.gbapal"); +const u16 gObjectEventPal_PlayerReflectionDummy[] = INCBIN_U16("graphics/object_events/palettes/player_reflection_dummy.gbapal"); const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); @@ -45,14 +45,14 @@ const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/peopl const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); -const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); -const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); -const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); -const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/6.gbapal"); -const u16 gObjectEventPal_4[] = INCBIN_U16("graphics/object_events/palettes/7.gbapal"); -const u16 gObjectEventPal_5[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); -const u16 gObjectEventPal_6[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); -const u16 gObjectEventPal_7[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); +const u16 gObjectEventPal_NpcBlue[] = INCBIN_U16("graphics/object_events/palettes/npc_blue.gbapal"); +const u16 gObjectEventPal_NpcPink[] = INCBIN_U16("graphics/object_events/palettes/npc_pink.gbapal"); +const u16 gObjectEventPal_NpcGreen[] = INCBIN_U16("graphics/object_events/palettes/npc_green.gbapal"); +const u16 gObjectEventPal_NpcWhite[] = INCBIN_U16("graphics/object_events/palettes/npc_white.gbapal"); +const u16 gObjectEventPal_NpcBlueReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_blue_reflection.gbapal"); +const u16 gObjectEventPal_NpcPinkReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_pink_reflection.gbapal"); +const u16 gObjectEventPal_NpcGreenReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_green_reflection.gbapal"); +const u16 gObjectEventPal_NpcWhiteReflection[] = INCBIN_U16("graphics/object_events/palettes/npc_white_reflection.gbapal"); const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp"); const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp"); const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp"); @@ -175,12 +175,12 @@ const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/mi const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); -const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); +const u16 gObjectEventPal_Meteorite[] = INCBIN_U16("graphics/object_events/palettes/meteorite.gbapal"); const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); -const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); +const u16 gObjectEventPal_Seagallop[] = INCBIN_U16("graphics/object_events/palettes/seagallop.gbapal"); const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); -const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u16 gObjectEventPal_SSAnne[] = INCBIN_U16("graphics/object_events/palettes/ss_anne.gbapal"); const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 5ff04e790..bfdf8ec44 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,7 +1,7 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; @@ -67,11 +67,11 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReception const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; @@ -88,12 +88,12 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_IN const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c9524ee02..98cedf601 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -71,7 +71,7 @@ static void GetObjectEventMovingCameraOffset(s16 *, s16 *); static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); static void LoadObjectEventPalette(u16); static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); -static void sub_805EE3C(u8, s16, s16); +static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y); static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); static void sub_805EFF4(struct ObjectEvent *); static u8 TryLoadObjectPalette(const struct SpritePalette *spritePalette); @@ -450,23 +450,23 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = }; #define OBJ_EVENT_PAL_TAG_PLAYER_RED 0x1100 -#define OBJ_EVENT_PAL_TAG_9 0x1101 -#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION 0x1102 +#define OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION 0x1101 +#define OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY 0x1102 #define OBJ_EVENT_PAL_TAG_NPC_BLUE 0x1103 #define OBJ_EVENT_PAL_TAG_NPC_PINK 0x1104 #define OBJ_EVENT_PAL_TAG_NPC_GREEN 0x1105 #define OBJ_EVENT_PAL_TAG_NPC_WHITE 0x1106 -#define OBJ_EVENT_PAL_TAG_4 0x1107 -#define OBJ_EVENT_PAL_TAG_5 0x1108 -#define OBJ_EVENT_PAL_TAG_6 0x1109 -#define OBJ_EVENT_PAL_TAG_7 0x110A +#define OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION 0x1107 +#define OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION 0x1108 +#define OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION 0x1109 +#define OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION 0x110A #define OBJ_EVENT_PAL_TAG_12 0x110B #define OBJ_EVENT_PAL_TAG_13 0x110C #define OBJ_EVENT_PAL_TAG_14 0x110D #define OBJ_EVENT_PAL_TAG_15 0x110E #define OBJ_EVENT_PAL_TAG_16 0x110F #define OBJ_EVENT_PAL_TAG_PLAYER_GREEN 0x1110 -#define OBJ_EVENT_PAL_TAG_18 0x1111 +#define OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION 0x1111 #define OBJ_EVENT_PAL_TAG_19 0x1112 #define OBJ_EVENT_PAL_TAG_METEORITE 0x1113 #define OBJ_EVENT_PAL_TAG_SEAGALLOP 0x1114 @@ -496,39 +496,39 @@ const u8 gInitialMovementTypeFacingDirections[NUM_FIELD_MAP_OBJECT_TEMPLATES] = #include "data/object_events/object_event_graphics_info.h" static const struct SpritePalette sObjectEventSpritePalettes[] = { - {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, - {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, - {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, - {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, - {gObjectEventPal_4, OBJ_EVENT_PAL_TAG_4}, - {gObjectEventPal_5, OBJ_EVENT_PAL_TAG_5}, - {gObjectEventPal_6, OBJ_EVENT_PAL_TAG_6}, - {gObjectEventPal_7, OBJ_EVENT_PAL_TAG_7}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_9}, - {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION}, - {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, - {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, - {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, - {gObjectEventPal_9, OBJ_EVENT_PAL_TAG_18}, - {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, - {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, - {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, + {gObjectEventPal_NpcBlue, OBJ_EVENT_PAL_TAG_NPC_BLUE}, + {gObjectEventPal_NpcPink, OBJ_EVENT_PAL_TAG_NPC_PINK}, + {gObjectEventPal_NpcGreen, OBJ_EVENT_PAL_TAG_NPC_GREEN}, + {gObjectEventPal_NpcWhite, OBJ_EVENT_PAL_TAG_NPC_WHITE}, + {gObjectEventPal_NpcBlueReflection, OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION}, + {gObjectEventPal_NpcPinkReflection, OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION}, + {gObjectEventPal_NpcGreenReflection, OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION}, + {gObjectEventPal_NpcWhiteReflection, OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_RED}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION}, + {gObjectEventPal_PlayerReflectionDummy, OBJ_EVENT_PAL_TAG_PLAYER_REFLECTION_DUMMY}, + {gObjectEventPal_12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPal_13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPal_Player, OBJ_EVENT_PAL_TAG_PLAYER_GREEN}, + {gObjectEventPal_PlayerReflection, OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION}, + {gObjectEventPal_Meteorite, OBJ_EVENT_PAL_TAG_METEORITE}, + {gObjectEventPal_SSAnne, OBJ_EVENT_PAL_TAG_SS_ANNE}, + {gObjectEventPal_Seagallop, OBJ_EVENT_PAL_TAG_SEAGALLOP}, {}, }; const u16 gPlayerReflectionPaletteTags[] = { - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, }; const u16 gUnusedPlayerReflectionPaletteTags[] = { - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, - OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_PLAYER_GREEN_REFLECTION, }; const u16 gUnknownPaletteTags_83A5200[] = { @@ -609,10 +609,10 @@ const u16 gUnknownPaletteTags_83A5268[] = { }; const u16 gUnknownPaletteTags_83A5270[] = { - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, }; const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { @@ -633,15 +633,15 @@ const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { const u16 gUnknownPaletteTags_83A52E0[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A52F4[] = { @@ -651,36 +651,36 @@ const u16 gUnknownPaletteTags_83A52F4[] = { OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A5308[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 gUnknownPaletteTags_83A531C[] = { OBJ_EVENT_PAL_TAG_PLAYER_RED, - OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_PLAYER_RED_REFLECTION, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NPC_WHITE, - OBJ_EVENT_PAL_TAG_4, - OBJ_EVENT_PAL_TAG_5, - OBJ_EVENT_PAL_TAG_6, - OBJ_EVENT_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_NPC_BLUE_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_PINK_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_GREEN_REFLECTION, + OBJ_EVENT_PAL_TAG_NPC_WHITE_REFLECTION, }; const u16 *const gObjectPaletteTagSets[] = { @@ -1904,7 +1904,7 @@ static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) RemoveObjectEvent(objectEvent); } -void sub_805EDF0(s16 x, s16 y) +void ReloadMapObjectsWithOffset(s16 x, s16 y) { u8 i; @@ -1913,13 +1913,13 @@ void sub_805EDF0(s16 x, s16 y) { if (gObjectEvents[i].active) { - sub_805EE3C(i, x, y); + ReloadMapObjectWithOffset(i, x, y); } } CreateReflectionEffectSprites(); } -static void sub_805EE3C(u8 objectEventId, s16 x, s16 y) +static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y) { u8 spriteId; struct Sprite *sprite; diff --git a/src/overworld.c b/src/overworld.c index 2083b7578..66ca5e336 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -151,7 +151,7 @@ static void InitOverworldGraphicsRegisters(void); static void sub_8057024(bool32 a0); static void sub_8057074(void); static void mli4_mapscripts_and_other(void); -static void sub_8057100(void); +static void ReloadObjectsAndRunReturnToFieldMapScript(void); static void sub_8057114(void); static void SetCameraToTrackGuestPlayer(void); static void SetCameraToTrackGuestPlayer_2(void); @@ -1933,7 +1933,7 @@ static bool32 sub_8056CD8(u8 *state) InitOverworldBgs(); QuestLog_InitPalettesBackup(); sub_8057024(FALSE); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; @@ -1971,7 +1971,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) break; case 2: CreateLinkPlayerSprites(); - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); SetCameraToTrackGuestPlayer_2(); SetHelpContextForMap(); (*state)++; @@ -2141,9 +2141,9 @@ static void mli4_mapscripts_and_other(void) TryRunOnWarpIntoMapScript(); } -static void sub_8057100(void) +static void ReloadObjectsAndRunReturnToFieldMapScript(void) { - sub_805EDF0(0, 0); + ReloadMapObjectsWithOffset(0, 0); RunOnReturnToFieldMapScript(); } @@ -2267,7 +2267,7 @@ static bool32 LoadMap_QLPlayback(u8 *state) (*state)++; break; case 3: - sub_8057100(); + ReloadObjectsAndRunReturnToFieldMapScript(); sub_8057114(); (*state)++; break; -- cgit v1.2.3