atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14692 commits 2 branches 40 tags 617 MiB
Commit graph

14692 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bassoonian
495ee6698c Clean up code 2024-02-02 13:13:27 +01:00
Bassoonian
acf5d8133a Convert ifndef configs to standard configs 2024-02-02 12:43:31 +01:00
Bassoonian
d1bb078919 Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock 2024-02-02 11:27:48 +01:00
Bassoonian
2f2d7c281f
Clean up contest strings (#3876) 
* Move contest move descriptions out of inc file

* Clean up unused contest strings

* More contest cleanup

* sRoundResultTexts cleanup

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2024-02-02 10:55:39 +01:00
kaicardenas2
e828ae58a1
Non-Tagged Release (#4109) 2024-02-01 21:20:10 -03:00
Eduardo Quezada D'Ottone
2d24f96420
Version 1.7.3 (#4106) 
* Version 1.7.3

* Latest changelog
 2024-02-01 20:55:53 -03:00
Eduardo Quezada D'Ottone
b898a65891
Fixed Gigantamax Factor not changing form (#4108) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-02-01 19:26:30 -03:00
Bassoonian
ccfebe5e05
Adds missing evolution methods (#4087) 
* Add evolution tracker to BoxMon struct

* Add "use move 20 times, then lv up" evolution method

* Add recoil tracker

* Reduce to 9 bits

* Fix agbcc complaint

* Put MOVEEND_CLEAR_BITS at the end

* Remove battle argument from tryupdaterecoiltrackker

* Add null checks

* Fix upcoming merge

* Add requested formatting changes

* Condense evolution check into a single function for easier customisation later

* Incorporate review requests

* Update src/pokedex_plus_hgss.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-02-01 18:35:38 -03:00
DizzyEggg
1d9e692e31
Unused warnings are no longer treated as errrors by default (#4092) 2024-02-01 20:19:14 +01:00
Eduardo Quezada
09d12fb154 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	ld_script_modern.ld
#	src/battle_ai_switch_items.c
 2024-02-01 12:52:31 -03:00
Bassoonian
e8538ef585
Merge branch 'master' into _RHH/pr/master/unused 2024-02-01 13:48:44 +01:00
ZnogyroP
71b49a114f
Adds move Upper Hand (#4085) 
* Remove non-existent tilesets from label comments and alphabetize

* Fixed braces style

* gbagfx bit depth upconversion fix

* jsonproc: filter out every non-alphanumeric character

* fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld

* Adds move Upper Hand

* Requested changes

- Tabs / spaces where proper
- HitFromAtkString -> HitFromAccCheck
- Actually compiles now lol
- Moved assumes into relevant tests
- Cleaned up the check for TryUpperHand

* Fixed || positioning

* Update upper_hand.c

* Revert "Merge remote-tracking branch 'upstream/master' into upper-hand"

This reverts commit b21275dfe9, reversing
changes made to 89b1ad1ea1.

* AI logic and conflicts solved

* Test fix

* Fix Sheer Force test

* Requested changes

* Requested changes

* Update battle_script_commands.c

---------

Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: Sierraffinity <sierra@domoreaweso.me>
Co-authored-by: sbird <sbird@no.tld>
 2024-02-01 12:23:58 +01:00
Nephrite
8a8d181654 AdditionalEffects storage tweak 
Uses some macro and bitwise trickery to store additional effects and the count thereof in a single word
 2024-02-01 15:19:10 +09:00
Alex
1a65894967
Fixes test description + small fix follow up (#4100) 
* Fixes test description + small fix follow up

* fix fix

* Apply suggestions from code review

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-31 09:33:04 -03:00
Alex
6d3fa525d5
Rename EFFECT_FAKE_OUT to EFFECT_FIRST_TURN_ONLY (#4081) 
* Splits First Impression effect from Fake Out

* Fix test failing

* rename EFFECT_FAKE_OUT

* use moveeffect chance for fake out and priority field for first impression

* rename rest of fake out

* messed up merge

* remove useful comment

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-31 09:32:58 -03:00
Eduardo Quezada D'Ottone
5af733a391
Merge branch 'master' into _RHH/pr/master/unused 2024-01-31 08:18:55 -03:00
Eduardo Quezada
f7e5709745 Review changes 2024-01-31 08:18:43 -03:00
Eduardo Quezada D'Ottone
7afa20029c
Fix braces style (#4023) 
* Fix braces style

* Unified 2 conditions

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-31 10:26:44 +01:00
GriffinR
5be69b2713 Merge slot machine smoke SubspriteTable arrays 2024-01-30 11:46:19 -05:00
DizzyEggg
f5623595a0
Fix AI trying to switch into the same mon 2 times (#4098) 2024-01-30 16:14:33 +01:00
Nephrite
086375ab13 Moved a couple more flags 2024-01-30 18:05:52 +09:00
Nephrite
02ffd05aea Removed Sheer Force flag 2024-01-30 13:37:38 +09:00