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.
-	.macro setmoneventlegal slot:req
+	@ Sets the modernFatefulEncounter bit for the Pokemon in the specified slot of the player's party.
+	.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
-	setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff
+	setmonmodernfatefulencounter VAR_EVENT_PICHU_SLOT
+	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

@@ -1,219 +1,219 @@
 	.align 2
 
 gScriptCmdTable::
-	.4byte ScrCmd_nop      	                @ 0x00
-	.4byte ScrCmd_nop1                      @ 0x01
-	.4byte ScrCmd_end      	                @ 0x02
-	.4byte ScrCmd_return                    @ 0x03
-	.4byte ScrCmd_call                      @ 0x04
-	.4byte ScrCmd_goto                      @ 0x05
-	.4byte ScrCmd_goto_if                   @ 0x06
-	.4byte ScrCmd_call_if                   @ 0x07
-	.4byte ScrCmd_gotostd                   @ 0x08
-	.4byte ScrCmd_callstd                   @ 0x09
-	.4byte ScrCmd_gotostd_if                @ 0x0a
-	.4byte ScrCmd_callstd_if                @ 0x0b
-	.4byte ScrCmd_returnram                 @ 0x0c
-	.4byte ScrCmd_endram                    @ 0x0d
-	.4byte ScrCmd_setmysteryeventstatus     @ 0x0e
-	.4byte ScrCmd_loadword                  @ 0x0f
-	.4byte ScrCmd_loadbyte                  @ 0x10
-	.4byte ScrCmd_setptr                    @ 0x11
-	.4byte ScrCmd_loadbytefromptr           @ 0x12
-	.4byte ScrCmd_setptrbyte                @ 0x13
-	.4byte ScrCmd_copylocal                 @ 0x14
-	.4byte ScrCmd_copybyte                  @ 0x15
-	.4byte ScrCmd_setvar                    @ 0x16
-	.4byte ScrCmd_addvar                    @ 0x17
-	.4byte ScrCmd_subvar                    @ 0x18
-	.4byte ScrCmd_copyvar                   @ 0x19
-	.4byte ScrCmd_setorcopyvar              @ 0x1a
-	.4byte ScrCmd_compare_local_to_local    @ 0x1b
-	.4byte ScrCmd_compare_local_to_value    @ 0x1c
-	.4byte ScrCmd_compare_local_to_ptr      @ 0x1d
-	.4byte ScrCmd_compare_ptr_to_local      @ 0x1e
-	.4byte ScrCmd_compare_ptr_to_value      @ 0x1f
-	.4byte ScrCmd_compare_ptr_to_ptr        @ 0x20
-	.4byte ScrCmd_compare_var_to_value      @ 0x21
-	.4byte ScrCmd_compare_var_to_var        @ 0x22
-	.4byte ScrCmd_callnative                @ 0x23
-	.4byte ScrCmd_gotonative                @ 0x24
-	.4byte ScrCmd_special                   @ 0x25
-	.4byte ScrCmd_specialvar                @ 0x26
-	.4byte ScrCmd_waitstate                 @ 0x27
-	.4byte ScrCmd_delay                     @ 0x28
-	.4byte ScrCmd_setflag                   @ 0x29
-	.4byte ScrCmd_clearflag                 @ 0x2a
-	.4byte ScrCmd_checkflag                 @ 0x2b
-	.4byte ScrCmd_initclock                 @ 0x2c
-	.4byte ScrCmd_dotimebasedevents         @ 0x2d
-	.4byte ScrCmd_gettime                   @ 0x2e
-	.4byte ScrCmd_playse                    @ 0x2f
-	.4byte ScrCmd_waitse                    @ 0x30
-	.4byte ScrCmd_playfanfare               @ 0x31
-	.4byte ScrCmd_waitfanfare               @ 0x32
-	.4byte ScrCmd_playbgm                   @ 0x33
-	.4byte ScrCmd_savebgm                   @ 0x34
-	.4byte ScrCmd_fadedefaultbgm            @ 0x35
-	.4byte ScrCmd_fadenewbgm                @ 0x36
-	.4byte ScrCmd_fadeoutbgm                @ 0x37
-	.4byte ScrCmd_fadeinbgm                 @ 0x38
-	.4byte ScrCmd_warp                      @ 0x39
-	.4byte ScrCmd_warpsilent                @ 0x3a
-	.4byte ScrCmd_warpdoor                  @ 0x3b
-	.4byte ScrCmd_warphole                  @ 0x3c
-	.4byte ScrCmd_warpteleport              @ 0x3d
-	.4byte ScrCmd_setwarp                   @ 0x3e
-	.4byte ScrCmd_setdynamicwarp            @ 0x3f
-	.4byte ScrCmd_setdivewarp               @ 0x40
-	.4byte ScrCmd_setholewarp               @ 0x41
-	.4byte ScrCmd_getplayerxy               @ 0x42
-	.4byte ScrCmd_getpartysize              @ 0x43
-	.4byte ScrCmd_additem                   @ 0x44
-	.4byte ScrCmd_removeitem                @ 0x45
-	.4byte ScrCmd_checkitemspace            @ 0x46
-	.4byte ScrCmd_checkitem                 @ 0x47
-	.4byte ScrCmd_checkitemtype             @ 0x48
-	.4byte ScrCmd_addpcitem                 @ 0x49
-	.4byte ScrCmd_checkpcitem               @ 0x4a
-	.4byte ScrCmd_adddecoration             @ 0x4b
-	.4byte ScrCmd_removedecoration          @ 0x4c
-	.4byte ScrCmd_checkdecor                @ 0x4d
-	.4byte ScrCmd_checkdecorspace           @ 0x4e
-	.4byte ScrCmd_applymovement             @ 0x4f
-	.4byte ScrCmd_applymovementat           @ 0x50
-	.4byte ScrCmd_waitmovement              @ 0x51
-	.4byte ScrCmd_waitmovementat            @ 0x52
-	.4byte ScrCmd_removeobject              @ 0x53
-	.4byte ScrCmd_removeobjectat            @ 0x54
-	.4byte ScrCmd_addobject                 @ 0x55
-	.4byte ScrCmd_addobjectat               @ 0x56
-	.4byte ScrCmd_setobjectxy               @ 0x57
-	.4byte ScrCmd_showobjectat              @ 0x58
-	.4byte ScrCmd_hideobjectat              @ 0x59
-	.4byte ScrCmd_faceplayer                @ 0x5a
-	.4byte ScrCmd_turnobject                @ 0x5b
-	.4byte ScrCmd_trainerbattle             @ 0x5c
-	.4byte ScrCmd_dotrainerbattle           @ 0x5d
-	.4byte ScrCmd_gotopostbattlescript      @ 0x5e
-	.4byte ScrCmd_gotobeatenscript          @ 0x5f
-	.4byte ScrCmd_checktrainerflag          @ 0x60
-	.4byte ScrCmd_settrainerflag            @ 0x61
-	.4byte ScrCmd_cleartrainerflag          @ 0x62
-	.4byte ScrCmd_setobjectxyperm           @ 0x63
-	.4byte ScrCmd_copyobjectxytoperm        @ 0x64
-	.4byte ScrCmd_setobjectmovementtype     @ 0x65
-	.4byte ScrCmd_waitmessage               @ 0x66
-	.4byte ScrCmd_message                   @ 0x67
-	.4byte ScrCmd_closemessage              @ 0x68
-	.4byte ScrCmd_lockall                   @ 0x69
-	.4byte ScrCmd_lock                      @ 0x6a
-	.4byte ScrCmd_releaseall                @ 0x6b
-	.4byte ScrCmd_release                   @ 0x6c
-	.4byte ScrCmd_waitbuttonpress           @ 0x6d
-	.4byte ScrCmd_yesnobox                  @ 0x6e
-	.4byte ScrCmd_multichoice               @ 0x6f
-	.4byte ScrCmd_multichoicedefault        @ 0x70
-	.4byte ScrCmd_multichoicegrid           @ 0x71
-	.4byte ScrCmd_drawbox                   @ 0x72
-	.4byte ScrCmd_erasebox                  @ 0x73
-	.4byte ScrCmd_drawboxtext               @ 0x74
-	.4byte ScrCmd_showmonpic                @ 0x75
-	.4byte ScrCmd_hidemonpic                @ 0x76
-	.4byte ScrCmd_showcontestpainting       @ 0x77
-	.4byte ScrCmd_braillemessage            @ 0x78
-	.4byte ScrCmd_givemon                   @ 0x79
-	.4byte ScrCmd_giveegg                   @ 0x7a
-	.4byte ScrCmd_setmonmove                @ 0x7b
-	.4byte ScrCmd_checkpartymove            @ 0x7c
-	.4byte ScrCmd_bufferspeciesname         @ 0x7d
-	.4byte ScrCmd_bufferleadmonspeciesname  @ 0x7e
-	.4byte ScrCmd_bufferpartymonnick        @ 0x7f
-	.4byte ScrCmd_bufferitemname            @ 0x80
-	.4byte ScrCmd_bufferdecorationname      @ 0x81
-	.4byte ScrCmd_buffermovename            @ 0x82
-	.4byte ScrCmd_buffernumberstring        @ 0x83
-	.4byte ScrCmd_bufferstdstring           @ 0x84
-	.4byte ScrCmd_bufferstring              @ 0x85
-	.4byte ScrCmd_pokemart                  @ 0x86
-	.4byte ScrCmd_pokemartdecoration        @ 0x87
-	.4byte ScrCmd_pokemartdecoration2       @ 0x88
-	.4byte ScrCmd_playslotmachine           @ 0x8
-	.4byte ScrCmd_setberrytree              @ 0x8a
-	.4byte ScrCmd_choosecontestmon          @ 0x8b
-	.4byte ScrCmd_startcontest              @ 0x8c
-	.4byte ScrCmd_showcontestresults        @ 0x8d
-	.4byte ScrCmd_contestlinktransfer       @ 0x8e
-	.4byte ScrCmd_random                    @ 0x8f
-	.4byte ScrCmd_addmoney                  @ 0x90
-	.4byte ScrCmd_removemoney               @ 0x91
-	.4byte ScrCmd_checkmoney                @ 0x92
-	.4byte ScrCmd_showmoneybox              @ 0x93
-	.4byte ScrCmd_hidemoneybox              @ 0x94
-	.4byte ScrCmd_updatemoneybox            @ 0x95
-	.4byte ScrCmd_getpokenewsactive         @ 0x96
-	.4byte ScrCmd_fadescreen                @ 0x97
-	.4byte ScrCmd_fadescreenspeed           @ 0x98
-	.4byte ScrCmd_setflashlevel             @ 0x99
-	.4byte ScrCmd_animateflash              @ 0x9a
-	.4byte ScrCmd_messageautoscroll         @ 0x9b
-	.4byte ScrCmd_dofieldeffect             @ 0x9c
-	.4byte ScrCmd_setfieldeffectargument    @ 0x9d
-	.4byte ScrCmd_waitfieldeffect           @ 0x9e
-	.4byte ScrCmd_setrespawn                @ 0x9f
-	.4byte ScrCmd_checkplayergender         @ 0xa0
-	.4byte ScrCmd_playmoncry                @ 0xa1
-	.4byte ScrCmd_setmetatile               @ 0xa2
-	.4byte ScrCmd_resetweather              @ 0xa3
-	.4byte ScrCmd_setweather                @ 0xa4
-	.4byte ScrCmd_doweather                 @ 0xa5
-	.4byte ScrCmd_setstepcallback           @ 0xa6
-	.4byte ScrCmd_setmaplayoutindex         @ 0xa7
-	.4byte ScrCmd_setobjectsubpriority      @ 0xa8
-	.4byte ScrCmd_resetobjectsubpriority    @ 0xa9
-	.4byte ScrCmd_createvobject             @ 0xaa
-	.4byte ScrCmd_turnvobject               @ 0xab
-	.4byte ScrCmd_opendoor                  @ 0xac
-	.4byte ScrCmd_closedoor                 @ 0xad
-	.4byte ScrCmd_waitdooranim              @ 0xae
-	.4byte ScrCmd_setdooropen               @ 0xaf
-	.4byte ScrCmd_setdoorclosed             @ 0xb0
-	.4byte ScrCmd_addelevmenuitem           @ 0xb1
-	.4byte ScrCmd_showelevmenu              @ 0xb2
-	.4byte ScrCmd_checkcoins                @ 0xb3
-	.4byte ScrCmd_addcoins                  @ 0xb4
-	.4byte ScrCmd_removecoins               @ 0xb5
-	.4byte ScrCmd_setwildbattle             @ 0xb6
-	.4byte ScrCmd_dowildbattle              @ 0xb7
-	.4byte ScrCmd_setvaddress               @ 0xb8
-	.4byte ScrCmd_vgoto                     @ 0xb9
-	.4byte ScrCmd_vcall                     @ 0xba
-	.4byte ScrCmd_vgoto_if                  @ 0xbb
-	.4byte ScrCmd_vcall_if                  @ 0xbc
-	.4byte ScrCmd_vmessage                  @ 0xbd
-	.4byte ScrCmd_vbuffermessage            @ 0xbe
-	.4byte ScrCmd_vbufferstring             @ 0xbf
-	.4byte ScrCmd_showcoinsbox              @ 0xc0
-	.4byte ScrCmd_hidecoinsbox              @ 0xc1
-	.4byte ScrCmd_updatecoinsbox            @ 0xc2
-	.4byte ScrCmd_incrementgamestat         @ 0xc3
-	.4byte ScrCmd_setescapewarp             @ 0xc4
-	.4byte ScrCmd_waitmoncry                @ 0xc5
-	.4byte ScrCmd_bufferboxname             @ 0xc6
-	.4byte ScrCmd_textcolor                 @ 0xc7
-	.4byte ScrCmd_loadhelp                  @ 0xc8
-	.4byte ScrCmd_unloadhelp                @ 0xc9
-	.4byte ScrCmd_signmsg                   @ 0xca
-	.4byte ScrCmd_normalmsg                 @ 0xcb
-	.4byte ScrCmd_comparestat               @ 0xcc
-	.4byte ScrCmd_setmoneventlegal          @ 0xcd
-	.4byte ScrCmd_checkmoneventlegal        @ 0xce
-	.4byte ScrCmd_trywondercardscript       @ 0xcf
-	.4byte ScrCmd_setworldmapflag           @ 0xd0
-	.4byte ScrCmd_warpspinenter             @ 0xd1
-	.4byte ScrCmd_setmonmetlocation         @ 0xd2
-	.4byte ScrCmd_getbraillestringwidth     @ 0xd3
-	.4byte ScrCmd_bufferitemnameplural      @ 0xd4
+	.4byte ScrCmd_nop      	                     @ 0x00
+	.4byte ScrCmd_nop1                           @ 0x01
+	.4byte ScrCmd_end      	                     @ 0x02
+	.4byte ScrCmd_return                         @ 0x03
+	.4byte ScrCmd_call                           @ 0x04
+	.4byte ScrCmd_goto                           @ 0x05
+	.4byte ScrCmd_goto_if                        @ 0x06
+	.4byte ScrCmd_call_if                        @ 0x07
+	.4byte ScrCmd_gotostd                        @ 0x08
+	.4byte ScrCmd_callstd                        @ 0x09
+	.4byte ScrCmd_gotostd_if                     @ 0x0a
+	.4byte ScrCmd_callstd_if                     @ 0x0b
+	.4byte ScrCmd_returnram                      @ 0x0c
+	.4byte ScrCmd_endram                         @ 0x0d
+	.4byte ScrCmd_setmysteryeventstatus          @ 0x0e
+	.4byte ScrCmd_loadword                       @ 0x0f
+	.4byte ScrCmd_loadbyte                       @ 0x10
+	.4byte ScrCmd_setptr                         @ 0x11
+	.4byte ScrCmd_loadbytefromptr                @ 0x12
+	.4byte ScrCmd_setptrbyte                     @ 0x13
+	.4byte ScrCmd_copylocal                      @ 0x14
+	.4byte ScrCmd_copybyte                       @ 0x15
+	.4byte ScrCmd_setvar                         @ 0x16
+	.4byte ScrCmd_addvar                         @ 0x17
+	.4byte ScrCmd_subvar                         @ 0x18
+	.4byte ScrCmd_copyvar                        @ 0x19
+	.4byte ScrCmd_setorcopyvar                   @ 0x1a
+	.4byte ScrCmd_compare_local_to_local         @ 0x1b
+	.4byte ScrCmd_compare_local_to_value         @ 0x1c
+	.4byte ScrCmd_compare_local_to_ptr           @ 0x1d
+	.4byte ScrCmd_compare_ptr_to_local           @ 0x1e
+	.4byte ScrCmd_compare_ptr_to_value           @ 0x1f
+	.4byte ScrCmd_compare_ptr_to_ptr             @ 0x20
+	.4byte ScrCmd_compare_var_to_value           @ 0x21
+	.4byte ScrCmd_compare_var_to_var             @ 0x22
+	.4byte ScrCmd_callnative                     @ 0x23
+	.4byte ScrCmd_gotonative                     @ 0x24
+	.4byte ScrCmd_special                        @ 0x25
+	.4byte ScrCmd_specialvar                     @ 0x26
+	.4byte ScrCmd_waitstate                      @ 0x27
+	.4byte ScrCmd_delay                          @ 0x28
+	.4byte ScrCmd_setflag                        @ 0x29
+	.4byte ScrCmd_clearflag                      @ 0x2a
+	.4byte ScrCmd_checkflag                      @ 0x2b
+	.4byte ScrCmd_initclock                      @ 0x2c
+	.4byte ScrCmd_dotimebasedevents              @ 0x2d
+	.4byte ScrCmd_gettime                        @ 0x2e
+	.4byte ScrCmd_playse                         @ 0x2f
+	.4byte ScrCmd_waitse                         @ 0x30
+	.4byte ScrCmd_playfanfare                    @ 0x31
+	.4byte ScrCmd_waitfanfare                    @ 0x32
+	.4byte ScrCmd_playbgm                        @ 0x33
+	.4byte ScrCmd_savebgm                        @ 0x34
+	.4byte ScrCmd_fadedefaultbgm                 @ 0x35
+	.4byte ScrCmd_fadenewbgm                     @ 0x36
+	.4byte ScrCmd_fadeoutbgm                     @ 0x37
+	.4byte ScrCmd_fadeinbgm                      @ 0x38
+	.4byte ScrCmd_warp                           @ 0x39
+	.4byte ScrCmd_warpsilent                     @ 0x3a
+	.4byte ScrCmd_warpdoor                       @ 0x3b
+	.4byte ScrCmd_warphole                       @ 0x3c
+	.4byte ScrCmd_warpteleport                   @ 0x3d
+	.4byte ScrCmd_setwarp                        @ 0x3e
+	.4byte ScrCmd_setdynamicwarp                 @ 0x3f
+	.4byte ScrCmd_setdivewarp                    @ 0x40
+	.4byte ScrCmd_setholewarp                    @ 0x41
+	.4byte ScrCmd_getplayerxy                    @ 0x42
+	.4byte ScrCmd_getpartysize                   @ 0x43
+	.4byte ScrCmd_additem                        @ 0x44
+	.4byte ScrCmd_removeitem                     @ 0x45
+	.4byte ScrCmd_checkitemspace                 @ 0x46
+	.4byte ScrCmd_checkitem                      @ 0x47
+	.4byte ScrCmd_checkitemtype                  @ 0x48
+	.4byte ScrCmd_addpcitem                      @ 0x49
+	.4byte ScrCmd_checkpcitem                    @ 0x4a
+	.4byte ScrCmd_adddecoration                  @ 0x4b
+	.4byte ScrCmd_removedecoration               @ 0x4c
+	.4byte ScrCmd_checkdecor                     @ 0x4d
+	.4byte ScrCmd_checkdecorspace                @ 0x4e
+	.4byte ScrCmd_applymovement                  @ 0x4f
+	.4byte ScrCmd_applymovementat                @ 0x50
+	.4byte ScrCmd_waitmovement                   @ 0x51
+	.4byte ScrCmd_waitmovementat                 @ 0x52
+	.4byte ScrCmd_removeobject                   @ 0x53
+	.4byte ScrCmd_removeobjectat                 @ 0x54
+	.4byte ScrCmd_addobject                      @ 0x55
+	.4byte ScrCmd_addobjectat                    @ 0x56
+	.4byte ScrCmd_setobjectxy                    @ 0x57
+	.4byte ScrCmd_showobjectat                   @ 0x58
+	.4byte ScrCmd_hideobjectat                   @ 0x59
+	.4byte ScrCmd_faceplayer                     @ 0x5a
+	.4byte ScrCmd_turnobject                     @ 0x5b
+	.4byte ScrCmd_trainerbattle                  @ 0x5c
+	.4byte ScrCmd_dotrainerbattle                @ 0x5d
+	.4byte ScrCmd_gotopostbattlescript           @ 0x5e
+	.4byte ScrCmd_gotobeatenscript               @ 0x5f
+	.4byte ScrCmd_checktrainerflag               @ 0x60
+	.4byte ScrCmd_settrainerflag                 @ 0x61
+	.4byte ScrCmd_cleartrainerflag               @ 0x62
+	.4byte ScrCmd_setobjectxyperm                @ 0x63
+	.4byte ScrCmd_copyobjectxytoperm             @ 0x64
+	.4byte ScrCmd_setobjectmovementtype          @ 0x65
+	.4byte ScrCmd_waitmessage                    @ 0x66
+	.4byte ScrCmd_message                        @ 0x67
+	.4byte ScrCmd_closemessage                   @ 0x68
+	.4byte ScrCmd_lockall                        @ 0x69
+	.4byte ScrCmd_lock                           @ 0x6a
+	.4byte ScrCmd_releaseall                     @ 0x6b
+	.4byte ScrCmd_release                        @ 0x6c
+	.4byte ScrCmd_waitbuttonpress                @ 0x6d
+	.4byte ScrCmd_yesnobox                       @ 0x6e
+	.4byte ScrCmd_multichoice                    @ 0x6f
+	.4byte ScrCmd_multichoicedefault             @ 0x70
+	.4byte ScrCmd_multichoicegrid                @ 0x71
+	.4byte ScrCmd_drawbox                        @ 0x72
+	.4byte ScrCmd_erasebox                       @ 0x73
+	.4byte ScrCmd_drawboxtext                    @ 0x74
+	.4byte ScrCmd_showmonpic                     @ 0x75
+	.4byte ScrCmd_hidemonpic                     @ 0x76
+	.4byte ScrCmd_showcontestpainting            @ 0x77
+	.4byte ScrCmd_braillemessage                 @ 0x78
+	.4byte ScrCmd_givemon                        @ 0x79
+	.4byte ScrCmd_giveegg                        @ 0x7a
+	.4byte ScrCmd_setmonmove                     @ 0x7b
+	.4byte ScrCmd_checkpartymove                 @ 0x7c
+	.4byte ScrCmd_bufferspeciesname              @ 0x7d
+	.4byte ScrCmd_bufferleadmonspeciesname       @ 0x7e
+	.4byte ScrCmd_bufferpartymonnick             @ 0x7f
+	.4byte ScrCmd_bufferitemname                 @ 0x80
+	.4byte ScrCmd_bufferdecorationname           @ 0x81
+	.4byte ScrCmd_buffermovename                 @ 0x82
+	.4byte ScrCmd_buffernumberstring             @ 0x83
+	.4byte ScrCmd_bufferstdstring                @ 0x84
+	.4byte ScrCmd_bufferstring                   @ 0x85
+	.4byte ScrCmd_pokemart                       @ 0x86
+	.4byte ScrCmd_pokemartdecoration             @ 0x87
+	.4byte ScrCmd_pokemartdecoration2            @ 0x88
+	.4byte ScrCmd_playslotmachine                @ 0x8
+	.4byte ScrCmd_setberrytree                   @ 0x8a
+	.4byte ScrCmd_choosecontestmon               @ 0x8b
+	.4byte ScrCmd_startcontest                   @ 0x8c
+	.4byte ScrCmd_showcontestresults             @ 0x8d
+	.4byte ScrCmd_contestlinktransfer            @ 0x8e
+	.4byte ScrCmd_random                         @ 0x8f
+	.4byte ScrCmd_addmoney                       @ 0x90
+	.4byte ScrCmd_removemoney                    @ 0x91
+	.4byte ScrCmd_checkmoney                     @ 0x92
+	.4byte ScrCmd_showmoneybox                   @ 0x93
+	.4byte ScrCmd_hidemoneybox                   @ 0x94
+	.4byte ScrCmd_updatemoneybox                 @ 0x95
+	.4byte ScrCmd_getpokenewsactive              @ 0x96
+	.4byte ScrCmd_fadescreen                     @ 0x97
+	.4byte ScrCmd_fadescreenspeed                @ 0x98
+	.4byte ScrCmd_setflashlevel                  @ 0x99
+	.4byte ScrCmd_animateflash                   @ 0x9a
+	.4byte ScrCmd_messageautoscroll              @ 0x9b
+	.4byte ScrCmd_dofieldeffect                  @ 0x9c
+	.4byte ScrCmd_setfieldeffectargument         @ 0x9d
+	.4byte ScrCmd_waitfieldeffect                @ 0x9e
+	.4byte ScrCmd_setrespawn                     @ 0x9f
+	.4byte ScrCmd_checkplayergender              @ 0xa0
+	.4byte ScrCmd_playmoncry                     @ 0xa1
+	.4byte ScrCmd_setmetatile                    @ 0xa2
+	.4byte ScrCmd_resetweather                   @ 0xa3
+	.4byte ScrCmd_setweather                     @ 0xa4
+	.4byte ScrCmd_doweather                      @ 0xa5
+	.4byte ScrCmd_setstepcallback                @ 0xa6
+	.4byte ScrCmd_setmaplayoutindex              @ 0xa7
+	.4byte ScrCmd_setobjectsubpriority           @ 0xa8
+	.4byte ScrCmd_resetobjectsubpriority         @ 0xa9
+	.4byte ScrCmd_createvobject                  @ 0xaa
+	.4byte ScrCmd_turnvobject                    @ 0xab
+	.4byte ScrCmd_opendoor                       @ 0xac
+	.4byte ScrCmd_closedoor                      @ 0xad
+	.4byte ScrCmd_waitdooranim                   @ 0xae
+	.4byte ScrCmd_setdooropen                    @ 0xaf
+	.4byte ScrCmd_setdoorclosed                  @ 0xb0
+	.4byte ScrCmd_addelevmenuitem                @ 0xb1
+	.4byte ScrCmd_showelevmenu                   @ 0xb2
+	.4byte ScrCmd_checkcoins                     @ 0xb3
+	.4byte ScrCmd_addcoins                       @ 0xb4
+	.4byte ScrCmd_removecoins                    @ 0xb5
+	.4byte ScrCmd_setwildbattle                  @ 0xb6
+	.4byte ScrCmd_dowildbattle                   @ 0xb7
+	.4byte ScrCmd_setvaddress                    @ 0xb8
+	.4byte ScrCmd_vgoto                          @ 0xb9
+	.4byte ScrCmd_vcall                          @ 0xba
+	.4byte ScrCmd_vgoto_if                       @ 0xbb
+	.4byte ScrCmd_vcall_if                       @ 0xbc
+	.4byte ScrCmd_vmessage                       @ 0xbd
+	.4byte ScrCmd_vbuffermessage                 @ 0xbe
+	.4byte ScrCmd_vbufferstring                  @ 0xbf
+	.4byte ScrCmd_showcoinsbox                   @ 0xc0
+	.4byte ScrCmd_hidecoinsbox                   @ 0xc1
+	.4byte ScrCmd_updatecoinsbox                 @ 0xc2
+	.4byte ScrCmd_incrementgamestat              @ 0xc3
+	.4byte ScrCmd_setescapewarp                  @ 0xc4
+	.4byte ScrCmd_waitmoncry                     @ 0xc5
+	.4byte ScrCmd_bufferboxname                  @ 0xc6
+	.4byte ScrCmd_textcolor                      @ 0xc7
+	.4byte ScrCmd_loadhelp                       @ 0xc8
+	.4byte ScrCmd_unloadhelp                     @ 0xc9
+	.4byte ScrCmd_signmsg                        @ 0xca
+	.4byte ScrCmd_normalmsg                      @ 0xcb
+	.4byte ScrCmd_comparestat                    @ 0xcc
+	.4byte ScrCmd_setmonmodernfatefulencounter   @ 0xcd
+	.4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce
+	.4byte ScrCmd_trywondercardscript            @ 0xcf
+	.4byte ScrCmd_setworldmapflag                @ 0xd0
+	.4byte ScrCmd_warpspinenter                  @ 0xd1
+	.4byte ScrCmd_setmonmetlocation              @ 0xd2
+	.4byte ScrCmd_getbraillestringwidth          @ 0xd3
+	.4byte ScrCmd_bufferitemnameplural           @ 0xd4
 
 gScriptCmdTableEnd::
 	.4byte ScrCmd_nop

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