Cinnabar Gym

7 files changed, 244 insertions, 62 deletions

diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm
index d9b69192..2b9f34cb 100755
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/cinnabargym.asm
@@ -8,7 +8,7 @@ CinnabarGymObject: ; 0x75acc (size=90)
 	db $0 ; signs
 
 	db $9 ; objects
-	object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1
+	object SPRITE_MR_MASTERBALL, $3, $3, STAY, DOWN, $1, OPP_BLAINE, $1
 	object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, OPP_SUPER_NERD, $9
 	object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, OPP_BURGLAR, $4
 	object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, OPP_SUPER_NERD, $a
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 7a6b7cf4..7f48a4cc 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -166,7 +166,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(VermilionHouse2_h)
 	db BANK(FuchsiaHouse3_h)
 	db BANK(Mansion1_h)
-	db $1d ; db BANK(CinnabarGym_h)
+	db BANK(CinnabarGym_h)
 	db $1d ; db BANK(Lab1_h)
 	db $1d ; db BANK(Lab2_h)
 	db $1d ; db BANK(Lab3_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index b73fd43c..038a1f0f 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -166,7 +166,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw VermilionHouse2_h
 	dw FuchsiaHouse3_h
 	dw Mansion1_h
-	dw $4ee6 ; dw CinnabarGym_h
+	dw CinnabarGym_h
 	dw $53fb ; dw Lab1_h
 	dw $5490 ; dw Lab2_h
 	dw $54f6 ; dw Lab3_h
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index b44b7f18..e7ac2a4e 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -386,7 +386,7 @@ PikachuMovementData_f1f2c:
 
 INCLUDE "scripts/celadondiner2.asm"
 INCLUDE "scripts/safarizoneentrance2.asm"
-	dr $f2133, $f218c
+INCLUDE "scripts/cinnabargym2.asm"
 
 INCLUDE "scripts/mtmoonpokecenter2.asm"
 
diff --git a/main.asm b/main.asm
index f11910f5..55ff27b7 100755
--- a/main.asm
+++ b/main.asm
@@ -1647,7 +1647,31 @@ INCLUDE "data/mapHeaders/fuchsiameetingroom.asm"
 INCLUDE "scripts/fuchsiameetingroom.asm"
 INCLUDE "data/mapObjects/fuchsiameetingroom.asm"
 FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk"
-	dr $74ee6,$757a0
+
+INCLUDE "data/mapHeaders/cinnabargym.asm"
+INCLUDE "scripts/cinnabargym.asm"
+INCLUDE "data/mapObjects/cinnabargym.asm"
+CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk"
+
+CinnabarGymScript_753de:
+	callab Func_f2150
+	jp TextScriptEnd
+
+CinnabarGymScript_753e9:
+	push hl
+	ld hl, wd475
+	bit 7, [hl]
+	res 7, [hl]
+	pop hl
+	ret
+
+CinnabarGymScript_753f3:
+	push hl
+	ld hl, wd475
+	bit 7, [hl]
+	pop hl
+	ret
+	dr $753fb,$757a0
 
 INCLUDE "data/mapHeaders/gary.asm"
 INCLUDE "scripts/gary.asm"
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index c5d462b3..8ae77507 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -35,11 +35,14 @@ CinnabarGymScript_75792: ; 75792 (1d:5792)
 	ld [wOpponentAfterWrongAnswer], a
 	ret
 
-CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
+CinnabarGymScript_74f48: ; 757a0 (1d:57a0)
 	ld a, [hSpriteIndexOrTextID]
 	ld [wTrainerHeaderFlagBit], a
 	ret
 
+CinnabarGymFlagAction: ; 757f1 (1d:57f1)
+	predef_jump FlagActionPredef
+
 CinnabarGymScriptPointers: ; 757a6 (1d:57a6)
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
@@ -55,12 +58,18 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
 	jr nz, .asm_757c3
 	ld a, PLAYER_DIR_DOWN
 	ld [wPlayerMovingDirection], a
+	ld hl, PikachuMovementData_74f97
+	ld b, SPRITE_FACING_DOWN
+	call CinnabarGymScript_74fa3
 	ld de, MovementData_757d7
 	jr .asm_757cb
 .asm_757c3
-	ld de, MovementData_757da
 	ld a, PLAYER_DIR_RIGHT
 	ld [wPlayerMovingDirection], a
+	ld hl, PikachuMovementData_74f9e
+	ld b, SPRITE_FACING_RIGHT
+	call CinnabarGymScript_74fa3
+	ld de, MovementData_757da
 .asm_757cb
 	call MoveSprite
 	ld a, $1
@@ -73,10 +82,39 @@ MovementData_757d7: ; 757d7 (1d:57d7)
 	db NPC_MOVEMENT_UP
 	db $FF
 
+PikachuMovementData_74f97:
+	db $00
+	db $20
+	db $1e
+	db $35
+	db $3f
+
 MovementData_757da: ; 757da (1d:57da)
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
+PikachuMovementData_74f9e:
+	db $00
+	db $1d
+	db $1f
+	db $38
+	db $3f
+
+CinnabarGymScript_74fa3:
+	ld a, [wd472]
+	bit 7, a
+	ret z
+	push hl
+	push bc
+	callab GetPikachuFacingDirectionAndReturnToE
+	pop bc
+	pop hl
+	ld a, b
+	cp e
+	ret nz
+	call Func_159b
+	ret
+
 CinnabarGymScript1: ; 757dc (1d:57dc)
 	ld a, [wd730]
 	bit 0, a
@@ -88,52 +126,74 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-CinnabarGymFlagAction: ; 757f1 (1d:57f1)
-	predef_jump FlagActionPredef
-
 CinnabarGymScript2: ; 757f6 (1d:57f6)
+	call CinnabarGymScript_753e9
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
 	ld a, [wTrainerHeaderFlagBit]
-	ld [$ffdb], a
-	AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2
+	sub 2
 	ld c, a
 	ld b, FLAG_TEST
-	EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0
+	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
 	call CinnabarGymFlagAction
 	ld a, c
 	and a
-	jr nz, .asm_7581b
+	jr nz, .asm_7500d
+	ld a, [wTrainerHeaderFlagBit]
+	cp 2
+	jr z, .asm_7500d
+	ld c, 30
+	call DelayFrames
+	call CinnabarGymScript_75023
+	call CinnabarGymScript_75041
 	call WaitForSoundToFinish
 	ld a, SFX_GO_INSIDE
 	call PlaySound
 	call WaitForSoundToFinish
-.asm_7581b
+	jr .asm_75013
+.asm_7500d
+	call CinnabarGymScript_75023
+	call CinnabarGymScript_75041
+.asm_75013
+	xor a
+	ld [wJoyIgnore], a
+	ld [wOpponentAfterWrongAnswer], a
+	ld a, $0
+	ld [W_CINNABARGYMCURSCRIPT], a
+	ld [W_CURMAPSCRIPT], a
+	ret
+
+CinnabarGymScript_75023:
 	ld a, [wTrainerHeaderFlagBit]
 	ld [$ffdb], a
-	AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2
 	ld c, a
 	ld b, FLAG_SET
 	EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0
 	call CinnabarGymFlagAction
+	ret
+
+CinnabarGymScript_75032:
 	ld a, [wTrainerHeaderFlagBit]
-	sub $2
-	AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0
+	ld [$ffdb], a
+	ld c, a
+	ld b, FLAG_TEST
+	EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0
+	call CinnabarGymFlagAction
+	ret
+
+CinnabarGymScript_75041:
+	ld a, [wTrainerHeaderFlagBit]
+	sub 2
 	ld c, a
 	ld b, FLAG_SET
 	EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
 	call CinnabarGymFlagAction
 	call UpdateCinnabarGymGateTileBlocks
-	xor a
-	ld [wJoyIgnore], a
-	ld [wOpponentAfterWrongAnswer], a
-	ld a, $0
-	ld [W_CINNABARGYMCURSCRIPT], a
-	ld [W_CURMAPSCRIPT], a
 	ret
 
 CinnabarGymScript3: ; 7584a (1d:584a)
+	call CinnabarGymScript_753e9
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
@@ -184,7 +244,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
 	dw ReceivedTM38Text
 	dw TM38NoRoomText
 
-CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
+CinnabarGymScript_750c3: ; 758b7 (1d:58b7)
 	ld a, [hSpriteIndexOrTextID]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
@@ -225,7 +285,7 @@ CinnabarGymText1: ; 758df (1d:58df)
 	call SaveEndBattleTextPointers
 	ld a, $7
 	ld [wGymLeaderNo], a
-	jp CinnabarGymScript_758b7
+	jp CinnabarGymScript_750c3
 
 BlaineBattleText: ; 75914 (1d:5914)
 	TX_FAR _BlaineBattleText
@@ -257,7 +317,7 @@ TM38NoRoomText: ; 75934 (1d:5934)
 
 CinnabarGymText2: ; 75939 (1d:5939)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
 	jr nz, .asm_46bb4
 	ld hl, CinnabarGymText_7595f
@@ -265,7 +325,7 @@ CinnabarGymText2: ; 75939 (1d:5939)
 	ld hl, CinnabarGymText_75964
 	ld de, CinnabarGymText_75964
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
+	jp CinnabarGymScript_750c3
 .asm_46bb4
 	ld hl, CinnabarGymText_75969
 	call PrintText
@@ -285,16 +345,25 @@ CinnabarGymText_75969: ; 75969 (1d:5969)
 
 CinnabarGymText3: ; 7596e (1d:596e)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
-	jr nz, .asm_4b406
+	jr nz, .asm_751a8
+	call CinnabarGymScript_753f3
+	jr nz, .asm_75196
+	CheckEvent EVENT_CINNABAR_GYM_GATE1_UNLOCKED
+	jr nz, .asm_75196
+	ld e, $00
+	jp CinnabarGymScript_753de
+
+.asm_75196
 	ld hl, CinnabarGymText_75994
 	call PrintText
 	ld hl, CinnabarGymText_75999
 	ld de, CinnabarGymText_75999
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
-.asm_4b406
+	jp CinnabarGymScript_750c3
+
+.asm_751a8
 	ld hl, CinnabarGymText_7599e
 	call PrintText
 	jp TextScriptEnd
@@ -313,16 +382,24 @@ CinnabarGymText_7599e: ; 7599e (1d:599e)
 
 CinnabarGymText4: ; 759a3 (1d:59a3)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
-	jr nz, .asm_c0673
+	jr nz, .asm_751ee
+	call CinnabarGymScript_753f3
+	jr nz, .asm_751dc
+	CheckEvent EVENT_CINNABAR_GYM_GATE2_UNLOCKED
+	jr nz, .asm_751dc
+	ld e, $1
+	jp CinnabarGymScript_753de
+
+.asm_751dc
 	ld hl, CinnabarGymText_759c9
 	call PrintText
 	ld hl, CinnabarGymText_759ce
 	ld de, CinnabarGymText_759ce
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
-.asm_c0673
+	jp CinnabarGymScript_750c3
+.asm_751ee
 	ld hl, CinnabarGymText_759d3
 	call PrintText
 	jp TextScriptEnd
@@ -341,16 +418,24 @@ CinnabarGymText_759d3: ; 759d3 (1d:59d3)
 
 CinnabarGymText5: ; 759d8 (1d:59d8)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
-	jr nz, .asm_5cfd7
+	jr nz, .asm_75234
+	call CinnabarGymScript_753f3
+	jr nz, .asm_75222
+	CheckEvent EVENT_CINNABAR_GYM_GATE3_UNLOCKED
+	jr nz, .asm_75222
+	ld e, $2
+	jp CinnabarGymScript_753de
+
+.asm_75222
 	ld hl, CinnabarGymText_759fe
 	call PrintText
 	ld hl, CinnabarGymText_75a03
 	ld de, CinnabarGymText_75a03
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
-.asm_5cfd7
+	jp CinnabarGymScript_750c3
+.asm_75234
 	ld hl, CinnabarGymText_75a08
 	call PrintText
 	jp TextScriptEnd
@@ -369,15 +454,23 @@ CinnabarGymText_75a08: ; 75a08 (1d:5a08)
 
 CinnabarGymText6: ; 75a0d (1d:5a0d)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
 	jr nz, .asm_776b4
+	call CinnabarGymScript_753f3
+	jr nz, .asm_75222
+	CheckEvent EVENT_CINNABAR_GYM_GATE4_UNLOCKED
+	jr nz, .asm_75222
+	ld e, $3
+	jp CinnabarGymScript_753de
+
+.asm_75222
 	ld hl, CinnabarGymText_75a33
 	call PrintText
 	ld hl, CinnabarGymText_75a38
 	ld de, CinnabarGymText_75a38
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
+	jp CinnabarGymScript_750c3
 .asm_776b4
 	ld hl, CinnabarGymText_75a3d
 	call PrintText
@@ -397,15 +490,23 @@ CinnabarGymText_75a3d: ; 75a3d (1d:5a3d)
 
 CinnabarGymText7: ; 75a42 (1d:5a42)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
 	jr nz, .asm_2f755
+	call CinnabarGymScript_753f3
+	jr nz, .asm_75222
+	CheckEvent EVENT_CINNABAR_GYM_GATE5_UNLOCKED
+	jr nz, .asm_75222
+	ld e, $4
+	jp CinnabarGymScript_753de
+
+.asm_75222
 	ld hl, CinnabarGymText_75a68
 	call PrintText
 	ld hl, CinnabarGymText_75a6d
 	ld de, CinnabarGymText_75a6d
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
+	jp CinnabarGymScript_750c3
 .asm_2f755
 	ld hl, CinnabarGymText_75a72
 	call PrintText
@@ -425,15 +526,23 @@ CinnabarGymText_75a72: ; 75a72 (1d:5a72)
 
 CinnabarGymText8: ; 75a77 (1d:5a77)
 	TX_ASM
-	call CinnabarGymScript_757a0
+	call CinnabarGymScript_74f48
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
 	jr nz, .asm_d87be
+	call CinnabarGymScript_753f3
+	jr nz, .asm_75222
+	CheckEvent EVENT_CINNABAR_GYM_GATE6_UNLOCKED
+	jr nz, .asm_75222
+	ld e, $5
+	jp CinnabarGymScript_753de
+
+.asm_75222
 	ld hl, CinnabarGymText_75a9d
 	call PrintText
 	ld hl, CinnabarGymText_75aa2
 	ld de, CinnabarGymText_75aa2
 	call SaveEndBattleTextPointers
-	jp CinnabarGymScript_758b7
+	jp CinnabarGymScript_750c3
 .asm_d87be
 	ld hl, CinnabarGymText_75aa7
 	call PrintText
@@ -453,20 +562,5 @@ CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7)
 
 CinnabarGymText9: ; 75aac (1d:5aac)
 	TX_ASM
-	CheckEvent EVENT_BEAT_BLAINE
-	jr nz, .asm_627d9
-	ld hl, CinnabarGymText_75ac2
-	jr .asm_0b11d
-.asm_627d9
-	ld hl, CinnabarGymText_75ac7
-.asm_0b11d
-	call PrintText
+	callab Func_f2133
 	jp TextScriptEnd
-
-CinnabarGymText_75ac2: ; 75ac2 (1d:5ac2)
-	TX_FAR _CinnabarGymText_75ac2
-	db "@"
-
-CinnabarGymText_75ac7: ; 75ac7 (1d:5ac7)
-	TX_FAR _CinnabarGymText_75ac7
-	db "@"
diff --git a/scripts/cinnabargym2.asm b/scripts/cinnabargym2.asm
new file mode 100755
index 00000000..a85a3206
--- /dev/null
+++ b/scripts/cinnabargym2.asm
@@ -0,0 +1,64 @@
+Func_f2133:
+	CheckEvent EVENT_BEAT_BLAINE
+	jr nz, .asm_627d9
+	ld hl, CinnabarGymText_75ac2
+	jr .asm_0b11d
+.asm_627d9
+	ld hl, CinnabarGymText_75ac7
+.asm_0b11d
+	call PrintText
+	ret
+
+CinnabarGymText_75ac2: ; 75ac2 (1d:5ac2)
+	TX_FAR _CinnabarGymText_75ac2
+	db "@"
+
+CinnabarGymText_75ac7: ; 75ac7 (1d:5ac7)
+	TX_FAR _CinnabarGymText_75ac7
+	db "@"
+
+Func_f2150:
+	ld hl, TextPointers_f215d
+	ld d, 0
+	add hl, de
+	add hl, de
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	jp PrintText
+
+TextPointers_f215d:
+	dw CinnabarGymText_f2169
+	dw CinnabarGymText_f216e
+	dw CinnabarGymText_f2173
+	dw CinnabarGymText_f2178
+	dw CinnabarGymText_f217d
+	dw CinnabarGymText_f2182
+
+CinnabarGymText_f2169:
+	TX_FAR _CinnabarGymText_1
+	db "@"
+
+CinnabarGymText_f216e:
+	TX_FAR _CinnabarGymText_2
+	db "@"
+
+CinnabarGymText_f2173:
+	TX_FAR _CinnabarGymText_3
+	db "@"
+
+CinnabarGymText_f2178:
+	TX_FAR _CinnabarGymText_4
+	db "@"
+
+CinnabarGymText_f217d:
+	TX_FAR _CinnabarGymText_5
+	db "@"
+
+CinnabarGymText_f2182:
+	TX_FAR _CinnabarGymText_6
+	db "@"
+
+CinnabarGymText_f2187:
+	TX_FAR _CinnabarGymText_7 ; unused
+	db "@"