maps.o and stats/pokedex/entries.o

1 files changed, 42 insertions, 29 deletions

diff --git a/contents.asm b/contents.asm
index 298ef936c..6b85c75df 100644
--- a/contents.asm
+++ b/contents.asm
@@ -3,43 +3,56 @@
 
 ; stats/egg_moves.o
 
-EGG_MOVES      EQU $8
+EGG_MOVES                 EQU $8
+
+
+; stats/evos_attacks.o
+
+EVOS_ATTACKS              EQU $10
+
+
+; stats/pokedex/entries.o
+
+POKEDEX_ENTRIES_1         EQU $60
+POKEDEX_ENTRIES_2         EQU $6E
+POKEDEX_ENTRIES_3         EQU $73
+POKEDEX_ENTRIES_4         EQU $74
 
 
 ; engine/events.o
 ; engine/scripting.o
 ; engine/events_2.o
 
-EVENTS         EQU $25
+EVENTS                    EQU $25
 
 
 ; maps.o
 
-MAP_HEADERS    EQU $25
-
-MAP_SCRIPTS_1  EQU $15
-MAP_SCRIPTS_2  EQU $16
-MAP_SCRIPTS_3  EQU $17
-MAP_SCRIPTS_4  EQU $18
-MAP_SCRIPTS_5  EQU $1A
-MAP_SCRIPTS_6  EQU $1B
-MAP_SCRIPTS_7  EQU $1C
-MAP_SCRIPTS_8  EQU $1D
-MAP_SCRIPTS_9  EQU $1E
-MAP_SCRIPTS_10 EQU $1F
-MAP_SCRIPTS_11 EQU $26
-MAP_SCRIPTS_12 EQU $27
-MAP_SCRIPTS_13 EQU $60
-MAP_SCRIPTS_14 EQU $61
-MAP_SCRIPTS_15 EQU $62
-MAP_SCRIPTS_16 EQU $63
-MAP_SCRIPTS_17 EQU $64
-MAP_SCRIPTS_18 EQU $65
-MAP_SCRIPTS_19 EQU $66
-MAP_SCRIPTS_20 EQU $67
-MAP_SCRIPTS_21 EQU $68
-MAP_SCRIPTS_22 EQU $69
-MAP_SCRIPTS_23 EQU $6A
-MAP_SCRIPTS_24 EQU $6B
-MAP_SCRIPTS_25 EQU $6C
+MAP_HEADERS               EQU $25
+
+MAP_SCRIPTS_1             EQU $15
+MAP_SCRIPTS_2             EQU $16
+MAP_SCRIPTS_3             EQU $17
+MAP_SCRIPTS_4             EQU $18
+MAP_SCRIPTS_5             EQU $1A
+MAP_SCRIPTS_6             EQU $1B
+MAP_SCRIPTS_7             EQU $1C
+MAP_SCRIPTS_8             EQU $1D
+MAP_SCRIPTS_9             EQU $1E
+MAP_SCRIPTS_10            EQU $1F
+MAP_SCRIPTS_11            EQU $26
+MAP_SCRIPTS_12            EQU $27
+MAP_SCRIPTS_13            EQU $60
+MAP_SCRIPTS_14            EQU $61
+MAP_SCRIPTS_15            EQU $62
+MAP_SCRIPTS_16            EQU $63
+MAP_SCRIPTS_17            EQU $64
+MAP_SCRIPTS_18            EQU $65
+MAP_SCRIPTS_19            EQU $66
+MAP_SCRIPTS_20            EQU $67
+MAP_SCRIPTS_21            EQU $68
+MAP_SCRIPTS_22            EQU $69
+MAP_SCRIPTS_23            EQU $6A
+MAP_SCRIPTS_24            EQU $6B
+MAP_SCRIPTS_25            EQU $6C