pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix triple newlines left over from removing address comments

Browse Source
This commit is contained in:
Rangi 2018-06-24 23:22:50 -04:00
parent 91f914718a
commit 67d1364c7a
193 changed files with 3 additions and 1965 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio.asm
View File

@ -11,7 +11,6 @@ INCLUDE "audio/cry_pointers.asm"
INCLUDE "audio/sfx_pointers.asm" INCLUDE "audio/sfx_pointers.asm"
SECTION "Songs 1", ROMX SECTION "Songs 1", ROMX
INCLUDE "audio/music/route36.asm" INCLUDE "audio/music/route36.asm"
@ -130,7 +129,6 @@ INCLUDE "audio/music/battletowerlobby.asm"
INCLUDE "audio/music/mobilecenter.asm" INCLUDE "audio/music/mobilecenter.asm"
SECTION "Extra Songs 1", ROMX SECTION "Extra Songs 1", ROMX
INCLUDE "audio/music/credits.asm" INCLUDE "audio/music/credits.asm"
@ -143,7 +141,6 @@ SECTION "Extra Songs 2", ROMX
INCLUDE "audio/music/postcredits.asm" INCLUDE "audio/music/postcredits.asm"
SECTION "Sound Effects", ROMX SECTION "Sound Effects", ROMX
INCLUDE "audio/sfx.asm" INCLUDE "audio/sfx.asm"
@ -154,7 +151,6 @@ SECTION "Crystal Sound Effects", ROMX
INCLUDE "audio/sfx_crystal.asm" INCLUDE "audio/sfx_crystal.asm"
SECTION "Cries", ROMX SECTION "Cries", ROMX
INCLUDE "data/pokemon/cries.asm" INCLUDE "data/pokemon/cries.asm"

72
audio/engine.asm
View File

@ -56,7 +56,6 @@ _MapSetup_Sound_Off::
pop hl pop hl
ret ret
MusicFadeRestart: MusicFadeRestart:
; restart but keep the music id to fade in to ; restart but keep the music id to fade in to
ld a, [wMusicFadeID + 1] ld a, [wMusicFadeID + 1]
@ -70,19 +69,16 @@ MusicFadeRestart:
ld [wMusicFadeID + 1], a ld [wMusicFadeID + 1], a
ret ret
MusicOn: MusicOn:
ld a, 1 ld a, 1
ld [wMusicPlaying], a ld [wMusicPlaying], a
ret ret
MusicOff: MusicOff:
xor a xor a
ld [wMusicPlaying], a ld [wMusicPlaying], a
ret ret
_UpdateSound:: _UpdateSound::
; called once per frame ; called once per frame
; no use updating audio if it's not playing ; no use updating audio if it's not playing
@ -212,7 +208,6 @@ _UpdateSound::
ld [rNR51], a ld [rNR51], a
ret ret
UpdateChannels: UpdateChannels:
ld hl, .ChannelFnPtrs ld hl, .ChannelFnPtrs
ld a, [wCurChannel] ld a, [wCurChannel]
@ -505,7 +500,6 @@ endr
ld [rNR44], a ld [rNR44], a
ret ret
_CheckSFX: _CheckSFX:
; return carry if any sfx channels are active ; return carry if any sfx channels are active
ld hl, wChannel5Flags1 ld hl, wChannel5Flags1
@ -527,7 +521,6 @@ _CheckSFX:
scf scf
ret ret
PlayDanger: PlayDanger:
ld a, [wLowHealthAlarm] ld a, [wLowHealthAlarm]
bit DANGER_ON_F, a bit DANGER_ON_F, a
@ -588,7 +581,6 @@ PlayDanger:
ld [wSoundOutput], a ld [wSoundOutput], a
ret ret
DangerSoundHigh: DangerSoundHigh:
db $80 ; duty 50% db $80 ; duty 50%
db $e2 ; volume 14, envelope decrease sweep 2 db $e2 ; volume 14, envelope decrease sweep 2
@ -713,7 +705,6 @@ FadeMusic:
ld [wVolume], a ld [wVolume], a
ret ret
LoadNote: LoadNote:
; wait for pitch wheel to finish ; wait for pitch wheel to finish
ld hl, CHANNEL_FLAGS2 ld hl, CHANNEL_FLAGS2
@ -834,7 +825,6 @@ LoadNote:
ld [hl], a ld [hl], a
ret ret
HandleTrackVibrato: HandleTrackVibrato:
; handle duty, cry pitch, and vibrato ; handle duty, cry pitch, and vibrato
ld hl, CHANNEL_FLAGS2 ld hl, CHANNEL_FLAGS2
@ -952,7 +942,6 @@ HandleTrackVibrato:
.quit .quit
ret ret
ApplyPitchWheel: ApplyPitchWheel:
; quit if pitch wheel inactive ; quit if pitch wheel inactive
ld hl, CHANNEL_FLAGS2 ld hl, CHANNEL_FLAGS2
@ -1068,7 +1057,6 @@ ApplyPitchWheel:
set NOTE_DUTY_OVERRIDE, [hl] set NOTE_DUTY_OVERRIDE, [hl]
ret ret
HandleNoise: HandleNoise:
; is noise sampling on? ; is noise sampling on?
ld hl, CHANNEL_FLAGS1 ld hl, CHANNEL_FLAGS1
@ -1095,7 +1083,6 @@ HandleNoise:
ld [wNoiseSampleDelay], a ld [wNoiseSampleDelay], a
ret ret
ReadNoiseSample: ReadNoiseSample:
; sample struct: ; sample struct:
; [wx] [yy] [zz] ; [wx] [yy] [zz]
@ -1146,7 +1133,6 @@ ReadNoiseSample:
.quit .quit
ret ret
ParseMusic: ParseMusic:
; parses until a note is read or the song is ended ; parses until a note is read or the song is ended
call GetMusicByte ; store next byte in a call GetMusicByte ; store next byte in a
@ -1255,7 +1241,6 @@ ParseMusic:
ld [hli], a ; bank ld [hli], a ; bank
ret ret
RestoreVolume: RestoreVolume:
; ch5 only ; ch5 only
ld a, [wCurChannel] ld a, [wCurChannel]
@ -1275,7 +1260,6 @@ RestoreVolume:
ld [wSFXPriority], a ld [wSFXPriority], a
ret ret
ParseSFXOrRest: ParseSFXOrRest:
; turn noise sampling on ; turn noise sampling on
ld hl, CHANNEL_NOTE_FLAGS ld hl, CHANNEL_NOTE_FLAGS
@ -1306,7 +1290,6 @@ ParseSFXOrRest:
ld [hl], a ld [hl], a
ret ret
GetNoiseSample: GetNoiseSample:
; load ptr to sample header in wNoiseSampleAddress ; load ptr to sample header in wNoiseSampleAddress
; are we on the last channel? ; are we on the last channel?
@ -1363,7 +1346,6 @@ GetNoiseSample:
ld [wNoiseSampleDelay], a ld [wNoiseSampleDelay], a
ret ret
ParseMusicCommand: ParseMusicCommand:
; reload command ; reload command
ld a, [wCurMusicByte] ld a, [wCurMusicByte]
@ -1381,7 +1363,6 @@ ParseMusicCommand:
ld l, a ld l, a
jp hl jp hl
MusicCommands: MusicCommands:
; entries correspond to macros/sound.asm enumeration ; entries correspond to macros/sound.asm enumeration
dw Music_Octave8 ; octave 8 dw Music_Octave8 ; octave 8
@ -1443,7 +1424,6 @@ MusicF7:
MusicF8: MusicF8:
ret ret
Music_EndChannel: Music_EndChannel:
; called when $ff is encountered w/ subroutine flag set ; called when $ff is encountered w/ subroutine flag set
; end music stream ; end music stream
@ -1465,7 +1445,6 @@ Music_EndChannel:
ld [hl], d ld [hl], d
ret ret
Music_CallChannel: Music_CallChannel:
; call music stream (subroutine) ; call music stream (subroutine)
; parameters: ll hh ; pointer to subroutine ; parameters: ll hh ; pointer to subroutine
@ -1499,7 +1478,6 @@ Music_CallChannel:
set SOUND_SUBROUTINE, [hl] set SOUND_SUBROUTINE, [hl]
ret ret
Music_JumpChannel: Music_JumpChannel:
; jump ; jump
; parameters: ll hh ; pointer ; parameters: ll hh ; pointer
@ -1515,7 +1493,6 @@ Music_JumpChannel:
ld [hl], d ld [hl], d
ret ret
Music_LoopChannel: Music_LoopChannel:
; loops xx - 1 times ; loops xx - 1 times
; 00: infinite ; 00: infinite
@ -1577,7 +1554,6 @@ Music_LoopChannel:
ld [hl], e ld [hl], e
ret ret
Music_SetCondition: Music_SetCondition:
; set condition for a jump ; set condition for a jump
; used with FB ; used with FB
@ -1591,7 +1567,6 @@ Music_SetCondition:
ld [hl], a ld [hl], a
ret ret
Music_JumpIf: Music_JumpIf:
; conditional jump ; conditional jump
; used with FA ; used with FA
@ -1638,7 +1613,6 @@ Music_JumpIf:
ld [hl], d ld [hl], d
ret ret
MusicEE MusicEE
; conditional jump ; conditional jump
; checks a byte in ram corresponding to the current channel ; checks a byte in ram corresponding to the current channel
@ -1691,7 +1665,6 @@ MusicEE
ld [hl], d ld [hl], d
ret ret
MusicF9: MusicF9:
; sets some flag ; sets some flag
; seems to be unused ; seems to be unused
@ -1700,7 +1673,6 @@ MusicF9:
ld [wc2b5], a ld [wc2b5], a
ret ret
MusicE2: MusicE2:
; seems to have been dummied out ; seems to have been dummied out
; params: 1 ; params: 1
@ -1713,7 +1685,6 @@ MusicE2:
set SOUND_UNKN_0B, [hl] set SOUND_UNKN_0B, [hl]
ret ret
Music_Vibrato: Music_Vibrato:
; vibrato ; vibrato
; params: 2 ; params: 2
@ -1769,7 +1740,6 @@ Music_Vibrato:
ld [hl], a ld [hl], a
ret ret
Music_SlidePitchTo: Music_SlidePitchTo:
; set the target for pitch wheel ; set the target for pitch wheel
; params: 2 ; params: 2
@ -1801,7 +1771,6 @@ Music_SlidePitchTo:
set SOUND_PITCH_WHEEL, [hl] set SOUND_PITCH_WHEEL, [hl]
ret ret
Music_Tone: Music_Tone:
; tone ; tone
; params: 1 (dw) ; params: 1 (dw)
@ -1816,7 +1785,6 @@ Music_Tone:
ld [hl], a ld [hl], a
ret ret
MusicE7: MusicE7:
; unused ; unused
; params: 1 ; params: 1
@ -1829,7 +1797,6 @@ MusicE7:
ld [hl], a ld [hl], a
ret ret
Music_SoundDuty: Music_SoundDuty:
; sequence of 4 duty cycles to be looped ; sequence of 4 duty cycles to be looped
; params: 1 (4 2-bit duty cycle arguments) ; params: 1 (4 2-bit duty cycle arguments)
@ -1850,7 +1817,6 @@ Music_SoundDuty:
ld [hl], a ld [hl], a
ret ret
MusicE8: MusicE8:
; unused ; unused
; params: 1 ; params: 1
@ -1863,7 +1829,6 @@ MusicE8:
ld [hl], a ld [hl], a
ret ret
Music_ToggleSFX: Music_ToggleSFX:
; toggle something ; toggle something
; params: none ; params: none
@ -1878,7 +1843,6 @@ Music_ToggleSFX:
set SOUND_SFX, [hl] set SOUND_SFX, [hl]
ret ret
Music_ToggleNoise: Music_ToggleNoise:
; toggle music noise sampling ; toggle music noise sampling
; can't be used as a straight toggle since the param is not read from on->off ; can't be used as a straight toggle since the param is not read from on->off
@ -1901,7 +1865,6 @@ Music_ToggleNoise:
ld [wMusicNoiseSampleSet], a ld [wMusicNoiseSampleSet], a
ret ret
Music_SFXToggleNoise: Music_SFXToggleNoise:
; toggle sfx noise sampling ; toggle sfx noise sampling
; params: ; params:
@ -1923,7 +1886,6 @@ Music_SFXToggleNoise:
ld [wSFXNoiseSampleSet], a ld [wSFXNoiseSampleSet], a
ret ret
Music_NoteType: Music_NoteType:
; note length ; note length
; # frames per 16th note ; # frames per 16th note
@ -1942,7 +1904,6 @@ Music_NoteType:
call Music_Intensity call Music_Intensity
ret ret
Music_SoundStatus: Music_SoundStatus:
; update sound status ; update sound status
; params: 1 ; params: 1
@ -1953,7 +1914,6 @@ Music_SoundStatus:
set NOTE_UNKN_3, [hl] set NOTE_UNKN_3, [hl]
ret ret
Music_DutyCycle: Music_DutyCycle:
; duty cycle ; duty cycle
; params: 1 ; params: 1
@ -1966,7 +1926,6 @@ Music_DutyCycle:
ld [hl], a ld [hl], a
ret ret
Music_Intensity: Music_Intensity:
; intensity ; intensity
; params: 1 ; params: 1
@ -1978,7 +1937,6 @@ Music_Intensity:
ld [hl], a ld [hl], a
ret ret
Music_Tempo: Music_Tempo:
; global tempo ; global tempo
; params: 2 ; params: 2
@ -1990,7 +1948,6 @@ Music_Tempo:
call SetGlobalTempo call SetGlobalTempo
ret ret
Music_Octave8: Music_Octave8:
Music_Octave7: Music_Octave7:
Music_Octave6: Music_Octave6:
@ -2007,7 +1964,6 @@ Music_Octave1:
ld [hl], a ld [hl], a
ret ret
Music_ForceOctave: Music_ForceOctave:
; set starting octave ; set starting octave
; this forces all notes up by the starting octave ; this forces all notes up by the starting octave
@ -2018,7 +1974,6 @@ Music_ForceOctave:
ld [hl], a ld [hl], a
ret ret
Music_StereoPanning: Music_StereoPanning:
; stereo panning ; stereo panning
; params: 1 ; params: 1
@ -2030,7 +1985,6 @@ Music_StereoPanning:
call GetMusicByte call GetMusicByte
ret ret
Music_Panning: Music_Panning:
; force panning ; force panning
; params: 1 ; params: 1
@ -2042,7 +1996,6 @@ Music_Panning:
ld [hl], a ld [hl], a
ret ret
Music_Volume: Music_Volume:
; set volume ; set volume
; params: 1 ; params: 1
@ -2059,7 +2012,6 @@ Music_Volume:
ld [wVolume], a ld [wVolume], a
ret ret
Music_TempoRelative: Music_TempoRelative:
; set global tempo to current channel tempo +/- param ; set global tempo to current channel tempo +/- param
; params: 1 signed ; params: 1 signed
@ -2086,7 +2038,6 @@ Music_TempoRelative:
call SetGlobalTempo call SetGlobalTempo
ret ret
Music_SFXPriorityOn: Music_SFXPriorityOn:
; turn sfx priority on ; turn sfx priority on
; params: none ; params: none
@ -2094,7 +2045,6 @@ Music_SFXPriorityOn:
ld [wSFXPriority], a ld [wSFXPriority], a
ret ret
Music_SFXPriorityOff: Music_SFXPriorityOff:
; turn sfx priority off ; turn sfx priority off
; params: none ; params: none
@ -2102,7 +2052,6 @@ Music_SFXPriorityOff:
ld [wSFXPriority], a ld [wSFXPriority], a
ret ret
Music_RestartChannel: Music_RestartChannel:
; restart current channel from channel header (same bank) ; restart current channel from channel header (same bank)
; params: 2 (5) ; params: 2 (5)
@ -2137,7 +2086,6 @@ Music_RestartChannel:
pop bc ; restore current channel pop bc ; restore current channel
ret ret
Music_NewSong: Music_NewSong:
; new song ; new song
; params: 2 ; params: 2
@ -2151,7 +2099,6 @@ Music_NewSong:
pop bc pop bc
ret ret
GetMusicByte: GetMusicByte:
; returns byte from current address in a ; returns byte from current address in a
; advances to next byte in music data ; advances to next byte in music data
@ -2184,7 +2131,6 @@ GetMusicByte:
ld a, [wCurMusicByte] ld a, [wCurMusicByte]
ret ret
GetFrequency: GetFrequency:
; generate frequency ; generate frequency
; input: ; input:
@ -2237,7 +2183,6 @@ GetFrequency:
ld d, a ld d, a
ret ret
SetNoteDuration: SetNoteDuration:
; input: a = note duration in 16ths ; input: a = note duration in 16ths
; store delay units in de ; store delay units in de
@ -2277,7 +2222,6 @@ SetNoteDuration:
ld [hl], d ld [hl], d
ret ret
.Multiply: .Multiply:
; multiplies a and de ; multiplies a and de
; adds the result to l ; adds the result to l
@ -2299,7 +2243,6 @@ SetNoteDuration:
jr nz, .loop jr nz, .loop
ret ret
SetGlobalTempo: SetGlobalTempo:
push bc ; save current channel push bc ; save current channel
; are we dealing with music or sfx? ; are we dealing with music or sfx?
@ -2329,7 +2272,6 @@ SetGlobalTempo:
pop bc ; restore current channel pop bc ; restore current channel
ret ret
Tempo: Tempo:
; input: ; input:
; de: note length ; de: note length
@ -2346,7 +2288,6 @@ Tempo:
ld [hl], a ld [hl], a
ret ret
StartChannel: StartChannel:
call SetLRTracks call SetLRTracks
ld hl, CHANNEL_FLAGS1 ld hl, CHANNEL_FLAGS1
@ -2354,7 +2295,6 @@ StartChannel:
set SOUND_CHANNEL_ON, [hl] ; turn channel on set SOUND_CHANNEL_ON, [hl] ; turn channel on
ret ret
SetLRTracks: SetLRTracks:
; set tracks for a the current channel to default ; set tracks for a the current channel to default
; seems to be redundant since this is overwritten by stereo data later ; seems to be redundant since this is overwritten by stereo data later
@ -2375,7 +2315,6 @@ SetLRTracks:
pop de pop de
ret ret
_PlayMusic:: _PlayMusic::
; load music ; load music
call MusicOff call MusicOff
@ -2418,7 +2357,6 @@ _PlayMusic::
call MusicOn call MusicOn
ret ret
_PlayCry:: _PlayCry::
; Play cry de using parameters: ; Play cry de using parameters:
; wCryPitch ; wCryPitch
@ -2530,7 +2468,6 @@ _PlayCry::
call MusicOn call MusicOn
ret ret
_PlaySFX:: _PlaySFX::
; clear channels if they aren't already ; clear channels if they aren't already
call MusicOff call MusicOff
@ -2630,7 +2567,6 @@ _PlaySFX::
ld [wSFXPriority], a ld [wSFXPriority], a
ret ret
PlayStereoSFX:: PlayStereoSFX::
; play sfx de ; play sfx de
@ -2732,7 +2668,6 @@ PlayStereoSFX::
call MusicOn call MusicOn
ret ret
LoadChannel: LoadChannel:
; prep channel for use ; prep channel for use
; input: ; input:
@ -2777,7 +2712,6 @@ LoadChannel:
ld [hl], a ld [hl], a
ret ret
ChannelInit: ChannelInit:
; make sure channel is cleared ; make sure channel is cleared
; set default tempo and note length in case nothing is loaded ; set default tempo and note length in case nothing is loaded
@ -2808,7 +2742,6 @@ ChannelInit:
pop de pop de
ret ret
LoadMusicByte:: LoadMusicByte::
; input: ; input:
; de = current music address ; de = current music address
@ -2820,14 +2753,12 @@ LoadMusicByte::
ret ret
INCLUDE "audio/notes.asm" INCLUDE "audio/notes.asm"
INCLUDE "audio/wave_samples.asm" INCLUDE "audio/wave_samples.asm"
INCLUDE "audio/drumkits.asm" INCLUDE "audio/drumkits.asm"
GetLRTracks: GetLRTracks:
; gets the default sound l/r channels ; gets the default sound l/r channels
; stores mono/stereo table in hl ; stores mono/stereo table in hl
@ -2842,7 +2773,6 @@ GetLRTracks:
ld hl, StereoTracks ld hl, StereoTracks
ret ret
MonoTracks: MonoTracks:
; bit corresponds to track # ; bit corresponds to track #
; hi: left channel ; hi: left channel
@ -2883,7 +2813,6 @@ ClearChannels::
jr nz, .loop jr nz, .loop
ret ret
ClearChannel: ClearChannel:
; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40) ; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40)
; output: 00 00 80 00 80 ; output: 00 00 80 00 80
@ -2901,7 +2830,6 @@ ClearChannel:
ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0)
ret ret
PlayTrainerEncounterMusic:: PlayTrainerEncounterMusic::
; input: e = trainer type ; input: e = trainer type
; turn fade off ; turn fade off

2
audio/music/magnettrain.asm
View File

@ -245,7 +245,6 @@ Music_MagnetTrain_Ch4:
note B_, 16 note B_, 16
endchannel endchannel
; unused ; unused
Music_MagnetTrain_branch_ef711: Music_MagnetTrain_branch_ef711:
note G#, 1 note G#, 1
@ -262,7 +261,6 @@ Music_MagnetTrain_branch_ef711:
note G_, 1 note G_, 1
endchannel endchannel
Music_MagnetTrain_branch_ef71e: Music_MagnetTrain_branch_ef71e:
note G#, 2 note G#, 2
note G_, 2 note G_, 2

4
constants/gfx_constants.asm
View File

@ -8,7 +8,6 @@ PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE
PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff
SCREEN_WIDTH EQU 20 ; tiles SCREEN_WIDTH EQU 20 ; tiles
SCREEN_HEIGHT EQU 18 ; tiles SCREEN_HEIGHT EQU 18 ; tiles
SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels
@ -23,7 +22,6 @@ SCREEN_META_HEIGHT EQU 5 ; metatiles
SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles
SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles
HP_BAR_LENGTH EQU 6 ; tiles HP_BAR_LENGTH EQU 6 ; tiles
EXP_BAR_LENGTH EQU 8 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles
HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
@ -34,7 +32,6 @@ HP_GREEN EQU 0
HP_YELLOW EQU 1 HP_YELLOW EQU 1
HP_RED EQU 2 HP_RED EQU 2
; sprite_oam_struct members (see macros/wram.asm) ; sprite_oam_struct members (see macros/wram.asm)
const_def const_def
const SPRITEOAMSTRUCT_YCOORD ; 0 const SPRITEOAMSTRUCT_YCOORD ; 0
@ -44,7 +41,6 @@ HP_RED EQU 2
SPRITEOAMSTRUCT_LENGTH EQU const_value SPRITEOAMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
; PokeAnims indexes (see engine/gfx/pic_animation.asm) ; PokeAnims indexes (see engine/gfx/pic_animation.asm)
const_def const_def
const ANIM_MON_SLOW const ANIM_MON_SLOW

3
constants/item_data_constants.asm
View File

@ -32,7 +32,6 @@ NO_LIMITS EQU 0
CANT_SELECT EQU 1 << CANT_SELECT_F CANT_SELECT EQU 1 << CANT_SELECT_F
CANT_TOSS EQU 1 << CANT_TOSS_F CANT_TOSS EQU 1 << CANT_TOSS_F
; pack pockets ; pack pockets
const_def const_def
const ITEM_POCKET ; 0 const ITEM_POCKET ; 0
@ -46,14 +45,12 @@ MAX_BALLS EQU 12
MAX_KEY_ITEMS EQU 25 MAX_KEY_ITEMS EQU 25
MAX_PC_ITEMS EQU 50 MAX_PC_ITEMS EQU 50
; mail ; mail
MAIL_LINE_LENGTH EQU $10 MAIL_LINE_LENGTH EQU $10
MAIL_MSG_LENGTH EQU $20 MAIL_MSG_LENGTH EQU $20
MAILBOX_CAPACITY EQU 10 MAILBOX_CAPACITY EQU 10
MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
; held item effects ; held item effects
const_def const_def
const HELD_NONE const HELD_NONE

1
constants/landmark_constants.asm
View File

@ -105,7 +105,6 @@ KANTO_LANDMARK EQU const_value
GIFT_LOCATION EQU $7e GIFT_LOCATION EQU $7e
EVENT_LOCATION EQU $7f EVENT_LOCATION EQU $7f
; Regions ; Regions
const_def const_def
const JOHTO_REGION ; 0 const JOHTO_REGION ; 0

4
constants/map_data_constants.asm
View File

@ -3,7 +3,6 @@ MAP_N_A EQU -1
GROUP_NONE EQU 0 GROUP_NONE EQU 0
MAP_NONE EQU 0 MAP_NONE EQU 0
; map struct members (see data/maps/maps.asm) ; map struct members (see data/maps/maps.asm)
const_def const_def
const MAP_MAPATTRIBUTES_BANK ; 0 const MAP_MAPATTRIBUTES_BANK ; 0
@ -51,7 +50,6 @@ MAP_NONE EQU 0
const FISHGROUP_REMORAID const FISHGROUP_REMORAID
const FISHGROUP_QWILFISH_NO_SWARM const FISHGROUP_QWILFISH_NO_SWARM
; connection directions (see data/maps/data.asm) ; connection directions (see data/maps/data.asm)
const_def const_def
const EAST_F const EAST_F
@ -66,7 +64,6 @@ MAP_NONE EQU 0
shift_const SOUTH shift_const SOUTH
shift_const NORTH shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm) ; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_value = -1 const_value = -1
const SPAWN_N_A const SPAWN_N_A
@ -102,7 +99,6 @@ const_value = -1
const SPAWN_FAST_SHIP const SPAWN_FAST_SHIP
NUM_SPAWNS EQU const_value NUM_SPAWNS EQU const_value
; outdoor sprite limits (see engine/overworld/overworld.asm) ; outdoor sprite limits (see engine/overworld/overworld.asm)
MAX_OUTDOOR_SPRITES EQU 23 MAX_OUTDOOR_SPRITES EQU 23
SPRITE_GFX_LIST_CAPACITY EQU $20 SPRITE_GFX_LIST_CAPACITY EQU $20

2
constants/map_object_constants.asm
View File

@ -126,7 +126,6 @@ NUM_SPRITEMOVEDATA_FIELDS EQU const_value
MAPOBJECT_SCREEN_WIDTH EQU (SCREEN_WIDTH / 2) + 2 MAPOBJECT_SCREEN_WIDTH EQU (SCREEN_WIDTH / 2) + 2
MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2 MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
; SpriteMovementData indexes (see data/sprites/map_objects.asm) ; SpriteMovementData indexes (see data/sprites/map_objects.asm)
const_def const_def
const SPRITEMOVEDATA_00 ; 00 const SPRITEMOVEDATA_00 ; 00
@ -283,7 +282,6 @@ NUM_SPRITEMOVEDATA EQU const_value
const FACING_GRASS_1 ; 1e const FACING_GRASS_1 ; 1e
const FACING_GRASS_2 ; 1f const FACING_GRASS_2 ; 1f
; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm) ; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm)
const_def const_def
const STEP_SLOW ; 0 const STEP_SLOW ; 0

2
constants/menu_constants.asm
View File

@ -32,7 +32,6 @@
shift_const SCROLLINGMENU_ENABLE_START shift_const SCROLLINGMENU_ENABLE_START
shift_const SCROLLINGMENU_ENABLE_SELECT shift_const SCROLLINGMENU_ENABLE_SELECT
; MonMenuOptions indexes (see data/mon_menu.asm) ; MonMenuOptions indexes (see data/mon_menu.asm)
; used by PokemonActionSubmenu (see engine/menus/start_menu.asm) ; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
const_def 1 const_def 1
@ -70,7 +69,6 @@ NUM_MONMENU_ITEMS EQU 8
HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111 HMENURETURN_ASM EQU %11111111
; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) ; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
const_def const_def
const PARTYMENUACTION_CHOOSE_POKEMON const PARTYMENUACTION_CHOOSE_POKEMON

9
constants/pokemon_data_constants.asm
View File

@ -62,11 +62,9 @@ GENDER_UNKNOWN EQU -1
const EGG_DRAGON ; e const EGG_DRAGON ; e
const EGG_NONE ; f (Undiscovered) const EGG_NONE ; f (Undiscovered)
; pokedex entries (see data/pokemon/dex_entries.asm) ; pokedex entries (see data/pokemon/dex_entries.asm)
NUM_DEX_ENTRY_BANKS EQU 4 NUM_DEX_ENTRY_BANKS EQU 4
; party_struct members (see macros/wram.asm) ; party_struct members (see macros/wram.asm)
MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)"
MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)"
@ -101,7 +99,6 @@ BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
REDMON_STRUCT_LENGTH EQU 44 REDMON_STRUCT_LENGTH EQU 44
; caught data ; caught data
CAUGHT_TIME_MASK EQU %11000000 CAUGHT_TIME_MASK EQU %11000000
@ -116,7 +113,6 @@ CAUGHT_BY_BOY EQU 2
CAUGHT_EGG_LEVEL EQU 1 CAUGHT_EGG_LEVEL EQU 1
; maximum number of party pokemon ; maximum number of party pokemon
PARTY_LENGTH EQU 6 PARTY_LENGTH EQU 6
@ -129,7 +125,6 @@ HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, leve
HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
NUM_HOF_TEAMS = 30 NUM_HOF_TEAMS = 30
; evolution types (used in data/pokemon/evos_attacks.asm) ; evolution types (used in data/pokemon/evos_attacks.asm)
const_def 1 const_def 1
const EVOLVE_LEVEL const EVOLVE_LEVEL
@ -150,7 +145,6 @@ NUM_HOF_TEAMS = 30
const ATK_LT_DEF const ATK_LT_DEF
const ATK_EQ_DEF const ATK_EQ_DEF
; wild data ; wild data
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
@ -162,7 +156,6 @@ FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
; treemon sets ; treemon sets
; TreeMons indexes (see data/wild/treemons.asm) ; TreeMons indexes (see data/wild/treemons.asm)
const_def const_def
@ -182,7 +175,6 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_GOOD ; 1 const TREEMON_SCORE_GOOD ; 1
const TREEMON_SCORE_RARE ; 2 const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm) ; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1 const_value = 1
const HAPPINESS_GAINLEVEL ; 01 const HAPPINESS_GAINLEVEL ; 01
@ -212,7 +204,6 @@ HAPPINESS_TO_EVOLVE EQU 220
HAPPINESS_THRESHOLD_1 EQU 100 HAPPINESS_THRESHOLD_1 EQU 100
HAPPINESS_THRESHOLD_2 EQU 200 HAPPINESS_THRESHOLD_2 EQU 200
; PP ; PP
PP_UP_MASK EQU %11000000 PP_UP_MASK EQU %11000000
PP_UP_ONE EQU %01000000 PP_UP_ONE EQU %01000000

9
constants/script_constants.asm
View File

@ -2,7 +2,6 @@
PLAYER EQU 0 PLAYER EQU 0
LAST_TALKED EQU -2 LAST_TALKED EQU -2
; memory constants ; memory constants
const_def const_def
const MEM_BUFFER_0 ; use wStringBuffer3 const MEM_BUFFER_0 ; use wStringBuffer3
@ -10,7 +9,6 @@ LAST_TALKED EQU -2
const MEM_BUFFER_2 ; use wStringBuffer5 const MEM_BUFFER_2 ; use wStringBuffer5
NUM_MEM_BUFFERS EQU const_value NUM_MEM_BUFFERS EQU const_value
; checkmoney/takemoney accounts ; checkmoney/takemoney accounts
const_def const_def
const YOUR_MONEY ; 0 const YOUR_MONEY ; 0
@ -36,7 +34,6 @@ NUM_MEM_BUFFERS EQU const_value
const PHONE_CONTACTS_FULL ; 1 const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2 const PHONE_CONTACT_REFUSED ; 2
; writecode/checkcode arguments ; writecode/checkcode arguments
; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm) ; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
const_def const_def
@ -74,7 +71,6 @@ RETVAR_STRBUF2 EQU (0 << 6)
RETVAR_ADDR_DE EQU (1 << 6) RETVAR_ADDR_DE EQU (1 << 6)
RETVAR_EXECUTE EQU (2 << 6) RETVAR_EXECUTE EQU (2 << 6)
; PlayerEventScriptPointers indexes (see engine/overworld/events.asm) ; PlayerEventScriptPointers indexes (see engine/overworld/events.asm)
const_def -1 const_def -1
const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_MAPSCRIPT
@ -90,7 +86,6 @@ RETVAR_EXECUTE EQU (2 << 6)
const PLAYEREVENT_JOYCHANGEFACING const PLAYEREVENT_JOYCHANGEFACING
NUM_PLAYER_EVENTS EQU const_value NUM_PLAYER_EVENTS EQU const_value
; bg_event types ; bg_event types
; TryBGEvent arguments (see engine/overworld/events.asm) ; TryBGEvent arguments (see engine/overworld/events.asm)
const_def const_def
@ -115,7 +110,6 @@ NUM_PLAYER_EVENTS EQU const_value
const OBJECTTYPE_5 const OBJECTTYPE_5
const OBJECTTYPE_6 const OBJECTTYPE_6
; command queue members ; command queue members
CMDQUEUE_TYPE EQU 0 CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1 CMDQUEUE_ADDR EQU 1
@ -128,7 +122,6 @@ CMDQUEUE_CAPACITY EQU 4
; command queue types ; command queue types
CMDQUEUE_STONETABLE EQU 2 CMDQUEUE_STONETABLE EQU 2
; elevfloor macro values ; elevfloor macro values
; ElevatorFloorNames indexes (see data/events/elevator_floors.asm) ; ElevatorFloorNames indexes (see data/events/elevator_floors.asm)
const_def const_def
@ -149,7 +142,6 @@ CMDQUEUE_STONETABLE EQU 2
const FLOOR_11F const FLOOR_11F
const FLOOR_ROOF const FLOOR_ROOF
; showemote arguments ; showemote arguments
; Emotes indexes (see data/sprites/emotes.asm) ; Emotes indexes (see data/sprites/emotes.asm)
const_def const_def
@ -217,7 +209,6 @@ NUM_FRUIT_TREES EQU const_value + -1
const SWARM_DUNSPARCE ; 0 const SWARM_DUNSPARCE ; 0
const SWARM_YANMA ; 1 const SWARM_YANMA ; 1
; ActivateFishingSwarm writebyte arguments ; ActivateFishingSwarm writebyte arguments
const_def const_def
const FISHSWARM_NONE ; 0 const FISHSWARM_NONE ; 0

210
data/battle_tower/parties.asm
View File

File diff suppressed because it is too large Load Diff

1
data/events/field_move_blocks.asm
View File

@ -42,7 +42,6 @@ CutTreeBlockPointers:
db $0f, $17, 0 db $0f, $17, 0
db -1 ; end db -1 ; end
WhirlpoolBlockPointers: WhirlpoolBlockPointers:
dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO, .johto
db -1 ; end db -1 ; end

1
data/events/odd_eggs.asm
View File

@ -27,7 +27,6 @@ prob_total = 0
prob 10 prob 10
prob 1 prob 1
OddEggs: OddEggs:
OddEgg1: OddEgg1:

1
data/items/marts.asm
View File

@ -36,7 +36,6 @@ Marts:
dw MartUnderground dw MartUnderground
.End .End
MartCherrygrove: MartCherrygrove:
db 4 ; # items db 4 ; # items
db POTION db POTION

1
data/maps/attributes.asm
View File

@ -63,7 +63,6 @@ elif "\1" == "east"
endc endc
ENDM ENDM
map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
connection west, Route29, ROUTE_29, 0, 0, 9 connection west, Route29, ROUTE_29, 0, 0, 9
connection east, Route27, ROUTE_27, 0, 0, 9 connection east, Route27, ROUTE_27, 0, 0, 9

1
data/maps/map_data.asm
View File

@ -6,7 +6,6 @@ SECTION "Maps", ROMX
INCLUDE "data/maps/maps.asm" INCLUDE "data/maps/maps.asm"
INCLUDE "data/maps/attributes.asm" INCLUDE "data/maps/attributes.asm"
INCLUDE "data/maps/blocks.asm" INCLUDE "data/maps/blocks.asm"
INCLUDE "data/maps/scripts.asm" INCLUDE "data/maps/scripts.asm"

1
data/maps/maps.asm
View File

@ -43,7 +43,6 @@ MapGroupPointers::
dw MapGroup_Saffron ; 25 dw MapGroup_Saffron ; 25
dw MapGroup_Cherrygrove ; 26 dw MapGroup_Cherrygrove ; 26
MapGroup_Olivine: MapGroup_Olivine:
map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

1
data/maps/outdoor_sprites.asm
View File

@ -30,7 +30,6 @@ OutdoorSprites:
dw SaffronGroupSprites dw SaffronGroupSprites
dw CherrygroveGroupSprites dw CherrygroveGroupSprites
PalletGroupSprites: PalletGroupSprites:
db SPRITE_SUICUNE db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY db SPRITE_SILVER_TROPHY

1
data/party_menu_qualities.asm
View File

@ -18,7 +18,6 @@ endr
db -1 ; end db -1 ; end
ENDM ENDM
PartyMenuQualityPointers: PartyMenuQualityPointers:
; entries correspond to PARTYMENUACTION_* constants ; entries correspond to PARTYMENUACTION_* constants
dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON

2
data/sgb_ctrl_packets.asm
View File

@ -37,7 +37,6 @@ sgb_data_snd: MACRO
db \3 ; length (1-11) db \3 ; length (1-11)
ENDM ENDM
; Crystal does not support SGB, so this is unused. ; Crystal does not support SGB, so this is unused.
PalTrnPacket: sgb_pal_trn PalTrnPacket: sgb_pal_trn
@ -49,7 +48,6 @@ PctTrnPacket: sgb_pct_trn
MaskEnFreezePacket: sgb_mask_en 1 MaskEnFreezePacket: sgb_mask_en 1
MaskEnCancelPacket: sgb_mask_en 0 MaskEnCancelPacket: sgb_mask_en 0
; These are packets containing SNES code. ; These are packets containing SNES code.
; This set of packets is found in several Japanese SGB-compatible titles. ; This set of packets is found in several Japanese SGB-compatible titles.
; It appears to be part of NCL's SGB devkit. ; It appears to be part of NCL's SGB devkit.

1
data/sprites/facings.asm
View File

@ -37,7 +37,6 @@ Facings:
NUM_FACINGS EQU (Facings.End - Facings) / 2 NUM_FACINGS EQU (Facings.End - Facings) / 2
; Tables used as a reference to transform OAM data. ; Tables used as a reference to transform OAM data.
; Format: ; Format:

67
data/trainers/parties.asm
View File

@ -8,7 +8,6 @@ Trainers:
; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves ; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
; - db -1 ; end ; - db -1 ; end
FalknerGroup: FalknerGroup:
; FALKNER (1) ; FALKNER (1)
db "FALKNER@", TRAINERTYPE_MOVES db "FALKNER@", TRAINERTYPE_MOVES
@ -16,7 +15,6 @@ FalknerGroup:
db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE
db -1 ; end db -1 ; end
WhitneyGroup: WhitneyGroup:
; WHITNEY (1) ; WHITNEY (1)
db "WHITNEY@", TRAINERTYPE_MOVES db "WHITNEY@", TRAINERTYPE_MOVES
@ -24,7 +22,6 @@ WhitneyGroup:
db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK
db -1 ; end db -1 ; end
BugsyGroup: BugsyGroup:
; BUGSY (1) ; BUGSY (1)
db "BUGSY@", TRAINERTYPE_MOVES db "BUGSY@", TRAINERTYPE_MOVES
@ -33,7 +30,6 @@ BugsyGroup:
db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
db -1 ; end db -1 ; end
MortyGroup: MortyGroup:
; MORTY (1) ; MORTY (1)
db "MORTY@", TRAINERTYPE_MOVES db "MORTY@", TRAINERTYPE_MOVES
@ -43,7 +39,6 @@ MortyGroup:
db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
db -1 ; end db -1 ; end
PryceGroup: PryceGroup:
; PRYCE (1) ; PRYCE (1)
db "PRYCE@", TRAINERTYPE_MOVES db "PRYCE@", TRAINERTYPE_MOVES
@ -52,7 +47,6 @@ PryceGroup:
db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
db -1 ; end db -1 ; end
JasmineGroup: JasmineGroup:
; JASMINE (1) ; JASMINE (1)
db "JASMINE@", TRAINERTYPE_MOVES db "JASMINE@", TRAINERTYPE_MOVES
@ -61,7 +55,6 @@ JasmineGroup:
db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
db -1 ; end db -1 ; end
ChuckGroup: ChuckGroup:
; CHUCK (1) ; CHUCK (1)
db "CHUCK@", TRAINERTYPE_MOVES db "CHUCK@", TRAINERTYPE_MOVES
@ -69,7 +62,6 @@ ChuckGroup:
db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
db -1 ; end db -1 ; end
ClairGroup: ClairGroup:
; CLAIR (1) ; CLAIR (1)
db "CLAIR@", TRAINERTYPE_MOVES db "CLAIR@", TRAINERTYPE_MOVES
@ -79,7 +71,6 @@ ClairGroup:
db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
db -1 ; end db -1 ; end
Rival1Group: Rival1Group:
; RIVAL1 (1) ; RIVAL1 (1)
db "?@", TRAINERTYPE_NORMAL db "?@", TRAINERTYPE_NORMAL
@ -198,10 +189,8 @@ Rival1Group:
db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
db -1 ; end db -1 ; end
PokemonProfGroup: PokemonProfGroup:
WillGroup: WillGroup:
; WILL (1) ; WILL (1)
db "WILL@", TRAINERTYPE_MOVES db "WILL@", TRAINERTYPE_MOVES
@ -212,7 +201,6 @@ WillGroup:
db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
db -1 ; end db -1 ; end
PKMNTrainerGroup: PKMNTrainerGroup:
; CAL (1) ; CAL (1)
db "CAL@", TRAINERTYPE_NORMAL db "CAL@", TRAINERTYPE_NORMAL
@ -235,7 +223,6 @@ PKMNTrainerGroup:
db 50, FERALIGATR db 50, FERALIGATR
db -1 ; end db -1 ; end
BrunoGroup: BrunoGroup:
; BRUNO (1) ; BRUNO (1)
db "BRUNO@", TRAINERTYPE_MOVES db "BRUNO@", TRAINERTYPE_MOVES
@ -246,7 +233,6 @@ BrunoGroup:
db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
db -1 ; end db -1 ; end
KarenGroup: KarenGroup:
; KAREN (1) ; KAREN (1)
db "KAREN@", TRAINERTYPE_MOVES db "KAREN@", TRAINERTYPE_MOVES
@ -257,7 +243,6 @@ KarenGroup:
db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH
db -1 ; end db -1 ; end
KogaGroup: KogaGroup:
; KOGA (1) ; KOGA (1)
db "KOGA@", TRAINERTYPE_MOVES db "KOGA@", TRAINERTYPE_MOVES
@ -268,7 +253,6 @@ KogaGroup:
db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
db -1 ; end db -1 ; end
ChampionGroup: ChampionGroup:
; CHAMPION (1) ; CHAMPION (1)
db "LANCE@", TRAINERTYPE_MOVES db "LANCE@", TRAINERTYPE_MOVES
@ -280,7 +264,6 @@ ChampionGroup:
db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
db -1 ; end db -1 ; end
BrockGroup: BrockGroup:
; BROCK (1) ; BROCK (1)
db "BROCK@", TRAINERTYPE_MOVES db "BROCK@", TRAINERTYPE_MOVES
@ -291,7 +274,6 @@ BrockGroup:
db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN
db -1 ; end db -1 ; end
MistyGroup: MistyGroup:
; MISTY (1) ; MISTY (1)
db "MISTY@", TRAINERTYPE_MOVES db "MISTY@", TRAINERTYPE_MOVES
@ -301,7 +283,6 @@ MistyGroup:
db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
db -1 ; end db -1 ; end
LtSurgeGroup: LtSurgeGroup:
; LT_SURGE (1) ; LT_SURGE (1)
db "LT.SURGE@", TRAINERTYPE_MOVES db "LT.SURGE@", TRAINERTYPE_MOVES
@ -312,7 +293,6 @@ LtSurgeGroup:
db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
db -1 ; end db -1 ; end
ScientistGroup: ScientistGroup:
; SCIENTIST (1) ; SCIENTIST (1)
db "ROSS@", TRAINERTYPE_NORMAL db "ROSS@", TRAINERTYPE_NORMAL
@ -344,7 +324,6 @@ ScientistGroup:
db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
db -1 ; end db -1 ; end
ErikaGroup: ErikaGroup:
; ERIKA (1) ; ERIKA (1)
db "ERIKA@", TRAINERTYPE_MOVES db "ERIKA@", TRAINERTYPE_MOVES
@ -354,7 +333,6 @@ ErikaGroup:
db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
db -1 ; end db -1 ; end
YoungsterGroup: YoungsterGroup:
; YOUNGSTER (1) ; YOUNGSTER (1)
db "JOEY@", TRAINERTYPE_NORMAL db "JOEY@", TRAINERTYPE_NORMAL
@ -434,7 +412,6 @@ YoungsterGroup:
db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
db -1 ; end db -1 ; end
SchoolboyGroup: SchoolboyGroup:
; SCHOOLBOY (1) ; SCHOOLBOY (1)
db "JACK@", TRAINERTYPE_NORMAL db "JACK@", TRAINERTYPE_NORMAL
@ -591,7 +568,6 @@ SchoolboyGroup:
db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
db -1 ; end db -1 ; end
BirdKeeperGroup: BirdKeeperGroup:
; BIRD_KEEPER (1) ; BIRD_KEEPER (1)
db "ROD@", TRAINERTYPE_NORMAL db "ROD@", TRAINERTYPE_NORMAL
@ -708,7 +684,6 @@ BirdKeeperGroup:
db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY
db -1 ; end db -1 ; end
LassGroup: LassGroup:
; LASS (1) ; LASS (1)
db "CARRIE@", TRAINERTYPE_MOVES db "CARRIE@", TRAINERTYPE_MOVES
@ -814,7 +789,6 @@ LassGroup:
db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH
db -1 ; end db -1 ; end
JanineGroup: JanineGroup:
; JANINE (1) ; JANINE (1)
db "JANINE@", TRAINERTYPE_MOVES db "JANINE@", TRAINERTYPE_MOVES
@ -825,7 +799,6 @@ JanineGroup:
db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
db -1 ; end db -1 ; end
CooltrainerMGroup: CooltrainerMGroup:
; COOLTRAINERM (1) ; COOLTRAINERM (1)
db "NICK@", TRAINERTYPE_MOVES db "NICK@", TRAINERTYPE_MOVES
@ -956,7 +929,6 @@ CooltrainerMGroup:
db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM
db -1 ; end db -1 ; end
CooltrainerFGroup: CooltrainerFGroup:
; COOLTRAINERF (1) ; COOLTRAINERF (1)
db "GWEN@", TRAINERTYPE_NORMAL db "GWEN@", TRAINERTYPE_NORMAL
@ -1088,7 +1060,6 @@ CooltrainerFGroup:
db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER
db -1 ; end db -1 ; end
BeautyGroup: BeautyGroup:
; BEAUTY (1) ; BEAUTY (1)
db "VICTORIA@", TRAINERTYPE_NORMAL db "VICTORIA@", TRAINERTYPE_NORMAL
@ -1184,7 +1155,6 @@ BeautyGroup:
db 19, CORSOLA db 19, CORSOLA
db -1 ; end db -1 ; end
PokemaniacGroup: PokemaniacGroup:
; POKEMANIAC (1) ; POKEMANIAC (1)
db "LARRY@", TRAINERTYPE_NORMAL db "LARRY@", TRAINERTYPE_NORMAL
@ -1266,7 +1236,6 @@ PokemaniacGroup:
db 17, NIDOQUEEN db 17, NIDOQUEEN
db -1 ; end db -1 ; end
GruntMGroup: GruntMGroup:
; GRUNTM (1) ; GRUNTM (1)
db "GRUNT@", TRAINERTYPE_NORMAL db "GRUNT@", TRAINERTYPE_NORMAL
@ -1458,7 +1427,6 @@ GruntMGroup:
db 30, GOLBAT db 30, GOLBAT
db -1 ; end db -1 ; end
GentlemanGroup: GentlemanGroup:
; GENTLEMAN (1) ; GENTLEMAN (1)
db "PRESTON@", TRAINERTYPE_NORMAL db "PRESTON@", TRAINERTYPE_NORMAL
@ -1487,7 +1455,6 @@ GentlemanGroup:
db 20, NOCTOWL db 20, NOCTOWL
db -1 ; end db -1 ; end
SkierGroup: SkierGroup:
; SKIER (1) ; SKIER (1)
db "ROXANNE@", TRAINERTYPE_NORMAL db "ROXANNE@", TRAINERTYPE_NORMAL
@ -1499,7 +1466,6 @@ SkierGroup:
db 28, DEWGONG db 28, DEWGONG
db -1 ; end db -1 ; end
TeacherGroup: TeacherGroup:
; TEACHER (1) ; TEACHER (1)
db "COLETTE@", TRAINERTYPE_NORMAL db "COLETTE@", TRAINERTYPE_NORMAL
@ -1517,7 +1483,6 @@ TeacherGroup:
db 35, JIGGLYPUFF db 35, JIGGLYPUFF
db -1 ; end db -1 ; end
SabrinaGroup: SabrinaGroup:
; SABRINA (1) ; SABRINA (1)
db "SABRINA@", TRAINERTYPE_MOVES db "SABRINA@", TRAINERTYPE_MOVES
@ -1526,7 +1491,6 @@ SabrinaGroup:
db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
db -1 ; end db -1 ; end
BugCatcherGroup: BugCatcherGroup:
; BUG_CATCHER (1) ; BUG_CATCHER (1)
db "DON@", TRAINERTYPE_NORMAL db "DON@", TRAINERTYPE_NORMAL
@ -1647,7 +1611,6 @@ BugCatcherGroup:
db 10, PARAS db 10, PARAS
db -1 ; end db -1 ; end
FisherGroup: FisherGroup:
; FISHER (1) ; FISHER (1)
db "JUSTIN@", TRAINERTYPE_NORMAL db "JUSTIN@", TRAINERTYPE_NORMAL
@ -1811,7 +1774,6 @@ FisherGroup:
db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
db -1 ; end db -1 ; end
SwimmerMGroup: SwimmerMGroup:
; SWIMMERM (1) ; SWIMMERM (1)
db "HAROLD@", TRAINERTYPE_NORMAL db "HAROLD@", TRAINERTYPE_NORMAL
@ -1953,7 +1915,6 @@ SwimmerMGroup:
db 35, SEADRA db 35, SEADRA
db -1 ; end db -1 ; end
SwimmerFGroup: SwimmerFGroup:
; SWIMMERF (1) ; SWIMMERF (1)
db "ELAINE@", TRAINERTYPE_NORMAL db "ELAINE@", TRAINERTYPE_NORMAL
@ -2063,7 +2024,6 @@ SwimmerFGroup:
db 35, SEAKING db 35, SEAKING
db -1 ; end db -1 ; end
SailorGroup: SailorGroup:
; SAILOR (1) ; SAILOR (1)
db "EUGENE@", TRAINERTYPE_NORMAL db "EUGENE@", TRAINERTYPE_NORMAL
@ -2145,7 +2105,6 @@ SailorGroup:
db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION
db -1 ; end db -1 ; end
SuperNerdGroup: SuperNerdGroup:
; SUPER_NERD (1) ; SUPER_NERD (1)
db "STAN@", TRAINERTYPE_NORMAL db "STAN@", TRAINERTYPE_NORMAL
@ -2231,7 +2190,6 @@ SuperNerdGroup:
db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH
db -1 ; end db -1 ; end
Rival2Group: Rival2Group:
; RIVAL2 (1) ; RIVAL2 (1)
db "?@", TRAINERTYPE_MOVES db "?@", TRAINERTYPE_MOVES
@ -2293,7 +2251,6 @@ Rival2Group:
db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
db -1 ; end db -1 ; end
GuitaristGroup: GuitaristGroup:
; GUITARIST (1) ; GUITARIST (1)
db "CLYDE@", TRAINERTYPE_NORMAL db "CLYDE@", TRAINERTYPE_NORMAL
@ -2308,7 +2265,6 @@ GuitaristGroup:
db 32, MAGNEMITE db 32, MAGNEMITE
db -1 ; end db -1 ; end
HikerGroup: HikerGroup:
; HIKER (1) ; HIKER (1)
db "ANTHONY@", TRAINERTYPE_NORMAL db "ANTHONY@", TRAINERTYPE_NORMAL
@ -2454,7 +2410,6 @@ HikerGroup:
db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
db -1 ; end db -1 ; end
BikerGroup: BikerGroup:
; BIKER (1) ; BIKER (1)
db "BENNY@", TRAINERTYPE_NORMAL db "BENNY@", TRAINERTYPE_NORMAL
@ -2514,7 +2469,6 @@ BikerGroup:
db 32, WEEZING db 32, WEEZING
db -1 ; end db -1 ; end
BlaineGroup: BlaineGroup:
; BLAINE (1) ; BLAINE (1)
db "BLAINE@", TRAINERTYPE_MOVES db "BLAINE@", TRAINERTYPE_MOVES
@ -2523,7 +2477,6 @@ BlaineGroup:
db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
db -1 ; end db -1 ; end
BurglarGroup: BurglarGroup:
; BURGLAR (1) ; BURGLAR (1)
db "DUNCAN@", TRAINERTYPE_NORMAL db "DUNCAN@", TRAINERTYPE_NORMAL
@ -2546,7 +2499,6 @@ BurglarGroup:
db 30, KOFFING db 30, KOFFING
db -1 ; end db -1 ; end
FirebreatherGroup: FirebreatherGroup:
; FIREBREATHER (1) ; FIREBREATHER (1)
db "OTIS@", TRAINERTYPE_NORMAL db "OTIS@", TRAINERTYPE_NORMAL
@ -2597,7 +2549,6 @@ FirebreatherGroup:
db 28, KOFFING db 28, KOFFING
db -1 ; end db -1 ; end
JugglerGroup: JugglerGroup:
; JUGGLER (1) ; JUGGLER (1)
db "IRWIN@", TRAINERTYPE_NORMAL db "IRWIN@", TRAINERTYPE_NORMAL
@ -2646,7 +2597,6 @@ JugglerGroup:
db 30, ELECTRODE db 30, ELECTRODE
db -1 ; end db -1 ; end
BlackbeltGroup: BlackbeltGroup:
; BLACKBELT_T (1) ; BLACKBELT_T (1)
db "KENJI@", TRAINERTYPE_NORMAL db "KENJI@", TRAINERTYPE_NORMAL
@ -2705,7 +2655,6 @@ BlackbeltGroup:
db 34, MACHOKE db 34, MACHOKE
db -1 ; end db -1 ; end
ExecutiveMGroup: ExecutiveMGroup:
; EXECUTIVEM (1) ; EXECUTIVEM (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES db "EXECUTIVE@", TRAINERTYPE_MOVES
@ -2736,7 +2685,6 @@ ExecutiveMGroup:
db 22, KOFFING db 22, KOFFING
db -1 ; end db -1 ; end
PsychicGroup: PsychicGroup:
; PSYCHIC_T (1) ; PSYCHIC_T (1)
db "NATHAN@", TRAINERTYPE_NORMAL db "NATHAN@", TRAINERTYPE_NORMAL
@ -2809,7 +2757,6 @@ PsychicGroup:
db 33, HYPNO db 33, HYPNO
db -1 ; end db -1 ; end
PicnickerGroup: PicnickerGroup:
; PICNICKER (1) ; PICNICKER (1)
db "LIZ@", TRAINERTYPE_NORMAL db "LIZ@", TRAINERTYPE_NORMAL
@ -2965,7 +2912,6 @@ PicnickerGroup:
db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE
db -1 ; end db -1 ; end
CamperGroup: CamperGroup:
; CAMPER (1) ; CAMPER (1)
db "ROLAND@", TRAINERTYPE_NORMAL db "ROLAND@", TRAINERTYPE_NORMAL
@ -3109,7 +3055,6 @@ CamperGroup:
db 30, TAUROS db 30, TAUROS
db -1 ; end db -1 ; end
ExecutiveFGroup: ExecutiveFGroup:
; EXECUTIVEF (1) ; EXECUTIVEF (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES db "EXECUTIVE@", TRAINERTYPE_MOVES
@ -3125,7 +3070,6 @@ ExecutiveFGroup:
db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE
db -1 ; end db -1 ; end
SageGroup: SageGroup:
; SAGE (1) ; SAGE (1)
db "CHOW@", TRAINERTYPE_NORMAL db "CHOW@", TRAINERTYPE_NORMAL
@ -3203,7 +3147,6 @@ SageGroup:
db 32, VAPOREON db 32, VAPOREON
db -1 ; end db -1 ; end
MediumGroup: MediumGroup:
; MEDIUM (1) ; MEDIUM (1)
db "MARTHA@", TRAINERTYPE_NORMAL db "MARTHA@", TRAINERTYPE_NORMAL
@ -3245,7 +3188,6 @@ MediumGroup:
db 36, SLOWBRO db 36, SLOWBRO
db -1 ; end db -1 ; end
BoarderGroup: BoarderGroup:
; BOARDER (1) ; BOARDER (1)
db "RONALD@", TRAINERTYPE_NORMAL db "RONALD@", TRAINERTYPE_NORMAL
@ -3267,7 +3209,6 @@ BoarderGroup:
db 24, SHELLDER db 24, SHELLDER
db -1 ; end db -1 ; end
PokefanMGroup: PokefanMGroup:
; POKEFANM (1) ; POKEFANM (1)
db "WILLIAM@", TRAINERTYPE_ITEM db "WILLIAM@", TRAINERTYPE_ITEM
@ -3350,7 +3291,6 @@ PokefanMGroup:
db 35, TEDDIURSA, BERRY db 35, TEDDIURSA, BERRY
db -1 ; end db -1 ; end
KimonoGirlGroup: KimonoGirlGroup:
; KIMONO_GIRL (1) ; KIMONO_GIRL (1)
db "NAOKO@", TRAINERTYPE_NORMAL db "NAOKO@", TRAINERTYPE_NORMAL
@ -3384,7 +3324,6 @@ KimonoGirlGroup:
db 17, JOLTEON db 17, JOLTEON
db -1 ; end db -1 ; end
TwinsGroup: TwinsGroup:
; TWINS (1) ; TWINS (1)
db "AMY & MAY@", TRAINERTYPE_NORMAL db "AMY & MAY@", TRAINERTYPE_NORMAL
@ -3446,7 +3385,6 @@ TwinsGroup:
db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end db -1 ; end
PokefanFGroup: PokefanFGroup:
; POKEFANF (1) ; POKEFANF (1)
db "BEVERLY@", TRAINERTYPE_ITEM db "BEVERLY@", TRAINERTYPE_ITEM
@ -3482,7 +3420,6 @@ PokefanFGroup:
db 16, MEOWTH, BERRY db 16, MEOWTH, BERRY
db -1 ; end db -1 ; end
RedGroup: RedGroup:
; RED (1) ; RED (1)
db "RED@", TRAINERTYPE_MOVES db "RED@", TRAINERTYPE_MOVES
@ -3494,7 +3431,6 @@ RedGroup:
db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
db -1 ; end db -1 ; end
BlueGroup: BlueGroup:
; BLUE (1) ; BLUE (1)
db "BLUE@", TRAINERTYPE_MOVES db "BLUE@", TRAINERTYPE_MOVES
@ -3506,7 +3442,6 @@ BlueGroup:
db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
db -1 ; end db -1 ; end
OfficerGroup: OfficerGroup:
; OFFICER (1) ; OFFICER (1)
db "KEITH@", TRAINERTYPE_NORMAL db "KEITH@", TRAINERTYPE_NORMAL
@ -3519,7 +3454,6 @@ OfficerGroup:
db 14, GROWLITHE db 14, GROWLITHE
db -1 ; end db -1 ; end
GruntFGroup: GruntFGroup:
; GRUNTF (1) ; GRUNTF (1)
db "GRUNT@", TRAINERTYPE_NORMAL db "GRUNT@", TRAINERTYPE_NORMAL
@ -3552,7 +3486,6 @@ GruntFGroup:
db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
db -1 ; end db -1 ; end
MysticalmanGroup: MysticalmanGroup:
; MYSTICALMAN (1) ; MYSTICALMAN (1)
db "EUSINE@", TRAINERTYPE_MOVES db "EUSINE@", TRAINERTYPE_MOVES

1
data/wild/fish.asm
View File

@ -204,7 +204,6 @@ FishGroups:
db 90 percent + 1, MAGIKARP, 40 db 90 percent + 1, MAGIKARP, 40
db 100 percent, REMORAID, 40 db 100 percent, REMORAID, 40
TimeFishGroups: TimeFishGroups:
; day nite ; day nite
db CORSOLA, 20, STARYU, 20 ; 0 db CORSOLA, 20, STARYU, 20 ; 0

1
docs/design_flaws.md
View File

@ -84,6 +84,7 @@ In [gfx/pics.asm](/gfx/pics.asm):
; PokemonPicPointers and UnownPicPointers are assumed to start at the same ; PokemonPicPointers and UnownPicPointers are assumed to start at the same
; address, but in different banks. This is enforced in pokecrystal.link. ; address, but in different banks. This is enforced in pokecrystal.link.
SECTION "Pic Pointers", ROMX SECTION "Pic Pointers", ROMX
INCLUDE "data/pokemon/pic_pointers.asm" INCLUDE "data/pokemon/pic_pointers.asm"

9
engine/battle/ai/items.asm
View File

@ -145,13 +145,11 @@ SwitchSometimes:
ld [wEnemySwitchMonIndex], a ld [wEnemySwitchMonIndex], a
jp AI_TrySwitch jp AI_TrySwitch
CheckSubstatusCantRun: CheckSubstatusCantRun:
ld a, [wEnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
ret ret
AI_TryItem: AI_TryItem:
; items are not allowed in the BattleTower ; items are not allowed in the BattleTower
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
@ -238,7 +236,6 @@ AI_TryItem:
scf scf
ret ret
.IsHighestLevel: .IsHighestLevel:
ld a, [wOTPartyCount] ld a, [wOTPartyCount]
ld d, a ld d, a
@ -270,7 +267,6 @@ AI_TryItem:
scf scf
ret ret
AI_Items: AI_Items:
dbw FULL_RESTORE, .FullRestore dbw FULL_RESTORE, .FullRestore
dbw MAX_POTION, .MaxPotion dbw MAX_POTION, .MaxPotion
@ -520,7 +516,6 @@ AI_Items:
and a and a
ret ret
AIUpdateHUD: AIUpdateHUD:
call UpdateEnemyMonInParty call UpdateEnemyMonInParty
farcall UpdateEnemyHUD farcall UpdateEnemyHUD
@ -538,7 +533,6 @@ AIUsedItemSound:
pop de pop de
ret ret
EnemyUsedFullHeal: EnemyUsedFullHeal:
call AIUsedItemSound call AIUsedItemSound
call AI_HealStatus call AI_HealStatus
@ -642,7 +636,6 @@ EnemyPotionFinish:
predef AnimateHPBar predef AnimateHPBar
jp AIUpdateHUD jp AIUpdateHUD
AI_TrySwitch: AI_TrySwitch:
; Determine whether the AI can switch based on how many Pokemon are still alive. ; Determine whether the AI can switch based on how many Pokemon are still alive.
; If it can switch, it will. ; If it can switch, it will.
@ -805,7 +798,6 @@ EnemyUsedXSpecial:
ld b, SP_ATTACK ld b, SP_ATTACK
ld a, X_SPECIAL ld a, X_SPECIAL
; Parameter ; Parameter
; a = ITEM_CONSTANT ; a = ITEM_CONSTANT
; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION) ; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION)
@ -817,7 +809,6 @@ EnemyUsedXItem:
farcall CheckIfStatCanBeRaised farcall CheckIfStatCanBeRaised
jp AIUpdateHUD jp AIUpdateHUD
; Parameter ; Parameter
; a = ITEM_CONSTANT ; a = ITEM_CONSTANT
PrintText_UsedItemOn_AND_AIUpdateHUD: PrintText_UsedItemOn_AND_AIUpdateHUD:

3
engine/battle/ai/move.asm
View File

@ -15,7 +15,6 @@ AIChooseMove:
farcall CheckEnemyLockedIn farcall CheckEnemyLockedIn
ret nz ret nz
; The default score is 20. Unusable moves are given a score of 80. ; The default score is 20. Unusable moves are given a score of 80.
ld a, 20 ld a, 20
ld hl, wBuffer1 ld hl, wBuffer1
@ -61,7 +60,6 @@ AIChooseMove:
ld [hl], 80 ld [hl], 80
jr .CheckMovePP jr .CheckMovePP
; Apply AI scoring layers depending on the trainer class. ; Apply AI scoring layers depending on the trainer class.
.ApplyLayers: .ApplyLayers:
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
@ -199,7 +197,6 @@ AIChooseMove:
ld [wCurEnemyMoveNum], a ld [wCurEnemyMoveNum], a
ret ret
AIScoringPointers: AIScoringPointers:
; entries correspond to AI_* constants ; entries correspond to AI_* constants
dw AI_Basic dw AI_Basic

103
engine/battle/ai/scoring.asm
View File

@ -65,7 +65,6 @@ AI_Basic:
INCLUDE "data/battle/ai/status_only_effects.asm" INCLUDE "data/battle/ai/status_only_effects.asm"
AI_Setup: AI_Setup:
; Use stat-modifying moves on turn 1. ; Use stat-modifying moves on turn 1.
@ -141,7 +140,6 @@ AI_Setup:
jr .checkmove jr .checkmove
AI_Types: AI_Types:
; Dismiss any move that the player is immune to. ; Dismiss any move that the player is immune to.
; Encourage super-effective moves. ; Encourage super-effective moves.
@ -232,7 +230,6 @@ AI_Types:
jr .checkmove jr .checkmove
AI_Offensive: AI_Offensive:
; Greatly discourage non-damaging moves. ; Greatly discourage non-damaging moves.
@ -260,7 +257,6 @@ AI_Offensive:
jr .checkmove jr .checkmove
AI_Smart: AI_Smart:
; Context-specific scoring. ; Context-specific scoring.
@ -392,7 +388,6 @@ AI_Smart:
dbw EFFECT_FLY, AI_Smart_Fly dbw EFFECT_FLY, AI_Smart_Fly
db -1 ; end db -1 ; end
AI_Smart_Sleep: AI_Smart_Sleep:
; Greatly encourage sleep inducing moves if the enemy has either Dream Eater or Nightmare. ; Greatly encourage sleep inducing moves if the enemy has either Dream Eater or Nightmare.
; 50% chance to greatly encourage sleep inducing moves otherwise. ; 50% chance to greatly encourage sleep inducing moves otherwise.
@ -412,7 +407,6 @@ AI_Smart_Sleep:
dec [hl] dec [hl]
ret ret
AI_Smart_LeechHit: AI_Smart_LeechHit:
push hl push hl
ld a, 1 ld a, 1
@ -447,7 +441,6 @@ AI_Smart_LeechHit:
inc [hl] inc [hl]
ret ret
AI_Smart_LockOn: AI_Smart_LockOn:
ld a, [wPlayerSubStatus5] ld a, [wPlayerSubStatus5]
bit SUBSTATUS_LOCK_ON, a bit SUBSTATUS_LOCK_ON, a
@ -552,7 +545,6 @@ AI_Smart_LockOn:
pop hl pop hl
jp AIDiscourageMove jp AIDiscourageMove
AI_Smart_Selfdestruct: AI_Smart_Selfdestruct:
; Selfdestruct, Explosion ; Selfdestruct, Explosion
@ -589,7 +581,6 @@ AI_Smart_Selfdestruct:
inc [hl] inc [hl]
ret ret
AI_Smart_DreamEater: AI_Smart_DreamEater:
; 90% chance to greatly encourage this move. ; 90% chance to greatly encourage this move.
; The AI_Basic layer will make sure that ; The AI_Basic layer will make sure that
@ -602,7 +593,6 @@ AI_Smart_DreamEater:
dec [hl] dec [hl]
ret ret
AI_Smart_EvasionUp: AI_Smart_EvasionUp:
; Dismiss this move if enemy's evasion can't raise anymore. ; Dismiss this move if enemy's evasion can't raise anymore.
@ -688,7 +678,6 @@ AI_Smart_EvasionUp:
bit SUBSTATUS_ROLLOUT, a bit SUBSTATUS_ROLLOUT, a
jr nz, .asm_388ef jr nz, .asm_388ef
.asm_38936 .asm_38936
inc [hl] inc [hl]
ret ret
@ -714,7 +703,6 @@ AI_Smart_EvasionUp:
dec [hl] dec [hl]
ret ret
AI_Smart_AlwaysHit: AI_Smart_AlwaysHit:
; 80% chance to greatly encourage this move if either... ; 80% chance to greatly encourage this move if either...
@ -736,7 +724,6 @@ AI_Smart_AlwaysHit:
dec [hl] dec [hl]
ret ret
AI_Smart_MirrorMove: AI_Smart_MirrorMove:
; If the player did not use any move last turn... ; If the player did not use any move last turn...
@ -779,7 +766,6 @@ AI_Smart_MirrorMove:
dec [hl] dec [hl]
ret ret
AI_Smart_AccuracyDown: AI_Smart_AccuracyDown:
; If player's HP is full... ; If player's HP is full...
@ -885,7 +871,6 @@ AI_Smart_AccuracyDown:
dec [hl] dec [hl]
ret ret
AI_Smart_ResetStats: AI_Smart_ResetStats:
; 85% chance to encourage this move if any of enemy's stat levels is lower than -2. ; 85% chance to encourage this move if any of enemy's stat levels is lower than -2.
@ -927,7 +912,6 @@ AI_Smart_ResetStats:
inc [hl] inc [hl]
ret ret
AI_Smart_Bide: AI_Smart_Bide:
; 90% chance to discourage this move unless enemy's HP is full. ; 90% chance to discourage this move unless enemy's HP is full.
@ -939,7 +923,6 @@ AI_Smart_Bide:
inc [hl] inc [hl]
ret ret
AI_Smart_ForceSwitch: AI_Smart_ForceSwitch:
; Whirlwind, Roar. ; Whirlwind, Roar.
@ -956,7 +939,6 @@ AI_Smart_ForceSwitch:
inc [hl] inc [hl]
ret ret
AI_Smart_Heal: AI_Smart_Heal:
AI_Smart_MorningSun: AI_Smart_MorningSun:
AI_Smart_Synthesis: AI_Smart_Synthesis:
@ -980,7 +962,6 @@ AI_Smart_Moonlight:
dec [hl] dec [hl]
ret ret
AI_Smart_Toxic: AI_Smart_Toxic:
AI_Smart_LeechSeed: AI_Smart_LeechSeed:
; Discourage this move if player's HP is below 50%. ; Discourage this move if player's HP is below 50%.
@ -990,7 +971,6 @@ AI_Smart_LeechSeed:
inc [hl] inc [hl]
ret ret
AI_Smart_LightScreen: AI_Smart_LightScreen:
AI_Smart_Reflect: AI_Smart_Reflect:
; Over 90% chance to discourage this move unless enemy's HP is full. ; Over 90% chance to discourage this move unless enemy's HP is full.
@ -1003,7 +983,6 @@ AI_Smart_Reflect:
inc [hl] inc [hl]
ret ret
AI_Smart_Ohko: AI_Smart_Ohko:
; Dismiss this move if player's level is higher than enemy's level. ; Dismiss this move if player's level is higher than enemy's level.
; Else, discourage this move is player's HP is below 50%. ; Else, discourage this move is player's HP is below 50%.
@ -1018,7 +997,6 @@ AI_Smart_Ohko:
inc [hl] inc [hl]
ret ret
AI_Smart_TrapTarget: AI_Smart_TrapTarget:
; Bind, Wrap, Fire Spin, Clamp ; Bind, Wrap, Fire Spin, Clamp
@ -1058,7 +1036,6 @@ AI_Smart_TrapTarget:
dec [hl] dec [hl]
ret ret
AI_Smart_RazorWind: AI_Smart_RazorWind:
AI_Smart_Unused2B: AI_Smart_Unused2B:
ld a, [wEnemySubStatus1] ld a, [wEnemySubStatus1]
@ -1112,7 +1089,6 @@ AI_Smart_Unused2B:
ld [hl], a ld [hl], a
ret ret
AI_Smart_Confuse: AI_Smart_Confuse:
; 90% chance to discourage this move if player's HP is between 25% and 50%. ; 90% chance to discourage this move if player's HP is between 25% and 50%.
@ -1130,7 +1106,6 @@ AI_Smart_Confuse:
inc [hl] inc [hl]
ret ret
AI_Smart_SpDefenseUp2: AI_Smart_SpDefenseUp2:
; Discourage this move if enemy's HP is lower than 50%. ; Discourage this move if enemy's HP is lower than 50%.
@ -1165,7 +1140,6 @@ AI_Smart_SpDefenseUp2:
inc [hl] inc [hl]
ret ret
AI_Smart_Fly: AI_Smart_Fly:
; Fly, Dig ; Fly, Dig
@ -1184,7 +1158,6 @@ AI_Smart_Fly:
dec [hl] dec [hl]
ret ret
AI_Smart_SuperFang: AI_Smart_SuperFang:
; Discourage this move if player's HP is below 25%. ; Discourage this move if player's HP is below 25%.
@ -1193,7 +1166,6 @@ AI_Smart_SuperFang:
inc [hl] inc [hl]
ret ret
AI_Smart_Paralyze: AI_Smart_Paralyze:
; 50% chance to discourage this move if player's HP is below 25%. ; 50% chance to discourage this move if player's HP is below 25%.
@ -1218,7 +1190,6 @@ AI_Smart_Paralyze:
inc [hl] inc [hl]
ret ret
AI_Smart_SpeedDownHit: AI_Smart_SpeedDownHit:
; Icy Wind ; Icy Wind
@ -1244,7 +1215,6 @@ AI_Smart_SpeedDownHit:
dec [hl] dec [hl]
ret ret
AI_Smart_Substitute: AI_Smart_Substitute:
; Dismiss this move if enemy's HP is below 50%. ; Dismiss this move if enemy's HP is below 50%.
@ -1252,7 +1222,6 @@ AI_Smart_Substitute:
ret c ret c
jp AIDiscourageMove jp AIDiscourageMove
AI_Smart_HyperBeam: AI_Smart_HyperBeam:
call AICheckEnemyHalfHP call AICheckEnemyHalfHP
jr c, .asm_38b72 jr c, .asm_38b72
@ -1276,7 +1245,6 @@ AI_Smart_HyperBeam:
inc [hl] inc [hl]
ret ret
AI_Smart_Rage: AI_Smart_Rage:
ld a, [wEnemySubStatus4] ld a, [wEnemySubStatus4]
bit SUBSTATUS_RAGE, a bit SUBSTATUS_RAGE, a
@ -1315,7 +1283,6 @@ AI_Smart_Rage:
inc [hl] inc [hl]
ret ret
AI_Smart_Mimic: AI_Smart_Mimic:
ld a, [wLastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
and a and a
@ -1365,7 +1332,6 @@ AI_Smart_Mimic:
inc [hl] inc [hl]
ret ret
AI_Smart_Counter: AI_Smart_Counter:
push hl push hl
ld hl, wPlayerUsedMoves ld hl, wPlayerUsedMoves
@ -1415,7 +1381,6 @@ AI_Smart_Counter:
cp SPECIAL cp SPECIAL
jr nc, .asm_38c38 jr nc, .asm_38c38
.asm_38c30 .asm_38c30
call Random call Random
cp 39 percent + 1 cp 39 percent + 1
@ -1430,7 +1395,6 @@ AI_Smart_Counter:
inc [hl] inc [hl]
ret ret
AI_Smart_Encore: AI_Smart_Encore:
call AICompareSpeed call AICompareSpeed
jr nc, .asm_38c81 jr nc, .asm_38c81
@ -1484,7 +1448,6 @@ AI_Smart_Encore:
INCLUDE "data/battle/ai/encore_moves.asm" INCLUDE "data/battle/ai/encore_moves.asm"
AI_Smart_PainSplit: AI_Smart_PainSplit:
; Discourage this move if [enemy's current HP * 2 > player's current HP]. ; Discourage this move if [enemy's current HP * 2 > player's current HP].
@ -1505,7 +1468,6 @@ AI_Smart_PainSplit:
inc [hl] inc [hl]
ret ret
AI_Smart_Snore: AI_Smart_Snore:
AI_Smart_SleepTalk: AI_Smart_SleepTalk:
; Greatly encourage this move if enemy is fast asleep. ; Greatly encourage this move if enemy is fast asleep.
@ -1527,7 +1489,6 @@ AI_Smart_SleepTalk:
inc [hl] inc [hl]
ret ret
AI_Smart_DefrostOpponent: AI_Smart_DefrostOpponent:
; Greatly encourage this move if enemy is frozen. ; Greatly encourage this move if enemy is frozen.
; No move has EFFECT_DEFROST_OPPONENT, so this layer is unused. ; No move has EFFECT_DEFROST_OPPONENT, so this layer is unused.
@ -1540,7 +1501,6 @@ AI_Smart_DefrostOpponent:
dec [hl] dec [hl]
ret ret
AI_Smart_Spite: AI_Smart_Spite:
ld a, [wLastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
and a and a
@ -1597,11 +1557,9 @@ AI_Smart_Spite:
dec [hl] dec [hl]
ret ret
Function_0x38d16 Function_0x38d16
jp AIDiscourageMove jp AIDiscourageMove
AI_Smart_DestinyBond: AI_Smart_DestinyBond:
AI_Smart_Reversal: AI_Smart_Reversal:
AI_Smart_SkullBash: AI_Smart_SkullBash:
@ -1612,7 +1570,6 @@ AI_Smart_SkullBash:
inc [hl] inc [hl]
ret ret
AI_Smart_HealBell: AI_Smart_HealBell:
; Dismiss this move if none of the opponent's Pokemon is statused. ; Dismiss this move if none of the opponent's Pokemon is statused.
; Encourage this move if the enemy is statused. ; Encourage this move if the enemy is statused.
@ -1670,7 +1627,6 @@ AI_Smart_HealBell:
jp AIDiscourageMove jp AIDiscourageMove
AI_Smart_PriorityHit: AI_Smart_PriorityHit:
call AICompareSpeed call AICompareSpeed
ret c ret c
@ -1702,7 +1658,6 @@ AI_Smart_PriorityHit:
dec [hl] dec [hl]
ret ret
AI_Smart_Thief: AI_Smart_Thief:
; Don't use Thief unless it's the only move available. ; Don't use Thief unless it's the only move available.
@ -1711,7 +1666,6 @@ AI_Smart_Thief:
ld [hl], a ld [hl], a
ret ret
AI_Smart_Conversion2: AI_Smart_Conversion2:
ld a, [wLastPlayerMove] ld a, [wLastPlayerMove]
and a and a
@ -1751,7 +1705,6 @@ AI_Smart_Conversion2:
inc [hl] inc [hl]
ret ret
AI_Smart_Disable: AI_Smart_Disable:
call AICompareSpeed call AICompareSpeed
jr nc, .asm_38df3 jr nc, .asm_38df3
@ -1783,7 +1736,6 @@ AI_Smart_Disable:
inc [hl] inc [hl]
ret ret
AI_Smart_MeanLook: AI_Smart_MeanLook:
call AICheckEnemyHalfHP call AICheckEnemyHalfHP
jr nc, .asm_38e24 jr nc, .asm_38e24
@ -1825,7 +1777,6 @@ AI_Smart_MeanLook:
dec [hl] dec [hl]
ret ret
AICheckLastPlayerMon: AICheckLastPlayerMon:
ld a, [wPartyCount] ld a, [wPartyCount]
ld b, a ld b, a
@ -1851,7 +1802,6 @@ AICheckLastPlayerMon:
ret ret
AI_Smart_Nightmare: AI_Smart_Nightmare:
; 50% chance to encourage this move. ; 50% chance to encourage this move.
; The AI_Basic layer will make sure that ; The AI_Basic layer will make sure that
@ -1862,7 +1812,6 @@ AI_Smart_Nightmare:
dec [hl] dec [hl]
ret ret
AI_Smart_FlameWheel: AI_Smart_FlameWheel:
; Use this move if the enemy is frozen. ; Use this move if the enemy is frozen.
@ -1874,7 +1823,6 @@ rept 5
endr endr
ret ret
AI_Smart_Curse: AI_Smart_Curse:
ld a, [wEnemyMonType1] ld a, [wEnemyMonType1]
cp GHOST cp GHOST
@ -1932,14 +1880,12 @@ AI_Smart_Curse:
jr .asm_38eb7 jr .asm_38eb7
.asm_38eb0 .asm_38eb0
push hl push hl
call AICheckLastPlayerMon call AICheckLastPlayerMon
pop hl pop hl
jr z, .asm_38ecb jr z, .asm_38ecb
.asm_38eb7 .asm_38eb7
call AICheckEnemyQuarterHP call AICheckEnemyQuarterHP
jp nc, .asm_38e90 jp nc, .asm_38e90
@ -1962,7 +1908,6 @@ AI_Smart_Curse:
dec [hl] dec [hl]
ret ret
AI_Smart_Protect: AI_Smart_Protect:
ld a, [wEnemyProtectCount] ld a, [wEnemyProtectCount]
and a and a
@ -2014,7 +1959,6 @@ AI_Smart_Protect:
inc [hl] inc [hl]
ret ret
AI_Smart_Foresight: AI_Smart_Foresight:
ld a, [wEnemyAccLevel] ld a, [wEnemyAccLevel]
cp $5 cp $5
@ -2044,7 +1988,6 @@ AI_Smart_Foresight:
dec [hl] dec [hl]
ret ret
AI_Smart_PerishSong: AI_Smart_PerishSong:
push hl push hl
callfar FindAliveEnemyMons callfar FindAliveEnemyMons
@ -2081,7 +2024,6 @@ AI_Smart_PerishSong:
ld [hl], a ld [hl], a
ret ret
AI_Smart_Sandstorm: AI_Smart_Sandstorm:
; Greatly discourage this move if the player is immune to Sandstorm damage. ; Greatly discourage this move if the player is immune to Sandstorm damage.
@ -2125,7 +2067,6 @@ AI_Smart_Sandstorm:
db STEEL db STEEL
db -1 ; end db -1 ; end
AI_Smart_Endure: AI_Smart_Endure:
ld a, [wEnemyProtectCount] ld a, [wEnemyProtectCount]
and a and a
@ -2168,7 +2109,6 @@ AI_Smart_Endure:
inc [hl] inc [hl]
ret ret
AI_Smart_FuryCutter: AI_Smart_FuryCutter:
; Encourage this move based on Fury Cutter's count. ; Encourage this move based on Fury Cutter's count.
@ -2192,7 +2132,6 @@ AI_Smart_FuryCutter:
; fallthrough ; fallthrough
AI_Smart_Rollout: AI_Smart_Rollout:
; Rollout, Fury Cutter ; Rollout, Fury Cutter
@ -2235,7 +2174,6 @@ AI_Smart_Rollout:
inc [hl] inc [hl]
ret ret
AI_Smart_Swagger: AI_Smart_Swagger:
AI_Smart_Attract: AI_Smart_Attract:
; 80% chance to encourage this move during the first turn of player's Pokemon. ; 80% chance to encourage this move during the first turn of player's Pokemon.
@ -2257,7 +2195,6 @@ AI_Smart_Attract:
dec [hl] dec [hl]
ret ret
AI_Smart_Safeguard: AI_Smart_Safeguard:
; 80% chance to discourage this move if player's HP is below 50%. ; 80% chance to discourage this move if player's HP is below 50%.
@ -2268,7 +2205,6 @@ AI_Smart_Safeguard:
inc [hl] inc [hl]
ret ret
AI_Smart_Magnitude: AI_Smart_Magnitude:
AI_Smart_Earthquake: AI_Smart_Earthquake:
@ -2300,7 +2236,6 @@ AI_Smart_Earthquake:
dec [hl] dec [hl]
ret ret
AI_Smart_BatonPass: AI_Smart_BatonPass:
; Discourage this move if the player hasn't shown super-effective moves against the enemy. ; Discourage this move if the player hasn't shown super-effective moves against the enemy.
; Consider player's type(s) if its moves are unknown. ; Consider player's type(s) if its moves are unknown.
@ -2314,7 +2249,6 @@ AI_Smart_BatonPass:
inc [hl] inc [hl]
ret ret
AI_Smart_Pursuit: AI_Smart_Pursuit:
; 50% chance to greatly encourage this move if player's HP is below 25%. ; 50% chance to greatly encourage this move if player's HP is below 25%.
; 80% chance to discourage this move otherwise. ; 80% chance to discourage this move otherwise.
@ -2333,7 +2267,6 @@ AI_Smart_Pursuit:
dec [hl] dec [hl]
ret ret
AI_Smart_RapidSpin: AI_Smart_RapidSpin:
; 80% chance to greatly encourage this move if the enemy is ; 80% chance to greatly encourage this move if the enemy is
; trapped (Bind effect), seeded, or scattered with spikes. ; trapped (Bind effect), seeded, or scattered with spikes.
@ -2358,7 +2291,6 @@ AI_Smart_RapidSpin:
dec [hl] dec [hl]
ret ret
AI_Smart_HiddenPower: AI_Smart_HiddenPower:
push hl push hl
ld a, 1 ld a, 1
@ -2397,7 +2329,6 @@ AI_Smart_HiddenPower:
inc [hl] inc [hl]
ret ret
AI_Smart_RainDance: AI_Smart_RainDance:
; Greatly discourage this move if it would favour the player type-wise. ; Greatly discourage this move if it would favour the player type-wise.
@ -2420,7 +2351,6 @@ AI_Smart_RainDance:
INCLUDE "data/battle/ai/rain_dance_moves.asm" INCLUDE "data/battle/ai/rain_dance_moves.asm"
AI_Smart_SunnyDay: AI_Smart_SunnyDay:
; Greatly discourage this move if it would favour the player type-wise. ; Greatly discourage this move if it would favour the player type-wise.
@ -2442,7 +2372,6 @@ AI_Smart_SunnyDay:
; fallthrough ; fallthrough
AI_Smart_WeatherMove: AI_Smart_WeatherMove:
; Rain Dance, Sunny Day ; Rain Dance, Sunny Day
@ -2492,10 +2421,8 @@ AIGoodWeatherType:
dec [hl] dec [hl]
ret ret
INCLUDE "data/battle/ai/sunny_day_moves.asm" INCLUDE "data/battle/ai/sunny_day_moves.asm"
AI_Smart_BellyDrum: AI_Smart_BellyDrum:
; Dismiss this move if enemy's attack is higher than +2 or if enemy's HP is below 50%. ; Dismiss this move if enemy's attack is higher than +2 or if enemy's HP is below 50%.
; Else, discourage this move if enemy's HP is not full. ; Else, discourage this move if enemy's HP is not full.
@ -2518,7 +2445,6 @@ AI_Smart_BellyDrum:
ld [hl], a ld [hl], a
ret ret
AI_Smart_PsychUp: AI_Smart_PsychUp:
push hl push hl
ld hl, wEnemyAtkLevel ld hl, wEnemyAtkLevel
@ -2576,7 +2502,6 @@ AI_Smart_PsychUp:
inc [hl] inc [hl]
ret ret
AI_Smart_MirrorCoat: AI_Smart_MirrorCoat:
push hl push hl
ld hl, wPlayerUsedMoves ld hl, wPlayerUsedMoves
@ -2626,7 +2551,6 @@ AI_Smart_MirrorCoat:
cp SPECIAL cp SPECIAL
jr c, .asm_391d2 jr c, .asm_391d2
.asm_391ca .asm_391ca
call Random call Random
cp 100 cp 100
@ -2640,7 +2564,6 @@ AI_Smart_MirrorCoat:
inc [hl] inc [hl]
ret ret
AI_Smart_Twister: AI_Smart_Twister:
AI_Smart_Gust: AI_Smart_Gust:
@ -2671,7 +2594,6 @@ AI_Smart_Gust:
dec [hl] dec [hl]
ret ret
AI_Smart_FutureSight: AI_Smart_FutureSight:
; Greatly encourage this move if the player is ; Greatly encourage this move if the player is
; flying or underground, and slower than the enemy. ; flying or underground, and slower than the enemy.
@ -2687,7 +2609,6 @@ AI_Smart_FutureSight:
dec [hl] dec [hl]
ret ret
AI_Smart_Stomp: AI_Smart_Stomp:
; 80% chance to encourage this move if the player has used Minimize. ; 80% chance to encourage this move if the player has used Minimize.
@ -2701,7 +2622,6 @@ AI_Smart_Stomp:
dec [hl] dec [hl]
ret ret
AI_Smart_Solarbeam: AI_Smart_Solarbeam:
; 80% chance to encourage this move when it's sunny. ; 80% chance to encourage this move when it's sunny.
; 90% chance to discourage this move when it's raining. ; 90% chance to discourage this move when it's raining.
@ -2729,7 +2649,6 @@ AI_Smart_Solarbeam:
dec [hl] dec [hl]
ret ret
AI_Smart_Thunder: AI_Smart_Thunder:
; 90% chance to discourage this move when it's sunny. ; 90% chance to discourage this move when it's sunny.
@ -2744,7 +2663,6 @@ AI_Smart_Thunder:
inc [hl] inc [hl]
ret ret
AICompareSpeed: AICompareSpeed:
; Return carry if enemy is faster than player. ; Return carry if enemy is faster than player.
@ -2760,7 +2678,6 @@ AICompareSpeed:
pop bc pop bc
ret ret
AICheckPlayerMaxHP: AICheckPlayerMaxHP:
push hl push hl
push de push de
@ -2769,7 +2686,6 @@ AICheckPlayerMaxHP:
ld hl, wBattleMonMaxHP ld hl, wBattleMonMaxHP
jr AICheckMaxHP jr AICheckMaxHP
AICheckEnemyMaxHP: AICheckEnemyMaxHP:
push hl push hl
push de push de
@ -2778,7 +2694,6 @@ AICheckEnemyMaxHP:
ld hl, wEnemyMonMaxHP ld hl, wEnemyMonMaxHP
; fallthrough ; fallthrough
AICheckMaxHP: AICheckMaxHP:
; Return carry if hp at de matches max hp at hl. ; Return carry if hp at de matches max hp at hl.
@ -2805,7 +2720,6 @@ AICheckMaxHP:
and a and a
ret ret
AICheckPlayerHalfHP: AICheckPlayerHalfHP:
push hl push hl
ld hl, wBattleMonHP ld hl, wBattleMonHP
@ -2823,7 +2737,6 @@ AICheckPlayerHalfHP:
pop hl pop hl
ret ret
AICheckEnemyHalfHP: AICheckEnemyHalfHP:
push hl push hl
push de push de
@ -2845,7 +2758,6 @@ AICheckEnemyHalfHP:
pop hl pop hl
ret ret
AICheckEnemyQuarterHP: AICheckEnemyQuarterHP:
push hl push hl
push de push de
@ -2869,7 +2781,6 @@ AICheckEnemyQuarterHP:
pop hl pop hl
ret ret
AICheckPlayerQuarterHP: AICheckPlayerQuarterHP:
push hl push hl
ld hl, wBattleMonHP ld hl, wBattleMonHP
@ -2889,7 +2800,6 @@ AICheckPlayerQuarterHP:
pop hl pop hl
ret ret
AIHasMoveEffect: AIHasMoveEffect:
; Return carry if the enemy has move b. ; Return carry if the enemy has move b.
@ -2921,7 +2831,6 @@ AIHasMoveEffect:
scf scf
ret ret
AIHasMoveInArray: AIHasMoveInArray:
; Return carry if the enemy has a move in array hl. ; Return carry if the enemy has a move in array hl.
@ -2955,10 +2864,8 @@ AIHasMoveInArray:
pop hl pop hl
ret ret
INCLUDE "data/battle/ai/useful_moves.asm" INCLUDE "data/battle/ai/useful_moves.asm"
AI_Opportunist: AI_Opportunist:
; Discourage stall moves when the enemy's HP is low. ; Discourage stall moves when the enemy's HP is low.
@ -3009,7 +2916,6 @@ AI_Opportunist:
INCLUDE "data/battle/ai/stall_moves.asm" INCLUDE "data/battle/ai/stall_moves.asm"
AI_Aggressive: AI_Aggressive:
; Use whatever does the most damage. ; Use whatever does the most damage.
@ -3117,7 +3023,6 @@ AI_Aggressive:
INCLUDE "data/battle/ai/reckless_moves.asm" INCLUDE "data/battle/ai/reckless_moves.asm"
AIDamageCalc: AIDamageCalc:
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
@ -3137,7 +3042,6 @@ AIDamageCalc:
INCLUDE "data/battle/ai/constant_damage_effects.asm" INCLUDE "data/battle/ai/constant_damage_effects.asm"
AI_Cautious: AI_Cautious:
; 90% chance to discourage moves with residual effects after the first turn. ; 90% chance to discourage moves with residual effects after the first turn.
@ -3180,7 +3084,6 @@ AI_Cautious:
INCLUDE "data/battle/ai/residual_moves.asm" INCLUDE "data/battle/ai/residual_moves.asm"
AI_Status: AI_Status:
; Dismiss status moves that don't affect the player. ; Dismiss status moves that don't affect the player.
@ -3243,7 +3146,6 @@ AI_Status:
jr .checkmove jr .checkmove
AI_Risky: AI_Risky:
; Use any move that will KO the target. ; Use any move that will KO the target.
; Risky moves will often be an exception (see below). ; Risky moves will often be an exception (see below).
@ -3313,18 +3215,15 @@ endr
INCLUDE "data/battle/ai/risky_effects.asm" INCLUDE "data/battle/ai/risky_effects.asm"
AI_None: AI_None:
ret ret
AIDiscourageMove: AIDiscourageMove:
ld a, [hl] ld a, [hl]
add 10 add 10
ld [hl], a ld [hl], a
ret ret
AIGetEnemyMove: AIGetEnemyMove:
; Load attributes of move a into ram ; Load attributes of move a into ram
@ -3345,13 +3244,11 @@ AIGetEnemyMove:
pop hl pop hl
ret ret
AI_80_20: AI_80_20:
call Random call Random
cp 20 percent - 1 cp 20 percent - 1
ret ret
AI_50_50: AI_50_50:
call Random call Random
cp 50 percent + 1 cp 50 percent + 1

6
engine/battle/ai/switch.asm
View File

@ -96,7 +96,6 @@ CheckPlayerMoveTypeMatchups:
pop hl pop hl
ret ret
.CheckEnemyMoveMatchups: .CheckEnemyMoveMatchups:
ld de, wEnemyMonMoves ld de, wEnemyMonMoves
ld b, NUM_MOVES + 1 ld b, NUM_MOVES + 1
@ -290,7 +289,6 @@ CheckAbleToSwitch:
ld [wEnemySwitchMonParam], a ld [wEnemySwitchMonParam], a
ret ret
FindAliveEnemyMons: FindAliveEnemyMons:
ld a, [wOTPartyCount] ld a, [wOTPartyCount]
cp 2 cp 2
@ -341,7 +339,6 @@ FindAliveEnemyMons:
and a and a
ret ret
FindEnemyMonsImmuneToLastCounterMove: FindEnemyMonsImmuneToLastCounterMove:
ld hl, wOTPartyMon1 ld hl, wOTPartyMon1
ld a, [wOTPartyCount] ld a, [wOTPartyCount]
@ -408,7 +405,6 @@ FindEnemyMonsImmuneToLastCounterMove:
srl c srl c
jr .loop jr .loop
FindAliveEnemyMonsWithASuperEffectiveMove: FindAliveEnemyMonsWithASuperEffectiveMove:
push bc push bc
ld a, [wOTPartyCount] ld a, [wOTPartyCount]
@ -546,7 +542,6 @@ FindEnemyMonsWithASuperEffectiveMove:
pop bc pop bc
ret ret
FindEnemyMonsThatResistPlayer: FindEnemyMonsThatResistPlayer:
push bc push bc
ld hl, wOTPartySpecies ld hl, wOTPartySpecies
@ -607,7 +602,6 @@ FindEnemyMonsThatResistPlayer:
ld c, a ld c, a
ret ret
FindEnemyMonsWithAtLeastQuarterMaxHP: FindEnemyMonsWithAtLeastQuarterMaxHP:
push bc push bc
ld de, wOTPartySpecies ld de, wOTPartySpecies

2
engine/battle/battle_transition.asm
View File

@ -146,7 +146,6 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
TrainerBattlePokeballTiles: TrainerBattlePokeballTiles:
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
BattleTransitionJumptable: BattleTransitionJumptable:
jumptable .Jumptable, wJumptableIndex jumptable .Jumptable, wJumptableIndex
@ -753,7 +752,6 @@ WipeLYOverrides:
jr nz, .loop jr nz, .loop
ret ret
StartTrainerBattle_DrawSineWave: StartTrainerBattle_DrawSineWave:
calc_sine_wave calc_sine_wave

1
engine/battle/core.asm
View File

@ -6486,7 +6486,6 @@ CheckUnownLetter:
INCLUDE "data/wild/unlocked_unowns.asm" INCLUDE "data/wild/unlocked_unowns.asm"
Unreferenced_SwapBattlerLevels: Unreferenced_SwapBattlerLevels:
push bc push bc
ld a, [wBattleMonLevel] ld a, [wBattleMonLevel]

249
engine/battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/battle/hidden_power.asm
View File

@ -8,7 +8,6 @@ HiddenPowerDamage:
ld hl, wEnemyMonDVs ld hl, wEnemyMonDVs
.got_dvs .got_dvs
; Power: ; Power:
; Take the top bit from each stat ; Take the top bit from each stat
@ -62,7 +61,6 @@ HiddenPowerDamage:
ld d, a ld d, a
; Type: ; Type:
; Def & 3 ; Def & 3

3
engine/battle/misc.asm
View File

@ -49,7 +49,6 @@ GetPlayerBackpicCoords:
lb bc, 6, 6 lb bc, 6, 6
ret ret
DoWeatherModifiers: DoWeatherModifiers:
ld de, WeatherTypeModifiers ld de, WeatherTypeModifiers
@ -76,7 +75,6 @@ DoWeatherModifiers:
inc de inc de
jr .CheckWeatherType jr .CheckWeatherType
.done_weather_types .done_weather_types
ld de, WeatherMoveModifiers ld de, WeatherMoveModifiers
@ -147,7 +145,6 @@ DoWeatherModifiers:
INCLUDE "data/battle/weather_modifiers.asm" INCLUDE "data/battle/weather_modifiers.asm"
DoBadgeTypeBoosts: DoBadgeTypeBoosts:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a

1
engine/battle/move_effects/attract.asm
View File

@ -22,7 +22,6 @@ BattleCommand_Attract:
.failed .failed
jp FailMove jp FailMove
CheckOppositeGender: CheckOppositeGender:
ld a, MON_SPECIES ld a, MON_SPECIES
call BattlePartyAttr call BattlePartyAttr

8
engine/battle/move_effects/baton_pass.asm
View File

@ -5,7 +5,6 @@ BattleCommand_BatonPass:
and a and a
jp nz, .Enemy jp nz, .Enemy
; Need something to switch to ; Need something to switch to
call CheckAnyOtherAlivePartyMons call CheckAnyOtherAlivePartyMons
jp z, FailedBatonPass jp z, FailedBatonPass
@ -45,7 +44,6 @@ BattleCommand_BatonPass:
call ResetBatonPassStatus call ResetBatonPassStatus
ret ret
.Enemy: .Enemy:
; Wildmons don't have anything to switch to ; Wildmons don't have anything to switch to
@ -82,7 +80,6 @@ BattleCommand_BatonPass:
jr ResetBatonPassStatus jr ResetBatonPassStatus
BatonPass_LinkPlayerSwitch: BatonPass_LinkPlayerSwitch:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@ -101,7 +98,6 @@ BatonPass_LinkPlayerSwitch:
ret ret
BatonPass_LinkEnemySwitch: BatonPass_LinkEnemySwitch:
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
@ -128,13 +124,11 @@ BatonPass_LinkEnemySwitch:
jp CloseWindow jp CloseWindow
FailedBatonPass: FailedBatonPass:
call AnimateFailedMove call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
ResetBatonPassStatus: ResetBatonPassStatus:
; Reset status changes that aren't passed by Baton Pass. ; Reset status changes that aren't passed by Baton Pass.
@ -175,7 +169,6 @@ ResetBatonPassStatus:
ret ret
CheckAnyOtherAlivePartyMons: CheckAnyOtherAlivePartyMons:
ld hl, wPartyMon1HP ld hl, wPartyMon1HP
ld a, [wPartyCount] ld a, [wPartyCount]
@ -185,7 +178,6 @@ CheckAnyOtherAlivePartyMons:
jr CheckAnyOtherAliveMons jr CheckAnyOtherAliveMons
CheckAnyOtherAliveEnemyMons: CheckAnyOtherAliveEnemyMons:
ld hl, wOTPartyMon1HP ld hl, wOTPartyMon1HP
ld a, [wOTPartyCount] ld a, [wOTPartyCount]

3
engine/battle/move_effects/beat_up.asm
View File

@ -194,13 +194,11 @@ BattleCommand_BeatUp:
ret ret
.beatup_fail .beatup_fail
ld b, buildopponentrage_command ld b, buildopponentrage_command
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_BeatUpFailText: BattleCommand_BeatUpFailText:
; beatupfailtext ; beatupfailtext
@ -211,7 +209,6 @@ BattleCommand_BeatUpFailText:
jp PrintButItFailed jp PrintButItFailed
GetBeatupMonLocation: GetBeatupMonLocation:
push bc push bc
ld c, a ld c, a

1
engine/battle/move_effects/bide.asm
View File

@ -70,7 +70,6 @@ BattleCommand_StoreEnergy:
jp EndMoveEffect jp EndMoveEffect
BattleCommand_UnleashEnergy: BattleCommand_UnleashEnergy:
; unleashenergy ; unleashenergy

3
engine/battle/move_effects/curse.asm
View File

@ -21,7 +21,6 @@ BattleCommand_Curse:
cp GHOST cp GHOST
jr z, .ghost jr z, .ghost
; If no stats can be increased, don't. ; If no stats can be increased, don't.
; Attack ; Attack
@ -54,7 +53,6 @@ BattleCommand_Curse:
call BattleCommand_DefenseUp call BattleCommand_DefenseUp
jp BattleCommand_StatUpMessage jp BattleCommand_StatUpMessage
.ghost .ghost
; Cut HP in half and put a curse on the opponent. ; Cut HP in half and put a curse on the opponent.
@ -84,7 +82,6 @@ BattleCommand_Curse:
call AnimateFailedMove call AnimateFailedMove
jp PrintButItFailed jp PrintButItFailed
.cantraise .cantraise
; Can't raise either stat. ; Can't raise either stat.

1
engine/battle/move_effects/fury_cutter.asm
View File

@ -39,7 +39,6 @@ BattleCommand_FuryCutter:
ret ret
ResetFuryCutterCount: ResetFuryCutterCount:
push hl push hl

1
engine/battle/move_effects/future_sight.asm
View File

@ -25,7 +25,6 @@ BattleCommand_CheckFutureSight:
ld b, futuresight_command ld b, futuresight_command
jp SkipToBattleCommand jp SkipToBattleCommand
BattleCommand_FutureSight: BattleCommand_FutureSight:
; futuresight ; futuresight

2
engine/battle/move_effects/metronome.asm
View File

@ -34,12 +34,10 @@ BattleCommand_Metronome:
call CheckUserMove call CheckUserMove
jr z, .GetMove jr z, .GetMove
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE
call GetBattleVarAddr call GetBattleVarAddr
ld [hl], b ld [hl], b
call UpdateMoveData call UpdateMoveData
jp ResetTurn jp ResetTurn
INCLUDE "data/battle/metronome_exception_moves.asm" INCLUDE "data/battle/metronome_exception_moves.asm"

1
engine/battle/move_effects/pain_split.asm
View File

@ -89,7 +89,6 @@ BattleCommand_PainSplit:
ld [wBuffer6], a ld [wBuffer6], a
ret ret
.ButItFailed: .ButItFailed:
jp PrintDidntAffect2 jp PrintDidntAffect2

1
engine/battle/move_effects/perish_song.asm
View File

@ -1,7 +1,6 @@
BattleCommand_PerishSong: BattleCommand_PerishSong:
; perishsong ; perishsong
ld hl, wPlayerSubStatus1 ld hl, wPlayerSubStatus1
ld de, wEnemySubStatus1 ld de, wEnemySubStatus1
bit SUBSTATUS_PERISH, [hl] bit SUBSTATUS_PERISH, [hl]

2
engine/battle/move_effects/protect.asm
View File

@ -12,7 +12,6 @@ BattleCommand_Protect:
ld hl, ProtectedItselfText ld hl, ProtectedItselfText
jp StdBattleTextBox jp StdBattleTextBox
ProtectChance: ProtectChance:
ld de, wPlayerProtectCount ld de, wPlayerProtectCount
@ -68,7 +67,6 @@ ProtectChance:
and a and a
ret ret
.failed .failed
xor a xor a
ld [de], a ld [de], a

2
engine/battle/move_effects/rollout.asm
View File

@ -1,6 +1,5 @@
MAX_ROLLOUT_COUNT EQU 5 MAX_ROLLOUT_COUNT EQU 5
BattleCommand_CheckCurl: BattleCommand_CheckCurl:
; checkcurl ; checkcurl
@ -23,7 +22,6 @@ BattleCommand_CheckCurl:
ld [de], a ld [de], a
ret ret
BattleCommand_RolloutPower: BattleCommand_RolloutPower:
; rolloutpower ; rolloutpower

3
engine/battle/move_effects/thief.asm
View File

@ -50,7 +50,6 @@ BattleCommand_Thief:
ld [de], a ld [de], a
jr .stole jr .stole
.enemy .enemy
; The enemy can't already have an item. ; The enemy can't already have an item.
@ -91,13 +90,11 @@ BattleCommand_Thief:
ld [hl], a ld [hl], a
ld [de], a ld [de], a
.stole .stole
call GetItemName call GetItemName
ld hl, StoleText ld hl, StoleText
jp StdBattleTextBox jp StdBattleTextBox
.playeritem .playeritem
ld a, 1 ld a, 1
call BattlePartyAttr call BattlePartyAttr

1
engine/battle/move_effects/triple_kick.asm
View File

@ -27,7 +27,6 @@ BattleCommand_TripleKick:
ret ret
BattleCommand_KickCounter: BattleCommand_KickCounter:
; kickcounter ; kickcounter

1
engine/battle/read_trainer_party.asm
View File

@ -321,7 +321,6 @@ ComputeTrainerReward:
ld [hl], a ld [hl], a
ret ret
Battle_GetTrainerName:: Battle_GetTrainerName::
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a

2
engine/battle/used_move_text.asm
View File

@ -131,7 +131,6 @@ EndUsedMove5Text:
text_jump _EndUsedMove5Text text_jump _EndUsedMove5Text
db "@" db "@"
GetMoveGrammar: GetMoveGrammar:
; store move grammar type in wd265 ; store move grammar type in wd265
@ -169,7 +168,6 @@ GetMoveGrammar:
INCLUDE "data/moves/grammar.asm" INCLUDE "data/moves/grammar.asm"
UpdateUsedMoves: UpdateUsedMoves:
; append move a to wPlayerUsedMoves unless it has already been used ; append move a to wPlayerUsedMoves unless it has already been used

4
engine/battle_anims/anim_commands.asm
View File

@ -240,7 +240,6 @@ Unreferenced_Functioncc220:
call BattleAnimDelayFrame call BattleAnimDelayFrame
ret ret
BattleAnim_ClearCGB_OAMFlags: BattleAnim_ClearCGB_OAMFlags:
ld a, [wBattleAnimFlags] ld a, [wBattleAnimFlags]
@ -333,7 +332,6 @@ RunBattleAnimCommand:
ld l, a ld l, a
jp hl jp hl
BattleAnimCommands:: BattleAnimCommands::
; entries correspond to macros/scripts/battle_anims.asm enumeration ; entries correspond to macros/scripts/battle_anims.asm enumeration
dw BattleAnimCmd_Obj dw BattleAnimCmd_Obj
@ -385,7 +383,6 @@ BattleAnimCommands::
dw BattleAnimCmd_Call dw BattleAnimCmd_Call
dw BattleAnimCmd_Ret dw BattleAnimCmd_Ret
BattleAnimCmd_EA: BattleAnimCmd_EA:
BattleAnimCmd_EB: BattleAnimCmd_EB:
BattleAnimCmd_EC: BattleAnimCmd_EC:
@ -1304,7 +1301,6 @@ endr
dw $0000, $0000 dw $0000, $0000
dw $0000, $0000 dw $0000, $0000
PlayHitSound: PlayHitSound:
ld a, [wNumHits] ld a, [wNumHits]
cp $1 cp $1

28
engine/battle_anims/bg_effects.asm
View File

@ -134,7 +134,6 @@ BattleBGEffects:
dw BattleBGEffect_WobbleMon dw BattleBGEffect_WobbleMon
dw BattleBGEffect_35 dw BattleBGEffect_35
BattleBGEffect_End: BattleBGEffect_End:
call EndBattleBGEffect call EndBattleBGEffect
ret ret
@ -348,7 +347,6 @@ BattleBGEffect_HideMon:
dw BattleBGEffects_IncrementJumptable dw BattleBGEffects_IncrementJumptable
dw .four dw .four
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
push bc push bc
@ -415,7 +413,6 @@ BattleBGEffect_FeetFollow:
dw BattleBGEffects_IncrementJumptable dw BattleBGEffects_IncrementJumptable
dw .five dw .five
.zero .zero
call BGEffect_CheckFlyDigStatus call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging jr z, .not_flying_digging
@ -483,7 +480,6 @@ BattleBGEffect_HeadFollow:
dw BattleBGEffects_IncrementJumptable dw BattleBGEffects_IncrementJumptable
dw .five dw .five
.zero .zero
call BGEffect_CheckFlyDigStatus call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging jr z, .not_flying_digging
@ -554,7 +550,6 @@ BattleBGEffect_27:
dw BattleBGEffects_IncrementJumptable dw BattleBGEffects_IncrementJumptable
dw .four dw .four
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BGEffect_CheckBattleTurn call BGEffect_CheckBattleTurn
@ -717,7 +712,6 @@ BattleBGEffect_RunPicResizeScript:
dw .restart dw .restart
dw .end dw .end
.zero .zero
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
@ -915,7 +909,6 @@ BattleBGEffect_Surf:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
lb de, 2, 2 lb de, 2, 2
@ -982,7 +975,6 @@ BattleBGEffect_Whirlpool:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1056,7 +1048,6 @@ BattleBGEffect_Psychic:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1094,7 +1085,6 @@ BattleBGEffect_Teleport:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1119,7 +1109,6 @@ BattleBGEffect_NightShade:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1150,7 +1139,6 @@ BattleBGEffect_DoubleTeam:
dw .four dw .four
dw .five dw .five
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1242,7 +1230,6 @@ BattleBGEffect_AcidArmor:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1305,7 +1292,6 @@ BattleBGEffect_Withdraw:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1355,7 +1341,6 @@ BattleBGEffect_Dig:
dw .two dw .two
dw .three dw .three
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1422,7 +1407,6 @@ BattleBGEffect_Tackle:
dw Tackle_BGEffect25_2d_two dw Tackle_BGEffect25_2d_two
dw .three dw .three
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1457,7 +1441,6 @@ BattleBGEffect_25:
dw Tackle_BGEffect25_2d_two dw Tackle_BGEffect25_2d_two
dw .three dw .three
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1585,7 +1568,6 @@ BattleBGEffect_2d:
dw Tackle_BGEffect25_2d_two dw Tackle_BGEffect25_2d_two
dw .three dw .three
.three .three
call BattleAnim_ResetLCDStatCustom call BattleAnim_ResetLCDStatCustom
ret ret
@ -1633,7 +1615,6 @@ BattleBGEffect_26:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1672,7 +1653,6 @@ BattleBGEffect_2c:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1727,7 +1707,6 @@ BattleBGEffect_28:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1770,7 +1749,6 @@ BattleBGEffect_BounceDown:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1928,7 +1906,6 @@ BattleBGEffect_2b:
dw .zero dw .zero
dw .one dw .one
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -1969,7 +1946,6 @@ BattleBGEffect_1c:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld a, $e4 ld a, $e4
@ -2196,7 +2172,6 @@ BattleBGEffect_VibrateMon:
dw .zero dw .zero
dw .one dw .one
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -2242,7 +2217,6 @@ BattleBGEffect_WobbleMon:
dw .one dw .one
dw .two dw .two
.zero .zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
@ -2407,7 +2381,6 @@ BGEffect_RapidCyclePals:
dw .one_dmg dw .one_dmg
dw .two_dmg dw .two_dmg
.zero_dmg .zero_dmg
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld a, $e4 ld a, $e4
@ -2472,7 +2445,6 @@ BGEffect_RapidCyclePals:
dw .three_cgb dw .three_cgb
dw .four_cgb dw .four_cgb
.zero_cgb .zero_cgb
call BGEffect_CheckBattleTurn call BGEffect_CheckBattleTurn
jr nz, .player_turn_cgb jr nz, .player_turn_cgb

4
engine/battle_anims/core.asm
View File

@ -26,7 +26,6 @@ DeinitBattleAnimation:
ld [hl], $0 ld [hl], $0
ret ret
InitBattleAnimation: InitBattleAnimation:
ld a, [wBattleAnimTemp0] ld a, [wBattleAnimTemp0]
ld e, a ld e, a
@ -190,7 +189,6 @@ BattleAnimOAMUpdate:
scf scf
ret ret
InitBattleAnimBuffer: InitBattleAnimBuffer:
ld hl, BATTLEANIMSTRUCT_01 ld hl, BATTLEANIMSTRUCT_01
add hl, bc add hl, bc
@ -274,7 +272,6 @@ InitBattleAnimBuffer:
ld [wBattleAnimTempXOffset], a ld [wBattleAnimTempXOffset], a
ret ret
GetBattleAnimTileOffset: GetBattleAnimTileOffset:
push hl push hl
push bc push bc
@ -302,7 +299,6 @@ _ExecuteBGEffects:
callfar ExecuteBGEffects callfar ExecuteBGEffects
ret ret
_QueueBGEffect: _QueueBGEffect:
callfar QueueBGEffect callfar QueueBGEffect
ret ret

3
engine/battle_anims/helpers.asm
View File

@ -72,7 +72,6 @@ GetBattleAnimFrame:
ld [hl], a ld [hl], a
jr .loop jr .loop
.GetPointer: .GetPointer:
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc add hl, bc
@ -92,7 +91,6 @@ GetBattleAnimFrame:
add hl, de add hl, de
ret ret
GetBattleAnimOAMPointer: GetBattleAnimOAMPointer:
ld l, a ld l, a
ld h, 0 ld h, 0
@ -102,7 +100,6 @@ GetBattleAnimOAMPointer:
add hl, de add hl, de
ret ret
LoadBattleAnimObj: LoadBattleAnimObj:
push hl push hl
ld l, a ld l, a

9
engine/events/battle_tower/battle_tower.asm
View File

@ -264,7 +264,6 @@ RunBattleTowerTrainer:
ld [wBattleTowerBattleEnded], a ld [wBattleTowerBattleEnded], a
ret ret
ReadBTTrainerParty: ReadBTTrainerParty:
; Initialise the BattleTower-Trainer and his mon ; Initialise the BattleTower-Trainer and his mon
call CopyBTTrainer_FromBT_OT_TowBT_OTTemp call CopyBTTrainer_FromBT_OT_TowBT_OTTemp
@ -555,7 +554,6 @@ Function17042c:
INCLUDE "data/battle_tower/unknown_levels.asm" INCLUDE "data/battle_tower/unknown_levels.asm"
CopyBTTrainer_FromBT_OT_TowBT_OTTemp: CopyBTTrainer_FromBT_OT_TowBT_OTTemp:
; copy the BattleTower-Trainer data that lies at 'wBT_OTTrainer' to 'wBT_OTTemp' ; copy the BattleTower-Trainer data that lies at 'wBT_OTTrainer' to 'wBT_OTTemp'
ld a, [rSVBK] ld a, [rSVBK]
@ -672,12 +670,10 @@ Function1704e1:
call .PlaceTextItems call .PlaceTextItems
jr .NextJumptableFunction jr .NextJumptableFunction
.Jumptable_1: .Jumptable_1:
call SetPalettes call SetPalettes
call .NextJumptableFunction call .NextJumptableFunction
.Jumptable_2: .Jumptable_2:
ld hl, hJoyPressed ld hl, hJoyPressed
ld a, [hl] ld a, [hl]
@ -882,7 +878,6 @@ BattleTowerAction:
ld l, a ld l, a
jp hl jp hl
.dw .dw
dw BattleTowerAction_CheckExplanationRead ; 0x00 dw BattleTowerAction_CheckExplanationRead ; 0x00
dw BattleTowerAction_SetExplanationRead ; 0x01 dw BattleTowerAction_SetExplanationRead ; 0x01
@ -917,7 +912,6 @@ BattleTowerAction:
dw BattleTower_RandomlyChooseReward ; 0x1e dw BattleTower_RandomlyChooseReward ; 0x1e
dw BattleTower_SaveOptions ; 0x1f dw BattleTower_SaveOptions ; 0x1f
; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes) ; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes)
ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a
ld a, BANK(sBTTrainers) ld a, BANK(sBTTrainers)
@ -1200,7 +1194,6 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09
ld [wScriptVar], a ld [wScriptVar], a
ret ret
Function1708b1: ; BattleTowerAction $0a Function1708b1: ; BattleTowerAction $0a
xor a xor a
ld [wMusicFade], a ld [wMusicFade], a
@ -1260,7 +1253,6 @@ Function1708f0: ; BattleTowerAction $0d
ld [wScriptVar], a ld [wScriptVar], a
ret ret
Function170923: Function170923:
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
@ -1273,7 +1265,6 @@ Function170923:
call CloseSRAM call CloseSRAM
ret ret
BattleTowerAction_EggTicket: ; BattleTowerAction $0e BattleTowerAction_EggTicket: ; BattleTowerAction $0e
xor a xor a
ld [wScriptVar], a ld [wScriptVar], a

1
engine/events/battle_tower/load_trainer.asm
View File

@ -91,7 +91,6 @@ endc
ret ret
Function_LoadRandomBattleTowerMon: Function_LoadRandomBattleTowerMon:
ld c, BATTLETOWER_PARTY_LENGTH ld c, BATTLETOWER_PARTY_LENGTH
.loop .loop

4
engine/events/battle_tower/trainer_text.asm
View File

@ -88,7 +88,6 @@ INCLUDE "mobile/fixed_words.asm"
INCLUDE "data/trainers/genders.asm" INCLUDE "data/trainers/genders.asm"
BTMaleTrainerTexts: BTMaleTrainerTexts:
dw .Greetings dw .Greetings
dw .PlayerLost dw .PlayerLost
@ -175,7 +174,6 @@ BTMaleTrainerTexts:
dw BTWinM24 dw BTWinM24
dw BTWinM25 dw BTWinM25
BTFemaleTrainerTexts: BTFemaleTrainerTexts:
dw .Greetings dw .Greetings
dw .PlayerLost dw .PlayerLost
@ -232,7 +230,6 @@ BTFemaleTrainerTexts:
dw BTWinF14 dw BTWinF14
dw BTWinF15 dw BTWinF15
BTGreetingM1: BTGreetingM1:
text_jump BattleTowerText_0x1ec000 text_jump BattleTowerText_0x1ec000
db "@" db "@"
@ -535,7 +532,6 @@ BTWinM25:
BTGreetingF1: BTGreetingF1:
text_jump UnknownText_0x1ec9bd text_jump UnknownText_0x1ec9bd
db "@" db "@"

2
engine/events/bug_contest/judging.asm
View File

@ -125,10 +125,8 @@ LoadContestantName:
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
jp CopyBytes jp CopyBytes
INCLUDE "data/events/bug_contest_winners.asm" INCLUDE "data/events/bug_contest_winners.asm"
BugContest_GetPlayersResult: BugContest_GetPlayersResult:
ld hl, wBugContestThirdPlaceWinnerID ld hl, wBugContestThirdPlaceWinnerID
ld de, - BUG_CONTESTANT_SIZE ld de, - BUG_CONTESTANT_SIZE

19
engine/events/celebi.asm
View File

@ -41,7 +41,6 @@ CelebiShrineEvent:
pop bc pop bc
jr .loop jr .loop
.done .done
pop af pop af
ld [wVramState], a ld [wVramState], a
@ -49,7 +48,6 @@ CelebiShrineEvent:
call CelebiEvent_SetBattleType call CelebiEvent_SetBattleType
ret ret
.RestorePlayerSprite_DespawnLeaves: .RestorePlayerSprite_DespawnLeaves:
ld hl, wVirtualOAMSprite00TileID ld hl, wVirtualOAMSprite00TileID
xor a xor a
@ -68,7 +66,6 @@ endr
call ByteFill call ByteFill
ret ret
LoadCelebiGFX: LoadCelebiGFX:
farcall ClearSpriteAnims farcall ClearSpriteAnims
ld de, SpecialCelebiLeafGFX ld de, SpecialCelebiLeafGFX
@ -83,7 +80,6 @@ LoadCelebiGFX:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
CelebiEvent_CountDown: CelebiEvent_CountDown:
ld hl, wFrameCounter ld hl, wFrameCounter
ld a, [hl] ld a, [hl]
@ -92,13 +88,11 @@ CelebiEvent_CountDown:
dec [hl] dec [hl]
ret ret
.done .done
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set 7, [hl]
ret ret
CelebiEvent_SpawnLeaf: CelebiEvent_SpawnLeaf:
; unused ; unused
ld hl, wcf65 ld hl, wcf65
@ -119,7 +113,6 @@ CelebiEvent_SpawnLeaf:
ld [hl], $80 ld [hl], $80
ret ret
SpecialCelebiLeafGFX: SpecialCelebiLeafGFX:
INCBIN "gfx/overworld/cut_grass.2bpp" INCBIN "gfx/overworld/cut_grass.2bpp"
@ -129,7 +122,6 @@ INCBIN "gfx/overworld/celebi/2.2bpp"
INCBIN "gfx/overworld/celebi/3.2bpp" INCBIN "gfx/overworld/celebi/3.2bpp"
INCBIN "gfx/overworld/celebi/4.2bpp" INCBIN "gfx/overworld/celebi/4.2bpp"
UpdateCelebiPosition: UpdateCelebiPosition:
ld hl, SPRITEANIMSTRUCT_XOFFSET ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc add hl, bc
@ -224,7 +216,6 @@ UpdateCelebiPosition:
.done .done
ret ret
.FreezeCelebiPosition: .FreezeCelebiPosition:
pop af pop af
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
@ -233,7 +224,6 @@ UpdateCelebiPosition:
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ret ret
CelebiEvent_Cosine: CelebiEvent_Cosine:
; a = d * cos(a * pi/32) ; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2) add %010000 ; cos(x) = sin(x + pi/2)
@ -261,22 +251,18 @@ GetCelebiSpriteTile:
jr c, .done jr c, .done
jr .restart jr .restart
.Frame1: .Frame1:
ld a, SPECIALCELEBIEVENT_CELEBI ld a, SPECIALCELEBIEVENT_CELEBI
jr .load_tile jr .load_tile
.Frame2: .Frame2:
ld a, SPECIALCELEBIEVENT_CELEBI + 4 ld a, SPECIALCELEBIEVENT_CELEBI + 4
jr .load_tile jr .load_tile
.Frame3: .Frame3:
ld a, SPECIALCELEBIEVENT_CELEBI + 8 ld a, SPECIALCELEBIEVENT_CELEBI + 8
jr .load_tile jr .load_tile
.Frame4: .Frame4:
ld a, SPECIALCELEBIEVENT_CELEBI + 12 ld a, SPECIALCELEBIEVENT_CELEBI + 12
@ -286,7 +272,6 @@ GetCelebiSpriteTile:
ld [hl], a ld [hl], a
jr .done jr .done
.restart .restart
pop de pop de
ld d, $ff ld d, $ff
@ -298,7 +283,6 @@ GetCelebiSpriteTile:
pop hl pop hl
ret ret
.AddE: .AddE:
push af push af
ld a, d ld a, d
@ -307,13 +291,11 @@ GetCelebiSpriteTile:
pop af pop af
ret ret
CelebiEvent_SetBattleType: CelebiEvent_SetBattleType:
ld a, BATTLETYPE_CELEBI ld a, BATTLETYPE_CELEBI
ld [wBattleType], a ld [wBattleType], a
ret ret
CheckCaughtCelebi: CheckCaughtCelebi:
ld a, [wBattleResult] ld a, [wBattleResult]
bit BATTLERESULT_CAUGHT_CELEBI, a bit BATTLERESULT_CAUGHT_CELEBI, a
@ -322,7 +304,6 @@ CheckCaughtCelebi:
ld [wScriptVar], a ld [wScriptVar], a
jr .done jr .done
.false .false
xor a ; FALSE xor a ; FALSE
ld [wScriptVar], a ld [wScriptVar], a

2
engine/events/elevator.asm
View File

@ -142,7 +142,6 @@ Elevator_WhichFloorText:
text_jump UnknownText_0x1bd2bc text_jump UnknownText_0x1bd2bc
db "@" db "@"
Elevator_GetCurrentFloorText: Elevator_GetCurrentFloorText:
ld hl, wOptions ld hl, wOptions
ld a, [hl] ld a, [hl]
@ -164,7 +163,6 @@ Elevator_GetCurrentFloorText:
Elevator_CurrentFloorText: Elevator_CurrentFloorText:
db "Now on:@" db "Now on:@"
Elevator_GetCurrentFloorString: Elevator_GetCurrentFloorString:
push hl push hl
ld a, [wElevatorOriginFloor] ld a, [wElevatorOriginFloor]

2
engine/events/engine_flags.asm
View File

@ -7,7 +7,6 @@ EngineFlagAction::
; ;
; Setting/resetting does not return a result. ; Setting/resetting does not return a result.
; 16-bit flag ids are considered invalid, but it's nice ; 16-bit flag ids are considered invalid, but it's nice
; to know that the infrastructure is there. ; to know that the infrastructure is there.
@ -81,5 +80,4 @@ EngineFlagAction::
ld [de], a ld [de], a
ret ret
INCLUDE "data/engine_flags.asm" INCLUDE "data/engine_flags.asm"

3
engine/events/field_moves.asm
View File

@ -161,14 +161,12 @@ OWCutJumptable:
ld l, a ld l, a
jp hl jp hl
.dw .dw
dw Cut_SpawnAnimateTree dw Cut_SpawnAnimateTree
dw Cut_SpawnAnimateLeaves dw Cut_SpawnAnimateLeaves
dw Cut_StartWaiting dw Cut_StartWaiting
dw Cut_WaitAnimSFX dw Cut_WaitAnimSFX
Cut_SpawnAnimateTree: Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
@ -303,7 +301,6 @@ Cut_Headbutt_GetPixelFacing:
dbpixel 8, 11 dbpixel 8, 11
dbpixel 12, 11 dbpixel 12, 11
FlyFromAnim: FlyFromAnim:
call DelayFrame call DelayFrame
ld a, [wVramState] ld a, [wVramState]

3
engine/events/fish.asm
View File

@ -21,7 +21,6 @@ endr
pop af pop af
ret ret
.Fish: .Fish:
; Fish for monsters with rod b from encounter data in FishGroup at hl. ; Fish for monsters with rod b from encounter data in FishGroup at hl.
; Return monster e at level d. ; Return monster e at level d.
@ -90,7 +89,6 @@ endr
inc hl inc hl
ret ret
GetFishGroupIndex: GetFishGroupIndex:
; Return the index of fishgroup d in de. ; Return the index of fishgroup d in de.
@ -126,5 +124,4 @@ GetFishGroupIndex:
ld d, FISHGROUP_REMORAID_SWARM ld d, FISHGROUP_REMORAID_SWARM
jr .done jr .done
INCLUDE "data/wild/fish.asm" INCLUDE "data/wild/fish.asm"

2
engine/events/fruit_trees.asm
View File

@ -94,10 +94,8 @@ GetFruitTreeItem:
pop hl pop hl
ret ret
INCLUDE "data/items/fruit_trees.asm" INCLUDE "data/items/fruit_trees.asm"
FruitBearingTreeText: FruitBearingTreeText:
text_jump _FruitBearingTreeText text_jump _FruitBearingTreeText
db "@" db "@"

1
engine/events/halloffame.asm
View File

@ -134,7 +134,6 @@ AnimateHallOfFame:
.String_NewHallOfFamer: .String_NewHallOfFamer:
db "New Hall of Famer!@" db "New Hall of Famer!@"
GetHallOfFameParty: GetHallOfFameParty:
ld hl, wHallOfFamePokemonList ld hl, wHallOfFamePokemonList
ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1 ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1

3
engine/events/happiness_egg.asm
View File

@ -102,10 +102,8 @@ ChangeHappiness:
ld [wBattleMonHappiness], a ld [wBattleMonHappiness], a
ret ret
INCLUDE "data/events/happiness_changes.asm" INCLUDE "data/events/happiness_changes.asm"
StepHappiness:: StepHappiness::
; Raise the party's happiness by 1 point every other step cycle. ; Raise the party's happiness by 1 point every other step cycle.
@ -141,7 +139,6 @@ StepHappiness::
jr nz, .loop jr nz, .loop
ret ret
DayCareStep:: DayCareStep::
; Raise the experience of Day-Care Pokémon every step cycle. ; Raise the experience of Day-Care Pokémon every step cycle.

2
engine/events/magikarp.asm
View File

@ -139,7 +139,6 @@ CalcMagikarpLength:
; if b = 252-253: x = 65210, y = 5, z = 13 ; if b = 252-253: x = 65210, y = 5, z = 13
; if b = 254: x = 65410, y = 2, z = 14 ; if b = 254: x = 65410, y = 2, z = 14
; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id) ; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id)
; id ; id
@ -303,7 +302,6 @@ CalcMagikarpLength:
INCLUDE "data/events/magikarp_lengths.asm" INCLUDE "data/events/magikarp_lengths.asm"
MagikarpHouseSign: MagikarpHouseSign:
ld a, [wBestMagikarpLengthFeet] ld a, [wBestMagikarpLengthFeet]
ld [wMagikarpLength], a ld [wMagikarpLength], a

4
engine/events/map_name_sign.asm
View File

@ -96,7 +96,6 @@ ReturnFromMapSetupScript::
cp MAP_ROUTE_36_NATIONAL_PARK_GATE cp MAP_ROUTE_36_NATIONAL_PARK_GATE
ret ret
PlaceMapNameSign:: PlaceMapNameSign::
ld hl, wLandmarkSignTimer ld hl, wLandmarkSignTimer
ld a, [hl] ld a, [hl]
@ -125,7 +124,6 @@ PlaceMapNameSign::
ld [hLCDCPointer], a ld [hLCDCPointer], a
ret ret
LoadMapNameSignGFX: LoadMapNameSignGFX:
ld de, MapEntryFrameGFX ld de, MapEntryFrameGFX
ld hl, vTiles2 tile MAP_NAME_SIGN_START ld hl, vTiles2 tile MAP_NAME_SIGN_START
@ -141,7 +139,6 @@ InitMapNameFrame:
call PlaceMapNameFrame call PlaceMapNameFrame
ret ret
PlaceMapNameCenterAlign: PlaceMapNameCenterAlign:
ld a, [wCurrentLandmark] ld a, [wCurrentLandmark]
ld e, a ld e, a
@ -174,7 +171,6 @@ PlaceMapNameCenterAlign:
pop hl pop hl
ret ret
InitMapSignAttrMap: InitMapSignAttrMap:
ld de, wAttrMap - wTileMap ld de, wAttrMap - wTileMap
add hl, de add hl, de

4
engine/events/mom_phone.asm
View File

@ -113,7 +113,6 @@ CheckBalance_MomItem2:
farcall AddMoney farcall AddMoney
ret ret
MomBuysItem_DeductFunds: MomBuysItem_DeductFunds:
call GetItemFromMom call GetItemFromMom
ld de, 3 ; cost ld de, 3 ; cost
@ -129,7 +128,6 @@ MomBuysItem_DeductFunds:
farcall TakeMoney farcall TakeMoney
ret ret
Mom_GiveItemOrDoll: Mom_GiveItemOrDoll:
call GetItemFromMom call GetItemFromMom
ld de, 6 ; item type ld de, 6 ; item type
@ -153,7 +151,6 @@ Mom_GiveItemOrDoll:
call ReceiveItem call ReceiveItem
ret ret
Mom_GetScriptPointer: Mom_GetScriptPointer:
call GetItemFromMom call GetItemFromMom
ld de, 6 ; item type ld de, 6 ; item type
@ -179,7 +176,6 @@ Mom_GetScriptPointer:
writetext _MomText_ItsInRoom writetext _MomText_ItsInRoom
end end
GetItemFromMom: GetItemFromMom:
ld a, [wWhichMomItemSet] ld a, [wWhichMomItemSet]
and a and a

2
engine/events/money.asm
View File

@ -25,7 +25,6 @@ GiveMoney::
MaxMoney: MaxMoney:
dt MAX_MONEY dt MAX_MONEY
TakeMoney:: TakeMoney::
ld a, 3 ld a, 3
call SubtractMoney call SubtractMoney
@ -187,7 +186,6 @@ GiveCoins::
.maxcoins .maxcoins
bigdw MAX_COINS bigdw MAX_COINS
TakeCoins:: TakeCoins::
ld a, 2 ld a, 2
ld de, wCoins ld de, wCoins

9
engine/events/npc_trade.asm
View File

@ -271,7 +271,6 @@ DoNPCTrade:
pop af pop af
ret ret
GetTradeAttribute: GetTradeAttribute:
ld d, 0 ld d, 0
push de push de
@ -384,10 +383,8 @@ GetTradeMonNames:
ld [hl], "@" ld [hl], "@"
ret ret
INCLUDE "data/events/npc_trades.asm" INCLUDE "data/events/npc_trades.asm"
PrintTradeText: PrintTradeText:
push af push af
call GetTradeMonNames call GetTradeMonNames
@ -433,13 +430,11 @@ TradeTexts:
dw TradeAfterText3 dw TradeAfterText3
dw TradeAfterText4 dw TradeAfterText4
ConnectLinkCableText: ConnectLinkCableText:
; OK, connect the Game Link Cable. ; OK, connect the Game Link Cable.
text_jump UnknownText_0x1bd407 text_jump UnknownText_0x1bd407
db "@" db "@"
TradedForText: TradedForText:
; traded givemon for getmon ; traded givemon for getmon
text_jump UnknownText_0x1bd429 text_jump UnknownText_0x1bd429
@ -456,7 +451,6 @@ TradedForText:
text_jump UnknownText_0x1bd445 text_jump UnknownText_0x1bd445
db "@" db "@"
TradeIntroText1: TradeIntroText1:
; I collect #MON. Do you have @ ? Want to trade it for my @ ? ; I collect #MON. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd449 text_jump UnknownText_0x1bd449
@ -482,7 +476,6 @@ TradeAfterText1:
text_jump UnknownText_0x1bd4f4 text_jump UnknownText_0x1bd4f4
db "@" db "@"
TradeIntroText2: TradeIntroText2:
TradeIntroText3: TradeIntroText3:
; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ? ; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
@ -511,7 +504,6 @@ TradeAfterText2:
text_jump UnknownText_0x1bd5f4 text_jump UnknownText_0x1bd5f4
db "@" db "@"
TradeIntroText4: TradeIntroText4:
; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ? ; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
text_jump UnknownText_0x1bd621 text_jump UnknownText_0x1bd621
@ -537,7 +529,6 @@ TradeAfterText4:
text_jump UnknownText_0x1bd6f5 text_jump UnknownText_0x1bd6f5
db "@" db "@"
TradeCompleteText3: TradeCompleteText3:
; Uh? What happened? ; Uh? What happened?
text_jump UnknownText_0x1bd731 text_jump UnknownText_0x1bd731

2
engine/events/overworld.asm
View File

@ -276,10 +276,8 @@ CheckOverworldTileArrays:
xor a xor a
ret ret
INCLUDE "data/events/field_move_blocks.asm" INCLUDE "data/events/field_move_blocks.asm"
OWFlash: OWFlash:
call .CheckUseFlash call .CheckUseFlash
and $7f and $7f

3
engine/events/poke_seer.asm
View File

@ -48,7 +48,6 @@ PokeSeer:
call PrintSeerText call PrintSeerText
ret ret
SeerAction: SeerAction:
ld a, [wSeerAction] ld a, [wSeerAction]
ld hl, SeerActions ld hl, SeerActions
@ -337,7 +336,6 @@ SeerCancelText:
text_jump UnknownText_0x1c4955 text_jump UnknownText_0x1c4955
db "@" db "@"
SeerAdvice: SeerAdvice:
ld a, MON_LEVEL ld a, MON_LEVEL
call GetPartyParamLocation call GetPartyParamLocation
@ -398,7 +396,6 @@ SeerAdvice5:
text_jump UnknownText_0x1c4ae5 text_jump UnknownText_0x1c4ae5
db "@" db "@"
GetCaughtGender: GetCaughtGender:
ld hl, MON_CAUGHTGENDER ld hl, MON_CAUGHTGENDER
add hl, bc add hl, bc

5
engine/events/specials.asm
View File

@ -291,7 +291,6 @@ ActivateFishingSwarm:
ld [wFishingSwarmFlag], a ld [wFishingSwarmFlag], a
ret ret
StoreSwarmMapIndices:: StoreSwarmMapIndices::
ld a, c ld a, c
and a and a
@ -310,7 +309,6 @@ StoreSwarmMapIndices::
ld [wYanmaMapNumber], a ld [wYanmaMapNumber], a
ret ret
CheckPokerus: CheckPokerus:
; Check if a monster in your party has Pokerus ; Check if a monster in your party has Pokerus
farcall _CheckPokerus farcall _CheckPokerus
@ -377,12 +375,10 @@ SnorlaxAwake:
db 36, 9 ; right db 36, 9 ; right
db -1 db -1
PlayCurMonCry: PlayCurMonCry:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
jp PlayMonCry jp PlayMonCry
GameboyCheck: GameboyCheck:
ld a, [hCGB] ld a, [hCGB]
and a and a
@ -404,7 +400,6 @@ GameboyCheck:
ld [wScriptVar], a ld [wScriptVar], a
ret ret
FadeOutMusic: FadeOutMusic:
ld a, LOW(MUSIC_NONE) ld a, LOW(MUSIC_NONE)
ld [wMusicFadeID], a ld [wMusicFadeID], a

2
engine/events/std_scripts.asm
View File

@ -1850,7 +1850,6 @@ CoinVendor_IntroScript:
closetext closetext
end end
.MenuHeader: .MenuHeader:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 0, 4, 15, TEXTBOX_Y - 1 menu_coords 0, 4, 15, TEXTBOX_Y - 1
@ -1864,7 +1863,6 @@ CoinVendor_IntroScript:
db "500 : ¥10000@" db "500 : ¥10000@"
db "CANCEL@" db "CANCEL@"
HappinessCheckScript: HappinessCheckScript:
faceplayer faceplayer
opentext opentext

1
engine/events/whiteout.asm
View File

@ -59,7 +59,6 @@ HalveMoney:
ld [hl], a ld [hl], a
ret ret
GetWhiteoutSpawn: GetWhiteoutSpawn:
ld a, [wLastSpawnMapGroup] ld a, [wLastSpawnMapGroup]
ld d, a ld d, a

1
engine/games/card_flip.asm
View File

@ -977,7 +977,6 @@ CardFlip_CheckWinCondition:
ld de, SFX_2ND_PLACE ld de, SFX_2ND_PLACE
jp .Payout jp .Payout
.PikaOne: .PikaOne:
ld e, $0 ld e, $0
jr .CheckWin72 jr .CheckWin72

8
engine/games/dummy_game.asm
View File

@ -243,7 +243,6 @@ endr
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
DummyGame_CheckMatch: DummyGame_CheckMatch:
ld hl, wDummyGameCard1 ld hl, wDummyGameCard1
ld a, [hli] ld a, [hli]
@ -321,7 +320,6 @@ DummyGame_CheckMatch:
inc bc inc bc
ret ret
DummyGameText_Yeah: DummyGameText_Yeah:
; , yeah! ; , yeah!
text_jump UnknownText_0x1c1a5b text_jump UnknownText_0x1c1a5b
@ -381,7 +379,6 @@ DummyGame_InitBoard:
jr nz, .loop jr nz, .loop
ret ret
DummyGame_SampleTilePlacement: DummyGame_SampleTilePlacement:
push hl push hl
ld de, wDummyGameCards ld de, wDummyGameCards
@ -403,7 +400,6 @@ DummyGame_SampleTilePlacement:
inc hl inc hl
ret ret
DummyGame_GetDistributionOfTiles: DummyGame_GetDistributionOfTiles:
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
@ -439,7 +435,6 @@ DummyGame_PlaceCard:
call DelayFrames call DelayFrames
ret ret
DummyGame_DeleteCard: DummyGame_DeleteCard:
ld a, $1 ld a, $1
ld [hli], a ld [hli], a
@ -452,7 +447,6 @@ DummyGame_DeleteCard:
call DelayFrames call DelayFrames
ret ret
DummyGame_InitStrings: DummyGame_InitStrings:
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@ -501,7 +495,6 @@ DummyGame_Card2Coord:
add hl, de add hl, de
ret ret
DummyGame_InterpretJoypad_AnimateCursor: DummyGame_InterpretJoypad_AnimateCursor:
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
cp $7 cp $7
@ -595,6 +588,5 @@ DummyGame_InterpretJoypad_AnimateCursor:
ld [hl], a ld [hl], a
ret ret
LZ_e2221: LZ_e2221:
INCBIN "gfx/dummy_game/dummy_game.2bpp.lz" INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"

57
engine/games/slot_machine.asm
View File

@ -219,7 +219,6 @@ SlotsLoop:
call DmgToCgbBGPals call DmgToCgbBGPals
ret ret
.PrintCoinsAndPayout: .PrintCoinsAndPayout:
hlcoord 5, 1 hlcoord 5, 1
ld de, wCoins ld de, wCoins
@ -231,7 +230,6 @@ SlotsLoop:
call PrintNum call PrintNum
ret ret
Unreferenced_Function92811: Unreferenced_Function92811:
; debug function? ; debug function?
ld a, [wSlotBias] ld a, [wSlotBias]
@ -250,7 +248,6 @@ Unreferenced_Function92811:
ld [hl], a ld [hl], a
ret ret
Unreferenced_Function9282c: Unreferenced_Function9282c:
; animate OAM tiles? ; animate OAM tiles?
ld hl, wcf66 ld hl, wcf66
@ -271,7 +268,6 @@ endr
jr nz, .loop jr nz, .loop
ret ret
SlotsJumptable: SlotsJumptable:
jumptable .Jumptable, wJumptableIndex jumptable .Jumptable, wJumptableIndex
@ -849,7 +845,6 @@ Slots_UpdateReelPositionAndOAM:
jr nz, .loop jr nz, .loop
ret ret
Unreferenced_Function92bbe: Unreferenced_Function92bbe:
push hl push hl
srl a srl a
@ -863,7 +858,6 @@ Unreferenced_Function92bbe:
pop hl pop hl
ret ret
.Unknown_92bce: .Unknown_92bce:
db 0, 1, 2, 3, 4, 5 db 0, 1, 2, 3, 4, 5
@ -880,7 +874,6 @@ ReelActionJumptable:
ld l, a ld l, a
jp hl jp hl
.Jumptable: .Jumptable:
dw ReelAction_DoNothing ; 00 dw ReelAction_DoNothing ; 00
dw ReelAction_StopReelIgnoreJoypad ; 01 dw ReelAction_StopReelIgnoreJoypad ; 01
@ -911,42 +904,36 @@ ReelActionJumptable:
ReelAction_DoNothing: ReelAction_DoNothing:
ret ret
ReelAction_QuadrupleRate: ReelAction_QuadrupleRate:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
ld [hl], 16 ld [hl], 16
ret ret
ReelAction_DoubleRate: ReelAction_DoubleRate:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
ld [hl], 8 ld [hl], 8
ret ret
ReelAction_NormalRate: ReelAction_NormalRate:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
ld [hl], 4 ld [hl], 4
ret ret
ReelAction_HalfRate: ReelAction_HalfRate:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
ld [hl], 2 ld [hl], 2
ret ret
ReelAction_QuarterRate: ReelAction_QuarterRate:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
ld [hl], 1 ld [hl], 1
ret ret
Slots_StopReel: Slots_StopReel:
ld hl, REEL_SPIN_RATE ld hl, REEL_SPIN_RATE
add hl, bc add hl, bc
@ -973,7 +960,6 @@ ReelAction_StopReelIgnoreJoypad:
ld [hl], a ld [hl], a
ret ret
ReelAction_StopReel1: ReelAction_StopReel1:
; If no bias: don't manipulate reel. ; If no bias: don't manipulate reel.
; If bias: manipulate reel up to wReel1ManipCounter (i.e. 4) slots, ; If bias: manipulate reel up to wReel1ManipCounter (i.e. 4) slots,
@ -995,7 +981,6 @@ ReelAction_StopReel1:
call Slots_StopReel call Slots_StopReel
ret ret
.CheckForBias: .CheckForBias:
call Slots_GetCurrentReelState call Slots_GetCurrentReelState
ld a, [wSlotBias] ld a, [wSlotBias]
@ -1010,7 +995,6 @@ ReelAction_StopReel1:
cp e cp e
ret ret
ReelAction_StopReel2: ReelAction_StopReel2:
; If no bias: don't manipulate reel. ; If no bias: don't manipulate reel.
; If bias: manipulate reel up to wReel2ManipCounter (i.e. 4) slots, ; If bias: manipulate reel up to wReel2ManipCounter (i.e. 4) slots,
@ -1039,7 +1023,6 @@ ReelAction_StopReel2:
call Slots_StopReel call Slots_StopReel
ret ret
ReelAction_StopReel3: ReelAction_StopReel3:
; Manipulate the reel up to wReel3ManipCounter (i.e. 4) slots, ; Manipulate the reel up to wReel3ManipCounter (i.e. 4) slots,
; stopping early if the bias symbol is lined up for a win. ; stopping early if the bias symbol is lined up for a win.
@ -1074,7 +1057,6 @@ ReelAction_StopReel3:
call Slots_StopReel call Slots_StopReel
ret ret
ReelAction_SetUpReel2SkipTo7: ReelAction_SetUpReel2SkipTo7:
; Unique reel 2 action (see Slots_StopReel2) ; Unique reel 2 action (see Slots_StopReel2)
; Ensures that 7 symbols become lined up in the first two reels, ; Ensures that 7 symbols become lined up in the first two reels,
@ -1103,7 +1085,6 @@ ReelAction_SetUpReel2SkipTo7:
ld [hl], 0 ld [hl], 0
ret ret
ReelAction_WaitReel2SkipTo7: ReelAction_WaitReel2SkipTo7:
ld hl, REEL_MANIP_DELAY ld hl, REEL_MANIP_DELAY
add hl, bc add hl, bc
@ -1124,7 +1105,6 @@ ReelAction_WaitReel2SkipTo7:
ld [hl], 8 ld [hl], 8
ret ret
ReelAction_FastSpinReel2UntilLinedUp7s: ReelAction_FastSpinReel2UntilLinedUp7s:
call Slots_CheckMatchedFirstTwoReels call Slots_CheckMatchedFirstTwoReels
ret nc ret nc
@ -1134,7 +1114,6 @@ ReelAction_FastSpinReel2UntilLinedUp7s:
call Slots_StopReel call Slots_StopReel
ret ret
ReelAction_InitGolem: ReelAction_InitGolem:
; Ensures SEVENs are lined up if there's bias to SEVEN. ; Ensures SEVENs are lined up if there's bias to SEVEN.
; Ensures nothing is lined up if there's no bias symbols. ; Ensures nothing is lined up if there's no bias symbols.
@ -1190,7 +1169,6 @@ ReelAction_WaitGolem:
ld [hl], 8 ld [hl], 8
ret ret
ReelAction_EndGolem: ReelAction_EndGolem:
xor a xor a
ld [wSlotsDelay], a ld [wSlotsDelay], a
@ -1202,7 +1180,6 @@ ReelAction_EndGolem:
ld [hl], 0 ld [hl], 0
ret ret
ReelAction_InitChansey: ReelAction_InitChansey:
; Ensures the lining up of SEVEN symbols, but this mode is only possible ; Ensures the lining up of SEVEN symbols, but this mode is only possible
; when there is bias to SEVEN symbols (and even then, it's still rare). ; when there is bias to SEVEN symbols (and even then, it's still rare).
@ -1229,7 +1206,6 @@ ReelAction_InitChansey:
ld [wSlotsDelay], a ld [wSlotsDelay], a
ret ret
ReelAction_WaitChansey: ReelAction_WaitChansey:
ld a, [wSlotsDelay] ld a, [wSlotsDelay]
and a and a
@ -1283,7 +1259,6 @@ ReelAction_DropReel:
ld [wSlotsDelay], a ld [wSlotsDelay], a
ret ret
ReelAction_Unused: ReelAction_Unused:
call Slots_CheckMatchedAllThreeReels call Slots_CheckMatchedAllThreeReels
ret c ret c
@ -1336,7 +1311,6 @@ ReelAction_WaitDropReel:
ld [hl], 8 ld [hl], 8
ret ret
ReelAction_StartSlowAdvanceReel3: ReelAction_StartSlowAdvanceReel3:
; Ensures SEVENs are lined up if there's bias to SEVEN. ; Ensures SEVENs are lined up if there's bias to SEVEN.
; Ensures nothing is lined up if there's no bias symbols. ; Ensures nothing is lined up if there's no bias symbols.
@ -1390,7 +1364,6 @@ ReelAction_WaitSlowAdvanceReel3:
call WaitSFX call WaitSFX
ret ret
Slots_CheckMatchedFirstTwoReels: Slots_CheckMatchedFirstTwoReels:
xor a xor a
ld [wFirstTwoReelsMatching], a ld [wFirstTwoReelsMatching], a
@ -1418,7 +1391,6 @@ Slots_CheckMatchedFirstTwoReels:
scf scf
ret ret
.Jumptable: .Jumptable:
dw .zero dw .zero
dw .one dw .one
@ -1439,7 +1411,6 @@ Slots_CheckMatchedFirstTwoReels:
.zero .zero
ret ret
.CheckBottomRow: .CheckBottomRow:
ld hl, wCurrReelStopped ld hl, wCurrReelStopped
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
@ -1447,7 +1418,6 @@ Slots_CheckMatchedFirstTwoReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckUpwardsDiag: .CheckUpwardsDiag:
ld hl, wCurrReelStopped + 1 ld hl, wCurrReelStopped + 1
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
@ -1455,7 +1425,6 @@ Slots_CheckMatchedFirstTwoReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckMiddleRow: .CheckMiddleRow:
ld hl, wCurrReelStopped + 1 ld hl, wCurrReelStopped + 1
ld a, [wReel1Stopped + 1] ld a, [wReel1Stopped + 1]
@ -1463,7 +1432,6 @@ Slots_CheckMatchedFirstTwoReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckDownwardsDiag: .CheckDownwardsDiag:
ld hl, wCurrReelStopped + 1 ld hl, wCurrReelStopped + 1
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
@ -1471,7 +1439,6 @@ Slots_CheckMatchedFirstTwoReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckTopRow: .CheckTopRow:
ld hl, wCurrReelStopped + 2 ld hl, wCurrReelStopped + 2
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
@ -1479,7 +1446,6 @@ Slots_CheckMatchedFirstTwoReels:
call z, .StoreResult call z, .StoreResult
ret ret
.StoreResult: .StoreResult:
ld [wSlotBuildingMatch], a ld [wSlotBuildingMatch], a
and a and a
@ -1492,7 +1458,6 @@ Slots_CheckMatchedFirstTwoReels:
ld [wFirstTwoReelsMatching], a ld [wFirstTwoReelsMatching], a
ret ret
Slots_CheckMatchedAllThreeReels: Slots_CheckMatchedAllThreeReels:
ld a, SLOTS_NO_MATCH ld a, SLOTS_NO_MATCH
ld [wSlotMatched], a ld [wSlotMatched], a
@ -1523,7 +1488,6 @@ Slots_CheckMatchedAllThreeReels:
scf scf
ret ret
.Jumptable: .Jumptable:
dw .zero dw .zero
dw .one dw .one
@ -1544,7 +1508,6 @@ Slots_CheckMatchedAllThreeReels:
.zero .zero
ret ret
.CheckBottomRow: .CheckBottomRow:
ld hl, wCurrReelStopped ld hl, wCurrReelStopped
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
@ -1555,7 +1518,6 @@ Slots_CheckMatchedAllThreeReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckUpwardsDiag: .CheckUpwardsDiag:
ld hl, wCurrReelStopped + 2 ld hl, wCurrReelStopped + 2
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
@ -1566,7 +1528,6 @@ Slots_CheckMatchedAllThreeReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckMiddleRow: .CheckMiddleRow:
ld hl, wCurrReelStopped + 1 ld hl, wCurrReelStopped + 1
ld a, [wReel1Stopped + 1] ld a, [wReel1Stopped + 1]
@ -1577,7 +1538,6 @@ Slots_CheckMatchedAllThreeReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckDownwardsDiag: .CheckDownwardsDiag:
ld hl, wCurrReelStopped ld hl, wCurrReelStopped
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
@ -1588,7 +1548,6 @@ Slots_CheckMatchedAllThreeReels:
call z, .StoreResult call z, .StoreResult
ret ret
.CheckTopRow: .CheckTopRow:
ld hl, wCurrReelStopped + 2 ld hl, wCurrReelStopped + 2
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
@ -1599,12 +1558,10 @@ Slots_CheckMatchedAllThreeReels:
call z, .StoreResult call z, .StoreResult
ret ret
.StoreResult: .StoreResult:
ld [wSlotMatched], a ld [wSlotMatched], a
ret ret
Slots_CopyReelState: Slots_CopyReelState:
ld de, wCurrReelStopped ld de, wCurrReelStopped
ld a, [hli] ld a, [hli]
@ -1617,7 +1574,6 @@ Slots_CopyReelState:
ld [de], a ld [de], a
ret ret
Slots_GetNumberOfGolems: Slots_GetNumberOfGolems:
ld hl, REEL_POSITION ld hl, REEL_POSITION
add hl, bc add hl, bc
@ -1631,7 +1587,6 @@ Slots_GetNumberOfGolems:
ld a, e ld a, e
ret ret
.Check7Bias: .Check7Bias:
ld a, [wSlotBias] ld a, [wSlotBias]
and a and a
@ -1669,7 +1624,6 @@ Slots_GetNumberOfGolems:
jr c, .loop2 jr c, .loop2
ret ret
Slots_InitBias: Slots_InitBias:
ld a, [wSlotBias] ld a, [wSlotBias]
and a and a
@ -1694,7 +1648,6 @@ Slots_InitBias:
ld [wSlotBias], a ld [wSlotBias], a
ret ret
.Normal: .Normal:
db $01, SLOTS_SEVEN ; 1/256 db $01, SLOTS_SEVEN ; 1/256
db $03, SLOTS_POKEBALL ; 1/128 db $03, SLOTS_POKEBALL ; 1/128
@ -1794,7 +1747,6 @@ Slots_AskBet:
and a and a
ret ret
.Text_BetHowManyCoins: .Text_BetHowManyCoins:
; Bet how many coins? ; Bet how many coins?
text_jump UnknownText_0x1c5049 text_jump UnknownText_0x1c5049
@ -1852,7 +1804,6 @@ Slots_AskPlayAgain:
scf scf
ret ret
.Text_OutOfCoins: .Text_OutOfCoins:
text_jump UnknownText_0x1c5079 text_jump UnknownText_0x1c5079
db "@" db "@"
@ -1927,7 +1878,6 @@ Slots_PayoutText:
farcall StubbedTrainerRankings_AddToSlotsWinStreak farcall StubbedTrainerRankings_AddToSlotsWinStreak
ret ret
.PayoutStrings: .PayoutStrings:
dbw "300@", .LinedUpSevens dbw "300@", .LinedUpSevens
dbw "50@@", .LinedUpPokeballs dbw "50@@", .LinedUpPokeballs
@ -1955,7 +1905,6 @@ rept 4
endr endr
ret ret
.Text_LinedUpWonCoins: .Text_LinedUpWonCoins:
; lined up! Won @ coins! ; lined up! Won @ coins!
text_jump UnknownText_0x1c509f text_jump UnknownText_0x1c509f
@ -1993,21 +1942,18 @@ endr
ld [wSlotBias], a ld [wSlotBias], a
ret ret
.LinedUpPokeballs: .LinedUpPokeballs:
ld a, SFX_3RD_PLACE ld a, SFX_3RD_PLACE
call Slots_PlaySFX call Slots_PlaySFX
call WaitSFX call WaitSFX
ret ret
.LinedUpMonOrCherry: .LinedUpMonOrCherry:
ld a, SFX_PRESENT ld a, SFX_PRESENT
call Slots_PlaySFX call Slots_PlaySFX
call WaitSFX call WaitSFX
ret ret
Slots_AnimateGolem: Slots_AnimateGolem:
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
@ -2183,7 +2129,6 @@ Slots_AnimateChansey:
pop bc pop bc
ret ret
Slots_WaitSFX: Slots_WaitSFX:
push bc push bc
ld c, 16 ld c, 16
@ -2191,7 +2136,6 @@ Slots_WaitSFX:
pop bc pop bc
ret ret
Slots_PlaySFX: Slots_PlaySFX:
push de push de
ld e, a ld e, a
@ -2200,7 +2144,6 @@ Slots_PlaySFX:
pop de pop de
ret ret
; The first three positions are repeated to ; The first three positions are repeated to
; avoid needing to check indices when copying. ; avoid needing to check indices when copying.
Reel1Tilemap: Reel1Tilemap:

1
engine/gfx/cgb_layouts.asm
View File

@ -149,7 +149,6 @@ _CGB_FinishBattleScreenLayout:
call ApplyAttrMap call ApplyAttrMap
ret ret
InitPartyMenuBGPal7: InitPartyMenuBGPal7:
farcall Function100dc0 farcall Function100dc0
Mobile_InitPartyMenuBGPal7: Mobile_InitPartyMenuBGPal7:

4
engine/gfx/dma_transfer.asm
View File

@ -233,7 +233,6 @@ CallInSafeGFXMode:
._hl_ ._hl_
jp hl jp hl
HDMATransferToWRAMBank3: HDMATransferToWRAMBank3:
call _LoadHDMAParameters call _LoadHDMAParameters
ld a, $23 ld a, $23
@ -333,7 +332,6 @@ HDMATransfer_Wait123Scanlines:
ld b, $7b ld b, $7b
jr _continue_HDMATransfer jr _continue_HDMATransfer
HDMATransfer_Wait127Scanlines: HDMATransfer_Wait127Scanlines:
ld b, $7f ld b, $7f
_continue_HDMATransfer: _continue_HDMATransfer:
@ -396,7 +394,6 @@ _continue_HDMATransfer:
ret ret
_LoadHDMAParameters: _LoadHDMAParameters:
ld a, h ld a, h
ld [rHDMA1], a ld [rHDMA1], a
@ -453,7 +450,6 @@ PadMapForHDMATransfer:
ld [hMapObjectIndexBuffer], a ld [hMapObjectIndexBuffer], a
ret ret
_Get2bpp:: _Get2bpp::
; 2bpp when [rLCDC] & $80 ; 2bpp when [rLCDC] & $80
; switch to WRAM bank 6 ; switch to WRAM bank 6

3
engine/gfx/mon_icons.asm
View File

@ -33,7 +33,6 @@ LoadMenuMonIcon:
ld l, a ld l, a
jp hl jp hl
.Jumptable: .Jumptable:
dw PartyMenu_InitAnimatedMonIcon ; party menu dw PartyMenu_InitAnimatedMonIcon ; party menu
dw NamingScreen_InitAnimatedMonIcon ; naming screen dw NamingScreen_InitAnimatedMonIcon ; naming screen
@ -263,7 +262,6 @@ GetSpeciesIcon:
call GetIconGFX call GetIconGFX
ret ret
FlyFunction_GetMonIcon: FlyFunction_GetMonIcon:
push de push de
ld a, [wd265] ld a, [wd265]
@ -449,7 +447,6 @@ ReadMonMenuIcon:
ld a, ICON_EGG ld a, ICON_EGG
ret ret
INCLUDE "data/pokemon/menu_icons.asm" INCLUDE "data/pokemon/menu_icons.asm"
INCLUDE "data/icon_pointers.asm" INCLUDE "data/icon_pointers.asm"

2
engine/gfx/pic_animation.asm
View File

@ -79,7 +79,6 @@ PokeAnims:
.Egg1: pokeanim Setup, Play .Egg1: pokeanim Setup, Play
.Egg2: pokeanim Idle, Play .Egg2: pokeanim Idle, Play
AnimateFrontpic: AnimateFrontpic:
call AnimateMon_CheckIfPokemon call AnimateMon_CheckIfPokemon
ret c ret c
@ -718,7 +717,6 @@ PokeAnim_ConvertAndApplyBitmask:
; db 36, 37, 38, 39, 40, 41 ; db 36, 37, 38, 39, 40, 41
; db 43, 44, 45, 46, 47, 48 ; db 43, 44, 45, 46, 47, 48
.GetStartCoord: .GetStartCoord:
ld hl, wPokeAnimCoord ld hl, wPokeAnimCoord
ld a, [hli] ld a, [hli]

7
engine/gfx/sprites.asm
View File

@ -212,7 +212,6 @@ DeinitializeSprite:
ld [hl], $0 ld [hl], $0
ret ret
DeinitializeAllSprites: DeinitializeAllSprites:
; Clear the index field of every struct in the wSpriteAnimationStructs array. ; Clear the index field of every struct in the wSpriteAnimationStructs array.
ld hl, wSpriteAnimationStructs ld hl, wSpriteAnimationStructs
@ -226,7 +225,6 @@ DeinitializeAllSprites:
jr nz, .loop jr nz, .loop
ret ret
UpdateAnimFrame: UpdateAnimFrame:
call InitSpriteAnimBuffer ; init WRAM call InitSpriteAnimBuffer ; init WRAM
call GetSpriteAnimFrame ; read from a memory array call GetSpriteAnimFrame ; read from a memory array
@ -411,7 +409,6 @@ _ReinitSpriteAnimFrame::
ld [hl], -1 ld [hl], -1
ret ret
GetSpriteAnimFrame: GetSpriteAnimFrame:
.loop .loop
ld hl, SPRITEANIMSTRUCT_DURATION ld hl, SPRITEANIMSTRUCT_DURATION
@ -532,7 +529,6 @@ Unreferenced_BrokenGetStdGraphics:
pop bc pop bc
ret ret
INCLUDE "data/sprite_anims/sequences.asm" INCLUDE "data/sprite_anims/sequences.asm"
INCLUDE "engine/gfx/sprite_anims.asm" INCLUDE "engine/gfx/sprite_anims.asm"
@ -541,7 +537,6 @@ INCLUDE "data/sprite_anims/framesets.asm"
INCLUDE "data/sprite_anims/oam.asm" INCLUDE "data/sprite_anims/oam.asm"
BrokenStdGFXPointers: BrokenStdGFXPointers:
; tile count, bank, pointer ; tile count, bank, pointer
; (all pointers were dummied out to .deleted) ; (all pointers were dummied out to .deleted)
@ -557,7 +552,6 @@ BrokenStdGFXPointers:
.deleted .deleted
Sprites_Cosine: Sprites_Cosine:
; a = d * cos(a * pi/32) ; a = d * cos(a * pi/32)
add %010000 ; cos(x) = sin(x + pi/2) add %010000 ; cos(x) = sin(x + pi/2)
@ -566,7 +560,6 @@ Sprites_Sine:
; a = d * sin(a * pi/32) ; a = d * sin(a * pi/32)
calc_sine_wave calc_sine_wave
AnimateEndOfExpBar: AnimateEndOfExpBar:
ld a, [hSGB] ld a, [hSGB]
ld de, EndOfExpBarGFX ld de, EndOfExpBarGFX

50
engine/items/item_effects.asm
View File

@ -11,7 +11,6 @@ _DoItemEffect::
rst JumpTable rst JumpTable
ret ret
ItemEffects: ItemEffects:
; entries correspond to item ids ; entries correspond to item ids
dw PokeBallEffect ; MASTER_BALL dw PokeBallEffect ; MASTER_BALL
@ -194,7 +193,6 @@ ItemEffects:
dw NoEffect ; RAINBOW_WING dw NoEffect ; RAINBOW_WING
dw NoEffect ; ITEM_B3 dw NoEffect ; ITEM_B3
PokeBallEffect: PokeBallEffect:
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
@ -712,7 +710,6 @@ PokeBallEffect:
dec [hl] dec [hl]
ret ret
BallMultiplierFunctionTable: BallMultiplierFunctionTable:
; table of routines that increase or decrease the catch rate based on ; table of routines that increase or decrease the catch rate based on
; which ball is used in a certain situation. ; which ball is used in a certain situation.
@ -1137,12 +1134,10 @@ TownMapEffect:
farcall PokegearMap farcall PokegearMap
ret ret
BicycleEffect: BicycleEffect:
farcall BikeFunction farcall BikeFunction
ret ret
EvoStoneEffect: EvoStoneEffect:
ld b, PARTYMENUACTION_EVO_STONE ld b, PARTYMENUACTION_EVO_STONE
call UseItem_SelectMon call UseItem_SelectMon
@ -1174,7 +1169,6 @@ EvoStoneEffect:
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
ret ret
VitaminEffect: VitaminEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1218,13 +1212,11 @@ VitaminEffect:
jp UseDisposableItem jp UseDisposableItem
NoEffectMessage: NoEffectMessage:
ld hl, WontHaveAnyEffectText ld hl, WontHaveAnyEffectText
call PrintText call PrintText
jp ClearPalettes jp ClearPalettes
UpdateStatsAfterItem: UpdateStatsAfterItem:
ld a, MON_MAXHP ld a, MON_MAXHP
call GetPartyParamLocation call GetPartyParamLocation
@ -1240,13 +1232,11 @@ RareCandy_StatBooster_ExitMenu:
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
jp ClearPalettes jp ClearPalettes
Text_StatRose: Text_StatRose:
; 's @ rose. ; 's @ rose.
text_jump UnknownText_0x1c5b9a text_jump UnknownText_0x1c5b9a
db "@" db "@"
StatStrings: StatStrings:
dw .health dw .health
dw .attack dw .attack
@ -1260,7 +1250,6 @@ StatStrings:
.speed db "SPEED@" .speed db "SPEED@"
.special db "SPECIAL@" .special db "SPECIAL@"
GetStatExpRelativePointer: GetStatExpRelativePointer:
ld a, [wCurItem] ld a, [wCurItem]
ld hl, Table_eeeb ld hl, Table_eeeb
@ -1284,7 +1273,6 @@ Table_eeeb:
db CARBOS, MON_SPD_EXP - MON_STAT_EXP db CARBOS, MON_SPD_EXP - MON_STAT_EXP
db CALCIUM, MON_SPC_EXP - MON_STAT_EXP db CALCIUM, MON_SPC_EXP - MON_STAT_EXP
RareCandy_StatBooster_GetParameters: RareCandy_StatBooster_GetParameters:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
ld [wCurSpecies], a ld [wCurSpecies], a
@ -1299,7 +1287,6 @@ RareCandy_StatBooster_GetParameters:
call GetNick call GetNick
ret ret
RareCandyEffect: RareCandyEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1390,7 +1377,6 @@ RareCandyEffect:
jp UseDisposableItem jp UseDisposableItem
HealPowderEffect: HealPowderEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1411,7 +1397,6 @@ HealPowderEffect:
.asm_efc9 .asm_efc9
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
StatusHealingEffect: StatusHealingEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1421,7 +1406,6 @@ FullyHealStatus:
call UseStatusHealer call UseStatusHealer
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
UseStatusHealer: UseStatusHealer:
call IsMonFainted call IsMonFainted
ld a, $1 ld a, $1
@ -1529,7 +1513,6 @@ StatusHealer_Jumptable:
dw StatusHealer_NoEffect dw StatusHealer_NoEffect
dw StatusHealer_ExitMenu dw StatusHealer_ExitMenu
RevivalHerbEffect: RevivalHerbEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1547,7 +1530,6 @@ RevivalHerbEffect:
.asm_f0c5 .asm_f0c5
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
ReviveEffect: ReviveEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1556,7 +1538,6 @@ ReviveEffect:
call RevivePokemon call RevivePokemon
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
RevivePokemon: RevivePokemon:
call IsMonFainted call IsMonFainted
ld a, 1 ld a, 1
@ -1603,7 +1584,6 @@ RevivePokemon:
ld a, 0 ld a, 0
ret ret
FullRestoreEffect: FullRestoreEffect:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -1621,7 +1601,6 @@ FullRestoreEffect:
call .FullRestore call .FullRestore
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
.FullRestore: .FullRestore:
xor a xor a
ld [wLowHealthAlarm], a ld [wLowHealthAlarm], a
@ -1641,7 +1620,6 @@ FullRestoreEffect:
ld a, 0 ld a, 0
ret ret
BitterBerryEffect: BitterBerryEffect:
ld hl, wPlayerSubStatus3 ld hl, wPlayerSubStatus3
bit SUBSTATUS_CONFUSED, [hl] bit SUBSTATUS_CONFUSED, [hl]
@ -1661,12 +1639,10 @@ BitterBerryEffect:
.done .done
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
RestoreHPEffect: RestoreHPEffect:
call ItemRestoreHP call ItemRestoreHP
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
EnergypowderEffect: EnergypowderEffect:
ld c, HAPPINESS_BITTERPOWDER ld c, HAPPINESS_BITTERPOWDER
jr EnergypowderEnergyRootCommon jr EnergypowderEnergyRootCommon
@ -1688,7 +1664,6 @@ EnergypowderEnergyRootCommon:
.skip_happiness .skip_happiness
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
ItemRestoreHP: ItemRestoreHP:
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@ -2090,7 +2065,6 @@ Softboiled_MilkDrinkFunction:
text_jump UnknownText_0x1c5bac text_jump UnknownText_0x1c5bac
db "@" db "@"
EscapeRopeEffect: EscapeRopeEffect:
xor a xor a
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
@ -2101,7 +2075,6 @@ EscapeRopeEffect:
call z, UseDisposableItem call z, UseDisposableItem
ret ret
SuperRepelEffect: SuperRepelEffect:
ld b, 200 ld b, 200
jr UseRepel jr UseRepel
@ -2123,13 +2096,11 @@ UseRepel:
ld [wRepelEffect], a ld [wRepelEffect], a
jp UseItemText jp UseItemText
TextJump_RepelUsedEarlierIsStillInEffect: TextJump_RepelUsedEarlierIsStillInEffect:
; The REPEL used earlier is still in effect. ; The REPEL used earlier is still in effect.
text_jump Text_RepelUsedEarlierIsStillInEffect text_jump Text_RepelUsedEarlierIsStillInEffect
db "@" db "@"
XAccuracyEffect: XAccuracyEffect:
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_X_ACCURACY, [hl] bit SUBSTATUS_X_ACCURACY, [hl]
@ -2137,7 +2108,6 @@ XAccuracyEffect:
set SUBSTATUS_X_ACCURACY, [hl] set SUBSTATUS_X_ACCURACY, [hl]
jp UseItemText jp UseItemText
PokeDollEffect: PokeDollEffect:
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
@ -2155,7 +2125,6 @@ PokeDollEffect:
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
ret ret
GuardSpecEffect: GuardSpecEffect:
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_MIST, [hl] bit SUBSTATUS_MIST, [hl]
@ -2163,7 +2132,6 @@ GuardSpecEffect:
set SUBSTATUS_MIST, [hl] set SUBSTATUS_MIST, [hl]
jp UseItemText jp UseItemText
DireHitEffect: DireHitEffect:
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_FOCUS_ENERGY, [hl] bit SUBSTATUS_FOCUS_ENERGY, [hl]
@ -2171,7 +2139,6 @@ DireHitEffect:
set SUBSTATUS_FOCUS_ENERGY, [hl] set SUBSTATUS_FOCUS_ENERGY, [hl]
jp UseItemText jp UseItemText
XItemEffect: XItemEffect:
call UseItemText call UseItemText
@ -2206,7 +2173,6 @@ XItemEffect:
INCLUDE "data/items/x_stats.asm" INCLUDE "data/items/x_stats.asm"
PokeFluteEffect: PokeFluteEffect:
ld a, [wBattleMode] ld a, [wBattleMode]
and a and a
@ -2251,7 +2217,6 @@ PokeFluteEffect:
ld hl, .AllSleepingMonWokeUp ld hl, .AllSleepingMonWokeUp
jp PrintText jp PrintText
.CureSleep: .CureSleep:
ld de, PARTYMON_STRUCT_LENGTH ld de, PARTYMON_STRUCT_LENGTH
ld c, PARTY_LENGTH ld c, PARTY_LENGTH
@ -2272,7 +2237,6 @@ PokeFluteEffect:
jr nz, .loop jr nz, .loop
ret ret
.CatchyTune: .CatchyTune:
; Played the # FLUTE. Now, that's a catchy tune! ; Played the # FLUTE. Now, that's a catchy tune!
text_jump UnknownText_0x1c5bf9 text_jump UnknownText_0x1c5bf9
@ -2300,7 +2264,6 @@ PokeFluteEffect:
.battle .battle
jp PokeFluteTerminatorCharacter jp PokeFluteTerminatorCharacter
BlueCardEffect: BlueCardEffect:
ld hl, .bluecardtext ld hl, .bluecardtext
jp MenuTextBoxWaitButton jp MenuTextBoxWaitButton
@ -2309,7 +2272,6 @@ BlueCardEffect:
text_jump UnknownText_0x1c5c5e text_jump UnknownText_0x1c5c5e
db "@" db "@"
CoinCaseEffect: CoinCaseEffect:
ld hl, .coincasetext ld hl, .coincasetext
jp MenuTextBoxWaitButton jp MenuTextBoxWaitButton
@ -2318,7 +2280,6 @@ CoinCaseEffect:
text_jump UnknownText_0x1c5c7b text_jump UnknownText_0x1c5c7b
db "@" db "@"
OldRodEffect: OldRodEffect:
ld e, $0 ld e, $0
jr UseRod jr UseRod
@ -2335,12 +2296,10 @@ UseRod:
farcall FishFunction farcall FishFunction
ret ret
ItemfinderEffect: ItemfinderEffect:
farcall ItemFinder farcall ItemFinder
ret ret
RestorePPEffect: RestorePPEffect:
ld a, [wCurItem] ld a, [wCurItem]
ld [wd002], a ld [wd002], a
@ -2596,22 +2555,18 @@ UnknownText_0xf739:
text_jump UnknownText_0x1c5cf1 text_jump UnknownText_0x1c5cf1
db "@" db "@"
SquirtbottleEffect: SquirtbottleEffect:
farcall _Squirtbottle farcall _Squirtbottle
ret ret
CardKeyEffect: CardKeyEffect:
farcall _CardKey farcall _CardKey
ret ret
BasementKeyEffect: BasementKeyEffect:
farcall _BasementKey farcall _BasementKey
ret ret
SacredAshEffect: SacredAshEffect:
farcall _SacredAsh farcall _SacredAsh
ld a, [wItemEffectSucceeded] ld a, [wItemEffectSucceeded]
@ -2620,7 +2575,6 @@ SacredAshEffect:
call UseDisposableItem call UseDisposableItem
ret ret
NormalBoxEffect: NormalBoxEffect:
ld c, DECOFLAG_SILVER_TROPHY_DOLL ld c, DECOFLAG_SILVER_TROPHY_DOLL
jr OpenBox jr OpenBox
@ -2643,7 +2597,6 @@ OpenBox:
NoEffect: NoEffect:
jp IsntTheTimeMessage jp IsntTheTimeMessage
Play_SFX_FULL_HEAL: Play_SFX_FULL_HEAL:
push de push de
ld de, SFX_FULL_HEAL ld de, SFX_FULL_HEAL
@ -2796,7 +2749,6 @@ GotOffTheItemText:
text_jump UnknownText_0x1c5e90 text_jump UnknownText_0x1c5e90
db "@" db "@"
ApplyPPUp: ApplyPPUp:
ld a, MON_MOVES ld a, MON_MOVES
call GetPartyParamLocation call GetPartyParamLocation
@ -2833,7 +2785,6 @@ ApplyPPUp:
jr .loop jr .loop
ComputeMaxPP: ComputeMaxPP:
push bc push bc
; Divide the base PP by 5. ; Divide the base PP by 5.
@ -2918,7 +2869,6 @@ RestoreAllPP:
jr nz, .loop jr nz, .loop
ret ret
GetMaxPPOfMove: GetMaxPPOfMove:
ld a, [wStringBuffer1 + 0] ld a, [wStringBuffer1 + 0]
push af push af

6
engine/items/mart.asm
View File

@ -331,7 +331,6 @@ ReadMart:
INCLUDE "data/items/bargain_shop.asm" INCLUDE "data/items/bargain_shop.asm"
BuyMenu: BuyMenu:
call FadeToMenu call FadeToMenu
farcall BlankScreen farcall BlankScreen
@ -425,7 +424,6 @@ GetMartDialogGroup:
dw Text_Pharmacy_HereYouGo dw Text_Pharmacy_HereYouGo
dw BuyMenuLoop dw BuyMenuLoop
BuyMenuLoop: BuyMenuLoop:
farcall PlaceMoneyTopRight farcall PlaceMoneyTopRight
call UpdateSprites call UpdateSprites
@ -581,7 +579,6 @@ RooftopSaleAskPurchaseQuantity:
ld d, [hl] ld d, [hl]
ret ret
Text_Mart_HowMany: Text_Mart_HowMany:
; How many? ; How many?
text_jump UnknownText_0x1c4bfd text_jump UnknownText_0x1c4bfd
@ -730,7 +727,6 @@ Text_Pharmacist_ComeAgain:
text_jump UnknownText_0x1c4ef6 text_jump UnknownText_0x1c4ef6
db "@" db "@"
SellMenu: SellMenu:
call DisableSpriteUpdates call DisableSpriteUpdates
farcall DepositSellInitPackBuffers farcall DepositSellInitPackBuffers
@ -758,7 +754,6 @@ SellMenu:
text_jump UnknownText_0x1c4f12 text_jump UnknownText_0x1c4f12
db "@" db "@"
.TryToSellItem: .TryToSellItem:
farcall CheckItemMenu farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
@ -778,7 +773,6 @@ SellMenu:
.cant_buy .cant_buy
ret ret
.try_sell .try_sell
farcall _CheckTossableItem farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]

6
engine/items/pack.asm
View File

@ -38,7 +38,6 @@ Pack:
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp hl jp hl
.Jumptable: .Jumptable:
; entries correspond to PACKSTATE_* constants ; entries correspond to PACKSTATE_* constants
dw .InitGFX ; 0 dw .InitGFX ; 0
@ -174,7 +173,6 @@ Pack:
dw .UseItem dw .UseItem
dw QuitItemSubmenu dw QuitItemSubmenu
.MenuHeader2: .MenuHeader2:
db MENU_BACKUP_TILES ; flags db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
@ -424,7 +422,6 @@ Jumptable_GiveTossQuit:
dw TossMenu dw TossMenu
dw QuitItemSubmenu dw QuitItemSubmenu
UseItem: UseItem:
farcall CheckItemMenu farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
@ -651,7 +648,6 @@ BattlePack:
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp hl jp hl
.Jumptable: .Jumptable:
; entries correspond to PACKSTATE_* constants ; entries correspond to PACKSTATE_* constants
dw .InitGFX ; 0 dw .InitGFX ; 0
@ -943,7 +939,6 @@ DepositSellPack:
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp hl jp hl
.Jumptable: .Jumptable:
; entries correspond to *_POCKET constants ; entries correspond to *_POCKET constants
dw .ItemsPocket dw .ItemsPocket
@ -1088,7 +1083,6 @@ TutorialPack:
call Pack_GetJumptablePointer call Pack_GetJumptablePointer
jp hl jp hl
.dw .dw
; entries correspond to *_POCKET constants ; entries correspond to *_POCKET constants
dw .Items dw .Items

1
engine/items/switch_items.asm
View File

@ -239,7 +239,6 @@ ItemSwitch_ConvertSpacingToDW:
pop hl pop hl
ret ret
.spacing_dws .spacing_dws
dw 0, 1, 2 dw 0, 1, 2

1
engine/items/tmhm2.asm
View File

@ -43,5 +43,4 @@ GetTMHMMove:
ld [wd265], a ld [wd265], a
ret ret
INCLUDE "data/moves/tmhm_moves.asm" INCLUDE "data/moves/tmhm_moves.asm"

5
engine/link/link.asm
View File

@ -1112,10 +1112,8 @@ TimeCapsule_ReplaceTeruSama:
pop hl pop hl
ret ret
INCLUDE "data/items/catch_rate_items.asm" INCLUDE "data/items/catch_rate_items.asm"
Link_CopyOTData: Link_CopyOTData:
.loop .loop
ld a, [hli] ld a, [hli]
@ -1489,7 +1487,6 @@ Function28926:
call DelayFrames call DelayFrames
jp InitTradeMenuDisplay jp InitTradeMenuDisplay
.Text_CantTradeLastMon: .Text_CantTradeLastMon:
; If you trade that #MON, you won't be able to battle. ; If you trade that #MON, you won't be able to battle.
text_jump UnknownText_0x1c41b1 text_jump UnknownText_0x1c41b1
@ -1503,7 +1500,6 @@ Function28926:
text_jump UnknownText_0x1c41e6 text_jump UnknownText_0x1c41e6
db "@" db "@"
Function28ac9: Function28ac9:
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
cp 1 cp 1
@ -1964,7 +1960,6 @@ String_TooBadTheTradeWasCanceled:
db "Too bad! The trade" db "Too bad! The trade"
next "was canceled!@" next "was canceled!@"
LinkTextboxAtHL: LinkTextboxAtHL:
ld d, h ld d, h
ld e, l ld e, l

1
engine/link/link_trade.asm
View File

@ -126,7 +126,6 @@ _LoadTradeScreenBorder:
call __LoadTradeScreenBorder call __LoadTradeScreenBorder
ret ret
LinkComms_LoadPleaseWaitTextboxBorderGFX: LinkComms_LoadPleaseWaitTextboxBorderGFX:
ld de, LinkCommsBorderGFX + $30 tiles ld de, LinkCommsBorderGFX + $30 tiles
ld hl, vTiles2 tile $76 ld hl, vTiles2 tile $76

5
engine/link/mystery_gift.asm
View File

@ -1168,7 +1168,6 @@ Function1050c8:
.okay .okay
jp CloseSRAM jp CloseSRAM
BackupMysteryGift: BackupMysteryGift:
call GetMysteryGiftBank call GetMysteryGiftBank
ld hl, sMysteryGiftItem ld hl, sMysteryGiftItem
@ -1180,7 +1179,6 @@ BackupMysteryGift:
ld [de], a ld [de], a
jp CloseSRAM jp CloseSRAM
RestoreMysteryGift: RestoreMysteryGift:
call GetMysteryGiftBank call GetMysteryGiftBank
ld hl, sBackupMysteryGiftItem ld hl, sBackupMysteryGiftItem
@ -1202,12 +1200,10 @@ MysteryGift_ClearTrainerData:
jr nz, .loop jr nz, .loop
ret ret
GetMysteryGiftBank: GetMysteryGiftBank:
ld a, BANK(sBackupMysteryGiftItem) ld a, BANK(sBackupMysteryGiftItem)
jp GetSRAMBank jp GetSRAMBank
StagePartyDataForMysteryGift: StagePartyDataForMysteryGift:
; You will be sending this data to your mystery gift partner. ; You will be sending this data to your mystery gift partner.
; Structure is the same as a trainer with species and moves ; Structure is the same as a trainer with species and moves
@ -1493,7 +1489,6 @@ String_PressAToLink_BToCancel_JP:
next "つうしん<WO>ちゅうし　します" next "つうしん<WO>ちゅうし　します"
db "@" db "@"
Text_ReceivedCard: Text_ReceivedCard:
text_jump UnknownText_0x1c051a text_jump UnknownText_0x1c051a
db "@" db "@"

1
engine/link/mystery_gift_2.asm
View File

@ -145,7 +145,6 @@ MysteryGiftFallbackItem:
ld c, DECO_POLKADOT_BED ; GREAT_BALL ld c, DECO_POLKADOT_BED ; GREAT_BALL
ret ret
INCLUDE "data/items/mystery_gift_items.asm" INCLUDE "data/items/mystery_gift_items.asm"
INCLUDE "data/decorations/mystery_gift_decos.asm" INCLUDE "data/decorations/mystery_gift_decos.asm"

1
engine/link/time_capsule_2.asm
View File

@ -33,5 +33,4 @@ ConvertMon_1to2:
pop bc pop bc
ret ret
INCLUDE "data/pokemon/gen1_order.asm" INCLUDE "data/pokemon/gen1_order.asm"

4
engine/math/math.asm
View File

@ -11,7 +11,6 @@ _Multiply::
ld [hMathBuffer + 3], a ld [hMathBuffer + 3], a
ld [hMathBuffer + 4], a ld [hMathBuffer + 4], a
.loop .loop
ld a, [hMultiplier] ld a, [hMultiplier]
srl a srl a
@ -46,7 +45,6 @@ _Multiply::
dec b dec b
jr z, .done jr z, .done
; hMultiplicand <<= 1 ; hMultiplicand <<= 1
ld a, [hMultiplicand + 2] ld a, [hMultiplicand + 2]
@ -67,7 +65,6 @@ _Multiply::
jr .loop jr .loop
.done .done
ld a, [hMathBuffer + 4] ld a, [hMathBuffer + 4]
ld [hProduct + 3], a ld [hProduct + 3], a
@ -83,7 +80,6 @@ _Multiply::
ret ret
_Divide:: _Divide::
xor a xor a
ld [hMathBuffer + 0], a ld [hMathBuffer + 0], a

2
engine/menus/debug.asm
View File

@ -1034,7 +1034,6 @@ String_81fcd:
DebugColorTestGFX: DebugColorTestGFX:
INCBIN "gfx/debug/color_test.2bpp" INCBIN "gfx/debug/color_test.2bpp"
TilesetColorTest: TilesetColorTest:
ret ret
xor a xor a
@ -1148,7 +1147,6 @@ Function8220f:
ld [rSVBK], a ld [rSVBK], a
ret ret
Function82236: Function82236:
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]

6
engine/menus/intro_menu.asm
View File

@ -549,7 +549,6 @@ Continue_LoadMenuHeader:
db " @" db " @"
db "TIME@" db "TIME@"
Continue_DisplayBadgesDexPlayerName: Continue_DisplayBadgesDexPlayerName:
call MenuBoxCoord2Tile call MenuBoxCoord2Tile
push hl push hl
@ -626,7 +625,6 @@ Continue_DisplayGameTime:
lb bc, PRINTNUM_LEADINGZEROS | 1, 2 lb bc, PRINTNUM_LEADINGZEROS | 1, 2
jp PrintNum jp PrintNum
OakSpeech: OakSpeech:
farcall InitClock farcall InitClock
call RotateFourPalettesLeft call RotateFourPalettesLeft
@ -957,7 +955,6 @@ Intro_PlacePlayerSprite:
db 10 * 8 + 4, 9 * 8, 2 db 10 * 8 + 4, 9 * 8, 2
db 10 * 8 + 4, 10 * 8, 3 db 10 * 8 + 4, 10 * 8, 3
CrystalIntroSequence: CrystalIntroSequence:
callfar Copyright_GFPresents callfar Copyright_GFPresents
jr c, StartTitleScreen jr c, StartTitleScreen
@ -1018,7 +1015,6 @@ StartTitleScreen:
dw CrystalIntroSequence dw CrystalIntroSequence
dw ResetClock dw ResetClock
.TitleScreen: .TitleScreen:
farcall _TitleScreen farcall _TitleScreen
ret ret
@ -1070,7 +1066,6 @@ TitleScreenScene:
inc [hl] inc [hl]
ret ret
TitleScreenEntrance: TitleScreenEntrance:
; Animate the logo: ; Animate the logo:
@ -1119,7 +1114,6 @@ TitleScreenEntrance:
ld [hWY], a ld [hWY], a
ret ret
TitleScreenTimer: TitleScreenTimer:
; Next scene ; Next scene

4
engine/menus/main_menu.asm
View File

@ -139,7 +139,6 @@ StudiumMenu:
db MOBILE_STUDIUM db MOBILE_STUDIUM
db -1 db -1
MainMenu_GetWhichMenu: MainMenu_GetWhichMenu:
nop nop
nop nop
@ -231,7 +230,6 @@ MainMenu_PrintCurrentTimeAndDay:
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
.PlaceBox: .PlaceBox:
call CheckRTCStatus call CheckRTCStatus
and $80 and $80
@ -246,7 +244,6 @@ MainMenu_PrintCurrentTimeAndDay:
call SpeechTextBox call SpeechTextBox
ret ret
.PlaceTime: .PlaceTime:
ld a, [wSaveFileExists] ld a, [wSaveFileExists]
and a and a
@ -323,7 +320,6 @@ Function49ed0:
call ClearWindowData call ClearWindowData
ret ret
MainMenu_NewGame: MainMenu_NewGame:
farcall NewGame farcall NewGame
ret ret

5
engine/menus/menu.asm
View File

@ -56,7 +56,6 @@ _InterpretMobileMenu::
ret ret
Draw2DMenu: Draw2DMenu:
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -158,7 +157,6 @@ Place2DMenuItemStrings:
rst FarCall rst FarCall
ret ret
Init2DMenuCursorPosition: Init2DMenuCursorPosition:
call GetMenuTextStartCoord call GetMenuTextStartCoord
ld a, b ld a, b
@ -247,7 +245,6 @@ Init2DMenuCursorPosition:
ld [wMenuJoypadFilter], a ld [wMenuJoypadFilter], a
ret ret
_StaticMenuJoypad:: _StaticMenuJoypad::
call Place2DMenuCursor call Place2DMenuCursor
_ScrollingMenuJoypad:: _ScrollingMenuJoypad::
@ -276,7 +273,6 @@ MobileMenuJoypad:
ld c, a ld c, a
ret ret
Unreferenced_Function241d5: Unreferenced_Function241d5:
call Place2DMenuCursor call Place2DMenuCursor
.loop .loop
@ -315,7 +311,6 @@ Unreferenced_Function241d5:
and a and a
ret ret
MenuJoypadLoop: MenuJoypadLoop:
.loop .loop
call Move2DMenuCursor call Move2DMenuCursor

36
engine/menus/naming_screen.asm
View File

@ -10,7 +10,6 @@ _NamingScreen:
call ReturnToMapWithSpeechTextbox call ReturnToMapWithSpeechTextbox
ret ret
NamingScreen: NamingScreen:
ld hl, wNamingScreenDestinationPointer ld hl, wNamingScreenDestinationPointer
ld [hl], e ld [hl], e
@ -44,7 +43,6 @@ NamingScreen:
call ClearJoypad call ClearJoypad
ret ret
.SetUpNamingScreen: .SetUpNamingScreen:
call ClearBGPalettes call ClearBGPalettes
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
@ -61,7 +59,6 @@ NamingScreen:
call NamingScreen_InitNameEntry call NamingScreen_InitNameEntry
ret ret
.GetNamingScreenSetup: .GetNamingScreenSetup:
ld a, [wNamingScreenType] ld a, [wNamingScreenType]
and 7 and 7
@ -75,7 +72,6 @@ NamingScreen:
ld l, a ld l, a
jp hl jp hl
.Jumptable: .Jumptable:
dw .Pokemon dw .Pokemon
dw .Player dw .Player
@ -117,12 +113,10 @@ NamingScreen:
call .StoreMonIconParams call .StoreMonIconParams
ret ret
.NicknameStrings: .NicknameStrings:
db "'S@" db "'S@"
db "NICKNAME?@" db "NICKNAME?@"
.Player: .Player:
farcall GetPlayerIcon farcall GetPlayerIcon
call .LoadSprite call .LoadSprite
@ -132,11 +126,9 @@ NamingScreen:
call .StoreSpriteIconParams call .StoreSpriteIconParams
ret ret
.PlayerNameString: .PlayerNameString:
db "YOUR NAME?@" db "YOUR NAME?@"
.Rival: .Rival:
ld de, SilverSpriteGFX ld de, SilverSpriteGFX
ld b, BANK(SilverSpriteGFX) ld b, BANK(SilverSpriteGFX)
@ -147,11 +139,9 @@ NamingScreen:
call .StoreSpriteIconParams call .StoreSpriteIconParams
ret ret
.RivalNameString: .RivalNameString:
db "RIVAL'S NAME?@" db "RIVAL'S NAME?@"
.Mom: .Mom:
ld de, MomSpriteGFX ld de, MomSpriteGFX
ld b, BANK(MomSpriteGFX) ld b, BANK(MomSpriteGFX)
@ -162,11 +152,9 @@ NamingScreen:
call .StoreSpriteIconParams call .StoreSpriteIconParams
ret ret
.MomNameString: .MomNameString:
db "MOTHER'S NAME?@" db "MOTHER'S NAME?@"
.Box: .Box:
ld de, PokeBallSpriteGFX ld de, PokeBallSpriteGFX
ld hl, vTiles0 tile $00 ld hl, vTiles0 tile $00
@ -188,11 +176,9 @@ NamingScreen:
call .StoreBoxIconParams call .StoreBoxIconParams
ret ret
.BoxNameString: .BoxNameString:
db "BOX NAME?@" db "BOX NAME?@"
.Tomodachi: .Tomodachi:
hlcoord 3, 2 hlcoord 3, 2
ld de, .oTomodachi_no_namae_sutoringu ld de, .oTomodachi_no_namae_sutoringu
@ -200,11 +186,9 @@ NamingScreen:
call .StoreSpriteIconParams call .StoreSpriteIconParams
ret ret
.oTomodachi_no_namae_sutoringu .oTomodachi_no_namae_sutoringu
db "おともだち　の　なまえは？@" db "おともだち　の　なまえは？@"
.LoadSprite: .LoadSprite:
push de push de
ld hl, vTiles0 tile $00 ld hl, vTiles0 tile $00
@ -271,7 +255,6 @@ NamingScreen_IsTargetBox:
pop bc pop bc
ret ret
NamingScreen_InitText: NamingScreen_InitText:
call WaitTop call WaitTop
hlcoord 0, 0 hlcoord 0, 0
@ -333,7 +316,6 @@ NamingScreen_ApplyTextInputMode:
jr nz, .row jr nz, .row
ret ret
NamingScreenJoypadLoop: NamingScreenJoypadLoop:
call JoyTextDelay call JoyTextDelay
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
@ -355,7 +337,6 @@ NamingScreenJoypadLoop:
scf scf
ret ret
.UpdateStringEntry: .UpdateStringEntry:
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -380,7 +361,6 @@ NamingScreenJoypadLoop:
ld [hBGMapMode], a ld [hBGMapMode], a
ret ret
.RunJumptable: .RunJumptable:
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
ld e, a ld e, a
@ -393,7 +373,6 @@ NamingScreenJoypadLoop:
ld l, a ld l, a
jp hl jp hl
.Jumptable: .Jumptable:
dw .InitCursor dw .InitCursor
dw .ReadButtons dw .ReadButtons
@ -569,14 +548,12 @@ NamingScreen_AnimateCursor:
ld [hl], a ld [hl], a
ret ret
.LetterEntries: .LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80 db $00, $10, $20, $30, $40, $50, $60, $70, $80
.CaseDelEnd: .CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60 db $00, $00, $00, $30, $30, $30, $60, $60, $60
.GetDPad: .GetDPad:
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
@ -720,7 +697,6 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
scf scf
ret ret
; unused ; unused
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurrNameLength]
and a and a
@ -745,10 +721,8 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
ld a, [hl] ld a, [hl]
jr NamingScreen_LoadNextCharacter jr NamingScreen_LoadNextCharacter
INCLUDE "data/text/unused_dakutens.asm" INCLUDE "data/text/unused_dakutens.asm"
NamingScreen_DeleteCharacter: NamingScreen_DeleteCharacter:
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurrNameLength
ld a, [hl] ld a, [hl]
@ -777,7 +751,6 @@ NamingScreen_GetTextCursorPosition:
pop af pop af
ret ret
NamingScreen_InitNameEntry: NamingScreen_InitNameEntry:
; load NAMINGSCREEN_UNDERLINE, (NAMINGSCREEN_MIDDLELINE * [wNamingScreenMaxNameLength]), "@" into the dw address at wNamingScreenDestinationPointer ; load NAMINGSCREEN_UNDERLINE, (NAMINGSCREEN_MIDDLELINE * [wNamingScreenMaxNameLength]), "@" into the dw address at wNamingScreenDestinationPointer
ld hl, wNamingScreenDestinationPointer ld hl, wNamingScreenDestinationPointer
@ -797,7 +770,6 @@ NamingScreen_InitNameEntry:
ld [hl], "@" ld [hl], "@"
ret ret
NamingScreen_StoreEntry: NamingScreen_StoreEntry:
ld hl, wNamingScreenDestinationPointer ld hl, wNamingScreenDestinationPointer
ld a, [hli] ld a, [hli]
@ -907,7 +879,6 @@ LoadNamingScreenGFX:
ld [hWX], a ld [hWX], a
ret ret
NamingScreenGFX_Border: NamingScreenGFX_Border:
INCBIN "gfx/naming_screen/border.2bpp" INCBIN "gfx/naming_screen/border.2bpp"
@ -995,7 +966,6 @@ _ComposeMailMessage:
ld [hl], "<NEXT>" ld [hl], "<NEXT>"
ret ret
.MailIcon: .MailIcon:
INCBIN "gfx/icons/mail_big.2bpp" INCBIN "gfx/icons/mail_big.2bpp"
@ -1004,11 +974,9 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld [wNamingScreenMaxNameLength], a ld [wNamingScreenMaxNameLength], a
ret ret
.UnusedString11f7a: .UnusedString11f7a:
db "メールを　かいてね@" db "メールを　かいてね@"
.InitCharset: .InitCharset:
call WaitTop call WaitTop
hlcoord 0, 0 hlcoord 0, 0
@ -1235,14 +1203,12 @@ ComposeMail_AnimateCursor:
ld [hl], a ld [hl], a
ret ret
.LetterEntries: .LetterEntries:
db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90 db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90
.CaseDelEnd: .CaseDelEnd:
db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60 db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
.GetDPad: .GetDPad:
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
@ -1383,7 +1349,6 @@ MailComposition_TryAddLastCharacter:
ld a, [wNamingScreenLastCharacter] ld a, [wNamingScreenLastCharacter]
jp MailComposition_TryAddCharacter jp MailComposition_TryAddCharacter
; unused ; unused
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurrNameLength]
and a and a
@ -1418,6 +1383,5 @@ MailComposition_TryAddLastCharacter:
ld a, [hl] ld a, [hl]
jp NamingScreen_LoadNextCharacter jp NamingScreen_LoadNextCharacter
INCLUDE "data/text/mail_input_chars.asm" INCLUDE "data/text/mail_input_chars.asm"

Some files were not shown because too many files have changed in this diff Show More