Testing legacy code

Removes debugging logs
Fixes issue with possible uninitialized dyed items map when opening clothing menus
2025-12-06 06:01:46 +00:00 · 2025-03-11 16:21:40 -04:00 · 2025-03-11 16:15:36 -04:00 · 2025-03-11 14:04:42 -04:00 · 2025-03-10 13:35:04 -04:00 · 2025-03-10 12:59:14 -04:00
7726 changed files with 598900 additions and 14539 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,14 @@
-
+Graphics/CustomBattlers/local_sprites/*
 Graphics/Pokemon/FusionIcons/*
+Graphics/CustomBattlers/spritesheets
+Graphics/CustomBattlers/*
 Data/sprites/*
 Data/VERSION
- 
+infinitefusion.sh
+Data/sprites/CUSTOM_SPRITES
+Data/sprites
+Data/sprites/updated_spritesheets_cache
+Data/sprites/sprites_rate_limit.log
+.gitignore
+Game.rxproj
+.DS_Store
--- a/Audio/BGM/Hall
+++ b/Audio/BGM/Hall
--- a/Audio/SE/Cries/MINIOR_C.ogg
+++ b/Audio/SE/Cries/MINIOR_C.ogg
--- a/Audio/SE/Cries/MINIOR_M.ogg
+++ b/Audio/SE/Cries/MINIOR_M.ogg
--- a/Credits.txt
+++ b/Credits.txt
@@ -45,7 +45,7 @@ Special thanks to Aegide and Reizod for helping to rip the sprites from the webs
 and to the owners of the respective fusion websites for accepting to share
 their sprites.

-Intro cinamatic
+Intro cinematic
 #####################
 Kiwikelly

@@ -116,7 +116,7 @@ with their respective authors' consent
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
 		Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
-
+		zender1752 (Sabrina OW sprite)
 	Battle sprites: 
 		Custom graphics:
 		Kiwikelly, UnworthyPie
@@ -124,7 +124,7 @@ with their respective authors' consent
 		Free use graphics:
 		luckygirl88  (Misty VS sprite) 		http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
-		
+		x-5-4-5-2 (Sabrina sprite) 		https://www.deviantart.com/x-5-4-5-2/art/Game-Sabrina-204548703
 ### Custom tileset graphics ###
 Kiwikelly

--- a/Data/.DS_Store
+++ b/Data/.DS_Store
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map001.rxdata
+++ b/Data/Map001.rxdata
--- a/Data/Map004.rxdata
+++ b/Data/Map004.rxdata
--- a/Data/Map006.rxdata
+++ b/Data/Map006.rxdata
--- a/Data/Map010.rxdata
+++ b/Data/Map010.rxdata
--- a/Data/Map013.rxdata
+++ b/Data/Map013.rxdata
--- a/Data/Map017.rxdata
+++ b/Data/Map017.rxdata
--- a/Data/Map019.rxdata
+++ b/Data/Map019.rxdata
--- a/Data/Map024.rxdata
+++ b/Data/Map024.rxdata
--- a/Data/Map025.rxdata
+++ b/Data/Map025.rxdata
--- a/Data/Map027.rxdata
+++ b/Data/Map027.rxdata
--- a/Data/Map029.rxdata
+++ b/Data/Map029.rxdata
--- a/Data/Map036.rxdata
+++ b/Data/Map036.rxdata
--- a/Data/Map042.rxdata
+++ b/Data/Map042.rxdata
--- a/Data/Map045.rxdata
+++ b/Data/Map045.rxdata
--- a/Data/Map046.rxdata
+++ b/Data/Map046.rxdata
--- a/Data/Map048.rxdata
+++ b/Data/Map048.rxdata
--- a/Data/Map051.rxdata
+++ b/Data/Map051.rxdata
--- a/Data/Map067.rxdata
+++ b/Data/Map067.rxdata
--- a/Data/Map068.rxdata
+++ b/Data/Map068.rxdata
--- a/Data/Map069.rxdata
+++ b/Data/Map069.rxdata
--- a/Data/Map070.rxdata
+++ b/Data/Map070.rxdata
--- a/Data/Map071.rxdata
+++ b/Data/Map071.rxdata
--- a/Data/Map073.rxdata
+++ b/Data/Map073.rxdata
--- a/Data/Map077.rxdata
+++ b/Data/Map077.rxdata
--- a/Data/Map078.rxdata
+++ b/Data/Map078.rxdata
--- a/Data/Map080.rxdata
+++ b/Data/Map080.rxdata
--- a/Data/Map085.rxdata
+++ b/Data/Map085.rxdata
--- a/Data/Map095.rxdata
+++ b/Data/Map095.rxdata
--- a/Data/Map096.rxdata
+++ b/Data/Map096.rxdata
--- a/Data/Map106.rxdata
+++ b/Data/Map106.rxdata
--- a/Data/Map108.rxdata
+++ b/Data/Map108.rxdata
--- a/Data/Map129.rxdata
+++ b/Data/Map129.rxdata
--- a/Data/Map145.rxdata
+++ b/Data/Map145.rxdata
--- a/Data/Map146.rxdata
+++ b/Data/Map146.rxdata
--- a/Data/Map151.rxdata
+++ b/Data/Map151.rxdata
--- a/Data/Map154.rxdata
+++ b/Data/Map154.rxdata
--- a/Data/Map155.rxdata
+++ b/Data/Map155.rxdata
--- a/Data/Map159.rxdata
+++ b/Data/Map159.rxdata
--- a/Data/Map171.rxdata
+++ b/Data/Map171.rxdata
--- a/Data/Map237.rxdata
+++ b/Data/Map237.rxdata
--- a/Data/Map250.rxdata
+++ b/Data/Map250.rxdata
--- a/Data/Map265.rxdata
+++ b/Data/Map265.rxdata
--- a/Data/Map266.rxdata
+++ b/Data/Map266.rxdata
--- a/Data/Map267.rxdata
+++ b/Data/Map267.rxdata
--- a/Data/Map279.rxdata
+++ b/Data/Map279.rxdata
--- a/Data/Map317.rxdata
+++ b/Data/Map317.rxdata
--- a/Data/Map341.rxdata
+++ b/Data/Map341.rxdata
--- a/Data/Map342.rxdata
+++ b/Data/Map342.rxdata
--- a/Data/Map349.rxdata
+++ b/Data/Map349.rxdata
--- a/Data/Map351.rxdata
+++ b/Data/Map351.rxdata
--- a/Data/Map357.rxdata
+++ b/Data/Map357.rxdata
--- a/Data/Map359.rxdata
+++ b/Data/Map359.rxdata
--- a/Data/Map380.rxdata
+++ b/Data/Map380.rxdata
--- a/Data/Map389.rxdata
+++ b/Data/Map389.rxdata
--- a/Data/Map391.rxdata
+++ b/Data/Map391.rxdata
--- a/Data/Map394.rxdata
+++ b/Data/Map394.rxdata
--- a/Data/Map406.rxdata
+++ b/Data/Map406.rxdata
--- a/Data/Map409.rxdata
+++ b/Data/Map409.rxdata
--- a/Data/Map416.rxdata
+++ b/Data/Map416.rxdata
--- a/Data/Map434.rxdata
+++ b/Data/Map434.rxdata
--- a/Data/Map440.rxdata
+++ b/Data/Map440.rxdata
--- a/Data/Map444.rxdata
+++ b/Data/Map444.rxdata
--- a/Data/Map449.rxdata
+++ b/Data/Map449.rxdata
--- a/Data/Map457.rxdata
+++ b/Data/Map457.rxdata
--- a/Data/Map461.rxdata
+++ b/Data/Map461.rxdata
--- a/Data/Map484.rxdata
+++ b/Data/Map484.rxdata
--- a/Data/Map486.rxdata
+++ b/Data/Map486.rxdata
--- a/Data/Map491.rxdata
+++ b/Data/Map491.rxdata
--- a/Data/Map494.rxdata
+++ b/Data/Map494.rxdata
--- a/Data/Map500.rxdata
+++ b/Data/Map500.rxdata
--- a/Data/Map506.rxdata
+++ b/Data/Map506.rxdata
--- a/Data/Map508.rxdata
+++ b/Data/Map508.rxdata
--- a/Data/Map520.rxdata
+++ b/Data/Map520.rxdata
--- a/Data/Map565.rxdata
+++ b/Data/Map565.rxdata
--- a/Data/Map598.rxdata
+++ b/Data/Map598.rxdata
--- a/Data/Map609.rxdata
+++ b/Data/Map609.rxdata
--- a/Data/Map635.rxdata
+++ b/Data/Map635.rxdata
--- a/Data/Map638.rxdata
+++ b/Data/Map638.rxdata
--- a/Data/Map647.rxdata
+++ b/Data/Map647.rxdata
--- a/Data/Map666.rxdata
+++ b/Data/Map666.rxdata
--- a/Data/Map670.rxdata
+++ b/Data/Map670.rxdata
--- a/Data/Map692.rxdata
+++ b/Data/Map692.rxdata
--- a/Data/Map744.rxdata
+++ b/Data/Map744.rxdata
--- a/Data/Map755.rxdata
+++ b/Data/Map755.rxdata
--- a/Data/Map770.rxdata
+++ b/Data/Map770.rxdata
--- a/Data/Map783.rxdata
+++ b/Data/Map783.rxdata
--- a/Data/Map788.rxdata
+++ b/Data/Map788.rxdata
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chardub	ac83e9ddcb	Testing legacy code	2025-03-11 16:21:40 -04:00
chardub	3470c75b02	Removes debugging logs	2025-03-11 16:15:36 -04:00
chardub	7358d67e7e	Fixes issue with possible uninitialized dyed items map when opening clothing menus	2025-03-11 14:04:42 -04:00
chardub	701ea9ab11	clothes menu crash fix	2025-03-10 13:35:04 -04:00
chardub	36851c7bb7	Hats menu navigation improvements	2025-03-10 12:59:14 -04:00
chardub	3d6e76a41e	Fixes issue when putting on clothes	2025-03-09 22:34:42 -04:00
chardub	bc2d48488e	changes engineer, traveller and gambler npc overworld sprites	2025-03-09 21:34:19 -04:00
chardub	f3ebd7e7f5	updates gambler sprite	2025-03-09 18:12:44 -04:00
chardub	6a072917b8	Fixes accidental file rename	2025-03-09 18:06:23 -04:00
chardub	0c06b7a6c9	Fixes new game crash	2025-03-09 18:04:48 -04:00
chardub	14f99f7efb	Fixes issue with hats shops	2025-03-09 16:47:16 -04:00
chardub	b14d9d491c	Adds moar character customization options	2025-03-09 16:20:27 -04:00
chardub	071621b8dd	Fixes issue with hat swapping	2025-03-09 15:38:16 -04:00
chardub	dc4ec939cd	Clothes and Hats selection menu now opens on current worn outfit	2025-03-09 13:45:59 -04:00
chardub	a974994d15	Adds Dye Kit item	2025-03-09 13:45:31 -04:00
chardub	6b978c0ebc	double hats menu UI stuff	2025-03-09 12:49:07 -04:00
chardub	8b8b348ed1	Double hats menu	2025-03-09 12:48:32 -04:00
chardub	e9bdea5bad	Double hats UI (except dyes)	2025-03-08 16:29:21 -05:00
chardub	6248ccd061	Fixes thief	2025-03-08 15:24:35 -05:00
chardub	60de077d01	double hats UI wip	2025-03-08 12:52:55 -05:00
chardub	20a5811ab8	Fixes Pokedex entries issues	2025-03-07 10:42:46 -05:00
chardub	32874d8a38	Adds second hat to continue screen	2025-03-07 09:49:42 -05:00
chardub	d9ef1cd12e	Promps users for updating spritepack files	2025-03-06 18:57:43 -05:00
chardub	ccb05dc509	Fixes critical capture (based on `70bc2480f4`)	2025-03-06 11:55:30 -05:00
chardub	4ed504d817	Fixes minimize glitch after soft reset	2025-03-06 11:44:05 -05:00
chardub	96f60d8cb9	fixes egg moves issue with pokemon that breed with incense in the official games, updates intro screen	2025-03-06 09:42:48 -05:00
chardub	45bf331031	Clothes given by fossil npc final encounter	2025-03-03 09:38:57 -05:00
chardub	4ef0e87577	nvm	2025-03-02 21:34:37 -05:00
chardub	4f1accc017	Fixes an issue causing checks for rate limiting to be counted	2025-03-02 21:30:44 -05:00
chardub	c41773d06f	misty gym & learned moves stuff wip	2025-03-01 15:51:49 -05:00
chardub	5398a5aa78	Replace Dig TM with Return TM on Route 15 #101 (KamilaBorowska)	2025-03-01 15:41:41 -05:00
chardub	0d7ea25203	mahogany town gym trainers	2025-03-01 11:31:34 -05:00
chardub	98f753eb97	updates several gym leader graphics	2025-02-26 15:04:14 -05:00
chardub	f1f00202c2	fixes level graphics in party screen	2025-02-24 21:29:04 -05:00
chardub	c4242bb0b6	fixes level graphics	2025-02-24 21:17:07 -05:00
chardub	c3b501dc28	cc data	2025-02-24 20:08:22 -05:00
chardub	a6649ce82d	Adds more character customization options	2025-02-24 20:06:41 -05:00
chardub	4fcc3e1516	optimized graphics	2025-02-24 16:58:14 -05:00
chardub	553d862168	Merge branch 'develop' of https://github.com/infinitefusion/infinitefusion-e18 into develop	2025-02-24 11:52:54 -05:00
infinitefusion	1dba2e41ae	Merge pull request #124 from fellow-dev-simon/dna-reverser-fix DNAReverser Removal Bug	2025-02-24 11:49:11 -05:00
infinitefusion	f15fd29c39	Merge pull request #100 from KamilaBorowska/fix-aromatherapy-bug Make Aromatherapy work when user is not statused	2025-02-24 11:44:27 -05:00
chardub	c38d513a67	Replace Dig TM with Return TM on Route 15 #101 (KamilaBorowska)	2025-02-24 11:34:43 -05:00
chardub	92feb7c714	Remove league check (unused) from list of Hidden Ability maps (KamilaBorowska)	2025-02-24 11:28:46 -05:00
infinitefusion	892c2b62f6	Merge pull request #116 from homie-estate/turtwig-fix Turtwig fix #114	2025-02-24 11:23:01 -05:00
chardub	f1d21b10c6	updates readme	2025-02-24 11:01:40 -05:00
infinitefusion	687aa86e1c	Merge pull request #128 from GLugia/bug-fixes Fix for Drain vs Liquid Ooze	2025-02-24 10:57:00 -05:00
chardub	707bac5d65	adds some more character customization options	2025-02-22 23:48:37 -05:00
chardub	c8f2a37d5a	updates pbsà	2025-02-22 12:28:55 -05:00
chardub	5eac2dd43a	changes tm80 to rock slide	2025-02-22 12:28:02 -05:00
chardub	9b5f376ed9	updates misty sprite	2025-02-22 11:50:04 -05:00
chardub	5ed090229b	updates sabrina sprite & Meloetta	2025-02-21 20:56:31 -05:00
chardub	f9095f2d06	hair can be one frame long	2025-02-21 20:38:56 -05:00
chardub	c6f69edf9c	Fixes meloetta form change	2025-02-21 20:38:23 -05:00
chardub	a52af5a021	Changes Miss Melody (Meloetta) to Aria/Pirouette fusion	2025-02-21 19:49:16 -05:00
chardub	80eef3b1c4	Custom appearances for art gallery spriters	2025-02-21 12:30:56 -05:00
chardub	0f416eecaf	Refactor: double hats	2025-02-20 17:10:24 -05:00
chardub	d099d788f4	Refactor: double hats	2025-02-20 17:09:56 -05:00
chardub	f835ff8209	Refactor: double hats	2025-02-20 17:09:48 -05:00
chardub	810154c516	fixes hair animation	2025-02-19 22:22:26 -05:00
chardub	76ecb4e2e0	Secondary Hat (WIP)	2025-02-18 23:01:49 -05:00
chardub	1c665bf636	Small map fixes	2025-02-18 19:39:42 -05:00
chardub	0f38d7933b	Adds more dishes at once in SS Anne restaurant quest	2025-02-18 11:53:42 -05:00
chardub	4089c956d7	Adds way to favorite hats and clothes and item to quickly swap to them	2025-02-18 11:06:14 -05:00
chardub	133f01218b	fixes reset cache option menu crash	2025-02-17 22:33:38 -05:00
chardub	c5cff0dfb9	fixes rare crashes from double team, minimize, dragon rage, sonic boom taken from: `720c2a4661`	2025-02-17 20:55:01 -05:00
chardub	1d2139df32	Get clown nose by donating to clowns	2025-02-17 20:24:35 -05:00
chardub	8352043c4c	fixes crash on fusion screen	2025-02-17 19:41:49 -05:00
chardub	67d32e7c18	Fixes music in mt. moon square	2025-02-17 18:23:02 -05:00
chardub	1ddb9ba24a	Mahogany gym trainers now notice player when standing next to them + adds referee that sends back the puck	2025-02-17 15:01:14 -05:00
chardub	4fa7292bdd	Adds new hats & easter egg pokeballs	2025-02-17 11:06:32 -05:00
chardub	cb39bac568	Adds option for toggling custom eggs	2025-02-16 16:16:39 -05:00
chardub	541c98ba6b	Adds option for toggling custom eggs	2025-02-16 16:16:32 -05:00
chardub	28a982ce15	Fixes F12 soft reset	2025-02-15 14:19:00 -05:00
chardub	fdcfbb5bb4	Fusion cries play both the head and body pokemon cries	2025-02-15 12:23:44 -05:00
chardub	05b1af28e0	Capitalizes suffix in Mr. Mime fusions name	2025-02-13 21:43:51 -05:00
chardub	0f58800fd1	adds new team flags	2025-02-13 20:43:46 -05:00
chardub	f251cf37ab	Fixes goldenrod map transitions Fixes message in dresser in player room Fixes tiles in kindle road underwater Fixes black border on route 43	2025-02-12 09:48:21 -05:00
chardub	d23e2ff98a	Fixes super Gourgeist attack stat	2025-02-10 10:42:58 -05:00
chardub	871045ca46	adds new hairstyles to Saffron boutique	2025-02-08 16:13:07 -05:00
chardub	0c918bbfcb	updates gitignore	2025-02-08 14:48:36 -05:00
chardub	2488a2575e	removes dev files	2025-02-08 11:31:14 -05:00
chardub	2c5b161029	lowers number of pokemon to catch for first celadon rocket mission from 4 to 3	2025-02-08 11:00:01 -05:00
chardub	32dc832b5c	santa hat	2025-02-08 00:06:29 -05:00
chardub	9fa7dac43f	oops spritesheets	2025-02-07 23:54:34 -05:00
chardub	d3e4fd3d33	updates gitignore	2025-02-07 23:40:57 -05:00
chardub	16b2deeefb	adds missing folder	2025-02-07 23:21:28 -05:00
chardub	b8d479b801	Some minor map fixes	2025-02-07 22:47:02 -05:00
chardub	38377b703e	updates version number	2025-02-07 22:29:12 -05:00
chardub	1fed55f7fa	adds new character customization options	2025-02-07 22:28:44 -05:00
chardub	3ebd3fd68a	Adds some character customization data	2025-02-07 21:04:35 -05:00
chardub	2fcc7fc9cd	glitched mask obtain method	2025-02-07 20:22:23 -05:00
chardub	692a25bd8e	Lowers default game volume	2025-02-07 11:15:41 -05:00
chardub	24943e092f	fixes typo	2025-02-06 21:18:13 -05:00
chardub	935c548016	fixes normal type expert team	2025-02-06 21:14:19 -05:00
chardub	44f114b5e0	Adds debug function to change a pokemon's species from head and body pokedex numbers	2025-02-06 19:47:11 -05:00
chardub	1809d246b6	Clears celadon TR rocket HQ after getting recognized by Archer in Mt. Ember	2025-02-06 19:17:41 -05:00
infinitefusion	a9de6b6c97	updates sinnoh triple fusion sprite	2025-02-02 18:34:33 -05:00
infinitefusion	1499465ce0	santa claus sprite fix	2025-02-02 16:34:54 -05:00
infinitefusion	f72c7fff7b	Adds CUSTOM_DEX_FILE_URL file url to settubgs	2025-02-02 15:23:55 -05:00
infinitefusion	a9267b7bad	Adds credits file url to settubgs	2025-02-02 15:14:54 -05:00
infinitefusion	fed8490fc3	Removes debug code	2025-02-02 14:27:22 -05:00
infinitefusion	a62544e8d8	Entering TR HQ after Team Rocket has disbanded automatically completes any unfinished quests	2025-02-02 14:22:22 -05:00
infinitefusion	9d30b0e0fb	Adds hint NPC in hotel for last cerulean rocket quest	2025-02-02 12:58:02 -05:00
infinitefusion	5640871dcd	fixes missing minior cry	2025-02-02 12:07:34 -05:00
infinitefusion	e7d2330a2f	Fix for TR quests not registered in quest log	2025-02-01 00:20:45 -05:00
infinitefusion	71894707b1	Lowers GS Ball quest requirement to 50	2025-01-31 16:29:49 -05:00
infinitefusion	727bccfe61	Adds Pinkan Berry to "do not randomize" items list	2025-01-31 16:10:20 -05:00
infinitefusion	e0201bf021	Adds option to swap base color in hair dye menu	2025-01-31 16:09:57 -05:00
infinitefusion	8f1f4a0f9b	Makes it possible to finish construction materials quest after beating league	2025-01-31 15:22:26 -05:00
infinitefusion	8bcc4f226b	fixes missing hall of fame music	2025-01-25 14:21:00 -05:00
infinitefusion	5fc4935a0c	Removes Pinkan island troll rock	2025-01-22 16:59:00 -05:00
infinitefusion	064a09664a	adds new batch of custom pokedex entries	2025-01-22 10:15:04 -05:00
infinitefusion	6c621d04e4	small fixes	2025-01-18 10:35:28 -05:00
infinitefusion	d523f30eb7	fIXES SCRAGGY POKERADAR	2025-01-17 13:24:31 -05:00
infinitefusion	b2b8a4ec12	Makes Magikarp contest easier the first time	2025-01-13 21:51:19 -05:00
infinitefusion	33ab16c3c6	Makes Magikarp contest easier the first time	2025-01-13 21:50:39 -05:00
infinitefusion	4730228557	updates outdoor tileset	2025-01-13 21:16:23 -05:00
GLugia	256a045607	Fix for Drain vs Liquid Ooze When a draining move KOs a Pokemon with Liquid Ooze, the ability would not activate. This fixes that.	2024-12-25 12:11:05 -05:00
Simon Fedick	7bb75aaf1d	Fixed DNAReverser deletion bug	2024-08-20 19:20:34 +02:00
Edward Perpich	2bf0b6d104	fix turtwigs name in the split names	2024-03-01 17:24:27 -05:00
Konrad Borowski	bd11977c80	Make Aromatherapy work when user is not statused	2023-07-23 09:19:00 +02:00