Add subdirectories to data/ similar to pokecrystal

Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.

41 files changed, 69 insertions, 69 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index fcc3c99f..4f75aab9 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -649,7 +649,7 @@ DoSpecialEffectByAnimationId:
 	pop hl
 	ret
 
-INCLUDE "data/move_animation_special_effects.asm"
+INCLUDE "data/moves/animation_special_effects.asm"
 
 DoBallTossSpecialEffects:
 	ld a, [wcf91]
@@ -911,7 +911,7 @@ TailWhipAnimationUnused:
 	ld c, 20
 	jp DelayFrames
 
-INCLUDE "data/move_animation_pointers.asm"
+INCLUDE "data/moves/animation_special_effect_pointers.asm"
 
 AnimationDelay10:
 	ld c, 10
@@ -2208,7 +2208,7 @@ IsCryMove:
 	scf
 	ret
 
-INCLUDE "data/move_sfx.asm"
+INCLUDE "data/moves/sfx.asm"
 
 CopyPicTiles:
 	ld a, [H_WHOSETURN]
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 62b023b0..06b02aec 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -151,7 +151,7 @@ GetBattleTransitionID_IsDungeonMap:
 	res 2, c
 	ret
 
-INCLUDE "data/dungeon_maps.asm"
+INCLUDE "data/maps/dungeon_maps.asm"
 
 LoadBattleTransitionTile:
 	ld hl, vChars1 + $7f0
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 75841ccf..fec10215 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3814,7 +3814,7 @@ DetermineExclamationPointTextNum:
 	pop bc
 	ret
 
-INCLUDE "data/move_grammar.asm"
+INCLUDE "data/moves/grammar.asm"
 
 PrintMoveFailureText:
 	ld de, wPlayerMoveEffect
@@ -5317,7 +5317,7 @@ AIGetTypeEffectiveness:
 	ld [wTypeEffectiveness], a ; store damage multiplier
 	ret
 
-INCLUDE "data/type_effects.asm"
+INCLUDE "data/types/type_matchups.asm"
 
 ; some tests that need to pass for a move to hit
 MoveHitTest:
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index 8bb22a1c..2c015097 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -21,7 +21,7 @@ _JumpMoveEffect:
 	ld l, a
 	jp hl ; jump to special effect handler
 
-INCLUDE "data/effects_pointers.asm"
+INCLUDE "data/moves/effects_pointers.asm"
 
 SleepEffect:
 	ld de, wEnemyMonStatus
@@ -751,7 +751,7 @@ PrintStatText:
 	ld bc, $a
 	jp CopyData
 
-INCLUDE "text/stat_names.asm"
+INCLUDE "data/battle/stat_names.asm"
 
 INCLUDE "data/battle/stat_modifiers.asm"
 
diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
index f717f871..7da0dc8c 100644
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -49,4 +49,4 @@ PrintType_:
 	pop hl
 	jp PlaceString
 
-INCLUDE "text/type_names.asm"
+INCLUDE "data/types/names.asm"
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 78e53b87..4d40fd82 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -18,4 +18,4 @@ SaveTrainerName::
 	jr nz, .CopyCharacter
 	ret
 
-INCLUDE "text/trainer_name_pointers.asm"
+INCLUDE "data/trainers/name_pointers.asm"
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 2850b9c2..91aef0f1 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -273,19 +273,19 @@ ReadMove:
 	pop hl
 	ret
 
-INCLUDE "data/trainer_move_choices.asm"
+INCLUDE "data/trainers/move_choices.asm"
 
-INCLUDE "data/trainer_pic_money_pointers.asm"
+INCLUDE "data/trainers/pic_pointers_money.asm"
 
-INCLUDE "text/trainer_names.asm"
+INCLUDE "data/trainers/names.asm"
 
 INCLUDE "engine/battle/misc.asm"
 
 INCLUDE "engine/battle/read_trainer_party.asm"
 
-INCLUDE "data/trainer_moves.asm"
+INCLUDE "data/trainers/special_moves.asm"
 
-INCLUDE "data/trainer_parties.asm"
+INCLUDE "data/trainers/parties.asm"
 
 TrainerAI:
 	and a
@@ -319,7 +319,7 @@ TrainerAI:
 	call Random
 	jp hl
 
-INCLUDE "data/trainer_ai_pointers.asm"
+INCLUDE "data/trainers/ai_pointers.asm"
 
 JugglerAI:
 	cp 25 percent + 1
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 93409051..9d6fcb8d 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -101,4 +101,4 @@ TryDoWildEncounter:
 	xor a
 	ret
 
-INCLUDE "data/wild_probabilities.asm"
+INCLUDE "data/wild/probabilities.asm"
diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm
index e40b0ac7..ad954c9f 100755
--- a/engine/events/hidden_items.asm
+++ b/engine/events/hidden_items.asm
@@ -18,7 +18,7 @@ HiddenItems:
 	call GetItemName
 	tx_pre_jump FoundHiddenItemText
 
-INCLUDE "data/hidden_item_coords.asm"
+INCLUDE "data/events/hidden_item_coords.asm"
 
 FoundHiddenItemText::
 	TX_FAR _FoundHiddenItemText
@@ -118,7 +118,7 @@ HiddenCoins:
 .done
 	jp PrintPredefTextID
 
-INCLUDE "data/hidden_coins.asm"
+INCLUDE "data/events/hidden_coins.asm"
 
 FoundHiddenCoinsText::
 	TX_FAR _FoundHiddenCoinsText
diff --git a/engine/events/hidden_object_functions3.asm b/engine/events/hidden_object_functions3.asm
index 1237e960..4b3262f7 100755
--- a/engine/events/hidden_object_functions3.asm
+++ b/engine/events/hidden_object_functions3.asm
@@ -36,7 +36,7 @@ PrintBookshelfText::
 	ld [$ffdb], a
 	jpba PrintCardKeyText
 
-INCLUDE "data/bookshelf_tile_ids.asm"
+INCLUDE "data/tilesets/bookshelf_tile_ids.asm"
 
 IndigoPlateauStatues::
 	TX_ASM
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index c01bc3c3..c1466485 100755
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
@@ -84,7 +84,7 @@ InGameTrade_GetMonName:
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-INCLUDE "data/trades.asm"
+INCLUDE "data/events/trades.asm"
 
 InGameTrade_DoTrade:
 	xor a ; NORMAL_PARTY_MENU
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index 5e08bb8f..aa86f828 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -145,7 +145,7 @@ GetPrizeMenuId:
 	ld c, (1 << 7 | 2)
 	jp PrintBCDNumber
 
-INCLUDE "data/prizes.asm"
+INCLUDE "data/events/prizes.asm"
 
 PrintPrizePrice:
 	coord hl, 11, 0
@@ -303,4 +303,4 @@ GetPrizeMonLevel:
 	ld [wCurEnemyLVL], a
 	ret
 
-INCLUDE "data/prize_mon_levels.asm"
+INCLUDE "data/events/prize_mon_levels.asm"
diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm
index 091cfa1a..02ab92ea 100755
--- a/engine/events/saffron_guards.asm
+++ b/engine/events/saffron_guards.asm
@@ -12,4 +12,4 @@ RemoveGuardDrink::
 	jr z, .drinkLoop
 	jpba RemoveItemByID
 
-INCLUDE "data/guard_drink_items.asm"
+INCLUDE "data/items/guard_drink_items.asm"
diff --git a/engine/events/set_blackout_map.asm b/engine/events/set_blackout_map.asm
index 14f0ba28..e8460240 100644
--- a/engine/events/set_blackout_map.asm
+++ b/engine/events/set_blackout_map.asm
@@ -22,4 +22,4 @@ SetLastBlackoutMap:
 	pop hl
 	ret
 
-INCLUDE "data/rest_house_maps.asm"
+INCLUDE "data/maps/rest_house_maps.asm"
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 554c5d4f..4a39f7b9 100755
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -130,4 +130,4 @@ LoadVendingMachineItem:
 	ld [hVendingMachinePrice + 2], a
 	ret
 
-INCLUDE "data/vending_prices.asm"
+INCLUDE "data/items/vending_prices.asm"
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index d2913715..7a96b36c 100755
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -162,7 +162,7 @@ LoadMonPartySpriteGfxWithLCDDisabled:
 	jr nz, .loop
 	jp EnableLCD
 
-INCLUDE "data/mon_party_sprite_pointers.asm"
+INCLUDE "data/icon_pointers.asm"
 
 WriteMonPartySpriteOAMByPartyIndex:
 ; Write OAM blocks for the party mon in [hPartyMonIndex].
@@ -278,7 +278,7 @@ GetPartyMonSpriteID:
 	srl a
 	ret
 
-INCLUDE "data/mon_party_sprites.asm"
+INCLUDE "data/pokemon/menu_icons.asm"
 
 INC_FRAME_1 EQUS "0, $20"
 INC_FRAME_2 EQUS "$20, $20"
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 39991d48..9ec0f04a 100755
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -632,10 +632,10 @@ CopySGBBorderTiles:
 	jr nz, .tileLoop
 	ret
 
-INCLUDE "data/sgb_packets.asm"
+INCLUDE "data/sgb/sgb_packets.asm"
 
-INCLUDE "data/mon_palettes.asm"
+INCLUDE "data/pokemon/palettes.asm"
 
-INCLUDE "data/super_palettes.asm"
+INCLUDE "data/sgb/sgb_palettes.asm"
 
-INCLUDE "data/sgb_border.asm"
+INCLUDE "data/sgb/sgb_border.asm"
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 6e7bed1e..e1723118 100755
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1901,7 +1901,7 @@ ItemUseGoodRod:
 	xor 1
 	jr RodResponse
 
-INCLUDE "data/good_rod.asm"
+INCLUDE "data/wild/good_rod.asm"
 
 ItemUseSuperRod:
 	call FishingInit
@@ -2686,7 +2686,7 @@ IsKeyItem_::
 	ld [wIsKeyItem], a
 	ret
 
-INCLUDE "data/key_items.asm"
+INCLUDE "data/items/key_items.asm"
 
 SendNewMonToBox:
 	ld de, wNumInBox
@@ -2881,7 +2881,7 @@ IsNextTileShoreOrWater:
 	and a
 	ret
 
-INCLUDE "data/water_tilesets.asm"
+INCLUDE "data/tilesets/water_tilesets.asm"
 
 ReadSuperRodData:
 ; return e = 2 if no fish on this map
@@ -2928,7 +2928,7 @@ ReadSuperRodData:
 	ld e, $1 ; $1 if there's a bite
 	ret
 
-INCLUDE "data/super_rod.asm"
+INCLUDE "data/wild/super_rod.asm"
 
 ; reloads map view and processes sprite data
 ; for items that cause the overworld to be displayed
diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm
index c359dc1d..85531bab 100755
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
@@ -22,4 +22,4 @@ GetMachinePrice::
 	ld [hItemPrice + 2], a
 	ret
 
-INCLUDE "data/tm_prices.asm"
+INCLUDE "data/items/tm_prices.asm"
diff --git a/engine/items/tms.asm b/engine/items/tms.asm
index da1b5e72..ea7fbcad 100755
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
@@ -33,4 +33,4 @@ TMToMove:
 	ld [wd11e], a
 	ret
 
-INCLUDE "data/tms.asm"
+INCLUDE "data/moves/tmhm_moves.asm"
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 84a92994..285dbfa5 100755
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -103,7 +103,7 @@ DisplayTownMap:
 	ld [wWhichTownMapLocation], a
 	jp .townMapLoop
 
-INCLUDE "data/town_map_order.asm"
+INCLUDE "data/maps/town_map_order.asm"
 
 TownMapCursor:
 	INCBIN "gfx/town_map/town_map_cursor.1bpp"
@@ -581,9 +581,9 @@ LoadTownMapEntry:
 	ld l, a
 	ret
 
-INCLUDE "data/town_map_entries.asm"
+INCLUDE "data/maps/town_map_entries.asm"
 
-INCLUDE "text/map_names.asm"
+INCLUDE "data/maps/names.asm"
 
 MonNestIcon:
 	INCBIN "gfx/town_map/mon_nest_icon.1bpp"
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 2b86d6f4..6e78c5c3 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -365,7 +365,7 @@ PrintAlphabet:
 	ld [H_AUTOBGTRANSFERENABLED], a
 	jp Delay3
 
-INCLUDE "text/alphabets.asm"
+INCLUDE "data/text/alphabets.asm"
 
 PrintNicknameAndUnderscores:
 	call CalcStringLength
@@ -435,7 +435,7 @@ DakutensAndHandakutens:
 	ld [wNamingScreenLetter], a
 	ret
 
-INCLUDE "text/dakutens.asm"
+INCLUDE "data/text/dakutens.asm"
 
 ; calculates the length of the string at wcf4b and stores it in c
 CalcStringLength:
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 8e1fd480..25c9ad89 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -623,7 +623,7 @@ DrawTileLine:
 	pop bc
 	ret
 
-INCLUDE "data/pokedex_entries.asm"
+INCLUDE "data/pokemon/dex_entries.asm"
 
 PokedexToIndex:
 	; converts the Pokédex number at wd11e to an index
@@ -662,4 +662,4 @@ IndexToPokedex:
 	pop bc
 	ret
 
-INCLUDE "data/pokedex_order.asm"
+INCLUDE "data/pokemon/dex_order.asm"
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index b81769a2..d9501da7 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -446,9 +446,9 @@ CannotGetOffHereText:
 	TX_FAR _CannotGetOffHereText
 	db "@"
 
-INCLUDE "data/party_items.asm"
+INCLUDE "data/items/use_party.asm"
 
-INCLUDE "data/overworld_items.asm"
+INCLUDE "data/items/use_overworld.asm"
 
 StartMenu_TrainerInfo::
 	call GBPalWhiteOut
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index f820aae3..f6900602 100755
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -104,7 +104,7 @@ DisplayCreditsMon:
 	ld [rBGP], a
 	ret
 
-INCLUDE "data/credit_mons.asm"
+INCLUDE "data/credits/credits_mons.asm"
 
 ScrollCreditsMonLeft:
 	ld h, b
@@ -261,9 +261,9 @@ TheEndTextString:
 	db $60," ",$62," ",$64,"  ",$64," ",$66," ",$68,"@"
 	db $61," ",$63," ",$65,"  ",$65," ",$67," ",$69,"@"
 
-INCLUDE "data/credits_order.asm"
+INCLUDE "data/credits/credits_order.asm"
 
-INCLUDE "text/credits_text.asm"
+INCLUDE "data/credits/credits_text.asm"
 
 TheEndGfx:
 	INCBIN "gfx/intro_credits/the_end.2bpp"
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index fdc9ffa3..d7112440 100755
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -187,7 +187,7 @@ DisplayIntroNameTextBox:
 .namestring
 	db "NAME@"
 
-INCLUDE "text/player_names.asm"
+INCLUDE "data/player_names.asm"
 
 GetDefaultName:
 ; a = name index
@@ -213,7 +213,7 @@ GetDefaultName:
 	ld bc, $14
 	jp CopyData
 
-INCLUDE "text/player_names_list.asm"
+INCLUDE "data/player_names_list.asm"
 
 TextTerminator_6b20:
 	db "@"
diff --git a/engine/movie/titlescreen.asm b/engine/movie/title.asm
index c30f83a9..4bdbb05d 100755
--- a/engine/movie/titlescreen.asm
+++ b/engine/movie/title.asm
@@ -382,7 +382,7 @@ CopyrightTextString:
 	next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc.
 	db   "@"
 
-INCLUDE "data/title_mons.asm"
+INCLUDE "data/pokemon/title_mons.asm"
 
 ; prints version text (red, blue)
 PrintGameVersionOnTitleScreen:
diff --git a/engine/movie/titlescreen2.asm b/engine/movie/title2.asm
index 2346fcc5..2346fcc5 100755
--- a/engine/movie/titlescreen2.asm
+++ b/engine/movie/title2.asm
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index f61ca65f..c75fbbb6 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -248,4 +248,4 @@ ReplaceTreeTileBlock:
 	ld [hl], a
 	ret
 
-INCLUDE "data/cut_tree_blocks.asm"
+INCLUDE "data/tilesets/cut_tree_blocks.asm"
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 1339430a..ed893773 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -25,4 +25,4 @@ IsPlayerStandingOnDoorTile:
 	and a
 	ret
 
-INCLUDE "data/door_tile_ids.asm"
+INCLUDE "data/tilesets/door_tile_ids.asm"
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm
index c93f2e1b..5887660e 100755
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -130,4 +130,4 @@ CheckIfCoordsInFrontOfPlayerMatch:
 	ld [hCoordsInFrontOfPlayerMatch], a
 	ret
 
-INCLUDE "data/hidden_objects.asm"
+INCLUDE "data/events/hidden_objects.asm"
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 290c8c80..c56914f6 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -54,7 +54,7 @@ HandleLedges::
 	call PlaySound
 	ret
 
-INCLUDE "data/ledge_tiles.asm"
+INCLUDE "data/tilesets/ledge_tiles.asm"
 
 LoadHoppingShadowOAM:
 	ld hl, vChars1 + $7f0
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index 19e25435..2079bb6a 100755
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -437,4 +437,4 @@ GetSplitMapSpriteSetID:
 	ld a, $01
 	ret
 
-INCLUDE "data/sprite_sets.asm"
+INCLUDE "data/maps/sprite_sets.asm"
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 0ac4f3b2..a3f6e051 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -373,7 +373,7 @@ IsPlayerStandingOnWarpPadOrHole::
 	ld [wStandingOnWarpPadOrHole], a
 	ret
 
-INCLUDE "data/warp_pad_hole_tile_ids.asm"
+INCLUDE "data/tilesets/warp_pad_hole_tile_ids.asm"
 
 FishingAnim:
 	ld c, 10
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index 23da664c..69b9201f 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -82,7 +82,7 @@ CheckForceBikeOrSurf::
 	ld [wWalkBikeSurfStateCopy], a
 	jp ForceBikeOrSurf
 
-INCLUDE "data/force_bike_surf.asm"
+INCLUDE "data/maps/force_bike_surf.asm"
 
 IsPlayerFacingEdgeOfMap::
 	push hl
@@ -176,7 +176,7 @@ IsWarpTileInFrontOfPlayer::
 	pop hl
 	ret
 
-INCLUDE "data/warp_carpet_tile_ids.asm"
+INCLUDE "data/tilesets/warp_carpet_tile_ids.asm"
 
 IsSSAnneBowWarpTileInFrontOfPlayer:
 	ld a, [wTileInFrontOfPlayer]
@@ -215,7 +215,7 @@ IsPlayerStandingOnDoorTileOrWarpTile::
 	pop hl
 	ret
 
-INCLUDE "data/warp_tile_ids.asm"
+INCLUDE "data/tilesets/warp_tile_ids.asm"
 
 PrintSafariZoneSteps::
 	ld a, [wCurMap]
diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm
index eee85402..042146f9 100644
--- a/engine/overworld/special_warps.asm
+++ b/engine/overworld/special_warps.asm
@@ -146,4 +146,4 @@ LoadSpecialWarpData:
 	ld [wDestinationWarpID], a
 	ret
 
-INCLUDE "data/special_warps.asm"
+INCLUDE "data/maps/special_warps.asm"
diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm
index 6e33974f..d6b8221c 100644
--- a/engine/overworld/tilesets.asm
+++ b/engine/overworld/tilesets.asm
@@ -55,6 +55,6 @@ LoadTilesetHeader:
 .done
 	ret
 
-INCLUDE "data/dungeon_tilesets.asm"
+INCLUDE "data/tilesets/dungeon_tilesets.asm"
 
-INCLUDE "data/tileset_headers.asm"
+INCLUDE "data/tilesets/tileset_headers.asm"
diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm
index df4d3121..24dc7681 100644
--- a/engine/overworld/wild_mons.asm
+++ b/engine/overworld/wild_mons.asm
@@ -30,4 +30,4 @@ LoadWildData::
 	ld bc, $0014
 	jp CopyData
 
-INCLUDE "data/wild_mons.asm"
+INCLUDE "data/wild/grass_water.asm"
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index e5855f1d..7d599404 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -376,7 +376,7 @@ KnowsHMMove::
 	and a
 	ret
 
-INCLUDE "data/hm_moves.asm"
+INCLUDE "data/moves/hm_moves.asm"
 
 DisplayDepositWithdrawMenu:
 	coord hl, 9, 10
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index f50f8081..d25b71ec 100755
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -510,4 +510,4 @@ WriteMonMoves_ShiftMoveData:
 Evolution_FlagAction:
 	predef_jump FlagActionPredef
 
-INCLUDE "data/evos_moves.asm"
+INCLUDE "data/pokemon/evos_moves.asm"
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index 0a92c69b..16696713 100755
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -881,7 +881,7 @@ SlotMachineMap:
 	INCBIN "gfx/slots/slots.tilemap"
 SlotMachineMapEnd:
 
-INCLUDE "data/slot_machine_wheels.asm"
+INCLUDE "data/events/slot_machine_wheels.asm"
 
 SlotMachineTiles1:
 IF DEF(_RED)