Celeste Hill Gate & other things

- New Celeste Hill Gate location so the entrance into the location makes more sense. Also took the opportunity to include more lore. This replaces Pokemon Tower 4F.
- Fixed a bug that caused the Cat icon to not animate correctly.
- Made the infinite Nugget glitch work properly because I was stupid and didn't test it.
- Luxwan now uses the Small Bird icon to fit with the rest of the line.
- Nidoreign has a new Pokedex entry and classification, centred on the Nido's origins in the Moon Rabbit of Asian mythology.
This commit is contained in:
Llinos Evans 2023-09-20 17:02:09 +01:00
parent 953e8e295f
commit 63a28e410c
34 changed files with 118 additions and 200 deletions

View file

@ -0,0 +1,22 @@
CelesteHillGate_Script:
jp EnableAutoTextBoxDrawing
CelesteHillGate_TextPointers:
dw CelesteHillGateText1
dw CelesteHillGateText2
dw CelesteHillGateText3
CelesteHillGateText1:
text_far _CelesteHillGateText1
text_end
CelesteHillGateText2:
text_far _CelesteHillGateText2
text_end
CelesteHillGateText3:
text_far _CelesteHillGateText3
text_asm
ld a, LUXWAN
call PlayCry
jp TextScriptEnd

View file

@ -1,82 +0,0 @@
PokemonTower4F_Script:
call EnableAutoTextBoxDrawing
ld hl, PokemonTower4TrainerHeaders
ld de, PokemonTower4F_ScriptPointers
ld a, [wPokemonTower4FCurScript]
call ExecuteCurMapScriptInTable
ld [wPokemonTower4FCurScript], a
ret
PokemonTower4F_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
PokemonTower4F_TextPointers:
dw PokemonTower4Text1
dw PokemonTower4Text2
dw PokemonTower4Text3
PokemonTower4TrainerHeaders:
def_trainers
PokemonTower4TrainerHeader0:
trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4BattleText1, PokemonTower4EndBattleText1, PokemonTower4AfterBattleText1
PokemonTower4TrainerHeader1:
trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4BattleText2, PokemonTower4EndBattleText2, PokemonTower4AfterBattleText2
PokemonTower4TrainerHeader2:
trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4BattleText3, PokemonTower4EndBattleText3, PokemonTower4AfterBattleText3
db -1 ; end
PokemonTower4Text1:
text_asm
ld hl, PokemonTower4TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
PokemonTower4Text2:
text_asm
ld hl, PokemonTower4TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
PokemonTower4Text3:
text_asm
ld hl, PokemonTower4TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
PokemonTower4BattleText1:
text_far _PokemonTower4BattleText1
text_end
PokemonTower4EndBattleText1:
text_far _PokemonTower4EndBattleText1
text_end
PokemonTower4AfterBattleText1:
text_far _PokemonTower4AfterBattleText1
text_end
PokemonTower4BattleText2:
text_far _PokemonTower4BattleText2
text_end
PokemonTower4EndBattleText2:
text_far _PokemonTower4EndBattleText2
text_end
PokemonTower4AfterBattleText2:
text_far _PokemonTower4AfterBattleText2
text_end
PokemonTower4BattleText3:
text_far _PokemonTower4BattleText3
text_end
PokemonTower4EndBattleText3:
text_far _PokemonTower4EndBattleText3
text_end
PokemonTower4AfterBattleText3:
text_far _PokemonTower4AfterBattleText3
text_end

View file

@ -22,7 +22,7 @@ Route24_ScriptPointers:
dw Route24Script4
Route24Script0:
CheckEvent EVENT_GOT_NUGGET
CheckEvent EVENT_BEAT_ROUTE24_ROCKET
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5140e
call ArePlayerCoordsInArray
@ -106,9 +106,9 @@ Route24TrainerHeader5:
; We added the infinite Nugget glitch from FRLG to own the libs
Route24Text1:
text_asm
ResetEvent EVENT_NUGGET_REWARD_AVAILABLE
;CheckEvent EVENT_GOT_NUGGET
;jr nz, .got_item
;ResetEvent EVENT_NUGGET_REWARD_AVAILABLE
CheckEvent EVENT_BEAT_ROUTE24_ROCKET
jr nz, .got_item
ld hl, Route24Text_51510
call PrintText
lb bc, NUGGET, 1
@ -142,7 +142,7 @@ Route24Text1:
.bag_full
ld hl, Route24Text_51521
call PrintText
SetEvent EVENT_NUGGET_REWARD_AVAILABLE
; SetEvent EVENT_NUGGET_REWARD_AVAILABLE
jp TextScriptEnd
Route24Text_51510: