diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 34c7c70263b3..88129a778143 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -168,7 +168,7 @@ SSTidalRooms_Text_NotSuspiciousTakeThis: .string "someone! I'd never do such a thing!\l" .string "It's clean! You can use it!$" -SSTidalRooms_Text_ExplainSnatch: @CHANGE THIS DUMBUFUCK +SSTidalRooms_Text_ExplainSnatch: @CHANGE THIS DUMBFUCK .string "Snatch steals the beneficial effects\n" .string "of certain moves before they can be\l" .string "used by a foe or ally.$" diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 4c7ea03d156b..65a9d221cf23 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA" }, { - "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_STILL", + "graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_RAYQUAZA", "x": 14, "y": 6, "elevation": 3, diff --git a/graphics/battle_interface/ball_status_bar.png b/graphics/battle_interface/ball_status_bar.png old mode 100644 new mode 100755 diff --git a/graphics/battle_terrain/long_grass/palette_night.pal b/graphics/battle_terrain/long_grass/palette_night.pal index f845c312986f..f28a8a48d88b 100755 --- a/graphics/battle_terrain/long_grass/palette_night.pal +++ b/graphics/battle_terrain/long_grass/palette_night.pal @@ -2,41 +2,41 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -60 98 69 -88 116 92 -70 114 79 -62 112 80 -69 95 71 -45 108 71 -45 83 50 -0 0 0 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -39 51 63 -60 98 69 -88 116 92 -70 114 79 -62 112 80 -69 95 71 -45 108 71 -45 83 50 -0 0 0 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -115 213 82 -98 180 90 -90 148 74 +89 143 139 +83 137 139 +77 137 120 +77 137 114 +70 130 102 +64 118 82 +58 118 69 +26 118 89 +0 105 76 +45 42 44 +0 68 51 +0 0 7 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +89 143 139 +83 137 139 +77 137 120 +77 137 114 +70 130 102 +64 118 82 +58 118 69 +26 118 89 +0 105 76 +45 42 44 +0 68 51 +0 0 7 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +88 143 138 +7 92 76 +39 124 101 0 0 0 0 0 0 0 0 0 diff --git a/graphics/battle_terrain/plain/palette_night.pal b/graphics/battle_terrain/plain/palette_night.pal index 71830bbd843f..004f6ab45fe7 100755 --- a/graphics/battle_terrain/plain/palette_night.pal +++ b/graphics/battle_terrain/plain/palette_night.pal @@ -2,21 +2,21 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -60 99 93 -72 114 93 -78 57 66 -78 99 81 -75 57 66 -87 105 93 -72 114 93 +123 156 177 +117 156 158 +104 150 164 +92 143 170 +79 137 177 +67 130 190 +79 130 127 +110 112 127 +104 93 114 +48 87 69 +35 36 26 +16 23 19 +0 0 0 0 0 0 0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 0 0 0 39 51 63 60 99 93 diff --git a/graphics/battle_terrain/pond_water/palette_night.pal b/graphics/battle_terrain/pond_water/palette_night.pal index faf83f50aab1..f3db3529e74b 100755 --- a/graphics/battle_terrain/pond_water/palette_night.pal +++ b/graphics/battle_terrain/pond_water/palette_night.pal @@ -2,37 +2,37 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -61 103 143 -57 84 33 -40 53 77 -53 110 94 -34 55 68 -55 92 56 -39 51 60 -81 111 129 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -39 51 63 -61 103 143 -57 84 33 -40 53 77 -53 110 94 -34 55 68 -55 92 56 -39 51 60 -81 111 129 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 +116 156 196 +110 150 196 +103 150 190 +97 143 183 +90 137 183 +78 130 190 +28 130 196 +9 124 196 +9 137 102 +0 118 190 +0 93 196 +0 74 183 +0 105 69 +0 62 164 +0 0 63 +0 0 0 +116 156 196 +0 86 177 +46 149 76 +71 156 107 +9 117 138 +77 156 151 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 0 0 0 205 246 255 148 213 238 diff --git a/graphics/battle_terrain/rock/palette_night.pal b/graphics/battle_terrain/rock/palette_night.pal index d360a61ed01e..71af4194fca4 100755 --- a/graphics/battle_terrain/rock/palette_night.pal +++ b/graphics/battle_terrain/rock/palette_night.pal @@ -2,37 +2,37 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -106 96 78 -126 126 99 -39 70 83 -132 113 88 -32 70 76 -135 115 90 -49 61 68 -95 82 63 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -39 51 63 -106 96 78 -126 126 99 -39 70 83 -132 113 88 -32 70 76 -135 115 90 -49 61 68 -95 82 63 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 +146 156 196 +140 150 196 +133 150 190 +127 143 183 +127 137 183 +120 137 177 +114 124 133 +95 99 114 +95 93 108 +77 93 120 +83 87 102 +58 68 95 +58 68 89 +32 42 69 +13 23 51 +0 0 0 +146 156 196 +95 92 107 +114 124 132 +120 130 164 +107 105 120 +0 0 0 +0 0 0 +0 0 0 +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 98 90 164 131 98 diff --git a/graphics/battle_terrain/sky/palette_night.pal b/graphics/battle_terrain/sky/palette_night.pal index 9d9364afd734..1a59c4a10985 100755 --- a/graphics/battle_terrain/sky/palette_night.pal +++ b/graphics/battle_terrain/sky/palette_night.pal @@ -2,50 +2,50 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -170 183 223 -89 153 207 -21 54 75 -140 175 222 -39 54 69 -129 173 218 -21 60 54 -148 175 214 -167 196 231 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -39 51 63 -170 183 223 -89 153 207 -21 54 75 -140 175 222 -39 54 69 -129 173 218 -21 60 54 -148 175 214 -167 196 231 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -222 238 255 -230 238 255 -238 246 255 -246 246 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 172 205 -197 230 255 +136 146 196 +123 140 196 +104 133 196 +117 140 196 +110 127 196 +92 127 196 +98 120 190 +92 120 196 +79 120 196 +73 114 196 +67 114 196 +54 108 196 +3 39 108 +98 129 192 +0 0 0 +0 0 0 +78 133 196 +110 127 196 +54 107 196 +72 114 196 +91 120 196 +91 127 196 +72 114 196 +117 139 196 +97 120 189 +123 139 196 +54 101 196 +66 107 196 +85 120 196 +97 127 196 +117 139 196 +0 0 0 +110 133 196 +117 133 196 +123 139 196 +129 139 196 +136 146 196 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +47 82 157 +54 108 196 0 0 0 0 0 0 0 0 0 diff --git a/graphics/battle_terrain/tall_grass/palette_night.pal b/graphics/battle_terrain/tall_grass/palette_night.pal index d4fa9cee8737..e87eebd5663b 100755 --- a/graphics/battle_terrain/tall_grass/palette_night.pal +++ b/graphics/battle_terrain/tall_grass/palette_night.pal @@ -2,43 +2,43 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -60 99 93 -72 114 93 -39 114 87 -78 99 81 -30 114 93 -87 105 93 +76 116 131 +76 116 126 +71 111 131 +66 111 121 +59 110 113 +51 109 104 +41 106 91 +76 76 55 +6 96 75 +0 86 66 +0 71 50 +0 1 15 +40 107 91 0 0 0 0 0 0 0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 +76 116 130 +15 90 80 +45 110 71 +61 110 116 +25 101 80 +76 116 125 +36 106 75 0 0 0 -39 51 63 -60 99 93 -72 114 93 -39 114 87 -78 99 81 -30 114 93 -87 105 93 0 0 0 0 0 0 +50 101 91 +56 106 100 +61 106 116 +65 110 121 +70 110 130 0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -123 205 115 -164 222 148 -82 164 57 +6 96 75 0 0 0 +0 71 50 0 0 0 +41 106 91 0 0 0 0 0 0 0 0 0 diff --git a/graphics/battle_terrain/water/palette_night.pal b/graphics/battle_terrain/water/palette_night.pal index 2b8f714efa4a..36c9c08b8e64 100755 --- a/graphics/battle_terrain/water/palette_night.pal +++ b/graphics/battle_terrain/water/palette_night.pal @@ -2,47 +2,47 @@ JASC-PAL 0100 48 0 0 0 -39 51 63 -35 76 128 -30 105 133 -34 99 119 -36 83 123 -21 69 84 -39 99 134 -21 51 84 -0 0 0 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -39 51 63 -35 76 128 -30 105 133 -34 99 119 -36 83 123 -21 69 84 -39 99 134 -21 51 84 -0 0 0 -0 0 0 -21 33 21 -21 33 21 -48 33 63 -48 33 63 -33 57 66 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 238 255 -148 213 238 -123 189 230 -90 148 222 -49 106 189 -16 74 156 +116 136 196 +110 130 196 +103 130 190 +97 123 183 +90 117 183 +78 110 190 +28 110 196 +9 104 196 +0 98 190 +0 73 196 +0 54 183 +0 42 164 +0 29 158 +0 22 114 +0 0 63 +0 0 0 +116 136 196 +0 54 170 +34 104 183 +58 117 189 +2 72 177 +71 123 196 +15 85 177 +90 129 196 +0 0 0 +0 0 0 +77 110 189 +90 117 183 +97 123 183 +103 129 189 +109 129 196 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +71 123 196 +34 104 183 +15 85 177 +0 54 170 +0 22 145 +0 0 120 0 0 0 0 0 0 0 0 0 diff --git a/include/battle_bg.h b/include/battle_bg.h index 1b32c7395d9e..c97a8ef69cec 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -8,6 +8,8 @@ struct BattleBackground const void *entryTileset; const void *entryTilemap; const void *palette; + const void *nightPalette; + const void *twilightPalette; }; void BattleInitBgsAndWindows(void); diff --git a/src/battle_bg.c b/src/battle_bg.c index 4be20fab29d6..d731f39e4225 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -603,6 +603,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_TallGrass, .entryTilemap = gBattleTerrainAnimTilemap_TallGrass, .palette = gBattleTerrainPalette_TallGrass, + .nightPalette = gBattleTerrainPalette_TallGrass_Night, + .twilightPalette = gBattleTerrainPalette_TallGrass, }, [BATTLE_TERRAIN_LONG_GRASS] = @@ -612,6 +614,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_LongGrass, .entryTilemap = gBattleTerrainAnimTilemap_LongGrass, .palette = gBattleTerrainPalette_LongGrass, + .nightPalette = gBattleTerrainPalette_LongGrass_Night, + .twilightPalette = gBattleTerrainPalette_LongGrass, }, [BATTLE_TERRAIN_SAND] = @@ -621,6 +625,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Sand, .entryTilemap = gBattleTerrainAnimTilemap_Sand, .palette = gBattleTerrainPalette_Sand, + .nightPalette = gBattleTerrainPalette_Sand_Night, + .twilightPalette = gBattleTerrainPalette_Sand, }, [BATTLE_TERRAIN_UNDERWATER] = @@ -630,6 +636,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Underwater, .entryTilemap = gBattleTerrainAnimTilemap_Underwater, .palette = gBattleTerrainPalette_Underwater, + .nightPalette = gBattleTerrainPalette_Underwater, + .twilightPalette = gBattleTerrainPalette_Underwater, }, [BATTLE_TERRAIN_WATER] = @@ -639,6 +647,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Water, .entryTilemap = gBattleTerrainAnimTilemap_Water, .palette = gBattleTerrainPalette_Water, + .nightPalette = gBattleTerrainPalette_Water_Night, + .twilightPalette = gBattleTerrainPalette_Water, }, [BATTLE_TERRAIN_POND] = @@ -648,6 +658,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_PondWater, .entryTilemap = gBattleTerrainAnimTilemap_PondWater, .palette = gBattleTerrainPalette_PondWater, + .nightPalette = gBattleTerrainPalette_PondWater_Night, + .twilightPalette = gBattleTerrainPalette_PondWater, }, [BATTLE_TERRAIN_MOUNTAIN] = @@ -657,6 +669,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Rock, .entryTilemap = gBattleTerrainAnimTilemap_Rock, .palette = gBattleTerrainPalette_Rock, + .nightPalette = gBattleTerrainPalette_Rock_Night, + .twilightPalette = gBattleTerrainPalette_Rock, }, [BATTLE_TERRAIN_CAVE] = @@ -666,6 +680,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Cave, .entryTilemap = gBattleTerrainAnimTilemap_Cave, .palette = gBattleTerrainPalette_Cave, + .nightPalette = gBattleTerrainPalette_Cave, + .twilightPalette = gBattleTerrainPalette_Cave, }, [BATTLE_TERRAIN_BUILDING] = @@ -675,6 +691,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Building, .entryTilemap = gBattleTerrainAnimTilemap_Building, .palette = gBattleTerrainPalette_Building, + .nightPalette = gBattleTerrainPalette_Building, + .twilightPalette = gBattleTerrainPalette_Building, }, [BATTLE_TERRAIN_PLAIN] = @@ -684,6 +702,8 @@ const struct BattleBackground sBattleTerrainTable[] = .entryTileset = gBattleTerrainAnimTiles_Building, .entryTilemap = gBattleTerrainAnimTilemap_Building, .palette = gBattleTerrainPalette_Plain, + .nightPalette = gBattleTerrainPalette_Plain_Night, + .twilightPalette = gBattleTerrainPalette_Plain, }, }; @@ -818,31 +838,12 @@ void DrawMainBattleBackground(void) UpdateTimeOfDay(); LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26))); - if ((gBattleTerrain == BATTLE_TERRAIN_GRASS) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_TallGrass_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_LONG_GRASS) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_LongGrass_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_WATER) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_Water_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_POND) && (gMapHeader.mapType == MAP_TYPE_UNDERGROUND)) - LoadCompressedPalette(gBattleTerrainPalette_PondWater_Cave, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - else if ((gBattleTerrain == BATTLE_TERRAIN_POND) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_UNDERGROUND)) - LoadCompressedPalette(gBattleTerrainPalette_PondWater_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_PLAIN) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_Plain_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_MOUNTAIN) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_Rock_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - - else if ((gBattleTerrain == BATTLE_TERRAIN_SAND) && (gTimeOfDay == TIME_OF_DAY_NIGHT) && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) - LoadCompressedPalette(gBattleTerrainPalette_Sand_Night, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); - + if(gTimeOfDay == TIME_OF_DAY_NIGHT && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].nightPalette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); + else if(gTimeOfDay == TIME_OF_DAY_TWILIGHT && !(gMapHeader.mapType == MAP_TYPE_INDOOR)) + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].twilightPalette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); else - LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); + LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); break; case MAP_BATTLE_SCENE_GYM: LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); diff --git a/src/battle_util.c b/src/battle_util.c index af6a0f191cb9..8ec394e537e8 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1867,7 +1867,7 @@ u8 GetImprisonedMovesCount(u32 battler, u16 move) return imprisonedMoves; } - +//CHANGE THIS LATER DUMBUFUCK remove mega and change frontier u32 GetBattlerAffectionHearts(u32 battler) { u8 side = GetBattlerSide(battler);