Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-03-21 17:45:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source 
Regex patterns used:
 ; [0-9a-f]{1,5} \([0-9a-f]{1,2}:[0-9a-f]{1,4}\)
 ; [0-9a-f]{1,2}:[0-9a-f]{4}
 ; [0-9a-f]{4,5}

 ;[0-9a-f]{4,5}
 ;[0-9a-f]{1,2}:[0-9a-f]{1,4}
This commit is contained in:
jd-0 2020-09-20 12:07:01 -07:00
parent e789ee48b6
commit 8900eb7ad0
301 changed files with 3527 additions and 3527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
audio/engine.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/engine.asm@Audio", ROMX
_DisableAudio:: ; 3a:4000
_DisableAudio::
push hl
push de
push bc
@ -47,7 +47,7 @@ _DisableAudio:: ; 3a:4000
pop hl
ret
_UpdateSound:: ; 3a:4037
_UpdateSound::
; Called once per frame
xor a
ld [wCurChannel], a
@ -77,7 +77,7 @@ _UpdateSound:: ; 3a:4037
call Functione82f0
ret
UpdateChannel: ; 3a:4061
UpdateChannel:
; Get the note's duration
ld hl, CHANNEL_NOTE_DURATION
add hl, bc
@ -100,13 +100,13 @@ UpdateChannel: ; 3a:4061
call Functione80b6
ret
DisablePitchWheel: ; 3a:4061
DisablePitchWheel:
ld hl, CHANNEL_FLAGS2
add hl, bc
res SOUND_PITCH_WHEEL, [hl]
ret
Unreferenced_Functione8081: ; 3a:4081
Unreferenced_Functione8081:
ld a, [wMapMusic]
bit 0, a
jr nz, .disable_music
@ -140,7 +140,7 @@ Unreferenced_Functione8081: ; 3a:4081
scf
ret
GetChannelRegisters: ; 3a:40a4
GetChannelRegisters:
ld a, [wCurChannel]
ld e, a
ld d, $00
@ -153,7 +153,7 @@ GetChannelRegisters: ; 3a:40a4
.registers
db LOW(rNR10), LOW(rNR20), LOW(rNR30), LOW(rNR40)
Functione80b6: ; 3a:40b6
Functione80b6:
ld hl, CHANNEL_DUTY_CYCLE
add hl, bc
ld a, [hl]
@ -192,7 +192,7 @@ Functione80b6: ; 3a:40b6
ld [hl], a
ret
Functione80fa: ; 3a:40fa
Functione80fa:
ld hl, .jumptable
ld a, [wCurChannel]
maskbits NUM_CHANNELS
@ -209,7 +209,7 @@ Functione80fa: ; 3a:40fa
; TODO
SECTION "audio/engine.asm@IsChannelSFXOn", ROMX
IsChannelSFXOn: ; 3a:42bd
IsChannelSFXOn:
; If it's not a valid channel, return
ld a, [wCurChannel]
cp NUM_MUSIC_CHANS
@ -228,7 +228,7 @@ IsChannelSFXOn: ; 3a:42bd
scf
ret
IsAnySFXOn: ; 3a:42d0
IsAnySFXOn:
ld hl, wChannel5Flags1
bit SOUND_CHANNEL_ON, [hl]
jr nz, .on
@ -250,7 +250,7 @@ IsAnySFXOn: ; 3a:42d0
ret
SECTION "audio/engine.asm@Functione82f0", ROMX
Functione82f0: ; 3a:42f0
Functione82f0:
call IncrementTempo
call PlayDanger
call FadeMusic
@ -261,7 +261,7 @@ Functione82f0: ; 3a:42f0
ld [rNR51], a
ret
PlayDanger: ; 3a:4307
PlayDanger:
ld a, [wLowHealthAlarm]
bit DANGER_ON_F, a
ret z
@ -318,19 +318,19 @@ PlayDanger: ; 3a:4307
ld [wSoundOutput], a
ret
DangerSoundHigh: ; 3a:434a
DangerSoundHigh:
db $80 ; duty 50%
db $e2 ; volume 14, envelope decrease sweep 2
db $50 ; frequency: $750
db $87 ; restart sound
DangerSoundLow: ; 3a:434e
DangerSoundLow:
db $80 ; duty 50%
db $e2 ; volume 14, envelope decrease sweep 2
db $ee ; frequency: $6ee
db $86 ; restart sound
IncrementTempo: ; 3a:4352
IncrementTempo:
call IsAnyChannelOn
ret c
@ -371,7 +371,7 @@ IncrementTempo: ; 3a:4352
pop de
ret
IsAnyChannelOn: ; 3a:438e
IsAnyChannelOn:
; Check if any music channel is on and isn't on the last frame
ld hl, wChannel1Flags1
@ -421,7 +421,7 @@ IsAnyChannelOn: ; 3a:438e
scf
ret
FadeMusic: ; 3a:43ce
FadeMusic:
; Fade music if applicable
; usage:
; write to wMusicFade
@ -504,7 +504,7 @@ FadeMusic: ; 3a:43ce
SECTION "audio/engine.asm@Audio engine, part 2", ROMX
SetGlobalTempo: ; 3a:4cee
SetGlobalTempo:
push bc
ld a, [wCurChannel]
cp CHAN5
@ -533,7 +533,7 @@ SetGlobalTempo: ; 3a:4cee
pop bc
ret
Tempo: ; 3a:4d2a
Tempo:
ld hl, CHANNEL_TEMPO
add hl, bc
ld [hl], e
@ -546,7 +546,7 @@ Tempo: ; 3a:4d2a
ret
StartChannel: ; 3a:4d38
StartChannel:
call SetLRTracks
ld hl, CHANNEL_FLAGS1
add hl, bc
@ -554,7 +554,7 @@ StartChannel: ; 3a:4d38
ret
StopChannel: ; 3a:4d42
StopChannel:
ld hl, CHANNEL_FLAGS1
add hl, bc
res SOUND_CHANNEL_ON, [hl]
@ -567,7 +567,7 @@ StopChannel: ; 3a:4d42
ret
SetLRTracks: ; 3a:4d51
SetLRTracks:
push de
ld a, [wCurChannel]
maskbits NUM_MUSIC_CHANS
@ -583,7 +583,7 @@ SetLRTracks: ; 3a:4d51
ret
_PlayMusic:: ; 3a:4d66
_PlayMusic::
ld hl, wMusicID
ld [hl], e
inc hl

10
audio/songs/bicycle.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/bicycle.asm", ROMX
Song_Bicycle:: ; ed63e (3b:563e)
Song_Bicycle::
db 3 << 6 | 0
dw Song_Bicycle_Ch0
db 1
@ -12,7 +12,7 @@ Song_Bicycle:: ; ed63e (3b:563e)
db 3
dw Song_Bicycle_Ch3
Song_Bicycle_Ch0:: ; ed64a (3b:564a)
Song_Bicycle_Ch0::
tempo 144
volume 7, 7
duty 3
@ -171,7 +171,7 @@ Song_Bicycle_branch_ed659::
loopchannel 0, Song_Bicycle_branch_ed659
Song_Bicycle_Ch1:: ; ed70d (3b:570d)
Song_Bicycle_Ch1::
duty 2
vibrato 6, 1, 5
notetype 12, 12, 3
@ -320,7 +320,7 @@ Song_Bicycle_branch_ed717::
loopchannel 0, Song_Bicycle_branch_ed717
Song_Bicycle_Ch2:: ; ed7c5 (3b:57c5)
Song_Bicycle_Ch2::
notetype 12, 1, 3
rest 2
@ -661,7 +661,7 @@ Song_Bicycle_branch_ed7c9::
loopchannel 0, Song_Bicycle_branch_ed7c9
Song_Bicycle_Ch3:: ; ed91a (3b:591a)
Song_Bicycle_Ch3::
drumset 1
dspeed 12
rest 2

8
audio/songs/evolution.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/evolution.asm", ROMX
Song_Evolution:: ; edb1c (3b:5b1c)
Song_Evolution::
db 2 << 6 | 0
dw Song_Evolution_Ch0
db 1
@ -10,7 +10,7 @@ Song_Evolution:: ; edb1c (3b:5b1c)
db 2
dw Song_Evolution_Ch2
Song_Evolution_Ch0:: ; edb25 (3b:5b25)
Song_Evolution_Ch0::
tempo 132
volume 7, 7
vibrato 6, 3, 4
@ -53,7 +53,7 @@ Song_Evolution_branch_edb5b::
endchannel
Song_Evolution_Ch1:: ; edb67 (3b:5b67)
Song_Evolution_Ch1::
duty 2
vibrato 8, 2, 5
notetype 12, 10, 2
@ -87,7 +87,7 @@ Song_Evolution_branch_edb89::
endchannel
Song_Evolution_Ch2:: ; edb95 (3b:5b95)
Song_Evolution_Ch2::
notetype 12, 1, 0
rest 8

8
audio/songs/heal.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/heal.asm", ROMX
Song_Heal:: ; ed5f4 (3b:55f4)
Song_Heal::
db 2 << 6 | 0
dw Song_Heal_Ch0
db 1
@ -10,7 +10,7 @@ Song_Heal:: ; ed5f4 (3b:55f4)
db 2
dw Song_Heal_Ch2
Song_Heal_Ch0:: ; ed5fd (3b:55fd)
Song_Heal_Ch0::
tempo 144
volume 7, 7
duty 2
@ -33,7 +33,7 @@ Song_Heal_Ch0:: ; ed5fd (3b:55fd)
endchannel
Song_Heal_Ch1:: ; ed621 (3b:5621)
Song_Heal_Ch1::
duty 2
notetype 12, 12, 3
octave 4
@ -47,7 +47,7 @@ Song_Heal_Ch1:: ; ed621 (3b:5621)
endchannel
Song_Heal_Ch2:: ; ed631 (3b:5631)
Song_Heal_Ch2::
notetype 12, 1, 0
octave 4
E_ 2

8
audio/songs/leaderbattle.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/leaderbattle.asm", ROMX
Song_LeaderBattle:: ; ec858 (3b:4858)
Song_LeaderBattle::
db 2 << 6 | 0
dw Song_LeaderBattle_Ch0
db 1
@ -10,7 +10,7 @@ Song_LeaderBattle:: ; ec858 (3b:4858)
db 2
dw Song_LeaderBattle_Ch2
Song_LeaderBattle_Ch0:: ; ec861 (3b:4861)
Song_LeaderBattle_Ch0::
tempo 104
volume 7, 7
duty 3
@ -561,7 +561,7 @@ Song_LeaderBattle_branch_ec8a4::
loopchannel 0, Song_LeaderBattle_branch_ec8a4
Song_LeaderBattle_Ch1:: ; eca9c (3b:4a9c)
Song_LeaderBattle_Ch1::
duty 3
vibrato 8, 2, 5
notetype 12, 12, 3
@ -862,7 +862,7 @@ Song_LeaderBattle_branch_ecadc::
loopchannel 0, Song_LeaderBattle_branch_ecadc
Song_LeaderBattle_Ch2:: ; ecc05 (3b:4c05)
Song_LeaderBattle_Ch2::
vibrato 0, 2, 0
notetype 12, 1, 3
rest 12

10
audio/songs/nidorinointro.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/nidorinointro.asm", ROMX
Song_NidorinoIntro:: ; ec000 (3b:4000)
Song_NidorinoIntro::
db 3 << 6 | 0
dw Song_NidorinoIntro_Ch0
db 1
@ -12,7 +12,7 @@ Song_NidorinoIntro:: ; ec000 (3b:4000)
db 3
dw Song_NidorinoIntro_Ch3
Song_NidorinoIntro_Ch0:: ; ec00c (3b:400c)
Song_NidorinoIntro_Ch0::
tempo 102
volume 7, 7
duty 3
@ -106,7 +106,7 @@ Song_NidorinoIntro_Ch0:: ; ec00c (3b:400c)
endchannel
Song_NidorinoIntro_Ch1:: ; ec09f (3b:409f)
Song_NidorinoIntro_Ch1::
duty 3
vibrato 8, 2, 5
notetype 12, 12, 2
@ -181,7 +181,7 @@ Song_NidorinoIntro_Ch1:: ; ec09f (3b:409f)
endchannel
Song_NidorinoIntro_Ch2:: ; ec116 (3b:4116)
Song_NidorinoIntro_Ch2::
notetype 12, 1, 0
rest 8
octave 4
@ -245,7 +245,7 @@ Song_NidorinoIntro_Ch2:: ; ec116 (3b:4116)
endchannel
Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155)
Song_NidorinoIntro_Ch3::
drumset 2
dspeed 6
snare4 1

10
audio/songs/none.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/none.asm", ROMX
Song_None:: ; e92ee (3a:52ee)
Song_None::
db 3 << 6 | 0
dw Song_None_Ch0
db 1
@ -12,9 +12,9 @@ Song_None:: ; e92ee (3a:52ee)
db 3
dw Song_None_Ch3
Song_None_Ch0:: ; e92fa (3a:52fa)
Song_None_Ch1:: ; e92fa (3a:52fa)
Song_None_Ch2:: ; e92fa (3a:52fa)
Song_None_Ch3:: ; e92fa (3a:52fa)
Song_None_Ch0::
Song_None_Ch1::
Song_None_Ch2::
Song_None_Ch3::
endchannel
; 0xe92fb

10
audio/songs/oakintro.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/oakintro.asm", ROMX
Song_OakIntro:: ; ec685 (3b:4685)
Song_OakIntro::
db 3 << 6 | 0
dw Song_OakIntro_Ch0
db 1
@ -12,7 +12,7 @@ Song_OakIntro:: ; ec685 (3b:4685)
db 3
dw Song_OakIntro_Ch3
Song_OakIntro_Ch0:: ; ec691 (3b:4691)
Song_OakIntro_Ch0::
tempo 152
volume 7, 7
vibrato 9, 2, 5
@ -156,7 +156,7 @@ Song_OakIntro_branch_ec69b::
endchannel
Song_OakIntro_Ch1:: ; ec729 (3b:4729)
Song_OakIntro_Ch1::
vibrato 8, 2, 6
duty 3
@ -232,7 +232,7 @@ Song_OakIntro_branch_ec72e::
endchannel
Song_OakIntro_Ch2:: ; ec779 (3b:4779)
Song_OakIntro_Ch2::
vibrato 9, 2, 8
Song_OakIntro_branch_ec77c::
@ -340,7 +340,7 @@ Song_OakIntro_branch_ec77c::
endchannel
Song_OakIntro_Ch3:: ; ec7e7 (3b:47e7)
Song_OakIntro_Ch3::
drumset 0
Song_OakIntro_branch_ec7e9::

10
audio/songs/route1.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/route1.asm", ROMX
Song_Route1:: ; ec4c2 (3b:44c2)
Song_Route1::
db 3 << 6 | 0
dw Song_Route1_Ch0
db 1
@ -12,7 +12,7 @@ Song_Route1:: ; ec4c2 (3b:44c2)
db 3
dw Song_Route1_Ch3
Song_Route1_Ch0:: ; ec4ce (3b:44ce)
Song_Route1_Ch0::
tempo 152
volume 7, 7
vibrato 4, 2, 3
@ -122,7 +122,7 @@ Song_Route1_branch_ec4db::
endchannel
Song_Route1_Ch1:: ; ec546 (3b:4546)
Song_Route1_Ch1::
duty 2
Song_Route1_branch_ec548::
@ -252,7 +252,7 @@ Song_Route1_branch_ec586::
endchannel
Song_Route1_Ch2:: ; ec5d6 (3b:45d6)
Song_Route1_Ch2::
vibrato 8, 2, 5
notetype 12, 1, 3
@ -327,7 +327,7 @@ Song_Route1_branch_ec5dc::
endchannel
Song_Route1_Ch3:: ; ec623 (3b:4623)
Song_Route1_Ch3::
drumset 2
Song_Route1_branch_ec625::

8
audio/songs/spottedrocket.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/spottedrocket.asm", ROMX
Song_SpottedRocket:: ; ed978 (3b:5978)
Song_SpottedRocket::
db 2 << 6 | 0
dw Song_SpottedRocket_Ch0
db 1
@ -10,7 +10,7 @@ Song_SpottedRocket:: ; ed978 (3b:5978)
db 2
dw Song_SpottedRocket_Ch2
Song_SpottedRocket_Ch0:: ; ed981 (3b:5981)
Song_SpottedRocket_Ch0::
tempo 124
volume 7, 7
duty 2
@ -35,7 +35,7 @@ Song_SpottedRocket_branch_ed996::
loopchannel 0, Song_SpottedRocket_branch_ed996
Song_SpottedRocket_Ch1:: ; ed9a4 (3b:59a4)
Song_SpottedRocket_Ch1::
duty 1
notetype 12, 11, 6
octave 3
@ -74,7 +74,7 @@ Song_SpottedRocket_branch_ed9ad::
loopchannel 0, Song_SpottedRocket_branch_ed9ad
Song_SpottedRocket_Ch2:: ; ed9d6 (3b:59d6)
Song_SpottedRocket_Ch2::
notetype 12, 1, 0
rest 8
octave 4

10
audio/songs/title.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/title.asm", ROMX
Song_Title:: ; f22fe (3c:62fe)
Song_Title::
db 3 << 6 | 0
dw Song_Title_Ch0
db 1
@ -12,7 +12,7 @@ Song_Title:: ; f22fe (3c:62fe)
db 3
dw Song_Title_Ch3
Song_Title_Ch0:: ; f230a (3c:630a)
Song_Title_Ch0::
tempo 144
volume 7, 7
vibrato 9, 3, 4
@ -168,7 +168,7 @@ Song_Title_branch_f23b3::
endchannel
Song_Title_Ch1:: ; f23d0 (3c:63d0)
Song_Title_Ch1::
vibrato 16, 4, 6
duty 1
notetype 12, 14, 1
@ -337,7 +337,7 @@ Song_Title_branch_f24a2::
endchannel
Song_Title_Ch2:: ; f24b0 (3c:64b0)
Song_Title_Ch2::
notetype 12, 1, 0
octave 3
G_ 1
@ -475,7 +475,7 @@ Song_Title_branch_f2556::
endchannel
Song_Title_Ch3:: ; f255d (3c:655d)
Song_Title_Ch3::
drumset 0
dspeed 6
rest 4

8
audio/songs/trainerbattle.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/trainerbattle.asm", ROMX
Song_TrainerBattle:: ; ece31 (3b:4e31)
Song_TrainerBattle::
db 2 << 6 | 0
dw Song_TrainerBattle_Ch0
db 1
@ -10,7 +10,7 @@ Song_TrainerBattle:: ; ece31 (3b:4e31)
db 2
dw Song_TrainerBattle_Ch2
Song_TrainerBattle_Ch0:: ; ece3a (3b:4e3a)
Song_TrainerBattle_Ch0::
tempo 112
volume 7, 7
duty 3
@ -663,7 +663,7 @@ Song_TrainerBattle_branch_ece86::
loopchannel 0, Song_TrainerBattle_branch_ece86
Song_TrainerBattle_Ch1:: ; ed0d7 (3b:50d7)
Song_TrainerBattle_Ch1::
duty 3
vibrato 10, 2, 5
notetype 12, 12, 2
@ -967,7 +967,7 @@ Song_TrainerBattle_branch_ed129::
loopchannel 0, Song_TrainerBattle_branch_ed129
Song_TrainerBattle_Ch2:: ; ed26a (3b:526a)
Song_TrainerBattle_Ch2::
vibrato 0, 2, 0
notetype 12, 1, 4
octave 3

8
audio/songs/victorytrainer.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/victorytrainer.asm", ROMX
Song_VictoryTrainer:: ; ed9ea (3b:59ea)
Song_VictoryTrainer::
db 2 << 6 | 0
dw Song_VictoryTrainer_Ch0
db 1
@ -10,7 +10,7 @@ Song_VictoryTrainer:: ; ed9ea (3b:59ea)
db 2
dw Song_VictoryTrainer_Ch2
Song_VictoryTrainer_Ch0:: ; ed9f3 (3b:59f3)
Song_VictoryTrainer_Ch0::
tempo 224
volume 7, 7
duty 2
@ -108,7 +108,7 @@ Song_VictoryTrainer_branch_eda18::
loopchannel 0, Song_VictoryTrainer_branch_eda18
Song_VictoryTrainer_Ch1:: ; eda64 (3b:5a64)
Song_VictoryTrainer_Ch1::
duty 2
notetype 4, 12, 3
octave 4
@ -184,7 +184,7 @@ Song_VictoryTrainer_branch_eda75::
loopchannel 0, Song_VictoryTrainer_branch_eda75
Song_VictoryTrainer_Ch2:: ; edabd (3b:5abd)
Song_VictoryTrainer_Ch2::
notetype 4, 1, 0
octave 5
D_ 2

10
audio/songs/viridiancity.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "audio/songs/viridiancity.asm", ROMX
Song_ViridianCity:: ; ec1b9 (3b:41b9)
Song_ViridianCity::
db 3 << 6 | 0
dw Song_ViridianCity_Ch0
db 1
@ -16,7 +16,7 @@ Song_ViridianCity_branch_ec1c5::
tempo 232
loopchannel 0, Song_ViridianCity_branch_ec1cf
Song_ViridianCity_Ch0:: ; ec1cc (3b:41cc)
Song_ViridianCity_Ch0::
tempo 144
Song_ViridianCity_branch_ec1cf::
@ -282,7 +282,7 @@ Song_ViridianCity_branch_ec2eb::
endchannel
Song_ViridianCity_Ch1:: ; ec2f3 (3b:42f3)
Song_ViridianCity_Ch1::
vibrato 5, 1, 5
callchannel Song_ViridianCity_branch_ec368
octave 4
@ -415,7 +415,7 @@ Song_ViridianCity_branch_ec368::
endchannel
Song_ViridianCity_Ch2:: ; ec3a2 (3b:43a2)
Song_ViridianCity_Ch2::
notetype 12, 1, 1
toggleperfectpitch
rest 1
@ -595,7 +595,7 @@ Song_ViridianCity_branch_ec441::
endchannel
Song_ViridianCity_Ch3:: ; ec462 (3b:4462)
Song_ViridianCity_Ch3::
drumset 0
Song_ViridianCity_branch_ec464::

4
bin.asm
View File

@ -1,9 +1,9 @@
SECTION "bin.asm@Unknownaebc", ROMX
Unknownaebc: ; 02:6ebc
Unknownaebc:
INCBIN "bin/unknown_aebc.bin"
SECTION "bin.asm@Unknownbb43", ROMX
Unknownbb43: ; 02:7b43
Unknownbb43:
INCBIN "bin/unknown_bb43.bin"

6
constants/wram_constants.asm
View File

@ -7,7 +7,7 @@
const RIGHT ; 3
NUM_DIRECTIONS EQU const_value
; wMonType:: ; cb5a
; wMonType::
const_def
const PARTYMON ; 0
const OTPARTYMON ; 1
@ -15,14 +15,14 @@ NUM_DIRECTIONS EQU const_value
const TEMPMON ; 3
const WILDMON ; 4
; wPlayerState:: ; d95d
; wPlayerState::
PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1
PLAYER_SKATE EQU 2
PLAYER_SURF EQU 4
PLAYER_SURF_PIKA EQU 8
; wDebugFlags:: ; ce63
; wDebugFlags::
const_def
const DEBUG_BATTLE_F
const DEBUG_FIELD_F

2
data/collision/collision_type_table.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/collision/collision_type_table.asm", ROMX
CollisionTypeTable: ; 03:4664
CollisionTypeTable:
db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $00
db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $04
db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $08

2
data/items/attributes.asm
View File

@ -9,7 +9,7 @@ ENDM
SECTION "data/items/attributes.asm", ROMX
ItemAttributes:: ; 68f3
ItemAttributes::
; ITEM_MASTER_BALL
item_attribute 0, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ITEM_ULTRA_BALL

2
data/moves/tmhm_moves.asm
View File

@ -6,7 +6,7 @@ SECTION "data/moves/tmhm_moves.asm", ROMX
; It was probably meant for easy testing, not as
; a final set of TM moves.
TMHMMoves: ; 04:52d1
TMHMMoves:
; TMs
db MOVE_SKETCH ; TM01
db MOVE_HIDDEN_POWER ; TM02

502
data/pokemon/evos_attacks.asm
View File

File diff suppressed because it is too large Load Diff

2
data/pokemon/evos_attacks_pointers.inc
View File

@ -1,6 +1,6 @@
; Evolutions and attacks are grouped together since they're both checked at level-up.
EvosAttacksPointers:: ; 42493
EvosAttacksPointers::
dw FushigidaneEvosAttacks
dw FushigisouEvosAttacks
dw FushigibanaEvosAttacks

2
data/pokemon/menu_icons.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/pokemon/menu_icons.asm", ROMX
MonMenuIcons:: ; 8F22A
MonMenuIcons::
db ICON_FUSHIGIDANE ; 01 FUSHIGIDANE
db ICON_FUSHIGIDANE ; 02 FUSHIGISOU
db ICON_FUSHIGIDANE ; 03 FUSHIGIBANA

2
data/predef_pointers.inc
View File

@ -6,7 +6,7 @@ add_predef: MACRO
dba \1
ENDM
PredefPointers:: ; 1:62d3
PredefPointers::
; To YOU who is reading this:
; Please be a peach and nuke the hell out of these:
; WE NEED LABELS!

6
data/text/text_input_chars.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/text/text_input_chars.asm", ROMX
TextEntryChars: ; 04:58B3
TextEntryChars:
db "あいうえお　かきくけこ　さしすせそ"
db "たちつてと　なにぬねの　はひふへほ"
db "まみむめも　やゆよわん　らりるれろ"
@ -12,14 +12,14 @@ TextEntryChars: ; 04:58B3
db "ゃゅょっを　ャュョッヲ　ﾞﾟ　ー。"
db "１２３４５　６７８９０　？！×.円"
TextEntryHiragana: ; 04:593B
TextEntryHiragana:
db "あいうえお　かきくけこ　さしすせそ"
db "たちつてと　なにぬねの　はひふへほ"
db "まみむめも　やゆよわん　らりるれろ"
db "ゃゅょっを　１２３４５　６７８９０"
db "　ﾞﾟ　ー？！円"
TextEntryKatakana: ; 04:5987
TextEntryKatakana:
db "アイウエオ　カキクケコ　サシスセソ"
db "タチツテト　ナニヌネノ　ハヒフへホ"
db "マミムメモ　ヤユヨワン　ラりルレロ"

2
data/trainers/class_names.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/trainers/class_names.asm", ROMX
TrainerClassNames:: ; 38d90
TrainerClassNames::
db "ハヤト@" ; HAYATO
db "アカネ@" ; AKANE
db "ツクシ@" ; TSUKISHI

2
data/types/type_matchups.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/types/type_matchups.asm", ROMX
TypeMatchups: ; 3506d
TypeMatchups:
; attacker, defender, *=
db TYPE_NORMAL, TYPE_ROCK, NOT_VERY_EFFECTIVE
db TYPE_NORMAL, TYPE_DARK, SUPER_EFFECTIVE

2
data/wild.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "data/wild.asm", ROMX
GrassWildMons:: ; f:6a3c
GrassWildMons::
db $01, $01 ; map group, map id
db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite

2
engine/battle/core.asm
View File

@ -1,7 +1,7 @@
include "constants.asm"
SECTION "engine/battle/core.asm", ROMX
_BattleRandom: ; 3e3da (f:63da)
_BattleRandom:
; If the normal RNG is used in a link battle it'll desync.
; To circumvent this a shared PRNG is used instead.

170
engine/battle_anims/bg_effects.asm
View File

@ -12,7 +12,7 @@ SECTION "engine/battle_anims/bg_effects.asm", ROMX
; BG effects for use in battle animations.
ExecuteBGEffects: ; c8000 (32:4000)
ExecuteBGEffects:
ld hl, wActiveBGEffects
ld e, 5
.loop
@ -33,7 +33,7 @@ ExecuteBGEffects: ; c8000 (32:4000)
jr nz, .loop
ret
QueueBGEffect: ; c801a (32:401a)
QueueBGEffect:
ld hl, wActiveBGEffects
ld e, 5
.loop
@ -62,13 +62,13 @@ QueueBGEffect: ; c801a (32:401a)
ld [hl], a
ret
EndBattleBGEffect: ; c8043 (32:4043)
EndBattleBGEffect:
ld hl, BG_EFFECT_STRUCT_FUNCTION
add hl, bc
ld [hl], 0
ret
DoBattleBGEffectFunction: ; c804a (32:404a)
DoBattleBGEffectFunction:
ld hl, BG_EFFECT_STRUCT_FUNCTION
add hl, bc
ld e, [hl]
@ -81,7 +81,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
ld l, a
jp hl
BattleBGEffects: ; c805a (32:405a)
BattleBGEffects:
; entries correspond to ANIM_BG_* constants
dw BattleBGEffect_End
dw BattleBGEffect_FlashInverted
@ -138,17 +138,17 @@ BattleBGEffects: ; c805a (32:405a)
;dw BattleBGEffect_WobbleMon
BattleBGEffect_End: ; c80b6 (32:40b6)
BattleBGEffect_End:
call EndBattleBGEffect
ret
BattleBGEffects_AnonJumptable: ; c80ba (32:40ba)
BattleBGEffects_AnonJumptable:
ld hl, sp+$0
ld e, [hl]
inc hl
ld d, [hl]
inc de
BatttleBGEffects_GetNamedJumptablePointer: ; c80c0 (32:40c0)
BatttleBGEffects_GetNamedJumptablePointer:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld l, [hl]
@ -160,33 +160,33 @@ BatttleBGEffects_GetNamedJumptablePointer: ; c80c0 (32:40c0)
ld l, a
ret
BattleBGEffects_IncrementJumptable: ; c80cd (32:40cd)
BattleBGEffects_IncrementJumptable:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
inc [hl]
ret
BattleBGEffect_FlashInverted: ; c80d3 (32:40d3)
BattleBGEffect_FlashInverted:
ld de, .inverted
call BattleBGEffect_FlashContinue
ret
.inverted
db %11100100 ; 3210
db %00011011 ; 0123
db %11100100
db %00011011
; c80f3
BattleBGEffect_FlashWhite: ; c80dc (32:40dc)
BattleBGEffect_FlashWhite:
ld de, .white
call BattleBGEffect_FlashContinue
ret
.white
db %11100100 ; 3210
db %00000000 ; 0000
db %11100100
db %00000000
; c80fb
BattleBGEffect_FlashContinue: ; c80e5 (32:40e5)
BattleBGEffect_FlashContinue:
; current timer, flash duration, number of flashes
ld a, $1
ld [wBattleAnimTemp0], a
@ -224,7 +224,7 @@ BattleBGEffect_FlashContinue: ; c80e5 (32:40e5)
ld [wBGP], a
ret
BattleBGEffect_WhiteHues: ; c8117 (32:4117)
BattleBGEffect_WhiteHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@ -242,7 +242,7 @@ BattleBGEffect_WhiteHues: ; c8117 (32:4117)
db -1
; c8141
BattleBGEffect_BlackHues: ; c812b (32:412b)
BattleBGEffect_BlackHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@ -260,7 +260,7 @@ BattleBGEffect_BlackHues: ; c812b (32:412b)
db -1
; c8155
BattleBGEffect_AlternateHues: ; c813f (32:413f)
BattleBGEffect_AlternateHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@ -284,7 +284,7 @@ BattleBGEffect_AlternateHues: ; c813f (32:413f)
db -2
; c8171
BattleBGEffect_06: ; c815b (32:415b)
BattleBGEffect_06:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
@ -308,7 +308,7 @@ BattleBGEffect_06: ; c815b (32:415b)
db -2
; c818b
BattleBGEffect_07: ; c8175 (32:4175)
BattleBGEffect_07:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
@ -332,7 +332,7 @@ BattleBGEffect_07: ; c8175 (32:4175)
db -2
; c81a5
BattleBGEffect_08: ; c818f (32:418f)
BattleBGEffect_08:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
ld [wBGP], a
@ -345,7 +345,7 @@ BattleBGEffect_08: ; c818f (32:418f)
db -2
; c81b3
BattleBGEffect_HideMon: ; c819d (32:419d)
BattleBGEffect_HideMon:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -381,7 +381,7 @@ BattleBGEffect_HideMon: ; c819d (32:419d)
call EndBattleBGEffect
ret
BattleBGEffect_ShowMon: ; c81d2 (32:41d2)
BattleBGEffect_ShowMon:
call BGEffect_CheckFlyDigStatus
jr z, .not_flying
call EndBattleBGEffect
@ -411,7 +411,7 @@ BattleBGEffect_ShowMon: ; c81d2 (32:41d2)
db -1
; c8214
BattleBGEffect_FeetFollow: ; c81fc (32:41fc)
BattleBGEffect_FeetFollow:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -478,7 +478,7 @@ BattleBGEffect_FeetFollow: ; c81fc (32:41fc)
call EndBattleBGEffect
ret
BattleBGEffect_HeadFollow: ; c8266 (32:4266)
BattleBGEffect_HeadFollow:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -545,11 +545,11 @@ BattleBGEffect_HeadFollow: ; c8266 (32:4266)
call EndBattleBGEffect
ret
_QueueBattleAnimation: ; c82ee (32:42ee)
_QueueBattleAnimation:
callab QueueBattleAnimation
ret
BattleBGEffect_27: ; c82d9 (32:42d9)
BattleBGEffect_27:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -638,7 +638,7 @@ BattleBGEffect_27: ; c82d9 (32:42d9)
call EndBattleBGEffect
ret
BattleBGEffect_EnterMon: ; c8350 (32:4350)
BattleBGEffect_EnterMon:
call BGEffect_CheckBattleTurn
jr nz, .player_turn
ld de, .EnemyData
@ -666,7 +666,7 @@ BattleBGEffect_EnterMon: ; c8350 (32:4350)
db -1
; c83a8
BattleBGEffect_ReturnMon: ; c837d (32:437d)
BattleBGEffect_ReturnMon:
call BGEffect_CheckBattleTurn
jr nz, .player_turn
ld de, .EnemyData
@ -702,7 +702,7 @@ BattleBGEffect_ReturnMon: ; c837d (32:437d)
db -1
; c83ed
BattleBGEffect_RunPicResizeScript: ; c83c2 (32:43c2)
BattleBGEffect_RunPicResizeScript:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -905,7 +905,7 @@ ENDM
db $06, $1b, $30
; c8545
BattleBGEffect_Surf: ; c851d (32:451d)
BattleBGEffect_Surf:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -962,7 +962,7 @@ BattleBGEffect_Surf: ; c851d (32:451d)
ld [bc], a
ret
BattleBGEffect_Psychic: ; c8560 (32:4560)
BattleBGEffect_Psychic:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1001,7 +1001,7 @@ BattleBGEffect_Psychic: ; c8560 (32:4560)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Teleport: ; c8599 (32:4599)
BattleBGEffect_Teleport:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1027,7 +1027,7 @@ BattleBGEffect_Teleport: ; c8599 (32:4599)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_NightShade: ; c85bd (32:45bd)
BattleBGEffect_NightShade:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1056,7 +1056,7 @@ BattleBGEffect_NightShade: ; c85bd (32:45bd)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_DoubleTeam: ; c85e5 (32:45e5)
BattleBGEffect_DoubleTeam:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1146,7 +1146,7 @@ BattleBGEffect_DoubleTeam: ; c85e5 (32:45e5)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_AcidArmor: ; c865e (32:465e)
BattleBGEffect_AcidArmor:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1188,7 +1188,7 @@ BattleBGEffect_AcidArmor: ; c865e (32:465e)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Withdraw: ; c8695 (32:4695)
BattleBGEffect_Withdraw:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1238,7 +1238,7 @@ BattleBGEffect_Withdraw: ; c8695 (32:4695)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Dig: ; c86dc (32:46dc)
BattleBGEffect_Dig:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1306,7 +1306,7 @@ BattleBGEffect_Dig: ; c86dc (32:46dc)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Tackle: ; c873b (32:473b)
BattleBGEffect_Tackle:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1383,7 +1383,7 @@ Tackle_BGEffect25_2d_two:
ld [hl], a
ret
Functionc88a5: ; c87aa (32:47aa)
Functionc88a5:
push af
.asm_c87ab:
ld a, [rLY]
@ -1393,7 +1393,7 @@ Functionc88a5: ; c87aa (32:47aa)
call BGEffect_FillLYOverridesBackup
ret
BattleBGEffect_2d: ; c87b6 (32:47b6)
BattleBGEffect_2d:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1429,7 +1429,7 @@ BGEffect2d_2f_zero:
ld [hl], a
ret
BattleBGEffect_2f: ; c87e9 (32:47e9)
BattleBGEffect_2f:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1444,7 +1444,7 @@ BattleBGEffect_2f: ; c87e9 (32:47e9)
.two
ret
BattleBGEffect_26: ; c87fb (32:47fb)
BattleBGEffect_26:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1494,7 +1494,7 @@ BattleBGEffect_26: ; c87fb (32:47fb)
call BGEffect_FillLYOverridesBackup
ret
BattleBGEffect_2c: ; c8842 (32:4842)
BattleBGEffect_2c:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1560,7 +1560,7 @@ BattleBGEffect_2c: ; c8842 (32:4842)
call BGEffect_FillLYOverridesBackup
ret
BattleBGEffect_28: ; c88a0 (32:48a0)
BattleBGEffect_28:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1604,7 +1604,7 @@ BattleBGEffect_28: ; c88a0 (32:48a0)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_BounceDown: ; c88da (32:48da)
BattleBGEffect_BounceDown:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1656,7 +1656,7 @@ BattleBGEffect_BounceDown: ; c88da (32:48da)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2a: ; c8927 (32:4927)
BattleBGEffect_2a:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1766,7 +1766,7 @@ BattleBGEffect_2a: ; c8927 (32:4927)
db -1
; c8acc
BattleBGEffect_2b: ; c89ba (32:49ba)
BattleBGEffect_2b:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1804,7 +1804,7 @@ BattleBGEffect_2b: ; c89ba (32:49ba)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_1c: ; c89ef (32:49ef)
BattleBGEffect_1c:
call BattleBGEffects_AnonJumptable
jp hl
.anon_dw
@ -1894,7 +1894,7 @@ BattleBGEffect_1c: ; c89ef (32:49ef)
db $90, $f8
; c8be8
BattleBGEffect_RapidFlash: ; c8a6e (32:4a6e)
BattleBGEffect_RapidFlash:
ld de, .FlashPals
call BGEffect_RapidCyclePals
ret
@ -1903,7 +1903,7 @@ BattleBGEffect_RapidFlash: ; c8a6e (32:4a6e)
db $e4, $6c, $fe
; c8bf2
BattleBGEffect_16: ; c8a78 (32:4a78)
BattleBGEffect_16:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1912,7 +1912,7 @@ BattleBGEffect_16: ; c8a78 (32:4a78)
db $e4, $90, $40, $ff
; c8bfd
BattleBGEffect_17: ; c8a83 (32:4a83)
BattleBGEffect_17:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1921,7 +1921,7 @@ BattleBGEffect_17: ; c8a83 (32:4a83)
db $e4, $f8, $fc, $ff
; c8c08
BattleBGEffect_18: ; c8a8e (32:4a8e)
BattleBGEffect_18:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1930,7 +1930,7 @@ BattleBGEffect_18: ; c8a8e (32:4a8e)
db $e4, $90, $40, $90, $fe
; c8c14
BattleBGEffect_19: ; c8a9a (32:4a9a)
BattleBGEffect_19:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1939,7 +1939,7 @@ BattleBGEffect_19: ; c8a9a (32:4a9a)
db $e4, $f8, $fc, $f8, $fe
; c8c20
BattleBGEffect_1a: ; c8aa6 (32:4aa6)
BattleBGEffect_1a:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1948,7 +1948,7 @@ BattleBGEffect_1a: ; c8aa6 (32:4aa6)
db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
; c8c30
BattleBGEffect_1b: ; c8ab6 (32:4ab6)
BattleBGEffect_1b:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1957,7 +1957,7 @@ BattleBGEffect_1b: ; c8ab6 (32:4ab6)
db $e4, $fc, $e4, $00, $fe
; c8c3c
BattleBGEffect_1d: ; c8ac2 (32:4ac2)
BattleBGEffect_1d:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1966,7 +1966,7 @@ BattleBGEffect_1d: ; c8ac2 (32:4ac2)
db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
; c8c55
BattleBGEffect_1e: ; c8adb (32:4adb)
BattleBGEffect_1e:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
@ -1975,7 +1975,7 @@ BattleBGEffect_1e: ; c8adb (32:4adb)
db $00, $40, $90, $e4, $ff
; c8c61
BattleBGEffect_2e: ; c8ae7 (32:4ae7)
BattleBGEffect_2e:
call Functionc8d0b
jr c, .xor_a
bit 7, a
@ -1989,7 +1989,7 @@ BattleBGEffect_2e: ; c8ae7 (32:4ae7)
ld [$c753], a ; wAnimObject01YOffset
ret
BattleBGEffect_1f: ; c8afa (32:4afa)
BattleBGEffect_1f:
call Functionc8d0b
jr nc, .skip
xor a
@ -1997,7 +1997,7 @@ BattleBGEffect_1f: ; c8afa (32:4afa)
ldh [hSCX], a
ret
BattleBGEffect_20: ; c8b03 (32:4b03)
BattleBGEffect_20:
call Functionc8d0b
jr nc, .skip
xor a
@ -2005,7 +2005,7 @@ BattleBGEffect_20: ; c8b03 (32:4b03)
ldh [hSCY], a
ret
Functionc8d0b: ; c8b0c (32:4b0c)
Functionc8d0b:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
@ -2043,7 +2043,7 @@ Functionc8d0b: ; c8b0c (32:4b0c)
and a
ret
BattleBGEffect_GetNthDMGPal: ; c8b3b (32:4b3b)
BattleBGEffect_GetNthDMGPal:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
@ -2066,7 +2066,7 @@ BattleBGEffect_GetNthDMGPal: ; c8b3b (32:4b3b)
call BattleBGEffect_GetFirstDMGPal
ret
BGEffect_RapidCyclePals: ; c8b5b (32:4b5b)
BGEffect_RapidCyclePals:
push de
ld de, .Jumptable_DMG
call BatttleBGEffects_GetNamedJumptablePointer
@ -2079,7 +2079,7 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b)
dw .two_dmg
.zero_dmg ; c8d8b (32:4d8b)
.zero_dmg
call BattleBGEffects_IncrementJumptable
ld a, $e4
call BattleBGEffects_SetLYOverrides
@ -2097,7 +2097,7 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b)
ld [hl], a
ret
.one_dmg ; c8daa (32:4daa)
.one_dmg
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hl]
@ -2122,19 +2122,19 @@ BGEffect_RapidCyclePals: ; c8b5b (32:4b5b)
dec [hl]
ret
.two_dmg ; c8dc9 (32:4dc9)
.two_dmg
call BattleBGEffects_ResetVideoHRAM
ld a, %11100100
ld [rBGP], a
call EndBattleBGEffect
ret
BattleBGEffect_GetFirstDMGPal: ; c8bb3 (32:4bb3)
BattleBGEffect_GetFirstDMGPal:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
inc [hl]
BattleBGEffect_GetNextDMGPal: ; c8bb9 (32:4bb9)
BattleBGEffect_GetNextDMGPal:
ld l, a
ld h, $0
add hl, de
@ -2155,9 +2155,9 @@ BattleBGEffect_GetNextDMGPal: ; c8bb9 (32:4bb9)
scf
ret
BattleBGEffects_ClearLYOverrides: ; c8bd1 (32:4bd1)
BattleBGEffects_ClearLYOverrides:
xor a
BattleBGEffects_SetLYOverrides: ; c8bd2 (32:4bd2)
BattleBGEffects_SetLYOverrides:
ld hl, wLYOverrides
ld e, $91
.loop
@ -2166,7 +2166,7 @@ BattleBGEffects_SetLYOverrides: ; c8bd2 (32:4bd2)
jr nz, .loop
ret
BattleBGEffect_SetLCDStatCustoms: ; c8bdc (32:4bdc)
BattleBGEffect_SetLCDStatCustoms:
ldh [hLCDCPointer], a
call BGEffect_CheckBattleTurn
jr nz, .player_turn
@ -2182,7 +2182,7 @@ BattleBGEffect_SetLCDStatCustoms: ; c8bdc (32:4bdc)
ldh [hLYOverrideEnd], a
ret
BattleAnim_ResetLCDStatCustom: ; c8bf2 (32:4bf2)
BattleAnim_ResetLCDStatCustom:
xor a
ldh [hLYOverrideStart], a
ldh [hLYOverrideEnd], a
@ -2192,7 +2192,7 @@ BattleAnim_ResetLCDStatCustom: ; c8bf2 (32:4bf2)
call EndBattleBGEffect
ret
BattleBGEffects_ResetVideoHRAM: ; c8c01 (32:4c01)
BattleBGEffects_ResetVideoHRAM:
xor a
ldh [hLCDCPointer], a
ldh [hLYOverrideStart], a
@ -2200,7 +2200,7 @@ BattleBGEffects_ResetVideoHRAM: ; c8c01 (32:4c01)
call BattleBGEffects_ClearLYOverrides
ret
Functionc8f2e: ; c8c0c (32:4c0c)
Functionc8f2e:
push bc
xor a
ld [wBattleAnimTemp0], a
@ -2235,7 +2235,7 @@ Functionc8f2e: ; c8c0c (32:4c0c)
pop bc
ret
InitSurfWaves: ; c8c47 (32:4c47)
InitSurfWaves:
push bc
xor a
ld [wBattleAnimTemp0], a
@ -2263,7 +2263,7 @@ InitSurfWaves: ; c8c47 (32:4c47)
pop bc
ret
BattleBGEffect_WavyScreenFX: ; c8c78 (32:4c78)
BattleBGEffect_WavyScreenFX:
push bc
ldh a, [hLYOverrideStart]
ld l, a
@ -2290,7 +2290,7 @@ BattleBGEffect_WavyScreenFX: ; c8c78 (32:4c78)
pop bc
ret
BGEffect_FillLYOverridesBackup: ; c8c94 (32:4c94)
BGEffect_FillLYOverridesBackup:
push af
ld h, HIGH(wLYOverrides)
ldh a, [hLYOverrideStart]
@ -2305,7 +2305,7 @@ BGEffect_FillLYOverridesBackup: ; c8c94 (32:4c94)
jr nz, .loop
ret
BGEffect_DisplaceLYOverridesBackup: ; c8ca4 (32:4ca4)
BGEffect_DisplaceLYOverridesBackup:
; e = a; d = [hLYOverrideEnd] - [hLYOverrideStart] - a
push af
ld e, a
@ -2332,7 +2332,7 @@ BGEffect_DisplaceLYOverridesBackup: ; c8ca4 (32:4ca4)
jr nz, .loop2
ret
BGEffect_CheckBattleTurn: ; c8cc2 (32:4cc2)
BGEffect_CheckBattleTurn:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ldh a, [hBattleTurn]
@ -2340,7 +2340,7 @@ BGEffect_CheckBattleTurn: ; c8cc2 (32:4cc2)
xor [hl]
ret
BGEffect_CheckFlyDigStatus: ; c8ccc (32:4ccc)
BGEffect_CheckFlyDigStatus:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ldh a, [hBattleTurn]
@ -2356,18 +2356,18 @@ BGEffect_CheckFlyDigStatus: ; c8ccc (32:4ccc)
bit 6, a
ret
BattleBGEffects_CheckSGB: ; c8ce3 (32:4ce3)
BattleBGEffects_CheckSGB:
ld a, [wSGB]
and a
ret
BattleBGEffects_Sine: ; c8ce8 (32:4ce8)
BattleBGEffects_Sine:
ld e, a
callab BattleAnim_Sine_e
ld a, e
ret
BattleBGEffects_Cosine: ; c8cf3 (32:4cf3)
BattleBGEffects_Cosine:
ld e, a
callab BattleAnim_Cosine_e
ld a, e

4
engine/bcd.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/bcd.asm", ROMX
AddBCD: ; 03:4de3
AddBCD:
and a
ld b, c
.add
@ -29,7 +29,7 @@ AddBCD: ; 03:4de3
ret
SubBCD: ; 03:4df9
SubBCD:
and a
ld b, c
.sub

568
engine/dumps/bank01.asm
View File

File diff suppressed because it is too large Load Diff

450
engine/dumps/bank02.asm
View File

File diff suppressed because it is too large Load Diff

640
engine/dumps/bank03.asm
View File

File diff suppressed because it is too large Load Diff

98
engine/events/field_moves.asm
View File

@ -5,7 +5,7 @@ INCLUDE "constants.asm"
SECTION "engine/events/field_moves.asm", ROMX
CutFunction: ; 03:4fab
CutFunction:
call .ResetScriptID
.next
call .ExecScript
@ -21,7 +21,7 @@ CutFunction: ; 03:4fab
ld hl, .CutScriptTable
jp CallJumptable
.CutScriptTable ; 03:4fc5
.CutScriptTable
init_script_table
add_script TryCut
add_script CheckCuttableBlock
@ -30,7 +30,7 @@ CutFunction: ; 03:4fab
add_script DoCut2
add_script FailCut
TryCut: ; 03:4fd1
TryCut:
call GetMapEnvironment
cp ROUTE
jr z, .success
@ -44,7 +44,7 @@ TryCut: ; 03:4fd1
xor a
ret
CheckCuttableBlock: ; 03:4fea
CheckCuttableBlock:
call GetFacingTileCoord
cp $80
jr nz, .fail
@ -67,7 +67,7 @@ CheckCuttableBlock: ; 03:4fea
xor a
ret
GetCutReplacementBlock: ; 03:5015
GetCutReplacementBlock:
ld c, a
ld hl, CutReplacementBlocks
.loop
@ -80,7 +80,7 @@ GetCutReplacementBlock: ; 03:5015
scf
ret
CutReplacementBlocks: ; 03:5023
CutReplacementBlocks:
; replacement block, facing block
db $30, $25
db $31, $2A
@ -88,7 +88,7 @@ CutReplacementBlocks: ; 03:5023
db $33, $35
db -1
CheckCuttableTile: ; 03:502c
CheckCuttableTile:
call GetFacingTileCoord
call IsCuttableTile
jr nc, .fail
@ -110,7 +110,7 @@ CheckCuttableTile: ; 03:502c
xor a
ret
IsCuttableTile: ; 03:5057
IsCuttableTile:
ld hl, CuttableTiles
ld c, a
.loop
@ -122,32 +122,32 @@ IsCuttableTile: ; 03:5057
scf
ret
CuttableTiles: ; 03:5064
CuttableTiles:
db $81
db $82
db $8A
db $8B
db -1
FailCut: ; 03:5069
FailCut:
ld hl, Text_CantUseCutHere
call MenuTextBoxBackup
scf
ld a, SCRIPT_FAIL
ret
Text_CantUseCutHere: ; 03:5073
Text_CantUseCutHere:
text "ここでは　つかえません"
prompt
DoCut:
DoCut2: ; 03:5080
DoCut2:
far_queue CutScript
scf
ld a, SCRIPT_SUCCESS
ret
CutScript: ; 03:508C
CutScript:
call RefreshScreen
ld hl, wPartyMonNicknames
ld a, BOXMON
@ -172,13 +172,13 @@ CutScript: ; 03:508C
scf
ret
Text_CutItDown: ; 03:50c4
Text_CutItDown:
text_from_ram wStringBuffer2
text "　は　"
line "くさかりを　つかった！"
prompt
SurfFunction: ; 03:50d8
SurfFunction:
call .ResetScriptID
.next
call .ExecScript
@ -194,13 +194,13 @@ SurfFunction: ; 03:50d8
ld hl, .SurfScriptTable
jp CallJumptable
.SurfScriptTable: ; 03:50f2
.SurfScriptTable:
init_script_table
add_script TrySurf
add_script DoSurf
add_script FailSurf
TrySurf: ; 03:50f8
TrySurf:
call GetFacingTileCoord
and $f0
cp $20
@ -215,7 +215,7 @@ TrySurf: ; 03:50f8
xor a
ret
DoSurf: ; 03:5113
DoSurf:
queue_ba SurfScript
ld a, -1
ld [wFieldMoveScriptID], a
@ -223,7 +223,7 @@ DoSurf: ; 03:5113
ld a, SCRIPT_SUCCESS
ret
FailSurf: ; 03:5124
FailSurf:
ld hl, Text_CantSurfHere
call MenuTextBoxBackup
ld a, -1
@ -232,12 +232,12 @@ FailSurf: ; 03:5124
ld a, SCRIPT_FAIL
ret
Text_CantSurfHere: ; 03:5133
Text_CantSurfHere:
text "ここでは　のることが"
next "できません"
prompt
SurfScript: ; 03:5145
SurfScript:
call RefreshScreen
ld hl, wPartyMonNicknames
ld a, BOXMON
@ -255,7 +255,7 @@ SurfScript: ; 03:5145
call Function1fea
ret
Text_UsedSurf: ; 03:5171
Text_UsedSurf:
text_from_ram wStringBuffer2
text "　は　"
line "@"
@ -263,7 +263,7 @@ Text_UsedSurf: ; 03:5171
text "を　のせた！"
prompt
MovePlayerIntoWater: ; 03:5185
MovePlayerIntoWater:
call InitMovementBuffer
call .get_movement_direction
call AppendToMovementBuffer
@ -284,11 +284,11 @@ MovePlayerIntoWater: ; 03:5185
ret
; Direction to move player, mapped to facing direction
SurfMovementDirections: ; 03:51ab
SurfMovementDirections:
db 4, 5, 6, 7
FlyFunction: ; 03:51af
FlyFunction:
call .ResetScriptID
.next
call .ExecScript
@ -304,14 +304,14 @@ FlyFunction: ; 03:51af
ld hl, .FlyScriptTable
jp CallJumptable
.FlyScriptTable: ; 03:51c9
.FlyScriptTable:
init_script_table
add_script TryFly
add_script ShowFlyMap
add_script DoFly
add_script FailFly
TryFly: ; 03:51d1
TryFly:
call GetMapEnvironment
cp TOWN
jr z, .success
@ -325,7 +325,7 @@ TryFly: ; 03:51d1
xor a
ret
ShowFlyMap: ; 03:51ea
ShowFlyMap:
call LoadStandardMenuHeader
call ClearSprites
callab FlyMap
@ -348,7 +348,7 @@ ShowFlyMap: ; 03:51ea
ld a, SCRIPT_FAIL
ret
DoFly: ; 03:521f
DoFly:
ld a, [wFlyDestination]
inc a
ld [wDefaultSpawnPoint], a
@ -359,7 +359,7 @@ DoFly: ; 03:521f
ld a, SCRIPT_SUCCESS
ret
FailFly: ; 03:5237
FailFly:
ld hl, Text_CantUseFlyHere
call MenuTextBoxBackup
ld a, -1
@ -368,17 +368,17 @@ FailFly: ; 03:5237
ld a, SCRIPT_FAIL
ret
Text_CantUseFlyHere: ; 03:5246
Text_CantUseFlyHere:
text "ここでは　つかえません！"
prompt
FlyScript: ; 03:5254
FlyScript:
ld a, MAPSETUP_TELEPORT
ldh [hMapEntryMethod], a
jpab Functionfcc24
DigFunction: ; 03:5260
DigFunction:
call .ResetScriptID
.next
ld a, [wFieldMoveScriptID]
@ -399,13 +399,13 @@ DigFunction: ; 03:5260
ld [wFieldMoveScriptID], a
ret
.DigScriptTable: ; 03:527D
.DigScriptTable:
init_script_table
add_script CheckCanDig
add_script DoDig
add_script FailDig
CheckCanDig: ; 03:5283
CheckCanDig:
call GetMapEnvironment
cp INDOOR
jr z, .success
@ -417,24 +417,24 @@ CheckCanDig: ; 03:5283
set_script DoDig
ret
DoDig: ; 03:529a
DoDig:
queue_ab DigScript
ld a, SCRIPT_FINISHED_MASK | SCRIPT_SUCCESS
ld [wFieldMoveScriptID], a
ret
FailDig: ; 03:52a8
FailDig:
ld hl, Text_CantUseDigHere
call MenuTextBoxBackup
ld a, SCRIPT_FINISHED_MASK | SCRIPT_FAIL
ld [wFieldMoveScriptID], a
ret
Text_CantUseDigHere: ; 03:52b4
Text_CantUseDigHere:
text "ここでは　つかえません！"
prompt
DigScript: ; 03:52c2
DigScript:
ld hl, wDigWarpNumber
ld de, wNextWarp
ld bc, 3
@ -443,10 +443,10 @@ DigScript: ; 03:52c2
ldh [hMapEntryMethod], a
jpab Functionfcc24
EmptyFunctiond2da: ; 03:52da
EmptyFunctiond2da:
ret
TeleportFunction: ; 03:52db
TeleportFunction:
xor a
ld [wFieldMoveScriptID], a
.next
@ -470,7 +470,7 @@ TeleportFunction: ; 03:52db
add_script FailTeleport
add_script CheckIfSpawnPoint
TryTeleport: ; 03:52fc
TryTeleport:
call GetMapEnvironment
cp TOWN
jr z, .success
@ -482,7 +482,7 @@ TryTeleport: ; 03:52fc
set_script CheckIfSpawnPoint
ret
CheckIfSpawnPoint: ; 03:5313
CheckIfSpawnPoint:
ld a, [wLastSpawnMapGroup]
ld d, a
ld a, [wLastSpawnMapNumber]
@ -500,18 +500,18 @@ CheckIfSpawnPoint: ; 03:5313
set_script DoTeleport
ret
Text_CantFindDestination: ; 03:533B
Text_CantFindDestination:
text "とびさきが　みつかりません"
para ""
done
DoTeleport: ; 03:534b
DoTeleport:
queue_ba TeleportScript
ld a, SCRIPT_FINISHED_MASK | SCRIPT_SUCCESS
ld [wFieldMoveScriptID], a
ret
FailTeleport: ; 03:5359
FailTeleport:
ld hl, Text_CantUseTeleportHere
call MenuTextBoxBackup
ld a, SCRIPT_FINISHED_MASK | SCRIPT_FAIL
@ -519,12 +519,12 @@ FailTeleport: ; 03:5359
scf
ret
Text_CantUseTeleportHere: ; 03:5366
Text_CantUseTeleportHere:
text "ここでは　つかえません！"
para ""
done
TeleportScript: ; 03:5375
TeleportScript:
call RefreshScreen
ld hl, Text_ReturnToLastMonCenter
call MenuTextBox
@ -536,7 +536,7 @@ TeleportScript: ; 03:5375
ldh [hMapEntryMethod], a
jpab Functionfcc24
Text_ReturnToLastMonCenter: ; 03:5395
Text_ReturnToLastMonCenter:
text "さいごに　たちよった"
line "#センターにもどります"
done

22
engine/gfx.asm
View File

@ -2,12 +2,12 @@ INCLUDE "constants.asm"
SECTION "engine/gfx.asm", ROMX
LoadFontGraphics:: ; f8000 (3e:4000)
LoadFontGraphics::
ld de, FontGFX
ld hl, $8800
lb bc, BANK(FontGFX), ((FontGFXEnd - FontGFX) / LEN_1BPP_TILE)
jp Get1bpp
LoadFontExtraGraphicsWithCursor:: ; f800c (3e:400c)
LoadFontExtraGraphicsWithCursor::
ld de, FontExtraCDEFGHIVSLM_GFX
ld hl, $9620
lb bc, BANK(FontExtraCDEFGHIVSLM_GFX), ((FontSmallKanaPunctuationGFXEnd - FontExtraCDEFGHIVSLM_GFX) / LEN_2BPP_TILE)
@ -17,13 +17,13 @@ LoadFontExtraGraphicsWithCursor:: ; f800c (3e:400c)
lb bc, BANK(BlackTileAndCursor1bppGFX), ((BlackTileAndCursor1bppGFXEnd - BlackTileAndCursor1bppGFX) / LEN_1BPP_TILE)
call Get1bpp
jr LoadActiveFrameGraphics
LoadPokemonMenuGraphics:: ; f8026 (3e:4026)
LoadPokemonMenuGraphics::
ld de, BattleHPBarGFX
ld hl, $9600
lb bc, BANK(BattleHPBarGFX), ((LevelUpGFXEnd - BattleHPBarGFX) / LEN_2BPP_TILE)
call Get2bpp
jr LoadActiveFrameGraphics
LoadToolgearGraphicsDebug:: ; f8034 (3e:4034)
LoadToolgearGraphicsDebug::
call LoadActiveFrameGraphics
ld hl, $d153
bit 0, [hl]
@ -37,7 +37,7 @@ LoadToolgearGraphicsDebug:: ; f8034 (3e:4034)
lb bc, BANK(FontExtraAB_GFX), ("Ｆ" - "Ａ" + 1)
call Get2bpp
ret
.loadToolgearGraphics:: ; f8057 (3e:4057)
.loadToolgearGraphics::
ld hl, $9660
ld de, FontGFX + (("０" - "ア") * $08)
lb bc, BANK(FontGFX), ("９" - "０" + 1)
@ -51,7 +51,7 @@ LoadToolgearGraphicsDebug:: ; f8034 (3e:4034)
lb bc, BANK(HUD_GFX), ((HUD_GFXEnd - HUD_GFX) / LEN_2BPP_TILE)
call Get2bpp
ret
LoadActiveFrameGraphics:: ; f807c (3e:407c)
LoadActiveFrameGraphics::
ld a, [wActiveFrame]
ld bc, (FrameGFXFirstFrameEnd - FrameGFXFirstFrame)
ld hl, FrameGFX
@ -66,7 +66,7 @@ LoadActiveFrameGraphics:: ; f807c (3e:407c)
lb bc, BANK(EmptyTile1bppGFX), ((EmptyTile1bppGFXEnd - EmptyTile1bppGFX) / LEN_1BPP_TILE)
call Get1bpp
ret
LoadPokeDexGraphics:: ; f80a0 (3e:40a0)
LoadPokeDexGraphics::
call LoadPokemonMenuGraphics
ld de, PokedexGFX
ld hl, $9600
@ -76,7 +76,7 @@ LoadPokeDexGraphics:: ; f80a0 (3e:40a0)
ld hl, $9720
lb bc, BANK(PokeBallsGFX), 1 ; 1 of 4 tiles
jp Get2bpp
LoadBattleGraphics:: ; f80bb (3e:40bb)
LoadBattleGraphics::
ld de, BattleHPBarGFX
ld hl, $9600
lb bc, BANK(BattleHPBarGFX), ((BattleHPBarGFXEnd - BattleHPBarGFX) / LEN_2BPP_TILE)
@ -99,7 +99,7 @@ LoadBattleGraphics:: ; f80bb (3e:40bb)
lb bc, BANK(ExpBarGFX), ((ExpBarGFXEnd - ExpBarGFX) / LEN_2BPP_TILE)
call Get2bpp
ret
LoadPokemonStatsGraphics:: ; f80fb (3e:40fb)
LoadPokemonStatsGraphics::
call LoadPokemonMenuGraphics
ld de, HpExpBarParts0GFX
ld hl, $96c0
@ -117,13 +117,13 @@ LoadPokemonStatsGraphics:: ; f80fb (3e:40fb)
ld hl, $9550
lb bc, BANK(ExpBarGFX), ((ExpBarGFXEnd - ExpBarGFX) / LEN_2BPP_TILE)
call Get2bpp
LoadOnlyPokemonStatsGraphics:: ; 3E:412E
LoadOnlyPokemonStatsGraphics::
ld de, StatsGFX
ld hl, $9310
lb bc, BANK(StatsGFX), ((StatsGFXEnd - StatsGFX) / LEN_2BPP_TILE)
call Get2bpp
ret
LoadBackpackGraphics:: ; f813b (3e:413b)
LoadBackpackGraphics::
ld de, BlackTileAndCursor1bppGFX
ld hl, $9600
lb bc, BANK(BlackTileAndCursor1bppGFX), ((BlackTileAndCursor1bppGFXEnd - BlackTileAndCursor1bppGFX) / LEN_1BPP_TILE)

108
engine/intro.asm
View File

@ -2,7 +2,7 @@ include "constants.asm"
SECTION "engine/intro.asm", ROMX
DemoStart:: ; 558D
DemoStart::
ld de, OakPic
lb bc, BANK(OakPic), $00
call IntroDisplayPicCenteredOrUpperRight
@ -20,7 +20,7 @@ DemoStart:: ; 558D
call DemoSetUpPlayer
jp IntroCleanup
GameStart:: ; 55BB
GameStart::
ld de, OakPic
lb bc, BANK(OakPic), $00
call IntroDisplayPicCenteredOrUpperRight
@ -95,7 +95,7 @@ GameStart:: ; 55BB
ld c, $04
call DelayFrames
IntroCleanup:: ; 568E
IntroCleanup::
ld de, ShrinkPic1
lb bc, BANK(ShrinkPic1), $00
call IntroDisplayPicCenteredOrUpperRight
@ -132,7 +132,7 @@ OverworldStart::
set 0, [hl]
jp Function2a85
SetUpGameEntry:: ; 56E8
SetUpGameEntry::
ld a, $04
ld [wd65e], a
ld a, $F2
@ -150,7 +150,7 @@ SetUpGameEntry:: ; 56E8
call CopyBytes
ret
GameStartPlacement:: ; 570D
GameStartPlacement::
db $01 ; map group
db MAP_PLAYER_HOUSE_2F ; map
dwcoord 15, 45 ; screen anchor
@ -159,7 +159,7 @@ GameStartPlacement:: ; 570D
db $00 ; in-metatile x
db $01 ; in-metatile y
DebugSetUpPlayer:: ; 5715
DebugSetUpPlayer::
call SetPlayerNamesDebug
ld a, $0F
ld [wd15d], a
@ -185,7 +185,7 @@ DebugSetUpPlayer:: ; 5715
call Function40fd
ret
DebugFillPokedex:: ; 5755
DebugFillPokedex::
ld b, $1F
ld a, $FF
.loop
@ -195,7 +195,7 @@ DebugFillPokedex:: ; 5755
ld [hl], $07
ret
FillBagWithList:: ; 5760
FillBagWithList::
ld hl, wNumBagItems
.loop
ld a, [de]
@ -211,7 +211,7 @@ FillBagWithList:: ; 5760
.yump
ret
DebugBagItems:: ; 5777
DebugBagItems::
db ITEM_IMPORTANT_BAG, $01
db ITEM_BAG, $01
db ITEM_TM_HOLDER, $01
@ -234,7 +234,7 @@ DebugBagItems:: ; 5777
db ITEM_DETECT_ORB, $63
db $FF
GiveRandomPokemon:: ; 57A0
GiveRandomPokemon::
and a
ret z
.loop
@ -247,7 +247,7 @@ GiveRandomPokemon:: ; 57A0
jr nz, .loop
ret
GiveRandomJohto:: ; 57B0
GiveRandomJohto::
.loop
call Random
and $03
@ -263,7 +263,7 @@ GiveRandomJohto:: ; 57B0
ld [wPartyMon1 + 1], a
ret
GiveKantoStarters:: ; 57C8
GiveKantoStarters::
ld a, $03
ld b, $20
call GivePokemon
@ -275,7 +275,7 @@ GiveKantoStarters:: ; 57C8
call GivePokemon
ret
GivePokemon:: ; 57DE
GivePokemon::
ld [wMonDexIndex], a
ld a, b
ld [wCurPartyLevel], a
@ -283,7 +283,7 @@ GivePokemon:: ; 57DE
call Predef
ret
AddRandomPokemonToBox: ; 57EB
AddRandomPokemonToBox:
and a
ret z
.loop
@ -303,7 +303,7 @@ AddRandomPokemonToBox: ; 57EB
jr nz, .loop
ret
RandomUnder246:: ; 5818
RandomUnder246::
.loop
call Random
and a
@ -312,7 +312,7 @@ RandomUnder246:: ; 5818
jr nc, .loop
ret
FillTMs:: ; 5823
FillTMs::
ld b, $39
ld a, $01
ld hl, wTMsHMs
@ -322,7 +322,7 @@ FillTMs:: ; 5823
jr nz, .loop
ret
DebugGiveKeyItems:: ; 582F
DebugGiveKeyItems::
ld hl, DebugKeyItemsList
ld de, wKeyItems
ld c, $FF
@ -337,14 +337,14 @@ DebugGiveKeyItems:: ; 582F
ld [wNumKeyItems], a
ret
DebugKeyItemsList:: ; 5844
DebugKeyItemsList::
db ITEM_TM_HOLDER
db ITEM_BALL_HOLDER
db ITEM_BAG
db ITEM_BICYCLE
db $FF
DemoSetUpPlayer:: ; 5849
DemoSetUpPlayer::
ld hl, wPlayerName
ld de, DemoPlayerName
call CopyString
@ -357,7 +357,7 @@ DemoSetUpPlayer:: ; 5849
call GiveRandomJohto
ret
DemoItemList:: ; 5868
DemoItemList::
db ITEM_POKE_BALL, $05
db ITEM_POTION, $0A
db ITEM_FULL_HEAL, $0A
@ -365,13 +365,13 @@ DemoItemList:: ; 5868
db ITEM_FOCUS_ORB, $01
db $FF
DemoPlayerName:: ; 5873
DemoPlayerName::
db "サトシ@"
DemoRivalName:: ; 5877
DemoRivalName::
db "シゲル@"
OakSpeechDemo:: ; 587B
OakSpeechDemo::
text "ようこそ"
line "ポケット　モンスターの　せかいへ！"
cont "ごぞんじ　わしが　オーキドじゃ！"
@ -396,7 +396,7 @@ OakSpeechDemo:: ; 587B
para "まけないよう　がんばって　くれい！"
prompt
OakSpeech1:: ; 5956
OakSpeech1::
text "いやあ　またせた！"
para "ポケット　モンスターの　せかいへ"
@ -408,7 +408,7 @@ OakSpeech1:: ; 5956
line "したわれて　おるよ"
prompt
OakSpeech2:: ; 599F
OakSpeech2::
text "きみも　もちろん"
line "しっているとは　おもうが"
@ -418,7 +418,7 @@ OakSpeech2:: ; 599F
cont "いたるところに　すんでいる！"
prompt
OakSpeech3:: ; 59E8
OakSpeech3::
text "その　#　という　いきものを"
line "ひとは　ぺットに　したり"
cont "しょうぶに　つかったり"
@ -428,12 +428,12 @@ OakSpeech3:: ; 59E8
line "けんきゅうを　してる　というわけだ"
prompt
OakSpeech4:: ; 5A35
OakSpeech4::
text "では　はじめに　きみの　なまえを"
line "おしえて　もらおう！"
prompt
OakSpeech5:: ; 5A52
OakSpeech5::
text "そして　この　しょうねんは"
line "きみの　おさななじみであり"
cont"ライバルである"
@ -442,7 +442,7 @@ OakSpeech5:: ; 5A52
line "なまえは　なんて　いったかな？"
prompt
OakSpeech6:: ; 5A8F
OakSpeech6::
text "さて　きみの　きねんすべき"
line "たびだちのひを"
cont "きろくしておこう！"
@ -450,7 +450,7 @@ OakSpeech6:: ; 5A8F
para "じかんも　なるべく　せいかくにな！"
prompt
OakSpeech7:: ; 5AC2
OakSpeech7::
text "<PLAYER>！"
para "いよいよ　これから"
@ -462,7 +462,7 @@ OakSpeech7:: ; 5AC2
para "レッツ　ゴー！"
done
SetPlayerNamesDebug:: ; 5B07
SetPlayerNamesDebug::
ld hl, DebugPlayerName
ld de, wPlayerName
call CopyNameDebug
@ -474,13 +474,13 @@ CopyNameDebug:
call CopyBytes
ret
DebugPlayerName: ; 5B1D
DebugPlayerName:
db "コージ@"
DebugRivalName: ; 5B21
DebugRivalName:
db "レッド@"
ChoosePlayerName:: ; 5B25
ChoosePlayerName::
call PanPortraitRight
ld hl, PlayerNameMenuHeader
call NamingWindow
@ -512,18 +512,18 @@ ChoosePlayerName:: ; 5B25
call PrintText
ret
ChoosePlayerNameEndText: ; 5B6F
ChoosePlayerNameEndText:
text "ふむ・・・"
line "<PLAYER>　と　いうんだな！"
prompt
PlayerNameMenuHeader: ; 5B81
PlayerNameMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 00, 00, 10, 11
dw PlayerNameMenuData
db 01 ; initial selection
PlayerNameMenuData: ; 5B89
PlayerNameMenuData:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
db 04 ; items
db "じぶんできめる@"
@ -533,7 +533,7 @@ PlayerNameMenuData: ; 5B89
db 3 ; x offset for the title string
db "なまえこうほ@"
ChooseRivalName:: ; 5BA9
ChooseRivalName::
call PanPortraitRight
ld hl, RivalNameMenuHeader
call NamingWindow
@ -565,18 +565,18 @@ ChooseRivalName:: ; 5BA9
call PrintText
ret
ChooseRivalNameEndText: ; 5BF3
ChooseRivalNameEndText:
text "そうか　そうだったな"
line "<RIVAL>　という　なまえだ"
prompt
RivalNameMenuHeader: ; 5C0A
RivalNameMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 00, 00, 10, 11
dw RivalNameMenuData
db 01 ; initial selection
RivalNameMenuData: ; 5C12
RivalNameMenuData:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
db 04 ; items
db "じぶんできめる@"
@ -586,7 +586,7 @@ RivalNameMenuData: ; 5C12
db 3
db "なまえこうほ@"
MomNamePrompt:: ; 5C31
MomNamePrompt::
ld hl, MomNameMenuHeader
call NamingWindow
ld a, [wMenuCursorY]
@ -613,13 +613,13 @@ MomNamePrompt:: ; 5C31
.escape
ret
MomNameMenuHeader: ; 5C71
MomNameMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 00, 00, 10, 11
dw .MomNameMenuData
db 01 ; initial selection
.MomNameMenuData: ; 5C79
.MomNameMenuData:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B
db 04 ; items
db "じぶんで　きめる@"
@ -629,7 +629,7 @@ MomNameMenuHeader: ; 5C71
db 3
db "なまえこうほ@"
NamingWindow:: ; 5C9B
NamingWindow::
; loads the menu header put into hl
call LoadMenuHeader
call VerticalMenu
@ -639,13 +639,13 @@ NamingWindow:: ; 5C9B
call CloseWindow
ret
SaveCustomName:: ; 5CAC
SaveCustomName::
ld hl, wStringBuffer2
ld bc, PLAYER_NAME_LENGTH
call CopyBytes
ret
PanPortraitRight:: ; 5CB6
PanPortraitRight::
hlcoord 5, 4
ld d, $06
ld e, $7E
@ -674,7 +674,7 @@ PanPortraitRight:: ; 5CB6
jr nz, .loop
ret
PanPortraitLeft:: ; 5CD7
PanPortraitLeft::
hlcoord 12, 4
ld b, $06
ld c, $7E
@ -698,11 +698,11 @@ PanPortraitLeft:: ; 5CD7
jr nz, .loop
ret
MenuCallSettings:: ; 5CF3
MenuCallSettings::
call SettingsScreen
ret
FadeInIntroPic: ; 5CF7
FadeInIntroPic:
ld hl, IntroFadePalettes
ld b, 6
.next
@ -722,7 +722,7 @@ IntroFadePalettes:
db %11110100
db %11100100
MovePicLeft: ; 5D0E
MovePicLeft:
ld a, 119
ldh [hWX], a
call DelayFrame
@ -738,7 +738,7 @@ MovePicLeft: ; 5D0E
ldh [hWX], a
jr .next
IntroDisplayPicCenteredOrUpperRight:: ; 5D27
IntroDisplayPicCenteredOrUpperRight::
; b = bank
; de = address of compressed pic
; c: 0 = centred, non-zero = upper-right
@ -767,7 +767,7 @@ IntroDisplayPicCenteredOrUpperRight:: ; 5D27
predef PlaceGraphic
ret
LoadStartingSprites: ; 5D5D
LoadStartingSprites:
ld de, GoldSpriteGFX
lb bc, BANK(GoldSpriteGFX), $0C
ld hl, VRAM_Begin
@ -791,7 +791,7 @@ LoadStartingSprites: ; 5D5D
jr nz, .loop
ret
GameStartSprites: ; 5D80
GameStartSprites:
db $50, $48, $00
db $50, $50, $01
db $58, $48, $02

100
engine/items/inventory.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/items/inventory.asm@Inventory", ROMX
_ReceiveItem: ; 03:4AA1
_ReceiveItem:
call DoesHLEqualwNumBagItems
jp nz, PutItemInPocket
push hl
@ -12,28 +12,28 @@ _ReceiveItem: ; 03:4AA1
ld hl, .Pockets
jp CallJumptable
.Pockets: ; 03:4ABA
.Pockets:
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Item: ; 03:4AC2
.Item:
pop hl
jp PutItemInPocket
.KeyItem: ; 03:4AC6
.KeyItem:
pop hl
jp ReceiveKeyItem
.Ball: ; 03:4ACA
.Ball:
pop hl
ld a, [wCurItem]
ld c, a
call GetBallIndex
jp ReceiveBall
.TMHM: ; 03:4AD5
.TMHM:
pop hl
ld a, [wCurItem]
ld c, a
@ -41,7 +41,7 @@ _ReceiveItem: ; 03:4AA1
jp ReceiveTMHM
_TossItem: ; 03:4AE0
_TossItem:
call DoesHLEqualwNumBagItems
jr nz, .remove_item
push hl
@ -51,38 +51,38 @@ _TossItem: ; 03:4AE0
ld hl, .Pockets
jp CallJumptable
.Pockets ; 03:4AF8
.Pockets
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Ball ; 03:4B00
.Ball
pop hl
ld a, [wCurItem]
ld c, a
call GetBallIndex
jp TossBall
.TMHM ; 03:4B0B
.TMHM
pop hl
ld a, [wCurItem]
ld c, a
call GetTMHMNumber
jp TossTMHM
.KeyItem ; 03:4B16
.KeyItem
pop hl
jp TossKeyItem
.Item ; 03:4B1A
.Item
pop hl
.remove_item ; 03:4B1B
.remove_item
jp RemoveItemFromPocket
_CheckItem: ; 03:4B1E
_CheckItem:
call DoesHLEqualwNumBagItems
jr nz, .not_bag
push hl
@ -92,38 +92,38 @@ _CheckItem: ; 03:4B1E
ld hl, .Pockets
jp CallJumptable
.Pockets ; 03:4B36
.Pockets
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Ball ; 03:4B3E
.Ball
pop hl
ld a, [wCurItem]
ld c, a
call GetBallIndex
jp CheckBall
.TMHM ; 03:4B49
.TMHM
pop hl
ld a, [wCurItem]
ld c, a
call GetTMHMNumber
jp CheckTMHM
.KeyItem ; 03:4B54
.KeyItem
pop hl
jp CheckKeyItems
.Item ; 03:4B58
.Item
pop hl
.not_bag
jp CheckTheItem
DoesHLEqualwNumBagItems: ; 03:4B5C
DoesHLEqualwNumBagItems:
ld a, l
cp LOW(wNumBagItems)
ret nz
@ -132,7 +132,7 @@ DoesHLEqualwNumBagItems: ; 03:4B5C
ret
PutItemInPocket: ; 03:4B64
PutItemInPocket:
ld d, h
ld e, l
inc hl
@ -217,7 +217,7 @@ PutItemInPocket: ; 03:4B64
ret
GetPocketCapacity: ; 03:4BC1
GetPocketCapacity:
ld c, MAX_ITEMS
ld a, e
cp a, LOW(wNumBagItems)
@ -231,7 +231,7 @@ GetPocketCapacity: ; 03:4BC1
ret
RemoveItemFromPocket: ;03:4BCF
RemoveItemFromPocket:
ld d, h
ld e, l
inc hl
@ -280,7 +280,7 @@ RemoveItemFromPocket: ;03:4BCF
ret
CheckTheItem: ; 03:4BFD
CheckTheItem:
ld a, [wCurItem]
ld c, a
@ -300,7 +300,7 @@ CheckTheItem: ; 03:4BFD
ret
ReceiveKeyItem: ; 03:4C0E
ReceiveKeyItem:
ld hl, wNumKeyItems
ld a, [hli]
cp a, MAX_KEY_ITEMS
@ -321,7 +321,7 @@ ReceiveKeyItem: ; 03:4C0E
ret
TossKeyItem: ; 03:4C28
TossKeyItem:
ld hl, wNumKeyItems
dec [hl]
inc hl
@ -345,7 +345,7 @@ TossKeyItem: ; 03:4C28
ret
CheckKeyItems: ; 03:4C40
CheckKeyItems:
ld a, [wCurItem]
ld c, a
ld hl, wKeyItems
@ -366,7 +366,7 @@ CheckKeyItems: ; 03:4C40
; get index of ball item id c from BallItems
GetBallIndex: ; 03:4C53
GetBallIndex:
ld a, c
push hl
push de
@ -383,7 +383,7 @@ GetBallIndex: ; 03:4C53
; get ball item id at index c in BallItems
GetBallByIndex: ; 03:4c66
GetBallByIndex:
push bc
push hl
ld b, 0
@ -396,7 +396,7 @@ GetBallByIndex: ; 03:4c66
ret
BallItems: ; 03:4C73
BallItems:
db ITEM_MASTER_BALL
db ITEM_ULTRA_BALL
db ITEM_GREAT_BALL
@ -409,7 +409,7 @@ BallItems: ; 03:4C73
; Note, the ball pocket appears to be
; a fixed length, not -1 terminated
EmptyBallPocket: ; 03:4C78
EmptyBallPocket:
ld hl, wNumBallItems
xor a
ld [hli], a
@ -417,7 +417,7 @@ EmptyBallPocket: ; 03:4C78
ret
ReceiveBall: ; 03:4C80
ReceiveBall:
ld hl, wBallQuantities
ld b, 0
add hl, bc
@ -446,7 +446,7 @@ ReceiveBall: ; 03:4C80
ret
TossBall: ; 03:4C9F
TossBall:
ld hl, wBallQuantities
ld b, 0
add hl, bc
@ -476,7 +476,7 @@ TossBall: ; 03:4C9F
ret
CheckBall: ; 03:4CC0
CheckBall:
ld hl, wBallQuantities
ld b, 0
add hl, bc
@ -487,7 +487,7 @@ CheckBall: ; 03:4CC0
ret
ReceiveTMHM: ; 03:4CCB
ReceiveTMHM:
ld b, 0
ld hl, wTMsHMs
add hl, bc
@ -504,7 +504,7 @@ ReceiveTMHM: ; 03:4CCB
ret
TossTMHM: ; 03:4CDE
TossTMHM:
ld b, 0
ld hl, wTMsHMs
add hl, bc
@ -524,7 +524,7 @@ TossTMHM: ; 03:4CDE
ret
CheckTMHM: ; 03:4CF4
CheckTMHM:
ld b, 0
ld hl, wTMsHMs
add hl, bc
@ -534,7 +534,7 @@ CheckTMHM: ; 03:4CF4
scf
ret
GetTMHMNumber: ; 03:4CFF
GetTMHMNumber:
ld a, c
ld c, 0
@ -565,7 +565,7 @@ GetTMHMNumber: ; 03:4CFF
and a
ret
GetNumberedTMHM: ; 03:4D1A
GetNumberedTMHM:
; Return the item id of a TM/HM by number c.
ld a, c
ld c, 0
@ -592,7 +592,7 @@ SECTION "engine/items/inventory.asm@GetItemAmount", ROMX
; Returns carry if user has the item
; and the amount in b
GetItemAmount: ; 03:4e10
GetItemAmount:
call CheckAmountInItemPocket
ret c
call CheckAmountInKeyItems
@ -602,7 +602,7 @@ GetItemAmount: ; 03:4e10
ret
; Returns the amount of item b in b
CheckAmountInItemPocket: ; 03:4E1C
CheckAmountInItemPocket:
ld hl, wItems
.loop
inc hl
@ -618,7 +618,7 @@ CheckAmountInItemPocket: ; 03:4E1C
ret
; Returns the amount of item b in b
CheckAmountInKeyItems: ; 03:4E2B
CheckAmountInKeyItems:
ld hl, wNumKeyItems
ld a, [hli]
and a
@ -638,7 +638,7 @@ SECTION "engine/items/inventory.asm@_CheckTossableItem", ROMX
; Return 1 in wItemAttributeParamBuffer and
; carry if wCurItem can't be removed from the bag.
_CheckTossableItem: ; 03:53AD
_CheckTossableItem:
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
bit CANT_TOSS_F, a
@ -648,7 +648,7 @@ _CheckTossableItem: ; 03:53AD
; Return 1 in wItemAttributeParamBuffer
; and carry if wCurItem can't be selected.
CheckSelectableItem: ; 03:53B8
CheckSelectableItem:
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
bit CANT_SELECT_F, a
@ -657,7 +657,7 @@ CheckSelectableItem: ; 03:53B8
ret
; Return the pocket for wCurItem in wItemAttributeParamBuffer.
CheckItemPocket: ; 03:53C3
CheckItemPocket:
ld a, ITEMATTR_POCKET
call GetItemAttr
and $f
@ -665,7 +665,7 @@ CheckItemPocket: ; 03:53C3
ret
; Return the context for wCurItem in wItemAttributeParamBuffer.
CheckItemContext: ; 03:53CE
CheckItemContext:
ld a, ITEMATTR_HELP
call GetItemAttr
and $f
@ -673,7 +673,7 @@ CheckItemContext: ; 03:53CE
ret
; Return the menu for wCurItem in wItemAttributeParamBuffer.
CheckItemMenu: ; 03:53D9
CheckItemMenu:
ld a, ITEMATTR_HELP
call GetItemAttr
swap a
@ -682,7 +682,7 @@ CheckItemMenu: ; 03:53D9
ret
; Get attribute a of wCurItem.
GetItemAttr: ; 03:53E6
GetItemAttr:
push hl
push bc
ld hl, ItemAttributes
@ -702,14 +702,14 @@ GetItemAttr: ; 03:53E6
pop hl
ret
ItemAttr_ReturnCarry: ; 03:5405
ItemAttr_ReturnCarry:
ld a, 1
ld [wItemAttributeParamBuffer], a
scf
ret
; Return the price of wCurItem in de.
GetItemPrice: ; 03:540C
GetItemPrice:
push hl
push bc
ld a, ITEMATTR_PRICE

4
engine/items/item_effects.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/items/item_effects.asm", ROMX
ApplyPPUp: ; 03:78f6
ApplyPPUp:
ld a, MON_MOVES
call GetPartyParamLocation
push hl
@ -35,7 +35,7 @@ ApplyPPUp: ; 03:78f6
inc de
jr .loop
ComputeMaxPP: ; 03:792B
ComputeMaxPP:
push bc
; Divide the base PP by 5.
ld a, [de]

4
engine/items/tmhm.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/items/tmhm.asm", ROMX
CanLearnTMHMMove: ; 04:528f
CanLearnTMHMMove:
; Gets the index of TM or HM with move ID wce32,
; then checks the corresponding flag in wMonDexIndex's learnset.
; Sets register c to 1 if TM/HM is in learnset OR if debug is enabled.
@ -37,7 +37,7 @@ CanLearnTMHMMove: ; 04:528f
pop de
ret
GetTMHMMove: ; 04:52C1
GetTMHMMove:
; converts TM/HM list index to TM/HM move ID
ld a, [wNamedObjectIndexBuffer]
dec a

2
engine/link/place_waiting_text.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/link/place_waiting_text.asm", ROMX
PlaceWaitingText:: ; 1:4000
PlaceWaitingText::
hlcoord 3, 10
ld b, 1
ld c, 11

4
engine/math/math.asm
View File

@ -2,7 +2,7 @@ include "constants.asm"
SECTION "engine/math/math.asm", ROMX
_Multiply:: ; 6810
_Multiply::
; hMultiplier is one byte.
ld a, 8
@ -89,7 +89,7 @@ _Multiply:: ; 6810
; 6870
_Divide:: ; 6870
_Divide::
xor a
ldh [hMathBuffer + 0], a
ldh [hMathBuffer + 1], a

16
engine/menu/debug_menu.asm
View File

@ -22,7 +22,7 @@ DebugMenu:: ; $4031
ld hl, DebugJumpTable
jp CallJumptable
DebugJumpTable:: ; 4064
DebugJumpTable::
dw DebugMenuOptionFight
dw DebugMenuOptionField
dw Function094c ; sound test
@ -30,13 +30,13 @@ DebugJumpTable:: ; 4064
dw DebugMenuOptionMonsterTest
dw DebugMenuOptionName
DebugMenuHeader: ; 4070
DebugMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 05, 02, SCREEN_WIDTH - 7, SCREEN_HEIGHT - 1
dw .MenuData
db 01 ; default option
.MenuData: ; 4078
.MenuData:
db $A0
db 0 ; items
dw DebugMenuItems
@ -61,12 +61,12 @@ DebugMenuItems:
db 05
db -1
DebugMenuOptionField:: ; 40A8
DebugMenuOptionField::
ld hl, wDebugFlags
set DEBUG_FIELD_F, [hl] ; set debug mode
jp StartNewGame
DebugMenuOptionFight:: ; 40B0
DebugMenuOptionFight::
ld hl, wDebugFlags
set DEBUG_BATTLE_F, [hl]
ld a, $54
@ -75,11 +75,11 @@ DebugMenuOptionFight:: ; 40B0
res DEBUG_BATTLE_F, [hl]
ret
DebugMenuOptionSubGames:: ; 40C0
DebugMenuOptionSubGames::
callab CallSubGameMenu
jp DebugMenu
DebugMenuOptionMonsterTest:: ; 40CB
DebugMenuOptionMonsterTest::
ld hl, wPokedexOwned
ld de, wPokedexSeen
ld b, $1F
@ -100,7 +100,7 @@ DebugMenuOptionMonsterTest:: ; 40CB
Function40eb::
jp DebugMenu
DebugMenuOptionName:: ; 40EE
DebugMenuOptionName::
callab OpenTrainerGear
ld a, $e4
ldh [rBGP], a

24
engine/menu/main_menu.asm
View File

@ -87,7 +87,7 @@ InitializeByteList:
SECTION "engine/menu/main_menu.asm@MainMenu", ROMX
MainMenu:: ; 01:53CC
MainMenu::
ld hl, wd4a9
res 0, [hl]
call ClearTileMap
@ -123,27 +123,27 @@ MainMenu:: ; 01:53CC
ld a, [wMenuSelection]
jp CallJumptable
MainMenuHeader: ; 01:5418
MainMenuHeader:
db MENU_BACKUP_TILES
menu_coords 0, 0, 13, 7
dw .MenuData
db 1 ; default option
.MenuData: ; 01:5420
.MenuData:
db $80
db 0 ; items
dw MainMenuItems
db $8a, $1f
dw .Strings
.Strings: ; 01:5428
.Strings:
db "つづきから　はじめる@"
db "さいしょから　はじめる@"
db "せっていを　かえる@"
db "#を　あそぶ@"
db "じかんセット@"
MainMenuJumptable: ; 01:5457
MainMenuJumptable:
dw MainMenuOptionContinue
dw StartNewGame
dw MenuCallSettings
@ -178,11 +178,11 @@ PlayPokemonSetTimeMenu:
db SET_TIME
db -1
MainMenuOptionSetTime:: ; 5473
MainMenuOptionSetTime::
callab SetTime
ret
MainMenuOptionContinue:: ;547C
MainMenuOptionContinue::
callab Function14624
call DisplayContinueGameInfo
.loop
@ -212,7 +212,7 @@ MainMenuOptionContinue:: ;547C
call DelayFrames
jp OverworldStart
DisplayContinueGameInfo:: ; 54BF
DisplayContinueGameInfo::
xor a
ldh [hBGMapMode], a
hlcoord 4, 7
@ -237,7 +237,7 @@ DisplayContinueGameInfo:: ; 54BF
call DelayFrames
ret
PrintNumBadges:: ;54FA
PrintNumBadges::
push hl
ld hl, wd163 ; badges?
ld b, $01
@ -247,7 +247,7 @@ PrintNumBadges:: ;54FA
ld bc, $0102 ; flags and constants for this? 1 byte source, 2 digit display
jp PrintNumber
PrintNumOwnedMons:: ; 550D
PrintNumOwnedMons::
push hl
ld hl, wPokedexOwned
ld b, $20 ; flag_array NUM_POKEMON?
@ -257,7 +257,7 @@ PrintNumOwnedMons:: ; 550D
ld bc, $0103 ; 1 byte, 3 digit
jp PrintNumber
PrintPlayTime:: ; 5520
PrintPlayTime::
ld de, hRTCHours
ld bc, $0103 ; 1 byte, 3 digit
call PrintNumber
@ -274,7 +274,7 @@ PlayerInfoText:
next "プレイじかん"
text_end
StartNewGame:: ; 555C
StartNewGame::
ld de, MUSIC_NONE
call PlayMusic
ld de, MUSIC_OAK_INTRO

2
engine/menu/reset_dialog.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/menu/reset_dialog.asm", ROMX
DisplayResetDialog:: ; fc362 (3f:4362)
DisplayResetDialog::
ld hl, _ResetConfirmText
call MenuTextBox
call YesNoBox

6
engine/menu/set_time.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/menu/set_time.asm", ROMX
SetTime: ; 36:7ae4
SetTime:
ld hl, wStartHour
ldh a, [hRTCHours]
ld [hli], a
@ -12,7 +12,7 @@ SetTime: ; 36:7ae4
call PrintText
ret
Textdbaf4: ; 36:7af4
Textdbaf4:
deciram wStartHour, 1, 2
text "　じ"
line "@"
@ -72,7 +72,7 @@ Textdbaf4: ; 36:7af4
call Function0502
jp Function3036
Textdbb6c: ; 36:7b6c
Textdbb6c:
deciram wStartHour, 1, 2
text "　じ"
line "@"

400
engine/menu/start_menu.asm
View File

File diff suppressed because it is too large Load Diff

124
engine/menu/text_entry.asm
View File

@ -6,7 +6,7 @@ NAMINGSCREEN_UNDERSCORE EQU "♀"
NAMINGSCREEN_HYPHEN EQU "♂"
NAMINGSCREEN_END EQU $F0
NamingScreen: ; 04:53F4
NamingScreen:
ld hl, wNamingScreenDestinationPointer
ld [hl], e
inc hl
@ -40,7 +40,7 @@ NamingScreen: ; 04:53F4
call ClearJoypad
ret
.SetUpNamingScreen: ; 04:542B
.SetUpNamingScreen:
call ClearBGPalettes
ld b, SGB_DIPLOMA
call GetSGBLayout
@ -59,7 +59,7 @@ NamingScreen: ; 04:53F4
call NamingScreenInitNameEntry
ret
GetNamingScreenSetup: ; 04:5455
GetNamingScreenSetup:
; wNamingScreenType selects which entry in the table below to jump to
ld a, [wNamingScreenType]
and $07
@ -73,7 +73,7 @@ GetNamingScreenSetup: ; 04:5455
ld l, a
jp hl
.Jumptable: ; 04:5466
.Jumptable:
dw .Pokemon
dw .Player
dw .Rival
@ -83,7 +83,7 @@ GetNamingScreenSetup: ; 04:5455
dw .Pokemon
dw .Pokemon
.Pokemon: ; 04:5476
.Pokemon:
ld hl, Function8f0e3
ld a, BANK(Function8f0e3)
ld e, 1
@ -98,10 +98,10 @@ GetNamingScreenSetup: ; 04:5455
call .StoreSpriteIconParams
ret
.NicknameText ; 04:5495
.NicknameText
db "のニックネームは？@"
.Player: ; 04:549F
.Player:
ld de, GoldSpriteGFX
call .LoadSprite
hlcoord 5, 2
@ -110,10 +110,10 @@ GetNamingScreenSetup: ; 04:5455
call .StoreSpriteIconParams
ret
.NameText: ; 04:54B2
.NameText:
db "あなた　の　なまえは？@"
.Rival: ; 04:54BE
.Rival:
ld de, SilverSpriteGFX
call .LoadSprite
hlcoord 5, 2
@ -122,11 +122,11 @@ GetNamingScreenSetup: ; 04:5455
call .StoreSpriteIconParams
ret
.RivalText: ; 04:54D1
.RivalText:
; the ret just preceeding this would make the first word Rival.
db "ライバル　の　なまえは？@"
.Mom: ; 04:54DE
.Mom:
ld de, MomSpriteGFX
call .LoadSprite
hlcoord 5, 2
@ -135,10 +135,10 @@ GetNamingScreenSetup: ; 04:5455
call .StoreSpriteIconParams
ret
.MomText: ; 04:54F1
.MomText:
db "ははおや　の　なまえは？@"
.Box: ; 04:54FE
.Box:
ld de, PokeBallSpriteGFX
ld hl, vChars0
lb bc, BANK(PokeBallSpriteGFX), $04
@ -159,10 +159,10 @@ GetNamingScreenSetup: ; 04:5455
call .StoreBoxIconParams
ret
.BoxText: ; 04:552D
.BoxText:
db "バンク　の　なまえは？@"
.LoadSprite: ; 04:5539
.LoadSprite:
; copies the sprite at de into the top of VRAM, as well as the sprite $C0 after de
push de
ld hl, vChars0
@ -185,7 +185,7 @@ GetNamingScreenSetup: ; 04:5455
call InitSpriteAnimStruct
ret
.StoreSpriteIconParams: ; 04:5564
.StoreSpriteIconParams:
ld a, $05
ld [wNamingScreenMaxNameLength], a
hlcoord 6, 5
@ -195,7 +195,7 @@ GetNamingScreenSetup: ; 04:5455
ld [wNamingScreenStringEntryCoordX], a
ret
.StoreBoxIconParams: ; 04:5575
.StoreBoxIconParams:
ld a, $08
ld [wNamingScreenMaxNameLength], a
hlcoord 5, 5
@ -205,7 +205,7 @@ GetNamingScreenSetup: ; 04:5455
ld [wNamingScreenStringEntryCoordX], a
ret
NamingScreen_InitText: ; 04:5586
NamingScreen_InitText:
; fills the tilemap with ■, then clears a 12x17 box at 1,1
; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box)
call WaitForAutoBgMapTransfer
@ -241,7 +241,7 @@ NamingScreen_InitText: ; 04:5586
ret
NamingScreenJoypadLoop: ; 04:55BD
NamingScreenJoypadLoop:
call GetJoypadDebounced
ld a, [wJumptableIndex]
bit 7, a
@ -253,7 +253,7 @@ NamingScreenJoypadLoop: ; 04:55BD
and a
ret
.leap ; 04:55DA
.leap
; kills sprites and resets screen position
callab InitEffectObject
call ClearSprites
@ -263,7 +263,7 @@ NamingScreenJoypadLoop: ; 04:55BD
scf
ret
.UpdateStringEntry: ; 04:55EC
.UpdateStringEntry:
; sets BGMapMode to 0, then loads a string and coords out of a buffer and displays it.
; BGMapMode is then set to 1.
xor a
@ -284,7 +284,7 @@ NamingScreenJoypadLoop: ; 04:55BD
ldh [hBGMapMode], a
ret
.RunJumpTable: ; 04:560C
.RunJumpTable:
ld a, [wJumptableIndex]
ld e, a
ld d, $00
@ -296,11 +296,11 @@ NamingScreenJoypadLoop: ; 04:55BD
ld l, a
jp hl
.JumpTable: ; 04:561B
.JumpTable:
dw .InitCursor
dw .ReadButtons
.InitCursor: ; 04:561F
.InitCursor:
ld de, $5818
ld a, $39
call InitSpriteAnimStruct
@ -312,7 +312,7 @@ NamingScreenJoypadLoop: ; 04:55BD
inc [hl]
ret
.ReadButtons: ; 04:5634
.ReadButtons:
; if A or B were pressed, clear hJoypadSum after calling functions; if start, set 7 in the jumptable??
ld hl, hJoypadSum
ld a, [hl]
@ -326,7 +326,7 @@ NamingScreenJoypadLoop: ; 04:55BD
jr nz, .jumpstart
ret
.jumpa ; 04:5647
.jumpa
call NamingScreenGetLastCharacter
cp NAMINGSCREEN_END
jr z, .jumpstart
@ -335,19 +335,19 @@ NamingScreenJoypadLoop: ; 04:55BD
ldh [hJoypadSum], a
ret
.jumpb ; 04:5655
.jumpb
call NamingScreenDeleteCharacter
xor a
ldh [hJoypadSum], a
ret
.jumpstart ; 04:565C
.jumpstart
call NamingScreenStoreEntry
ld hl, wJumptableIndex
set 7, [hl]
ret
.GetDPad: ; 04:5665
.GetDPad:
ld hl, hJoySum
ld a, [hl]
and D_UP
@ -363,7 +363,7 @@ NamingScreenJoypadLoop: ; 04:55BD
jr nz, .rightjump
ret
.rightjump ; 04:567D
.rightjump
ld hl, $000C
add hl, bc
ld a, [hl]
@ -400,7 +400,7 @@ NamingScreenJoypadLoop: ; 04:55BD
ld [hl], $00
jr .escape
.upjump ; 04:56AC :24
.upjump ; :24
ld hl, $000D
add hl, bc
ld a, [hl]
@ -434,13 +434,13 @@ NamingScreenJoypadLoop: ; 04:55BD
ld [hl], a
ret
LetterOffsetsTable1: ; 04:56DE
LetterOffsetsTable1:
db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80
LetterOffsetsTable2:; 04:56ED
db $00, $08, $10, $18, $20, $28, $30, $38
NamingScreenTryAddCharacter: ; 04:56F5
NamingScreenTryAddCharacter:
ld a, [wNamingScreenLastCharacter]
ld hl, Dakutens
cp "ﾞ"
@ -465,7 +465,7 @@ NamingScreenTryAddCharacter: ; 04:56F5
ld [hl], NAMINGSCREEN_UNDERSCORE
ret
.jump ; 04:5724
.jump
ld a, [wNamingScreenCurNameLength]
and a
ret z
@ -492,7 +492,7 @@ NamingScreenTryAddCharacter: ; 04:56F5
inc [hl]
ret
Dakutens: ; 04:5748
Dakutens:
db "かがきぎくぐけげこご"
db "さざしじすずせぜそぞ"
db "ただちぢつづてでとど"
@ -503,12 +503,12 @@ Dakutens: ; 04:5748
db "ハバヒビフブへべホボ"
db $FF
Handakutens: ; 04:5799
Handakutens:
db "はぱひぴふぷへぺほぽ"
db "ハパヒピフプへぺホポ"
db $FF
NamingScreenDeleteCharacter: ; 04:57AE
NamingScreenDeleteCharacter:
ld hl, wNamingScreenCurNameLength
ld a, [hl]
and a
@ -523,7 +523,7 @@ NamingScreenDeleteCharacter: ; 04:57AE
ld [hl], NAMINGSCREEN_HYPHEN
ret
NamingScreenGetTextCursorPosition: ; 04:57C2
NamingScreenGetTextCursorPosition:
push af
ld hl, wNamingScreenDestinationPointer
ld a, [hli]
@ -536,7 +536,7 @@ NamingScreenGetTextCursorPosition: ; 04:57C2
pop af
ret
NamingScreenInitNameEntry: ; 04:57D2
NamingScreenInitNameEntry:
ld hl, wNamingScreenDestinationPointer
ld a, [hli]
ld h, [hl]
@ -554,7 +554,7 @@ NamingScreenInitNameEntry: ; 04:57D2
ld [hl], "@"
ret
NamingScreenStoreEntry: ; 04:57E9
NamingScreenStoreEntry:
ld hl, wNamingScreenDestinationPointer
ld a, [hli]
ld h, [hl]
@ -575,7 +575,7 @@ NamingScreenStoreEntry: ; 04:57E9
jr nz, .loop
ret
NamingScreenGetLastCharacter: ; 04:5803
NamingScreenGetLastCharacter:
ld hl, wNamingScreenCursorObjectPointer
ld c, [hl]
inc hl
@ -618,7 +618,7 @@ NamingScreenGetLastCharacter: ; 04:5803
ld [wNamingScreenLastCharacter], a
ret
LoadNamingScreenGFX: ; 04:5843
LoadNamingScreenGFX:
call ClearSprites
callab InitEffectObject
call LoadFont
@ -669,7 +669,7 @@ LoadNamingScreenGFX: ; 04:5843
SECTION "engine/menu/text_entry.asm@mail", ROMX
ComposeMailMessage: ; 04:59EB
ComposeMailMessage:
ld hl, wNamingScreenDestinationPointer
ld [hl], e
inc hl
@ -713,7 +713,7 @@ ComposeMailMessage: ; 04:59EB
call .InitBlankMail
ret
.InitBlankMail: ; 04:5A2C
.InitBlankMail:
call ClearBGPalettes
ld b, 8 ;diploma?
call GetSGBLayout
@ -761,7 +761,7 @@ ComposeMailMessage: ; 04:59EB
ld [hl], "<NEXT>"
ret
InitMailText: ; 04:5A96
InitMailText:
hlcoord 5, 2
ld de, MailPromptText
call PlaceString
@ -769,10 +769,10 @@ InitMailText: ; 04:5A96
ld [wNamingScreenMaxNameLength], a
ret
MailPromptText: ; 04:5AA5
MailPromptText:
db "メールを　かいてね@"
InitCharSet: ; 04:5AAF
InitCharSet:
call WaitForAutoBgMapTransfer
ld hl, wTileMap
lb bc, $01, $68
@ -802,7 +802,7 @@ InitCharSet: ; 04:5AAF
jr nz, .outerloop
ret
DoMailEntry: ; 04:5AE6
DoMailEntry:
call GetJoypadDebounced
ld a, [wJumptableIndex]
bit 7, a
@ -817,7 +817,7 @@ DoMailEntry: ; 04:5AE6
and a
ret
.exit_mail ; 04:5B0A
.exit_mail
callab InitEffectObject
call ClearSprites
xor a
@ -826,7 +826,7 @@ DoMailEntry: ; 04:5AE6
scf
ret
.Update: ; 04:5B1C
.Update:
xor a
ldh [hBGMapMode], a
hlcoord 1, 3
@ -842,7 +842,7 @@ DoMailEntry: ; 04:5AE6
ldh [hBGMapMode], a
ret
.DoJumpTable: ; 04:5B39
.DoJumpTable:
ld a, [wJumptableIndex]
ld e, a
ld d, 0
@ -854,11 +854,11 @@ DoMailEntry: ; 04:5AE6
ld l, a
jp hl
.Jumptable: ; 04:5B48
.Jumptable:
dw .blinkcursor
dw .processjoypad
.blinkcursor ; 04:5B4C
.blinkcursor
ld hl, wJumptableIndex
inc [hl]
ret
@ -879,7 +879,7 @@ DoMailEntry: ; 04:5AE6
jr nz, .selectjump
ret
.ajump ; 04:5B69
.ajump
call NamingScreenGetLastCharacter
cp "円"
jr z, .startjump
@ -925,7 +925,7 @@ DoMailEntry: ; 04:5AE6
SECTION "engine/menu/text_entry.asm@mail2", ROMX
SetupMail: ; 04:5C31
SetupMail:
call ClearBGPalettes
ld b, 8
call GetSGBLayout
@ -978,7 +978,7 @@ SetupMail: ; 04:5C31
ld [hl], "<NEXT>"
ret
DrawMailLoadedText: ; 04:5CA9
DrawMailLoadedText:
hlcoord 5, 2
ld de, MailLoadedText
call PlaceString
@ -986,10 +986,10 @@ DrawMailLoadedText: ; 04:5CA9
ld [wNamingScreenMaxNameLength], a
ret
MailLoadedText: ; 04:5CB8
MailLoadedText:
db "スアケシ！！！@" ; should be "MAIL!!!" since the bold english font is loaded into vChars1
DrawMail: ; 04:5CC0
DrawMail:
call WaitForAutoBgMapTransfer
hlcoord 0, 0
lb bc, $01, $68
@ -1013,7 +1013,7 @@ DrawMail: ; 04:5CC0
call DrawMailTextExtra
ret
DrawMailRow: ; 04:5CFC
DrawMailRow:
ld c, $07
call .loop
inc hl
@ -1030,14 +1030,14 @@ DrawMailRow: ; 04:5CFC
inc hl
ld c, $05
.loop ; 04:5D15
.loop
ld [hli], a
inc a
dec c
jr nz, .loop
ret
DrawMailTextExtra: ; 04:5D1B
DrawMailTextExtra:
ld a, [de]
inc de
ld [hli], a
@ -1045,5 +1045,5 @@ DrawMailTextExtra: ; 04:5D1B
jr nz, DrawMailTextExtra
ret
MailTextExtra: ; 04:5D22
MailTextExtra:
db "？！１２３４５　　６７８９０ー円"

8
engine/overworld/object_collision.asm
View File

@ -3,7 +3,7 @@ INCLUDE "constants.asm"
SECTION "engine/overworld/object_collision.asm@GetSpritesNextTile", ROMX
; Get the tile that the sprite will walk onto next
GetSpritesNextTile: ; 01:774a
GetSpritesNextTile:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld d, [hl]
@ -16,7 +16,7 @@ GetSpritesNextTile: ; 01:774a
ret
; Sets carry flag if the object (bc) next tile is a collision
_IsObjectCollisionTileSolid: ; 01:775a
_IsObjectCollisionTileSolid:
call GetSpritesNextTile
ld e, a
ld d, 0
@ -35,7 +35,7 @@ SECTION "engine/overworld/object_collision.asm@_CheckObjectCollision", ROMX
; returns the carry flag if a sprite is at coords d, e
; will not collide with sprite index stored in hEventCollisionException
_CheckObjectCollision: ; 01:77dd
_CheckObjectCollision:
ld bc, wObjectStructs
xor a
.loop
@ -95,7 +95,7 @@ _CheckObjectCollision: ; 01:77dd
SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX
; Sets the carry flag if the player will collide with another sprite's current or next position
_CheckPlayerObjectCollision: ; 01:7894
_CheckPlayerObjectCollision:
ld a, [wPlayerNextMapX]
ld d, a
ld a, [wPlayerNextMapY]

120
engine/overworld/player_movement.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "engine/overworld/player_movement.asm@Player Movement", ROMX
OverworldMovementCheck:: ; 03:4000
OverworldMovementCheck::
jp _OverworldMovementCheck
UnusedOverworldMovementCheck:: ; 03:4003
UnusedOverworldMovementCheck::
ld a, PLAYER_OBJECT_INDEX
ldh [hEventCollisionException], a
ld a, [wPlayerDirection]
@ -26,10 +26,10 @@ UnusedOverworldMovementCheck:: ; 03:4003
jp z, OldCheckMovementSurf
jp CheckMovementWalkOrBike
SetPlayerIdle: ; 03:402c
SetPlayerIdle:
ld a, NO_MOVEMENT
SetPlayerMovement: ; 03:402e
SetPlayerMovement:
ld [wPlayerMovement], a
ld a, [wPlayerLastMapX]
ld [wPlayerNextMapX], a
@ -38,11 +38,11 @@ SetPlayerMovement: ; 03:402e
and a
ret
CheckMovementWalkOrBike: ; 03:403f
CheckMovementWalkOrBike:
call _CheckMovementWalkOrBike
jp SetPlayerMovement
_CheckMovementWalkOrBike: ; 03:4045
_CheckMovementWalkOrBike:
ld a, d
and D_PAD
jp z, .idle
@ -142,12 +142,12 @@ _CheckMovementWalkOrBike: ; 03:4045
ld a, FACE_UP
ret
CheckMovementDebug:: ; 03:40eb
CheckMovementDebug::
ld a, d
call _CheckMovementDebug
jp SetPlayerMovement
_CheckMovementDebug: ; 03:40f2
_CheckMovementDebug:
bit D_DOWN_F, a
jr nz, .move_down
bit D_UP_F, a
@ -191,11 +191,11 @@ _CheckMovementDebug: ; 03:40f2
ld a, JUMP_LEFT
ret
CheckMovementSkateboard:: ; 03:4131
CheckMovementSkateboard::
call _CheckMovementSkateboard
jp SetPlayerMovement
_CheckMovementSkateboard: ; 03:4137
_CheckMovementSkateboard:
ld a, [wSkatingDirection]
cp STANDING
jp z, .not_moving
@ -211,13 +211,13 @@ _CheckMovementSkateboard: ; 03:4137
pop de
jp hl
.SkateMovementTable ; 03:414d
.SkateMovementTable
dw CheckSkateDown
dw CheckSkateUp
dw CheckSkateLeft
dw CheckSkateRight
.not_moving ; 03:4155
.not_moving
ld a, d
and D_PAD
jp z, .idle
@ -236,7 +236,7 @@ _CheckMovementSkateboard: ; 03:4137
ld a, NO_MOVEMENT
ret
CheckSkateDown: ; 03:4177
CheckSkateDown:
ld a, [wPlayerLastMapY]
inc a
ld [wPlayerNextMapY], a
@ -271,7 +271,7 @@ CheckSkateDown: ; 03:4177
ld a, FACE_DOWN
ret
CheckSkateUp: ; 03:41ab
CheckSkateUp:
ld a, [wPlayerLastMapY]
dec a
ld [wPlayerNextMapY], a
@ -302,7 +302,7 @@ CheckSkateUp: ; 03:41ab
ld a, FACE_UP
ret
CheckSkateLeft: ; 03:41db
CheckSkateLeft:
ld a, [wPlayerLastMapX]
dec a
ld [wPlayerNextMapX], a
@ -333,7 +333,7 @@ CheckSkateLeft: ; 03:41db
ld a, FACE_LEFT
ret
CheckSkateRight: ; 03:420b
CheckSkateRight:
ld a, [wPlayerLastMapX]
inc a
ld [wPlayerNextMapX], a
@ -364,7 +364,7 @@ CheckSkateRight: ; 03:420b
ld a, FACE_RIGHT
ret
OldIsTileCollisionGrass:: ; 03:423b
OldIsTileCollisionGrass::
; Check whether collision ID in a is
; grass
; Result:
@ -379,11 +379,11 @@ OldIsTileCollisionGrass:: ; 03:423b
cp $8b
ret
OldCheckMovementSurf:: ; 03:4247
OldCheckMovementSurf::
call _OldCheckMovementSurf
jp SetPlayerMovement
_OldCheckMovementSurf: ; 03:424d
_OldCheckMovementSurf:
ld a, d
and D_PAD
bit D_DOWN_F, a
@ -481,7 +481,7 @@ _OldCheckMovementSurf: ; 03:424d
ld a, SLOW_STEP_RIGHT
ret
OldIsTileCollisionWater:: ; 03:42ee
OldIsTileCollisionWater::
; Check if collision ID in a is water
; Input:
; a - collision ID
@ -496,7 +496,7 @@ OldIsTileCollisionWater:: ; 03:42ee
scf
ret
SetPlayerStateWalk:: ; 03:42f8
SetPlayerStateWalk::
push bc
ld a, PLAYER_NORMAL
ld [wPlayerState], a
@ -504,7 +504,7 @@ SetPlayerStateWalk:: ; 03:42f8
pop bc
ret
IsPlayerCollisionTileSolid:: ; 03:4303
IsPlayerCollisionTileSolid::
; Return whether the collision under player's feet
; is solid/sometimes solid or non-solid.
; Clobbers: a
@ -519,7 +519,7 @@ IsPlayerCollisionTileSolid:: ; 03:4303
pop de
ret
CheckPlayerObjectCollision:: ; 03:4312
CheckPlayerObjectCollision::
; Check whether player object currentl
; collides with any other object.
; Result:
@ -531,7 +531,7 @@ CheckPlayerObjectCollision:: ; 03:4312
ret nc
jp CheckCompanionObjectCollision
CheckCompanionObjectCollision:: ; 03:4320
CheckCompanionObjectCollision::
; Marks the object struct pointed to by hl
; as having collided with player object.
; If object struct (as identified by hObjectStructIndexBuffer)
@ -562,7 +562,7 @@ CheckCompanionObjectCollision:: ; 03:4320
ld [wCompanionCollisionFrameCounter], a
ret
_OverworldMovementCheck:: ; 03:4344
_OverworldMovementCheck::
ld a, PLAYER_OBJECT_INDEX
ldh [hEventCollisionException], a
ld a, [wPlayerDirection]
@ -580,7 +580,7 @@ _OverworldMovementCheck:: ; 03:4344
call GetPlayerMovementByState
jp SetPlayerMovement
GetPlayerMovementByState: ; 03:4364
GetPlayerMovementByState:
ld a, [wPlayerState]
cp PLAYER_SKATE
jp z, CheckMovementSkateboard ; FIXME: CheckMovementSkateboard already calls SetPlayerMovement
@ -590,14 +590,14 @@ GetPlayerMovementByState: ; 03:4364
jp z, CheckMovementSurf
jp CheckMovementWalk
CheckMovementWalk:: ; 03:4374
CheckMovementWalk::
ld a, [wPlayerStandingTile]
swap a
and LOW((COLLISION_TYPE_MASK >> 4) | (COLLISION_TYPE_MASK << 4))
ld hl, .WalkingCollisionTable
jp CallJumptable
.WalkingCollisionTable ; 03:4381
.WalkingCollisionTable
dw CheckMovementWalkRegular ; regular
dw CheckMovementWalkSolid ; trees, grass, etc.
dw CheckMovementWalkSolid ; water
@ -615,14 +615,14 @@ CheckMovementWalk:: ; 03:4374
dw CheckMovementWalkRegular ; unused
dw CheckMovementWalkRegular ; unused
NoWalkMovement: ; 03:43a1
NoWalkMovement:
ld a, NO_MOVEMENT
ret
CheckMovementWalkSolid:: ; 03:43a4
CheckMovementWalkSolid::
jp CheckMovementWalkRegular
CheckMovementWalkLand:: ; 03:43a7
CheckMovementWalkLand::
ld a, [wPlayerStandingTile]
and COLLISION_SUBTYPE_MASK
jr nz, .force_movement
@ -648,7 +648,7 @@ CheckMovementWalkLand:: ; 03:43a7
ld a, b
ret
SlowDownMovementWalk: ; 03:43cf
SlowDownMovementWalk:
ld b, SLOW_STEP_DOWN
cp STEP_DOWN
jr z, .finish
@ -666,7 +666,7 @@ SlowDownMovementWalk: ; 03:43cf
ld a, b
ret
CheckMovementWalkLand2:: ; 03:43ea
CheckMovementWalkLand2::
ld a, [wPlayerStandingTile]
and COLLISION_SUBTYPE_MASK
ld b, STEP_DOWN
@ -686,10 +686,10 @@ CheckMovementWalkLand2:: ; 03:43ea
ld a, b
ret
UnusedCheckMovementWalk60:: ; 03:4409
UnusedCheckMovementWalk60::
jp CheckMovementWalkRegular
CheckMovementWalkWarp:: ; 03:440c
CheckMovementWalkWarp::
ld a, [wPlayerStandingTile]
and COLLISION_SUBTYPE_MASK
jr z, .check_dpad
@ -747,13 +747,13 @@ CheckMovementWalkWarp:: ; 03:440c
.moved_out_of_bounds
ret
CheckMovementWalkMisc:: ; 03:4472
CheckMovementWalkMisc::
jp CheckMovementWalkRegular
CheckMovementWalkSpecial:: ; 03:4475
CheckMovementWalkSpecial::
jp CheckMovementWalkRegular
CheckMovementWalkRegular:: ; 03:4478
CheckMovementWalkRegular::
ldh a, [hJoyState]
bit D_DOWN_F, a
jp nz, CheckWalkDown
@ -765,7 +765,7 @@ CheckMovementWalkRegular:: ; 03:4478
jp nz, CheckWalkRight
jp NoWalkMovement
CheckMovementWalkJump: ; 03:4491
CheckMovementWalkJump:
ldh a, [hJoyState]
bit D_DOWN_F, a
jr nz, .down
@ -833,7 +833,7 @@ CheckMovementWalkJump: ; 03:4491
ld a, JUMP_RIGHT
ret
CheckWalkDown:: ; 03:4502
CheckWalkDown::
ld d, 0
ld e, 1
call CheckObjectCollision
@ -847,7 +847,7 @@ CheckWalkDown:: ; 03:4502
ld a, FACE_DOWN
ret
CheckWalkUp:: ; 03:4519
CheckWalkUp::
ld d, 0
ld e, -1
call CheckObjectCollision
@ -861,7 +861,7 @@ CheckWalkUp:: ; 03:4519
ld a, FACE_UP
ret
CheckWalkLeft:: ; 03:4530
CheckWalkLeft::
ld d, -1
ld e, 0
call CheckObjectCollision
@ -875,7 +875,7 @@ CheckWalkLeft:: ; 03:4530
ld a, FACE_LEFT
ret
CheckWalkRight:: ; 03:4547
CheckWalkRight::
ld d, 1
ld e, 0
call CheckObjectCollision
@ -889,14 +889,14 @@ CheckWalkRight:: ; 03:4547
ld a, FACE_RIGHT
ret
CheckMovementSurf:: ; 03:455e
CheckMovementSurf::
ld a, [wPlayerStandingTile]
swap a
and LOW((COLLISION_TYPE_MASK >> 4) | (COLLISION_TYPE_MASK << 4))
ld hl, .SurfCollisionTable
jp CallJumptable
.SurfCollisionTable ; 03:456b
.SurfCollisionTable
dw CheckMovementSurfRegular
dw CheckMovementSurfRegular
dw CheckMovementSurfWater
@ -914,7 +914,7 @@ CheckMovementSurf:: ; 03:455e
dw CheckMovementSurfRegular
dw CheckMovementSurfRegular
CheckMovementSurfRegular:: ; 03:458b
CheckMovementSurfRegular::
ldh a, [hJoyState]
bit D_DOWN_F, a
jp nz, CheckSurfDown
@ -926,7 +926,7 @@ CheckMovementSurfRegular:: ; 03:458b
jp nz, CheckSurfRight
jp NoWalkMovement
CheckMovementSurfWater:: ; 03:45a4
CheckMovementSurfWater::
ld a, [wPlayerStandingTile]
and COLLISION_SUBTYPE_MASK
cp (COLLISION_WATERFALL & COLLISION_SUBTYPE_MASK)
@ -935,7 +935,7 @@ CheckMovementSurfWater:: ; 03:45a4
ld a, FAST_STEP_DOWN
ret
CheckMovementSurfWater2:: ; 03:45b0
CheckMovementSurfWater2::
ld a, [wPlayerStandingTile]
and COLLISION_WATER_SUBTYPE_MASK
ld d, STEP_RIGHT
@ -954,7 +954,7 @@ CheckMovementSurfWater2:: ; 03:45b0
ld a, d
ret
CheckSurfDown: ; 03:45cd
CheckSurfDown:
ld d, 0
ld e, 1
call CheckObjectCollision
@ -970,7 +970,7 @@ CheckSurfDown: ; 03:45cd
ld a, FACE_DOWN
ret
CheckSurfUp: ; 03:45e7
CheckSurfUp:
ld d, 0
ld e, -1
call CheckObjectCollision
@ -986,7 +986,7 @@ CheckSurfUp: ; 03:45e7
ld a, FACE_UP
ret
CheckSurfLeft: ; 03:4601
CheckSurfLeft:
ld d, -1
ld e, 0
call CheckObjectCollision
@ -1002,7 +1002,7 @@ CheckSurfLeft: ; 03:4601
ld a, FACE_LEFT
ret
CheckSurfRight: ; 03:461b
CheckSurfRight:
ld d, 1
ld e, 0
call CheckObjectCollision
@ -1018,10 +1018,10 @@ CheckSurfRight: ; 03:461b
ld a, FACE_RIGHT
ret
SurfDismount: ; 03:4635
SurfDismount:
jp SetPlayerStateWalk
CheckObjectCollision:: ; 03:4638
CheckObjectCollision::
; Check if coordinates relative
; to player collide with another object
; Clobbers:
@ -1082,16 +1082,16 @@ GetCollisionType::
SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX
_UnusedReturnFalse:: ; 03:4764
_UnusedReturnFalse::
xor a
ret
_UnusedReturnTrue:: ; 03:4766
_UnusedReturnTrue::
xor a
scf
ret
CheckCollisionSometimesSolid:: ; 03:4769
CheckCollisionSometimesSolid::
; Checks whether collision ID in a
; is sometimes, always or never solid.
; Clobbers:
@ -1124,13 +1124,13 @@ CheckCollisionSometimesSolid:: ; 03:4769
SECTION "engine/overworld/player_movement.asm@_RedrawPlayerSprite", ROMX
_RedrawPlayerSprite: ; 05:4000
_RedrawPlayerSprite:
call GetPlayerSprite
ld hl, vChars0
call LoadOverworldSprite
ret
GetPlayerSprite: ; 05:400a
GetPlayerSprite:
ld a, [wPlayerState]
ld hl, PlayerSpriteTable
ld c, a
@ -1153,7 +1153,7 @@ GetPlayerSprite: ; 05:400a
ld [wPlayerObjectSprite], a
ret
PlayerSpriteTable: ; 03:402d
PlayerSpriteTable:
; state, sprite
db PLAYER_NORMAL, SPRITE_GOLD
db PLAYER_BIKE, SPRITE_GOLD_BIKE

4
engine/overworld/spawn_points.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/overworld/spawn_points.asm", ROMX
LoadSpawnPoint: ; 03:4791
LoadSpawnPoint:
; loads the spawn point in wDefaultSpawnPoint
push hl
push de
@ -29,7 +29,7 @@ LoadSpawnPoint: ; 03:4791
pop hl
ret
IsSpawnPoint: ; 03:47b6
IsSpawnPoint:
; Checks if the map loaded in de is a spawn point.
; Returns carry if it's a spawn point.
ld hl, SpawnPoints

12
engine/palettes.asm
View File

@ -2,14 +2,14 @@ INCLUDE "constants.asm"
SECTION "engine/palettes.asm@Overworld fade", ROMX
OverworldFadeIn:: ; 23:433e
OverworldFadeIn::
ld c, 0
call GetFadeStep
ld b, 4
call FadeTowardsWhite
ret
OverworldFadeOut:: ; 23:4349
OverworldFadeOut::
ld c, 9
call GetFadeStep
ld b, 4
@ -20,7 +20,7 @@ OverworldFadeOut:: ; 23:4349
; TODO: merge this
SECTION "engine/palettes.asm@Palette fading, part 2?", ROMX
ApplyPalettesAtHL:: ; 23:43d1
ApplyPalettesAtHL::
push hl
ld a, [hli]
ld [rBGP], a
@ -31,7 +31,7 @@ ApplyPalettesAtHL:: ; 23:43d1
pop hl
ret
FadeTowardsWhite:: ; 23:43dd
FadeTowardsWhite::
call ApplyPalettesAtHL
inc hl
inc hl
@ -42,7 +42,7 @@ FadeTowardsWhite:: ; 23:43dd
jr nz, FadeTowardsWhite
ret
FadeTowardsBlack:: ; 23:43ec
FadeTowardsBlack::
call ApplyPalettesAtHL
dec hl
dec hl
@ -53,7 +53,7 @@ FadeTowardsBlack:: ; 23:43ec
jr nz, FadeTowardsBlack
ret
GetFadeStep:: ; 23:43fb
GetFadeStep::
ld a, [wTimeOfDayPal]
and 3
push bc

16
engine/pokemon/health.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/pokemon/health.asm@HealParty", ROMX
HealParty: ; 03:4d6f
HealParty:
ld hl, wPartySpecies
ld de, wPartyMons
@ -97,7 +97,7 @@ HealParty: ; 03:4d6f
SECTION "engine/pokemon/health.asm@HP Bar", ROMX
ComputeHPBarPixels: ; 03:4e3c
ComputeHPBarPixels:
push hl
xor a
ldh [hMultiplicand], a
@ -140,7 +140,7 @@ ComputeHPBarPixels: ; 03:4e3c
ld e, 1
ret
UpdateHPBar: ; 03:4e7c
UpdateHPBar:
ld a, [wHPBarOldHP]
ld c, a
ld a, [wHPBarOldHP + 1]
@ -229,7 +229,7 @@ UpdateHPBar: ; 03:4e7c
; animates the HP bar going up or down for (a) ticks (two waiting frames each)
; stops prematurely if bar is filled up
; e: current health (in pixels) to start with
UpdateHPBar_AnimateHPBar: ; 03:4F11
UpdateHPBar_AnimateHPBar:
push hl
.bar_animation_loop
@ -259,7 +259,7 @@ UpdateHPBar_AnimateHPBar: ; 03:4F11
ret
; compares old HP and new HP and sets c and z flags accordingly
UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37
UpdateHPBar_CompareNewHPToOldHP:
ld a, d
sub b
ret nz
@ -268,7 +268,7 @@ UpdateHPBar_CompareNewHPToOldHP: ; 03:4F37
ret
; calcs HP difference between bc and de (into de)
UpdateHPBar_CalcHPDifference: ; 03:4F3D
UpdateHPBar_CalcHPDifference:
ld a, d
sub b
jr c, .old_hp_greater
@ -297,7 +297,7 @@ UpdateHPBar_CalcHPDifference: ; 03:4F3D
ld de, 0
ret
UpdateHPBar_PrintHPNumber: ; 03:4F5B
UpdateHPBar_PrintHPNumber:
push af
push de
ld a, [wHPBarType]
@ -329,7 +329,7 @@ UpdateHPBar_PrintHPNumber: ; 03:4F5B
; calcs number of HP bar pixels for old and new HP value
; d: new pixels
; e: old pixels
UpdateHPBar_CalcOldNewHPBarPixels: ; 03:4F8B
UpdateHPBar_CalcOldNewHPBarPixels:
push hl
ld hl, wHPBarMaxHP
ld a, [hli]

2
engine/predef.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/predef.asm", ROMX
GetPredefPointer:: ; 1:62b0
GetPredefPointer::
ld a, h
ld [wPredefHL], a
ld a, l

2
engine/smallflag.asm
View File

@ -1,6 +1,6 @@
SECTION "engine/smallflag.asm", ROMX
SmallFarFlagAction: ; 03:4d33
SmallFarFlagAction:
; Perform action b on bit c in flag array hl.
; If checking a flag, check flag array d:hl unless d is 0.

4
engine/sprites/sprites.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/sprites/sprites.asm@LoadOverworldSprite", ROMX
LoadOverworldSprite: ; 05:4150
LoadOverworldSprite:
push af
call GetOverworldSpriteData
push bc
@ -33,7 +33,7 @@ LoadOverworldSprite: ; 05:4150
; get the data for overworld sprite in a
; returns: gfx ptr in hl, length in c, bank in b
GetOverworldSpriteData: ; 05:417d
GetOverworldSpriteData:
push hl
dec a
ld l, a

6
engine/unknown11d32.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/unknown11d32.asm", ROMX
Unknown11d32: ; 04:5D32
Unknown11d32:
ld hl, hJoySum
ld a, [hl]
and D_UP
@ -85,8 +85,8 @@ Unknown11d32: ; 04:5D32
ld [hl], a
ret
.Offsets1: ; 04:5DAB
.Offsets1:
db $00, $08, $10, $18, $20, $28, $30, $48, $50, $58, $60, $68, $70, $78
.Offsets2: ; 04:5DB9
.Offsets2:
db $00, $08, $18, $20, $30

12
engine/unknown_boxes.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "engine/unknown_boxes.asm", ROMX
Function1130a: ; 04:530A
Function1130a:
ret
Function1130b: ; 04:530B
Function1130b:
ld a, [wPartyCount]
cp PARTY_LENGTH
jr c, .bigjump
@ -39,7 +39,7 @@ Function1130b: ; 04:530B
scf
ret
RecievePokemon: ; 04:5357
RecievePokemon:
ld a, [wMonDexIndex]
push af
ld [wNamedObjectIndexBuffer], a
@ -54,7 +54,7 @@ RecievePokemon: ; 04:5357
ld hl, RecievePokemonText
jp PrintText
RecievePokemonText: ; 04:5377
RecievePokemonText:
text "<PLAYER>は"
line "@"
@ -64,7 +64,7 @@ RecievePokemonText: ; 04:5377
db $0B, "@"
BoxCantHoldText: ; 04:538B
BoxCantHoldText:
text "#を　もちきれないので"
line "<PC>の　ボックス@"
db $01, $31, $CD
@ -74,7 +74,7 @@ BoxCantHoldText: ; 04:538B
text "を　てんそうした！"
done
BoxFullText: ; 04:53B6
BoxFullText:
text "#を　もちきれません！"
para "ボックスも　いっぱいで"
line "てんそうできません！"

144
gfx.asm
View File

@ -321,80 +321,80 @@ SlotMachine2GFX::
INCBIN "gfx/minigames/slots_2.2bpp"
SECTION "gfx.asm@Bank 30 Sprites 1", ROMX
GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp" ; 30:4000
GoldBikeSpriteGFX:: INCBIN "gfx/sprites/gold_bike.2bpp" ; 30:4180
GoldSkateboardSpriteGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp" ; 30:4300
SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" ; 30:4480
OkidoSpriteGFX:: INCBIN "gfx/sprites/okido.2bpp" ; 30:4600
RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" ; 30:4780
BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" ; 30:4900
MasakiSpriteGFX:: INCBIN "gfx/sprites/masaki.2bpp" ; 30:4a80
ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" ; 30:4c00
SakakiSpriteGFX:: INCBIN "gfx/sprites/sakaki.2bpp" ; 30:4d80
GantetsuSpriteGFX:: INCBIN "gfx/sprites/gantetsu.2bpp" ; 30:4f00
MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" ; 30:5080
SilversMomSpriteGFX:: INCBIN "gfx/sprites/silvers_mom.2bpp" ; 30:5200
RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" ; 30:5380
NanamiSpriteGFX:: INCBIN "gfx/sprites/nanami.2bpp" ; 30:5500
EvilOkidoSpriteGFX:: INCBIN "gfx/sprites/evil_okido.2bpp" ; 30:5680
KikukoSpriteGFX:: INCBIN "gfx/sprites/kikuko.2bpp" ; 30:5800
HayatoSpriteGFX:: INCBIN "gfx/sprites/hayato.2bpp" ; 30:5980
TsukushiSpriteGFX:: INCBIN "gfx/sprites/tsukushi.2bpp" ; 30:5a40
EnokiSpriteGFX:: INCBIN "gfx/sprites/enoki.2bpp" ; 30:5b00
MikanSpriteGFX:: INCBIN "gfx/sprites/mikan.2bpp" ; 30:5bc0
CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; 30:5d40
CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; 30:5ec0
BugCatcherBoySpriteGFX:: INCBIN "gfx/sprites/bug_catcher_boy.2bpp" ; 30:6040
TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" ; 30:61c0
YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" ; 30:6340
LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" ; 30:64c0
TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" ; 30:6640
GirlSpriteGFX:: INCBIN "gfx/sprites/girl.2bpp" ; 30:67c0
SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" ; 30:6940
RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" ; 30:6ac0
PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" ; 30:6c40
PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" ; 30:6dc0
GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" ; 30:6f40
GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" ; 30:70c0
SwimmerMSpriteGFX:: INCBIN "gfx/sprites/swimmer_m.2bpp" ; 30:7240
SwimmerFSpriteGFX:: INCBIN "gfx/sprites/swimmer_f.2bpp" ; 30:73c0
RocketMSpriteGFX:: INCBIN "gfx/sprites/rocket_m.2bpp" ; 30:7540
RocketFSpriteGFX:: INCBIN "gfx/sprites/rocket_f.2bpp" ; 30:76c0
NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" ; 30:7840
LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" ; 30:7900
ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; 30:79c0
FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; 30:7b40
FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; 30:7cc0
GoldSpriteGFX:: INCBIN "gfx/sprites/gold.2bpp"
GoldBikeSpriteGFX:: INCBIN "gfx/sprites/gold_bike.2bpp"
GoldSkateboardSpriteGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp"
SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp"
OkidoSpriteGFX:: INCBIN "gfx/sprites/okido.2bpp"
RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp"
BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp"
MasakiSpriteGFX:: INCBIN "gfx/sprites/masaki.2bpp"
ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp"
SakakiSpriteGFX:: INCBIN "gfx/sprites/sakaki.2bpp"
GantetsuSpriteGFX:: INCBIN "gfx/sprites/gantetsu.2bpp"
MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp"
SilversMomSpriteGFX:: INCBIN "gfx/sprites/silvers_mom.2bpp"
RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp"
NanamiSpriteGFX:: INCBIN "gfx/sprites/nanami.2bpp"
EvilOkidoSpriteGFX:: INCBIN "gfx/sprites/evil_okido.2bpp"
KikukoSpriteGFX:: INCBIN "gfx/sprites/kikuko.2bpp"
HayatoSpriteGFX:: INCBIN "gfx/sprites/hayato.2bpp"
TsukushiSpriteGFX:: INCBIN "gfx/sprites/tsukushi.2bpp"
EnokiSpriteGFX:: INCBIN "gfx/sprites/enoki.2bpp"
MikanSpriteGFX:: INCBIN "gfx/sprites/mikan.2bpp"
CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp"
CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp"
BugCatcherBoySpriteGFX:: INCBIN "gfx/sprites/bug_catcher_boy.2bpp"
TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp"
YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp"
LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp"
TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp"
GirlSpriteGFX:: INCBIN "gfx/sprites/girl.2bpp"
SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp"
RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp"
PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp"
PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp"
GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp"
GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp"
SwimmerMSpriteGFX:: INCBIN "gfx/sprites/swimmer_m.2bpp"
SwimmerFSpriteGFX:: INCBIN "gfx/sprites/swimmer_f.2bpp"
RocketMSpriteGFX:: INCBIN "gfx/sprites/rocket_m.2bpp"
RocketFSpriteGFX:: INCBIN "gfx/sprites/rocket_f.2bpp"
NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp"
LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp"
ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp"
FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp"
FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp"
SECTION "gfx.asm@Bank 31 Sprites 2", ROMX
ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; 31:4000
MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp" ; 31:4180
SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; 31:4300
FrowningManSpriteGFX:: INCBIN "gfx/sprites/frowning_man.2bpp" ; 31:4480
GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" ; 31:4600
BlackbeltSpriteGFX:: INCBIN "gfx/sprites/blackbelt.2bpp" ; 31:4780
ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" ; 31:4900
OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" ; 31:4a80
CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" ; 31:4c00
MohawkSpriteGFX:: INCBIN "gfx/sprites/mohawk.2bpp" ; 31:4d80
GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" ; 31:4f00
SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" ; 31:5080
HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp" ; 31:5200
BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp" ; 31:5380
SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp" ; 31:5500
PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp" ; 31:5680
PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp" ; 31:5800
LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp" ; 31:5980
KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp" ; 31:5b00
PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp" ; 31:5c80
NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp" ; 31:5e00
LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp" ; 31:5f80
PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" ; 31:6100
PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" ; 31:6280
PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" ; 31:6400
OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; 31:6580
EggSpriteGFX:: INCBIN "gfx/sprites/egg.2bpp" ; 31:65c0
BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; 31:6600
ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp"
MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp"
SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp"
FrowningManSpriteGFX:: INCBIN "gfx/sprites/frowning_man.2bpp"
GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp"
BlackbeltSpriteGFX:: INCBIN "gfx/sprites/blackbelt.2bpp"
ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp"
OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp"
CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp"
MohawkSpriteGFX:: INCBIN "gfx/sprites/mohawk.2bpp"
GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp"
SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp"
HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp"
BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp"
SidonSpriteGFX:: INCBIN "gfx/sprites/sidon.2bpp"
PippiSpriteGFX:: INCBIN "gfx/sprites/pippi.2bpp"
PoppoSpriteGFX:: INCBIN "gfx/sprites/poppo.2bpp"
LizardonSpriteGFX:: INCBIN "gfx/sprites/lizardon.2bpp"
KabigonSpriteGFX:: INCBIN "gfx/sprites/kabigon.2bpp"
PawouSpriteGFX:: INCBIN "gfx/sprites/pawou.2bpp"
NyorobonSpriteGFX:: INCBIN "gfx/sprites/nyorobon.2bpp"
LaplaceSpriteGFX:: INCBIN "gfx/sprites/laplace.2bpp"
PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp"
PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp"
PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp"
OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp"
EggSpriteGFX:: INCBIN "gfx/sprites/egg.2bpp"
BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp"
SECTION "gfx.asm@Bank 37 Tilesets 10", ROMX
Tileset_10_GFX:

4
home/audio.asm
View File

@ -240,12 +240,12 @@ SpecialMapMusic::
scf
ret
.state2 ; 3e14
.state2
ld de, MUSIC_NONE
scf
ret
.normal ; 3e19
.normal
and a
ret

152
home/map.asm
View File

@ -3,7 +3,7 @@ INCLUDE "constants.asm"
SECTION "home/map.asm", ROM0
; Runs a map script indexed by wMapScriptNumber
RunMapScript:: ; 20ff
RunMapScript::
push hl
push de
push bc
@ -27,7 +27,7 @@ RunMapScript:: ; 20ff
ret
; TODO: is this used?
WriteIntod637:: ; 2117
WriteIntod637::
push af
; TODO: figure out what variables are concerned here
ld a, [wd637]
@ -36,14 +36,14 @@ WriteIntod637:: ; 2117
ld [wd637], a
ret
ClearMapBuffer:: ; 00:2123
ClearMapBuffer::
ld hl, wMapBuffer
ld bc, wMapBufferEnd - wMapBuffer
ld a, 0
call ByteFill
ret
SetUpMapBuffer:: ; 212f
SetUpMapBuffer::
call ClearMapBuffer
ldh a, [hROMBank]
push af
@ -86,7 +86,7 @@ SetUpMapBuffer:: ; 212f
add hl, de
jr .search
GetMapScriptNumber:: ; 2171
GetMapScriptNumber::
push hl
ld a, [hli]
ld h, [hl]
@ -96,7 +96,7 @@ GetMapScriptNumber:: ; 2171
pop hl
ret
CopyWord:: ; 217b
CopyWord::
ld a, [hli]
ld [de], a
ld a, [hli]
@ -105,21 +105,21 @@ CopyWord:: ; 217b
ret
SetMapScriptNumber:: ; 2181
SetMapScriptNumber::
ld [wMapScriptNumber], a
ret
IncMapScriptNumber:: ; 2185
IncMapScriptNumber::
ld hl, wMapScriptNumber
inc [hl]
ret
DecMapScriptNumber:: ; 218a
DecMapScriptNumber::
ld hl, wMapScriptNumber
dec [hl]
ret
WriteBackMapScriptNumber:: ; 218f
WriteBackMapScriptNumber::
ld a, [wMapScriptNumberLocation]
ld l, a
ld a, [wMapScriptNumberLocation + 1]
@ -129,12 +129,12 @@ WriteBackMapScriptNumber:: ; 218f
ret
GetMapPointer:: ; 219c
GetMapPointer::
ld a, [wMapGroup]
ld b, a
ld a, [wMapId]
ld c, a
GetAnyMapPointer:: ; 21a4
GetAnyMapPointer::
push bc
dec b
ld c, b
@ -153,12 +153,12 @@ GetAnyMapPointer:: ; 21a4
ret
SwitchToMapBank:: ; 21bb
SwitchToMapBank::
ld a, [wMapGroup]
ld b, a
ld a, [wMapId]
ld c, a
SwitchToAnyMapBank:: ; 21c3
SwitchToAnyMapBank::
push hl
ld a, BANK(MapGroupPointers)
call Bankswitch
@ -169,7 +169,7 @@ SwitchToAnyMapBank:: ; 21c3
ret
CopyMapPartial:: ; 213d
CopyMapPartial::
ldh a, [hROMBank]
push af
ld a, BANK(MapGroupPointers)
@ -182,7 +182,7 @@ CopyMapPartial:: ; 213d
call Bankswitch
ret
GetMapAttributesPointer:: ; 21eb
GetMapAttributesPointer::
push bc
ldh a, [hROMBank]
push af
@ -203,7 +203,7 @@ GetMapAttributesPointer:: ; 21eb
pop bc
ret
GetMapEnvironment:: ; 220c
GetMapEnvironment::
push hl
push bc
ldh a, [hROMBank]
@ -221,7 +221,7 @@ GetMapEnvironment:: ; 220c
pop hl
ret
GetAnyMapEnvironment:: ; 2226
GetAnyMapEnvironment::
ldh a, [hROMBank]
push af
ld a, BANK(MapGroupPointers)
@ -235,7 +235,7 @@ GetAnyMapEnvironment:: ; 2226
ld a, b
ret
GetWorldMapLocation:: ; 223c
GetWorldMapLocation::
ldh a, [hROMBank]
push af
ld a, BANK(MapGroupPointers)
@ -250,11 +250,11 @@ GetWorldMapLocation:: ; 223c
ret
EmptyFunction2252:: ; 2252
EmptyFunction2252::
ret
LoadMap:: ; 2253
LoadMap::
ldh a, [hMapEntryMethod]
and a ; Possible bug: if the entry method is $X0, this will overflow
ret z
@ -278,7 +278,7 @@ LoadMap:: ; 2253
dw MapSetup_2275 ; TODO
MapSetup_2275:: ; 2275
MapSetup_2275::
ldh a, [hROMBank]
push af
call MapSetup_22af ; TODO
@ -286,7 +286,7 @@ MapSetup_2275:: ; 2275
call Bankswitch
ret
MapSetup_Reload:: ; 2280
MapSetup_Reload::
call DisableLCD
call DisableAudio
call VolumeOff
@ -305,7 +305,7 @@ MapSetup_Reload:: ; 2280
call FadeIn
ret
MapSetup_22af:: ; 22af
MapSetup_22af::
call DisableLCD
call DisableAudio
call VolumeOff
@ -324,10 +324,10 @@ MapSetup_22af:: ; 22af
call FadeIn
ret
MapSetup_22de:: ; 22de
MapSetup_22de::
callab OverworldFadeOut
MapSetup_Continue:: ; 22e6
MapSetup_Continue::
call DisableLCD
call DisableAudio
call VolumeOff
@ -352,7 +352,7 @@ MapSetup_Continue:: ; 22e6
call FadeIn
ret
MapSetup_Warp:: ; 232c
MapSetup_Warp::
callab OverworldFadeOut
call DisableLCD
call Function27C7 ; TODO
@ -380,14 +380,14 @@ MapSetup_Warp:: ; 232c
call Function2407 ; TODO
ret
LoadMapTimeOfDay:: ; 237c
LoadMapTimeOfDay::
callab ReplaceTimeOfDayPals
call LoadMapPart
call .ClearBGMap
call .PushAttrMap
ret
.ClearBGMap ; 238e
.ClearBGMap
ld a, HIGH(vBGMap0)
ld [wBGMapAnchor + 1], a
xor a ; LOW(vBGMap0)
@ -401,7 +401,7 @@ LoadMapTimeOfDay:: ; 237c
call ByteFill
ret
.PushAttrMap ; 23a7
.PushAttrMap
decoord 0, 0
hlbgcoord 0, 0
ld c, SCREEN_WIDTH
@ -421,22 +421,22 @@ LoadMapTimeOfDay:: ; 237c
jr nz, .row
ret
LoadWildMons:: ; 23c1
LoadWildMons::
callab _LoadWildMons
ret
LoadGraphics:: ; 23ca
LoadGraphics::
call LoadTileset
call LoadTilesetGFX
callba RefreshSprites
call LoadFontExtra
ret
InitializeVisibleSprites:: ; 23dc
InitializeVisibleSprites::
callab _InitializeVisibleSprites
ret
FadeIn:: ; 23e5 ; This is not OverworldFadeIn, but I don't know what it is
FadeIn:: ; This is not OverworldFadeIn, but I don't know what it is
call InitToolgearBuffer
call RefreshTiles
ld hl, wVramState
@ -447,7 +447,7 @@ FadeIn:: ; 23e5 ; This is not OverworldFadeIn, but I don't know what it is
callab OverworldFadeIn
ret
Function2407:: ; 00:2407
Function2407::
ld a, NO_MOVEMENT
ld [wPlayerMovement], a
xor a
@ -473,7 +473,7 @@ Function2407:: ; 00:2407
call SetObjectFacing
ret
MapSetup_Connection:: ; 2439
MapSetup_Connection::
call EnterMapConnection
call CopyMapPartialAndAttributes
call SetUpMapBuffer
@ -489,7 +489,7 @@ MapSetup_Connection:: ; 2439
scf
ret
CheckMovingOffEdgeOfMap:: ; 245e
CheckMovingOffEdgeOfMap::
ld a, [wPlayerStepDirection]
cp STANDING
ret z
@ -548,7 +548,7 @@ CheckMovingOffEdgeOfMap:: ; 245e
scf
ret
EnterMapConnection: ; 24af
EnterMapConnection:
; Return carry if a connection has been entered.
ld a, [wPlayerStepDirection]
and a
@ -684,7 +684,7 @@ EnterMapConnection: ; 24af
ret
WarpCheck:: ; 259f
WarpCheck::
call GetDestinationWarpPointer
ret nc
ld a, [hli]
@ -700,7 +700,7 @@ WarpCheck:: ; 259f
scf
ret
GetDestinationWarpPointer: ; 25b9
GetDestinationWarpPointer:
ld a, [wPlayerNextMapY]
sub 4
ld d, a
@ -740,13 +740,13 @@ GetDestinationWarpPointer: ; 25b9
ret
CopyMapPartialAndAttributes:: ; 25ea
CopyMapPartialAndAttributes::
call SwitchToMapBank
call CopyAndReadHeaders
call ReadObjectEvents
ret
CopyAndReadHeaders:: ; 25f4
CopyAndReadHeaders::
call CopyMapPartial
call GetMapAttributesPointer
ld hl, wMapAttributesPtr
@ -772,7 +772,7 @@ CopyAndReadHeaders:: ; 25f4
call ReadSigns
ret
GetMapConnections:: ; 261d
GetMapConnections::
ld a, $ff
ld [wNorthConnectedMapGroup], a
ld [wSouthConnectedMapGroup], a
@ -807,7 +807,7 @@ GetMapConnections:: ; 261d
ret
GetMapConnection:: ; 2658
GetMapConnection::
ld c, wSouthMapConnection - wNorthMapConnection
.copy
ld a, [hli]
@ -818,7 +818,7 @@ GetMapConnection:: ; 2658
ret
ReadWarps:: ; 2661
ReadWarps::
ld a, [hli]
ld [wCurrMapWarpCount], a
and a
@ -840,7 +840,7 @@ ReadWarps:: ; 2661
ret
ReadSigns:: ; 2679
ReadSigns::
ld a, [hli]
ld [wCurrMapSignCount], a
and a
@ -860,7 +860,7 @@ ReadSigns:: ; 2679
ret
ReadObjectEvents:: ; 268f
ReadObjectEvents::
push hl
call ClearObjectStructs
pop de
@ -911,7 +911,7 @@ ReadObjectEvents:: ; 268f
ld l, e
ret
ClearObjectStructs:: ; 26cf
ClearObjectStructs::
xor a
ld [wUnkObjectStruct], a ; TODO
ld hl, wObject2Struct
@ -935,7 +935,7 @@ ClearObjectStructs:: ; 26cf
ret
ReadWord:: ; 26ef ; TODO: is this used?
ReadWord:: ; TODO: is this used?
ld e, [hl]
inc hl
ld d, [hl]
@ -943,7 +943,7 @@ ReadWord:: ; 26ef ; TODO: is this used?
ret
InitUnknownBuffercc9e:: ; 26f4
InitUnknownBuffercc9e::
xor a
ld hl, wUnknownWordcc9c
ld [hli], a
@ -995,7 +995,7 @@ InitUnknownBuffercc9e:: ; 26f4
ret
RestoreFacingAfterWarp:: ; 273d
RestoreFacingAfterWarp::
ld hl, wMapObjectsPtr
ld a, [hli]
ld h, [hl]
@ -1018,7 +1018,7 @@ RestoreFacingAfterWarp:: ; 273d
ret
Function275e:: ; 275e ; TODO: is this used?
Function275e:: ; TODO: is this used?
inc hl
inc hl
inc hl
@ -1035,7 +1035,7 @@ Function275e:: ; 275e ; TODO: is this used?
ret
GetCoordOfUpperLeftCorner:: ; 277a
GetCoordOfUpperLeftCorner::
ld hl, wOverworldMapBlocks
ld a, [wXCoord]
bit 0, a
@ -1081,7 +1081,7 @@ GetCoordOfUpperLeftCorner:: ; 277a
ld [wMetatileNextX], a
ret
Function27C7:: ; 27c7 ; TODO
Function27C7:: ; TODO
call GetMapEnvironment
cp 2
jr z, .interior
@ -1112,7 +1112,7 @@ Function27C7:: ; 27c7 ; TODO
ld [hli], a
ret
LoadMapPart:: ; 27fb
LoadMapPart::
callab UpdateTimeOfDayPal
ldh a, [hROMBank]
@ -1132,7 +1132,7 @@ LoadMapPart:: ; 27fb
call Bankswitch
ret
LoadMetatiles:: ; 2822
LoadMetatiles::
ld a, [wOverworldMapAnchor]
ld e, a
ld a, [wOverworldMapAnchor + 1]
@ -1173,7 +1173,7 @@ LoadMetatiles:: ; 2822
jr nz, .row
ret
ApplyFlashlight:: ; 285a
ApplyFlashlight::
ld hl, wTileMapBackup
ld a, [wMetatileNextY]
and a
@ -1253,19 +1253,19 @@ redraw_with_flashlight: MACRO
jr nz, .row\1
ENDM
.force_1 ; 289b
.force_1
redraw_with_flashlight 1
ret
.force_2 ; 28be
.force_2
redraw_with_flashlight 2
ret
.force_3 ; 28e1
.force_3
redraw_with_flashlight 3
ret
.force_9001 ; 2904
.force_9001
; Actually force 4, but this also applies to larger values
decoord 4 * 2, 4 * 2
ld bc, 4 * $32 ; TODO: constantify the $32
@ -1290,7 +1290,7 @@ ENDM
ld [de], a
ret
DrawMetatile:: ; 2921
DrawMetatile::
push hl
ld hl, wTilesetBlocksAddress
ld a, [hli]
@ -1323,7 +1323,7 @@ ENDR
ret
ChangeMap:: ; 294d
ChangeMap::
ld hl, wOverworldMapBlocks
ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
ld a, 0
@ -1368,7 +1368,7 @@ ChangeMap:: ; 294d
dec b
jr nz, .row
; FillMapConnections:: ; 298e
; FillMapConnections::
ld a, [wNorthConnectedMapGroup]
cp $ff
@ -1465,7 +1465,7 @@ ChangeMap:: ; 294d
ret
FillNorthConnectionStrip::
FillSouthConnectionStrip:: ; 2a3d
FillSouthConnectionStrip::
ld c, 3
.y
@ -1501,7 +1501,7 @@ FillSouthConnectionStrip:: ; 2a3d
; 25f6
FillWestConnectionStrip::
FillEastConnectionStrip:: ; 2a60
FillEastConnectionStrip::
.loop
ld a, [wMapWidth]
@ -1539,12 +1539,12 @@ FillEastConnectionStrip:: ; 2a60
ret
Function2a85::
.asm_2a85: ; 00:2a85
.asm_2a85:
call LoadMap
call Function2a8d
jr .asm_2a85
Function2a8d:: ; 00:2a8d
Function2a8d::
push hl
push de
push bc
@ -1570,14 +1570,14 @@ Function2a8d:: ; 00:2a8d
push de
jp hl
.Return: ; 00:2aac
.Return:
pop af
pop bc
pop de
pop hl
ret
.Pointers: ; 00:2ab1
.Pointers:
dbbw $00, $55, Function2ae5
dbbw $00, $55, Function2b52
dbbw $00, $55, Function2b77
@ -1593,7 +1593,7 @@ Function2a8d:: ; 00:2a8d
dbbw $05, $33, Function14777
Function2ae5::
.loop: ; 00:2ae5
.loop:
ld hl, wJoypadFlags
set 4, [hl]
set 6, [hl]
@ -1642,7 +1642,7 @@ Function2b39::
ret
Function2b52::
.asm_2b52: ; 00:2b52
.asm_2b52:
call UpdateTime
ld a, [wVramState]
bit 7, a
@ -1672,7 +1672,7 @@ Function2b79::
ret
Function2b87::
.asm_2b87: ; 00:2b87
.asm_2b87:
call UpdateTime
call GetJoypad
call OverworldStartButtonCheck
@ -1683,7 +1683,7 @@ Function2b87::
callba Function824c
jr .asm_2b87
Function2ba8:: ; 00:2ba8
Function2ba8::
ldh a, [hROMBank]
push af
ld a, BANK(Function50b9)
@ -1712,7 +1712,7 @@ Function2ba8:: ; 00:2ba8
scf
ret
Function2be5:: ; 00:2be5 ; TODO
Function2be5:: ; TODO
ld a, [wDebugFlags]
bit 7, a
ret nz
@ -1730,5 +1730,5 @@ Function2be5:: ; 00:2be5 ; TODO
push de
jp hl
.Return: ; 00:2c04
.Return:
ret

64
home/map_objects.asm
View File

@ -2,11 +2,11 @@ include "constants.asm"
SECTION "home/map_objects.asm", ROM0
Function15b5:: ; 15b5
Function15b5::
callab Function8000
ret
GetMapObject:: ; 00:15be
GetMapObject::
ld hl, wMapObjects
ld bc, MAP_OBJECT_LENGTH
call AddNTimes
@ -14,13 +14,13 @@ GetMapObject:: ; 00:15be
ld c, l
ret
GetMapObjectAttrPtr:: ; 15ca
GetMapObjectAttrPtr::
call GetMapObject
ld d, $0
add hl, de
ret
Function15d1:: ; 15d1
Function15d1::
ldh [hMapObjectIndexBuffer], a
call GetMapObject
call Function40eb
@ -52,7 +52,7 @@ Function1602::
callab Function813d
ret
Function1617:: ; 00:1617
Function1617::
ldh [hMapObjectIndexBuffer], a
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
@ -68,13 +68,13 @@ Function1617:: ; 00:1617
jr nz, .asm_1633
ld a, $ff
ld [wObjectFollow_Leader], a
.asm_1633: ; 00:1633
.asm_1633:
ld a, [wObjectFollow_Follower]
cp d
jr nz, .asm_163e
ld a, $0
ld [wObjectFollow_Follower], a
.asm_163e: ; 00:163e
.asm_163e:
pop af
call GetObjectStruct
ld bc, OBJECT_LENGTH
@ -156,7 +156,7 @@ Function169f::
jr nz, .asm_16c5
ld a, $ff
ld [wObjectFollow_Leader], a
.asm_16c5: ; 00:16c5
.asm_16c5:
ld a, b
call GetObjectStruct
ld bc, OBJECT_LENGTH
@ -203,10 +203,10 @@ Function16fb::
ld hl, OBJECT_FACING
add hl, bc
ld [hl], $0
.asm_171f: ; 00:171f
.asm_171f:
ret
CheckObjectVisibility:: ; 00:1720
CheckObjectVisibility::
ldh [hMapObjectIndexBuffer], a
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
@ -219,11 +219,11 @@ CheckObjectVisibility:: ; 00:1720
and a
ret
.asm_1735: ; 00:1735
.asm_1735:
scf
ret
PushToCmdQueue:: ; 1737
PushToCmdQueue::
push de
call GetCmdQueueEmptySlot
pop de
@ -285,11 +285,11 @@ PushToCmdQueue:: ; 1737
ld [hl], a
ret
GetCmdQueueEmptySlot:: ; 00:178e
GetCmdQueueEmptySlot::
ld hl, wCmdQueue
ld de, CMDQUEUE_ENTRY_SIZE
ld a, 1
.asm_1796: ; 00:1796
.asm_1796:
ldh [hObjectStructIndexBuffer], a
ld a, [hl]
and a
@ -302,11 +302,11 @@ GetCmdQueueEmptySlot:: ; 00:178e
scf
ret
.asm_17a6: ; 00:17a6
.asm_17a6:
xor a
ret
UpdateSprites:: ; 00:17a8
UpdateSprites::
ld a, [wVramState]
bit 0, a
ret z
@ -314,7 +314,7 @@ UpdateSprites:: ; 00:17a8
callab _UpdateSprites
ret
GetObjectStruct:: ; 00:17bf
GetObjectStruct::
; Puts the start of the a'th object struct into bc
ld bc, $28
ld hl, wObjectStructs
@ -338,7 +338,7 @@ Function17cd::
ret
; sets carry flag if the sprite data includes "in-motion" sprites
IsAnimatedSprite:: ; 00:17de
IsAnimatedSprite::
push hl
push bc
ld c, a
@ -356,7 +356,7 @@ IsAnimatedSprite:: ; 00:17de
pop hl
ret
.NonAnimatedSprites: ; 00:17f1
.NonAnimatedSprites:
db SPRITE_KABIGON
db SPRITE_POKE_BALL
db SPRITE_POKEDEX
@ -395,10 +395,10 @@ Function1813::
set 5, [hl]
ret
Function1828:: ; 00:1828
Function1828::
ld bc, wObjectStructs
xor a
.asm_182c: ; 00:182c
.asm_182c:
push af
ld hl, OBJECT_SPRITE
add hl, bc
@ -408,7 +408,7 @@ Function1828:: ; 00:1828
ld hl, OBJECT_FLAGS + 1
add hl, bc
set 5, [hl]
.asm_183b: ; 00:183b
.asm_183b:
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
@ -423,7 +423,7 @@ Function1848::
push bc
ld bc, wObjectStructs
xor a
.asm_184d: ; 00:184d
.asm_184d:
push af
ld hl, OBJECT_SPRITE
add hl, bc
@ -433,7 +433,7 @@ Function1848::
ld hl, OBJECT_FLAGS + 1
add hl, bc
res 5, [hl]
.asm_185c: ; 00:185c
.asm_185c:
ld hl, OBJECT_LENGTH
add hl, bc
ld b, h
@ -460,7 +460,7 @@ Function186a::
Function187f::
xor a
.asm_1880: ; 00:1880
.asm_1880:
push af
push hl
ld b, a
@ -484,7 +484,7 @@ Function187f::
jr nz, .asm_1880
ret
._hl_: ; 00:189f
._hl_:
jp hl
Function18a0::
@ -526,7 +526,7 @@ Function18cc::
ld [hl], $0
ret
Function18e5:: ; 00:18e5
Function18e5::
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld a, [hl]
@ -562,7 +562,7 @@ Function1908::
ld [wCenteredObject], a
ret
Function191d:: ; 00:191d
Function191d::
ld a, [wCenteredObject]
cp $ff
ret z
@ -586,7 +586,7 @@ StartFollow::
callab QueueFollowerFirstStep
ret
SetLeaderIfVisible:: ; 00:1945
SetLeaderIfVisible::
call CheckObjectVisibility
ret c
ldh a, [hObjectStructIndexBuffer]
@ -598,7 +598,7 @@ ResetLeader::
ld [wObjectFollow_Leader], a
ret
SetFollowerIfVisible:: ; 00:1954
SetFollowerIfVisible::
push af
call ResetFollower
pop af
@ -614,7 +614,7 @@ SetFollowerIfVisible:: ; 00:1954
ld [wObjectFollow_Follower], a
ret
ResetFollower:: ; 00:196f
ResetFollower::
ld a, [wObjectFollow_Follower]
and a
ret z
@ -672,7 +672,7 @@ Function19b5::
res 7, [hl]
ret
SetObjectFacing:: ; 19C0
SetObjectFacing::
; a is NPC number, d is direction
push de
call CheckObjectVisibility

8
home/menu.asm
View File

@ -22,7 +22,7 @@ MenuTextBox::
; unused
ret
.Data: ; 00:1d65
.Data:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw VRAM_Begin
@ -63,11 +63,11 @@ VerticalMenu::
call Get2DMenuJoypad
bit 1, a
jr z, .asm_1dac
.asm_1daa: ; 00:1daa
.asm_1daa:
scf
ret
.asm_1dac: ; 00:1dac
.asm_1dac:
and a
ret
@ -292,7 +292,7 @@ RunMenuItemPrintingFunction::
call MenuBoxCoord2Tile
ld bc, 2 * SCREEN_WIDTH + 2
add hl, bc
.asm_1f09: ; 00:1f09
.asm_1f09:
inc de
ld a, [de]
cp -1

4
home/menu_window.asm
View File

@ -309,12 +309,12 @@ Function1c0a::
ld hl, sSpriteBuffer0
decoord 0, 0
ld bc, $168
.asm_1c33: ; 00:1c33
.asm_1c33:
ld a, [hl]
cp $61
jr c, .asm_1c39
ld [de], a
.asm_1c39: ; 00:1c39
.asm_1c39:
inc hl
inc de
dec bc

4
home/misc_32c8.asm
View File

@ -43,7 +43,7 @@ WaitPressedAny::
; Reset hJoypadSum to clear button history
xor a
ldh [hJoypadSum], a
.loop: ; 00:369d
.loop:
; Wait for joypad polling.
call DelayFrame
@ -53,7 +53,7 @@ WaitPressedAny::
jr z, .not_pressed
and d
ret nz
.not_pressed: ; 00:36a7
.not_pressed:
; If bc < 0, don't check timeout.
bit 7, b

26
home/pic.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "home/pic.asm", ROM0
UncompressSpriteData:: ; 95e (0:95e)
UncompressSpriteData::
; bankswitches and runs _UncompressSpriteData
; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr
ld b, a
@ -18,7 +18,7 @@ UncompressSpriteData:: ; 95e (0:95e)
call Bankswitch
ret
_UncompressSpriteData:: ; 976 (0:976)
_UncompressSpriteData::
; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop
ld hl, sSpriteBuffer1
ld c, (2 * SPRITEBUFFERSIZE) % $100
@ -144,7 +144,7 @@ UncompressSpriteDataLoop::
jr nz, .writeZerosLoop
jr .readNextInput
MoveToNextBufferPosition:: ; a34 (0:a34)
MoveToNextBufferPosition::
; moves output pointer to next position
; also cancels the calling function if the all output is done (by removing the return pointer from stack)
; and calls postprocessing functions according to the unpack mode
@ -207,7 +207,7 @@ MoveToNextBufferPosition:: ; a34 (0:a34)
.done
jp UnpackSprite
WriteSpriteBitsToBuffer:: ; aa5 (0:aa5)
WriteSpriteBitsToBuffer::
; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr)
ld e, a
ld a, [wSpriteOutputBitOffset]
@ -235,7 +235,7 @@ WriteSpriteBitsToBuffer:: ; aa5 (0:aa5)
ld [hl], a
ret
ReadNextInputBit:: ; acc (0:acc)
ReadNextInputBit::
; reads next bit from input stream and returns it in a
ld a, [wSpriteInputBitCounter]
dec a
@ -251,7 +251,7 @@ ReadNextInputBit:: ; acc (0:acc)
and $01
ret
ReadNextInputByte: ; ae7 (0:ae7)
ReadNextInputByte:
; reads next byte from input stream and returns it in a
ld a, [wSpriteInputPtr]
ld l, a
@ -285,7 +285,7 @@ LengthEncodingOffsetList::
dw %0111111111111111
dw %1111111111111111
UnpackSprite:: ; b1b (0:b1b)
UnpackSprite::
; unpacks the sprite data depending on the unpack mode
ld a, [wSpriteUnpackMode]
cp $02
@ -383,7 +383,7 @@ SpriteDifferentialDecode::
ld [wSpriteCurPosY], a
ret
DifferentialDecodeNybble:: ; bc9 (0:bc9)
DifferentialDecodeNybble::
; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1)
srl a ; c=a%2, a/=2
ld c, $00
@ -463,7 +463,7 @@ DecodeNybble1TableFlipped::
dn $e, $6
dn $2, $a
XorSpriteChunks:: ; c23 (0:c23)
XorSpriteChunks::
; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differentially decoded beforehand.
xor a
ld [wSpriteCurPosX], a
@ -528,7 +528,7 @@ XorSpriteChunks:: ; c23 (0:c23)
ld [wSpriteCurPosX], a
ret
ReverseNybble:: ; c93 (0:c93)
ReverseNybble::
; reverses the bits in the nybble given in register a
ld de, NybbleReverseTable
add e
@ -539,7 +539,7 @@ ReverseNybble:: ; c93 (0:c93)
ld a, [de]
ret
ResetSpriteBufferPointers:: ; c9d (0:c9d)
ResetSpriteBufferPointers::
; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags
ld a, [wSpriteLoadFlags]
bit 0, a
@ -565,7 +565,7 @@ ResetSpriteBufferPointers:: ; c9d (0:c9d)
NybbleReverseTable::
db $0, $8, $4, $c, $2, $a, $6 ,$e, $1, $9, $5, $d, $3, $b, $7 ,$f
UnpackSpriteMode2:: ; cd3 (0:cd3)
UnpackSpriteMode2::
; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differentially decoded beforehand.
call ResetSpriteBufferPointers
ld a, [wSpriteFlipped]
@ -582,7 +582,7 @@ UnpackSpriteMode2:: ; cd3 (0:cd3)
ld [wSpriteFlipped], a
jp XorSpriteChunks
StoreSpriteOutputPointer:: ; cf3 (0:cf3)
StoreSpriteOutputPointer::
; stores hl into the output pointers
ld a, l
ld [wSpriteOutputPtr], a

108
home/text.asm
View File

@ -2,17 +2,17 @@ INCLUDE "constants.asm"
SECTION "home/text.asm", ROM0
ClearBox:: ; 00:0e18
ClearBox::
; Fill a c*b box at hl with blank tiles.
ld a, "　"
; fallthrough
FillBoxWithByte::
ld de, SCREEN_WIDTH
.asm_0e1d: ; 00:0e1d
.asm_0e1d:
push hl
push bc
.asm_0e1f: ; 00:0e1f
.asm_0e1f:
ld [hli], a
dec c
jr nz, .asm_0e1f
@ -23,7 +23,7 @@ FillBoxWithByte::
jr nz, .asm_0e1d
ret
ClearTileMap:: ; 00:0e2a
ClearTileMap::
; Fill wTileMap with blank tiles.
hlcoord 0, 0
@ -35,7 +35,7 @@ ClearTileMap:: ; 00:0e2a
ret z
jp WaitBGMap
DrawTextBox:: ; 00:0e3d
DrawTextBox::
; Top
push hl
@ -74,7 +74,7 @@ DrawTextBox:: ; 00:0e3d
ret
; e6a
.PlaceChars: ; e6a
.PlaceChars:
; Place char a c times.
ld d, c
.loop
@ -105,9 +105,9 @@ SpeechTextBox::
ld c, TEXTBOX_INNERW
jp DrawTextBox
PlaceString:: ; 00:0e93
PlaceString::
push hl
PlaceNextChar:: ; 00:0e94
PlaceNextChar::
ld a, [de]
cp "@"
jr nz, CheckDict
@ -116,7 +116,7 @@ PlaceNextChar:: ; 00:0e94
pop hl
ret
CheckDict:: ; 00:0e9d
CheckDict::
dict: MACRO
if \1 == 0
and a
@ -134,7 +134,7 @@ ENDM
push hl
jp NextChar
.asm_0eaa: ; 00:0eaa
.asm_0eaa:
cp "<LINE>"
jr nz, .asm_0eb6
pop hl
@ -142,7 +142,7 @@ ENDM
push hl
jp NextChar
.asm_0eb6: ; 00:0eb6
.asm_0eb6:
dict 0, NullChar
dict "<SCROLL>", _ContTextNoPause
dict "<_CONT>", _ContText
@ -168,7 +168,7 @@ ENDM
jr z, .diacritic
cp "ﾞ"
jr nz, .not_diacritic
.diacritic: ; 00:0f21
.diacritic:
push hl
ld bc, -SCREEN_WIDTH
add hl, bc
@ -176,7 +176,7 @@ ENDM
pop hl
jr NextChar
.not_diacritic: ; 00:0f2a
.not_diacritic:
cp FIRST_REGULAR_TEXT_CHAR
jr nc, .place
cp "パ"
@ -186,9 +186,9 @@ ENDM
add "カ" - "ガ"
jr .katakana_dakuten
.hiragana_dakuten: ; 00:0f3a
.hiragana_dakuten:
add "か" - "が"
.katakana_dakuten: ; 00:0f3c
.katakana_dakuten:
push af
ld a, "ﾞ"
push hl
@ -199,15 +199,15 @@ ENDM
pop af
jr .place
.handakuten: ; 00:0f49
.handakuten:
cp "ぱ"
jr nc, .hiragana_handakuten
add "ハ" - "パ"
jr .katakana_handakuten
.hiragana_handakuten: ; 00:0f51
.hiragana_handakuten:
add "は" - "ぱ"
.katakana_handakuten: ; 00:0f53
.katakana_handakuten:
push af
ld a, "ﾟ"
push hl
@ -216,14 +216,14 @@ ENDM
ld [hl], a
pop hl
pop af
.place: ; 00:0f5e
.place:
ld [hli], a
call PrintLetterDelay
NextChar:: ; 00:0f62
NextChar::
inc de
jp PlaceNextChar
NullChar:: ; 00:0f66
NullChar::
ld b, h
ld c, l
pop hl
@ -254,27 +254,27 @@ PlacePOKe:: print_name POKeCharText
SixDotsChar:: print_name SixDotsCharText
GaCharacter:: print_name GaCharacterTExt
PlaceMoveTargetsName:: ; 00:0fb3
PlaceMoveTargetsName::
ldh a, [hBattleTurn]
xor $1
jr asm_0fbb
PlaceMoveUsersName:: ; 00:0fb9
PlaceMoveUsersName::
ldh a, [hBattleTurn]
asm_0fbb: ; 00:0fbb
asm_0fbb:
push de
and a
jr nz, .asm_0fc4
ld de, wEnemyMonNickname
jr PlaceCommandCharacter
.asm_0fc4: ; 00:0fc4
.asm_0fc4:
ld de, EnemyText
call PlaceString
ld h, b
ld l, c
ld de, wBattleMonNickname
PlaceCommandCharacter: ; 00:0fcf
PlaceCommandCharacter:
call PlaceString
ld h, b
ld l, c
@ -291,7 +291,7 @@ SixDotsCharText:: db "⋯⋯@"
EnemyText:: db "てきの　@"
GaCharacterTExt:: db "が　@"
ContText:: ; 00:1001
ContText::
push de
ld b, h
ld c, l
@ -307,32 +307,32 @@ ContText:: ; 00:1001
text "<_CONT>@"
db "@"
PlaceDexEnd:: ; 00:1015
PlaceDexEnd::
ld [hl], "。"
pop hl
ret
PromptText:: ; 00:1019
PromptText::
ld a, [wLinkMode]
cp $3
jp z, Function1026
ld a, "▼"
ldcoord_a 18, 17
Function1026:: ; 00:1026
Function1026::
call ProtectedWaitBGMap
call ButtonSound
ld a, "─"
ldcoord_a 18, 17
DoneText:: ; 00:1031
DoneText::
pop hl
ld de, .Text
dec de
ret
.Text:: ; 00:1037
.Text::
db "@"
Paragraph:: ; 00:1038
Paragraph::
push de
ld a, "▼"
ldcoord_a 18, 17
@ -349,7 +349,7 @@ Paragraph:: ; 00:1038
hlcoord 1, 14
jp NextChar
_ContText:: ; 00:105e
_ContText::
ld a, "▼"
ldcoord_a 18, 17
call ProtectedWaitBGMap
@ -358,7 +358,7 @@ _ContText:: ; 00:105e
pop de
ld a, "─"
ldcoord_a 18, 17
_ContTextNoPause:: ; 00:1070
_ContTextNoPause::
push de
call ScrollTextUpOneLine
call ScrollTextUpOneLine
@ -366,7 +366,7 @@ _ContTextNoPause:: ; 00:1070
pop de
jp NextChar
ScrollTextUpOneLine:: ; 107e (0:107e)
ScrollTextUpOneLine::
; move both rows of text in the normal text box up one row
; always called twice in a row
; first time, copy the two rows of text to the "in between" rows that are usually emtpy
@ -394,13 +394,13 @@ ScrollTextUpOneLine:: ; 107e (0:107e)
jr nz, .waitFrame
ret
ProtectedWaitBGMap:: ; 10a0 (0:10a0)
ProtectedWaitBGMap::
push bc
call WaitBGMap
pop bc
ret
TextCommandProcessor:: ; 10a6 (0:10a6)
TextCommandProcessor::
; Process a string of text commands
; at hl and write text to bc
ld a, [wTextBoxFlags]
@ -413,7 +413,7 @@ TextCommandProcessor:: ; 10a6 (0:10a6)
ld [wTextDest + 1], a
; fall through
NextTextCommand:: ; 10b7 (0:10b7)
NextTextCommand::
ld a, [hli]
cp "@" ; terminator
jr nz, .doTextCommand
@ -434,7 +434,7 @@ NextTextCommand:: ; 10b7 (0:10b7)
ld l, a
jp hl
Text_TX_BOX:: ; 10d0 (0:10d0)
Text_TX_BOX::
; TX_BOX
; draw a box
; little endian
@ -455,7 +455,7 @@ Text_TX_BOX:: ; 10d0 (0:10d0)
pop hl
jr NextTextCommand
Text_TX:: ; 10e2 (0:10e2)
Text_TX::
; TX
; write text until "@"
; [$00]["...@"]
@ -470,7 +470,7 @@ Text_TX:: ; 10e2 (0:10e2)
inc hl
jr NextTextCommand
Text_TX_RAM:: ; 10ef (0:10ef)
Text_TX_RAM::
; text_from_ram
; write text from a ram address
; little endian
@ -487,7 +487,7 @@ Text_TX_RAM:: ; 10ef (0:10ef)
pop hl
jr NextTextCommand
Text_TX_BCD:: ; 10fd (0:10fd)
Text_TX_BCD::
; TX_BCD
; write bcd from address, typically ram
; [$02][addr][flags]
@ -508,7 +508,7 @@ Text_TX_BCD:: ; 10fd (0:10fd)
pop hl
jr NextTextCommand
Text_TX_MOVE:: ; 110f (0:110f)
Text_TX_MOVE::
; TX_MOVE
; move to a new tile
; [$03][addr]
@ -521,7 +521,7 @@ Text_TX_MOVE:: ; 110f (0:110f)
ld b, a
jp NextTextCommand
Text_TX_LOW:: ; 111d (0:111d)
Text_TX_LOW::
; TX_LOW
; write text at (1,16)
; [$05]
@ -530,7 +530,7 @@ Text_TX_LOW:: ; 111d (0:111d)
jp NextTextCommand
; 0x1124
Text_WAIT_BUTTON:: ; 1124 (0:1124)
Text_WAIT_BUTTON::
; TX_WAITBUTTON
; wait for button press
; show arrow
@ -548,7 +548,7 @@ Text_WAIT_BUTTON:: ; 1124 (0:1124)
pop hl
jp NextTextCommand
Text_TX_SCROLL:: ; 113f (0:113f)
Text_TX_SCROLL::
; TX_SCROLL
; pushes text up two lines and sets the BC cursor to the border tile
; below the first character column of the text box.
@ -561,7 +561,7 @@ Text_TX_SCROLL:: ; 113f (0:113f)
coord bc, TEXTBOX_INNERX, TEXTBOX_INNERY + 2
jp NextTextCommand
Text_START_ASM:: ; 1151 (0:1151)
Text_START_ASM::
; TX_ASM
; Executes code following this command.
; Text processing is resumed upon returning.
@ -571,7 +571,7 @@ Text_START_ASM:: ; 1151 (0:1151)
push de
jp hl
Text_TX_NUM:: ; 1157 (0:1157)
Text_TX_NUM::
; TX_NUM
; [$09][addr][hi:bytes lo:digits]
pop hl
@ -598,7 +598,7 @@ Text_TX_NUM:: ; 1157 (0:1157)
jp NextTextCommand
; 0x1175
Text_TX_EXIT: ; 1175 (0:1175)
Text_TX_EXIT:
; TX_EXIT
; [$0A]
push bc
@ -614,7 +614,7 @@ Text_TX_EXIT: ; 1175 (0:1175)
jp NextTextCommand
; 0x1189
Text_PlaySound:: ; 1189 (0:1189)
Text_PlaySound::
; Text_PlaySound
; [0B|0E..13] Play Sound Effects
; [14..16] Play Pokémon Cries
@ -672,7 +672,7 @@ Text_PlaySound:: ; 1189 (0:1189)
dbw TX_CRY_15, MON_PIGEOT
dbw TX_CRY_16, MON_JUGON
Text_TX_DOTS: ; 11e1 (0:11e1)
Text_TX_DOTS:
pop hl
ld a, [hli]
ld d, a
@ -698,7 +698,7 @@ Text_TX_DOTS: ; 11e1 (0:11e1)
pop hl
jp NextTextCommand
Text_TX_LINK_WAIT_BUTTON:: ; 1203 (0:1203)
Text_TX_LINK_WAIT_BUTTON::
push bc
call ButtonSound
pop bc
@ -706,7 +706,7 @@ Text_TX_LINK_WAIT_BUTTON:: ; 1203 (0:1203)
jp NextTextCommand
; 0x120c
TextCommands:: ; 120c
TextCommands::
dw Text_TX
dw Text_TX_RAM
dw Text_TX_BCD

2
home/unknown_388f.asm
View File

@ -83,7 +83,7 @@ Function3920::
call WriteIntod637
ret
.asm_392d: ; 00:392d
.asm_392d:
ld hl, wJoypadFlags
res 4, [hl]
ld hl, .text

44
home/vcopy.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "home/vcopy.asm", ROM0
RedrawRowOrColumn:: ; 123a (0:123a)
RedrawRowOrColumn::
; This function redraws a BG row of height 2 or a BG column of width 2.
; One of its main uses is redrawing the row or column that will be exposed upon
; scrolling the BG when the player takes a step. Redrawing only the exposed
@ -116,7 +116,7 @@ RedrawRowOrColumn:: ; 123a (0:123a)
dw RedrawFlashlightColumn3 ; $1301
dw RedrawFlashlightColumn3 ; $1301
RedrawFlashlightColumn0:: ; 12c3 (0:12c3)
RedrawFlashlightColumn0::
ldh a, [hSCX]
and $07
ret nz ; wait till we moved one complete tile in X
@ -131,7 +131,7 @@ RedrawFlashlightColumn0:: ; 12c3 (0:12c3)
call _RedrawFlashlightColumn
ret
RedrawFlashlightColumn1:: ; 12dc (0:12dc)
RedrawFlashlightColumn1::
ld a, [wRedrawFlashlightBlackDst0]
ld e, a
ld a, [wRedrawFlashlightBlackDst0 + 1]
@ -140,7 +140,7 @@ RedrawFlashlightColumn1:: ; 12dc (0:12dc)
ret
; 0x12e8
RedrawFlashlightColumn2:: ; 12e8 (0:12e8)
RedrawFlashlightColumn2::
ldh a, [hSCX]
and $0f
ret nz ; wait till we moved two complete tiles in X
@ -155,7 +155,7 @@ RedrawFlashlightColumn2:: ; 12e8 (0:12e8)
call _RedrawFlashlightColumn
ret
RedrawFlashlightColumn3:: ; 1301 (0:1301)
RedrawFlashlightColumn3::
ld a, [wRedrawFlashlightBlackDst1]
ld e, a
ld a, [wRedrawFlashlightBlackDst1 + 1]
@ -165,7 +165,7 @@ RedrawFlashlightColumn3:: ; 1301 (0:1301)
ldh [hRedrawRowOrColumnMode], a ; end flashlight redraw
ret
RedrawFlashlightRow0:: ; 1310 (0:1310)
RedrawFlashlightRow0::
ldh a, [hSCY]
and $07
ret nz ; wait till we moved one complete tile in Y
@ -180,7 +180,7 @@ RedrawFlashlightRow0:: ; 1310 (0:1310)
call _RedrawFlashlightRow
ret
RedrawFlashlightRow1:: ; 1329 (0:1329)
RedrawFlashlightRow1::
ld a, [wRedrawFlashlightBlackDst0]
ld e, a
ld a, [wRedrawFlashlightBlackDst0 + 1]
@ -189,7 +189,7 @@ RedrawFlashlightRow1:: ; 1329 (0:1329)
ret
; 0x12e8
RedrawFlashlightRow2:: ; 1335 (0:1335)
RedrawFlashlightRow2::
ldh a, [hSCY]
and $0f
ret nz ; wait till we moved two complete tiles in Y
@ -204,7 +204,7 @@ RedrawFlashlightRow2:: ; 1335 (0:1335)
call _RedrawFlashlightRow
ret
RedrawFlashlightRow3:: ; 134e (0:134e)
RedrawFlashlightRow3::
ld a, [wRedrawFlashlightBlackDst1]
ld e, a
ld a, [wRedrawFlashlightBlackDst1 + 1]
@ -214,7 +214,7 @@ RedrawFlashlightRow3:: ; 134e (0:134e)
ldh [hRedrawRowOrColumnMode], a ; end flashlight redraw
ret
_RedrawFlashlightColumn:: ; 135d (0:135d)
_RedrawFlashlightColumn::
ld a, [wRedrawFlashlightWidthHeight]
add a
ld c, a
@ -245,7 +245,7 @@ _RedrawFlashlightColumn:: ; 135d (0:135d)
ldh [hRedrawRowOrColumnMode], a ; has four directions
ret
_RedrawFlashlightRow:: ; 1382 (0:1382)
_RedrawFlashlightRow::
ld a, [wRedrawFlashlightWidthHeight]
ld c, a
.loop
@ -270,7 +270,7 @@ _RedrawFlashlightRow:: ; 1382 (0:1382)
ldh [hRedrawRowOrColumnMode], a ; has four directions
ret
_RedrawFlashlightColumnBlack:: ; 139f (0:139f)
_RedrawFlashlightColumnBlack::
ld l, e
ld h, d
ld b, "■"
@ -293,7 +293,7 @@ _RedrawFlashlightColumnBlack:: ; 139f (0:139f)
ldh [hRedrawRowOrColumnMode], a ; has four directions
ret
_RedrawFlashlightRowBlack:: ; 13bd (0:13bd)
_RedrawFlashlightRowBlack::
ld l, e
ld h, d
ld b, "■"
@ -319,7 +319,7 @@ _RedrawFlashlightRowBlack:: ; 13bd (0:13bd)
ldh [hRedrawRowOrColumnMode], a ; has four directions
ret
WaitForAutoBgMapTransfer:: ; 13dc (0:13dc)
WaitForAutoBgMapTransfer::
.loop
ldh a, [hBGMapMode]
and a
@ -341,7 +341,7 @@ WaitForAutoBgMapTransfer:: ; 13dc (0:13dc)
; on when talking to sprites, battling, using menus, etc. This is because
; the above function, RedrawRowOrColumn, is used when walking to
; improve efficiency.
AutoBgMapTransfer:: ; 13ee (0:13ee)
AutoBgMapTransfer::
ldh a, [hBGMapMode]
and a
ret z
@ -386,7 +386,7 @@ AutoBgMapTransfer:: ; 13ee (0:13ee)
ld a, $06 ; 6 rows of SCREEN_WIDTH each
; fallthrough
TransferBgRows:: ; 1430 (0:1430)
TransferBgRows::
ld bc, BG_MAP_WIDTH - SCREEN_WIDTH + 1
.loop
@ -412,7 +412,7 @@ TransferBgRows:: ; 1430 (0:1430)
ld sp, hl
ret
VBlankCopyDouble:: ; 1470 (0:1470)
VBlankCopyDouble::
; Copy [wVBCopyDoubleSize] 1bpp tiles
; from wVBCopyDoubleSrc to wVBCopyDoubleDst.
; wVBCopyDoubleDst must be aligned to 0x10 bytes.
@ -474,7 +474,7 @@ VBlankCopyDouble:: ; 1470 (0:1470)
ld sp, hl
ret
VBlankCopy:: ; 14c7 (0:14c7)
VBlankCopy::
; Copy 16 * [wVBCopySize] bytes
; from wVBCopySrc to wVBCopyDst.
; wVBCopyDst must be aligned to 0x10 bytes.
@ -527,7 +527,7 @@ VBlankCopy:: ; 14c7 (0:14c7)
ld sp, hl
ret
AnimateTileset:: ; 1522 (0:1522)
AnimateTileset::
ldh a, [hROMBank]
push af
ld a, BANK(AnimateTilesetImpl)
@ -537,14 +537,14 @@ AnimateTileset:: ; 1522 (0:1522)
jp Bankswitch
; 0x1531
EnableSprites:: ; 1531 (0:1531)
EnableSprites::
nop
ld hl, rLCDC
set rLCDC_SPRITES_ENABLE, [hl]
ret
; 0x1538
TransferToolgearRow: ; 1538 (0:1538)
TransferToolgearRow:
; TransferToolgearRow
; Copy second line of toolgear to window
ld a, [wToolgearFlags]
@ -563,7 +563,7 @@ TransferToolgearRow: ; 1538 (0:1538)
ld a, $01
jp TransferBgRows
VBlankCopyFar:: ; 1558 (0:1558)
VBlankCopyFar::
; Copy 0x10 * [wVBCopyFarSize] bytes
; from wVBCopyFarSrcBank::wVBCopyFarSrc to wVBCopyFarDst.
; wVBCopyFarDst must be aligned to 0x10 bytes.

140
hram.asm
View File

@ -1,95 +1,95 @@
SECTION "HRAM", HRAM
hOAMDMA:: ; ff80
hOAMDMA::
ds 10
ds 3 ; TODO
hRTCHours:: db ; ff8d
hRTCMinutes:: db ; ff8e
hRTCSeconds:: db ; ff8f
hRTCDays:: db ; ff90
hRTCHours:: db
hRTCMinutes:: db
hRTCSeconds:: db
hRTCDays:: db
ds 2 ; TODO
hRTCStatusFlags:: db ; ff93
hRTCStatusFlags:: db
ds 3 ; TODO
hVBlankCounter:: ; ff97
hVBlankCounter::
db
hROMBank:: ; ff98
hROMBank::
db
hVBlank:: ; ff99
hVBlank::
db
hMapEntryMethod:: ; ff9a
hMapEntryMethod::
db
hStartmenuCloseAndSelectHookEnable:: db ; ff9b
hStartmenuCloseAndSelectHookEnable:: db
hStartmenuCloseAndSelectHookTemp:: db ; ff9c
hStartmenuCloseAndSelectHookTemp:: db
hJoypadUp:: db ; ff9d
hJoypadUp:: db
; Raw Joypad Up Event
; A pressed key was released
hJoypadDown:: db ; ff9e
hJoypadDown:: db
; Raw Joypad Down Event
; An unpressed key was pressed
hJoypadState:: db ; ff9f
hJoypadState:: db
; Raw Joypad State
; State of all keys during current frame
hJoypadSum:: db ; ffa0
hJoypadSum:: db
; Raw Joypad State Sum
; Sum of all keys that were pressed
; since hJoypadSum was last cleared
ds 1; TODO
hJoyDown:: db ; ffa2
hJoyState:: db ; ffa3
hJoySum:: db ; ffa4
hJoyDown:: db
hJoyState:: db
hJoySum:: db
hJoyDebounceSrc:: db ; ffa5
hJoyDebounceSrc:: db
; hJoySum will be updated from
; 00 - hJoyDown
; <> - hJoyState
; See GetJoypadDebounced
hJoypadState2:: db ; ffa6
hJoypadState2:: db
ds 6 ; TODO
hGraphicStartTile:: db ; ffad
hGraphicStartTile:: db
hMoveMon:: db
UNION
hTextBoxCursorBlinkInterval:: ds 2 ; ffaf
hTextBoxCursorBlinkInterval:: ds 2
NEXTU
hEventCollisionException:: db ; ffaf
hEventCollisionException:: db
hEventID:: db ;; ffb0
NEXTU
hSpriteWidth:: ; ffaf
hSpriteInterlaceCounter:: ; ffaf
hSpriteWidth::
hSpriteInterlaceCounter::
db
hSpriteHeight:: ; ffb0
hSpriteHeight::
db
NEXTU
hConnectionStripLength:: db ; ffaf
hConnectedMapWidth:: db ; ffb0
hConnectionStripLength:: db
hConnectedMapWidth:: db
NEXTU
hMapObjectIndexBuffer:: db ; ffaf
hObjectStructIndexBuffer:: db ; ffb0
hMapObjectIndexBuffer:: db
hObjectStructIndexBuffer:: db
ENDU
hSpriteOffset:: ; ffb1
hSpriteOffset::
db
db ; TODO
@ -119,58 +119,58 @@ hMathBuffer::
NEXTU
hPrintNumLeadingDigit:: db ; ffb3 digit one place-value up
hPrintNumDividend:: ds 3 ; ffb4 big-endian
hPrintNumDivisor:: ds 3 ; ffb7 big-endian
hPrintNumTemp:: ds 3 ; ffba big-endian
hPrintNumLeadingDigit:: db ; digit one place-value up
hPrintNumDividend:: ds 3 ; big-endian
hPrintNumDivisor:: ds 3 ; big-endian
hPrintNumTemp:: ds 3 ; big-endian
ENDU
ds 3 ; TODO
hFFC0:: ds 1 ; FFC0
hFFC0:: ds 1
ds 6
hFFC7:: db ; FFC7
hFFC8:: db ; FFC8
hFFC9:: db ; FFC9
hFFCA:: db ; FFCA
hFFCB:: db ; FFCB
hFFCC:: db ; FFCC
hFFC7:: db
hFFC8:: db
hFFC9:: db
hFFCA:: db
hFFCB:: db
hFFCC:: db
ds 3 ; TODO
hLCDCPointer:: ; ffd0
hLCDCPointer::
db
hLYOverrideStart:: db ; ffd1
hLYOverrideEnd:: db ; ffd2
hLYOverrideStart:: db
hLYOverrideEnd:: db
ds 1 ; TODO
hSerialReceived:: ; ffd4
hSerialReceived::
db
hLinkPlayerNumber:: ; ffd5
hLinkPlayerNumber::
db
hSerialIgnoringInitialData::
db
hSerialSend:: ; ffd7
hSerialSend::
db
hSerialReceive:: ; ffd8
hSerialReceive::
db
hSCX:: db ; ffd9
hSCY:: db ; ffda
hWX:: db ; ffdb
hWY:: db ; ffdc
hSCX:: db
hSCY:: db
hWX:: db
hWY:: db
hOverworldFlashlightEffect:: db ; ffdd
hOverworldFlashlightEffect:: db
; Influences draw distance of map around HIRO
; Meant to go from 0x00--> to desired distance
; or else graphical errors will occur.
@ -180,20 +180,20 @@ hOverworldFlashlightEffect:: db ; ffdd
; 0x03 - 6x 6 tile block
; 0x04 - 2x 2 tile block
hBGMapMode:: ; ffde
hBGMapMode::
db
hBGMapTransferPosition:: ; ffdf
hBGMapTransferPosition::
db
hBGMapAddress:: ; ffe0
hBGMapAddress::
dw
db ; TODO
hSPTemp:: ; ffe3
hSPTemp::
dw
hRedrawRowOrColumnMode:: db ; ffe5
hRedrawRowOrColumnMode:: db
; Used for redrawing BG in small updates
; instead of once completely for faster
; scrolling on overworld etc.
@ -218,30 +218,30 @@ hRedrawRowOrColumnMode:: db ; ffe5
; 0x11 - flashlight column redraw 3 (move left)
; 0x12 - flashlight column redraw 3 (move right)
hRedrawRowOrColumnDest:: ds 2 ; ffe6
hRedrawRowOrColumnDest:: ds 2
hMapAnims:: ; ffe8
hMapAnims::
db
hTileAnimFrame:: ; ffe9
hTileAnimFrame::
db
hFFEA:: ; ffea
hFFEA::
db
hFFEB:: db
hFFEC:: db
hFFED:: db
hFFEE:: ; ffee
hFFEE::
db
hRandomAdd:: db ; ffef
hRandomSub:: db ; fff0
hRTCRandom:: db ; fff1
hRandomAdd:: db
hRandomSub:: db
hRTCRandom:: db
hBattleTurn:: db ; fff2
hBattleTurn:: db
hCurMapTextSubroutinePtr:: dw ; fff3
hCurMapTextSubroutinePtr:: dw
; TODO

22
macros/wram.asm
View File

@ -147,30 +147,30 @@ channel_struct: MACRO
\1Octave:: db ; 7-0 (0 is highest)
\1StartingOctave:: db ; raises existing octaves (to repeat phrases)
\1NoteDuration:: db ; frames remaining for the current note
\1Field16:: ds 1 ; c117
ds 1 ; c118
\1Field16:: ds 1
ds 1
\1LoopCount:: db
\1Tempo:: dw
\1Tracks:: db ; hi:left lo:right
\1SFXDutyLoop:: ds 1 ; c11d
\1SFXDutyLoop:: ds 1
\1VibratoDelayCount:: db ; initialized by \1VibratoDelay
\1VibratoDelay:: db ; number of frames a note plays until vibrato starts
\1VibratoExtent:: db
\1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt
\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel
\1PitchWheelAmount:: db ; c124
\1PitchWheelAmountFraction:: db ; c125
\1Field25:: ds 1 ; c126
ds 1 ; c127
\1PitchWheelAmount:: db
\1PitchWheelAmountFraction:: db
\1Field25:: ds 1
ds 1
\1CryPitch:: dw
\1Field29:: ds 1
\1Field2a:: ds 2
\1Field2c:: ds 1
\1NoteLength:: db ; frames per 16th note
\1Field2e:: ds 1 ; c12f
\1Field2f:: ds 1 ; c130
\1Field30:: ds 1 ; c131
ds 1 ; c132
\1Field2e:: ds 1
\1Field2f:: ds 1
\1Field30:: ds 1
ds 1
ENDM
mailmsg: MACRO

24
maps/OldCityPokecenter2F.asm
View File

@ -2,36 +2,36 @@ INCLUDE "constants.asm"
SECTION "maps/OldCityPokecenter2F.asm", ROMX
OldCityPokecenter2FScriptLoader: ; 25:4782
OldCityPokecenter2FScriptLoader:
call Unreferenced_Function7e6
ld hl, OldCityPokecenter2FScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
OldCityPokecenter2FScriptPointers: ; 25:478f
OldCityPokecenter2FScriptPointers:
dw OldCityPokecenter2FScript1
dw OldCityPokecenter2FNPCIds
OldCityPokecenter2FScript1: ; 25:4793
OldCityPokecenter2FScript1:
ld hl, OldCityPokecenter2FNPCIds
ld de, OldCityPokecenter2FSignPointers
call CallMapTextSubroutine
ret
OldCityPokecenter2FNPCIds: ; 25:479d
OldCityPokecenter2FNPCIds:
db $00, $01, $02, $03, $ff
OldCityPokecenter2FSignPointers: ; 25:47a2
OldCityPokecenter2FSignPointers:
dw MapDefaultText
OldCityPokecenter2FTextPointers: ; 25:47a4
OldCityPokecenter2FTextPointers:
dw OldCityPokecenter2FText1
dw OldCityPokecenter2FText2
dw OldCityPokecenter2FText3
dw OldCityPokecenter2FText4
OldCityPokecenter2FText1: ; 25:47ac
OldCityPokecenter2FText1:
ld a, $01
ld [wce37], a
ld hl, wJoypadFlags
@ -41,7 +41,7 @@ OldCityPokecenter2FText1: ; 25:47ac
res 5, [hl]
ret
OldCityPokecenter2FText2: ; 25:47c4
OldCityPokecenter2FText2:
ld a, $02
ld [wce37], a
ld hl, wJoypadFlags
@ -51,16 +51,16 @@ OldCityPokecenter2FText2: ; 25:47c4
res 5, [hl]
ret
OldCityPokecenter2FText3: ; 25:47dc
OldCityPokecenter2FText3:
ld hl, Text947e3
call OpenTextbox
ret
Text947e3: ; 25:47e3
Text947e3:
text "おりゃ！"
done
OldCityPokecenter2FText4: ; 25:47e9
OldCityPokecenter2FText4:
ld hl, OldCityPokecenter2FTextString4
call OpenTextbox
callab Function29a1f
@ -77,7 +77,7 @@ OldCityPokecenter2FText4: ; 25:47e9
.asm_9480c
ret
OldCityPokecenter2FTextString4: ; 25:480d
OldCityPokecenter2FTextString4:
text "うしろにあるのは"
line "タイムマシンです"
done

16
maps/OldCityPokecenterBattle.asm
View File

@ -2,32 +2,32 @@ INCLUDE "constants.asm"
SECTION "maps/OldCityPokecenterBattle.asm", ROMX
OldCityPokecenterBattleScriptLoader: ; 25:48eb
OldCityPokecenterBattleScriptLoader:
ld hl, OldCityPokecenterBattleScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
OldCityPokecenterBattleScriptPointers: ; 25:48f5
OldCityPokecenterBattleScriptPointers:
dw OldCityPokecenterBattleScript1
dw OldCityPokecenterBattleNPCIds
OldCityPokecenterBattleScript1: ; 25:48f9
OldCityPokecenterBattleScript1:
ld hl, OldCityPokecenterBattleNPCIds
ld de, OldCityPokecenterBattleSignPointers
call CallMapTextSubroutine
ret
OldCityPokecenterBattleNPCIds: ; 25:4903
OldCityPokecenterBattleNPCIds:
db $00, $ff
OldCityPokecenterBattleSignPointers: ; 25:4905
OldCityPokecenterBattleSignPointers:
dw MapDefaultText
OldCityPokecenterBattleTextPointers: ; 25:4907
OldCityPokecenterBattleTextPointers:
dw OldCityPokecenterBattleText1
OldCityPokecenterBattleText1: ; 25:4909
OldCityPokecenterBattleText1:
ld hl, wJoypadFlags
set 5, [hl]
ld hl, OldCityPokecenterBattleTextString1
@ -37,7 +37,7 @@ OldCityPokecenterBattleText1: ; 25:4909
callab Function28000
ret
OldCityPokecenterBattleTextString1: ; 25:4922
OldCityPokecenterBattleTextString1:
text "ちょっとまってね！@"
text_exit
db "@"

14
maps/OldCityPokecenterTimeMachine.asm
View File

@ -2,33 +2,33 @@ INCLUDE "constants.asm"
SECTION "maps/OldCityPokecenterTimeMachine.asm", ROMX
OldCityPokecenterTimeMachineScriptLoader: ; 25:497e
OldCityPokecenterTimeMachineScriptLoader:
call Unreferenced_Function7e6
ld hl, OldCityPokecenterTimeMachineScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
OldCityPokecenterTimeMachineScriptPointers: ; 25:498b
OldCityPokecenterTimeMachineScriptPointers:
dw OldCityPokecenterTimeMachineScript1
dw OldCityPokecenterTimeMachineNPCIds
OldCityPokecenterTimeMachineScript1: ; 25:498f
OldCityPokecenterTimeMachineScript1:
ld hl, OldCityPokecenterTimeMachineNPCIds
ld de, OldCityPokecenterTimeMachineSignPointers
call CallMapTextSubroutine
ret
OldCityPokecenterTimeMachineNPCIds: ; 25:4999
OldCityPokecenterTimeMachineNPCIds:
db $00, $ff
OldCityPokecenterTimeMachineSignPointers: ; 25:499b
OldCityPokecenterTimeMachineSignPointers:
dw MapDefaultText
OldCityPokecenterTimeMachineTextPointers: ; 25:499d
OldCityPokecenterTimeMachineTextPointers:
dw OldCityPokecenterTimeMachineText1
OldCityPokecenterTimeMachineText1: ; 25:499f
OldCityPokecenterTimeMachineText1:
xor a
ld [wce37], a
callab Function29abf

16
maps/OldCityPokecenterTrade.asm
View File

@ -2,32 +2,32 @@ INCLUDE "constants.asm"
SECTION "maps/OldCityPokecenterTrade.asm", ROMX
OldCityPokecenterTradeScriptLoader: ; 25:4866
OldCityPokecenterTradeScriptLoader:
ld hl, OldCityPokecenterTradeScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
OldCityPokecenterTradeScriptPointers: ; 25:4870
OldCityPokecenterTradeScriptPointers:
dw OldCityPokecenterTradeScript1
dw OldCityPokecenterTradeNPCIds
OldCityPokecenterTradeScript1: ; 25:4874
OldCityPokecenterTradeScript1:
ld hl, OldCityPokecenterTradeNPCIds
ld de, OldCityPokecenterTradeSignPointers
call CallMapTextSubroutine
ret
OldCityPokecenterTradeNPCIds: ; 25:487e
OldCityPokecenterTradeNPCIds:
db $00, $ff
OldCityPokecenterTradeSignPointers: ; 25:4880
OldCityPokecenterTradeSignPointers:
dw MapDefaultText
OldCityPokecenterTradeTextPointers: ; 25:4882
OldCityPokecenterTradeTextPointers:
dw OldCityPokecenterTradeText1
OldCityPokecenterTradeText1: ; 25:4884
OldCityPokecenterTradeText1:
ld hl, wJoypadFlags
set 5, [hl]
ld hl, OldCityPokecenterTradeTextString1
@ -37,7 +37,7 @@ OldCityPokecenterTradeText1: ; 25:4884
callab Function28000
ret
OldCityPokecenterTradeTextString1: ; 25:489d
OldCityPokecenterTradeTextString1:
text "ちょっとまってね！@"
text_exit
text_exit

18
maps/PlayerHouse1F.asm
View File

@ -2,38 +2,38 @@ include "constants.asm"
SECTION "maps/PlayerHouse1F.asm", ROMX
PlayerHouse1FScriptLoader:: ; 409C
PlayerHouse1FScriptLoader::
ld hl, PlayerHouse1FScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
PlayerHouse1FScriptPointers: ; 40A6
PlayerHouse1FScriptPointers:
dw PlayerHouse1FScript1
dw PlayerHouse1FNPCIDs1
dw PlayerHouse1FScript2
dw PlayerHouse1FNPCIDs2
PlayerHouse1FNPCIDs1: ; 40AE
PlayerHouse1FNPCIDs1:
db $FF
PlayerHouse1FNPCIDs2: ; 40AF
PlayerHouse1FNPCIDs2:
db 0
db $FF
PlayerHouse1FScript1: ; 40B1
PlayerHouse1FScript1:
ld hl, PlayerHouse1FNPCIDs1
ld de, PlayerHouse1FSignPointers
call CallMapTextSubroutine
ret
PlayerHouse1FScript2: ; 40BB
PlayerHouse1FScript2:
ld hl, PlayerHouse1FNPCIDs2
ld de, PlayerHouse1FSignPointers
call CallMapTextSubroutine
ret
PlayerHouse1FSignPointers: ; 40C5
PlayerHouse1FSignPointers:
dw Function38ab
dw Function38b4
dw Function38a2
@ -42,12 +42,12 @@ PlayerHouse1FSignPointers: ; 40C5
PlayerHouse1FTextPointers::
dw PlayerHouse1FNPCText1
PlayerHouse1FNPCText1: ; 40D1
PlayerHouse1FNPCText1:
ld hl, PlayerHouse1FTextString1
call OpenTextbox
ret
PlayerHouse1FTextString1: ; 40D8
PlayerHouse1FTextString1:
text "おかあさん『えっ　あなた"
line "オーキドはかせに"
cont "ポケモンずかんを　つくってくれって"

50
maps/PlayerHouse2F.asm
View File

@ -2,13 +2,13 @@ include "constants.asm"
SECTION "maps/PlayerHouse2F.asm", ROMX
PlayerHouse2FScriptLoader:: ; 418B
PlayerHouse2FScriptLoader::
ld hl, PlayerHouse2FScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
PlayerHouse2FScriptPointers: ; 4195
PlayerHouse2FScriptPointers:
dw PlayerHouse2FScript1
dw PlayerHouse2FNPCIDs1
dw PlayerHouse2FScript2
@ -18,23 +18,23 @@ PlayerHouse2FTextPointers::
dw PlayerHouse2FText1
dw PlayerHouse2FDollText
PlayerHouse2FNPCIDs1: ; 41A1
PlayerHouse2FNPCIDs1:
db 0
db 1
db $FF
PlayerHouse2FNPCIDs2: ; 41A4
PlayerHouse2FNPCIDs2:
db 1
db $FF
PlayerHouse2FSignPointers: ; 41A6
PlayerHouse2FSignPointers:
dw Function3899
dw PlayerHouse2FRadioText
dw PlayerHouse2FComputerText
dw Function3899
dw PlayerHouse2FN64Text
PlayerHouse2FScript1: ; 41B0
PlayerHouse2FScript1:
call PlayerHouse2PositionCheck
ret z
ld hl, PlayerHouse2FNPCIDs1
@ -43,7 +43,7 @@ PlayerHouse2FScript1: ; 41B0
ret nz
ret
PlayerHouse2PositionCheck: ; 41BF
PlayerHouse2PositionCheck:
ld hl, wd41a
bit 0, [hl]
ret nz
@ -64,7 +64,7 @@ PlayerHouse2PositionCheck: ; 41BF
call ClearAccumulator
ret
PlayerHouse2FMovePlayer: ; 41EA
PlayerHouse2FMovePlayer:
ld a, 0
ld hl, Movement
call LoadMovementDataPointer
@ -74,18 +74,18 @@ PlayerHouse2FMovePlayer: ; 41EA
call WriteIntod637
ret
Movement: ; 41FD
Movement:
db $08
db $04
db $32
PlayerHouse2FScript2: ; 4200
PlayerHouse2FScript2:
ld hl, PlayerHouse2FNPCIDs2
ld de, PlayerHouse2FSignPointers
call CallMapTextSubroutine
ret
PlayerHouse2FText1: ; 420A
PlayerHouse2FText1:
ld hl, wd41a
bit 3, [hl]
jr nz, .jump
@ -100,17 +100,17 @@ PlayerHouse2FText1: ; 420A
call OpenTextbox
ret
PlayerHouse2FDollText: ; 4228
PlayerHouse2FDollText:
ld hl, PlayerHouse2FTextString3
call OpenTextbox
ret
PlayerHouse2FRadioText: ; 422F
PlayerHouse2FRadioText:
ld hl, PlayerHouse2FTextString9
call OpenTextbox
ret
PlayerHouse2FComputerText: ; 4236
PlayerHouse2FComputerText:
ld hl, wd41a
bit 0, [hl]
jr nz, .jump
@ -125,7 +125,7 @@ PlayerHouse2FComputerText: ; 4236
call Function1fea
ret
PlayerHouse2FCheckEmail: ; 4253
PlayerHouse2FCheckEmail:
call YesNoBox
jr c, .jump2
ld hl, wd41a
@ -140,12 +140,12 @@ PlayerHouse2FCheckEmail: ; 4253
call PrintText
ret
PlayerHouse2FN64Text: ; 426B
PlayerHouse2FN64Text:
ld hl, PlayerHouse2FTextString4
call OpenTextbox
ret
PlayerHouse2FTextString1: ; 4272
PlayerHouse2FTextString1:
text "ケン『おっ　おまえの　うでで"
line "ひかりかがやく　そのとけいは⋯⋯"
cont "<PLAYER>も　ついに"
@ -165,27 +165,27 @@ PlayerHouse2FTextString1: ; 4272
cont "きょうは　むり　だぜ！"
done
PlayerHouse2FTextString2: ; 4332
PlayerHouse2FTextString2:
text "そうだ　おまえの　パソコンに"
line "メールが　とどいていたな"
cont "でかけるんなら"
cont "メールぐらい　よんでおけよ"
done
PlayerHouse2FTextString3: ; 4365
PlayerHouse2FTextString3:
text "クりスマスに　カントーの"
line "しんせきに　プレゼント"
cont "してもらった　にんぎょうだ"
done
PlayerHouse2FTextString4: ; 438D
PlayerHouse2FTextString4:
text "ニンテンドウ６４を　してる！"
cont "⋯⋯　⋯⋯　さてと！"
cont "そろそろ　そとに　あそびに"
cont "でかけるか！"
done
PlayerHouse2FTextString5: ; 43BD
PlayerHouse2FTextString5:
text "<PLAYER>は"
line "パソコンの　スイッチを　いれた！"
@ -200,7 +200,7 @@ PlayerHouse2FTextString5: ; 43BD
call Function3036
ret
PlayerHouse2FTextString6: ; 43FA
PlayerHouse2FTextString6:
text "とつぜん　メールを　さしあげる"
line "しつれいを　おゆるしあれ"
@ -210,12 +210,12 @@ PlayerHouse2FTextString6: ; 43FA
cont "ポケモンけんきゅうしゃ　オーキド"
done
PlayerHouse2FTextString7: ; 4456
PlayerHouse2FTextString7:
text "あとで"
line "よもっと<⋯⋯>"
done
PlayerHouse2FTextString8: ; 4461 (unused?)
PlayerHouse2FTextString8: ; (unused?)
text "しんはつばい　トレーナーギア！"
line "ポケモントレーナーの　ための"
cont "さいせんたんの　とけい　です"
@ -233,7 +233,7 @@ PlayerHouse2FTextString8: ; 4461 (unused?)
cont "シルフの　ホームぺージだ"
done
PlayerHouse2FTextString9: ; 44FE
PlayerHouse2FTextString9:
text "<PLAYER>は"
line "ラジオのスイッチを　おした！"

18
maps/Route1Gate1F.asm
View File

@ -2,7 +2,7 @@ include "constants.asm"
SECTION "maps/Route1Gate1F.asm", ROMX
Route1Gate1FScriptLoader:: ;4061
Route1Gate1FScriptLoader::
ld hl, Route1Gate1FScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
@ -12,39 +12,39 @@ Route1Gate1FScriptPointers:
dw Route1Gate1FScript ;>> routine
dw Route1Gate1FNPCIDs ;>> data
Route1Gate1FNPCIDs: ; 406F
Route1Gate1FNPCIDs:
db $00
db $01
db $FF
Route1Gate1FSignPointers: ; 4072
Route1Gate1FSignPointers:
dw MapDefaultText ;no signs
Route1Gate1FTextPointers:: ; 4074
Route1Gate1FTextPointers::
dw Route1Gate1FText1
dw Route1Gate1FText2
Route1Gate1FScript: ; 4078
Route1Gate1FScript:
ld hl, Route1Gate1FNPCIDs
ld de, Route1Gate1FSignPointers
call CallMapTextSubroutine
ret
Route1Gate1FText1: ; 4082
Route1Gate1FText1:
ld hl, Route1Gate1FText1String
call OpenTextbox
ret
Route1Gate1FText2: ; 4089
Route1Gate1FText2:
ld hl, Route1Gate1FText2String
call OpenTextbox
ret
Route1Gate1FText1String: ; 4090
Route1Gate1FText1String:
text "このゲートを　ぬけると"
line "すぐに　オールドシティ　です"
done
Route1Gate1FText2String: ; 40AC
Route1Gate1FText2String:
text "オールドシティには"
line "あの　ゆうめいな"
cont "ごじゅうのとう　が　あるの"

28
maps/Route1Gate2F.asm
View File

@ -2,55 +2,55 @@ include "constants.asm"
SECTION "maps/Route1Gate2F.asm", ROMX
Route1Gate2FScriptLoader:: ; 411F
Route1Gate2FScriptLoader::
ld hl, Route1Gate2FScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
Route1Gate2FScriptPointers: ; 4129
Route1Gate2FScriptPointers:
dw Route1Gate2FScript
dw Route1Gate2FNPCIDs
Route1Gate2FNPCIDs: ; 412D
Route1Gate2FNPCIDs:
db 0
db 1
db $FF
Route1Gate2FSignPointers: ; 4130
Route1Gate2FSignPointers:
dw Route1Gate2FTextSign1
dw Route1Gate2FTextSign2
Route1Gate2FTextPointers:: ; 4134
Route1Gate2FTextPointers::
dw Route1Gate2FTextNPC1
dw Route1Gate2FTextNPC2
Route1Gate2FScript:: ; 4138
Route1Gate2FScript::
ld hl, Route1Gate2FNPCIDs
ld de, Route1Gate2FSignPointers
call CallMapTextSubroutine
ret
Route1Gate2FTextNPC1: ; 4142
Route1Gate2FTextNPC1:
ld hl, Route1Gate2FTextString1
call OpenTextbox
ret
Route1Gate2FTextNPC2: ; 4149
Route1Gate2FTextNPC2:
ld hl, Route1Gate2FTextString2
call OpenTextbox
ret
Route1Gate2FTextSign1: ; 4150
Route1Gate2FTextSign1:
ld hl, Route1Gate2FTextString3
call OpenTextbox
ret
Route1Gate2FTextSign2: ; 4157
Route1Gate2FTextSign2:
ld hl, Route1Gate2FTextString4
call OpenTextbox
ret
Route1Gate2FTextString1: ; 415E
Route1Gate2FTextString1:
text "ガンテツさんって　しってる？"
para "ガンテツさんに"
@ -58,7 +58,7 @@ Route1Gate2FTextString1: ; 415E
cont "トレーナーとして　たいしたもの　よ"
done
Route1Gate2FTextString2: ; 4197
Route1Gate2FTextString2:
text "あなた　かんこうで　きたの？"
line "なら　ざんねんね"
@ -68,7 +68,7 @@ Route1Gate2FTextString2: ; 4197
cont "ものじゃないわ"
done
Route1Gate2FTextString3: ; 41D8
Route1Gate2FTextString3:
text "<PLAYER>は"
line "ぼうえんきょうを　のぞいた！"
@ -76,7 +76,7 @@ Route1Gate2FTextString3: ; 41D8
line "たかーい　とう　が　みえる！"
done
Route1Gate2FTextString4: ; 41FF
Route1Gate2FTextString4:
text "<PLAYER>は"
line "ぼうえんきょうを　のぞいた！"

26
maps/Route1P1.asm
View File

@ -5,7 +5,7 @@ SECTION "maps/Route1P1.asm", ROMX
ret
dw Textdbb82
Textdbb82: ; 36:7b82
Textdbb82:
text "べんりな　よのなかだね"
done
@ -13,22 +13,22 @@ Textdbb82: ; 36:7b82
ret
endr
Route1P1ScriptLoader:: ; 7B98
Route1P1ScriptLoader::
ld hl, Route1P1ScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
Route1P1ScriptPointers: ; 7BA2
Route1P1ScriptPointers:
dw Route1P1Script
dw Route1P1NPCIDs
Route1P1NPCIDs: ; 7BA6
Route1P1NPCIDs:
db 0
db 1
db $FF
Route1P1SignPointers: ; 7BA9
Route1P1SignPointers:
dw Route1P1TextSign1
dw Route1P1TextSign2
@ -36,33 +36,33 @@ Route1P1TextPointers::
dw Route1P1TextNPC1
dw Route1P1TextNPC2
Route1P1Script:: ; 7BB1
Route1P1Script::
ld hl, Route1P1NPCIDs
ld de, Route1P1SignPointers
call CallMapTextSubroutine
ret
Route1P1TextNPC1: ; 7BBB
Route1P1TextNPC1:
ld hl, Route1P1TextString1
call OpenTextbox
ret
Route1P1TextNPC2: ; 7BC2
Route1P1TextNPC2:
ld hl, Route1P1TextString2
call OpenTextbox
ret
Route1P1TextSign1: ; 7BC9
Route1P1TextSign1:
ld hl, Route1P1TextString3
call OpenTextbox
ret
Route1P1TextSign2: ; 7BD0
Route1P1TextSign2:
ld hl, Route1P1TextString4
call OpenTextbox
ret
Route1P1TextString1: ; 7BD7
Route1P1TextString1:
text "しょうねん！"
para "モンスターボールは"
@ -70,12 +70,12 @@ Route1P1TextString1: ; 7BD7
cont "つかうのが　きほんだ！"
done
Route1P1TextString2: ; 7C08
Route1P1TextString2:
text "ぼく　ゆうがた　じゅくの　かえりに"
line "かわった　ポケモンを　みたよ"
done
Route1P1TextString3: ; 7C2A
Route1P1TextString3:
text "このさき　しずかな　おか"
line "やせいの　ポケモンに　ちゅうい"
done

24
maps/Route1P2.asm
View File

@ -2,7 +2,7 @@ include "constants.asm"
SECTION "maps/Route1P2.asm", ROMX
Route1P2ScriptLoader:: ; 7C67
Route1P2ScriptLoader::
ld hl, Route1P2ScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
@ -12,7 +12,7 @@ Route1P2ScriptPointers:
dw Route1P2Script
dw Route1P2NPCIDs
Route1P2NPCIDs: ; 7C76
Route1P2NPCIDs:
db $00
db $01
db $FF
@ -24,7 +24,7 @@ Route1P2TextPointers::
dw Route1P2Text1
dw Route1P2Text2
Route1P2Script:: ; 7C7F
Route1P2Script::
ld a, [wYCoord]
cp $06
jr nz, .skipCheck
@ -45,13 +45,13 @@ Route1P2Script:: ; 7C7F
ret
.endDemo
Route1P2Text1: ; 7CA7
Route1P2Text1:
ld hl, Route1P2TextString4
call OpenTextbox
call GBFadeOutToBlack
jp Init
Route1P2Text2: ; 7CB3
Route1P2Text2:
ld hl, $D3A2 ; trainer flags?
bit 1, [hl]
jr nz, .Text2Jump ; already fought
@ -70,31 +70,31 @@ Route1P2Text2: ; 7CB3
ret
.Text2Jump
Route1P2Text3: ; 7CDA
Route1P2Text3:
ld hl, Route1P2TextString3
call OpenTextbox
ret
Route1P2TextSign1: ; 7CE1
Route1P2TextSign1:
ld hl, Route1P2TextString5
call OpenTextbox
ret
Route1P2TextString1: ; 7CE8
Route1P2TextString1:
text "まあ　かわいらしい　トレーナーやこと"
line "うちと　ポケモン　しはります？"
done
Route1P2TextString2: ; 7D0C (unused?)
Route1P2TextString2: ; (unused?)
text "いやあ　かんにんやわあ"
done
Route1P2TextString3: ; 7D19
Route1P2TextString3:
text "かわいい　かおして　つよおすなあ"
line "その　ちょうしで　おきばりやす"
done
Route1P2TextString4: ; 7D3B
Route1P2TextString4:
text "シゲル『おっ　サトシじゃないか！"
para "なんとか　ここまで　これた"
@ -111,7 +111,7 @@ Route1P2TextString4: ; 7D3B
line "じゃあな"
done
Route1P2TextString5: ; 7DBD
Route1P2TextString5:
text "ここは　１ばん　どうろ"
line "サイレントヒル　⋯⋯　オールドシティ"
done

66
maps/ShizukanaOka.asm
View File

@ -2,7 +2,7 @@ include "constants.asm"
SECTION "maps/ShizukanaOka.asm", ROMX
ShizukanaOkaScriptLoader:: ; 564B
ShizukanaOkaScriptLoader::
ld hl, ShizukanaOkaScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
@ -12,7 +12,7 @@ ShizukanaOkaScriptPointers:
dw ShizukanaOkaScript
dw ShizukanaOkaNPCIDs
ShizukanaOkaNPCIDs: ; 5659
ShizukanaOkaNPCIDs:
db 0
db 1
db 2
@ -22,29 +22,29 @@ ShizukanaOkaNPCIDs: ; 5659
db $FF
ShizukanaOkaSignPointers:
dw ShizukanaOkaSignpost1 ;574b
dw ShizukanaOkaSignpost2 ;5744
dw ShizukanaOkaSignpost1
dw ShizukanaOkaSignpost2
ShizukanaOkaTextPointers: ;5664
dw ShizukanaOkaText1 ;567a
dw ShizukanaOkaTrainer2 ;5681
dw ShizukanaOkaTrainer3 ;56A8
dw ShizukanaOkaTrainer4 ;56cf
dw ShizukanaOkaTrainer5 ;56f6
dw ShizukanaOkaTrainer6 ;571d
ShizukanaOkaTextPointers:
dw ShizukanaOkaText1
dw ShizukanaOkaTrainer2
dw ShizukanaOkaTrainer3
dw ShizukanaOkaTrainer4
dw ShizukanaOkaTrainer5
dw ShizukanaOkaTrainer6
ShizukanaOkaScript: ;5670
ShizukanaOkaScript:
ld hl, ShizukanaOkaNPCIDs
ld de, ShizukanaOkaSignPointers
call CallMapTextSubroutine
ret
ShizukanaOkaText1: ;567a
ShizukanaOkaText1:
ld hl, ShizukanaOkaText1String
call OpenTextbox
ret
ShizukanaOkaTrainer2: ;5681
ShizukanaOkaTrainer2:
ld hl, $D3A5
bit 1, [hl]
jr nz, .Trainer2Won
@ -63,7 +63,7 @@ ShizukanaOkaTrainer2: ;5681
call OpenTextbox
ret
ShizukanaOkaTrainer3: ;56A8
ShizukanaOkaTrainer3:
ld hl, wd3a5
bit 2, [hl]
jr nz, .Trainer3Won
@ -82,7 +82,7 @@ ShizukanaOkaTrainer3: ;56A8
call OpenTextbox
ret
ShizukanaOkaTrainer4: ;56CF
ShizukanaOkaTrainer4:
ld hl, wd3a5
bit 3, [hl]
jr nz, .Trainer4Won
@ -101,7 +101,7 @@ ShizukanaOkaTrainer4: ;56CF
call OpenTextbox
ret
ShizukanaOkaTrainer5: ;56F6
ShizukanaOkaTrainer5:
ld hl, wd3a5
bit 4, [hl]
jr nz, .Trainer5Won
@ -120,7 +120,7 @@ ShizukanaOkaTrainer5: ;56F6
call OpenTextbox
ret
ShizukanaOkaTrainer6: ;571D
ShizukanaOkaTrainer6:
ld hl, wd3a5
bit 5, [hl]
jr nz, .Trainer6Won
@ -139,17 +139,17 @@ ShizukanaOkaTrainer6: ;571D
call OpenTextbox
ret
ShizukanaOkaSignpost2: ;5744
ShizukanaOkaSignpost2:
ld hl, ShizukanaOkaSignpost2String
call OpenTextbox
ret
ShizukanaOkaSignpost1: ;574b
ShizukanaOkaSignpost1:
ld hl, ShizukanaOkaSignpost1String
call OpenTextbox
ret
ShizukanaOkaTrainer6EncounterString: ; 2f:5752
ShizukanaOkaTrainer6EncounterString:
text "ねえ　ねえ　みてよ"
para "これ　ぜったい"
line "しんしゅの　ポケモン　だよ！"
@ -159,13 +159,13 @@ ShizukanaOkaTrainer6EncounterString: ; 2f:5752
line "わかってないから　しかたないよ"
done
ShizukanaOkaTrainer6WonString: ; 2f:5794
ShizukanaOkaTrainer6WonString:
text "あたらしい　ポケモンだけでなく"
line "あたらしい　タイプも"
cont "みつかったって　うわさだよ"
done
ShizukanaOkaTrainer5EncounterString: ; 2f:57be
ShizukanaOkaTrainer5EncounterString:
text "いい　てんきねー"
line "あなた　ちょうしは　いかが？"
done
@ -174,11 +174,11 @@ ShizukanaOkaTrainer5EncounterString: ; 2f:57be
line "⋯⋯なにいってるのかしら　あたし"
done
ShizukanaOkaTrainer5WonString: ; 2f:57f1
ShizukanaOkaTrainer5WonString:
text "なんで　こうなるの？"
line "さんぽしてた　だけなのに@@"
ShizukanaOkaTrainer4EncounterString: ; 2f:580b
ShizukanaOkaTrainer4EncounterString:
text "こんなところで"
line "ひを　ふく　れんしゅう！"
done
@ -186,14 +186,14 @@ ShizukanaOkaTrainer4EncounterString: ; 2f:580b
text "あちち　しっぱいだー"
done
ShizukanaOkaTrainer4WonString: ; 2f:582d
ShizukanaOkaTrainer4WonString:
text "よるになると　くらくなるから"
line "こどもは　はやく　かえりなさい！"
para "おれ？"
line "おれは　ひをふくから　だいじょうぶ"
done
ShizukanaOkaTrainer3EncounterString: ; 2f:5864
ShizukanaOkaTrainer3EncounterString:
text "むしポケモンの　ことなら"
line "だれよりも　くわしいよ"
done
@ -201,14 +201,14 @@ ShizukanaOkaTrainer3EncounterString: ; 2f:5864
text "パラパラー"
done
ShizukanaOkaTrainer3WonString: ; 2f:5885
ShizukanaOkaTrainer3WonString:
text "ポケモンずかんを　つくるんだって？"
line "ちょっと　みせてよ"
para "へー"
line "タイプべつに　ポケモン　さがせるんだ"
done
ShizukanaOkaTrainer2EncounterString: ; 2f:58b8
ShizukanaOkaTrainer2EncounterString:
text "いっとくけど"
line "きみよりも　べんきょう　してるから"
cont "きみよりも　つよいよ　ぜったい！"
@ -217,13 +217,13 @@ ShizukanaOkaTrainer2EncounterString: ; 2f:58b8
text "な　なぜなんだ？"
done
ShizukanaOkaTrainer2WonString: ; 2f:58ed
ShizukanaOkaTrainer2WonString:
text "おかしいよ⋯⋯"
line "まいにち　ポケモンの　べんきょうを"
cont "きちんと　してるのに　まけるなんて"
done
ShizukanaOkaText1String: ; 2f:591a
ShizukanaOkaText1String:
text "この　おかの　ポケモンは　よわい！"
line "だから　ここで　しゅぎょう　している"
cont "トレーナーも　おおいよ"
@ -231,12 +231,12 @@ ShizukanaOkaText1String: ; 2f:591a
line "うでだめしを　するといい"
done
ShizukanaOkaSignpost2String: ; 2f:5968
ShizukanaOkaSignpost2String:
text "しずかな　おか"
line "サイレントヒル　は　こちら"
done
ShizukanaOkaSignpost1String: ; 2f:597f
ShizukanaOkaSignpost1String:
text "しずかな　おか"
line "オールドシティ　は　こちら"
done

100
maps/SilentHill.asm
View File

@ -2,58 +2,58 @@ include "constants.asm"
SECTION "maps/SilentHill.asm", ROMX
SilentHillScriptLoader:: ; 7669
SilentHillScriptLoader::
ld hl, SilentHillScriptPointers1
call RunMapScript
call WriteBackMapScriptNumber
ret
SilentHillNPCIDs1: ; 7673
SilentHillNPCIDs1:
db 0
db 2
db 3
db $FF
SilentHillNPCIDs2: ; 7677
SilentHillNPCIDs2:
db 2
db 3
db $FF
SilentHillNPCIDs3: ; 767A
SilentHillNPCIDs3:
db 1
db 2
db 3
db $FF
SilentHillScriptPointers1: ; 767E
SilentHillScriptPointers1:
dw SilentHillScript1
dw SilentHillNPCIDs1
SilentHillScriptPointers2: ; 7682
SilentHillScriptPointers2:
dw SilentHillScript2
dw SilentHillNPCIDs1
SilentHillScriptPointers3: ; 7686
SilentHillScriptPointers3:
dw SilentHillScript3
dw SilentHillNPCIDs1
SilentHillScriptPointers4: ; 768A
SilentHillScriptPointers4:
dw SilentHillScript4
dw SilentHillNPCIDs2
SilentHillScriptPointers5: ; 768E
SilentHillScriptPointers5:
dw SilentHillScript5
dw SilentHillNPCIDs3
SilentHillScriptPointers6: ; 7692
SilentHillScriptPointers6:
dw SilentHillScript6
dw SilentHillNPCIDs2
SilentHillScriptPointers7: ; 7696
SilentHillScriptPointers7:
dw SilentHillScript7
dw SilentHillNPCIDs2
SilentHillScript1: ; 769A
SilentHillScript1:
ld a, [wYCoord]
cp 5
ret nz
@ -75,7 +75,7 @@ SilentHillScript1: ; 769A
call WriteIntod637
ret
SilentHillMovement1: ; 76C8
SilentHillMovement1:
db $0D
db $0D
db $0D
@ -84,7 +84,7 @@ SilentHillMovement1: ; 76C8
db $02
db $32
SilentHillScript2: ; 76CF
SilentHillScript2:
ld a, 0
ld d, RIGHT
call SetObjectFacing
@ -105,17 +105,17 @@ SilentHillScript2: ; 76CF
ld [wMapScriptNumber], a
ret
SilentHillMovement2: ; 76FF
SilentHillMovement2:
db $00, $04, $08, $0C, $0C, $0C, $33
SilentHillScript3: ;7706
SilentHillScript3:
call Function1848
ld a, 3
ld [wMapScriptNumber], a
call InitUnknownBuffercc9e
ret
SilentHillScript4: ; 7712
SilentHillScript4:
ld a, [wXCoord]
cp 0
jr nz, .bigjump
@ -158,7 +158,7 @@ SilentHillScript4: ; 7712
call CallMapTextSubroutine
ret
Function776a: ; 776A
Function776a:
ld hl, wd41a
set 7, [hl]
ld a, 1
@ -166,13 +166,13 @@ Function776a: ; 776A
ld [hl], a
ret
SilentHillMovement3: ; 7776
SilentHillMovement3:
db $0A, $0A, $0A, $09, $0A, $06, $02, $32
SilentHillMovement4: ; 777E
SilentHillMovement4:
db $0A, $0A, $0A, $0A, $06, $02, $32
SilentHillScript5: ; 7785
SilentHillScript5:
ld a, 0
ld d, RIGHT
call SetObjectFacing
@ -205,13 +205,13 @@ SilentHillScript5: ; 7785
ld [wMapScriptNumber], a
ret
SilentHillMovement5: ; 77CC
SilentHillMovement5:
db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33
SilentHillMovement6: ; 77E0
SilentHillMovement6:
db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33
SilentHillScript6: ; 77F3
SilentHillScript6:
ld hl, SilentHillNPCIDs2
ld de, SilentHillSignPointers
call CallMapTextSubroutine
@ -224,7 +224,7 @@ SilentHillScript6: ; 77F3
ld [wMapScriptNumber], a
ret
SilentHillScript7: ; 780D
SilentHillScript7:
call CheckLabDoor
ret z
ld hl, SilentHillNPCIDs2
@ -232,7 +232,7 @@ SilentHillScript7: ; 780D
call CallMapTextSubroutine
ret
CheckLabDoor: ; 781B
CheckLabDoor:
ld a, [wYCoord]
cp $C
ret nz
@ -257,7 +257,7 @@ CheckLabDoor: ; 781B
call ClearAccumulator
ret
LabClosed: ; 784C
LabClosed:
ld a, 0
ld hl, SilentHillMovement7
call LoadMovementDataPointer
@ -267,64 +267,64 @@ LabClosed: ; 784C
call WriteIntod637
ret
SilentHillTextString1: ; 785F
SilentHillTextString1:
text "あれ？　カギが　かかっている"
done
SilentHillMovement7: ; 786F
SilentHillMovement7:
db $04, $32
SilentHillSignPointers:: ; 7871
SilentHillSignPointers::
dw SilentHillPlayerHouseText
dw Function38c6
dw SilentHillSignText1
dw SilentHillLabText
dw SilentHillRivalHouseText
SilentHillLabText: ; 787B
SilentHillLabText:
ld hl, SilentHillTextString2
call OpenTextbox
ret
SilentHillTextString2: ; 7882
SilentHillTextString2:
text "にゅうきょしゃ　ぼしゅうちゅう！"
done
SilentHillSignText1: ; 7894
SilentHillSignText1:
ld hl, SilentHillTextString3
call OpenTextbox
ret
SilentHillTextString3: ; 789B
SilentHillTextString3:
text "ここは　サイレント　ヒル"
line "しずかな　おか"
done
SilentHillPlayerHouseText: ; 78B1
SilentHillPlayerHouseText:
ld hl, SilentHillTextString4
call OpenTextbox
ret
SilentHillTextString4: ; 78B8
SilentHillTextString4:
text "ここは　<PLAYER>　のいえ"
done
SilentHillRivalHouseText: ; 78C3
SilentHillRivalHouseText:
ld hl, SilentHillTextString5
call OpenTextbox
ret
SilentHillTextString5: ; 78CA
SilentHillTextString5:
text "ここは　<RIVAL>　のいえ"
done
SilentHillTextPointers:: ; 78d5
SilentHillTextPointers::
dw SilentHillTextRival1 ; west
dw SilentHillTextNorthExit ; north
dw SilentHillTextBackpack ; npc1
dw SilentHillTextPokemonHate ; npc2
SilentHillTextRival1: ; 78DD
SilentHillTextRival1:
text "<RIVAL>『よう　ちょっと　おまえに"
cont "じまん　したいことが"
cont "あってきたんだよ"
@ -341,7 +341,7 @@ SilentHillTextRival1: ; 78DD
db $08
LoadMomNamePromptUnused: ; 796F
LoadMomNamePromptUnused:
call LoadStandardMenuHeader
callab MomNamePrompt
call CloseWindow
@ -350,13 +350,13 @@ LoadMomNamePromptUnused: ; 796F
call UpdateTimePals
jp Function3036
MomNameMenuHeaderUnused: ; 7989
MomNameMenuHeaderUnused:
db MENU_BACKUP_TILES ; flags
menu_coords 00, 00, 10, 11
dw .MomNameMenuDataUnused
db 01 ; initial selection
.MomNameMenuDataUnused: ; 7991
.MomNameMenuDataUnused:
db STATICMENU_CURSOR
db 04 ; items
db "じぶんで　きめる@"
@ -364,7 +364,7 @@ MomNameMenuHeaderUnused: ; 7989
db "ママ@"
db "かあちゃん@"
SilentHillTextRival2: ; 79AC - BYTE OFF
SilentHillTextRival2: ; BYTE OFF
text "<RIVAL>『えー　かっこわりい！"
line "そんな　こどもっぽい"
cont "よびかた　してるなんて"
@ -377,12 +377,12 @@ SilentHillTextRival2: ; 79AC - BYTE OFF
cont "いくことに　するぜ！"
done
SilentHillTextNorthExit: ; 7A14
SilentHillTextNorthExit:
text "ちょいまち！"
line "まってよ！　まてっ　てば！"
done
SilentHillTextPokemonInGrassString: ; 7A2A
SilentHillTextPokemonInGrassString:
text "きみは　まったく"
line "なんにも　しらないんだね！"
cont "くさむらでは"
@ -397,22 +397,22 @@ SilentHillTextPokemonInGrassString: ; 7A2A
cont "ぼくに　ついて　きて！"
done
SilentHillTextBackpack: ; 7A99
SilentHillTextBackpack:
ld hl, SilentHillTextBackpackString
call OpenTextbox
ret
SilentHillTextBackpackString: ; 7AA0
SilentHillTextBackpackString:
text "あなたの　りュック　かっこいいわよ"
line "どこで　てに　いれたの？"
done
SilentHillTextPokemonHate: ; 7AC0
SilentHillTextPokemonHate:
ld hl, SilentHillTextPokemonHateString
call OpenTextbox
ret
SilentHillTextPokemonHateString: ; 7AC7
SilentHillTextPokemonHateString:
text "よのなかに　ポケモンが　きらいな"
line "ひとは　いるのかな？"
done

36
maps/SilentHillHouse.asm
View File

@ -2,13 +2,13 @@ include "constants.asm"
SECTION "maps/SilentHillHouse.asm", ROMX
SilentHillHouseScriptLoader:: ; 4839
SilentHillHouseScriptLoader::
ld hl, SilentHillHouseScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
SilentHillHouseScriptPointers: ; 4843
SilentHillHouseScriptPointers:
dw SilentHillHouseScript1
dw SilentHillHouseNPCIDs1
dw SilentHillHouseScript2
@ -16,19 +16,19 @@ SilentHillHouseScriptPointers: ; 4843
dw SilentHillHouseScript3
dw SilentHillHouseNPCIDs1
SilentHillHouseScript1: ; 484F
SilentHillHouseScript1:
ld hl, SilentHillHouseNPCIDs1
ld de, SilentHillHouseTextPointers2
call CallMapTextSubroutine
ret
SilentHillHouseScript2: ; 4859
SilentHillHouseScript2:
ld hl, SilentHillHouseNPCIDs2
ld de, SilentHillHouseTextPointers2
call CallMapTextSubroutine
ret
SilentHillHouseScript3: ; 4863
SilentHillHouseScript3:
ld hl, SilentHillHouseNPCIDs1
ld de, SilentHillHouseTextPointers2
call CallMapTextSubroutine
@ -43,7 +43,7 @@ SilentHillHouseNPCIDs2:
db 1
db $FF
SilentHillHouseTextPointers2:: ; 4872
SilentHillHouseTextPointers2::
dw SilentHillHouseNPCText1
dw Function38bd
dw Function3899
@ -51,7 +51,7 @@ SilentHillHouseTextPointers2:: ; 4872
dw Function38ab
dw Function38cf
SilentHillHouseNPCText1: ; 487E
SilentHillHouseNPCText1:
ld hl, wd41a
bit 6, [hl]
jr nz, .jump
@ -66,13 +66,13 @@ SilentHillHouseNPCText1: ; 487E
call Function1fea
ret
SilentHillHouseTextString1: ; 489B
SilentHillHouseTextString1:
text "おや？　<RIVAL>あてに　メールが"
line "とどいている　ようだ"
cont "よんでみる？@"
db $08
SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?)
SilentHillHouseNPCText2: ; (unused due to typo in the text pointers?)
call YesNoBox
jr c, .jump
ld hl, wd41a
@ -87,7 +87,7 @@ SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?)
call Function3036
ret
SilentHillHouseTextString2: ; 48DB
SilentHillHouseTextString2:
text "とつぜん　メールを　さしあげる"
line "しつれいを　おゆるしあれ"
@ -97,26 +97,26 @@ SilentHillHouseTextString2: ; 48DB
cont "ポケモンけんきゅうしゃ　オーキド"
done
SilentHillHouseTextString3: ; 4937
SilentHillHouseTextString3:
text "ひとのメールは"
line "みちゃ　いけないよな<⋯⋯>"
done
SilentHillHouseTextPointers:: ; 494C
SilentHillHouseTextPointers::
dw SilentHillHouseNPCText3
dw SilentHillHouseNPCText4
SilentHillHouseNPCText3: ; 4950
SilentHillHouseNPCText3:
ld hl, SilentHillHouseTextString4
call OpenTextbox
ret
SilentHillHouseTextString4: ; 4957
SilentHillHouseTextString4:
text "このまえ　かわったいろの"
line "ポッポを　みかけたわ"
done
SilentHillHouseNPCText4: ; 4970
SilentHillHouseNPCText4:
ld hl, wd41e
bit 2, [hl]
jr nz, .jump
@ -133,7 +133,7 @@ SilentHillHouseNPCText4: ; 4970
call OpenTextbox
ret
SilentHillHouseTextString5: ; 4991
SilentHillHouseTextString5:
text "ケン『ななな"
line "なんだ　<PLAYER>　じゃないか！"
@ -151,7 +151,7 @@ SilentHillHouseTextString5: ; 4991
cont "よし　これで　マップが　みれるぞ！"
done
SilentHillHouseTextString6: ; 4A29
SilentHillHouseTextString6:
text "もし　オールドにいくなら"
line "マサキって　やつに　あうといい"
@ -161,7 +161,7 @@ SilentHillHouseTextString6: ; 4A29
cont "てだすけを　してくれるぜ"
done
SilentHillHouseTextString7: ; 4A76
SilentHillHouseTextString7:
text "ケン『<PLAYER>"
line "オーキドはかせに　みこまれて"
cont "ポケモンずかんを　つくるんだって？"

78
maps/SilentHillLabBack.asm
View File

@ -2,13 +2,13 @@ include "constants.asm"
SECTION "maps/SilentHillLabBack.asm", ROMX
SilentHillLabBackScriptLoader:: ; 5C69
SilentHillLabBackScriptLoader::
ld hl, SilentHillLabBackScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
SilentHillLabBackScriptPointers: ; 5C73
SilentHillLabBackScriptPointers:
dw SilentHillLabBackScript1
dw SilentHillLabBackNPCIDs1
dw SilentHillLabBackScript2
@ -24,23 +24,23 @@ SilentHillLabBackScriptPointers: ; 5C73
dw SilentHillLabBackScript7
dw SilentHillLabBackNPCIDs1
SilentHillLabBackNPCIDs1: ; 5C8F
SilentHillLabBackNPCIDs1:
db 00, 01, 02, 03, 04, $FF
SilentHillLabBackNPCIDs2: ; 5C95
SilentHillLabBackNPCIDs2:
db 00, 01, 04, $FF
SilentHillLabBackNPCIDs3: ; 5C99
SilentHillLabBackNPCIDs3:
db 00, 01, 02, $FF
SilentHillLabBackNPCIDs4: ; 5C9D
SilentHillLabBackNPCIDs4:
db 00, 01, 03, $FF
SilentHillLabBackTextPointers:: ; 5CA1
SilentHillLabBackTextPointers::
dw SilentHillLabBackText1
dw SilentHillLabBackFunc3
dw SilentHillLabBackFunc4
dw SilentHillLabBackFunc4
dw SilentHillLabBackFunc4
SilentHillLabBackScript1: ; 5CAB
SilentHillLabBackScript1:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 0
@ -58,10 +58,10 @@ SilentHillLabBackScript1: ; 5CAB
call WriteIntod637
ret
SilentHillLabBackMovement1: ; 5CD2
SilentHillLabBackMovement1:
db 09, 09, 05, $32
SilentHillLabBackScript2: ; 5CD6
SilentHillLabBackScript2:
ld hl, wc5ed
set 6, [hl]
call Function20f8
@ -78,13 +78,13 @@ SilentHillLabBackScript2: ; 5CD6
ld [wMapScriptNumber], a
ret
SilentHillLabBackScript3: ; 5CFD
SilentHillLabBackScript3:
ld hl, SilentHillLabBackNPCIDs1
ld de, SilentHillLabBackTextPointers2
call CallMapTextSubroutine
ret
SilentHillLabBackRivalChoosePokemon: ; 5D07
SilentHillLabBackRivalChoosePokemon:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 3
@ -108,15 +108,15 @@ SilentHillLabBackRivalChoosePokemon: ; 5D07
call WriteIntod637
ret
SilentHillLabBackMovementPointers: ; 5D34
SilentHillLabBackMovementPointers:
dw SilentHillLabBackMovement2+1
dw SilentHillLabBackMovement2
dw SilentHillLabBackMovement2+2
SilentHillLabBackMovement2: ; 5D3A
SilentHillLabBackMovement2:
db $0B, $0B, $0B, $0B, $05, $32
SilentHillLabBackScript5: ; 5D40
SilentHillLabBackScript5:
ld hl, SilentHillLabBackTextString12
call OpenTextbox
ld a, [wd266]
@ -128,7 +128,7 @@ SilentHillLabBackScript5: ; 5D40
ld [wMapScriptNumber], a
ret
SilentHillLabBackScript6: ; 5D5B
SilentHillLabBackScript6:
call Function20f8
ld hl, wc5ed
res 6, [hl]
@ -136,13 +136,13 @@ SilentHillLabBackScript6: ; 5D5B
ld[wMapScriptNumber], a
ret
SilentHillLabBackScript7: ; 5D69
SilentHillLabBackScript7:
ld hl, SilentHillLabBackNPCIDs1
ld de, SilentHillLabBackTextPointers2
call CallMapTextSubroutine
ret
SilentHillLabBackText1: ; 5D73
SilentHillLabBackText1:
ld hl, wd41b
bit 2, [hl]
ld hl, SilentHillLabBackTextString3
@ -152,7 +152,7 @@ SilentHillLabBackText1: ; 5D73
call OpenTextbox
ret
SilentHillLabBackTextString1: ; 5D84
SilentHillLabBackTextString1:
text "オーキド『ほれ　そこに　３びき"
cont "ポケモンが　いる　じゃろう！"
cont "ほっほ！"
@ -162,18 +162,18 @@ SilentHillLabBackTextString1: ; 5D84
cont "⋯⋯　さあ　えらべ！"
done
SilentHillLabBackTextString2: ; 5DCD
SilentHillLabBackTextString2:
text "オーキド『まあ"
line "あわてるな　<RIVAL>！"
cont "おまえも　すきなものを　とれ！"
done
SilentHillLabBackTextString3: ; 5DEF
SilentHillLabBackTextString3:
text "オーキド『さあ　<PLAYER>"
line "どの　ポケモンに　するかね？"
done
SilentHillLabBackTextString4: ; 5E1C
SilentHillLabBackTextString4:
text "オーキド『ほう！　ほのおのポケモン"
line "@"
ld bc, wStringBuffer1
@ -183,7 +183,7 @@ SilentHillLabBackTextString4: ; 5E1C
call Function3036
ret
SilentHillLabBackTextString5: ; 5E32
SilentHillLabBackTextString5:
text "オーキド『ふむ　みずのポケモン"
line "@"
ld bc, wStringBuffer1
@ -193,7 +193,7 @@ SilentHillLabBackTextString5: ; 5E32
call Function3036
ret
SilentHillLabBackTextString6: ; 5E6E
SilentHillLabBackTextString6:
text "オーキド『おお！　くさのポケモン"
line "@"
ld bc, wStringBuffer1
@ -203,7 +203,7 @@ SilentHillLabBackTextString6: ; 5E6E
call Function3036
ret
ConfirmPokemonSelection: ; 5E85
ConfirmPokemonSelection:
call YesNoBox
jr c, .bigJump
ld hl, wd41b
@ -228,17 +228,17 @@ ConfirmPokemonSelection: ; 5E85
ld a, 3
ld [wMapScriptNumber], a
ret
.bigJump ; 5EC6
.bigJump
ld hl, SilentHillLabBackTextString7
call PrintText
ret
SilentHillLabBackTextString7: ; 5ECD
SilentHillLabBackTextString7:
text "では"
line "どれに　するのじゃ？"
done
SilentHillLabBackTextString8: ; 5EDC
SilentHillLabBackTextString8:
text "オーキド『この　ポケモンは"
line "ほんとに　げんきが　いいぞ！"
@ -247,14 +247,14 @@ SilentHillLabBackTextString8: ; 5EDC
ld bc, wStringBuffer1
text "を　もらった！<PROMPT>"
SilentHillLabBackTextString9: ; 5F14
SilentHillLabBackTextString9:
text "オーキド『そうじゃ！"
line "やせいの　ポケモンが　でて　きても"
cont "そいつを　たたかわせて　いけば"
cont "となりまちへ　いける！"
done
SilentHillLabBackFunc3: ; 5F4E
SilentHillLabBackFunc3:
ld hl, wd41b
bit 2, [hl]
ld hl, SilentHillLabBackTextString11
@ -264,36 +264,36 @@ SilentHillLabBackFunc3: ; 5F4E
call OpenTextbox
ret
SilentHillLabBackTextString10: ; 5F5F
SilentHillLabBackTextString10:
text "<RIVAL>『あッ！　おれにも！"
line "じいさん　おれにもくれよう！"
done
SilentHillLabBackTextString11: ; 5F7B
SilentHillLabBackTextString11:
text "<RIVAL>『いいぜ　<PLAYER>！"
line "さきに　えらんで！"
cont "おれは　こころが　ひろいからな"
done
SilentHillLabBackTextString12: ; 5F9F
SilentHillLabBackTextString12:
text "<RIVAL>『じゃ　おれは　これ！"
done
SilentHillLabBackTextString13: ; 5FAD
SilentHillLabBackTextString13:
text "<RIVAL>は　オーキドから"
line "@"
ld bc, wStringBuffer1
text "を　もらった！"
done
SilentHillLabBackTextString14: ; 5FC5
SilentHillLabBackTextString14:
text "<RIVAL>『<PLAYER>の#"
line "いいなあ！"
cont "でも　おれのポケモンも"
cont "ちょっと　いいだろ？"
done
SilentHillLabBackFunc4: ; 5FE9
SilentHillLabBackFunc4:
ld hl, wd41b
bit 2, [hl]
jr nz, .bigjump
@ -332,7 +332,7 @@ SilentHillLabBackFunc4: ; 5FE9
call OpenTextbox
ret
SilentHillLabBackStarterData: ; 6031
SilentHillLabBackStarterData:
db DEX_HONOGUMA
dw SilentHillLabBackTextString4
db DEX_KURUSU
@ -345,12 +345,12 @@ SilentHillLabBackStarterData: ; 6031
dw SilentHillLabBackTextString6
db DEX_HONOGUMA
SilentHillLabBackTextString15: ; 603D
SilentHillLabBackTextString15:
text "オーキド『これ！"
line "よくばっちゃ　いかん！"
done
SilentHillLabBackTextPointers2: ; 6053
SilentHillLabBackTextPointers2:
dw Function3899
dw Function3899
dw Function3899

202
maps/SilentHillLabFront.asm
View File

@ -2,13 +2,13 @@ include "constants.asm"
SECTION "maps/SilentHillLabFront.asm", ROMX
SilentHillLabFrontScriptLoader:: ; 4BBC
SilentHillLabFrontScriptLoader::
ld hl, SilentHillLabFrontScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
SilentHillLabFrontScriptPointers: ; 4BC6
SilentHillLabFrontScriptPointers:
dw SilentHillLabFrontScript1
dw SilentHillLabFrontNPCIDs1
@ -66,30 +66,30 @@ SilentHillLabFrontScriptPointers: ; 4BC6
dw SilentHillLabFrontScript19
dw SilentHillLabFrontNPCIDs9
SilentHillLabFrontNPCIDs1: ; 4C12
SilentHillLabFrontNPCIDs1:
db $02
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs2: ; 4C16
SilentHillLabFrontNPCIDs2:
db $00
db $02
db $04
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs3: ; 4C1C
SilentHillLabFrontNPCIDs3:
db $02
db $04
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs4: ; 4C21
SilentHillLabFrontNPCIDs4:
db $04
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs5: ; 4C25
SilentHillLabFrontNPCIDs5:
db $01
db $03
db $05
@ -99,7 +99,7 @@ SilentHillLabFrontNPCIDs5: ; 4C25
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs6: ; 4C2E
SilentHillLabFrontNPCIDs6:
db $01
db $03
db $05
@ -107,14 +107,14 @@ SilentHillLabFrontNPCIDs6: ; 4C2E
db $07
db $08
db $FF
SilentHillLabFrontNPCIDs7: ; 4C35
SilentHillLabFrontNPCIDs7:
db $00
db $05
db $06
db $07
db $08
db $FF
SilentHillLabFrontNPCIDs8: ; 4C3B (unused?)
SilentHillLabFrontNPCIDs8: ; (unused?)
db $00
db $03
db $05
@ -124,13 +124,13 @@ SilentHillLabFrontNPCIDs8: ; 4C3B (unused?)
db $09
db $0A
db $FF
SilentHillLabFrontNPCIDs9: ; 4C44
SilentHillLabFrontNPCIDs9:
db $00
db $07
db $08
db $FF
SilentHillLabFrontTextPointers:: ; 4C48
SilentHillLabFrontTextPointers::
dw SilentHillLabFrontText4
dw SilentHillLabFrontText7
dw SilentHillLabFrontText10
@ -143,7 +143,7 @@ SilentHillLabFrontTextPointers:: ; 4C48
dw SilentHillLabFrontText16
dw SilentHillLabFrontText16
SilentHillLabFrontScript1: ; 4C5E
SilentHillLabFrontScript1:
call SilentHillLabFrontMoveDown
ret z
ld hl, SilentHillLabFrontNPCIDs1
@ -151,7 +151,7 @@ SilentHillLabFrontScript1: ; 4C5E
call CallMapTextSubroutine
ret
SilentHillLabFrontMoveDown: ; 4C6C
SilentHillLabFrontMoveDown:
ld a, [wXCoord]
cp 4
ret nz
@ -176,15 +176,15 @@ SilentHillLabFrontMoveDown: ; 4C6C
call ClearAccumulator
ret
SilentHillLabFrontMovement1: ; 4CA2
SilentHillLabFrontMovement1:
db $06, $32
SilentHillLabFrontScript2: ; 4CA4
SilentHillLabFrontScript2:
ld a, 2
ld [wMapScriptNumber], a
ret
SilentHillLabFrontScript3: ; 4CAA
SilentHillLabFrontScript3:
ld a, 6
call Function17f9
ld a, 0
@ -203,16 +203,16 @@ SilentHillLabFrontScript3: ; 4CAA
call WriteIntod637
ret
SilentHillLabFrontMovement2: ; 4CD3
SilentHillLabFrontMovement2:
db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32
SilentHillLabFrontScript4: ; 4CE0
SilentHillLabFrontScript4:
call Function1828
ld a, 4
ld [wMapScriptNumber], a
ret
SilentHillLabFrontConversation1: ; 4CE9
SilentHillLabFrontConversation1:
ld a, 4
ld d, RIGHT
call SetObjectFacing
@ -237,7 +237,7 @@ SilentHillLabFrontConversation1: ; 4CE9
call SilentHillLabFrontScript5
ret
SilentHillLabFrontScript5: ; 4D26
SilentHillLabFrontScript5:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 2
@ -253,10 +253,10 @@ SilentHillLabFrontScript5: ; 4D26
call WriteIntod637
ret
SilentHillLabFrontMovement3: ; 4D48
SilentHillLabFrontMovement3:
db 9, 5, $33
SilentHillLabFrontScript6: ; 4D4B
SilentHillLabFrontScript6:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 4
@ -272,10 +272,10 @@ SilentHillLabFrontScript6: ; 4D4B
call WriteIntod637
ret
SilentHillLabFrontMovement4: ; 4D6D
SilentHillLabFrontMovement4:
db $0D, $0D, $0F, $0D, $0D, $33
SilentHillLabFrontScript7: ; 4D73
SilentHillLabFrontScript7:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 0
@ -291,10 +291,10 @@ SilentHillLabFrontScript7: ; 4D73
call WriteIntod637
ret
SilentHillLabFrontMovement5: ; 4D95
SilentHillLabFrontMovement5:
db 09, 09, 09, 05, $32
SilentHillLabFrontScript8: ; 4D9A
SilentHillLabFrontScript8:
ld a, 3
call Function1989
ld a, 5
@ -314,10 +314,10 @@ SilentHillLabFrontScript8: ; 4D9A
call WriteIntod637
ret
SilentHillLabFrontMovement6: ; 4DC6
SilentHillLabFrontMovement6:
db 8, 8, 8, $0A, 6, $32
SilentHillLabFrontScript9: ; 4DCC
SilentHillLabFrontScript9:
ld hl, wJoypadFlags
set 4, [hl]
ld a, 5
@ -335,10 +335,10 @@ SilentHillLabFrontScript9: ; 4DCC
call WriteIntod637
ret
SilentHillLabFrontMovement7: ; 4DF3
SilentHillLabFrontMovement7:
db $08, $08, $08, $08, $0A, $06, $32
SilentHillLabFrontScript10: ; 4DFA
SilentHillLabFrontScript10:
ld a, 5
ld d, RIGHT
call SetObjectFacing
@ -367,10 +367,10 @@ SilentHillLabFrontScript10: ; 4DFA
call WriteIntod637
ret
SilentHillLabFrontMovement8: ; 4E3C
SilentHillLabFrontMovement8:
db $08, $04, $32
SilentHillLabFrontScript11: ; 4E3F
SilentHillLabFrontScript11:
ld hl, SilentHillLabFrontTextString8
call OpenTextbox
ld hl, SilentHillLabFrontTextString9
@ -391,7 +391,7 @@ SilentHillLabFrontScript11: ; 4E3F
call InitUnknownBuffercc9e
ret
SilentHillLabFrontScript12: ; 4E72
SilentHillLabFrontScript12:
call SilentHillLabFrontMoveDown
ret z
call SilentHillLabFrontRivalMovePokemon
@ -401,7 +401,7 @@ SilentHillLabFrontScript12: ; 4E72
call CallMapTextSubroutine
ret
SilentHillLabFrontRivalMovePokemon: ; 4E84
SilentHillLabFrontRivalMovePokemon:
ld a, [wYCoord]
cp 8
ret nz
@ -430,13 +430,13 @@ SilentHillLabFrontRivalMovePokemon: ; 4E84
call ClearAccumulator
ret
SilentHillLabFrontMovement9: ; 4EDE
SilentHillLabFrontMovement9:
db $08, $0B, $0B, $08, $08, $04, $32
SilentHillLabFrontMovement10: ; 4EC5
SilentHillLabFrontMovement10:
db $08, $0B, $08, $08, $04, $32
SilentHillLabFrontScript13: ; 4ECB
SilentHillLabFrontScript13:
ld hl, SilentHillLabFrontTextString17
call OpenTextbox
call GetLabPokemon
@ -449,7 +449,7 @@ SilentHillLabFrontScript13: ; 4ECB
call InitUnknownBuffercc9e
ret
GetLabPokemon: ; 4EE7
GetLabPokemon:
ld hl, LabPokemon
ld a, [wd266]
ld b, a
@ -466,7 +466,7 @@ GetLabPokemon: ; 4EE7
inc hl
jr .loop
LabPokemon: ; 4EFF
LabPokemon:
db DEX_KURUSU
db 1
db DEX_HAPPA
@ -474,7 +474,7 @@ LabPokemon: ; 4EFF
db DEX_HONOGUMA
db 3
SilentHillLabFrontScript14: ; 4F05
SilentHillLabFrontScript14:
ld hl, SilentHillLabFrontTextString19
ld a, [wcd5d]
and a
@ -497,17 +497,17 @@ SilentHillLabFrontScript14: ; 4F05
call WriteIntod637
ret
SilentHillLabFrontMovement11: ; 4F36
SilentHillLabFrontMovement11:
db $04, $08, $08, $08, $33
SilentHillLabFrontScript15: ; 4F3B
SilentHillLabFrontScript15:
call Function20f8
ld a, $0F
ld [wMapScriptNumber], a
call InitUnknownBuffercc9e
ret
SilentHillLabFrontScript16: ; 4F47
SilentHillLabFrontScript16:
call SilentHillLabFrontMoveDown
ret z
call SilentHillLabFrontMoveRivalLeave
@ -517,7 +517,7 @@ SilentHillLabFrontScript16: ; 4F47
call CallMapTextSubroutine
ret
SilentHillLabFrontMoveRivalLeave: ; 4F59
SilentHillLabFrontMoveRivalLeave:
ld a, [wYCoord]
cp $0B
ret nz
@ -549,7 +549,7 @@ SilentHillLabFrontMoveRivalLeave: ; 4F59
Movememt12:; 4F93
db $07, $07, $07, $05, $32
SilentHillLabFrontScript17: ; 4F98
SilentHillLabFrontScript17:
ld hl, SilentHillLabFrontTextString23
call OpenTextbox
ld hl, wd41d
@ -565,7 +565,7 @@ SilentHillLabFrontScript17: ; 4F98
ld [wMapScriptNumber], a
ret
SilentHillLabFrontScript18: ; 4FBC
SilentHillLabFrontScript18:
call SilentHillLabFrontMoveDown
ret z
ld hl, SilentHillLabFrontNPCIDs7
@ -573,7 +573,7 @@ SilentHillLabFrontScript18: ; 4FBC
call CallMapTextSubroutine
ret
SilentHillLabFrontScript19: ; 4FCA
SilentHillLabFrontScript19:
call SilentHillLabFrontMoveDown
ret z
ld hl, SilentHillLabFrontNPCIDs9
@ -581,7 +581,7 @@ SilentHillLabFrontScript19: ; 4FCA
call CallMapTextSubroutine
ret
SilentHillLabFrontTextPointers2: ; 4FD8
SilentHillLabFrontTextPointers2:
dw SilentHillLabFrontText1
dw SilentHillLabFrontText2
dw Function3899
@ -598,12 +598,12 @@ SilentHillLabFrontTextPointers2: ; 4FD8
dw Function3899
dw SilentHillLabFrontText3
SilentHillLabFrontText1: ; 4FF6
SilentHillLabFrontText1:
ld hl, SilentHillLabFrontTextString1
call OpenTextbox
ret
SilentHillLabFrontTextString1: ; 4FFD
SilentHillLabFrontTextString1:
text "パソコンを　みると"
line "なんと　メールが　きていた！"
@ -626,7 +626,7 @@ SilentHillLabFrontTextString1: ; 4FFD
cont "<⋯⋯>　<⋯⋯>　<⋯⋯>じょしゅより"
done
SilentHillLabFrontText2: ; 50B3
SilentHillLabFrontText2:
ld hl, wd39d
bit 0, [hl]
set 0, [hl]
@ -640,26 +640,26 @@ SilentHillLabFrontText2: ; 50B3
call OpenTextbox
ret
SilentHillLabFrontTextString2A: ; 50CA
SilentHillLabFrontTextString2A:
text "スタート　ボタンを　プシュ！"
line "おすと　メニューが　ひらくなり"
done
SilentHillLabFrontTextString2B: ; 50EA
SilentHillLabFrontTextString2B:
text "セーブするには　#　レポート"
line "こまめに　かくと　いいなり"
done
SilentHillLabFrontText3: ; 5108
SilentHillLabFrontText3:
ld hl, SilentHillLabFrontTextString3
call OpenTextbox
ret
SilentHillLabFrontTextString3: ; 510F
SilentHillLabFrontTextString3:
text "カギが　かかっている"
done
SilentHillLabFrontText4: ; 511B
SilentHillLabFrontText4:
ld a, [wMapScriptNumber]
cp $0E
jp nc, SilentHillLabFrontText7
@ -667,11 +667,11 @@ SilentHillLabFrontText4: ; 511B
call OpenTextbox
ret
SilentHillLabFrontTextString4: ; 512A
SilentHillLabFrontTextString4:
text "オーキド『ごくろうさん！"
done
SilentHillLabFrontTextString5: ; 5138
SilentHillLabFrontTextString5:
text "オーキド『そうとも！"
line "わしが　オーキドじゃ！"
cont "じじいで　わるかったな！"
@ -683,7 +683,7 @@ SilentHillLabFrontTextString5: ; 5138
line "きいては　くれんか？@"
db $08
SilentHillLabFrontText6: ; 5192
SilentHillLabFrontText6:
call YesNoBox
jr c, .jump
.loop
@ -699,7 +699,7 @@ SilentHillLabFrontText6: ; 5192
jr c, .jump
jr .loop
SilentHillLabFrontTextString6A: ; 51AE
SilentHillLabFrontTextString6A:
text "オーキド『いまから　１ねんまえ"
line "わしは　カントーで"
cont "きみたちの　ような　しょうねんに"
@ -740,7 +740,7 @@ SilentHillLabFrontTextString6A: ; 51AE
cont "ちからを　かして　くれんか！"
done
SilentHillLabFrontTextString6B: ; 5332
SilentHillLabFrontTextString6B:
text "オーキド『そうか<⋯⋯>"
line "わしに　ひとを　みるめが"
cont "なかったと　いうことじゃな<⋯⋯>"
@ -753,12 +753,12 @@ SilentHillLabFrontTextString6B: ; 5332
cont "わしの　はなしを　きいてくれるな？"
done
SilentHillLabFrontTextString7: ; 538D
SilentHillLabFrontTextString7:
text "オーキド『ふたりとも！"
line "ちょっと　わしに　ついてこい！"
done
SilentHillLabFrontText7: ; 53AA
SilentHillLabFrontText7:
ld a, [wMapScriptNumber]
cp $12
jr z, .jump
@ -771,18 +771,18 @@ SilentHillLabFrontText7: ; 53AA
call OpenTextbox
ret
SilentHillLabFrontTextString8: ; 53BF
SilentHillLabFrontTextString8:
text "オーキド『<PLAYER>！<RIVAL>！"
line "このずかんを"
cont "おまえたちに　あずける！"
done
SilentHillLabFrontTextString9: ; 53DE
SilentHillLabFrontTextString9:
text "<PLAYER>は　オーキドから"
line "#ずかんを　もらった！"
done
SilentHillLabFrontTextString10: ; 53F5
SilentHillLabFrontTextString10:
text "オーキド『この　せかいの　すべての"
line "#を　きろくした"
cont "かんぺきな　ずかんを　つくること！"
@ -804,13 +804,13 @@ SilentHillLabFrontTextString10: ; 53F5
cont "いだいな　しごとじゃー！"
done
SilentHillLabFrontTextString11A: ; 54C3
SilentHillLabFrontTextString11A:
text "オーキド『せかい　じゅうの"
line "#たちが"
cont "<PLAYER>を　まって　おるぞー"
done
SilentHillLabFrontTextString11B: ; 54E3
SilentHillLabFrontTextString11B:
text "オーキド『おう！　<PLAYER>"
line "どうだ？"
cont "わしの　あげた　#は<⋯⋯>？"
@ -827,12 +827,12 @@ SilentHillLabFrontTextString11B: ; 54E3
line "きに　なるからな"
done
SilentHillLabFrontText8: ; 5560
SilentHillLabFrontText8:
ld hl, SilentHillLabFrontTextString12
call OpenTextbox
ret
SilentHillLabFrontTextString12: ; 5567
SilentHillLabFrontTextString12:
text "オーキド『よく　きたな！"
line "#ずかんの"
cont "ちょうしは　どうかな？"
@ -841,12 +841,12 @@ SilentHillLabFrontTextString12: ; 5567
cont "みて　あげようか！"
done
SilentHillLabFrontText9: ; 559A
SilentHillLabFrontText9:
ld hl, SilentHillLabFrontTextString13
call OpenTextbox
ret
SilentHillLabFrontTextString13: ; 55A1
SilentHillLabFrontTextString13:
text "オーキド『<⋯⋯>　おっほんッ！"
line "よくやったな　<PLAYER>！"
@ -865,12 +865,12 @@ SilentHillLabFrontTextString13: ; 55A1
cont "<RIVAL>『ギクッ！"
done
SilentHillLabFrontText10: ; 561A
SilentHillLabFrontText10:
ld hl, SilentHillLabFrontTextString14
call OpenTextbox
ret
SilentHillLabFrontTextString14: ; 5621
SilentHillLabFrontTextString14:
text "<RIVAL>『なんだ"
line "<PLAYER>じゃないか！"
cont "おれも　ここが"
@ -878,23 +878,23 @@ SilentHillLabFrontTextString14: ; 5621
cont "だれも　いないみたいだな<⋯⋯>"
done
SilentHillLabFrontText11: ; 5658
SilentHillLabFrontText11:
ld hl, SilentHillLabFrontTextString16
call OpenTextbox
ret
SilentHillLabFrontTextString15: ; 565F
SilentHillLabFrontTextString15:
text "<RIVAL>『よっしゃあ！"
line "じいさん！　おれにまかせな！"
done
SilentHillLabFrontTextString16: ; 5678
SilentHillLabFrontTextString16:
text "<RIVAL>『おれが　えらんだ"
line "#のほうが　つよそうだぜ！"
cont "こっちに　したかったんじゃないの？"
done
SilentHillLabFrontTextString17: ; 56A4
SilentHillLabFrontTextString17:
text "<RIVAL>『<PLAYER>！"
line "せっかく　じいさんに"
cont "#　もらったんだから"
@ -902,12 +902,12 @@ SilentHillLabFrontTextString17: ; 56A4
cont "たたかわせて　みようぜ！"
done
SilentHillLabFrontTextString18: ; 56D4
SilentHillLabFrontTextString18:
text "<RIVAL>『くっそー！"
line "こんどは　ぜったい　まけないぞ！"
done
SilentHillLabFrontTextString19: ; 56EE
SilentHillLabFrontTextString19:
text "<RIVAL>『よーし！"
line "ほかの　#と　たたかわせて"
cont "もっと　もっと　つよくしよう！"
@ -915,12 +915,12 @@ SilentHillLabFrontTextString19: ; 56EE
para "そんじゃ　ばいばい！"
done
SilentHillLabFrontTextString20: ; 571F
SilentHillLabFrontTextString20:
text "じいちゃん！"
line "つれてきたよー！"
done
SilentHillLabFrontTextString21: ; 5730
SilentHillLabFrontTextString21:
text "ぼくは　かつて"
line "#トレーナーの　ちょうてんを"
cont "めざしたことが　あるんだ"
@ -944,23 +944,23 @@ SilentHillLabFrontTextString21: ; 5730
cont "とても　ハイテクな　ずかん　だよ！"
done
SilentHillLabFrontText12: ; 5814
SilentHillLabFrontText12:
ld hl, SilentHillLabFrontTextString22
call OpenTextbox
ret
SilentHillLabFrontTextString22: ; 581B
SilentHillLabFrontTextString22:
text "ぼくも　むかし　やったけど"
line "なかなか　たいへんだよ<⋯⋯>"
cont "がんばってね！"
done
SilentHillLabFrontText13: ; 583F
SilentHillLabFrontText13:
ld hl, SilentHillLabFrontTextString24
call OpenTextbox
ret
SilentHillLabFrontTextString23: ; 5846
SilentHillLabFrontTextString23:
text "ナナミ『さっき　あなたを　"
line "つれてきた　わかい　おとこのこ<⋯⋯>"
cont "あれは　わたしの　おとうとなの"
@ -1008,17 +1008,17 @@ SilentHillLabFrontTextString23: ; 5846
line "いのっているわ"
done
SilentHillLabFrontTextString24: ; 5A23
SilentHillLabFrontTextString24:
text "<⋯⋯>あなたの　かつやく"
line "いのってるわ"
done
SilentHillLabFrontText14: ; 5A36
SilentHillLabFrontText14:
ld hl, SilentHillLabFrontTextString25
call OpenTextbox
ret
SilentHillLabFrontTextString25: ; 5A3D
SilentHillLabFrontTextString25:
text "わたしは"
line "はかせの　じょしゅ　です"
@ -1030,12 +1030,12 @@ SilentHillLabFrontTextString25: ; 5A3D
cont "なるような　きがします"
done
SilentHillLabFrontText15: ; 5A90
SilentHillLabFrontText15:
ld hl, SilentHillLabFrontTextString26
call OpenTextbox
ret
SilentHillLabFrontTextString26: ; 5A97
SilentHillLabFrontTextString26:
text "わたしは"
line "はかせの　じょしゅ　です"
@ -1047,22 +1047,22 @@ SilentHillLabFrontTextString26: ; 5A97
cont "なるような　きがします"
done
SilentHillLabFrontText16: ; 5AEA
SilentHillLabFrontText16:
ld hl, SilentHillLabFrontTextString27
call OpenTextbox
ret
SilentHillLabFrontTextString27: ; 5AF1
SilentHillLabFrontTextString27:
text "なんだろう？"
line "でんし　てちょう　かな？"
done
SilentHillLabFrontText17: ; 5B05
SilentHillLabFrontText17:
ld hl, SilentHillLabFrontTextString28
call OpenTextbox
ret
SilentHillLabFrontTextString28: ; 5B0D
SilentHillLabFrontTextString28:
text "<RIVAL>『あのメールを　くれた"
line "オーキドって　こんな　じじい<⋯⋯>"
@ -1071,18 +1071,18 @@ SilentHillLabFrontTextString28: ; 5B0D
cont "ほんもの　はじめて　みたよ！"
done
SilentHillLabFrontTextString29: ; 5B4F
SilentHillLabFrontTextString29:
text "<RIVAL>『<PLAYER>！"
line "なんだか"
cont "おもしろく　なってきたな！"
done
SilentHillLabFrontText18: ; 5B68
SilentHillLabFrontText18:
ld hl, SilentHillLabFrontTextString30
call OpenTextbox
ret
SilentHillLabFrontTextString30: ; 5B6F
SilentHillLabFrontTextString30:
text "わたしは"
line "はかせの　じょしゅ　です"
@ -1091,12 +1091,12 @@ SilentHillLabFrontTextString30: ; 5B6F
cont "なるような　きがします"
done
SilentHillLabFrontText19: ; 5BA7
SilentHillLabFrontText19:
ld hl, SilentHillLabFrontTextString31
call OpenTextbox
ret
SilentHillLabFrontTextString31: ; 5BAE
SilentHillLabFrontTextString31:
text "わたしは"
line "はかせの　じょしゅ　です"

36
maps/SilentHillPokecenter.asm
View File

@ -2,17 +2,17 @@ include "constants.asm"
SECTION "maps/SilentHillPokecenter.asm", ROMX
SilentHillPokecenterScriptLoader:: ; 4682
SilentHillPokecenterScriptLoader::
ld hl, SilentHillPokecenterScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
SilentHillPokecenterScriptPointers: ; 468C
SilentHillPokecenterScriptPointers:
dw SilentHillPokecenterScript
dw SilentHillPokecenterNPCIDs
SilentHillPokecenterScript: ; 4690
SilentHillPokecenterScript:
ld hl, SilentHillPokecenterNPCIDs
ld de, SilentHillPokecenterPCPointer
call CallMapTextSubroutine
@ -21,7 +21,7 @@ SilentHillPokecenterScript: ; 4690
; 469A
dw SilentHillPokecenterNPCIDs
SilentHillPokecenterNPCIDs: ; 469C
SilentHillPokecenterNPCIDs:
db 0
db 1
db 2
@ -29,31 +29,31 @@ SilentHillPokecenterNPCIDs: ; 469C
db 4
db $FF
SilentHillPokecenterPCPointer: ; 46A2
SilentHillPokecenterPCPointer:
dw SilentHillPokecenterPCText
SilentHillPokecenterPCText: ; 46A4
SilentHillPokecenterPCText:
ld hl, SilentHillPokecenterTextString1
call OpenTextbox
ret
SilentHillPokecenterTextString1: ; 46AB
SilentHillPokecenterTextString1:
text "げんざい　ちょうせいちゅうです"
done
SilentHillPokecenterTextPointers:: ; 46BC
SilentHillPokecenterTextPointers::
dw SilentHillPokecenterNPCText1
dw SilentHillPokecenterNPCText2
dw SilentHillPokecenterNPCText3
dw SilentHillPokecenterNPCText4
dw SilentHillPokecenterNPCText5
SilentHillPokecenterNPCText1: ; 46C6
SilentHillPokecenterNPCText1:
ld hl, SilentHillPokecenterTextString2
call OpenTextbox
ret
SilentHillPokecenterTextString2: ; 46CD
SilentHillPokecenterTextString2:
text "もうしわけありませんが"
line "ただいま　しゅうりちゅう　でして"
@ -63,12 +63,12 @@ SilentHillPokecenterTextString2: ; 46CD
line "じゅうぶんに　おきをつけ　ください"
done
SilentHillPokecenterNPCText2: ; 4714
SilentHillPokecenterNPCText2:
ld hl, SilentHillPokecenterTextString3
call OpenTextbox
ret
SilentHillPokecenterTextString3: ; 471B
SilentHillPokecenterTextString3:
text "あそこに　ある　パソコンは"
line "トレーナー　だったら"
cont "いつでも　むりょうで"
@ -76,12 +76,12 @@ SilentHillPokecenterTextString3: ; 471B
cont "きが　きいてるよな！"
done
SilentHillPokecenterNPCText3: ; 4757
SilentHillPokecenterNPCText3:
ld hl, SilentHillPokecenterTextString4
call OpenTextbox
ret
SilentHillPokecenterTextString4: ; 475E
SilentHillPokecenterTextString4:
text "いま　じゅんびちゅうの"
line "きかいは　すごいらしいよ"
@ -91,22 +91,22 @@ SilentHillPokecenterTextString4: ; 475E
para "ほんとかな？"
done
SilentHillPokecenterNPCText4: ; 479E
SilentHillPokecenterNPCText4:
ld hl, SilentHillPokecenterTextString5
call OpenTextbox
ret
SilentHillPokecenterTextString5: ; 47A5
SilentHillPokecenterTextString5:
text "こいつ　へルガー"
line "いままでにない　タイプの　ポケモンさ"
done
SilentHillPokecenterNPCText5: ; 47C2
SilentHillPokecenterNPCText5:
ld hl, SilentHillPokecenterTextString6
call OpenTextbox
ret
SilentHillPokecenterTextString6: ; 47C9
SilentHillPokecenterTextString6:
text "へルガー『ぐるるうー"
done

12
maps/UnusedMap13.asm
View File

@ -2,26 +2,26 @@ include "constants.asm"
SECTION "maps/UnusedMap13.asm", ROMX
UnusedMap13ScriptLoader:: ; 6078
UnusedMap13ScriptLoader::
ld hl, UnusedMap13ScriptPointers
call RunMapScript
call WriteBackMapScriptNumber
ret
UnusedMap13ScriptPointers: ; 6082
UnusedMap13ScriptPointers:
dw UnusedMap13Script
dw UnusedMap13NPCIDs
UnusedMap13NPCIDs: ; 6086
UnusedMap13NPCIDs:
db $FF
UnusedMap13SignPointers: ; 6087
UnusedMap13SignPointers:
dw MapDefaultText
UnusedMap13TextPointers:: ; 6089
UnusedMap13TextPointers::
dw MapDefaultText
UnusedMap13Script: ; 608B
UnusedMap13Script:
ld hl, UnusedMap13NPCIDs
ld de, UnusedMap13SignPointers
call CallMapTextSubroutine

2
maps/placeholder/Baadon.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/Baadon.asm", ROMX
BaadonScriptLoader:: ; d89f7 (36:49f7)
BaadonScriptLoader::
ret
db "@"

4
maps/placeholder/BaadonHouse1.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonHouse1.asm", ROMX
BaadonHouse1ScriptLoader:: ; 9cade (27:4ade)
BaadonHouse1ScriptLoader::
ret
BaadonHouse1TextPointers:: ; 9cadf (27:4adf)
BaadonHouse1TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonHouse2.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonHouse2.asm", ROMX
BaadonHouse2ScriptLoader:: ; 9cb81 (27:4b81)
BaadonHouse2ScriptLoader::
ret
BaadonHouse2TextPointers:: ; 9cb82 (27:4b82)
BaadonHouse2TextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonLeague1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonLeague1F.asm", ROMX
BaadonLeague1FScriptLoader:: ; 9cc22 (27:4c22)
BaadonLeague1FScriptLoader::
ret
BaadonLeague1FTextPointers:: ; 9cc23 (27:4c23)
BaadonLeague1FTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonLeague2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonLeague2F.asm", ROMX
BaadonLeague2FScriptLoader:: ; 9ccc2 (27:4cc2)
BaadonLeague2FScriptLoader::
ret
BaadonLeague2FTextPointers:: ; 9ccc3 (27:4cc3)
BaadonLeague2FTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonMart.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonMart.asm", ROMX
BaadonMartScriptLoader:: ; 9c988 (27:4988)
BaadonMartScriptLoader::
ret
BaadonMartTextPointers:: ; 9c989 (27:4989)
BaadonMartTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonPokecenter1F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonPokecenter1F.asm", ROMX
BaadonPokecenter1FScriptLoader:: ; 9ca0f (27:4a0f)
BaadonPokecenter1FScriptLoader::
ret
BaadonPokecenter1FTextPointers:: ; 9ca10 (27:4a10)
BaadonPokecenter1FTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonPokecenter2F.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonPokecenter2F.asm", ROMX
BaadonPokecenter2FScriptLoader:: ; 9ca88 (27:4a88)
BaadonPokecenter2FScriptLoader::
ret
BaadonPokecenter2FTextPointers:: ; 9ca89 (27:4a89)
BaadonPokecenter2FTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

2
maps/placeholder/BaadonRoute1.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonRoute1.asm", ROMX
BaadonRoute1ScriptLoader:: ; da601 (36:6601)
BaadonRoute1ScriptLoader::
ret
db "@"

2
maps/placeholder/BaadonRoute2.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonRoute2.asm", ROMX
BaadonRoute2ScriptLoader:: ; da7ed (36:67ed)
BaadonRoute2ScriptLoader::
ret
db "@"

2
maps/placeholder/BaadonRoute3.asm
View File

@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonRoute3.asm", ROMX
BaadonRoute3ScriptLoader:: ; da8d9 (36:68d9)
BaadonRoute3ScriptLoader::
ret
db "@"

4
maps/placeholder/BaadonRouteGateNewtype.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonRouteGateNewtype.asm", ROMX
BaadonRouteGateNewtypeScriptLoader:: ; 9cd78 (27:4d78)
BaadonRouteGateNewtypeScriptLoader::
ret
BaadonRouteGateNewtypeTextPointers:: ; 9cd79 (27:4d79)
BaadonRouteGateNewtypeTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

4
maps/placeholder/BaadonRouteGateWest.asm
View File

@ -2,10 +2,10 @@ INCLUDE "constants.asm"
SECTION "maps/placeholder/BaadonRouteGateWest.asm", ROMX
BaadonRouteGateWestScriptLoader:: ; 9cd1d (27:4d1d)
BaadonRouteGateWestScriptLoader::
ret
BaadonRouteGateWestTextPointers:: ; 9cd1e (27:4d1e)
BaadonRouteGateWestTextPointers::
dw MapDefaultText
dw MapDefaultText
dw MapDefaultText

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