Mt Moon Square, Jessie & James Backport

This adds Victory4 in its original form over Mt. Moon Square's music, which could possibly have the initial jingle removed. I noticed the GSC version was being used, which wasn't ideal.

Mt. Moon Square's map is added, with accessibility where the Crater's originally was (for now). One warp on the south part of the map doesn't go anywhere (actually it's a glitch city). The shop and Clefairy event aren't done yet.

The Mt. Moon Crater Guard has been removed with the pretence of re-adding him on the Square map once it's finished.

I'm trying out having the text in the raw script file without farcalling, which seems to be more optimal than doing it the way the devs originally did it. The Battle Tent does this too.
This commit is contained in:
Llinos Evans 2023-05-15 19:26:42 +01:00
parent b03e9ffc6e
commit 082e581d81
20 changed files with 646 additions and 152 deletions

View file

@ -593,13 +593,13 @@
const EVENT_BEAT_MT_MOON_1_TRAINER_4
const EVENT_BEAT_MT_MOON_1_TRAINER_5
const EVENT_BEAT_MT_MOON_1_TRAINER_6
const_skip
const EVENT_GOT_DOME_FOSSIL
const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
const EVENT_BEAT_MT_MOON_3_TRAINER_0
const EVENT_BEAT_MT_MOON_3_TRAINER_1
const EVENT_BEAT_MT_MOON_3_TRAINER_2
const EVENT_BEAT_MT_MOON_3_TRAINER_3
const EVENT_GOT_DOME_FOSSIL
const EVENT_57E ; Jessie & James related.
const EVENT_GOT_HELIX_FOSSIL
; S.S. Anne events

View file

@ -124,11 +124,12 @@ DEF SHOW EQU $15
const HS_MT_MOON_1F_ITEM_4 ; 70 X
const HS_MT_MOON_1F_ITEM_5 ; 71 X
const HS_MT_MOON_1F_ITEM_6 ; 72 X
const HS_MT_MOON_B2F_JESSIE ; UHH 6D
const HS_MT_MOON_B2F_JAMES ; uhhh 6E
const HS_MT_MOON_B2F_FOSSIL_1 ; 73
const HS_MT_MOON_B2F_FOSSIL_2 ; 74
const HS_MT_MOON_B2F_ITEM_1 ; 75 X
const HS_MT_MOON_B2F_ITEM_2 ; 76 X
const HS_MT_MOON_CRATER_GUARD ; 77
const HS_SS_ANNE_2F_RIVAL ; 78
const HS_SS_ANNE_1F_ROOMS_ITEM ; 79 X
const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7A X

View file

@ -270,6 +270,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F8 - Switched with CINNABAR_VOLCANO_FLOORS
map_const GIOVANNIS_ROOM, 11, 14 ; $F9
map_const BATTLE_TENT, 5, 10 ; $FA
map_const MT_MOON_SQUARE, 15, 9 ; $FB
DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps

View file

@ -58,8 +58,8 @@
const MUSIC_DIGDA01
const MUSIC_FIELD06
const MUSIC_MEET_JESSIE_JAMES
const MUSIC_MTMOONSQUARE
const MUSIC_SAKAKI
const MUSIC_VICTORY4
const NUM_SONGS