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

Version 1.3.0 #2447

Merged
merged 186 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
2f03ac3
Multihit refactor and Parental Bond
BuffelSaft Sep 23, 2021
530998c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Sep 23, 2021
f49a486
Replace tabs with spaces
BuffelSaft Sep 23, 2021
1ee8411
Fix recoil occurring on zero damage attack
BuffelSaft Oct 2, 2021
41d6969
Fix Sturdy/Sash/Band
BuffelSaft Oct 8, 2021
07bdd2f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Oct 9, 2021
61add88
Fix Thief
BuffelSaft Oct 13, 2021
e59be67
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Oct 15, 2021
8db2e72
Parental Bond/Bug Bite interaction
BuffelSaft Oct 15, 2021
fb25e1a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Nov 1, 2021
0345dea
Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES
BuffelSaft Nov 1, 2021
5d678bc
Fix move effect defines
BuffelSaft Nov 1, 2021
735ee60
Restore missing break
BuffelSaft Nov 2, 2021
72d12a5
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Nov 6, 2021
be51860
Update move effect defines
BuffelSaft Nov 6, 2021
c69e766
Update battle_move_effects.h
BuffelSaft Nov 6, 2021
9351df5
Revert "Update move effect defines"
BuffelSaft Nov 6, 2021
d30f2b5
Fix move effects list
BuffelSaft Nov 7, 2021
e407883
Rethink final strike effects
BuffelSaft Nov 7, 2021
6232b04
Fix Burn Up
BuffelSaft Nov 12, 2021
d0336a9
Fix Payday
BuffelSaft Nov 13, 2021
2bf72fc
Double Struggle damage for PB
BuffelSaft Nov 13, 2021
55b279b
Fix several move effects
BuffelSaft Nov 13, 2021
02b3a1d
Fix infinite Bide loop
BuffelSaft Nov 13, 2021
04867ac
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Nov 13, 2021
16a4fc9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft Nov 19, 2021
a82d068
Implement Mr. Dollsteak's animations
BuffelSaft Oct 28, 2021
d3831a8
Added Gen 7 Form animations (minus Oricorio, Lycanroc, Wishiwashi and…
AsparagusEduardo Nov 21, 2021
84921d7
Fixed posion
AsparagusEduardo Nov 21, 2021
a0c127f
Move region map layout to C
GriffinRichards Feb 22, 2022
ed70b81
Use constants for region map layout
GriffinRichards Feb 22, 2022
8b43cff
Move remaining region map graphics to region map folder
GriffinRichards Feb 22, 2022
3cc21a0
Format object event graphics info
cbt6 Mar 12, 2022
3fe423a
use json for region map sections
garakmon Apr 5, 2022
8693db6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft May 7, 2022
3e1934e
Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE
BuffelSaft May 7, 2022
57003c6
EFFECT_SOLAR_BEAM
BuffelSaft May 7, 2022
3e645b1
IsMoveAffectedByParentalBond supports dynamic move targeting
BuffelSaft May 7, 2022
bb25746
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft May 13, 2022
f6f4227
better bug bite impl, fix item removal
May 13, 2022
cdd37ad
fix stuff cheeks w new consumeberry impl
May 13, 2022
b09dad6
minor edits to consumeberry calls
May 13, 2022
ebb711b
fix bug bite not activating if faints target. also save original move…
May 13, 2022
bd00df4
Fix indentation in IsMoveAffectedByParentalBond
BuffelSaft May 21, 2022
16570e8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…
BuffelSaft May 22, 2022
d29293f
Prevent infinite Bide loop with Parental Bond
BuffelSaft May 22, 2022
35bdacc
Add the HEAL_LOCATION_NONE constant
sphericalice Jun 3, 2022
bb3992e
Use TRY_FREE_AND_SET_NULL macro for sFlyMap
sphericalice Jun 3, 2022
277750b
Merge branch 'master' into rme-update
GriffinRichards Jun 22, 2022
ce4a6e9
MAP_NONE -> MAP_DYNAMIC
GriffinRichards Aug 26, 2022
c58dfa6
Merge remote-tracking branch 'RHH/master' into PE_monAnimations
AsparagusEduardo Sep 2, 2022
36551df
Treat warp ids as strings to allow constants
GriffinRichards Sep 3, 2022
5e39995
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnima…
AsparagusEduardo Sep 9, 2022
66177e7
Reworked shiny charm rerolls allow adding additional rerolls when nec…
AsparagusEduardo Sep 11, 2022
e3c19f5
Implement B2W2 Repel System
Deokishisu Aug 27, 2022
2d78ac0
Implemented Lures using the same vars as repels
AsparagusEduardo Sep 11, 2022
e3005e5
Item config for repel prompt
AsparagusEduardo Sep 12, 2022
0944232
Added shiny rerolls to Lures + reverted repel var name
AsparagusEduardo Sep 12, 2022
ca048e1
Lures now increase the level of encountered mon to max + 1
AsparagusEduardo Sep 12, 2022
dc423ef
Handling repel/lure menu
AsparagusEduardo Sep 14, 2022
b0bd5f9
Cleaned up trailing spaces and spaces instead of tabs
AsparagusEduardo Sep 16, 2022
b2b308f
Fixed Old Rod Lure swap
AsparagusEduardo Sep 16, 2022
7223dbd
Merge branch 'master' into rme-update
GriffinRichards Sep 25, 2022
e473aaf
Merge branch 'master' of https://github.com/pret/pokeemerald into ent…
GriffinRichards Sep 25, 2022
56c28fb
Move region map gitignore to existing data gitignore
GriffinRichards Sep 25, 2022
45e6b48
Merge pull request #1636 from GriffinRichards/rme-update
GriffinRichards Sep 26, 2022
171367d
Merge pull request #1643 from cbt6/object-event-graphics-info
GriffinRichards Sep 26, 2022
f074464
Merge pull request #1651 from garakmon/entry_json
GriffinRichards Sep 26, 2022
4f407a1
Convert tilesets.s to C
GriffinRichards Sep 27, 2022
6db489e
Use constants for overworld object palette slots
GriffinRichards Sep 28, 2022
453da8a
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed …
AsparagusEduardo Oct 7, 2022
044898f
Documented missing gSoftResetDisabled uses
AsparagusEduardo Oct 7, 2022
65d3944
Give tileset palettes proper type, name compressed secret base tiles
GriffinRichards Oct 8, 2022
bd023b1
Merge pull request #1796 from GriffinRichards/tilesets-c
GriffinRichards Oct 10, 2022
dc97eca
combine "unused" field into tile buffer
Kurausukun Oct 11, 2022
bbb4ee3
Merge pull request #1801 from Kurausukun/storage_struct
GriffinRichards Oct 11, 2022
11e3f03
Document new metatile wild encounter odds
abaresk Oct 12, 2022
af081b0
Make related func names more concise
abaresk Oct 12, 2022
a10ec04
Color rotating gate pngs
GriffinRichards Oct 12, 2022
f79205a
Fix bug where badge boost flag is inverted
May8th1995 Oct 13, 2022
839d706
Merge pull request #2383 from May8th1995/badgeFlagBug
AsparagusEduardo Oct 13, 2022
db013aa
Fix AI issue giving decrementing score to confuse hit instead of confuse
May8th1995 Oct 13, 2022
71dad6a
Merge pull request #2384 from May8th1995/confuseAI
AsparagusEduardo Oct 13, 2022
722e501
Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisa…
GriffinRichards Oct 13, 2022
2e128e3
Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid
GriffinRichards Oct 13, 2022
90f7999
Added class-based Poké Balls for trainers
LOuroboros Oct 13, 2022
d64e18d
Merge pull request #2385 from LOuroboros/trainerClassBasedBalls
ghoulslash Oct 14, 2022
8a1a561
Uncommented evo moves for each species
LOuroboros Oct 14, 2022
068422b
Merge pull request #2386 from LOuroboros/patch-1
AsparagusEduardo Oct 14, 2022
4cbc6d4
Config for running indoors
AsparagusEduardo Oct 15, 2022
b538239
Add more documentation to thunder weather
abaresk Oct 15, 2022
e67d55b
Fix names
abaresk Oct 15, 2022
dd2d610
Fixed Z-Move not being cleared if Pokémon faints
AsparagusEduardo Oct 16, 2022
e3f37ad
Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove
ghoulslash Oct 16, 2022
ede6162
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running
ghoulslash Oct 16, 2022
1607291
Implemented Honey's Sweet Scent functionality
AsparagusEduardo Oct 16, 2022
7102351
update psycho cut anim
Oct 16, 2022
327c648
Document seldom-used trigger functionality
tustin2121 Oct 17, 2022
a585d56
fix whitespace
Oct 17, 2022
ffc5ffc
Merge pull request #2390 from ghoulslash/be/psychocut
AsparagusEduardo Oct 17, 2022
610a8ef
Replaced busy-wait loops
gruxor Oct 17, 2022
c57ab9e
Merge pull request #2392 from gruxor/wait-fix
AsparagusEduardo Oct 17, 2022
7160253
Merge pull request #1802 from abaresk/wild-encounters
GriffinRichards Oct 17, 2022
48ab684
Fix weather color map documentation
huderlem Oct 16, 2022
0d0a9bd
Update src/overworld.c
huderlem Oct 18, 2022
7f09894
Merge branch 'master' into thunder
abaresk Oct 18, 2022
e33581f
Merge pull request #1671 from sphericalice/heal-location-none
GriffinRichards Oct 18, 2022
4730870
VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
tustin2121 Oct 19, 2022
a418f8d
Merge pull request #1755 from GriffinRichards/map-dynamic
GriffinRichards Oct 19, 2022
3e8baa5
Merge branch 'master' into porymap-5
GriffinRichards Oct 19, 2022
fad92ec
Merge pull request #1803 from abaresk/thunder
GriffinRichards Oct 20, 2022
e752c8a
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately
GriffinRichards Oct 20, 2022
6035c5a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald …
BuffelSaft Oct 22, 2022
3775c5d
Fix move effects
BuffelSaft Oct 22, 2022
c267c61
Fixed CanFling
LOuroboros Oct 22, 2022
449f4c0
Merge pull request #2408 from LOuroboros/patch-1
AsparagusEduardo Oct 22, 2022
ae6ec3b
Change cleanString() to convert invalid chars to underscores
huderlem Oct 22, 2022
1b056f9
Fix various Parental Bond issues
BuffelSaft Oct 23, 2022
9b076a9
Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES
BuffelSaft Oct 23, 2022
a5ede1e
Move B_PARENTAL_BOND_DAMAGE to damage settings
BuffelSaft Oct 23, 2022
7bca475
Add Misty Explosion to Parental Bond ban list
BuffelSaft Oct 23, 2022
d9cc98a
Suggested changes
BuffelSaft Oct 24, 2022
cc182bf
Use Porymap's new order for connection fields
GriffinRichards Oct 24, 2022
85ce30b
Created macros for Bard Sounds
AsparagusEduardo Oct 25, 2022
2cd0a0f
Fix lock when teaching a TM/HM after learning a move by level up.
kaisermg5 Oct 25, 2022
3327758
Move B_BEAT_UP_DMG to other move settings
BuffelSaft Oct 26, 2022
93dd878
Merge pull request #2413 from kaisermg5/fix_tmhm_lock
AsparagusEduardo Oct 27, 2022
224ca25
Requested clean up
BuffelSaft Oct 27, 2022
85c0d2d
Review changes
AsparagusEduardo Oct 27, 2022
b035fc1
Merge pull request #1811 from AsparagusEduardo/pret/pr/BardSounds
GriffinRichards Oct 27, 2022
215604f
fix battle palace bug
DizzyEggg Oct 27, 2022
a74a8fa
Updated CanTeleport
LOuroboros Oct 29, 2022
f439a2d
Fix EventScript_WroteSecretCodeLockOpened typo
GriffinRichards Oct 30, 2022
01c71b4
Fix more text and movements labeled as scripts
GriffinRichards Oct 30, 2022
c76beed
Merge pull request #1807 from pret/porymap-5
GriffinRichards Oct 30, 2022
3172273
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/featur…
AsparagusEduardo Oct 30, 2022
e4a439a
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge…
AsparagusEduardo Oct 30, 2022
d901328
Update gitignore/spacing for new region map data
GriffinRichards Oct 30, 2022
d02fc43
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge…
AsparagusEduardo Oct 30, 2022
5ebc996
Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
LOuroboros Oct 31, 2022
52dda5f
Actually removed ItemId_GetId
LOuroboros Oct 31, 2022
dc4c575
Merge pull request #2423 from LOuroboros/debugPCFlag
AsparagusEduardo Oct 31, 2022
9d64c83
Merge pull request #2424 from LOuroboros/getItemId
AsparagusEduardo Oct 31, 2022
ea43b77
Fix battle tent again
DizzyEggg Oct 31, 2022
51d8b57
restore deleted line
DizzyEggg Oct 31, 2022
ebc9fc3
Merge pull request #2416 from DizzyEggg/fix_palace
AsparagusEduardo Nov 1, 2022
c6cb54b
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures
ghoulslash Nov 2, 2022
53061c7
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodood…
ghoulslash Nov 2, 2022
b837150
Merge pull request #1676 from BuffelSaft/multistrike
AsparagusEduardo Nov 2, 2022
f4f9329
Fix build of jsonproc
tustin2121 Nov 2, 2022
8ff5ae7
Pinning the GF header to the front of modern
tustin2121 Nov 2, 2022
fd87c97
Adding documentation about GFHeader
tustin2121 Nov 2, 2022
e698a65
Pinning GFHeader to front of modern
tustin2121 Nov 2, 2022
b32413d
Restoring the GFHeader
tustin2121 Nov 2, 2022
1163643
Fix build of jsonproc
tustin2121 Nov 2, 2022
736ca89
Fix abilities that raise target's stat after hit
BuffelSaft Nov 3, 2022
c169a95
Merge branch 'upcoming' into fix-stat-boost-on-hit
BuffelSaft Nov 3, 2022
9ea3ad8
Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit
AsparagusEduardo Nov 3, 2022
edf4e45
Config for Dark Void being only usable by Darkrai
AsparagusEduardo Nov 4, 2022
fbc71b3
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge…
AsparagusEduardo Nov 4, 2022
d23b5c9
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/featur…
AsparagusEduardo Nov 4, 2022
8c66b31
Fixed Bad Dream's ability popup message
AsparagusEduardo Nov 4, 2022
f3d44f0
Merge pull request #1927 from AsparagusEduardo/PE_monAnimations
ghoulslash Nov 4, 2022
d13431b
merge w rhh master
Nov 4, 2022
1e69038
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
Nov 4, 2022
b1af66e
Merge pull request #1812 from tustin2121/patch-linker
GriffinRichards Nov 4, 2022
5b15525
Review changes
AsparagusEduardo Nov 4, 2022
7a0e541
workaround for GetBattlerHoldEffectParam to handle bug bite different…
Nov 4, 2022
d05c74b
Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams
BuffelSaft Nov 4, 2022
2b5aff2
Merge pull request #2426 from tustin2121-2/patch-linker
AsparagusEduardo Nov 4, 2022
fa8bf80
Merge pull request #2420 from LOuroboros/teleport
AsparagusEduardo Nov 4, 2022
f56df74
Optimized Bad Dreams' code
LOuroboros Nov 4, 2022
bbd7b20
Merge pull request #2433 from ghoulslash/be/bug_bite
BuffelSaft Nov 5, 2022
1da4eb3
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
BuffelSaft Nov 5, 2022
237877e
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
AsparagusEduardo Nov 7, 2022
0a6de12
Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc
GriffinRichards Nov 7, 2022
e6ae0bd
Merge pull request #2434 from LOuroboros/badDreams
AsparagusEduardo Nov 8, 2022
a35986f
Fixed indentation in ScrCmd_faceplayer
LOuroboros Nov 8, 2022
9e24fe6
Merge pull request #1816 from LOuroboros/patch-1
GriffinRichards Nov 9, 2022
bd63ef1
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge…
AsparagusEduardo Nov 9, 2022
f2d0e54
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
AsparagusEduardo Nov 9, 2022
a2b355f
Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_…
AsparagusEduardo Nov 9, 2022
7260478
Uncommented level up moves
LOuroboros Nov 11, 2022
6197e76
Merge pull request #2449 from LOuroboros/patch-1
AsparagusEduardo Nov 11, 2022
bd4b660
Fix Berries that were broken after Bug Bite fix
eatthepear Nov 12, 2022
49b7328
Merge pull request #2451 from eatthepear/patch-1
AsparagusEduardo Nov 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 9 additions & 3 deletions asm/macros/battle_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@
.4byte \ptr
.endm

.macro trygetbaddreamstarget ptr:req
.macro unused ptr:req
.byte 0xfd
.4byte \ptr
.endm
Expand Down Expand Up @@ -1789,9 +1789,9 @@
various BS_ATTACKER, VARIOUS_SET_Z_EFFECT
.endm

.macro consumeberry battler:req, restoreItem=FALSE
.macro consumeberry battler:req, frombattler:req
various \battler, VARIOUS_CONSUME_BERRY
.byte \restoreItem
.byte \frombattler
.endm

.macro activateitemeffects battler:req
Expand Down Expand Up @@ -1988,6 +1988,12 @@
various \battler, VARIOUS_GET_BATTLER_SIDE
.endm

.macro checkparentalbondcounter counter:req, ptr:req
various BS_ATTACKER, VARIOUS_CHECK_PARENTAL_BOND_COUNTER
.byte \counter
.4byte \ptr
.endm

@ helpful macros
.macro setstatchanger stat:req, stages:req, down:req
setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7
Expand Down
2 changes: 1 addition & 1 deletion asm/macros/event.inc
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
formatwarp \map, \a, \b, \c
.endm

@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination.
@ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination.
@ Warp commands can be given either the id of which warp location to go to on the destination map
@ or a pair of x/y coordinates to go to directly on the destination map.
.macro setdynamicwarp map:req, a, b, c
Expand Down
27 changes: 16 additions & 11 deletions data/battle_anim_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -2987,21 +2987,26 @@ Move_MUD_BOMB:
end

Move_PSYCHO_CUT:
loadspritegfx ANIM_TAG_SPIRAL
loadspritegfx ANIM_TAG_PSYCHO_CUT
monbg ANIM_ATK_PARTNER
loadspritegfx ANIM_TAG_SPIRAL
loadspritegfx ANIM_TAG_PSYCHO_CUT
loadspritegfx ANIM_TAG_CROSS_IMPACT
monbg ANIM_ATK_PARTNER
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 9, 9, RGB_PURPLE
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_ATTACKER
createsprite gPsychoCutSpiralSpriteTemplate, 2, 4, 0, 0, 0, 0
createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 0, 4, RGB_BLACK
createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 0, 10, RGB(20, 12, 23)
delay 30
clearmonbg ANIM_ATK_PARTNER
waitforvisualfinish
monbg ANIM_TARGET
splitbgprio ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER,
createsprite gPsychoCutSpriteTemplate, 130, 5, 20, 0, -8, 0, 20
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
waitforvisualfinish
monbg ANIM_TARGET
splitbgprio ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER,
createsprite gPsychoCutSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20
createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 4, 0, RGB_BLACK
createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 10, 0, RGB(20, 12, 23)
clearmonbg ANIM_TARGET
Expand Down
Loading