Commit graph

  • b9c1397558
    Merge branch 'upcoming' into metatileMigration psf 2024-12-30 09:40:08 -0800
  • 23bedf3844
    Merge 377a6ba6b5 into 3db351359a khbsd 2024-12-30 09:39:10 -0800
  • c9c9773228
    Merge branch 'upcoming' into levelUpNotification psf 2024-12-30 09:38:37 -0800
  • 37b7f600de GetMoveBattleScript Eduardo Quezada 2024-12-30 14:32:55 -0300
  • 3db351359a
    Clean up redundancy for mugshots (#5906) Alex 2024-12-30 18:32:21 +0100
  • ad5cc06237 Added clarifying comment on when to set B_VAR_DIFFICULTY per https://discord.com/channels/419213663107416084/1207720924414087168/1323331410496454768 pkmnsnfrn 2024-12-30 08:49:52 -0800
  • 7ac8aa36e4 Added clarifying comment on when to set B_VAR_DIFFICULTY per https://discord.com/channels/419213663107416084/1207720924414087168/1323325452399542335 pkmnsnfrn 2024-12-30 08:44:55 -0800
  • 2646713c31 Add manual breaking back to "What will (mon) do?" message kittenchilly 2024-12-30 09:56:15 -0600
  • 5bf44208a9 Fixes Round AlexOn1ine 2024-12-30 16:49:18 +0100
  • 576343cd96 Clean up redundancy for mugshots AlexOn1ine 2024-12-30 16:12:44 +0100
  • 23f96284be Fixed bug in PickLowest, added PruneRandom function Hedara 2024-12-30 12:56:30 +0100
  • 4a32c8d4d7 Added B_FAST_INTRO_NO_SLIDE config Eduardo Quezada 2024-12-30 08:34:13 -0300
  • 395fbc85c0 Rename current B_FAST_INTRO Eduardo Quezada 2024-12-30 08:28:21 -0300
  • af19b13195
    Adds Pledge Side Statuses as Starting Statuses (#5899) Alex 2024-12-30 09:18:23 +0100
  • f864bf8b70
    Adds Generational config for Magic Guard (Fix for Gen4+) (#5893) Alex 2024-12-30 09:01:20 +0100
  • 9b60fcc12f detach pyramid battles from regular trainer battles Sam Edding 2024-12-30 02:34:26 +0100
  • 377a6ba6b5 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh-upcoming_mega-ow-sprites Ken Bynell 2024-12-29 17:25:55 -0600
  • da6fddb2cb Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into pokenav-fly-v2 Ken Bynell 2024-12-29 17:22:09 -0600
  • 009de5c98c
    Setting Battle configs during tests (#5803) Eduardo Quezada 2024-12-29 19:28:39 -0300
  • e729e926b8
    Update src/battle_util.c Alex 2024-12-29 22:50:39 +0100
  • 1f5c7e5584 clean up AlexOn1ine 2024-12-29 22:38:40 +0100
  • eb9793581f fixes side message issue AlexOn1ine 2024-12-29 22:35:39 +0100
  • e64da065e8
    Fixes Eject Pack / Intimidate issue (#5902) Alex 2024-12-29 22:24:09 +0100
  • 24dcd1bc7b change statement order AlexOn1ine 2024-12-29 22:15:53 +0100
  • e93e88ade5
    Master to upcoming, 2024-12-29 (#5903) Eduardo Quezada 2024-12-29 18:13:38 -0300
  • 0ad907fd76 Merge branch 'master' into master-upcoming Hedara 2024-12-29 21:43:47 +0100
  • 2088f2a12d Merge branch 'master' into master-upcoming Hedara 2024-12-29 21:43:07 +0100
  • c8d374764c Forgot to regenerate trainers.h Hedara 2024-12-29 20:09:30 +0100
  • 0f06a7c9b3 Restored Tiana Hedara 2024-12-29 20:06:46 +0100
  • 2b2f1d3f3b Merge branch 'upcoming' into tpp-new Hedara 2024-12-29 20:05:38 +0100
  • dcc285b9b4 More pool creation options added Hedara 2024-12-29 20:04:32 +0100
  • 771e388604 Changed incoming access to gMovesInfo Eduardo Quezada 2024-12-29 15:33:33 -0300
  • af63295428 Fixes Eject Pack / Intimidate issue AlexOn1ine 2024-12-29 19:05:25 +0100
  • a10f63e317
    Fixed leaking tasks not showing up in summary (#5890) Eduardo Quezada 2024-12-29 14:18:40 -0300
  • 10c95e16ca use var AlexOn1ine 2024-12-29 17:59:16 +0100
  • 1bd1e934f1
    Comment out Ally Switch Illusion test (#5901) Eduardo Quezada 2024-12-29 13:52:35 -0300
  • 2748db4f23 combine field status func AlexOn1ine 2024-12-29 17:41:23 +0100
  • 49ab12aab9
    Backport changes from the wiki (#5900) Eduardo Quezada 2024-12-29 13:30:39 -0300
  • 4a13a09188 Comment out Ally Switch Illusion test Eduardo Quezada 2024-12-29 13:28:02 -0300
  • 98a5d5fb24 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/encapsulateMoveData Eduardo Quezada 2024-12-29 12:58:43 -0300
  • ca31145d36
    Fix Salt Cure script (#5895) ghoulslash 2024-12-29 10:51:33 -0500
  • dde7a05a9a Applied code suggestions Eduardo Quezada 2024-12-29 12:34:27 -0300
  • 8da84da875 add simple test ghoulslash 2024-12-29 10:32:05 -0500
  • dfbdc862c1 Backport changes from the wiki Eduardo Quezada 2024-12-29 12:09:40 -0300
  • 433058edc1
    Added missing Move Effect TODO tests - Volume D (#5887) Eduardo Quezada 2024-12-29 10:27:08 -0300
  • 7ddb4cdc1b
    Fixed TODO tests not showing up when filtering by name (#5894) Eduardo Quezada 2024-12-29 10:18:33 -0300
  • 445ba32679
    Fixes gen3 Style Shadows out of place (#5880) Alex 2024-12-29 12:54:33 +0100
  • 8bd6e52081 missed hardcoded val AlexOn1ine 2024-12-29 12:28:21 +0100
  • 05d8aa5b4e remove perma terrain flag AlexOn1ine 2024-12-29 12:18:11 +0100
  • eff4b26ff0 Adds Pledge Side Statuses as Starting Statuses AlexOn1ine 2024-12-29 12:11:17 +0100
  • c9bde52fd2 fix last tests AlexOn1ine 2024-12-29 10:23:46 +0100
  • 7282be806e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/owPicTableInSpeciesInfo Eduardo Quezada 2024-12-28 22:14:40 -0300
  • 220789cd2f Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/pokemonJump Eduardo Quezada 2024-12-28 22:13:34 -0300
  • d14af34290 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/gSpeciesInfoAnimations Eduardo Quezada 2024-12-28 22:13:10 -0300
  • 57db1ee08e
    Fix Ally Switch test failing on CI (#5896) Alex 2024-12-29 01:33:23 +0100
  • e5e41cef20
    Update ally_switch.c Alex 2024-12-29 00:55:26 +0100
  • 3050e87e16
    Update ally_switch.c Alex 2024-12-29 00:33:23 +0100
  • ca20f5b217 4 configs Eduardo Quezada 2024-12-28 19:23:18 -0300
  • 3ac4f81de9 protosynthesis test fix AlexOn1ine 2024-12-28 23:01:52 +0100
  • d9db60218c some test fixes AlexOn1ine 2024-12-28 22:58:16 +0100
  • c5e846377c Final steps for B_CRIT_CHANCE Eduardo Quezada 2024-12-28 18:15:53 -0300
  • 31f2243520 Reorganized Critical Hit tests Eduardo Quezada 2024-12-28 17:57:24 -0300
  • 74f1d7cb80 merge rhh/upcomig AlexOn1ine 2024-12-28 21:03:34 +0100
  • 6a906a3fc1 refactor done AlexOn1ine 2024-12-28 20:55:59 +0100
  • d6b6705983 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/gSpeciesInfoAnimations Eduardo Quezada 2024-12-28 16:01:09 -0300
  • b4c10b17c1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/pokemonJump Eduardo Quezada 2024-12-28 15:46:00 -0300
  • ed7af202ff Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/owPicTableInSpeciesInfo Eduardo Quezada 2024-12-28 15:32:30 -0300
  • 35912f4be1 spaces to tabs ghoulslash 2024-12-28 13:31:54 -0500
  • 18ca3ef942 simplify BattleScript_AbilityPopUpScripting ghoulslash 2024-12-28 13:29:59 -0500
  • eeaa5ea1fc fix salt cure tryfaintmon before string printing ghoulslash 2024-12-28 13:29:50 -0500
  • 3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming Eduardo Quezada 2024-12-28 15:28:07 -0300
  • c005050d4d Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/owPicTableInSpeciesInfo Eduardo Quezada 2024-12-28 15:16:40 -0300
  • 6fe143733b Fixed TODO tests not showing up when filtering by name Eduardo Quezada 2024-12-28 14:11:58 -0300
  • 02a2cdae56 Added missing Move Effect TODO tests - Volume E Eduardo Quezada 2024-12-28 13:42:02 -0300
  • 1f5ae4aff2 remove obsolete stuff Sam Edding 2024-12-28 15:40:15 +0100
  • a78d9b431a Adds Generational config for Magic Guard (Fix for Gen4+) AlexOn1ine 2024-12-28 12:41:25 +0100
  • 0bb86e4437 struct AlexOn1ine 2024-12-28 10:23:28 +0100
  • 26e8828480 Fixed PSYCHIC_2 macro Frank 2024-12-27 23:16:55 -0500
  • 1cdd3b1377 Merged Psychic_2 macros since checksum doesn't matter here like it does in pret Frank 2024-12-27 22:59:18 -0500
  • 16e14c0476 Moved Frontier teams into battle_frontier_trainers.h Frank 2024-12-27 22:54:35 -0500
  • 902e55e6c8
    Merge branch 'master' into emerald_eclipse Logan Hansen 2024-12-27 20:18:13 -0700
  • 64487b9318 Skip mon animations Eduardo Quezada 2024-12-28 00:13:36 -0300
  • 8b9eb106e6 Silence cries in headless mode Eduardo Quezada 2024-12-27 23:16:27 -0300
  • 5faf5cd5ca Fixed leaking tasks not showing up in summary Eduardo Quezada 2024-12-27 22:39:24 -0300
  • bd0e5bc702 Skipping pause in headless mode Eduardo Quezada 2024-12-27 22:13:29 -0300
  • 8919fe62dc Skipping waitmessage in headless mode Eduardo Quezada 2024-12-27 21:46:32 -0300
  • 2d550a280f Skip intro in headless mode Eduardo Quezada 2024-12-27 21:31:33 -0300
  • 8599721de0 Fix Eduardo Quezada 2024-12-27 20:54:16 -0300
  • cb68022df5 CI fast intro in tests Eduardo Quezada 2024-12-27 20:33:20 -0300
  • c4cb5b507b Moved existing Dynamax Cannon test Eduardo Quezada 2024-12-27 20:13:29 -0300
  • e52fbb44a2 Added missing Move Effect TODO tests - Volume D Eduardo Quezada 2024-12-27 20:03:09 -0300
  • 5900a01061
    Atk Canceller refactor / reorder / clean up (#5885) Alex 2024-12-27 21:14:05 +0100
  • eefb15ca67 fix move type call AlexOn1ine 2024-12-27 20:18:25 +0100
  • b7fc1df84d clean up AlexOn1ine 2024-12-27 19:54:18 +0100
  • 3424a464eb Function table dispatch AlexOn1ine 2024-12-27 19:32:44 +0100
  • f4e57fdabf detach multi battles from regular 'trainerbattle' macro Sam Edding 2024-12-27 19:27:51 +0100
  • 0cd1d95273 B_CRIT_CHANCE Eduardo Quezada 2024-12-27 14:58:07 -0300
  • af6de65685 Merge branch '_RHH/master' into _RHH/pr/master/genConfigs Eduardo Quezada 2024-12-27 14:45:03 -0300
  • bc3535c88a more reordering AlexOn1ine 2024-12-27 17:50:36 +0100
  • c92b4f33c3 Revert multi battle integration part 1 Sam Edding 2024-12-27 17:40:19 +0100