Merge branch 'mistress' into renewables

home/list_menu.asm

@@ -50,7 +50,7 @@ DisplayListMenuID::
 	ld [wTopMenuItemY], a
 	ld a, 5
 	ld [wTopMenuItemX], a
-	ld a, A_BUTTON | B_BUTTON | SELECT
+	ld a, A_BUTTON | B_BUTTON | SELECT | START
 	ld [wMenuWatchedKeys], a
 	ld c, 10
 	call DelayFrames
@@ -178,6 +178,8 @@ DisplayListMenuIDLoop::
 	jp nz, ExitListMenu ; if so, exit the menu
 	bit BIT_SELECT, a
 	jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries
+	bit 3, a ; was the start button pressed?
+	jp nz, .sortItems ; if so, allow the player to swap menu entries
 	ld b, a
 	bit BIT_D_DOWN, b
 	ld hl, wListScrollOffset
@@ -197,6 +199,10 @@ DisplayListMenuIDLoop::
 	jp z, DisplayListMenuIDLoop
 	dec [hl]
 	jp DisplayListMenuIDLoop
+.sortItems
+	rra ; Sets the zero flag to 0 so the sorting function will happen
+	rla
+	jp BankswitchBack
 
 DisplayChooseQuantityMenu::
 ; text box dimensions/coordinates for just quantity

home/npc_movement.asm

@@ -51,14 +51,4 @@ EndNPCMovementScript::
 	farjp _EndNPCMovementScript
 
 DebugPressedOrHeldB::
-IF DEF(_DEBUG)
-	ld a, [wd732]
-	bit 1, a
-	ret z
-	ldh a, [hJoyHeld]
-	bit BIT_B_BUTTON, a
-	ret nz
-	ldh a, [hJoyPressed]
-	bit BIT_B_BUTTON, a
-ENDC
 	ret

home/text_script.asm

@@ -200,6 +200,7 @@ DisplayPlayerBlackedOutText::
 DisplayRepelWoreOffText::
 	ld hl, RepelWoreOffText
 	call PrintText
+	callfar UseAnotherRepel
 	jp AfterDisplayingTextID
 
 RepelWoreOffText::

home/trainers.asm

@@ -127,10 +127,6 @@ TalkToTrainer::
 
 ; checks if any trainers are seeing the player and wanting to fight
 CheckFightingMapTrainers::
-IF DEF(_DEBUG)
-	call DebugPressedOrHeldB
-	jr nz, .trainerNotEngaging
-ENDC
 	call CheckForEngagingTrainers
 	ld a, [wSpriteIndex]
 	cp $ff