music, celadon events, cleanup

gotta tackle some new houses, the pokemart scripts, and the game corner, and then i'm moving onto cerulean!

README.md

@@ -11,16 +11,6 @@ This is my work in progress fork for a personal romhack project (tentatively "Po
 
 Generally, credits are listed in the files, or in notes for the individual commits, for who changed what - but my process is confessedly pretty messy and I may have made some mistakes! Please do not hesitate to point out any problems to me.
 
-Trainer sprite sources:
-
-* Brandy & Sherry (our protags) created by Washy
-* Ambassador design created with JillKatze
-* "Junior Hexer" by Bombbity https://www.deviantart.com/bombbity/art/Hex-Maniac-Trainer-Sprite-First-Pass-704399414
-* "Bookworm"/Cassandra by Bombbity https://www.deviantart.com/bombbity/art/Cassandra-Trainer-Sprite-Second-Pass-698473514
-* Hex Maniac modified from Similation's sprite https://www.deviantart.com/similation/art/Hex-Maniac-837337841 as well as Kyledove's sprite https://www.deviantart.com/kyle-dove/art/All-Kalos-Trainer-Classes-892329880
-* Jessie and James by Kimba616 https://www.deviantart.com/kimba616/art/Jessie-and-James-145243037
-* Anything else is from the original games or by me!
-
 Attack animation particles are free to use (most of the new ones are from me) but please don't use any other graphics I've created or am using; though I have done many, I didn't create all of the character sprites used here. (A more detailed graphics credits listing will come when I start adding more character graphics)
 
 **Vanilla CFRU info - read the documentation!!**

asm_defines.s

@@ -3589,15 +3589,14 @@
 .equ ITEM_TEACHY_TV, 366
 .equ ITEM_TRI_PASS, 367
 .equ ITEM_RAINBOW_PASS, 368
-.equ ITEM_TEA, 369
+.equ ITEM_ENERGY_DRINK, 369
 .equ ITEM_MYSTIC_TICKET, 370
 .equ ITEM_AURORA_TICKET, 371
 .equ ITEM_POWDER_JAR, 372
 .equ ITEM_RUBY, 373
 .equ ITEM_SAPPHIRE, 374
 .equ ITEM_X_SP_DEF, 375
 
-
 @;New TMs
 .equ ITEM_TM51, 376
 .equ ITEM_TM52, 377

assembly/overworld_scripts/celadon_city.s

@@ -13,6 +13,8 @@
 .equ FLAG_CHOSESTARTER1, 0x960
 .equ FLAG_CHOSESTARTER2, 0x961
 .equ FLAG_CHOSESTARTER3, 0x962
+.equ FLAG_CELADONDEPT_ROOF2, 0x96C @Person ID to hide the rockets in the store
+.equ FLAG_CELADON_GYMOPEN, 0x96D 
 .equ SP_DAILY_EVENT, 0xA0
 .equ SP_UPDATE_TIME_IN_VARS, 0xA1
 .equ SP_GET_TIME_DIFFERENCE, 0xA2
@@ -244,19 +246,37 @@ EventScript_CeladonCity_GirlCommentary:
 
 .global EventScript_CeladonCity_RGroupClassy
 EventScript_CeladonCity_RGroupClassy:
+	checkflag FLAG_CELADONDEPT_ROOF2
+	if SET _goto EventScript_CeladonCity_RGroupClassy_Angry
 	msgbox gText_CeladonCity_RGroupAwesome MSG_FACE
 	end
+
+EventScript_CeladonCity_RGroupClassy_Angry:
+	msgbox gText_CeladonCity_RGroupAwesome_WhatDidYouDo MSG_FACE
+	end
 
 .global EventScript_CeladonCity_NotStupidAboutRGroup
 EventScript_CeladonCity_NotStupidAboutRGroup:
+	checkflag FLAG_CELADONDEPT_ROOF2
+	if SET _goto EventScript_CeladonCity_NotStupidAboutRGroup_Angry
 	msgbox gText_CeladonCity_RGroupNotStupid MSG_FACE
 	end
-
+
+EventScript_CeladonCity_NotStupidAboutRGroup_Angry:
+	msgbox gText_CeladonCity_RGroupNotStupid_WhatDidYouDo MSG_FACE
+	end
+
 .global EventScript_CeladonCity_GrassHint
 EventScript_CeladonCity_GrassHint:
+	checkflag FLAG_CELADONDEPT_ROOF2
+	if SET _goto EventScript_CeladonCity_GrassHint_Angry
 	msgbox gText_CeladonCity_GrassHint MSG_FACE
 	end
 
+EventScript_CeladonCity_GrassHint_Angry:
+	msgbox gText_CeladonCity_GrassHint_Angry MSG_FACE
+	end
+
 .global EventScript_CeladonCity_CondominiumsSign
 EventScript_CeladonCity_CondominiumsSign:
 	signmsg
@@ -366,132 +386,28 @@ EventScript_CeladonCity_VoltorbFlipKid:
 	msgbox gText_CeladonCity_MissingVoltorbFlip MSG_FACE
 	end
 
-.global EventScript_CeladonCity_RGroupNoEntryLeft
-EventScript_CeladonCity_RGroupNoEntryLeft:
-	checkflag 0x966
-	if SET _goto RGroupGuardLeftOopsie
-	msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE
-	end
-
-RGroupGuardLeftOopsie:
-	lockall
-	msgbox gText_CeladonCity_OutsideDeptStore_Left MSG_FACE
-	trainerbattle3 0x3 9 0x0 gText_CeladonCity_OutsideDeptStore_Left_Loss
-	lockall
-	msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN
-	applymovement 0xE LookRight
-	waitmovement 0x0
-	applymovement 0xD LookLeft
-	waitmovement 0x0
-	msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL
-	call GuardsDoorEnter
-	lockall
-	clearflag 0x966
-	showsprite 7
-	movesprite 0x7 0x11 0x16
-	pause 0x12
-	applymovement 0x7 SibEntersDept1_FoughtLeftRocket
-	waitmovement 0x0
-	pause 0x5
-	applymovement 0xFF LookRight
-	checkgender
-	compare LASTRESULT 0x0
-    if 0x1 _call EventScript_SherryGrats
-    compare LASTRESULT 0x1
-    if 0x1 _call EventScript_BrandyGrats
-	applymovement 0x7 SibEntersDept2
-	opendoor 0xF 0xE
-	waitdooranim
-	pause 0x8
-	setflag 0x966
-	hidesprite 7
-	closedoor 0xF 0xE
-	waitdooranim
-	releaseall
-	end
-
-.global EventScript_CeladonCity_RGroupNoEntryRight
-EventScript_CeladonCity_RGroupNoEntryRight:
-	checkflag 0x966
-	if SET _goto RGroupGuardRightOopsie
-	msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE
-	end
-
-RGroupGuardRightOopsie:
-	lockall
-	msgbox gText_CeladonCity_OutsideDeptStore_Right MSG_FACE
-	trainerbattle3 0x3 10 0x0 gText_CeladonCity_OutsideDeptStore_Right_Loss
-	lockall
-	msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN
-	applymovement 0xD LookLeft
-	waitmovement 0x0
-	applymovement 0xE LookRight
-	waitmovement 0x0
-	msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL
-	call GuardsDoorEnter
-	lockall
-	clearflag 0x966
-	showsprite 7
-	movesprite 0x7 0x09 0x16
-	pause 0x12
-	applymovement 0x7 SibEntersDept1_FoughtRightRocket
-	waitmovement 0x0
-	pause 0x5
-	applymovement 0xFF LookLeft
-	checkgender
-	compare LASTRESULT 0x0
-    if 0x1 _call EventScript_SherryGrats
-    compare LASTRESULT 0x1
-    if 0x1 _call EventScript_BrandyGrats
-	applymovement 0x7 SibEntersDept2
-	opendoor 0xB 0xE
-	waitdooranim
-	pause 0x8
-	setflag 0x966
-	hidesprite 7
-	closedoor 0xB 0xE
-	waitdooranim
-	releaseall
-	end
-
-EventScript_SherryGrats:
-	msgbox gText_CeladonCity_OutsideDeptStore_Sib_Sherry MSG_NORMAL
-	return
-
-EventScript_BrandyGrats:
-	msgbox gText_CeladonCity_OutsideDeptStore_Sib_Brandy MSG_NORMAL
-	return
-
-GuardsDoorEnter:
-	applymovement 0xD RocketsWalkUp
-	opendoor 0xF 0xE
-	waitdooranim
-	setflag 0x967
-	hidesprite 13
-	pause 0x8
-	closedoor 0xF 0xE
-	waitdooranim
-	pause 0x5
-	lockall
-	applymovement 0xE RocketsWalkUp
-	opendoor 0xB 0xE
-	waitdooranim
-	pause 0x15
-	hidesprite 14
-	closedoor 0xB 0xE
-	waitdooranim
-	return
-
 .global EventScript_CeladonCity_RGroupGameCornerPromoter
 EventScript_CeladonCity_RGroupGameCornerPromoter:
+	checkflag FLAG_CELADONDEPT_ROOF2
+	if SET _goto EventScript_CeladonCity_RGroupGameCornerPromoter_Angry
 	msgbox gText_CeladonCity_RGroupGameCornerPromoter MSG_FACE
 	end	
-
+
+EventScript_CeladonCity_RGroupGameCornerPromoter_Angry:
+	msgbox gText_CeladonCity_RGroupGameCornerPromoter_Angry MSG_FACE
+	end	
+
 .global EventScript_CeladonCity_RGroupMemberFirstOne
 EventScript_CeladonCity_RGroupMemberFirstOne:
+	checkflag FLAG_CELADONDEPT_ROOF2
+	if SET _goto EventScript_CeladonCity_RGroupMemberFirstOne_Angry
 	msgbox gText_CeladonCity_RGroupMemberFirstOne MSG_FACE
 	end
 
+EventScript_CeladonCity_RGroupMemberFirstOne_Angry:
+	msgbox gText_CeladonCity_RGroupMemberFirstOne_Angry MSG_FACE
+	end
+
 .global EventScript_CeladonCity_CondominiumsInteriorSign
 EventScript_CeladonCity_CondominiumsInteriorSign:
 	signmsg
@@ -536,7 +452,7 @@ EventScript_CeladonCity_PrizeExchangeSign:
 EventScript_CeladonCity_SceptileNoises:
 	cry SPECIES_SCEPTILE 0x0
 	msgbox gText_CeladonCity_BerriesSceptile MSG_FACE
-	applymovement 0x9 LookUp
+	applymovement 0x10 LookUp
 	end
 
 .global EventScript_CeladonCity_BerriesGuy
@@ -777,12 +693,155 @@ UniversalMovementScript_GymScene1:
 	pause 0x5
 	msgbox gText_CeladonCity_ErikaGymSceneNPC1 MSG_KEEPOPEN
 	return
+
+.global EventScript_CeladonCity_RGroupNoEntryLeft
+EventScript_CeladonCity_RGroupNoEntryLeft:
+	checkflag 0x966
+	if SET _goto RGroupGuardLeftOopsie
+	msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE
+	end
+
+RGroupGuardLeftOopsie:
+	lockall
+	msgbox gText_CeladonCity_OutsideDeptStore_Left MSG_FACE
+	trainerbattle3 0x3 9 0x0 gText_CeladonCity_OutsideDeptStore_Left_Loss
+	lockall
+	msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN
+	applymovement 0xE LookRight
+	waitmovement 0x0
+	applymovement 0xD LookLeft
+	waitmovement 0x0
+	msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL
+	call GuardsDoorEnter
+	lockall
+	clearflag 0x966
+	showsprite 7
+	movesprite 0x7 0x11 0x16
+	pause 0x12
+	applymovement 0x7 SibEntersDept1_FoughtLeftRocket
+	waitmovement 0x0
+	pause 0x5
+	applymovement 0xFF LookRight
+	checkgender
+	compare LASTRESULT 0x0
+    if 0x1 _call EventScript_SherryGrats
+    compare LASTRESULT 0x1
+    if 0x1 _call EventScript_BrandyGrats
+	applymovement 0x7 SibEntersDept2
+	opendoor 0xF 0xE
+	waitdooranim
+	pause 0x8
+	setflag 0x966
+	hidesprite 7
+	closedoor 0xF 0xE
+	waitdooranim
+	releaseall
+	end
+
+.global EventScript_CeladonCity_NoLongerKnowEverything
+EventScript_CeladonCity_NoLongerKnowEverything:
+	msgbox gText_CeladonCity_NoLongerKnowEverything1 MSG_FACE
+	end
+
+.global EventScript_CeladonCity_RGroupNoEntryRight
+EventScript_CeladonCity_RGroupNoEntryRight:
+	checkflag 0x966
+	if SET _goto RGroupGuardRightOopsie
+	msgbox gText_CeladonCity_RGroupBigShipment MSG_FACE
+	end
+
+RGroupGuardRightOopsie:
+	lockall
+	msgbox gText_CeladonCity_OutsideDeptStore_Right MSG_FACE
+	trainerbattle3 0x3 10 0x0 gText_CeladonCity_OutsideDeptStore_Right_Loss
+	lockall
+	msgbox gText_CeladonCity_OutsideDeptStore_After MSG_KEEPOPEN
+	applymovement 0xD LookLeft
+	waitmovement 0x0
+	applymovement 0xE LookRight
+	waitmovement 0x0
+	msgbox gText_CeladonCity_OutsideDeptStore_GetInside MSG_NORMAL
+	call GuardsDoorEnter
+	lockall
+	clearflag 0x966
+	showsprite 7
+	movesprite 0x7 0x09 0x16
+	pause 0x12
+	applymovement 0x7 SibEntersDept1_FoughtRightRocket
+	waitmovement 0x0
+	pause 0x5
+	applymovement 0xFF LookLeft
+	checkgender
+	compare LASTRESULT 0x0
+    if 0x1 _call EventScript_SherryGrats
+    compare LASTRESULT 0x1
+    if 0x1 _call EventScript_BrandyGrats
+	applymovement 0x7 SibEntersDept2
+	opendoor 0xB 0xE
+	waitdooranim
+	pause 0x8
+	setflag 0x966
+	hidesprite 7
+	closedoor 0xB 0xE
+	waitdooranim
+	releaseall
+	end
+
+EventScript_SherryGrats:
+	msgbox gText_CeladonCity_OutsideDeptStore_Sib_Sherry MSG_NORMAL
+	return
+
+EventScript_BrandyGrats:
+	msgbox gText_CeladonCity_OutsideDeptStore_Sib_Brandy MSG_NORMAL
+	return
+
+GuardsDoorEnter:
+	applymovement 0xD RocketsWalkUp
+	opendoor 0xF 0xE
+	waitdooranim
+	setflag 0x967
+	hidesprite 13
+	pause 0x8
+	closedoor 0xF 0xE
+	waitdooranim
+	pause 0x5
+	lockall
+	applymovement 0xE RocketsWalkUp
+	opendoor 0xB 0xE
+	waitdooranim
+	pause 0x15
+	hidesprite 14
+	closedoor 0xB 0xE
+	waitdooranim
+	return
 
 .global EventScript_CeladonCity_GymTrainerOutside
 EventScript_CeladonCity_GymTrainerOutside:
+	checkitem ITEM_ENERGY_DRINK 0x1
+	compare 0x800D 0x1
+	if 0x4 _goto ErikaGymOpen
 	msgbox gText_CeladonCity_PleaseGoDeptStore MSG_FACE
 	end
 
+ErikaGymOpen:
+	faceplayer
+	sound 0x15
+	applymovement 0x8 ExclaimAnim 
+	waitmovement 0x0
+	pause 0x5
+	msgbox gText_CeladonCity_GymTrainer_GetsEnergyDrink1 MSG_KEEPOPEN
+	applymovement 0x8 GymTrainerShuffle
+	removeitem ITEM_ENERGY_DRINK 0x1
+	msgbox gText_CeladonCity_GymTrainer_GetsEnergyDrink2 MSG_NORMAL
+	setflag 0x96D
+	applymovement 0x8 RocketsWalkUp
+	opendoor 0xB 0x1E
+	waitdooranim
+	pause 0x15
+	hidesprite 8
+	closedoor 0xB 0x1E
+	end
+
 LookLeft:
 	.byte look_left
 	.byte 0xFE