Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

INSTALL.md

@@ -236,13 +236,19 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
 
 >   This guide installs libpng via Homebrew as it is the easiest method, however advanced users can install libpng through other means if they so desire.
 </details>
+<details>
+    <summary><i><strong>Note for Apple Silicon (M1) Mac users...</strong></i></summary>
+
+>   Currently, Homebrew and libng must be installed via Rosetta on Apple Silicon Macs. Before continuing, create a [Terminal shell profile with Rosetta](https://www.astroworldcreations.com/blog/apple-silicon-and-legacy-command-line-software). Be sure to run the commands corresponding to Apple Silicon (M1).
+</details>
 
 1. Open the Terminal.
 2. If Homebrew is not installed, then install [Homebrew](https://brew.sh/) by following the instructions on the website.
 3. Run the following command to install libpng.
 
     ```bash
-    brew install libpng
+    brew install libpng # Intel Macs
+    /usr/local/bin/brew install libpng # Apple Silicon (M1) Macs
     ```
    libpng is now installed.
 
@@ -265,11 +271,14 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
 
     ```bash
     export DEVKITPRO=/opt/devkitpro
-    echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc
+    echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc # Intel Macs
+    echo "export DEVKITPRO=$DEVKITPRO" >> ~/.zshrc # Apple Silicon (M1) Macs
     export DEVKITARM=$DEVKITPRO/devkitARM
-    echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
+    echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc # Intel Macs
+    echo "export DEVKITARM=$DEVKITARM" >> ~/.zshrc # Apple Silicon (M1) Macs
 
-    echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
+    echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile # Intel Macs
+    echo "if [ -f ~/.zshrc ]; then . ~/.zshrc; fi" >> ~/.zprofile # Apple Silicon (M1) Macs
     ```
 
 ### Choosing where to store pokefirered (macOS)

asm/macros.inc

@@ -1,7 +1,6 @@
 	.include "asm/macros/asm.inc"
 	.include "asm/macros/function.inc"
 	.include "asm/macros/movement.inc"
-	.include "asm/macros/pokemon_data.inc"
 	.include "asm/macros/ec.inc"
 	.include "asm/macros/map.inc"
 	.include "asm/macros/m4a.inc"

asm/macros/event.inc

@@ -1576,15 +1576,15 @@
 	.4byte \value
 	.endm
 
-	@ Sets the eventLegal bit for the Pokemon in the specified slot of the player's party.
+	@ Sets the modernFatefulEncounter bit for the Pokemon in the specified slot of the player's party.
-	.macro setmoneventlegal slot:req
+	.macro setmonmodernfatefulencounter slot:req
 	.byte 0xcd
 	.2byte \slot
 	.endm
 
-	@ Checks if the eventLegal bit is set for the Pokemon in the specified slot of the player's party. If it isn't set,
+	@ Checks if the modernFatefulEncounter bit is set for the Pokemon in the specified slot of the player's party. If it isn't set,
 	@ VAR_RESULT is TRUE. If the bit is set (or if the specified slot is empty or invalid), VAR_RESULT is FALSE.
-	.macro checkmoneventlegal slot:req
+	.macro checkmonmodernfatefulencounter slot:req
 	.byte 0xce
 	.2byte \slot
 	.endm
@@ -1849,10 +1849,10 @@
 	call EventScript_BrailleCursorWaitButton
 	.endm
 
-	@ Creates an "event legal" Pokémon for an encounter
+	@ Creates a Pokémon with the modernFatefulEncounter bit set for an encounter
 	.macro seteventmon species:req, level:req, item=ITEM_NONE
 	setvar VAR_0x8004, \species
 	setvar VAR_0x8005, \level
 	setvar VAR_0x8006, \item
-	special CreateEventLegalEnemyMon
+	special CreateEnemyEventMon
 	.endm

asm/macros/map.inc

@@ -75,6 +75,12 @@
 	inc _num_traps
 	.endm
 
+	@ Defines a weather coord event for map data. Any coord event is treated as a weather coord event if its script is NULL.
+	@ NOTE: In FRLG, the weather handling functions are dummied out. See src/coord_event_weather.c
+	.macro coord_weather_event x:req, y:req, elevation:req, weather:req
+	coord_event \x, \y, \elevation, \weather, 0, NULL
+	.endm
+
 	@ Defines a generic background event for map data. Mirrors the struct layout of BgEvent in include/global.fieldmap.h
 	@ 'kind' is any BG_EVENT_* constant (see include/constants/event_bg.h).
 	@ 'arg6' is used differently depending on the bg event type. 'arg7' and 'arg8' are only used by bg_hidden_item_event.

asm/macros/pokemon_data.inc

@@ -1,57 +0,0 @@
-	.macro pokedex_entry pokemon_name, height, weight, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset
-	.2byte \height @ in decimeters
-	.2byte \weight @ in hectograms
-	.4byte DexDescription_\pokemon_name\()_1
-	.4byte DexDescription_\pokemon_name\()_2
-	.2byte 0 @ unused
-	.2byte \pokemon_scale
-	.2byte \pokemon_offset
-	.2byte \trainer_scale
-	.2byte \trainer_offset
-	.2byte 0 @ padding
-	.endm
-
-	.macro base_stats hp, attack, defense, speed, sp_attack, sp_defense
-	.byte \hp
-	.byte \attack
-	.byte \defense
-	.byte \speed
-	.byte \sp_attack
-	.byte \sp_defense
-	.endm
-
-	.macro ev_yield hp, attack, defense, speed, sp_attack, sp_defense
-	.2byte (\sp_defense << 10) | (\sp_attack << 8) | (\speed << 6) | (\defense << 4) | (\attack << 2) | \hp
-	.endm
-
-	.macro level_up_move level, move
-	.2byte (\level << 9) | \move
-	.endm
-
-	.macro evo_entry method, parameter, target_species
-	.2byte \method
-	.2byte \parameter
-	.2byte \target_species
-	.2byte 0 @ padding
-	.endm
-
-	.macro empty_evo_entries count
-	.fill 8 * \count, 1, 0
-	.endm
-
-	.macro egg_moves_begin species
-	.2byte 20000 + \species
-	.endm
-
-@ If the min level equals the max level, only one level argument is needed.
-	.macro wild_mon species, min_level, max_level
-	.byte \min_level
-
-	.ifb \max_level
-	.byte \min_level
-	.else
-	.byte \max_level
-	.endif
-
-	.2byte SPECIES_\species
-	.endm

data/mystery_event_msg.s

@@ -7,6 +7,7 @@
 #include "constants/species.h"
 #include "constants/vars.h"
 #include "constants/items.h"
+#include "constants/region_map_sections.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
@@ -67,8 +68,8 @@ SurfPichu_FullParty:
 
 SurfPichu_GiveEgg:
 	giveegg SPECIES_PICHU
-	setmoneventlegal VAR_EVENT_PICHU_SLOT
+	setmonmodernfatefulencounter VAR_EVENT_PICHU_SLOT
-	setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff
+	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
 	vgoto_if_eq VAR_EVENT_PICHU_SLOT, 1, SurfPichu_Slot1
 	vgoto_if_eq VAR_EVENT_PICHU_SLOT, 2, SurfPichu_Slot2
 	vgoto_if_eq VAR_EVENT_PICHU_SLOT, 3, SurfPichu_Slot3

data/script_cmd_table.inc

@@ -206,8 +206,8 @@ gScriptCmdTable::
 	.4byte ScrCmd_signmsg                        @ 0xca
 	.4byte ScrCmd_normalmsg                      @ 0xcb
 	.4byte ScrCmd_comparestat                    @ 0xcc
-	.4byte ScrCmd_setmoneventlegal          @ 0xcd
+	.4byte ScrCmd_setmonmodernfatefulencounter   @ 0xcd
-	.4byte ScrCmd_checkmoneventlegal        @ 0xce
+	.4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce
 	.4byte ScrCmd_trywondercardscript            @ 0xcf
 	.4byte ScrCmd_setworldmapflag                @ 0xd0
 	.4byte ScrCmd_warpspinenter                  @ 0xd1

data/specials.inc

@@ -451,5 +451,5 @@ gSpecials::
 	def_special InitElevatorFloorSelectMenuPos
 	def_special UpdateLoreleiDollCollection
 	def_special LoopWingFlapSound
-	def_special CreateEventLegalEnemyMon
+	def_special CreateEnemyEventMon
 gSpecialsEnd::

graphics/battle_anims/sprites/black_ball.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 205 98
+156 205 98
+156 205 98
+131 205 131
+156 205 0
+24 0 106
+156 8 98
+0 213 131
+24 197 0
+164 8 106
+156 8 98
+164 8 106
+156 205 131
+24 213 98
+156 8 106
+164 205 98

graphics/battle_anims/unused/line_sketch_2.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 255
+0 255 255
+148 255 255
+148 205 255
+148 156 255
+0 0 0
+0 0 0
+0 0 0
+255 0 8
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255

graphics/berry_fix/gba_small.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0

graphics/berry_fix/gba_transfer.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0

graphics/berry_fix/gba_transfer_error.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0

graphics/berry_fix/gba_transfer_highlight.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0

graphics/berry_fix/logo.pal

@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0
-0 0 0
-255 255 255
-238 238 238
-222 222 230
-205 205 222
-197 197 205
-180 180 197
-164 164 189
-156 156 172
-139 139 164
-123 123 156
-115 115 139
-98 98 131
-82 82 123
-74 74 115
-32 32 32

graphics/berry_fix/window.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-0 0 0
-255 255 255
-32 32 32
-172 172 172
-230 8 8
-255 189 115
-32 156 8
-148 246 148
-49 82 205
-164 197 246
-164 213 90
-238 230 197
-148 197 213
-32 57 98
-106 148 197
-90 106 156
-255 255 255
-164 213 90
-32 32 32
-123 123 205
-255 255 255
-74 74 115
-197 197 197
-98 98 189
-106 106 197
-98 123 57
-131 131 131
-222 41 0
-189 123 41
-180 180 222
-0 0 0
-0 0 0

graphics/credits/unk_8410E10.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-57 57 123
-172 123 65
-255 197 148
-222 148 115
-123 65 65
-82 106 156
-57 57 123
-115 164 197
-123 123 131
-238 238 255
-180 180 213
-255 106 74
-197 57 57
-255 222 90
-213 180 74
-0 0 0

graphics/credits/unk_8411BF8.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-57 57 123
-172 123 65
-255 197 148
-222 148 115
-123 65 65
-82 106 156
-57 57 123
-115 164 197
-123 123 131
-238 238 255
-180 180 213
-255 106 74
-197 57 57
-255 222 90
-213 180 74
-0 0 0

graphics/credits/unk_84129A0.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-49 49 49
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-222 164 74
-197 123 8
-49 65 82
-205 139 255
-115 82 131
-156 106 172
-106 123 131
-197 205 180
-238 74 24
-255 255 255
-0 0 0