Label weather

Missingmew · May 17, 2019 · cfc43d1 · cfc43d1
1 parent 468d5a0
commit cfc43d1
Show file tree

Hide file tree

Showing 433 changed files with 894 additions and 891 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This is a disassembly of Pokémon FireRed and LeafGreen.
 
 It builds the following ROM:
 
-* **pokefirered.gba** `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
+* [**pokefirered.gba**](https://datomatic.no-intro.org/?page=show_record&s=23&n=1616) `sha1: 41cb23d8dccc8ebd7c649cd8fbb58eeace6e2fdc`
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
@@ -22,8 +22,8 @@ Other disassembly and/or decompilation projects:
 * [**Pokémon Crystal**](https://github.com/pret/pokecrystal)
 * [**Pokémon Ruby and Sapphire**](https://github.com/pret/pokeruby)
 * [**Pokémon Pinball: Ruby & Sapphire**](https://github.com/pret/pokepinballrs)
-* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
 * [**Pokémon Emerald**](https://github.com/pret/pokeemerald)
+* [**Pokémon Mystery Dungeon: Red Rescue Team**](https://github.com/pret/pmd-red)
 
 
 ## Contacts

diff --git a/berry_fix/payload/include/constants/vars.h b/berry_fix/payload/include/constants/vars.h
@@ -159,18 +159,18 @@
 #define VAR_MT_PYRE_STATE                 0x40B9
 #define VAR_NEW_MAUVILLE_STATE            0x40BA
 
-#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON 0x40BC
-#define VAR_JAGGED_PASS_ASH_WEATHER       0x40BD
-#define VAR_GLASS_WORKSHOP_STATE          0x40BE
-#define VAR_METEOR_FALLS_STATE            0x40BF
-#define VAR_GAME_CORNER_STATE             0x40C0
-#define VAR_TRICK_HOUSE_PRIZE_PICKUP      0x40C1
-#define VAR_PACIFIDLOG_TM_RECEIVED_DAY    0x40C2
-#define VAR_VICTORY_ROAD_1F_STATE         0x40C3
-#define VAR_FOSSIL_RESURRECTION_STATE     0x40C4
-#define VAR_WHICH_FOSSIL_REVIVED          0x40C5
-#define VAR_STEVENS_HOUSE_STATE           0x40C6
-#define VAR_OLDALE_STATE                  0x40C7
+#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON    0x40BC
+#define VAR_JAGGED_PASS_VOLCANIC_ASH_WEATHER 0x40BD
+#define VAR_GLASS_WORKSHOP_STATE             0x40BE
+#define VAR_METEOR_FALLS_STATE               0x40BF
+#define VAR_GAME_CORNER_STATE                0x40C0
+#define VAR_TRICK_HOUSE_PRIZE_PICKUP         0x40C1
+#define VAR_PACIFIDLOG_TM_RECEIVED_DAY       0x40C2
+#define VAR_VICTORY_ROAD_1F_STATE            0x40C3
+#define VAR_FOSSIL_RESURRECTION_STATE        0x40C4
+#define VAR_WHICH_FOSSIL_REVIVED             0x40C5
+#define VAR_STEVENS_HOUSE_STATE              0x40C6
+#define VAR_OLDALE_STATE                     0x40C7
 
 // special vars
 // They are commonly used as parameters to commands, or return values from commands.

diff --git a/constants/battle.inc b/constants/battle.inc
@@ -40,10 +40,10 @@
 .equiv TARGET, 0
 .equiv USER, 1
 
-.equiv WEATHER_SUN, 0
-.equiv WEATHER_RAIN, 1
-.equiv WEATHER_SANDSTORM, 2
-.equiv WEATHER_HAIL, 3
+.equiv BATTLE_WEATHER_SUNNY, 0
+.equiv BATTLE_WEATHER_RAIN, 1
+.equiv BATTLE_WEATHER_SANDSTORM, 2
+.equiv BATTLE_WEATHER_HAIL, 3
 
 	enum_start 1
 	enum ATTACK

diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
@@ -5,7 +5,7 @@
   "music": "0xFFFF",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 0,
   "unknown_19": 6,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
@@ -5,7 +5,7 @@
   "music": "0xFFFF",
   "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -51,4 +51,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_2",
+  "weather": "WEATHER_SUNNY",
   "map_type": "MAP_TYPE_1",
   "unknown_18": 1,
   "unknown_19": 6,
@@ -381,4 +381,4 @@
       "unknown": 1
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -127,4 +127,4 @@
       "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -87,4 +87,4 @@
       "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -155,4 +155,4 @@
       "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -53,4 +53,4 @@
       "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -87,4 +87,4 @@
       "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -102,4 +102,4 @@
       "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -99,4 +99,4 @@
       "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -182,4 +182,4 @@
       "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -86,4 +86,4 @@
       "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -99,4 +99,4 @@
       "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -46,4 +46,4 @@
       "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_POKEMON_CENTER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 4,
@@ -80,4 +80,4 @@
       "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GAMECORNER",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -466,4 +466,4 @@
       "script": "CeladonCity_GameCorner_EventScript_1B2867"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -104,4 +104,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_GYM",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -197,4 +197,4 @@
       "script": "CeladonCity_Gym_EventScript_16D1CC"
     }
   ]
-}
+}
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -91,4 +91,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
@@ -5,7 +5,7 @@
   "music": "BGM_FRLG_CELADON_CITY",
   "region_map_section": "MAPSEC_CELADON_CITY",
   "requires_flash": false,
-  "weather": "WEATHER_0",
+  "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 0,
@@ -78,4 +78,4 @@
   ],
   "coord_events": [],
   "bg_events": []
-}
+}