Merge pull request #241 from GriffinRichards/doc-viridian

Document Viridian City scripts and adjacent routes

include/constants/battle.h

@@ -81,6 +81,9 @@
 #define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
 #define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
 
+#define RIVAL_BATTLE_HEAL_AFTER  1
+#define RIVAL_BATTLE_TUTORIAL    3
+
 // Battle Outcome defines
 #define B_OUTCOME_WON                  0x1
 #define B_OUTCOME_LOST                 0x2

include/constants/battle_setup.h

@@ -10,6 +10,6 @@
 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE           6
 #define TRAINER_BATTLE_REMATCH_DOUBLE                   7
 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC  8
-#define TRAINER_BATTLE_TUTORIAL                         9
+#define TRAINER_BATTLE_EARLY_RIVAL                      9
 
 #endif // GUARD_CONSTANTS_BATTLE_SETUP_H

include/constants/metatile_labels.h

@@ -4,6 +4,10 @@
 // General
 #define METATILE_General_CalmWater  0x12B
 
+// PokeMart
+#define METATILE_Shop_CounterMid_Top     0x2BF
+#define METATILE_Shop_CounterMid_Bottom  0x2C0     
+
 // Vermilion Gym
 #define METATILE_VermilionGym_Floor                             0x281
 #define METATILE_VermilionGym_Beam_MidTop                       0x285

include/constants/object_events.h

@@ -35,7 +35,7 @@
 #define OBJECT_EVENT_GFX_WOMAN_3 31
 #define OBJECT_EVENT_GFX_OLD_MAN_1 32
 #define OBJECT_EVENT_GFX_OLD_MAN_2 33
-#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34
+#define OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN 34
 #define OBJECT_EVENT_GFX_OLD_WOMAN 35
 #define OBJECT_EVENT_GFX_TUBER_M_1 36
 #define OBJECT_EVENT_GFX_TUBER_F 37