Commit Graph

441 Commits

Author SHA1 Message Date
Ruan Pablo 184e654c64 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-31 04:54:48 -02:00
Ruan Pablo 8656318e8f minor fixes 2: electric boogaloo 2019-01-31 04:53:46 -02:00
darkfire006 f274bcb5df Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-31 00:49:35 -06:00
darkfire006 5e7742237b why am I so wrong sometimes 2019-01-31 00:36:08 -06:00
CaptainSegis d9f4173b0f Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-31 01:35:25 -05:00
CaptainSegis a24f5ff637 Hopefully fixed a couple of crashes 2019-01-31 01:35:14 -05:00
darkfire006 2bc4ef9ee4 fix adds 2019-01-31 00:11:36 -06:00
Ruan Pablo d42ddacd45 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-31 02:32:38 -02:00
Ruan Pablo c1b0bedc61 minor fixes 2019-01-31 02:31:54 -02:00
darkfire006 f581a1ecca Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy
# Conflicts:
#	P3D/P3D.vbproj
2019-01-30 22:29:45 -06:00
darkfire006 d0a19ba735 extra megas and red rematches 2019-01-30 22:24:58 -06:00
darkfire006 12dffd0649 Bruno was slightly overleveled 2019-01-30 20:34:02 -06:00
Ruan Pablo 69c570b205 Draco Meteor tutor 2019-01-30 20:10:29 -02:00
Ruan Pablo e0ec22c487 fix garden tutor 2019-01-30 16:06:01 -02:00
FantaX1911 1b48590ebd Implemented the item flame orb(battle effect was already implemented). 2019-01-30 17:28:03 +02:00
FantaX1911 74ef66cc28 Updated all medicine to GenVII 2019-01-30 16:57:18 +02:00
darkfire006 cd1bcf1907 lets try this again without the extra file........... 2019-01-30 00:07:31 -06:00
darkfire006 171bd27a34 Revert "Slight modification of tutor situation"
This reverts commit 3817f73935.
2019-01-30 00:02:22 -06:00
darkfire006 3817f73935 Slight modification of tutor situation 2019-01-30 00:01:26 -06:00
CaptainSegis 5d4ae15b67 Fixed exploit in NewMenuScreen 2019-01-29 22:49:09 -05:00
CaptainSegis cb15dd9e1c Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-29 22:48:16 -05:00
Ruan Pablo 38987eb4e9 minor fix 2019-01-30 01:39:46 -02:00
Ruan Pablo b1fb386a7c Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-30 01:38:52 -02:00
Ruan Pablo 16de3f6d83 Added V-Create Tutor 2019-01-30 01:30:50 -02:00
darkfire006 3a0f0f0fd5 fix E4 (again....sorry......) 2019-01-29 21:25:16 -06:00
darkfire006 3a7efc4e7d Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-29 17:35:00 -06:00
darkfire006 6070f2db9d attaching gym map scripts 2019-01-29 17:31:18 -06:00
Ruan Pablo 8b6ae4935d Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-29 14:18:48 -02:00
Ruan Pablo 7fc83cb5f3 Judgement fix + updated maps 2019-01-29 14:17:51 -02:00
darkfire006 c1e3dacf1e Gym Leader Rematch main set
still a few bonus trainers to complete
2019-01-29 02:05:49 -06:00
darkfire006 689ba5872e Altarianite fix 2019-01-28 22:20:59 -06:00
darkfire006 045515d64e tons of random fixes
Fix some flickering when snowy situations
replace slopes with actual stairs
fix phone typo
Some extra offset stuff for r17
2019-01-28 21:25:41 -06:00
darkfire006 4704f75476 Fix item 2019-01-27 23:16:49 -06:00
darkfire006 9d866a636f Post update changes 2019-01-27 22:51:22 -06:00
darkfire006 5e954cb39b Version update minutiea 2019-01-27 21:52:24 -06:00
Ruan Pablo 970a760985 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-28 01:20:37 -02:00
Ruan Pablo 0cfc070b47 added events center 2019-01-28 01:15:32 -02:00
darkfire006 f3aafe1953 T chambers and E4 fixes
Remove old lady(and hidden hiker) from tanoby chambers and prevent E4
skipping
2019-01-27 18:31:09 -06:00
CaptainSegis 924afc2005 Added a debug tool for music testing 2019-01-27 16:23:43 -05:00
darkfire006 64b16154f5 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-25 16:24:09 -06:00
darkfire006 054cecbb3a Modify some emblem descriptions 2019-01-25 16:24:06 -06:00
FantaX1911 c73f5ac07d Ok, I promise it works now.... 2019-01-25 19:13:06 +02:00
FantaX1911 d419794c3c Gave "beast" text color white. 2019-01-25 19:05:01 +02:00
FantaX1911 1f3fc83b8a Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-25 18:45:18 +02:00
FantaX1911 28c1af7d10 Implemented "Beast" emblem check in the party screen, (was I supposed to be the one to do it?) 2019-01-25 18:45:03 +02:00
darkfire006 4078edce1b fix speedboat music 2019-01-25 03:19:51 -06:00
darkfire006 698fc43a0f fix sevault? 2019-01-25 02:37:19 -06:00
darkfire006 018ecb62d0 Fix water warps and fix sevault offset maps 2019-01-25 01:26:54 -06:00
darkfire006 9d4be7425a Minor fixes
stairs at six island
warps at liberty island
Revival Herb heals fully
2019-01-24 19:12:11 -06:00
CaptainSegis 05436c2bb1 Small adjustment to credits 2019-01-24 02:00:45 -05:00
CaptainSegis 9f5e323d4a Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-24 01:52:57 -05:00
CaptainSegis 791902a05f Finished reworking emblems, added new ones. Adjusted all @sound.play(success) instances and such. 2019-01-24 01:52:47 -05:00
darkfire006 1ee8611317 Vermillion crash fix and typo 2019-01-24 00:30:00 -06:00
FantaX1911 13ebe54dd1 Added missing curly brackets. 2019-01-23 20:16:23 +02:00
FantaX1911 0a86c248cb Implemented repeatable check for "deep sea" emblem 2019-01-23 19:55:25 +02:00
FantaX1911 39283a33d0 Added repeatable check for "ancestor" emblem in faraway island. 2019-01-23 19:45:36 +02:00
FantaX1911 eceae2eedd Implemented repeatable check for eruption achievement. 2019-01-23 19:20:40 +02:00
FantaX1911 b7306a699e Added initial checks for (shooting star, ancestor, eruption, mega, victorious) via scripts.
Removed the recent pokedex emblem checks.
2019-01-23 18:59:07 +02:00
FantaX1911 0234edc3a7 fixed a typo with ancestor 2019-01-23 18:46:44 +02:00
FantaX1911 952482d645 Implemented pokedex check for the following achievements (Ancestor and Victorious) 2019-01-23 18:45:49 +02:00
FantaX1911 2fe8610a6b Added sylveon to the requirements of "eevee" achievement.
Implemented repeatable check for volcanion in the pokedex screen.
Implemented repeatable check for Jirachi in the pokedex screen.
Removed volcanion's emblem check from its script.
Removed Jirachi's emblem check from its script.
2019-01-23 18:03:06 +02:00
FantaX1911 d03b17775a Added initial checks for "Time", "Eruption" and "Deep sea" achievements + a typo fix. 2019-01-23 17:30:40 +02:00
CaptainSegis aef1cdbec1 Prep engine for new emblems. Temporary changes should be reverted when GJ support for trophies is brought back. 2019-01-23 06:11:11 -05:00
Ruan Pablo 35b77ec646 minor typo fix 2019-01-23 02:23:34 -02:00
Ruan Pablo f71ff86ac3 fixed garden compression 2019-01-23 01:38:05 -02:00
Ruan Pablo b6f59818b0 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-22 20:24:58 -02:00
Ruan Pablo 794f80296a garden trainer reposition 2019-01-22 20:24:49 -02:00
darkfire006 18b4ad6a36 Clouds around 2019-01-22 16:16:52 -06:00
darkfire006 2402e944b9 Fountain in Celadon City 2019-01-22 14:17:14 -06:00
CaptainSegis 59ce55288f Fixed build 2019-01-22 14:16:29 -05:00
CaptainSegis 98188fa3ef Fixed friend list, Trainer screen, play time, Woobat evolution condition. 2019-01-22 14:04:02 -05:00
CaptainSegis d898e7294a Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-21 23:38:46 -05:00
CaptainSegis e2567d073f Fixed karrablast/shelmet trade. Fixed multiple bugs related to new offline saves. 2019-01-21 23:38:32 -05:00
darkfire006 12348e4e29 Fix due to transparency issues 2019-01-21 18:21:21 -06:00
darkfire006 69ba5a94b9 Liberty Island switch the NPCs 2019-01-20 23:42:31 -06:00
darkfire006 73eb2325a0 Fix Liberty Island Scripts 2019-01-20 21:46:43 -06:00
Ruan Pablo 5cac70662e trainer card adjustment 2019-01-20 23:36:22 -02:00
Ruan Pablo cbaf194c10 fixing darnakin 2019-01-20 23:11:25 -02:00
darkfire006 0ebd6f0828 Add Switch to Lounge and remove unneeded League Trainer files 2019-01-20 22:41:38 -02:00
CaptainSegis 95ab854851 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-20 11:11:31 -05:00
CaptainSegis ca5be51d4c Some minor fixes 2019-01-20 11:11:07 -05:00
darkfire006 a61ce42566 and add kratos file to proj 2019-01-20 03:04:43 -06:00
darkfire006 9a31e9114a fix project inclusion 2019-01-20 03:03:20 -06:00
Ruan Pablo d54453fbac Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-19 20:52:44 -02:00
Ruan Pablo c15b3bbccc Fixing some transparent assets 2019-01-19 20:52:11 -02:00
darkfire006 7610def383 Last minute changes
anakin sprite in Krotos out, TV update, Minor changes in basement, and
implement 2 more evo lines in Pattern Bush
2019-01-19 15:00:00 -06:00
Ruan Pablo 9e538f4a18 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-19 04:48:32 -02:00
Ruan Pablo 2ef6b0b632 NPC Graphics 2019-01-19 04:48:15 -02:00
CaptainSegis 179d94ccd6 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2019-01-13 12:06:55 -05:00
CaptainSegis 7891cfd77d Disabled toggle third person from the new game screen. 2019-01-13 12:06:43 -05:00
nilllzz 71528d85a1 maybe fix the battle music 2019-01-13 00:55:17 +01:00
nilllzz 6e7032f2ae only reset mouse pos when needed 2019-01-11 20:22:01 +01:00
CaptainSegis 9cb32c3cc5 Added some debug messages (they are commented in OverworldCamera.vb). Small changes. 2019-01-11 13:58:43 -05:00
CaptainSegis 848482c031 Updated to MonoGame 3.7.1 2019-01-10 17:04:46 -05:00
CaptainSegis 03c6dbcf5b Fixed some issues related to File Validation and GJ saves. Updated the meta file. 2019-01-05 13:41:59 -05:00
CaptainSegis 28dba981db Oops 2019-01-05 02:53:34 -05:00
CaptainSegis c89c4f8121 Misc fixes:
- Fixed some screen size related issues
- Fixed crash related to indexes in TradeScreen
- Fixed @Pokemon.AddToStorage command
2019-01-05 02:47:05 -05:00
CaptainSegis 35291e9834 Minor change to ass. offices 2019-01-05 00:27:32 -05:00
CaptainSegis 1ad833463f Fixed music not playing after catching a pokemon 2019-01-04 21:36:31 -05:00
Ruan Pablo c719975da8 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-12-25 23:57:27 -02:00
Ruan Pablo d7ad0a78cf Minor fixes/updates 2018-12-25 23:57:06 -02:00
CaptainSegis df5a6806ba Small tweaks 2018-12-24 07:44:46 -05:00
CaptainSegis dd8f4d4192 Merge 2018-12-24 07:31:53 -05:00
Ruan Pablo 6fc51e95b1 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-12-22 18:27:26 -02:00
Ruan Pablo a061239256 Move fixes 2018-12-22 18:25:36 -02:00
CaptainSegis 87edaa0ee6 Fixes regarding battle system 2018-12-22 15:02:02 -05:00
CaptainSegis 3730ebbd10 Small adjustment to SummaryScreen 2018-12-22 11:28:09 -05:00
CaptainSegis 2784bbe54a Tiny BattleMenu visual fix 2018-12-21 20:26:51 -05:00
CaptainSegis 2d852d9166 Small adjustments to MapScreen 2018-12-21 15:19:17 -05:00
CaptainSegis 0aa2b03ad3 Fixed source control stuff 2018-12-21 13:00:14 -05:00
Ruan Pablo 843f87621f Graphic updates pt. 1 2018-12-20 18:28:06 -02:00
Ruan Pablo 1bbe4a1947 Habitat Dex quickfix 2018-11-21 01:35:17 -02:00
Ruan Pablo 57bf7bab66 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-11-08 17:35:19 -02:00
Ruan Pablo 813a5a373e Added some Gen 7 moves 2018-11-08 17:34:07 -02:00
CaptainSegis f3ebd5cad4 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-10-27 16:44:05 -05:00
CaptainSegis c1fe651ede Bag index now points to the last item used. 2018-10-27 16:43:52 -05:00
Ruan Pablo c4105ad5aa Added some missing moves up to Gen 6 2018-10-26 06:03:33 -02:00
CaptainSegis 17e2dc5fed Done with status condition icons 2018-10-21 22:20:08 -05:00
CaptainSegis a61e199aec Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-10-21 21:12:50 -05:00
CaptainSegis 5851f0d602 Fixed status icon not showing in PartyScreen 2018-10-21 21:12:37 -05:00
Ruan Pablo 35bb43d0a4 some moves + min gfx 2018-10-22 00:10:27 -02:00
CaptainSegis 4bac250b97 Fixed crash related to Toss/Give/Use in NewInventoryScreen 2018-10-17 03:30:27 -05:00
CaptainSegis 6925c74aa3 Lazy "fix" towards intros being cut by about 0.1 seconds 2018-10-02 00:49:58 -05:00
CaptainSegis 1aaa86bc04 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-10-01 20:38:36 -05:00
CaptainSegis 3053a55b9e Fixed some map's music loop. Fixed @Music.Play(no_music). 2018-10-01 20:38:26 -05:00
darkfire006 b099e4e199 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-09-30 03:46:42 -05:00
darkfire006 22c534d03c Change Red's title 2018-09-30 03:46:38 -05:00
FantaX1911 5e7a80d7ca removed the items from pattern bush. 2018-09-28 14:45:15 +03:00
darkfire006 5ce03092b8 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-09-28 06:00:32 -05:00
darkfire006 85a56e5b75 I guess this texture got corrupted or something? fix 2018-09-28 06:00:28 -05:00
FantaX1911 4f018bfbfb *Removed emb tower files from the repo.
*Fixed some dialogue typos.
2018-09-27 16:59:08 +03:00
FantaX1911 0c658973ea *Fixed missing wild pokemon in route 28.
*Fixed pokemon encounters in altering cave.
*Removed Items in altering cave.
*Replaced the berries in "berry forest".
2018-09-27 16:17:29 +03:00
FantaX1911 c4dc2aab8e Added altering cave's poke file to the project. 2018-09-26 21:23:34 +03:00
FantaX1911 95426250c9 Fixed liberty map keyitem again.... 2018-09-26 20:49:34 +03:00
FantaX1911 4a6a4eab8e replaced black belt with expert belt 2018-09-26 19:52:15 +03:00
FantaX1911 5abbbe8e16 Fixed wrong item tags 2018-09-26 19:12:12 +03:00
FantaX1911 83452d84e1 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-09-25 05:57:11 +03:00
FantaX1911 4e6ea9efa8 Looks like the extra flooe tile fix got lost somehow, reimplemented the fix. 2018-09-25 05:56:57 +03:00
darkfire006 9c38c16246 Improvements to the sevii Island Map 2018-09-15 23:05:47 -05:00
FantaX1911 7d0badae70 restored jack's fix. 2018-09-15 15:10:44 +03:00
FantaX1911 e15f36ca32 Revert "some updates to schoolboy jack"
This reverts commit 697379f62a.
2018-09-15 15:01:16 +03:00
FantaX1911 a9bcc45f80 Revert "more updates to the schoolboy"
This reverts commit d45e0e85a3.
2018-09-15 15:01:10 +03:00
FantaX1911 19589cc7d1 Revert "jack fix?"
This reverts commit 34ab0486c4.
2018-09-15 15:00:38 +03:00
darkfire006 34ab0486c4 jack fix? 2018-09-15 05:59:22 -05:00
FantaX1911 dd9d660844 Added Soothe bell to national park. 2018-09-15 12:30:01 +03:00
FantaX1911 f89c4f8d2f Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-09-15 11:58:32 +03:00
FantaX1911 d45e0e85a3 more updates to the schoolboy 2018-09-15 11:58:09 +03:00
FantaX1911 697379f62a some updates to schoolboy jack 2018-09-15 11:36:14 +03:00
darkfire006 23ad97d9d3 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-09-14 21:31:48 -05:00
darkfire006 f6e73ae139 Fix which ball disappears? 2018-09-14 21:31:44 -05:00