Skip to content
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.

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

Add B_SHOW_TYPES and cleaned up IsDoubleBattle #5131

Merged
merged 60 commits into from
Aug 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
cf2f19a
First attempt at a port
pkmnsnfrn Jul 29, 2024
649308a
Slightly broken but working
pkmnsnfrn Jul 29, 2024
65aad31
Got images working and opponent palettes
pkmnsnfrn Jul 29, 2024
a7a11f4
half finished compressed spritesheet approach instead
ravepossum Jul 31, 2024
46b4954
fix the palettes (smh)
ravepossum Aug 1, 2024
1bc4e25
fix hflip, and a lot of clean-up
ravepossum Aug 1, 2024
cc86194
Merge pull request #2 from ravepossum/typeIcons
pkmnsnfrn Aug 1, 2024
f0c21ce
Add B_SHOW_TYPES
pkmnsnfrn Aug 3, 2024
8adb4d0
Got Illusion working
pkmnsnfrn Aug 4, 2024
0bfed89
Add num type enum
pkmnsnfrn Aug 4, 2024
92e8b67
Updated function to get type
pkmnsnfrn Aug 4, 2024
e56635a
Fixed type icon position and cleaned up functions
pkmnsnfrn Aug 4, 2024
c541b63
Updated illusions and Tera handling
pkmnsnfrn Aug 4, 2024
791a892
Added BATTLE_TYPE_IS_SINGLE and DOUBLE
pkmnsnfrn Aug 5, 2024
4be0e35
Removed IS_BATTLE_TYPE_SINGLE
pkmnsnfrn Aug 5, 2024
5cde58d
Implemented BATTLE_TYPE_IS_DOUBLE across repo
pkmnsnfrn Aug 5, 2024
85f1cd5
Removed SIDE macro
pkmnsnfrn Aug 5, 2024
0c08beb
Updated config
pkmnsnfrn Aug 5, 2024
003efcb
Deprecated battler alive macro
pkmnsnfrn Aug 5, 2024
f96af60
Reindented file
pkmnsnfrn Aug 5, 2024
a72d78f
Added exceptions for 2v1
pkmnsnfrn Aug 5, 2024
97f3210
Replaced Fainted check with Null check
pkmnsnfrn Aug 5, 2024
96c5bfc
Added functionality for only types of caught mons
pkmnsnfrn Aug 5, 2024
7ce9366
UseDoubleBattleCoords updated
pkmnsnfrn Aug 5, 2024
ce3c2f6
Added ShouldFlipTypeIcon
pkmnsnfrn Aug 5, 2024
47a5a6b
Renamed TryLoadTypeIcon
pkmnsnfrn Aug 7, 2024
deb14d5
Refactored functions
pkmnsnfrn Aug 7, 2024
0eb4730
Refactored functions
pkmnsnfrn Aug 7, 2024
1376173
Refactored functions
pkmnsnfrn Aug 7, 2024
66e9fcb
Refactored functions
pkmnsnfrn Aug 8, 2024
449de40
Renamed SEEN to CAUGHT
pkmnsnfrn Aug 8, 2024
a18609f
Reset config
pkmnsnfrn Aug 8, 2024
d50431c
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
pkmnsnfrn Aug 8, 2024
a03271b
Added useSecondPalette and isOrdinary to gTypesInfo
fdeblasio Aug 9, 2024
4c8fa97
Further simplified secondPalette and isOrdinary
fdeblasio Aug 9, 2024
f30e759
Merge pull request #3 from fdeblasio/psfTypeIcons
pkmnsnfrn Aug 9, 2024
fcfe5e5
Changed isordinary to isSpecialCase
pkmnsnfrn Aug 9, 2024
c4caf09
Renamed to useSecondTypeIconPalette
pkmnsnfrn Aug 9, 2024
e4f613a
Fixed Stellar type interactions
pkmnsnfrn Aug 10, 2024
d13fdeb
fixed spacing
pkmnsnfrn Aug 10, 2024
fef817a
fixed include/config/battle.h
pkmnsnfrn Aug 10, 2024
ac34f8a
fixed
pkmnsnfrn Aug 10, 2024
3f65d19
fixed include/config/general.h
pkmnsnfrn Aug 10, 2024
95f9d42
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
pkmnsnfrn Aug 10, 2024
85d8b02
changed type1 and type2
pkmnsnfrn Aug 10, 2024
b1947b8
Moved IsDoubleBattle to include.battle.h
pkmnsnfrn Aug 10, 2024
f1b37aa
Changed IsBattlerFainted to IsBattlerAlive
pkmnsnfrn Aug 10, 2024
2fb9358
Removed IsBattlerNull
pkmnsnfrn Aug 10, 2024
997fa9e
Moved GetBattlerData to be inline
pkmnsnfrn Aug 10, 2024
7ba627e
Renamed GetMonDefensiveTeraType
pkmnsnfrn Aug 10, 2024
747fc32
Removed IsIllusionActive
pkmnsnfrn Aug 10, 2024
e901e2d
Fixed identation
pkmnsnfrn Aug 10, 2024
3c2543b
found one last isDoubleBattle hold out
pkmnsnfrn Aug 10, 2024
b40ee8f
fixed redundant brackets
pkmnsnfrn Aug 10, 2024
1a77ad7
Fixed spacing for B_SHOW_TYPES
pkmnsnfrn Aug 10, 2024
3c92e6c
Update src/battle_script_commands.c
pkmnsnfrn Aug 10, 2024
25a25c3
Fixed padding
pkmnsnfrn Aug 10, 2024
654844b
Reindent file and refactored GetTypeIconHideMovement
pkmnsnfrn Aug 10, 2024
5cb7c52
Update include/data.h
pkmnsnfrn Aug 11, 2024
2bb7578
Merge branch 'upcoming' into typeIcons
pkmnsnfrn Aug 11, 2024
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
2 changes: 1 addition & 1 deletion include/data.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct TypeInfo
u16 maxMove;
u16 teraTypeRGBValue; // Most values pulled from the Tera type icon palette.
u16 damageCategory:2; // Used for B_PHYSICAL_SPECIAL_SPLIT <= GEN_3
u16 padding:14;
u16 padding:12;
const u32 *const paletteTMHM;
bool8 useSecondTypeIconPalette:1;
bool8 isSpecialCaseType:1;
pkmnsnfrn marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading