From 15be9046a78817d6ff5a0109be415558e55a908b Mon Sep 17 00:00:00 2001
From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com>
Date: Sat, 17 Jun 2023 17:07:54 -0600
Subject: [PATCH] Mt. Moon Crater Guard

Guard is implemented.
---
 data/maps/hide_show_data.asm       |  5 +++--
 data/maps/objects/MtMoonB2F.asm    |  1 -
 data/maps/objects/MtMoonSquare.asm |  3 ++-
 scripts/MtMoonSquare.asm           |  7 ++++++-
 text.asm                           |  1 +
 text/MtMoonSquare.asm              | 23 +++++++++++++++++++++++
 6 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 text/MtMoonSquare.asm

diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 66202522..08d0ecd4 100644
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -255,7 +255,7 @@ MapHSPointers:
 	dw RockTunnelB1FHS
 	dw GiovannisRoomHS
 	dw NoHS ; Battle Tent
-	dw NoHS ; Mt Moon Square
+	dw MtMoonSquareHS ; Mt Moon Square
 	dw NoHS ; Mt Moon Square House
 	dw NoHS ; Celeste Hill Cave 
 	dw NoHS ; Celeste Hill Outside
@@ -431,7 +431,6 @@ MtMoonB2FHS:
 	db MT_MOON_B2F, $08, SHOW                 ; HS_MT_MOON_B2F_FOSSIL_2
 	db MT_MOON_B2F, $09, SHOW                 ; HS_MT_MOON_B2F_ITEM_1
 	db MT_MOON_B2F, $0A, SHOW                 ; HS_MT_MOON_B2F_ITEM_2
-	db MT_MOON_B2F, $0B, HIDE                 ; HS_MT_MOON_CRATER_GUARD
 SSAnne2FHS:
 	db SS_ANNE_2F, $02, HIDE                  ; HS_SS_ANNE_2F_RIVAL
 SSAnne1FRoomsHS:
@@ -612,5 +611,7 @@ RockTunnelB1FHS:
 	db ROCK_TUNNEL_B1F, $0B, SHOW			  ; HS_ROCK_TUNNEL_B1F_HELIX
 	db ROCK_TUNNEL_B1F, $0C, SHOW			  ; HS_ROCK_TUNNEL_B1F_AMBER
 	db ROCK_TUNNEL_B1F, $0D, SHOW			  ; HS_ROCK_TUNNEL_B1F_WING
+MtMoonSquareHS:
+	db MT_MOON_SQUARE, $04, SHOW              ; HS_MT_MOON_CRATER_GUARD
 	db $FF, $01, SHOW ; end
 	assert_table_length NUM_HS_OBJECTS + 1
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 65ea685c..15821717 100644
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -21,6 +21,5 @@ MtMoonB2F_Object:
 	object_event 13,  6, SPRITE_FOSSIL, STAY, NONE, 8 ; person
 	object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
 	object_event 35,  6, SPRITE_FOSSIL, STAY, NONE, 10, WING_FOSSIL
-	object_event 29,  8, SPRITE_SCIENTIST, STAY, NONE, 11, ; Crater Guard
 
 	def_warps_to MT_MOON_B2F
diff --git a/data/maps/objects/MtMoonSquare.asm b/data/maps/objects/MtMoonSquare.asm
index 898a15d0..81986b73 100644
--- a/data/maps/objects/MtMoonSquare.asm
+++ b/data/maps/objects/MtMoonSquare.asm
@@ -7,11 +7,12 @@ MtMoonSquare_Object:
 	warp_event 11,  5, MT_MOON_SQUARE_HOUSE, 1
 
 	def_bg_events
-	bg_event 15,  5,  4 ; Sign
+	bg_event 15,  5,  5 ; Sign
 
 	def_object_events
 	object_event  7,  5, SPRITE_FAIRY, WALK, ANY_DIR, 1 ; person
 	object_event  5,  4, SPRITE_FAIRY, WALK, ANY_DIR, 2 ; person
 	object_event  4,  6, SPRITE_FAIRY, WALK, ANY_DIR, 3 ; person
+	object_event 22,  2, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person  
 
 	def_warps_to MT_MOON_SQUARE
diff --git a/scripts/MtMoonSquare.asm b/scripts/MtMoonSquare.asm
index cc150d80..27edc99f 100644
--- a/scripts/MtMoonSquare.asm
+++ b/scripts/MtMoonSquare.asm
@@ -5,6 +5,7 @@ MtMoonSquare_TextPointers:
 	dw MtMoonSquareClefairy
 	dw MtMoonSquareClefairy
 	dw MtMoonSquareClefairy
+	dw MtMoonSquareResearcher
 	dw MtMoonSquareSign
 
 MtMoonSquareClefairy:
@@ -14,9 +15,13 @@ MtMoonSquareClefairy:
 	call PlayCry
 	jp TextScriptEnd
 
+MtMoonSquareResearcher:
+	text_far _MtMoonSquareText1
+	text_end
+
 MtMoonSquareSign:
 	text "MT MOON SQUARE"
 	line "Please don't"
 	cont "litter. Put trash"
 	cont "where it belongs!"
-	done
+	done
\ No newline at end of file
diff --git a/text.asm b/text.asm
index 881aa1d2..5b45c1eb 100644
--- a/text.asm
+++ b/text.asm
@@ -294,6 +294,7 @@ INCLUDE "text/GarnetCavernB1F.asm"
 INCLUDE "text/GarnetCavern2F.asm"
 INCLUDE "text/GiovannisRoom.asm"
 INCLUDE "text/CitrineCity.asm"
+INCLUDE "text/MtMoonSquare.asm"
 
 SECTION "Pokédex Text", ROMX
 
diff --git a/text/MtMoonSquare.asm b/text/MtMoonSquare.asm
new file mode 100644
index 00000000..f38395fb
--- /dev/null
+++ b/text/MtMoonSquare.asm
@@ -0,0 +1,23 @@
+_MtMoonSquareText1::
+	text "Our expedition"
+	line "team has been"
+	cont "researching the"
+	cont "#MON found in"
+	cont "MT. MOON CRATER."
+	
+	para "They appear to be"
+	line "primitive and"
+	cont "very aggressive!"
+	
+	para "...or at least"
+	line "that's what this" 
+	cont "book I found in"
+	cont "the PEWTER MUSEUM"
+	cont "has to say."
+	
+	para "Anyways, until our"
+	line "research is done,"
+	cont "only authorized"
+	cont "individuals may"
+	cont "enter the crater."
+	done
\ No newline at end of file