Merge branch 'dev' into release

Author: voloved

README.md

@@ -9,6 +9,36 @@ To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your l
 
  ![Example](https://i.imgur.com/KSMvc0h.png)  
 
+## v1.4.0
+- Added Weavile, Magnezone, Lickilicky, Rhyperior, Tangrowth, Electivire, Magmortar, Togekiss, Yanmega, Gliscor, Mamoswine, Porygon Z, Gallade, Probopass, Dusknoir
+- [Added Difficulty Mode](https://github.com/pret/pokeemerald/wiki/Add-Difficulty-Mode)
+- [Infinite TM usage](https://github.com/pret/pokeemerald/wiki/Infinite-TM-usage) [Credit: ExpoSeed]
+- [Item Automatically Goes to PC if Bag is Full](https://github.com/pret/pokeemerald/wiki/Item-Automatically-Goes-to-PC-if-Bag-is-Full)
+- [Fix AI's Switch In Battle (it will remain the same on easy difficulty)](https://github.com/pret/pokeemerald/wiki/Fix-AI's-Switch-In-Battle)
+- Added ability to change how much EXP you'll get in battle.
+- Added Nuzlocke options.
+  - [Dupes Clause.](https://github.com/pret/pokeemerald/wiki/Add-Nuzlocke-Challenge#Dupes-Clause)
+  - [Disallow overleveling Gym Leaders.](https://github.com/pret/pokeemerald/wiki/Add-Nuzlocke-Challenge#Cant-Overlevel-Leaders)
+  - [Disallow shift mode.](https://github.com/pret/pokeemerald/wiki/Add-Nuzlocke-Challenge#force-set-mode)
+  - [Ignore your held items.](https://github.com/pret/pokeemerald/wiki/Add-Nuzlocke-Challenge#no-held-items)
+  - [No Battle Items.](https://github.com/pret/pokeemerald/wiki/Add-Nuzlocke-Challenge#no-battle-items)
+- [Gen. 6 style Exp. Share](https://github.com/pret/pokeemerald/wiki/Gen-6-style-Exp.-Share---Alternative-Option)
+- [All Trees Permanently Get Cut](https://github.com/pret/pokeemerald/wiki/All-Trees-Permanently-Get-Cut)
+- Bug fix on Blaziken learning Death Move.
+- Norman's Slaking no longer knows counter.
+- Bug fix on no effect move being orange when move has low PP in showing type effectiveness.
+-  Added in dynamicmultilist to allow for color changing on PC used to set Nuzlocke and extra settings.
+- Added Carcinisation mode (Everything can now evolve into Krabby, Krabby in the wild, all NPCs have Krabby).
+- EXP multiplier can now be changed as a setting.
+- Holding R when it's turbo B no longer toggles running shoes.
+- Low health beeping can be toggled off.
+- Made getting Aurora Map receivable in Space Station.
+- Turbo B will now always work except in the Slot Machine, Wall Clock, and Chat Rooms.
+- Made wallclock default to 'Yes' when asking if the setting is correct.
+- Made Lucky Egg triple EXP and a default PC item.
+- Added Eevee to Hoenn Pokédex
+- [Push B in wild battle moves to Run](https://github.com/pret/pokeemerald/wiki/Push-B-in-wild-battle-moves-to-Run)
+
 ## v1.3.1
 - Diving and reflection palette fix.
 - Diving speed underwater same as running speed.
@@ -33,6 +63,8 @@ To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your l
 - Put more interesting Pokémon into the Safari Zone.
 - Added Surkit, Masquerain, Meditite, Roselia, Zangoose, and Lunatone.
 - Added ability to buy evolutionary stones and TMs from Mauville Game Corner in Lilycove Department Store.
+- Ability to restart Nuzlocke challenge after failing by talking to Hiker in House in Rustboro City.
+- Nuzlocke now counts in Safari Zone as well.
 - Electrike and Manectric can now learn Flamethrower.
 - Psyduck and Golduck can learn Fly.
 - Zangoose can learn Cut.

asm/macros/event.inc

@@ -1735,6 +1735,46 @@
 	.byte 0xe3
 	.endm
 
+	@ Checks if the player has enough space in their PC to hold quantity more of the specified item. Sets VAR_RESULT to
+	@ TRUE if there is room, or FALSE is there is no room.
+	.macro checkpcspace itemId:req, quantity=1
+	.byte 0xe4
+	.2byte \itemId
+	.2byte \quantity
+	.endm
+
+	.macro _dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req argv:vararg
+	.byte 0xe5
+	.byte \left
+	.byte \top
+	.byte \ignoreBPress
+	.byte \maxBeforeScroll
+	.byte \shouldSort
+	.2byte \initialSelected
+	.byte \callbacks
+	.byte (.Ldynmultichoice_\@_2 - .Ldynmultichoice_\@_1) / 4
+.Ldynmultichoice_\@_1:
+	.4byte \argv
+.Ldynmultichoice_\@_2:
+	.endm
+
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
+	@ Lists of options are provided in argv.
+	@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+	.macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, initialSelected:req, callbacks:req argv:vararg
+	_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \callbacks, \argv
+	.endm
+
+	.macro dynmultipush name:req, id:req
+	.byte 0xe6
+	.4byte \name
+	.2byte \id
+	.endm
+
+	.macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req
+	_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, \callbacks, NULL
+	.endm
+
 @ Supplementary
 
 	.macro goto_if_unset flag:req, dest:req

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -563,6 +563,7 @@ LilycoveCity_Harbor_EventScript_Truck::
 	goto_if_eq VAR_RESULT, TRUE, LilycoveCity_Harbor_EventScript_NoMew
 	checkitemspace ITEM_OLD_SEA_MAP
 	goto_if_eq VAR_RESULT, FALSE, LilycoveCity_Harbor_OldSeaMap_NoBagSpace
+	msgbox LilycoveCity_Harbor_Text_NuzlockeRun, MSGBOX_SIGN
 	giveitem ITEM_OLD_SEA_MAP
 	setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
 	setflag FLAG_RECEIVED_OLD_SEA_MAP
@@ -630,12 +631,16 @@ LilycoveCity_Harbor_Text_SailorFerryAvailable:
 LilycoveCity_Harbor_Text_OldTruck:
 	.string "It's an old truck.$"
 
-LilycoveCity_Harbor_Text_MysteryGiftOldSeaMapUseAtPort:
+LilycoveCity_Harbor_Text_NuzlockeRun::
+	.string "Congrats on not failing the\n"
+	.string "Nuzlocke challenge so far!$"
+
+LilycoveCity_Harbor_Text_MysteryGiftOldSeaMapUseAtPort::
 	.string "It appears to be for use at the\n"
 	.string "LILYCOVE CITY port once you defeat\l"
 	.string "the ELITE FOUR.$"
 
-LilycoveCity_Harbor_Text_MysteryGiftOldSeaMapBagFull:
+LilycoveCity_Harbor_Text_MysteryGiftOldSeaMapBagFull::
 	.string "Your BAG's KEY ITEMS POCKET is full.\p"
 	.string "Please store something on your PC,\n"
 	.string "then come back for this.$"

data/maps/LittlerootTown_ProfessorBirchsLab/map.json

@@ -191,47 +191,47 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_SkipIntro"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_BirchPCOptions"
     },
     {
       "type": "sign",
       "x": 3,
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_SkipIntro"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_BirchPCOptions"
     },
     {
       "type": "sign",
-      "x": 1,
+      "x": 11,
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_GrindRun"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
-      "x": 1,
+      "x": 11,
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_GrindRun"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
     },
     {
       "type": "sign",
-      "x": 11,
+      "x": 1,
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC_Nuzlocke"
     },
     {
       "type": "sign",
-      "x": 11,
+      "x": 1,
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
+      "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC_Nuzlocke"
     },
     {
       "type": "hidden_item",