Commit graph

14765 commits

Author SHA1 Message Date
Bassoonian
28e3a2ba98 Merge branch 'ghoulsaveblock' of https://github.com/Bassoonian/pokeemerald-expansion into ghoulsaveblock 2024-02-06 23:36:35 +01:00
Bassoonian
37b442f3bb Apply ghoul's review 2024-02-06 23:36:30 +01:00
Alex
fa5f507b1e
Fixes Mycelium Might speed bracker (#4146)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-06 23:30:57 +01:00
Frank DeBlasio
7f50c0b9c3
Simplify gTrainerSprites (#4140)
* Simplified y_offset equations

* Removed trainer pic animation from gTrainerSprites

* Used metaprogram to simplify trainer sprites without mugshots

* Incorporated comments

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-06 22:24:36 +01:00
ZnogyroP
34067ac37f A batch of gen 9 move anims
Animations for:
- Last Respects
- Lumina Crash
- Kowtow Cleave
- Torch Song
- Aqua Step
- Hydro Steam
- Tidy Up
- Pounce
- Trailblaze
- Chilling Water
- Rage Fist
- Temper Flare
- Psychic Noise
2024-02-06 13:58:25 -05:00
Frank DeBlasio
dd3228aa14
Updated Mew teachable moves to SV (#4142) 2024-02-06 08:55:49 -03:00
Eduardo Quezada D'Ottone
6a71e14718
Added credits section to PR template (#4141) 2024-02-06 12:39:42 +01:00
PCG
273110ebae
Jet Punch animation (#4067)
* Jet Punch animation

* Tabs

* Jet Punch anim makeover

* Fix anim glitch in doubles and whitespace

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-02-06 07:55:08 -03:00
Nephrite
f7ec44c2ea
Fixed Shield Dust, added tests (#4137)
* Fixed Shield Dust, added tests

Also fixed a duplicate macro caused by near-simultaneous PR merges (oops)

* Added KNOWN_FAILING Sparkling Aria test

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-06 09:19:37 +01:00
ghoulslash
c2c97d3c1c
GetBattleAnimMoveTargets fill absolute battler ids instead of relative anim ids (#4139)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-02-06 09:05:26 +01:00
Eduardo Quezada
f89efad082 Merge branch '_RHH/master' into _RHH/upcoming 2024-02-05 17:52:34 -03:00
ravepossum
8b70cea725
Fix screen select bar popping in too early for area screen in HGSS dex (#4094)
* fixing screen select bar popping in too early for area screen in HGSS pokedex

* exit early from select bar load function if dex is disabled

* remove unnecessary early exit

---------

Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-05 15:40:25 +01:00
GriffinR
d7a361cef1
Merge pull request #1978 from DizzyEggg/windows_overflow
Fix HideMapNamePopUpWindow possible overflow
2024-02-04 20:34:17 -05:00
GriffinR
246f47d9d0
Merge pull request #1979 from DizzyEggg/patch-2
Change Safe Div to explicitly check b != 0
2024-02-04 20:22:37 -05:00
ghoulslash
521ef8bf86
battle debug menu can cycle through battlers in ai score/dmg window (#4134)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-04 23:30:30 +01:00
DizzyEggg
065c0ec588
Fairy Lock animation fix (#4111)
* Fairy Lock animation fix

* remove comment

* fairy lock anim hopefully works

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-04 23:23:03 +01:00
Nephrite
65c508d193
Secondary effects overhaul minor follow-up (#4062)
* settwoturnstring command

* Unified two-turn attacks and Meteor Beam

To do: Solar Beam

* Solar Beam

Also fixed various function, removed EFFECT_GUST (who knows why that exists?)

* Updated Solar Beam + tests

* Redid two turn move + animations logic

Removed pointless various function; to do: remove Skull Bash, fix AI test

* Removed now-pointless flag

* Removed Skull Bash

And temporarily commented out failing AI tests

* Removed Sky Uppercut effect

Not sure when or why this was ever necessary

* Removed BattleScript_EffectSemiInvulnerable

Now uses BattleScript_EffectTwoTurnsAttack. Kept the effect; used the argument field to determine which STATUS3 such moves should apply but added a function to jump over weather checks in BattleScript_EffectTwoTurnsAttack if the current move is semi-invulnerable (since the instant-fire weather check and STATUS3 use the same field)

* Applied review changes

* Replaced VARIOUS with callnative

Tried to fix test but couldn't :/ wtf is going on

* Fixed one AI test

Cant fix the other...

* Added KNOWN_FAILING to failing AI tests

Separated them out into their own test

* Optimised script, overhauled charge turn string setting

Condensed multiple confusing macros into one, jumpifweathercheckchargeeffects. Script now tweaked and trimmed, string ids for charge turns now added to argument along with status3 (thanks to compression macro) and instant-fire-weather for semi-invulnerable and two-turn moves respectively. Also introduced a savedStringId in gBattleScripting to make string selection work.

* Unified two turn move tests + minor corrections

* Added semi-invulnerable move tests

Set the Razor Wind test to known failing - something to do with its animation?

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-02-04 23:02:59 +01:00
Nephrite
7ae50ea507
Metaprogram (#3968)
* metaprogram.h

Created by Mr. Griffin. Removed non-relevant parts

* Added DEFAULT/DEFAULT_2 macros

Also added a demonstration in battle_main

* Removed GET_ARGS

* Expanded DEFAULT

Because why not?

* Added EXCEPT

Expands to everything but the first x arguments.

* Added BIT_INDEX (thanks to MGriffin) and COMPRESS_BIT macros

These let you compress a bit up to a word in size inside a single byte and uncompress at the same time. BIT_INDEX just tells you where the bit is.

* Updated HANDLE_EXPANDED_MOVE_NAME

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-02-04 16:28:27 -03:00
DizzyEggg
512ab98bfe
Fix disobedience not resetting multihit moves (#4133) 2024-02-04 16:13:27 +01:00
LOuroboros
691b1879f8
Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132)
* Renamed VAR_TERRAIN and introduced a var-based field terrains timer

* Fixed sky battle configs alignment and syntax

* Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars

* Removed pointless edits to EndTurnTerrain

* Updated B_VAR_TERRAIN_TIMER's comment

* Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc

* Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects

* Reverted changes made to BS_SetRemoveTerrain
I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality.

* Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects
2024-02-04 13:04:55 +01:00
ravepossum
e75169fb87
Fix HGSS Dex List Decapped Tileset (#4126)
* fix decap HGSS dex tileset scroll bar

* more tileset fixes

---------

Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-03 20:07:47 +01:00
Alex
46d9adb326
Fixes Eerie Spell double pp and message drop (#4127)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-03 19:34:52 +01:00
DizzyEggg
85eea4869d
Fix move animation crashing on some emulators because of division by zero (#4121)
* fix flip turn div by zero

* fix incinerate move anim div by zero
2024-02-03 16:56:50 +01:00
Alex
ab2774f8c7
Adds Dragon Cheer (#4122)
* Adds Dragon Cheer

* fix assumptions

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-02-03 08:00:41 -07:00
DizzyEggg
132ca1be14
Change Safe Div to explicitly check b != 0 2024-02-02 22:57:02 +01:00
DizzyEggg
e87a69a5e7 Fix HideMapNamePopUpWindow possible overflow 2024-02-02 22:31:20 +01:00
DizzyEggg
ac94af3be6
Indigo Disk sprites (#4117) 2024-02-02 20:28:23 +01:00
Eduardo Quezada D'Ottone
3a45f0de0a
Apply suggestions from code review 2024-02-02 16:12:39 -03:00
Alex
4f40c678b5 Archaludon 2024-02-02 19:06:28 +01:00
Alex
f1b6fbb800 Indigo Disk sprites 2024-02-02 18:09:04 +01:00
Bassoonian
dddbce4f7e
Merge branch 'upcoming' into ghoulsaveblock 2024-02-02 16:53:03 +01:00
Bassoonian
adc3308d13 Actually multi battles seem to work fine too 2024-02-02 16:52:39 +01:00
Alex
a193b795c7
fix omniscient flag (#4114)
* rebase to upcoming

* merge rhh/upcoming and remove known failing

* remove known failing

---------

Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2024-02-02 08:49:36 -07:00
Bassoonian
6c1a111c14 No questionnaires are actually broken 2024-02-02 16:45:58 +01:00
Bassoonian
06d04c1194 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into ghoulsaveblock 2024-02-02 16:39:15 +01:00
Bassoonian
b8b7dd304b Add final config documentation 2024-02-02 16:38:33 +01:00
Bassoonian
016a05ba96 Fix small error with making new FREE_MYSTERY_GIFT 2024-02-02 16:34:03 +01:00
Bassoonian
6f668fb31d Add FREE_MYSTERY_GIFT 2024-02-02 16:31:19 +01:00
Bassoonian
4092d0283a Fix FREE_BATTLE_TOWER_E_READER 2024-02-02 15:58:27 +01:00
ghoulslash
83b9b95662
add supersweet syrup, unify single-use entry abilities to single field (#4115)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-02-02 15:44:14 +01:00
Bassoonian
db95a06ae0 Fix FREE_TRAINER_HILL 2024-02-02 15:24:46 +01:00
Bassoonian
dedba114be Fix FREE_LINK_BATTLE_RECORDS 2024-02-02 15:16:18 +01:00
Bassoonian
a1c17a1de7 Fix FREE_ENIGMA_BERRY 2024-02-02 15:01:50 +01:00
Bassoonian
cc57452695 Fix FREE_UNION_ROOM_CHAT 2024-02-02 14:57:40 +01:00
Bassoonian
24ed9e77ff Fix FREE_MATCH_CALL 2024-02-02 14:13:16 +01:00
Bassoonian
deb3e6a11d Add dependency #error 2024-02-02 13:47:53 +01:00
Bassoonian
27a65a5961 Fix FREE_RECORD_MIXING_HALL_RECORDS 2024-02-02 13:46:19 +01:00
Bassoonian
90be8436d9 Fix FREE_POKEMON_JUMP 2024-02-02 13:39:21 +01:00
Bassoonian
26a4c56843 Ensure FREE_EXTRA_SEEN_FLAGS works 2024-02-02 13:32:13 +01:00
Bassoonian
9eacffe5bb Fix Enigma Berry checks 2024-02-02 13:18:47 +01:00