Revert "Factor out tables into data/overworld/"

This reverts commit b5a7e7d.
vulcandth · Jul 23, 2020 · 11dc805 · 11dc805
1 parent b5a7e7d
commit 11dc805
Show file tree

Hide file tree

Showing 21 changed files with 441 additions and 300 deletions.
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
@@ -1,11 +1,11 @@
-; collision permissions (see data/overworld/collision_permissions.asm)
+; collision permissions (see data/collision_permissions.asm)
 LAND_TILE  EQU $00
 WATER_TILE EQU $01
 WALL_TILE  EQU $0f
 TALK       EQU $10
 
 ; collision data types (see data/tilesets/*_collision.asm)
-; TileCollisionTable indexes (see data/overworld/collision_permissions.asm)
+; TileCollisionTable indexes (see data/collision_permissions.asm)
 COLL_FLOOR             EQU $00
 COLL_01                EQU $01 ; garbage
 COLL_03                EQU $03 ; garbage

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
@@ -1,4 +1,4 @@
-; EngineFlags indexes (see data/events/engine_flags.asm)
+; EngineFlags indexes (see data/engine_flags.asm)
 	const_def
 ; wPokegearFlags
 	const ENGINE_RADIO_CARD

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
@@ -41,7 +41,7 @@ NUM_STRING_BUFFERS EQU const_value
 	const TRAINERTEXT_LOSS
 
 ; readvar/writevar/loadvar arguments
-; VarActionTable indexes (see data/overworld/variables.asm)
+; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
 	const_def
 	const VAR_STRINGBUFFER2    ; 00
 	const VAR_PARTYCOUNT       ; 01

diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
@@ -1,4 +1,4 @@
-; Tilesets indexes (see data/overworld/tilesets.asm)
+; Tilesets indexes (see data/tilesets.asm)
 	const_def 1
 	const TILESET_JOHTO                ; 01
 	const TILESET_JOHTO_MODERN         ; 02

diff --git a/data/overworld/collision_permissions.asm → data/collision_permissions.asm b/data/overworld/collision_permissions.asm → data/collision_permissions.asm
diff --git a/data/events/engine_flags.asm → data/engine_flags.asm b/data/events/engine_flags.asm → data/engine_flags.asm
diff --git a/data/events/std_scripts.asm b/data/events/std_scripts.asm
diff --git a/data/overworld/scripting.asm b/data/overworld/scripting.asm
diff --git a/data/overworld/variables.asm b/data/overworld/variables.asm
diff --git a/data/events/special_pointers.asm → data/special_pointers.asm b/data/events/special_pointers.asm → data/special_pointers.asm
diff --git a/data/overworld/tilesets.asm → data/tilesets.asm b/data/overworld/tilesets.asm → data/tilesets.asm
diff --git a/docs/event_commands.md b/docs/event_commands.md
@@ -1,6 +1,6 @@
 # Event Commands
 
-Defined in [macros/scripts/events.asm](https://github.com/pret/pokecrystal/blob/master/macros/scripts/events.asm) and [data/overworld/scripting.asm:ScriptCommandTable](https://github.com/pret/pokecrystal/blob/master/data/overworld/scripting.asm).
+Defined in [macros/scripts/events.asm](https://github.com/pret/pokecrystal/blob/master/macros/scripts/events.asm) and [engine/overworld/scripting.asm:ScriptCommandTable](https://github.com/pret/pokecrystal/blob/master/engine/overworld/scripting.asm).
 
 Until this document is filled out, the [G/S Scripting Compendium](https://hax.iimarckus.org/files/scriptingcodes_eng.htm) has descriptions for most of these commands. It was written for G/S binary hacking and not Crystal assembly hacking, so it's not 100% accurate for pokecrystal.
 

diff --git a/docs/index.md b/docs/index.md
@@ -13,6 +13,7 @@ These pages are for documenting pieces of the [pokecrystal](https://github.com/p
 - [event_commands.md](event_commands.md)
 - [movement_commands.md](movement_commands.md)
 - [text_commands.md](text_commands.md)
+- [map_setup_scripts.md](map_setup_scripts.md)
 
 
 ## Other types of scripts