thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-10-15 19:54:24 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mt Moon Square, Jessie & James Backport

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audio.asm
View file

@ -375,6 +375,7 @@ INCLUDE "crysaudio/music/RBY/sakaki.asm"
INCLUDE "crysaudio/music/RBY/meetjessiejames.asm"
INCLUDE "crysaudio/music/RBY/digda01.asm"
INCLUDE "crysaudio/music/RBY/field06.asm"
INCLUDE "crysaudio/music/RBY/victory4.asm"
SECTION "TCG Songs 1", ROMX

4
constants/event_constants.asm
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

3
constants/hide_show_constants.asm
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

1
constants/map_constants.asm
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

2
constants/music_constants.asm
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

187
crysaudio/music/RBY/victory4.asm Normal file
View file

@ -0,0 +1,187 @@
;
;; Victory01
;
;; Converting on Sat Mar 11 14:49:42 1995
;
;; by ver 1.02
;
Music_Victory4::
channel_count 3
channel 1, Music_Victory4_Ch1
channel 2, Music_Victory4_Ch2
channel 3, Music_Victory4_Ch3
;;----------------------------------------
Music_Victory4_Ch1:
;;----------------------------------------
tempo 112
volume 7, 7
duty_cycle 2
toggle_perfect_pitch
;; P1-1
note_type 8, 10, 2
octave 4
note D_, 2
note D_, 2
note D_, 2
note D_, 2
octave 3
note A_, 2
octave 4
note D_, 2
note_type 8, 11, 3
note F#, 12
;; P1-2
rest 1
.loop10
note_type 12, 4, 4
.loop11
octave 4
note D_, 2
note E_, 2
note F#, 4
note F#, 2
note A_, 2
octave 5
note D_, 4
sound_loop 2, .loop11
;; P2-4
.loop12
octave 4
note E_, 2
note F#, 2
note G#, 4
note G#, 2
note B_, 2
octave 5
note E_, 4
sound_loop 2, .loop12
;; P2-6
.loop13
octave 4
note C#, 2
note D_, 2
note E_, 4
note E_, 2
note G_, 2
octave 5
note C#, 4
sound_loop 2, .loop13
;; P2-8
.loop14
octave 4
note D_, 2
note E_, 2
note F#, 4
note F#, 2
note A_, 2
octave 5
note D_, 4
sound_loop 2, .loop14
sound_loop 0, .loop10
;;----------------------------------------
Music_Victory4_Ch2:
;;----------------------------------------
duty_cycle 2
vibrato 24, 2, 4
;; P2-1
note_type 8, 12, 3
octave 4
note A_, 2
note A_, 2
note A_, 2
note A_, 2
note B_, 2
octave 5
note C#, 2
note_type 8, 12, 4
note D_, 12
;; P2-2
.loop20
note_type 12, 8, 2
.loop21
octave 4
note D_, 2
note E_, 2
note F#, 4
note F#, 2
note A_, 2
octave 5
note D_, 4
note_type 12, 6, 2
sound_loop 2, .loop21
;; P2-4
note_type 12, 8, 2
.loop22
octave 4
note E_, 2
note F#, 2
note G#, 4
note G#, 2
note B_, 2
octave 5
note E_, 4
note_type 12, 6, 2
sound_loop 2, .loop22
;; P2-6
note_type 12, 8, 2
.loop23
octave 4
note C#, 2
note D_, 2
note E_, 4
note E_, 2
note G_, 2
octave 5
note C#, 4
note_type 12, 6, 2
sound_loop 2, .loop23
;; P2-8
note_type 12, 8, 2
.loop24
octave 4
note D_, 2
note E_, 2
note F#, 4
note F#, 2
note A_, 2
octave 5
note D_, 4
note_type 12, 6, 2
sound_loop 2, .loop24
sound_loop 0, .loop20
;;----------------------------------------
Music_Victory4_Ch3:
;;----------------------------------------
;; P3-1
note_type 12, 1, 0
octave 5
note D_, 4
note_type 8, 1, 0
octave 4
note B_, 2
note A_, 2
note G_, 2
note A_, 12
;; P3-2
sound_ret

2
crysaudio/music_pointers_red.asm
View file

@ -52,5 +52,5 @@ Music:
dba Music_Digda01
dba Music_Field06
dba Music_MeetJessieJames
dba Music_MtMoonSquare
dba Music_Sakaki
dba Music_Victory4

2
data/maps/headers/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,2 @@
map_header MtMoonSquare, MT_MOON_SQUARE, OVERWORLD, 0
end_map_header

14
data/maps/hide_show_data.asm
View file

@ -253,7 +253,8 @@ MapHSPointers:
dw NoHS
dw NoHS
dw GiovannisRoomHS
dw NoHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square
assert_table_length NUM_MAPS
dw -1 ; end
@ -420,11 +421,12 @@ MtMoon1FHS:
db MT_MOON_1F, $0C, SHOW ; HS_MT_MOON_1F_ITEM_5
db MT_MOON_1F, $0D, SHOW ; HS_MT_MOON_1F_ITEM_6
MtMoonB2FHS:
db MT_MOON_B2F, $06, SHOW ; HS_MT_MOON_B2F_FOSSIL_1
db MT_MOON_B2F, $07, SHOW ; HS_MT_MOON_B2F_FOSSIL_2
db MT_MOON_B2F, $08, SHOW ; HS_MT_MOON_B2F_ITEM_1
db MT_MOON_B2F, $09, SHOW ; HS_MT_MOON_B2F_ITEM_2
db MT_MOON_B2F, $0A, HIDE ; HS_MT_MOON_CRATER_GUARD
db MT_MOON_B2F, $02, HIDE ; Jessie
db MT_MOON_B2F, $06, HIDE ; James
db MT_MOON_B2F, $07, SHOW ; Fossil 1
db MT_MOON_B2F, $08, SHOW ; Fossil 2
db MT_MOON_B2F, $09, SHOW ; Item 1
db MT_MOON_B2F, $0A, SHOW ; Item 2
SSAnne2FHS:
db SS_ANNE_2F, $02, HIDE ; HS_SS_ANNE_2F_RIVAL
SSAnne1FRoomsHS:

1
data/maps/map_header_banks.asm
View file

@ -252,4 +252,5 @@ MapHeaderBanks::
db BANK(RockTunnelB1F_h)
db BANK(GiovannisRoom_h)
db BANK(BattleTent_h)
db BANK(MtMoonSquare_h)
assert_table_length NUM_MAPS

1
data/maps/map_header_pointers.asm
View file

@ -252,4 +252,5 @@ MapHeaderPointers::
dw RockTunnelB1F_h
dw GiovannisRoom_h
dw BattleTent_h
dw MtMoonSquare_h
assert_table_length NUM_MAPS

18
data/maps/objects/MtMoonB2F.asm
View file

@ -6,20 +6,20 @@ MtMoonB2F_Object:
warp_event 21, 17, MT_MOON_B1F, 5
warp_event 15, 27, MT_MOON_B1F, 6
warp_event 5, 7, MT_MOON_B1F, 7
warp_event 29, 7, MT_MOON_B1F, 9
warp_event 29, 7, MT_MOON_SQUARE, 1
def_bg_events
def_object_events
object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2
object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
object_event 34, 25, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
object_event 21, 5, SPRITE_FOSSIL, STAY, NONE, 9, WING_FOSSIL
object_event 29, 7, SPRITE_SCIENTIST, STAY, NONE, 10, ; Crater Guard
object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1
object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
object_event 33, 9, SPRITE_POKE_BALL, STAY, NONE, 10, WING_FOSSIL
def_warps_to MT_MOON_B2F

16
data/maps/objects/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,16 @@
MtMoonSquare_Object:
db $2C ; border block
def_warp_events
warp_event 18, 5, MT_MOON_1F, 8
warp_event 22, 11, MT_MOON_1F, 8
warp_event 24, 3, MT_MOON_CRATER, 1
;warp_event 13, 7, MT_MOON_SQUARE_HOUSE, 1
def_bg_events
bg_event 17, 7, 1 ; Sign
def_object_events
object_event 8, 8, SPRITE_CLEFAIRY, STAY, DOWN, 1 ; person
def_warps_to MT_MOON_SQUARE

3
data/maps/songs.asm
View file

@ -119,7 +119,7 @@ MapSongBanks::
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE
db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F
db MUSIC_MTMOONSQUARE, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_VICTORY4, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM
@ -251,4 +251,5 @@ MapSongBanks::
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
db MUSIC_GYM, 0 ; BATTLE_TENT
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
assert_table_length NUM_MAPS

1
data/wild/grass_water.asm
View file

@ -251,6 +251,7 @@ WildDataPointers:
dw RockTunnelB1FWildMons
dw NothingWildMons
dw NothingWildMons ; battle tent
dw NothingWildMons ; mt moon square
assert_table_length NUM_MAPS
dw -1 ; end

5
maps.asm
View file

@ -1376,3 +1376,8 @@ INCLUDE "data/maps/headers/BattleTent.asm"
INCLUDE "data/maps/objects/BattleTent.asm"
INCLUDE "scripts/BattleTent.asm"
BattleTent_Blocks: INCBIN "maps/BattleTent.blk"
INCLUDE "data/maps/headers/MtMoonSquare.asm"
INCLUDE "data/maps/objects/MtMoonSquare.asm"
INCLUDE "scripts/MtMoonSquare.asm"
MtMoonSquare_Blocks: INCBIN "maps/MtMoonSquare.blk"

6
maps/MtMoonSquare.blk Normal file
View file

@ -0,0 +1,6 @@
>?????????????;(+WWWW*,,,,+*)()bQQc$WWW%n()()NttM
tn()()NttM111
>??,)()P
O/$W*)()11111111111()(,???????????,)$WWWWWWWWWWWWW%

8
scripts/HallOfFame.asm
View file

@ -93,13 +93,13 @@ HallofFameRoomScript1:
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
ld [wJoyIgnore], a
ld [wJoyIgnore], a ; TODO: Make this less awful. See: Giovanni in Silph
ld a, HS_CERULEAN_CAVE_GUY
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_MT_MOON_CRATER_GUARD
ld [wMissableObjectIndex], a
predef HideObject
;ld a, HS_MT_MOON_CRATER_GUARD
;ld [wMissableObjectIndex], a
;predef HideObject
ld a, HS_ROUTE_1_OAK
ld [wMissableObjectIndex], a
predef ShowObject

511
scripts/MtMoonB2F.asm
View file

@ -37,13 +37,23 @@ CoordsData_49d37:
dbmapcoord 14, 8
db -1 ; end
MtMoon3Script_49d58:
MtMoon3Script_49cd7:
CheckAndResetEvent EVENT_57E
call nz, MtMoon3Script_49cec
xor a
ld [wJoyIgnore], a
MtMoon3Script_49ce5:
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
ret
MtMoon3Script_49cec:
ld a, HS_MT_MOON_B2F_JESSIE
call MtMoon3Script_49f93
ld a, HS_MT_MOON_B2F_JAMES
call MtMoon3Script_49f93
ret
MtMoonB2F_ScriptPointers:
dw MtMoon3Script0
dw DisplayEnemyTrainerTextAndStartBattle
@ -51,23 +61,45 @@ MtMoonB2F_ScriptPointers:
dw MtMoon3Script3
dw MtMoon3Script4
dw MtMoon3Script5
dw MtMoon3Script6
dw MtMoon3Script7
dw MtMoon3Script8
dw MtMoon3Script9
dw MtMoon3Script10
dw MtMoon3Script11
dw MtMoon3Script12
dw MtMoon3Script13
dw MtMoon3Script14
dw MtMoon3Script15
MtMoon3Script0:
IF DEF(_DEBUG)
call DebugPressedOrHeldB
ret nz
ENDC
CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
call z, MtMoon3Script_49d28
CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
call z, MtMoon3Script_49e15
ret
MtMoon3Script_49d28:
CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
jp nz, MtMoon3Script_49d91
jp nz, .asm_49d4b
ld a, [wYCoord]
cp 8
jp nz, MtMoon3Script_49d91
jp nz, .asm_49d4b
ld a, [wXCoord]
cp 13
jp nz, MtMoon3Script_49d91
jp nz, .asm_49d4b
xor a
ldh [hJoyHeld], a
ld a, $1
ldh [hSpriteIndexOrTextID], a
jp DisplayTextID
call DisplayTextID
ret
MtMoon3Script_49d91:
.asm_49d4b
CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
jp z, CheckFightingMapTrainers
ret
@ -75,55 +107,75 @@ MtMoon3Script_49d91:
MtMoon3Script3:
ld a, [wIsInBattle]
cp $ff
jp z, MtMoon3Script_49d58
jp z, MtMoon3Script_49cd7
call UpdateSprites
call Delay3
SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
call MtMoon3Script_49ce5
ret
MtMoon3Script4:
ld a, $1
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld hl, CoordsData_49dea
ld hl, CoordsData_49dc7
call ArePlayerCoordsInArray
jr c, .asm_49dd7
ld hl, CoordsData_49df1
jr c, .asm_49da8
ld hl, CoordsData_49dc0
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
ld de, MovementData_49df9
jr .asm_49dda
.asm_49dd7
ld de, MovementData_49df8
.asm_49dda
jr c, .asm_49db0
ld hl, CoordsData_49dd5
call ArePlayerCoordsInArray
jr c, .asm_49d9b
ld hl, CoordsData_49dce
call ArePlayerCoordsInArray
jr c, .asm_49da3
jp CheckFightingMapTrainers
; these are most likely pikachu-related and could be removed, but would need a lot of testing to make sure.
.asm_49d9b
ld b, SPRITE_FACING_LEFT
.asm_49da3
ld de, MovementData_49ddd
jr .asm_49db3
.asm_49da8
ld b, SPRITE_FACING_RIGHT
.asm_49db0
ld de, MovementData_49ddc
.asm_49db3
ld a, $1
ldh [hSpriteIndex], a
call MoveSprite
ld a, $5
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
call MtMoon3Script_49ce5
ret
CoordsData_49dea:
CoordsData_49dc0:
dbmapcoord 12, 7
dbmapcoord 11, 6
dbmapcoord 12, 5
db -1 ; end
CoordsData_49df1:
CoordsData_49dc7:
dbmapcoord 12, 7
db -1 ; end
CoordsData_49dce:
dbmapcoord 13, 7
dbmapcoord 14, 6
dbmapcoord 14, 5
db -1 ; end
MovementData_49df8:
CoordsData_49dd5:
dbmapcoord 13, 7
db -1 ; end
MovementData_49ddc:
db NPC_MOVEMENT_RIGHT
MovementData_49df9:
MovementData_49ddd:
db NPC_MOVEMENT_UP
db -1 ; end
@ -135,23 +187,215 @@ MtMoon3Script5:
ld [wJoyIgnore], a
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $a
ld a, $b
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
CheckEvent EVENT_GOT_DOME_FOSSIL
CheckEvent EVENT_GOT_HELIX_FOSSIL
jr z, .asm_49e1d
ld a, HS_MT_MOON_B2F_FOSSIL_2
ld a, HS_MT_MOON_B2F_FOSSIL_1
jr .asm_49e1f
.asm_49e1d
ld a, HS_MT_MOON_B2F_FOSSIL_1
ld a, HS_MT_MOON_B2F_FOSSIL_2
.asm_49e1f
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a
ld a, $0
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
call MtMoon3Script_49ce5
ret
MtMoon3Script_49e15:
ld a, [wXCoord]
cp $3
ret nz
ld a, [wYCoord]
cp $5
ret nz
call StopMusic
ld c, 0 ; BANK(Music_MeetJessieJames)
ld a, MUSIC_MEET_JESSIE_JAMES
call PlayMusic
xor a
ldh [hJoyHeld], a
ld a, ~(A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld a, HS_MT_MOON_B2F_JESSIE
call MtMoon3Script_49f84
ld a, HS_MT_MOON_B2F_JAMES
call MtMoon3Script_49f84
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $c
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
ld a, $ff
ld [wJoyIgnore], a
ld a, $6
call MtMoon3Script_49ce5
ret
MovementData_f9e65:
db $06
MovementData_f9e66:
db $06
db $06
db $06
db $06
db $06
db $FF
MtMoon3Script6:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3
ld a, $2
ldh [hSpriteIndex], a
ld de, MovementData_f9e65
call MoveSprite
ld a, $ff
ld [wJoyIgnore], a
ld a, $7
call MtMoon3Script_49ce5
ret
MtMoon3Script7:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd730]
bit 0, a
ret nz
MtMoon3Script8:
ld a, $2
ld [wSprite02StateData1MovementStatus], a
ld a, SPRITE_FACING_DOWN
ld [wSprite02StateData1FacingDirection], a
MtMoon3Script9:
ld a, $6
ldh [hSpriteIndex], a
ld de, MovementData_f9e66
call MoveSprite
ld a, $ff
ld [wJoyIgnore], a
ld a, $a
call MtMoon3Script_49ce5
ret
MtMoon3Script10:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wd730]
bit 0, a
ret nz
MtMoon3Script11:
ld a, $2
ld [wSprite06StateData1MovementStatus], a
ld a, SPRITE_FACING_LEFT
ld [wSprite06StateData1FacingDirection], a
call Delay3
ld a, ~(A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld a, $d
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
MtMoon3Script12:
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, MtMoon3JessieJamesEndBattleText
ld de, MtMoon3JessieJamesEndBattleText
call SaveEndBattleTextPointers
ld a, OPP_JESSIE_JAMES
ld [wCurOpponent], a
ld a, 1
ld [wTrainerNo], a
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
ld a, 1
ld [wIsTrainerBattle], a
SetEvent EVENT_57E
ld a, $d
call MtMoon3Script_49ce5
ret
MtMoon3Script13:
ld a, $ff
ld [wJoyIgnore], a
ld a, [wIsInBattle]
cp $ff
jp z, MtMoon3Script_49cd7
ld a, $2
ld [wSprite02StateData1MovementStatus], a
ld [wSprite06StateData1MovementStatus], a
xor a
ld [wSprite02StateData1FacingDirection], a
ld [wSprite06StateData1FacingDirection], a
ld a, ~(A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $e
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
call StopMusic
ld c, 0 ; BANK(Music_MeetJessieJames)
ld a, MUSIC_MEET_JESSIE_JAMES
call PlayMusic
ld a, $ff
ld [wJoyIgnore], a
ld a, $e
call MtMoon3Script_49ce5
ret
MtMoon3Script14:
ld a, $ff
ld [wJoyIgnore], a
call GBFadeOutToBlack
ld a, HS_MT_MOON_B2F_JESSIE
call MtMoon3Script_49f93
ld a, HS_MT_MOON_B2F_JAMES
call MtMoon3Script_49f93
call UpdateSprites
call Delay3
call GBFadeInFromBlack
ld a, $f
call MtMoon3Script_49ce5
ret
MtMoon3Script15:
call PlayDefaultMusic
xor a
ldh [hJoyHeld], a
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
ResetEventReuseHL EVENT_57E
ld a, $0
call MtMoon3Script_49ce5
ret
MtMoon3Script_49f84:
ld [wMissableObjectIndex], a
predef ShowObject
call UpdateSprites
call Delay3
ret
MtMoon3Script_49f93:
ld [wMissableObjectIndex], a
predef HideObject
ret
MtMoonB2F_TextPointers:
@ -162,189 +406,206 @@ MtMoonB2F_TextPointers:
dw MtMoon3Text5
dw MtMoon3Text6
dw MtMoon3Text7
dw MtMoon3Text8
dw PickUpItemText
dw PickUpItemText
dw MtMoon3Text_49f99
dw MtMoonCraterGuard
dw MtMoon3Text11
dw MtMoon3Text12
dw MtMoon3Text13
dw MtMoon3Text14
MtMoon3TrainerHeaders:
def_trainers 2
def_trainers 3
MtMoon3TrainerHeader0:
trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoon3BattleText2, MtMoon3EndBattleText2, MtMoon3AfterBattleText2
MtMoon3TrainerHeader1:
trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoon3BattleText3, MtMoon3EndBattleText3, MtMoon3AfterBattleText3
MtMoon3TrainerHeader2:
MtMoon3TrainerHeader1:
trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoon3BattleText4, MtMoon3EndBattleText4, MtMoon3AfterBattleText4
MtMoon3TrainerHeader3:
MtMoon3TrainerHeader2:
trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoon3BattleText5, MtMoon3EndBattleText5, MtMoon3AfterBattleText5
db -1 ; end
MtMoon3Text2:
MtMoon3Text6:
text_end
MtMoon3Text12:
text_far _MtMoonJessieJamesText1
text_asm
ld c, 10
call DelayFrames
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
ld a, $0
ld [wEmotionBubbleSpriteIndex], a
ld a, EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld c, 20
call DelayFrames
jp TextScriptEnd
MtMoon3Text13:
text_far _MtMoonJessieJamesText2
text_end
MtMoon3JessieJamesEndBattleText:
text_far _MtMoonJessieJamesText3
text_end
MtMoon3Text14:
text_far _MtMoonJessieJamesText4
text_asm
ld c, 64
call DelayFrames
jp TextScriptEnd
MtMoon3Text1:
text_asm
CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
jr z, .asm_49e8d
jr z, .asm_4a02f
; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8))
jr nz, .asm_49eb8
ld hl, MtMoon3Text_49f8f
jr nz, .asm_4a057
ld hl, MtMoon3Text_4a116
call PrintText
jr .asm_49ebe
.asm_49e8d
ld hl, MtMoon3Text_49f85
jr .asm_4a05d
.asm_4a02f
ld hl, MtMoon3Text_4a10c
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, MtMoon3Text_49f8a
ld de, MtMoon3Text_49f8a
ld hl, MtMoon3SuperNerdEndBattleText
ld de, MtMoon3SuperNerdEndBattleText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
jr .asm_49ebe
.asm_49eb8
ld hl, MtMoon3Text_49f94
call PrintText
.asm_49ebe
jp TextScriptEnd
call MtMoon3Script_49ce5
jr .asm_4a05d
MtMoon3Text2:
text_asm
ld hl, MtMoon3TrainerHeader0
call TalkToTrainer
.asm_4a057
ld hl, MtMoon3Text_4a11b
call PrintText
.asm_4a05d
jp TextScriptEnd
MtMoon3Text3:
text_asm
ld hl, MtMoon3TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
ld hl, MtMoon3TrainerHeader0
jr MtMoon3TalkToTrainer
MtMoon3Text4:
text_asm
ld hl, MtMoon3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
ld hl, MtMoon3TrainerHeader1
jr MtMoon3TalkToTrainer
MtMoon3Text5:
text_asm
ld hl, MtMoon3TrainerHeader3
ld hl, MtMoon3TrainerHeader2
MtMoon3TalkToTrainer:
call TalkToTrainer
jp TextScriptEnd
MtMoon3Text6:
text_asm
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f24
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .asm_49f21
lb bc, DOME_FOSSIL, 1
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, HS_MT_MOON_B2F_FOSSIL_1
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_DOME_FOSSIL
ld a, $4
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
.asm_49f21
jp TextScriptEnd
MtMoon3Text_49f24:
text_far _MtMoon3Text_49f24
text_end
MtMoon3Text7:
text_asm
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f64
ld hl, MtMoon3Text_4a0ae
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .asm_49f61
jr nz, .asm_4a0ab
lb bc, DOME_FOSSIL, 1
call GiveItem
jp nc, MtMoon3Script_4a0fd
call MtMoon3Script_4a0f0
ld a, HS_MT_MOON_B2F_FOSSIL_1
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_DOME_FOSSIL
ld a, $4
call MtMoon3Script_49ce5
.asm_4a0ab
jp TextScriptEnd
MtMoon3Text_4a0ae:
text_far _MtMoon3Text_49f24
text_end
MtMoon3Text8:
text_asm
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_4a0eb
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .asm_4a0e8
lb bc, HELIX_FOSSIL, 1
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
jp nc, MtMoon3Script_4a0fd
call MtMoon3Script_4a0f0
ld a, HS_MT_MOON_B2F_FOSSIL_2
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_HELIX_FOSSIL
ld a, $4
ld [wMtMoonB2FCurScript], a
ld [wCurMapScript], a
.asm_49f61
call MtMoon3Script_49ce5
.asm_4a0e8
jp TextScriptEnd
MtMoon3Text_49f64:
MtMoon3Text_4a0eb:
text_far _MtMoon3Text_49f64
text_end
MtMoon3Script_49f69:
ld hl, MtMoon3Text_49f6f
MtMoon3Script_4a0f0:
ld hl, MtMoon3Text_4a0f6
jp PrintText
MtMoon3Text_49f6f:
MtMoon3Text_4a0f6:
text_far _MtMoon3Text_49f6f
sound_get_key_item
text_waitbutton
text_end
MtMoon3Script_49f76:
ld hl, MtMoon3Text_49f7f
MtMoon3Script_4a0fd:
ld hl, MtMoon3Text_4a106
call PrintText
jp TextScriptEnd
MtMoon3Text_49f7f:
MtMoon3Text_4a106:
text_far _MtMoon3Text_49f7f
text_waitbutton
text_end
MtMoon3Text_49f85:
MtMoon3Text_4a10c:
text_far _MtMoon3Text_49f85
text_end
MtMoon3Text_49f8a:
MtMoon3SuperNerdEndBattleText:
text_far _MtMoon3Text_49f8a
text_end
MtMoon3Text_49f8f:
MtMoon3Text_4a116:
text_far _MtMoon3Text_49f8f
text_end
MtMoon3Text_49f94:
MtMoon3Text_4a11b:
text_far _MtMoon3Text_49f94
text_end
MtMoon3Text_49f99:
MtMoon3Text11:
text_far _MtMoon3Text_49f99
sound_get_key_item
text_end
MtMoon3BattleText2:
text_far _MtMoon3BattleText2
text_end
MtMoon3EndBattleText2:
text_far _MtMoon3EndBattleText2
text_end
MtMoon3AfterBattleText2:
text_far _MtMoon3AfterBattleText2
text_end
MtMoon3BattleText3:
text_far _MtMoon3BattleText3
text_end
@ -379,8 +640,4 @@ MtMoon3EndBattleText5:
MtMoon3AfterBattleText5:
text_far _MtMoon3AfterBattleText5
text_end
MtMoonCraterGuard:
text_far _MtMoonCraterGuard
text_end

12
scripts/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,12 @@
MtMoonSquare_Script:
jp EnableAutoTextBoxDrawing
MtMoonSquare_TextPointers:
dw MtMoonSquareSign
MtMoonSquareSign:
text "MT MOON SQUARE"
line "Please don't"
cont "litter. Put trash"
cont "where it belongs!"
done