Skip to content

Pret merge (29th of April 2025) #6722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 29, 2025
Merged

Pret merge (29th of April 2025) #6722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
003bd54
Rename battle terrain to environment
Bassoonian Jul 13, 2024
367f6dc
Address concerns
Bassoonian Jul 13, 2024
709cfa1
Merge pull request #2014 from Bassoonian/battleterrain
GriffinRichards Apr 13, 2025
f11bddf
Fixes for Mirage Tower graphics (#2120)
GriffinRichards Apr 14, 2025
dd70446
Added constant in Birch speech dialogue
estellarc Apr 23, 2025
66c07f9
Merge pull request #2123 from estellarc/birch-dialog-box
mrgriffin Apr 24, 2025
4873589
Merge remote-tracking branch 'pret/master' into new-pret-merge
Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asm/macros/battle_script.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@
.byte \battler
.endm

.macro callterrainattack
.macro callenvironmentattack
.byte 0xcc
.endm

Expand Down Expand Up @@ -1255,7 +1255,7 @@
.4byte \failInstr
.endm

.macro settypetoterrain failInstr:req
.macro settypetoenvironment failInstr:req
.byte 0xeb
.4byte \failInstr
.endm
Expand Down
110 changes: 55 additions & 55 deletions data/battle_anim_scripts.s
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/battle_scripts_1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4946,7 +4946,7 @@ BattleScript_EffectNaturePower::
attackcanceler
attackstring
pause B_WAIT_TIME_SHORT
callterrainattack
callenvironmentattack
printstring STRINGID_NATUREPOWERTURNEDINTO
waitmessage B_WAIT_TIME_LONG
return
Expand Down Expand Up @@ -5395,7 +5395,7 @@ BattleScript_EffectCamouflage::
attackcanceler
attackstring
ppreduce
settypetoterrain BattleScript_ButItFailed
settypetoenvironment BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNCHANGEDTYPE
Expand Down
0 ...hics/battle_terrain/building/anim_map.bin → .../battle_environment/building/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 ...cs/battle_terrain/building/anim_tiles.png → ...attle_environment/building/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/building/map.bin → graphics/battle_environment/building/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/building/palette.pal → ...s/battle_environment/building/palette.pal
View file
Open in desktop
File renamed without changes.
0 ...hics/battle_terrain/building/palette2.pal → .../battle_environment/building/palette2.pal
View file
Open in desktop
File renamed without changes.
0 ...hics/battle_terrain/building/palette3.pal → .../battle_environment/building/palette3.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/building/tiles.png → ...ics/battle_environment/building/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/cave/anim_map.bin → ...hics/battle_environment/cave/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/cave/anim_tiles.png → ...cs/battle_environment/cave/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/cave/groudon.pal → graphics/battle_environment/cave/groudon.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/cave/map.bin → graphics/battle_environment/cave/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/cave/palette.pal → graphics/battle_environment/cave/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/cave/tiles.png → graphics/battle_environment/cave/tiles.png
View file
Open in desktop
File renamed without changes
0 ...cs/battle_terrain/long_grass/anim_map.bin → ...attle_environment/long_grass/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 .../battle_terrain/long_grass/anim_tiles.png → ...tle_environment/long_grass/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/long_grass/map.bin → ...ics/battle_environment/long_grass/map.bin
View file
Open in desktop
File renamed without changes.
0 ...ics/battle_terrain/long_grass/palette.pal → ...battle_environment/long_grass/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/long_grass/tiles.png → ...s/battle_environment/long_grass/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/plain/palette.pal → ...hics/battle_environment/plain/palette.pal
View file
Open in desktop
File renamed without changes.
0 ...cs/battle_terrain/pond_water/anim_map.bin → ...attle_environment/pond_water/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 .../battle_terrain/pond_water/anim_tiles.png → ...tle_environment/pond_water/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/pond_water/map.bin → ...ics/battle_environment/pond_water/map.bin
View file
Open in desktop
File renamed without changes.
0 ...ics/battle_terrain/pond_water/palette.pal → ...battle_environment/pond_water/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/pond_water/tiles.png → ...s/battle_environment/pond_water/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/rock/anim_map.bin → ...hics/battle_environment/rock/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/rock/anim_tiles.png → ...cs/battle_environment/rock/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/rock/map.bin → graphics/battle_environment/rock/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/rock/palette.pal → graphics/battle_environment/rock/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/rock/tiles.png → graphics/battle_environment/rock/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/sand/anim_map.bin → ...hics/battle_environment/sand/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sand/anim_tiles.png → ...cs/battle_environment/sand/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/sand/map.bin → graphics/battle_environment/sand/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sand/palette.pal → graphics/battle_environment/sand/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sand/tiles.png → graphics/battle_environment/sand/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/sky/anim_map.bin → graphics/battle_environment/sky/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sky/anim_tiles.png → ...ics/battle_environment/sky/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/sky/map.bin → graphics/battle_environment/sky/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sky/palette.pal → graphics/battle_environment/sky/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/sky/tiles.png → graphics/battle_environment/sky/tiles.png
View file
Open in desktop
File renamed without changes
0 ...attle_terrain/stadium/battle_frontier.pal → ...e_environment/stadium/battle_frontier.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/map.bin → graphics/battle_environment/stadium/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette1.pal → ...s/battle_environment/stadium/palette1.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette2.pal → ...s/battle_environment/stadium/palette2.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette3.pal → ...s/battle_environment/stadium/palette3.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette4.pal → ...s/battle_environment/stadium/palette4.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette5.pal → ...s/battle_environment/stadium/palette5.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette6.pal → ...s/battle_environment/stadium/palette6.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/palette7.pal → ...s/battle_environment/stadium/palette7.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/stadium/tiles.png → ...hics/battle_environment/stadium/tiles.png
View file
Open in desktop
File renamed without changes
0 ...cs/battle_terrain/tall_grass/anim_map.bin → ...attle_environment/tall_grass/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 .../battle_terrain/tall_grass/anim_tiles.png → ...tle_environment/tall_grass/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/tall_grass/map.bin → ...ics/battle_environment/tall_grass/map.bin
View file
Open in desktop
File renamed without changes.
0 ...ics/battle_terrain/tall_grass/palette.pal → ...battle_environment/tall_grass/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/tall_grass/tiles.png → ...s/battle_environment/tall_grass/tiles.png
View file
Open in desktop
File renamed without changes
0 ...cs/battle_terrain/underwater/anim_map.bin → ...attle_environment/underwater/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 .../battle_terrain/underwater/anim_tiles.png → ...tle_environment/underwater/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/underwater/map.bin → ...ics/battle_environment/underwater/map.bin
View file
Open in desktop
File renamed without changes.
0 ...ics/battle_terrain/underwater/palette.pal → ...battle_environment/underwater/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/underwater/tiles.png → ...s/battle_environment/underwater/tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/water/anim_map.bin → ...ics/battle_environment/water/anim_map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/water/anim_tiles.png → ...s/battle_environment/water/anim_tiles.png
View file
Open in desktop
File renamed without changes
0 graphics/battle_terrain/water/kyogre.pal → graphics/battle_environment/water/kyogre.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/water/map.bin → graphics/battle_environment/water/map.bin
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/water/palette.pal → ...hics/battle_environment/water/palette.pal
View file
Open in desktop
File renamed without changes.
0 graphics/battle_terrain/water/tiles.png → graphics/battle_environment/water/tiles.png
View file
Open in desktop
File renamed without changes
Binary file modified graphics/misc/mirage_tower.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics_file_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ graphics/pokenav/region_map/map.8bpp: %.8bpp: %.png
$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29 -Wnum_tiles

$(MISCGFXDIR)/mirage_tower.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 73 -Wnum_tiles

$(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
$(BATINTGFXDIR)/textbox_1.gbapal
@cat $^ >$@
Expand Down
2 changes: 1 addition & 1 deletion include/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT];
extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT];
extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT + 13]; //to handle stupidly large z move names
extern u32 gBattleTypeFlags;
extern u8 gBattleTerrain;
extern u8 gBattleEnvironment;
extern u8 *gBattleAnimBgTileBuffer;
extern u8 *gBattleAnimBgTilemapBuffer;
extern u32 gBattleControllerExecFlags;
Expand Down
2 changes: 1 addition & 1 deletion include/battle_anim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void LoadMoveBg(u16 bgId);
// battle_intro.c
void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
void DrawBattlerOnBg(int bgId, u8 x, u8 y, u8 battlerPosition, u8 paletteId, u8 *tiles, u16 *tilemap, u16 tilesOffset);
void HandleIntroSlide(u8 terrainId);
void HandleIntroSlide(u8 environmentId);
int GetAnimBgAttribute(u8 bgId, u8 attributeId);

// battle_anim_mons.c
Expand Down
2 changes: 1 addition & 1 deletion include/battle_setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void BattleSetup_StartLatiBattle(void);
void BattleSetup_StartLegendaryBattle(void);
void StartGroudonKyogreBattle(void);
void StartRegiBattle(void);
u8 BattleSetup_GetTerrainId(void);
u8 BattleSetup_GetEnvironmentId(void);
u8 GetWildBattleTransition(void);
u8 GetTrainerBattleTransition(void);
u8 GetSpecialBattleTransition(s32 id);
Expand Down
52 changes: 26 additions & 26 deletions include/constants/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,32 +470,32 @@ enum MoveEffects
#define MOVE_EFFECT_CERTAIN 0x4000
#define MOVE_EFFECT_CONTINUE 0x8000

// Battle terrain defines for gBattleTerrain.
#define BATTLE_TERRAIN_GRASS 0
#define BATTLE_TERRAIN_LONG_GRASS 1
#define BATTLE_TERRAIN_SAND 2
#define BATTLE_TERRAIN_UNDERWATER 3
#define BATTLE_TERRAIN_WATER 4
#define BATTLE_TERRAIN_POND 5
#define BATTLE_TERRAIN_MOUNTAIN 6
#define BATTLE_TERRAIN_CAVE 7
#define BATTLE_TERRAIN_BUILDING 8
#define BATTLE_TERRAIN_PLAIN 9
// New battle terrains are used for Secret Power but not fully implemented.
#define BATTLE_TERRAIN_SOARING 10
#define BATTLE_TERRAIN_SKY_PILLAR 11
#define BATTLE_TERRAIN_BURIAL_GROUND 12
#define BATTLE_TERRAIN_PUDDLE 13
#define BATTLE_TERRAIN_MARSH 14
#define BATTLE_TERRAIN_SWAMP 15
#define BATTLE_TERRAIN_SNOW 16
#define BATTLE_TERRAIN_ICE 17
#define BATTLE_TERRAIN_VOLCANO 18
#define BATTLE_TERRAIN_DISTORTION_WORLD 19
#define BATTLE_TERRAIN_SPACE 20
#define BATTLE_TERRAIN_ULTRA_SPACE 21

#define BATTLE_TERRAIN_COUNT 22
// Battle environment defines for gBattleEnvironment.
#define BATTLE_ENVIRONMENT_GRASS 0
#define BATTLE_ENVIRONMENT_LONG_GRASS 1
#define BATTLE_ENVIRONMENT_SAND 2
#define BATTLE_ENVIRONMENT_UNDERWATER 3
#define BATTLE_ENVIRONMENT_WATER 4
#define BATTLE_ENVIRONMENT_POND 5
#define BATTLE_ENVIRONMENT_MOUNTAIN 6
#define BATTLE_ENVIRONMENT_CAVE 7
#define BATTLE_ENVIRONMENT_BUILDING 8
#define BATTLE_ENVIRONMENT_PLAIN 9
// New battle environments are used for Secret Power but not fully implemented.
#define BATTLE_ENVIRONMENT_SOARING 10
#define BATTLE_ENVIRONMENT_SKY_PILLAR 11
#define BATTLE_ENVIRONMENT_BURIAL_GROUND 12
#define BATTLE_ENVIRONMENT_PUDDLE 13
#define BATTLE_ENVIRONMENT_MARSH 14
#define BATTLE_ENVIRONMENT_SWAMP 15
#define BATTLE_ENVIRONMENT_SNOW 16
#define BATTLE_ENVIRONMENT_ICE 17
#define BATTLE_ENVIRONMENT_VOLCANO 18
#define BATTLE_ENVIRONMENT_DISTORTION_WORLD 19
#define BATTLE_ENVIRONMENT_SPACE 20
#define BATTLE_ENVIRONMENT_ULTRA_SPACE 21

#define BATTLE_ENVIRONMENT_COUNT 22

#define B_WAIT_TIME_LONG (B_WAIT_TIME_MULTIPLIER * 4)
#define B_WAIT_TIME_MED (B_WAIT_TIME_MULTIPLIER * 3)
Expand Down
132 changes: 66 additions & 66 deletions include/graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,72 +214,72 @@ extern const u32 gBattleVSFrame_Tilemap[];
extern const u32 gMultiBattleIntroBg_Opponent_Tilemap[];
extern const u32 gMultiBattleIntroBg_Player_Tilemap[];

// battle terrains
extern const u32 gBattleTerrainTiles_TallGrass[];
extern const u32 gBattleTerrainTilemap_TallGrass[];
extern const u32 gBattleTerrainAnimTiles_TallGrass[];
extern const u32 gBattleTerrainAnimTilemap_TallGrass[];
extern const u32 gBattleTerrainPalette_TallGrass[];
extern const u32 gBattleTerrainTiles_LongGrass[];
extern const u32 gBattleTerrainTilemap_LongGrass[];
extern const u32 gBattleTerrainAnimTiles_LongGrass[];
extern const u32 gBattleTerrainAnimTilemap_LongGrass[];
extern const u32 gBattleTerrainPalette_LongGrass[];
extern const u32 gBattleTerrainTiles_Sand[];
extern const u32 gBattleTerrainTilemap_Sand[];
extern const u32 gBattleTerrainAnimTiles_Sand[];
extern const u32 gBattleTerrainAnimTilemap_Sand[];
extern const u32 gBattleTerrainPalette_Sand[];
extern const u32 gBattleTerrainTiles_Underwater[];
extern const u32 gBattleTerrainTilemap_Underwater[];
extern const u32 gBattleTerrainAnimTiles_Underwater[];
extern const u32 gBattleTerrainAnimTilemap_Underwater[];
extern const u32 gBattleTerrainPalette_Underwater[];
extern const u32 gBattleTerrainTiles_Water[];
extern const u32 gBattleTerrainTilemap_Water[];
extern const u32 gBattleTerrainAnimTiles_Water[];
extern const u32 gBattleTerrainAnimTilemap_Water[];
extern const u32 gBattleTerrainPalette_Water[];
extern const u32 gBattleTerrainTiles_PondWater[];
extern const u32 gBattleTerrainTilemap_PondWater[];
extern const u32 gBattleTerrainAnimTiles_PondWater[];
extern const u32 gBattleTerrainAnimTilemap_PondWater[];
extern const u32 gBattleTerrainPalette_PondWater[];
extern const u32 gBattleTerrainTiles_Rock[];
extern const u32 gBattleTerrainTilemap_Rock[];
extern const u32 gBattleTerrainAnimTiles_Rock[];
extern const u32 gBattleTerrainAnimTilemap_Rock[];
extern const u32 gBattleTerrainPalette_Rock[];
extern const u32 gBattleTerrainTiles_Cave[];
extern const u32 gBattleTerrainTilemap_Cave[];
extern const u32 gBattleTerrainAnimTiles_Cave[];
extern const u32 gBattleTerrainAnimTilemap_Cave[];
extern const u32 gBattleTerrainPalette_Cave[];
extern const u32 gBattleTerrainTiles_Building[];
extern const u32 gBattleTerrainTilemap_Building[];
extern const u32 gBattleTerrainAnimTiles_Building[];
extern const u32 gBattleTerrainAnimTilemap_Building[];
extern const u32 gBattleTerrainPalette_Building[];
extern const u32 gBattleTerrainPalette_Plain[];
extern const u32 gBattleTerrainPalette_Frontier[];
extern const u32 gBattleTerrainTiles_Stadium[];
extern const u32 gBattleTerrainTilemap_Stadium[];
extern const u32 gBattleTerrainTiles_Rayquaza[];
extern const u32 gBattleTerrainTilemap_Rayquaza[];
extern const u32 gBattleTerrainAnimTiles_Rayquaza[];
extern const u32 gBattleTerrainAnimTilemap_Rayquaza[];
extern const u32 gBattleTerrainPalette_Rayquaza[];
extern const u32 gBattleTerrainPalette_Kyogre[];
extern const u32 gBattleTerrainPalette_Groudon[];
extern const u32 gBattleTerrainPalette_BuildingGym[];
extern const u32 gBattleTerrainPalette_BuildingLeader[];
extern const u32 gBattleTerrainPalette_StadiumAqua[];
extern const u32 gBattleTerrainPalette_StadiumMagma[];
extern const u32 gBattleTerrainPalette_StadiumSidney[];
extern const u32 gBattleTerrainPalette_StadiumPhoebe[];
extern const u32 gBattleTerrainPalette_StadiumGlacia[];
extern const u32 gBattleTerrainPalette_StadiumDrake[];
extern const u32 gBattleTerrainPalette_StadiumWallace[];
// battle environments
extern const u32 gBattleEnvironmentTiles_TallGrass[];
extern const u32 gBattleEnvironmentTilemap_TallGrass[];
extern const u32 gBattleEnvironmentAnimTiles_TallGrass[];
extern const u32 gBattleEnvironmentAnimTilemap_TallGrass[];
extern const u32 gBattleEnvironmentPalette_TallGrass[];
extern const u32 gBattleEnvironmentTiles_LongGrass[];
extern const u32 gBattleEnvironmentTilemap_LongGrass[];
extern const u32 gBattleEnvironmentAnimTiles_LongGrass[];
extern const u32 gBattleEnvironmentAnimTilemap_LongGrass[];
extern const u32 gBattleEnvironmentPalette_LongGrass[];
extern const u32 gBattleEnvironmentTiles_Sand[];
extern const u32 gBattleEnvironmentTilemap_Sand[];
extern const u32 gBattleEnvironmentAnimTiles_Sand[];
extern const u32 gBattleEnvironmentAnimTilemap_Sand[];
extern const u32 gBattleEnvironmentPalette_Sand[];
extern const u32 gBattleEnvironmentTiles_Underwater[];
extern const u32 gBattleEnvironmentTilemap_Underwater[];
extern const u32 gBattleEnvironmentAnimTiles_Underwater[];
extern const u32 gBattleEnvironmentAnimTilemap_Underwater[];
extern const u32 gBattleEnvironmentPalette_Underwater[];
extern const u32 gBattleEnvironmentTiles_Water[];
extern const u32 gBattleEnvironmentTilemap_Water[];
extern const u32 gBattleEnvironmentAnimTiles_Water[];
extern const u32 gBattleEnvironmentAnimTilemap_Water[];
extern const u32 gBattleEnvironmentPalette_Water[];
extern const u32 gBattleEnvironmentTiles_PondWater[];
extern const u32 gBattleEnvironmentTilemap_PondWater[];
extern const u32 gBattleEnvironmentAnimTiles_PondWater[];
extern const u32 gBattleEnvironmentAnimTilemap_PondWater[];
extern const u32 gBattleEnvironmentPalette_PondWater[];
extern const u32 gBattleEnvironmentTiles_Rock[];
extern const u32 gBattleEnvironmentTilemap_Rock[];
extern const u32 gBattleEnvironmentAnimTiles_Rock[];
extern const u32 gBattleEnvironmentAnimTilemap_Rock[];
extern const u32 gBattleEnvironmentPalette_Rock[];
extern const u32 gBattleEnvironmentTiles_Cave[];
extern const u32 gBattleEnvironmentTilemap_Cave[];
extern const u32 gBattleEnvironmentAnimTiles_Cave[];
extern const u32 gBattleEnvironmentAnimTilemap_Cave[];
extern const u32 gBattleEnvironmentPalette_Cave[];
extern const u32 gBattleEnvironmentTiles_Building[];
extern const u32 gBattleEnvironmentTilemap_Building[];
extern const u32 gBattleEnvironmentAnimTiles_Building[];
extern const u32 gBattleEnvironmentAnimTilemap_Building[];
extern const u32 gBattleEnvironmentPalette_Building[];
extern const u32 gBattleEnvironmentPalette_Plain[];
extern const u32 gBattleEnvironmentPalette_Frontier[];
extern const u32 gBattleEnvironmentTiles_Stadium[];
extern const u32 gBattleEnvironmentTilemap_Stadium[];
extern const u32 gBattleEnvironmentTiles_Rayquaza[];
extern const u32 gBattleEnvironmentTilemap_Rayquaza[];
extern const u32 gBattleEnvironmentAnimTiles_Rayquaza[];
extern const u32 gBattleEnvironmentAnimTilemap_Rayquaza[];
extern const u32 gBattleEnvironmentPalette_Rayquaza[];
extern const u32 gBattleEnvironmentPalette_Kyogre[];
extern const u32 gBattleEnvironmentPalette_Groudon[];
extern const u32 gBattleEnvironmentPalette_BuildingGym[];
extern const u32 gBattleEnvironmentPalette_BuildingLeader[];
extern const u32 gBattleEnvironmentPalette_StadiumAqua[];
extern const u32 gBattleEnvironmentPalette_StadiumMagma[];
extern const u32 gBattleEnvironmentPalette_StadiumSidney[];
extern const u32 gBattleEnvironmentPalette_StadiumPhoebe[];
extern const u32 gBattleEnvironmentPalette_StadiumGlacia[];
extern const u32 gBattleEnvironmentPalette_StadiumDrake[];
extern const u32 gBattleEnvironmentPalette_StadiumWallace[];

// Pokédex
extern const u32 gPokedexInterface_Gfx[];
Expand Down
14 changes: 7 additions & 7 deletions src/battle_anim_ground.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ static void AnimTask_DigEndBounceMovementSetInvisible(u8);
static void AnimTask_DigSetVisibleUnderground(u8);
static void AnimTask_DigRiseUpFromHole(u8);
static void SetDigScanlineEffect(u8, s16, s16);
static void AnimTask_ShakeTerrain(u8);
static void AnimTask_ShakePlatforms(u8);
static void AnimTask_ShakeBattlers(u8);
static void SetBattlersXOffsetForShake(struct Task *);
static void WaitForFissureCompletion(u8);
Expand Down Expand Up @@ -581,12 +581,12 @@ static void AnimDigDirtMound(struct Sprite *sprite)
#define tMaxTime data[3]
#define tbattlerSpriteIds(i) data[9 + (i)]
#define tNumBattlers data[13] // AnimTask_ShakeBattlers
#define tInitialX data[13] // AnimTask_ShakeTerrain
#define tInitialX data[13] // AnimTask_ShakePlatforms
#define tHorizOffset data[14]
#define tInitHorizOffset data[15]

// Shakes battler(s) or the battle terrain back and forth horizontally. Used by e.g. Earthquake, Eruption
// arg0: What to shake. 0-3 for any specific battler, MAX_BATTLERS_COUNT for all battlers, MAX_BATTLERS_COUNT + 1 for the terrain
// Shakes battler(s) or the battle platforms back and forth horizontally. Used by e.g. Earthquake, Eruption
// arg0: What to shake. 0-3 for any specific battler, MAX_BATTLERS_COUNT for all battlers, MAX_BATTLERS_COUNT + 1 for the platforms
// arg1: Shake intensity, used to calculate horizontal pixel offset (if 0, use move power instead)
// arg2: Length of time to shake for
void AnimTask_HorizontalShake(u8 taskId)
Expand All @@ -602,9 +602,9 @@ void AnimTask_HorizontalShake(u8 taskId)
task->tMaxTime = gBattleAnimArgs[2];
switch (gBattleAnimArgs[0])
{
case MAX_BATTLERS_COUNT + 1: // Shake terrain
case MAX_BATTLERS_COUNT + 1: // Shake platforms
task->tInitialX = gBattle_BG3_X;
task->func = AnimTask_ShakeTerrain;
task->func = AnimTask_ShakePlatforms;
break;
case MAX_BATTLERS_COUNT: // Shake all battlers
task->tNumBattlers = 0;
Expand Down Expand Up @@ -633,7 +633,7 @@ void AnimTask_HorizontalShake(u8 taskId)
}
}

static void AnimTask_ShakeTerrain(u8 taskId)
static void AnimTask_ShakePlatforms(u8 taskId)
{
struct Task *task = &gTasks[taskId];

Expand Down
Loading