Warps, ArticunoG, refactored Garnet 2F

I messed up Garnet Cavern's 2F name for some reason

Also added all the warps which are, ironically, exactly the same as the international Cerulean Cave. Added the event for Galarian Articuno but gee I hope the constant skip doesn't cause any issues
This commit is contained in:
Llinos Evans 2023-04-30 19:12:59 +01:00
parent 4da1a1235d
commit 084e03efa1
25 changed files with 95 additions and 47 deletions

View file

@ -0,0 +1,6 @@
GarnetCavern2F_Script:
jp EnableAutoTextBoxDrawing
GarnetCavern2F_TextPointers:
text_end ; unused

View file

@ -1,6 +1,39 @@
GarnetCavernB1F_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld hl, GarnetCavernB1FTrainerHeaders
ld de, GarnetCavernB1F_ScriptPointers
ld a, [wGarnetCavernB1FCurScript]
call ExecuteCurMapScriptInTable
ld [wGarnetCavernB1FCurScript], a
ret
GarnetCavernB1F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
GarnetCavernB1F_TextPointers:
dw ArticunoGText
;dw PickUpItemText soon
;dw PickUpItemText
GarnetCavernB1FTrainerHeaders:
def_trainers
ArticunoGTrainerHeader:
trainer EVENT_BEAT_ARTICUNO_G, 0, ArticunoGBattleText, ArticunoGBattleText, ArticunoGBattleText
db -1 ; end
ArticunoGText:
text_asm
ld hl, ArticunoGTrainerHeader
call TalkToTrainer
jp TextScriptEnd
ArticunoGBattleText:
text_far _ArticunoGBattleText
text_asm
ld a, ARTICUNO_G
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
text_end ; unused

View file

@ -1,6 +0,0 @@
GarnetCavernB2F_Script:
jp EnableAutoTextBoxDrawing
GarnetCavernB2F_TextPointers:
text_end ; unused