Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 73cbe9e37b Merge branch 'master' into enigmaberry kittenchilly 2023-09-08 11:44:33 -0500
• d585c520ff
  Fix Z effect descriptions being cut off (#3286) Gabriel Cowley 2023-09-08 11:09:11 +0100
• 6332870a3b Crabominable can now evolve via Ice Stone Eduardo Quezada 2023-09-08 00:26:42 -0300
• 75d06bb599
  Generation 6 Experience Share (#3276) psf 2023-09-07 19:18:18 -0700
• 40ac214764 Fix enigma berry kittenchilly 2023-09-07 17:10:25 -0500
• 8f8705929a Update battle_util.c kittenchilly 2023-09-07 15:37:58 -0500
• b4db3b6a81 Add enigma berry effect kittenchilly 2023-09-07 15:32:26 -0500
• dd3334aa82
  Battle bond tests and small fix (#3279) DizzyEggg 2023-09-07 22:23:43 +0200
• e20383b0a4 Merge branch 'upcoming' into overworldsnow kittenchilly 2023-09-07 14:29:30 -0500
• 3333395ff7 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1 Eduardo Quezada 2023-09-07 15:54:55 -0300
• 820113d883 Merge branch 'RHH/master' into RHH/upcoming Eduardo Quezada 2023-09-07 15:13:06 -0300
• d31b168522 Add blockBoxRS field to struct BoxPokemon citrusbolt 2023-09-05 06:17:10 -0600
• c99b34fd89
  Fix Magnet Rise animation (#3280) Alex 2023-09-05 13:08:51 +0200
• cfd802423b
  Fling fixes and tests (#3191) DizzyEggg 2023-09-05 11:56:36 +0200
• 675aa5db41
  fix GetBattleAnimMoveTargets logic (#3278) ghoulslash 2023-09-05 03:21:14 -0400
• 1e10bbe007 Merge branch 'upcoming' into overworldsnow kittenchilly 2023-09-04 17:57:20 -0500
• 2fa4206bf1
  Add new Substitute doll sprites (#3263) kittenchilly 2023-09-04 17:48:43 -0500
• b90702918e
  Get rid of the gActiveBattler variable (#3262) ghoulslash 2023-09-04 08:40:00 -0400
• d9677763e5 remove gActiveBattler replacement DizzyEggg 2023-09-04 10:26:37 +0200
• 7c2ad314d4 merge with upcoming DizzyEggg 2023-09-04 09:40:48 +0200
• 4439253f39 Add include guards for assembly constants files GriffinR 2023-09-03 20:57:54 -0400
• 0a781217ea Merge branch 'upcoming' into overworldsnow kittenchilly 2023-09-02 15:17:23 -0500
• 66710ac22a Updated various defines Eduardo Quezada 2023-08-31 23:54:11 -0400
• c4553c71aa 5 more callnatives Eduardo Quezada 2023-08-31 23:43:48 -0400
• 4ac61ad15f handleultraburst, handleprimalreversion, handlemegaevo Eduardo Quezada 2023-08-31 22:24:58 -0400
• 1513443c39 Fixed Ultra Burst + Mega Evolution test Eduardo Quezada 2023-08-31 22:33:20 -0400
• 35d7201935 Merge branch 'RHH/master' into RHH/upcoming Eduardo Quezada 2023-08-31 20:46:53 -0400
• c4e88760f5
  Pret merge (2023/08/31) (#3268) Eduardo Quezada D'Ottone 2023-08-31 14:52:18 -0400
• 842b9dc6c0 Incorporated bugfixes from upstream Eduardo Quezada 2023-08-31 14:30:13 -0400
• 0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 Eduardo Quezada 2023-08-31 14:28:01 -0400
• 9fcb1a8687 Merge remote-tracking branch 'upstream/upcoming' into overworldsnow kittenchilly 2023-08-31 11:56:12 -0500
• d78d63e537
  Fixed redundant calls in Teleport's battle script (#3212) LOuroboros 2023-08-31 04:07:06 -0300
• 82c65d37e7
  Fixed 2v1 handling when debug menu is enabled (#3223) Eduardo Quezada D'Ottone 2023-08-31 03:00:59 -0400
• d143d508e0
  Ai vs ai rhh (#3216) ghoulslash 2023-08-30 21:30:34 -0400
• 03f82a7a98
  [Makefile] make -fanalyzer optional (#3265) Philipp AUER 2023-08-31 01:16:02 +0200
• 64ffc5a85d
  Fixes Beat Up + Chloroblast (#3264) Alex 2023-08-30 21:58:53 +0200
• aae4a0970c merge with upcoming DizzyEggg 2023-08-30 15:46:27 +0200
• 493c330cbd merge with upcoming DizzyEggg 2023-08-30 13:23:55 +0200
• c29f8259f6 remove gActiveBattler entirely DizzyEggg 2023-08-30 12:46:22 +0200
• a7615f9649 remove almost all usage of active battler DizzyEggg 2023-08-30 11:21:10 +0200
• 4683783a92 remove active battler from other files DizzyEggg 2023-08-30 10:18:31 +0200
• 77dd5150f5 remove gActiveBattler from battle_script_commands.c DizzyEggg 2023-08-30 09:40:15 +0200
• c8aac3407e Merge branch 'upcoming' into overworldsnow kittenchilly 2023-08-29 21:02:33 -0500
• deb20552cd
  Implement Ultra Burst (#3221) Eduardo Quezada D'Ottone 2023-08-29 21:49:19 -0400
• c55fee147b
  Fixed B_ATK_TRAINER_NAME not working properly in tests (#3179) ghoulslash 2023-08-29 21:45:37 -0400
• c427d96f3f Better Ultra Burst animation kittenchilly 2023-08-29 19:13:21 -0500
• 028536e2d3 Spaces kittenchilly 2023-08-29 17:12:09 -0500
• d540eccbb1 Merge branch 'upcoming' into ultraburst kittenchilly 2023-08-29 16:17:35 -0500
• be152fbee8 Merge branch 'RHH/master' into RHH/pr/master/opponentName Eduardo Quezada 2023-08-29 13:11:32 -0400
• 766a1a27a7
  improve ai switching with bad moves (#3213) ghoulslash 2023-08-29 12:47:16 -0400
• 0381ccdf32 remove more of gActiveBattler DizzyEggg 2023-08-29 16:20:16 +0200
• 156aa59f18 start removing gActiveBattler in controller emitters DizzyEggg 2023-08-29 15:21:31 +0200
• 00e1542cb8 Merge branch 'ai_switch_mon_fix' of https://github.com/DizzyEggg/pokeemerald into ai_switch_mon_fix DizzyEggg 2023-08-29 10:42:07 +0200
• 44acd287f1 solve conflicts DizzyEggg 2023-08-29 10:41:05 +0200
• 326fb2605a
  Some gActiveBattler Fixes (#3259) ghoulslash 2023-08-29 03:31:11 -0400
• 4490e9879a
  Prevent certain status moves when item is known + Fake Out changes (#3219) ghoulslash 2023-08-28 17:12:29 -0400
• ee8d930634
  Simplify/Clean battle controllers code (#3202) ghoulslash 2023-08-28 17:08:39 -0400
• 6ae1ba10da fix conflicts DizzyEggg 2023-08-28 13:55:45 +0200
• 906ea4a5b0
  Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove (#3218) Pawkkie 2023-08-28 07:39:27 -0400
• d67914e114
  Merge pull request #1912 from GriffinRichards/moves-mask GriffinR 2023-08-27 19:40:59 -0400
• dcaf03e360
  Merge pull request #1918 from WhenGryphonsFly/key_intr_enable GriffinR 2023-08-27 17:23:16 -0400
• 37f6685949 Merge branch 'upcoming' into overworldsnow kittenchilly 2023-08-27 14:51:57 -0500
• 5abeb6718d Correct KEY_INTR_ENABLE WhenGryphonsFly 2023-08-27 14:30:57 -0500
• 7ffd31f5de Update ultra_burst.c kittenchilly 2023-08-26 16:42:35 -0500
• 96e39cde0b Update ultra_burst.c kittenchilly 2023-08-26 16:14:24 -0500
• ac67900c0a Fix test speed kittenchilly 2023-08-26 15:32:10 -0500
• 2e1b137183 Ultra Burst tests kittenchilly 2023-08-26 15:19:47 -0500
• 48d6fe2e64 Merge branch 'upcoming' into ultraburst kittenchilly 2023-08-26 14:43:31 -0500
• 2784f701d8
  Poké Ball shortcut tweaks (#3254) voloved 2023-08-26 12:58:51 -0400
• 76075ffe57
  Revert unneeded sprite changes from 3051 (#3205) Eduardo Quezada D'Ottone 2023-08-25 16:33:15 -0400
• 1f72e6ac07 Merge branch 'RHH/master' into RHH/upcoming Eduardo Quezada 2023-08-24 21:31:58 -0400
• d360deb3b6 1.5.3 in templates Eduardo Quezada 2023-08-24 20:44:50 -0400
• 2a2cd77cf4
  Allow Cycling Through Balls in the Last Ball Used Menu (#3039) voloved 2023-08-24 19:23:26 -0400
• 9c937a945c
  Pokemon sprite review pt.1 (#3235) Eduardo Quezada D'Ottone 2023-08-23 22:43:42 -0400
• ef69021f0f some more tweaks by mrds CyanSMP64 2023-08-24 13:00:31 +1200
• 905fc6fd4d
  Fixed Metronome Item damage multiplier (#3246) Philipp AUER 2023-08-24 01:23:00 +0200
• 843830374c
  Merge pull request #1916 from grunt-lucas/gbagfx-cc GriffinR 2023-08-22 14:57:32 -0400
• 9d170c7e35 gbagfx to respect user CC setting grunt-lucas 2023-08-22 07:37:48 -0700
• fd37946c1d resize golduck CyanSMP64 2023-08-22 20:31:13 +1200
• 9d6953cc63
  Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) LOuroboros 2023-08-21 08:49:17 -0300
• 9cf5376c96 use GetBattlerParty in LoadMonSprite DizzyEggg 2023-08-21 09:43:01 +0200
• e70577d59b Add missing sizeof in trainer_see GriffinR 2023-08-20 17:22:29 -0400
• a79898f1b1 Make fog cause misty terrain kittenchilly 2023-08-20 13:51:48 -0500
• 4941e2602a
  Merge pull request #1909 from GriffinRichards/stat-anim GriffinR 2023-08-20 14:29:11 -0400
• 5e98891577 Snow doesn't cause shade anymore kittenchilly 2023-08-20 13:24:20 -0500
• 4e5809a0d0 tweak graveler, pikachu CyanSMP64 2023-08-20 22:08:54 +1200
• f2391cd823
  Add female Basculegion to cry table (#3242) Bassoonian 2023-08-19 17:20:40 +0200
• 0ad3919f22 Fix overworld snow weather kittenchilly 2023-08-19 01:40:31 -0500
• 60a2878f8f tweak growlithe, slowbro, poliwag CyanSMP64 2023-08-19 16:15:20 +1200
• 4f3068406c
  Merge pull request #1914 from AnonymousRandomPerson/master GriffinR 2023-08-18 23:45:44 -0400
• 63f39133ab Added newer decomp projects to readme AnonymousRandomPerson 2023-08-18 22:16:04 -0400
• c33660e00f fix arcanine and zard CyanSMP64 2023-08-19 15:37:41 +1200
• ec24754489 fix arcanine, change bg colour of green pokemon CyanSMP64 2023-08-18 17:24:30 +1200
• 5b885a4ddb
  Convert vanilla trainer data to only use the full custom trainer mon struct (#3114) Eduardo Quezada D'Ottone 2023-08-17 18:19:38 -0400
• d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer Eduardo Quezada 2023-08-17 17:52:28 -0400
• 4ca4b2dd76 Update battle_interface.c kittenchilly 2023-08-17 13:29:27 -0500
• 4e0e70ae81 Fix memory corruption when handling the ultra burst trigger sprite kittenchilly 2023-08-17 13:29:04 -0500
• f95b4fdb4c Merge branch 'upcoming' into ultraburst kittenchilly 2023-08-17 13:25:00 -0500
• a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming Eduardo Quezada 2023-08-17 13:42:09 -0400
• cd90fdec5d
  [Critical] fix memory corruption when handling trigger sprites (#3238) Philipp AUER 2023-08-17 02:21:16 +0200