18 files changed, 12 insertions, 15 deletions
diff --git a/engine/routines/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm
index 2952e833b..2952e833b 100644
--- a/engine/routines/battlestart_copytilemapatonce.asm
+++ b/engine/battle/battlestart_copytilemapatonce.asm
diff --git a/engine/routines/checkbattlescene.asm b/engine/battle/checkbattlescene.asm
index b63f00907..b63f00907 100644
--- a/engine/routines/checkbattlescene.asm
+++ b/engine/battle/checkbattlescene.asm
diff --git a/engine/routines/consumehelditem.asm b/engine/battle/consumehelditem.asm
index a6f7766fb..a6f7766fb 100644
--- a/engine/routines/consumehelditem.asm
+++ b/engine/battle/consumehelditem.asm
diff --git a/engine/routines/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm
index e6e33f900..e6e33f900 100644
--- a/engine/routines/returntobattle_useball.asm
+++ b/engine/battle/returntobattle_useball.asm
diff --git a/engine/routines/updatebattlehuds.asm b/engine/battle/updatebattlehuds.asm
index ec7f662e8..ec7f662e8 100644
--- a/engine/routines/updatebattlehuds.asm
+++ b/engine/battle/updatebattlehuds.asm
diff --git a/engine/anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 1977f9112..875849ce3 100644
--- a/engine/anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -351,7 +351,7 @@ RunBattleAnimCommand: ; cc25f
 
 
 BattleAnimCommands:: ; cc2a4 (33:42a4)
-; entries correspond to macros/move_anim.asm enumeration
+; entries correspond to macros/scripts/battle_anims.asm enumeration
 	dw BattleAnimCmd_Obj
 	dw BattleAnimCmd_1GFX
 	dw BattleAnimCmd_2GFX
diff --git a/engine/anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index ab4a8036b..ab4a8036b 100644
--- a/engine/anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
diff --git a/engine/anims/engine.asm b/engine/battle_anims/engine.asm
index ae3bdde28..ae3bdde28 100755
--- a/engine/anims/engine.asm
+++ b/engine/battle_anims/engine.asm
diff --git a/engine/anims/functions.asm b/engine/battle_anims/functions.asm
index e5b2b16c4..ea9fb70b3 100755
--- a/engine/anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -451,7 +451,7 @@ GetBallAnimPal: ; cd249 (33:5249)
 	ret
 ; cd26c (33:526c)
 
-INCLUDE "data/anims/ball_colors.asm"
+INCLUDE "data/battle_anims/ball_colors.asm"
 
 BattleAnimFunction_10: ; cd284 (33:5284)
 	call BattleAnim_AnonJumptable
diff --git a/engine/routines/getpokeballwobble.asm b/engine/battle_anims/getpokeballwobble.asm
index 7fb4d3e38..7fb4d3e38 100755
--- a/engine/routines/getpokeballwobble.asm
+++ b/engine/battle_anims/getpokeballwobble.asm
diff --git a/engine/anims/helpers.asm b/engine/battle_anims/helpers.asm
index a692211d3..a692211d3 100755
--- a/engine/anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
diff --git a/engine/color.asm b/engine/color.asm
index 53c727eef..f4a420f1c 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1218,8 +1218,9 @@ INCLUDE "data/palettes/hp_bar.pal"
 ExpBarPalette:
 INCLUDE "data/palettes/exp_bar.pal"
 
-INCLUDE "gfx/pokemon/palette_pointers.asm"
-INCLUDE "gfx/trainer_palettes.asm"
+INCLUDE "data/palettes/pokemon_palettes.asm"
+
+INCLUDE "data/palettes/trainer_palettes.asm"
 
 LoadMapPals:
 	farcall LoadSpecialMapPalette
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm
index 965d9f0ef..2ebeb67fa 100755
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -468,6 +468,6 @@ ReadMonMenuIcon: ; 8eab3
 
 INCLUDE "data/pokemon/menu_icons.asm"
 
-INCLUDE "gfx/icon_pointers.asm"
+INCLUDE "data/icon_pointers.asm"
 
 INCLUDE "gfx/icons.asm"
diff --git a/engine/movement.asm b/engine/movement.asm
index 66c501909..bec089978 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -1,5 +1,5 @@
 MovementPointers: ; 5075
-; entries correspond to macros/movement.asm enumeration
+; entries correspond to macros/scripts/movement.asm enumeration
 	dw Movement_turn_head_down        ; 00
 	dw Movement_turn_head_up          ; 01
 	dw Movement_turn_head_left        ; 02
diff --git a/engine/routines/kurt_selectquantity_interpretjoypad.asm b/engine/routines/kurt_selectquantity_interpretjoypad.asm
deleted file mode 100644
index 12a43e325..000000000
--- a/engine/routines/kurt_selectquantity_interpretjoypad.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-Kurt_SelectQuantity_InterpretJoypad: ; 27a28
-	call BuySellToss_InterpretJoypad
-	ld b, a
-	ret
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 9818bbac3..826267f6b 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -64,7 +64,7 @@ RunScriptCommand:
 
 
 ScriptCommandTable:
-; entries correspond to macros/event.asm enumeration
+; entries correspond to macros/scripts/events.asm enumeration
 	dw Script_scall                      ; 00
 	dw Script_farscall                   ; 01
 	dw Script_ptcall                     ; 02
diff --git a/engine/sprites.asm b/engine/sprites.asm
index cc579a914..b52c9642b 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -551,13 +551,13 @@ BrokenGetStdGraphics: ; 8d1ac
 ; 8d1c4
 
 
-INCLUDE "data/sprites/sequences.asm"
+INCLUDE "data/sprite_anims/sequences.asm"
 
 INCLUDE "engine/sprite_anims.asm"
 
-INCLUDE "data/sprites/framesets.asm"
+INCLUDE "data/sprite_anims/framesets.asm"
 
-INCLUDE "data/sprites/oam.asm"
+INCLUDE "data/sprite_anims/oam.asm"
 
 
 BrokenStdGFXPointers: ; Broken 2bpp pointers
diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm
index fa631ae4e..1305fab5b 100755
--- a/engine/trade_animation.asm
+++ b/engine/trade_animation.asm
@@ -236,7 +236,7 @@ DoTradeAnimation: ; 29082
 ; 290af
 
 .JumpTable: ; 290af
-; entries correspond to macros/trade_anim.asm enumeration
+; entries correspond to macros/scripts/trade_anims.asm enumeration
 	dw TradeAnim_AdvanceScriptPointer ; 00
 	dw TradeAnim_ShowGivemonData      ; 01
 	dw TradeAnim_ShowGetmonData       ; 02