FEROCIOUS KICKS AND PUNCHES

This adds the Mega Punch & Mega Kick guys from FireRed and LeafGreen.

Given Mega Punch was in Mt. Moon, and GF replaced it with Thief in FRLG, I decided to change the TM to the Wing Fossil, which currently isn't obtainable outside of Mt. Moon Crater.

constants/event_constants.asm

@@ -61,7 +61,8 @@
 	const_skip 18
 	const EVENT_BEAT_CERULEAN_GYM_TRAINER_0
 	const EVENT_BEAT_CERULEAN_GYM_TRAINER_1
-	const_skip 2
+	const EVENT_GOT_TM01
+	const EVENT_GOT_TM05
 	const EVENT_GOT_TM11
 	const EVENT_BEAT_MISTY
 	const EVENT_GOT_BICYCLE

data/maps/objects/MtMoonB2F.asm

@@ -19,7 +19,7 @@ MtMoonB2F_Object:
 	object_event 12,  6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
 	object_event 13,  6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
 	object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
-	object_event 21,  5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
+	object_event 21,  5, SPRITE_POKE_BALL, STAY, NONE, 9, WING_FOSSIL
 	object_event 29,  7, SPRITE_SCIENTIST, STAY, NONE, 10, ; Crater Guard
 
 	def_warps_to MT_MOON_B2F

data/maps/objects/Route4.asm

@@ -7,13 +7,15 @@ Route4_Object:
 	warp_event 24,  5, MT_MOON_B1F, 8
 
 	def_bg_events
-	bg_event 12,  5, 4 ; PokeCenterSignText
+	bg_event 12,  5, 6 ; PokeCenterSignText
-	bg_event 17,  7, 5 ; Route4Text5
+	bg_event 17,  7, 7 ; Route4Text5
-	bg_event 27,  7, 6 ; Route4Text6
+	bg_event 27,  7, 8 ; Route4Text6
 
 	def_object_events
 	object_event  9,  8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person
 	object_event 63,  3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4
 	object_event 57,  3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND
+	object_event 39,  3, SPRITE_HIKER, STAY, RIGHT, 4 ; Mega Punch Guy
+	object_event 42,  3, SPRITE_HIKER, STAY, LEFT, 5 ; Mega Kick Guy
 
 	def_warps_to ROUTE_4

engine/battle/move_effects/pay_day.asm

@@ -1,4 +1,4 @@
-PayDayEffect_:
+PayDayEffect_: ; Pay Day money calculation
 	xor a
 	ld hl, wcd6d
 	ld [hli], a
@@ -7,7 +7,7 @@ PayDayEffect_:
 	ld a, [wBattleMonLevel]
 	jr z, .payDayEffect
 	ld a, [wEnemyMonLevel]
-.payDayEffect
+.payDayEffect ; what
 ; level * 2
 	add a
 	ldh [hDividend + 3], a

scripts/Route1.asm

@@ -63,7 +63,7 @@ Route1OakText:
 	ld hl, OakBeforeBattleText
 	call PrintText
 
-	call YesNoChoice ; this whole bit doesn't work for some reason
+	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .refused

scripts/Route4.asm

@@ -16,6 +16,8 @@ Route4_TextPointers:
 	dw Route4Text1
 	dw Route4Text2
 	dw PickUpItemText
+	dw MegaPunchGuy
+	dw MegaKickGuy
 	dw PokeCenterSignText
 	dw Route4Text5
 	dw Route4Text6
@@ -55,3 +57,107 @@ Route4Text5:
 Route4Text6:
 	text_far _Route4Text6
 	text_end
+
+MegaPunchGuy:
+	text_asm
+	CheckEvent EVENT_GOT_TM01
+	jr nz, .got_item
+	ld hl, TM01PreReceiveText
+	call PrintText
+	
+	call YesNoChoice
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .refused
+	
+	lb bc, TM_MEGA_PUNCH, 1
+	call GiveItem
+	jr nc, .bag_full
+	ld hl, ReceivedTM01Text
+	call PrintText
+	SetEvent EVENT_GOT_TM01
+	jr .done
+.refused
+	ld hl, TM01Refused
+	call PrintText
+	jr .done
+.bag_full
+	ld hl, MegaNoRoomText
+	call PrintText
+	jr .done
+.got_item
+	ld hl, TM01ExplanationText
+	call PrintText
+.done
+	jp TextScriptEnd
+
+TM01PreReceiveText:
+	text_far _TM01PreReceiveText
+	text_end
+
+ReceivedTM01Text:
+	text_far _ReceivedTM01Text
+	sound_get_item_1
+	text_end
+
+TM01ExplanationText:
+	text_far _TM01ExplanationText
+	text_end
+
+TM01Refused:
+	text_far _TM01Refused
+	text_end
+
+MegaNoRoomText:
+	text_far _MegaNoRoomText
+	text_end
+
+MegaKickGuy:
+	text_asm
+	CheckEvent EVENT_GOT_TM05
+	jr nz, .got_item
+	ld hl, TM05PreReceiveText
+	call PrintText
+	
+	call YesNoChoice
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .refused
+	
+	lb bc, TM_MEGA_KICK, 1
+	call GiveItem
+	jr nc, .bag_full
+	ld hl, ReceivedTM05Text
+	call PrintText
+	SetEvent EVENT_GOT_TM05
+	jr .done
+.bag_full
+	ld hl, MegaNoRoomText
+	call PrintText
+	jr .done
+.refused
+	ld hl, TM05Refused
+	call PrintText
+	jr .done
+.got_item
+	ld hl, TM05ExplanationText
+	call PrintText
+.done
+	jp TextScriptEnd
+
+TM05PreReceiveText:
+	text_far _TM05PreReceiveText
+	text_end
+
+ReceivedTM05Text:
+	text_far _ReceivedTM05Text
+	sound_get_item_1
+	text_end
+
+TM05ExplanationText:
+	text_far _TM05ExplanationText
+	text_end
+
+TM05Refused:
+	text_far _TM05Refused
+	text_end

text/Route4.asm

@@ -33,3 +33,100 @@ _Route4Text6::
 	line "MT.MOON -"
 	cont "CERULEAN CITY"
 	done
+
+_TM01PreReceiveText::
+	text "A punch of"
+	line "roaring ferocity!"
+	
+	para "Packed with"
+	line "destructive"
+	cont "power!"
+	
+	para "When the chips"
+	line "are down, MEGA"
+	cont "PUNCH is the"
+	cont "ultimate attack!"
+	
+	para "You agree, yes?"
+	prompt
+
+_ReceivedTM01Text::
+	text "<PLAYER> received"
+	line "@"
+	text_ram wStringBuffer
+	text "!@"
+	text_end
+
+_TM01ExplanationText::
+	text "Now, we are"
+	line "comrades in the"
+	cont "art of punching!"
+	
+	para "You should go"
+	line "before you're"
+	cont "seen by the"
+	cont "misguided fool"
+	cont "who trains only"
+	cont "his silly kicking"
+	cont "over there."
+	done
+
+_TM01Refused::
+	text "You'll come back"
+	line "when you"
+	cont "understand the"
+	cont "worth of MEGA"
+	cont "PUNCH."
+	done
+
+_MegaNoRoomText::
+	text "You have no"
+	line "room for this!"
+	done
+
+_TM05PreReceiveText::
+	text "A kick of brutal"
+	line "ferocity!"
+	
+	para "Packed with"
+	line "destructive"
+	cont "power!"
+	
+	para "When you get"
+	line "right down to"
+	cont "it, MEGA KICK"
+	cont "is the ultimate"
+	cont "attack!"
+	
+	para "Don't you agree?"
+	prompt
+
+_ReceivedTM05Text::
+	text "<PLAYER> received"
+	line "@"
+	text_ram wStringBuffer
+	text "!@"
+	text_end
+
+_TM05ExplanationText::
+	text "Now, we are soul"
+	line "mates in the way"
+	cont "of kicking!"
+	
+	para "You should run"
+	line "before you're"
+	cont "seen by the"
+	cont "deluded nitwit"
+	cont "who trains only"
+	cont "simple punching"
+	cont "over there."
+	done
+
+_TM05Refused::
+	text "You'll come"
+	line "crawling back"
+	cont "when you"
+	cont "realize the"
+	cont "value of MEGA"
+	cont "KICK."
+	done