Fix Giovanni's Room + bits and bobs

- Fixed the Arrow Tiles, it was very silly.
- Edited the text in Giovanni's Room to fix a gap, but also ended up adding citations and stuff to the file for the interested.
- Edited the map in Giovanni's Room to make a little more sense.
- Fixed some post-game Hall of Fame setup stuff.
- Edited Install.MD to be more idiot-proof
This commit is contained in:
Llinos Evans 2023-09-20 01:24:35 +01:00
parent 9d935a59a1
commit c0bf3ff49d
9 changed files with 73 additions and 57 deletions

View file

@ -1,5 +1,10 @@
GiovannisRoom_Script:
jp EnableAutoTextBoxDrawing
call EnableAutoTextBoxDrawing
ld de, GiovannisRoom_ScriptPointers
ld a, [wGiovannisRoomCurScript]
call ExecuteCurMapScriptInTable
ld [wGiovannisRoomCurScript], a
ret
GiovannisRoom_ScriptPointers:
dw GiovannisRoomScript0
@ -13,7 +18,7 @@ GiovannisRoomScript0:
ld hl, GiovannisRoomArrowTilePlayerMovement
call DecodeArrowMovementRLE
cp $ff
jp z, CheckFightingMapTrainers
jr z, .done ; Normally this checks for map trainers, but since there's none, we can remove them.
ld hl, wd736
set 7, [hl]
call StartSimulatingJoypadStates
@ -21,10 +26,12 @@ GiovannisRoomScript0:
call PlaySound
ld a, $ff
ld [wJoyIgnore], a
ld a, $3
ld a, $1
ld [wCurMapScript], a
.done
ret
; Some tile movements were removed due to either being unnecessary or ports from Viridian Gym itself.
GiovannisRoomArrowTilePlayerMovement:
map_coord_movement 12, 16, GiovannisRoomArrowMovement1
map_coord_movement 14, 15, GiovannisRoomArrowMovement2
@ -34,11 +41,8 @@ GiovannisRoomArrowTilePlayerMovement:
map_coord_movement 15, 8, GiovannisRoomArrowMovement7
map_coord_movement 12, 9, GiovannisRoomArrowMovement8
map_coord_movement 14, 9, GiovannisRoomArrowMovement9
map_coord_movement 13, 10, GiovannisRoomArrowMovement10
map_coord_movement 15, 10, GiovannisRoomArrowMovement11
map_coord_movement 12, 11, GiovannisRoomArrowMovement12
map_coord_movement 14, 11, GiovannisRoomArrowMovement13
map_coord_movement 14, 5, GiovannisRoomArrowMovement14
db -1 ; end
GiovannisRoomArrowMovement1:
@ -78,32 +82,18 @@ GiovannisRoomArrowMovement9:
db D_UP, 1
db -1 ; end
GiovannisRoomArrowMovement10:
db D_RIGHT, 5
db -1 ; end
GiovannisRoomArrowMovement11:
db D_RIGHT, 3
db -1 ; end
GiovannisRoomArrowMovement12:
db D_UP, 1
db D_RIGHT, 2
db D_UP, 2
db -1 ; end
GiovannisRoomArrowMovement13:
db D_UP, 3
db -1 ; end
GiovannisRoomArrowMovement14:
db D_RIGHT, 4
db -1 ; end
GiovannisRoomScript4:
ld a, [wSimulatedJoypadStatesIndex]
and a
jp nz, LoadSpinnerArrowTiles
jr nz, .GiovannisRoomLoadSpinnerArrow
xor a
ld [wJoyIgnore], a
ld hl, wd736
@ -111,6 +101,8 @@ GiovannisRoomScript4:
ld a, $0
ld [wCurMapScript], a
ret
.GiovannisRoomLoadSpinnerArrow
farjp LoadSpinnerArrowTiles
GiovannisRoom_TextPointers:
dw GiovannisRoomText1

View file

@ -149,14 +149,14 @@ ResetLegendaryPokemon:
.skipArticuno ; Rinse and repeat.
ld a, DEX_ZAPDOS
call HoFIsPokemonBitSet
jr z, .skipZapdos
jr nz, .skipZapdos
ResetEvent EVENT_BEAT_ZAPDOS
ld a, HS_ZAPDOS
call ShowThis
.skipZapdos
ld a, DEX_MOLTRES
call HoFIsPokemonBitSet
jr z, .skipMoltres
jr nz, .skipMoltres
ResetEvent EVENT_BEAT_MOLTRES
ld a, HS_MOLTRES
call ShowThis
@ -175,7 +175,7 @@ ResetLegendaryPokemon:
; So, we put this here.
ld a, DEX_MEW
call HoFIsPokemonBitSet
jr z, .skipMew
jr nz, .skipMew
ResetEvent EVENT_BEAT_MEW
ld a, HS_MEW
call ShowThis
@ -184,28 +184,28 @@ ResetLegendaryPokemon:
jp z, .skipGalarianBirdsAndMewtwo ; If you haven't cleared the game yet, you've not met the Galarian Birds. So we may as well skip processing all this.
ld a, DEX_ARTICUNO_G
call HoFIsPokemonBitSet
jr z, .skipArticunoG
jr nz, .skipArticunoG
ResetEvent EVENT_BEAT_ARTICUNO_G
ld a, HS_GARNET_ARTICUNO_G
call ShowThis
.skipArticunoG
ld a, DEX_ZAPDOS_G
call HoFIsPokemonBitSet
jr z, .skipZapdosG
jr nz, .skipZapdosG
ResetEvent EVENT_BEAT_ZAPDOSG
ld a, HS_BRUNSWICK_ZAPDOS_G_2
call ShowThis
.skipZapdosG
ld a, DEX_MOLTRES_G
call HoFIsPokemonBitSet
jr z, .skipMoltresG
jr nz, .skipMoltresG
ResetEvent EVENT_BEAT_GALARIAN_MOLTRES
ld a, HS_MOLTRES_G
call ShowThis
.skipMoltresG
ld a, DEX_MEWTWO
call HoFIsPokemonBitSet
jr z, .skipGalarianBirdsAndMewtwo
jr nz, .skipGalarianBirdsAndMewtwo
ResetEvent EVENT_BEAT_MEWTWO
ld a, HS_MEWTWO
call ShowThis