diff options
301 files changed, 3537 insertions, 3537 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 3fb4337..157734c 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -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 diff --git a/audio/songs/bicycle.asm b/audio/songs/bicycle.asm index 4f459e3..65c0f0b 100755 --- a/audio/songs/bicycle.asm +++ b/audio/songs/bicycle.asm @@ -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 diff --git a/audio/songs/evolution.asm b/audio/songs/evolution.asm index 0822a83..76faa57 100755 --- a/audio/songs/evolution.asm +++ b/audio/songs/evolution.asm @@ -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 diff --git a/audio/songs/heal.asm b/audio/songs/heal.asm index cd8b255..a290171 100755 --- a/audio/songs/heal.asm +++ b/audio/songs/heal.asm @@ -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 diff --git a/audio/songs/leaderbattle.asm b/audio/songs/leaderbattle.asm index f1e74aa..76e662b 100755 --- a/audio/songs/leaderbattle.asm +++ b/audio/songs/leaderbattle.asm @@ -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 diff --git a/audio/songs/nidorinointro.asm b/audio/songs/nidorinointro.asm index da26be5..54ff648 100755 --- a/audio/songs/nidorinointro.asm +++ b/audio/songs/nidorinointro.asm @@ -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 diff --git a/audio/songs/none.asm b/audio/songs/none.asm index ad12ef5..f45e12f 100755 --- a/audio/songs/none.asm +++ b/audio/songs/none.asm @@ -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 diff --git a/audio/songs/oakintro.asm b/audio/songs/oakintro.asm index 4827edf..88bfefe 100755 --- a/audio/songs/oakintro.asm +++ b/audio/songs/oakintro.asm @@ -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:: diff --git a/audio/songs/route1.asm b/audio/songs/route1.asm index 896bdd6..c1a4c2a 100755 --- a/audio/songs/route1.asm +++ b/audio/songs/route1.asm @@ -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:: diff --git a/audio/songs/spottedrocket.asm b/audio/songs/spottedrocket.asm index d0d040e..514af6a 100755 --- a/audio/songs/spottedrocket.asm +++ b/audio/songs/spottedrocket.asm @@ -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 diff --git a/audio/songs/title.asm b/audio/songs/title.asm index e734a23..2c0932c 100755 --- a/audio/songs/title.asm +++ b/audio/songs/title.asm @@ -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 diff --git a/audio/songs/trainerbattle.asm b/audio/songs/trainerbattle.asm index 35c6a2f..fc5a37c 100755 --- a/audio/songs/trainerbattle.asm +++ b/audio/songs/trainerbattle.asm @@ -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 diff --git a/audio/songs/victorytrainer.asm b/audio/songs/victorytrainer.asm index 11c91ae..87d3e0c 100755 --- a/audio/songs/victorytrainer.asm +++ b/audio/songs/victorytrainer.asm @@ -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 diff --git a/audio/songs/viridiancity.asm b/audio/songs/viridiancity.asm index ce75278..1c1ccb7 100755 --- a/audio/songs/viridiancity.asm +++ b/audio/songs/viridiancity.asm @@ -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:: @@ -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" diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index e124e13..ff00944 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -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 diff --git a/data/collision/collision_type_table.asm b/data/collision/collision_type_table.asm index f4a75ce..2bc2032 100644 --- a/data/collision/collision_type_table.asm +++ b/data/collision/collision_type_table.asm @@ -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 diff --git a/data/items/attributes.asm b/data/items/attributes.asm index bb6d696..1ffab05 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -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 diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 930d6ca..e92ca20 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -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 diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 2b2043a..6bcc4c2 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -25,7 +25,7 @@ EvosAttacks:: ; - db 0 ; no more level-up moves -FushigidaneEvosAttacks: ; 42689 +FushigidaneEvosAttacks: db EVOLVE_LEVEL, 16, DEX_FUSHIGISOU db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -41,7 +41,7 @@ FushigidaneEvosAttacks: ; 42689 db 56, MOVE_SOLARBEAM db 0 ; no more level-up moves -FushigisouEvosAttacks: ; 426a4 +FushigisouEvosAttacks: db EVOLVE_LEVEL, 32, DEX_FUSHIGIBANA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -57,7 +57,7 @@ FushigisouEvosAttacks: ; 426a4 db 66, MOVE_SOLARBEAM db 0 ; no more level-up moves -FushigibanaEvosAttacks: ; 426bf +FushigibanaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 4, MOVE_GROWL @@ -72,7 +72,7 @@ FushigibanaEvosAttacks: ; 426bf db 76, MOVE_SOLARBEAM db 0 ; no more level-up moves -HitokageEvosAttacks: ; 426d7 +HitokageEvosAttacks: db EVOLVE_LEVEL, 16, DEX_LIZARDO db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -87,7 +87,7 @@ HitokageEvosAttacks: ; 426d7 db 55, MOVE_FLAMETHROWER db 0 ; no more level-up moves -LizardoEvosAttacks: ; 426f0 +LizardoEvosAttacks: db EVOLVE_LEVEL, 36, DEX_LIZARDON db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -102,7 +102,7 @@ LizardoEvosAttacks: ; 426f0 db 64, MOVE_FLAMETHROWER db 0 ; no more level-up moves -LizardonEvosAttacks: ; 42709 +LizardonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 5, MOVE_GROWL @@ -117,7 +117,7 @@ LizardonEvosAttacks: ; 42709 db 73, MOVE_FLAMETHROWER db 0 ; no more level-up moves -ZenigameEvosAttacks: ; 42721 +ZenigameEvosAttacks: db EVOLVE_LEVEL, 16, DEX_KAMEIL db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -134,7 +134,7 @@ ZenigameEvosAttacks: ; 42721 db 51, MOVE_RAIN_DANCE db 0 ; no more level-up moves -KameilEvosAttacks: ; 4273e +KameilEvosAttacks: db EVOLVE_LEVEL, 36, DEX_KAMEX db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -151,7 +151,7 @@ KameilEvosAttacks: ; 4273e db 61, MOVE_RAIN_DANCE db 0 ; no more level-up moves -KamexEvosAttacks: ; 4275b +KamexEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_TAIL_WHIP @@ -167,20 +167,20 @@ KamexEvosAttacks: ; 4275b db 71, MOVE_RAIN_DANCE db 0 ; no more level-up moves -CaterpieEvosAttacks: ; 42775 +CaterpieEvosAttacks: db EVOLVE_LEVEL, 7, DEX_TRANSEL db 0 ; no more evolutions db 1, MOVE_TACKLE db 1, MOVE_STRING_SHOT db 0 ; no more level-up moves -TranselEvosAttacks: ; 4277e +TranselEvosAttacks: db EVOLVE_LEVEL, 10, DEX_BUTTERFREE db 0 ; no more evolutions db 1, MOVE_HARDEN db 0 ; no more level-up moves -ButterfreeEvosAttacks: ; 42785 +ButterfreeEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 1, MOVE_STRING_SHOT @@ -194,20 +194,20 @@ ButterfreeEvosAttacks: ; 42785 db 40, MOVE_PSYBEAM db 0 ; no more level-up moves -BeedleEvosAttacks: ; 4279b +BeedleEvosAttacks: db EVOLVE_LEVEL, 7, DEX_COCOON db 0 ; no more evolutions db 1, MOVE_POISON_STING db 1, MOVE_STRING_SHOT db 0 ; no more level-up moves -CocoonEvosAttacks: ; 427a4 +CocoonEvosAttacks: db EVOLVE_LEVEL, 10, DEX_SPEAR db 0 ; no more evolutions db 1, MOVE_HARDEN db 0 ; no more level-up moves -SpearEvosAttacks: ; 427ab +SpearEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POISON_STING db 1, MOVE_STRING_SHOT @@ -220,7 +220,7 @@ SpearEvosAttacks: ; 427ab db 40, MOVE_PIN_MISSILE db 0 ; no more level-up moves -PoppoEvosAttacks: ; 427bf +PoppoEvosAttacks: ; db EVOLVE_LEVEL, 18, DEX_PIGEON db 0 ; no more evolutions db 1, MOVE_GUST @@ -233,7 +233,7 @@ PoppoEvosAttacks: ; 427bf db 45, MOVE_MIRROR_MOVE db 0 ; no more level-up moves -PigeonEvosAttacks: ; 427d1 +PigeonEvosAttacks: db EVOLVE_LEVEL, 36, DEX_PIGEOT db 0 ; no more evolutions db 1, MOVE_GUST @@ -246,7 +246,7 @@ PigeonEvosAttacks: ; 427d1 db 52, MOVE_MIRROR_MOVE db 0 ; no more level-up moves -PigeotEvosAttacks: ; 427e6 +PigeotEvosAttacks: db 0 ; no more evolutions db 1, MOVE_GUST db 8, MOVE_SAND_ATTACK @@ -258,7 +258,7 @@ PigeotEvosAttacks: ; 427e6 db 59, MOVE_MIRROR_MOVE db 0 ; no more level-up moves -KorattaEvosAttacks: ; 427f8 +KorattaEvosAttacks: ; db EVOLVE_LEVEL, 20, DEX_RATTA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -271,7 +271,7 @@ KorattaEvosAttacks: ; 427f8 db 43, MOVE_HYPER_FANG db 0 ; no more level-up moves -RattaEvosAttacks: ; 4280a +RattaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 5, MOVE_TAIL_WHIP @@ -283,7 +283,7 @@ RattaEvosAttacks: ; 4280a db 50, MOVE_HYPER_FANG db 0 ; no more level-up moves -OnisuzumeEvosAttacks: ; 4281c +OnisuzumeEvosAttacks: db EVOLVE_LEVEL, 20, DEX_ONIDRILL db 0 ; no more evolutions db 1, MOVE_PECK @@ -297,7 +297,7 @@ OnisuzumeEvosAttacks: ; 4281c db 61, MOVE_AGILITY db 0 ; no more level-up moves -OnidrillEvosAttacks: ; 42833 +OnidrillEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 6, MOVE_GROWL @@ -310,7 +310,7 @@ OnidrillEvosAttacks: ; 42833 db 69, MOVE_AGILITY db 0 ; no more level-up moves -ArboEvosAttacks: ; 42847 +ArboEvosAttacks: ; db EVOLVE_LEVEL, 22, DEX_ARBOK db 0 ; no more evolutions db 1, MOVE_WRAP @@ -323,7 +323,7 @@ ArboEvosAttacks: ; 42847 db 45, MOVE_SLAM db 0 ; no more level-up moves -ArbokEvosAttacks: ; 42859 +ArbokEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WRAP db 7, MOVE_LEER @@ -336,7 +336,7 @@ ArbokEvosAttacks: ; 42859 db 52, MOVE_SLAM db 0 ; no more level-up moves -PikachuEvosAttacks: ; 4286d +PikachuEvosAttacks: ; db EVOLVE_STONE, 1, ITEM_THUNDERSTONE, DEX_RAICHU db 0 ; no more evolutions db 1, MOVE_GROWL @@ -350,7 +350,7 @@ PikachuEvosAttacks: ; 4286d db 61, MOVE_THUNDER db 0 ; no more level-up moves -RaichuEvosAttacks: ; 42881 +RaichuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK db 1, MOVE_TAIL_WHIP @@ -358,7 +358,7 @@ RaichuEvosAttacks: ; 42881 db 1, MOVE_SWIFT db 0 ; no more level-up moves -SandEvosAttacks: ; 4288b +SandEvosAttacks: db EVOLVE_LEVEL, 22, DEX_SANDPAN db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -372,7 +372,7 @@ SandEvosAttacks: ; 4288b db 45, MOVE_FOCUS_ENERGY db 0 ; no more level-up moves -SandpanEvosAttacks: ; 428a2 +SandpanEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 4, MOVE_DEFENSE_CURL @@ -386,7 +386,7 @@ SandpanEvosAttacks: ; 428a2 db 53, MOVE_FOCUS_ENERGY db 0 ; no more level-up moves -NidoranFEvosAttacks: ; 428b8 +NidoranFEvosAttacks: db EVOLVE_LEVEL, 16, DEX_NIDORINA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -399,7 +399,7 @@ NidoranFEvosAttacks: ; 428b8 db 43, MOVE_FURY_SWIPES db 0 ; no more level-up moves -NidorinaEvosAttacks: ; 428cd +NidorinaEvosAttacks: db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_NIDOQUEEN db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -412,7 +412,7 @@ NidorinaEvosAttacks: ; 428cd db 57, MOVE_FURY_SWIPES db 0 ; no more level-up moves -NidoqueenEvosAttacks: ; 428e3 +NidoqueenEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 1, MOVE_DOUBLE_KICK @@ -421,7 +421,7 @@ NidoqueenEvosAttacks: ; 428e3 db 46, MOVE_ATTRACT db 0 ; no more level-up moves -NidoranMEvosAttacks: ; 428ef +NidoranMEvosAttacks: db EVOLVE_LEVEL, 16, DEX_NIDORINO db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -434,7 +434,7 @@ NidoranMEvosAttacks: ; 428ef db 43, MOVE_FURY_ATTACK db 0 ; no more level-up moves -NidorinoEvosAttacks: ; 42904 +NidorinoEvosAttacks: db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_NIDOKING db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -447,7 +447,7 @@ NidorinoEvosAttacks: ; 42904 db 57, MOVE_FURY_ATTACK db 0 ; no more level-up moves -NidokingEvosAttacks: ; 4291a +NidokingEvosAttacks: db 0 ; no more evolutions db 1, MOVE_HORN_ATTACK db 1, MOVE_DOUBLE_KICK @@ -456,7 +456,7 @@ NidokingEvosAttacks: ; 4291a db 46, MOVE_ATTRACT db 0 ; no more level-up moves -PippiEvosAttacks: ; 42926 +PippiEvosAttacks: db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_PIXY db 0 ; no more evolutions db 1, MOVE_GROWL @@ -471,7 +471,7 @@ PippiEvosAttacks: ; 42926 db 64, MOVE_MOONLIGHT db 0 ; no more level-up moves -PixyEvosAttacks: ; 42940 +PixyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SING db 1, MOVE_DOUBLESLAP @@ -479,7 +479,7 @@ PixyEvosAttacks: ; 42940 db 1, MOVE_METRONOME db 0 ; no more level-up moves -RokonEvosAttacks: ; 4294a +RokonEvosAttacks: db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_KYUKON db 0 ; no more evolutions db 1, MOVE_TAIL_WHIP @@ -493,7 +493,7 @@ RokonEvosAttacks: ; 4294a db 53, MOVE_FLAMETHROWER db 0 ; no more level-up moves -KyukonEvosAttacks: ; 42962 +KyukonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK db 1, MOVE_FIRE_SPIN @@ -501,7 +501,7 @@ KyukonEvosAttacks: ; 42962 db 1, MOVE_DOUBLE_TEAM db 0 ; no more level-up moves -PurinEvosAttacks: ; 4296c +PurinEvosAttacks: db EVOLVE_STONE, 1, ITEM_MOON_STONE, DEX_PUKURIN db 0 ; no more evolutions db 1, MOVE_GROWL @@ -517,7 +517,7 @@ PurinEvosAttacks: ; 4296c db 60, MOVE_DOUBLE_EDGE db 0 ; no more level-up moves -PukurinEvosAttacks: ; 42988 +PukurinEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SING db 1, MOVE_DEFENSE_CURL @@ -525,7 +525,7 @@ PukurinEvosAttacks: ; 42988 db 1, MOVE_PAIN_SPLIT db 0 ; no more level-up moves -ZubatEvosAttacks: ; 42992 +ZubatEvosAttacks: db EVOLVE_LEVEL, 22, DEX_GOLBAT db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE @@ -538,7 +538,7 @@ ZubatEvosAttacks: ; 42992 db 49, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -GolbatEvosAttacks: ; 429a7 +GolbatEvosAttacks: db EVOLVE_LEVEL, 44, DEX_EKSING db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE @@ -551,7 +551,7 @@ GolbatEvosAttacks: ; 429a7 db 56, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -NazonokusaEvosAttacks: ; 429bc +NazonokusaEvosAttacks: db EVOLVE_LEVEL, 21, DEX_KUSAIHANA db 0 ; no more evolutions db 1, MOVE_ABSORB @@ -564,7 +564,7 @@ NazonokusaEvosAttacks: ; 429bc db 36, MOVE_SOLARBEAM db 0 ; no more level-up moves -KusaihanaEvosAttacks: ; 429d1 +KusaihanaEvosAttacks: db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_RUFFRESIA db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_KIREIHANA db 0 ; no more evolutions @@ -578,7 +578,7 @@ KusaihanaEvosAttacks: ; 429d1 db 46, MOVE_SOLARBEAM db 0 ; no more level-up moves -RuffresiaEvosAttacks: ; 429eb +RuffresiaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_ABSORB db 1, MOVE_STUN_SPORE @@ -586,7 +586,7 @@ RuffresiaEvosAttacks: ; 429eb db 1, MOVE_PETAL_DANCE db 0 ; no more level-up moves -ParasEvosAttacks: ; 429f5 +ParasEvosAttacks: db EVOLVE_LEVEL, 24, DEX_PARASECT db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -599,7 +599,7 @@ ParasEvosAttacks: ; 429f5 db 43, MOVE_SPORE db 0 ; no more level-up moves -ParasectEvosAttacks: ; 42a0a +ParasectEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 5, MOVE_STUN_SPORE @@ -611,7 +611,7 @@ ParasectEvosAttacks: ; 42a0a db 50, MOVE_SPORE db 0 ; no more level-up moves -KongpangEvosAttacks: ; 42a1c +KongpangEvosAttacks: db EVOLVE_LEVEL, 31, DEX_MORPHON db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -625,7 +625,7 @@ KongpangEvosAttacks: ; 42a1c db 56, MOVE_PSYCHIC db 0 ; no more level-up moves -MorphonEvosAttacks: ; 42a33 +MorphonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_DISABLE @@ -638,7 +638,7 @@ MorphonEvosAttacks: ; 42a33 db 64, MOVE_PSYCHIC db 0 ; no more level-up moves -DigdaEvosAttacks: ; 42a47 +DigdaEvosAttacks: db EVOLVE_LEVEL, 26, DEX_DUGTRIO db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -652,7 +652,7 @@ DigdaEvosAttacks: ; 42a47 db 53, MOVE_EARTHQUAKE db 0 ; no more level-up moves -DugtrioEvosAttacks: ; 42a5e +DugtrioEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 5, MOVE_GROWL @@ -665,7 +665,7 @@ DugtrioEvosAttacks: ; 42a5e db 61, MOVE_EARTHQUAKE db 0 ; no more level-up moves -NyarthEvosAttacks: ; 42a72 +NyarthEvosAttacks: db EVOLVE_LEVEL, 28, DEX_PERSIAN db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -681,7 +681,7 @@ NyarthEvosAttacks: ; 42a72 db 61, MOVE_COIN_HURL db 0 ; no more level-up moves -PersianEvosAttacks: ; 42a8d +PersianEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 6, MOVE_GROWL @@ -696,7 +696,7 @@ PersianEvosAttacks: ; 42a8d db 71, MOVE_COIN_HURL db 0 ; no more level-up moves -KoduckEvosAttacks: ; 42aa5 +KoduckEvosAttacks: db EVOLVE_LEVEL, 33, DEX_GOLDUCK db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -709,7 +709,7 @@ KoduckEvosAttacks: ; 42aa5 db 50, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -GolduckEvosAttacks: ; 42aba +GolduckEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 9, MOVE_TAIL_WHIP @@ -721,7 +721,7 @@ GolduckEvosAttacks: ; 42aba db 57, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -MankeyEvosAttacks: ; 42acc +MankeyEvosAttacks: db EVOLVE_LEVEL, 28, DEX_OKORIZARU db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -736,7 +736,7 @@ MankeyEvosAttacks: ; 42acc db 55, MOVE_THRASH db 0 ; no more level-up moves -OkorizaruEvosAttacks: ; 42ae5 +OkorizaruEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 8, MOVE_LEER @@ -750,7 +750,7 @@ OkorizaruEvosAttacks: ; 42ae5 db 64, MOVE_THRASH db 0 ; no more level-up moves -GardieEvosAttacks: ; 42afb +GardieEvosAttacks: db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_WINDIE db 0 ; no more evolutions db 1, MOVE_EMBER @@ -764,7 +764,7 @@ GardieEvosAttacks: ; 42afb db 61, MOVE_FLAMETHROWER db 0 ; no more level-up moves -WindieEvosAttacks: ; 42b13 +WindieEvosAttacks: db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK db 1, MOVE_BITE @@ -772,7 +772,7 @@ WindieEvosAttacks: ; 42b13 db 1, MOVE_SACRED_FIRE db 0 ; no more level-up moves -NyoromoEvosAttacks: ; 42b1d +NyoromoEvosAttacks: db EVOLVE_LEVEL, 25, DEX_NYOROZO db 0 ; no more evolutions db 1, MOVE_BUBBLE @@ -785,7 +785,7 @@ NyoromoEvosAttacks: ; 42b1d db 45, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -NyorozoEvosAttacks: ; 42b32 +NyorozoEvosAttacks: db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_NYOROBON db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_NYOROTONO db 0 ; no more evolutions @@ -799,7 +799,7 @@ NyorozoEvosAttacks: ; 42b32 db 59, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -NyorobonEvosAttacks: ; 42b4c +NyorobonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_HYPNOSIS db 1, MOVE_WATER_GUN @@ -807,13 +807,13 @@ NyorobonEvosAttacks: ; 42b4c db 25, MOVE_LOW_KICK db 0 ; no more level-up moves -CaseyEvosAttacks: ; 42b56 +CaseyEvosAttacks: db EVOLVE_LEVEL, 16, DEX_YUNGERER db 0 ; no more evolutions db 1, MOVE_TELEPORT db 0 ; no more level-up moves -YungererEvosAttacks: ; 42b5d +YungererEvosAttacks: db EVOLVE_TRADE, 1, DEX_FOODIN db 0 ; no more evolutions db 1, MOVE_TELEPORT @@ -828,7 +828,7 @@ YungererEvosAttacks: ; 42b5d db 46, MOVE_PSYCHIC db 0 ; no more level-up moves -FoodinEvosAttacks: ; 42b76 +FoodinEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TELEPORT db 16, MOVE_CONFUSION @@ -842,7 +842,7 @@ FoodinEvosAttacks: ; 42b76 db 46, MOVE_PSYCHIC db 0 ; no more level-up moves -WanrikyEvosAttacks: ; 42b8c +WanrikyEvosAttacks: db EVOLVE_LEVEL, 28, DEX_GORIKY db 0 ; no more evolutions db 1, MOVE_KARATE_CHOP @@ -856,7 +856,7 @@ WanrikyEvosAttacks: ; 42b8c db 45, MOVE_SUBMISSION db 0 ; no more level-up moves -GorikyEvosAttacks: ; 42ba3 +GorikyEvosAttacks: db EVOLVE_TRADE, 1, DEX_KAIRIKY db 0 ; no more evolutions db 1, MOVE_KARATE_CHOP @@ -870,7 +870,7 @@ GorikyEvosAttacks: ; 42ba3 db 61, MOVE_SUBMISSION db 0 ; no more level-up moves -KairikyEvosAttacks: ; 42bba +KairikyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_KARATE_CHOP db 7, MOVE_LEER @@ -884,7 +884,7 @@ KairikyEvosAttacks: ; 42bba db 61, MOVE_SUBMISSION db 0 ; no more level-up moves -MadatsubomiEvosAttacks: ; 42bd0 +MadatsubomiEvosAttacks: db EVOLVE_LEVEL, 21, DEX_UTSUDON db 0 ; no more evolutions db 1, MOVE_GROWTH @@ -899,7 +899,7 @@ MadatsubomiEvosAttacks: ; 42bd0 db 37, MOVE_SLAM db 0 ; no more level-up moves -UtsudonEvosAttacks: ; 42be9 +UtsudonEvosAttacks: db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_UTSUBOT db EVOLVE_STONE, 1, ITEM_POISON_STONE, DEX_TSUBOMITTO db 0 ; no more evolutions @@ -915,7 +915,7 @@ UtsudonEvosAttacks: ; 42be9 db 46, MOVE_SLAM db 0 ; no more level-up moves -UtsubotEvosAttacks: ; 42c07 +UtsubotEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WRAP db 1, MOVE_POISONPOWDER @@ -923,7 +923,7 @@ UtsubotEvosAttacks: ; 42c07 db 1, MOVE_RAZOR_LEAF db 0 ; no more level-up moves -MenokurageEvosAttacks: ; 42c11 +MenokurageEvosAttacks: db EVOLVE_LEVEL, 30, DEX_DOKUKURAGE db 0 ; no more evolutions db 1, MOVE_POISON_STING @@ -938,7 +938,7 @@ MenokurageEvosAttacks: ; 42c11 db 55, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -DokukurageEvosAttacks: ; 42c2a +DokukurageEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POISON_STING db 4, MOVE_SUPERSONIC @@ -952,7 +952,7 @@ DokukurageEvosAttacks: ; 42c2a db 64, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -IsitsubuteEvosAttacks: ; 42c40 +IsitsubuteEvosAttacks: db EVOLVE_LEVEL, 25, DEX_GOLONE db 0 ; no more evolutions db 1, MOVE_DEFENSE_CURL @@ -967,7 +967,7 @@ IsitsubuteEvosAttacks: ; 42c40 db 44, MOVE_EXPLOSION db 0 ; no more level-up moves -GoloneEvosAttacks: ; 42c59 +GoloneEvosAttacks: db EVOLVE_TRADE, 1, DEX_GOLONYA db 0 ; no more evolutions db 1, MOVE_DEFENSE_CURL @@ -982,7 +982,7 @@ GoloneEvosAttacks: ; 42c59 db 62, MOVE_EXPLOSION db 0 ; no more level-up moves -GolonyaEvosAttacks: ; 42c72 +GolonyaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_DEFENSE_CURL db 6, MOVE_TACKLE @@ -996,7 +996,7 @@ GolonyaEvosAttacks: ; 42c72 db 62, MOVE_EXPLOSION db 0 ; no more level-up moves -PonytaEvosAttacks: ; 42c88 +PonytaEvosAttacks: db EVOLVE_LEVEL, 40, DEX_GALLOP db 0 ; no more evolutions db 1, MOVE_TAIL_WHIP @@ -1010,7 +1010,7 @@ PonytaEvosAttacks: ; 42c88 db 64, MOVE_TAKE_DOWN db 0 ; no more level-up moves -GallopEvosAttacks: ; 42c9f +GallopEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TAIL_WHIP db 9, MOVE_EMBER @@ -1023,7 +1023,7 @@ GallopEvosAttacks: ; 42c9f db 72, MOVE_TAKE_DOWN db 0 ; no more level-up moves -YadonEvosAttacks: ; 42cb3 +YadonEvosAttacks: db EVOLVE_LEVEL, 37, DEX_YADORAN db 0 ; no more evolutions db 1, MOVE_CONFUSION @@ -1035,7 +1035,7 @@ YadonEvosAttacks: ; 42cb3 db 52, MOVE_PSYCHIC db 0 ; no more level-up moves -YadoranEvosAttacks: ; 42cc6 +YadoranEvosAttacks: db EVOLVE_ITEM, 1, ITEM_KINGS_ROCK, DEX_YADOKING db 0 ; no more evolutions db 1, MOVE_CONFUSION @@ -1048,7 +1048,7 @@ YadoranEvosAttacks: ; 42cc6 db 64, MOVE_PSYCHIC db 0 ; no more level-up moves -CoilEvosAttacks: ; 42cdc +CoilEvosAttacks: db EVOLVE_LEVEL, 30, DEX_RARECOIL db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1062,7 +1062,7 @@ CoilEvosAttacks: ; 42cdc db 61, MOVE_ZAP_CANNON db 0 ; no more level-up moves -RarecoilEvosAttacks: ; 42cf3 +RarecoilEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_THUNDER_WAVE @@ -1075,7 +1075,7 @@ RarecoilEvosAttacks: ; 42cf3 db 69, MOVE_ZAP_CANNON db 0 ; no more level-up moves -KamonegiEvosAttacks: ; 42d07 +KamonegiEvosAttacks: db EVOLVE_LEVEL, 24, DEX_MADAME db 0 ; no more evolutions db 1, MOVE_PECK @@ -1090,7 +1090,7 @@ KamonegiEvosAttacks: ; 42d07 db 46, MOVE_FURY_CUTTER db 0 ; no more level-up moves -DodoEvosAttacks: ; 42d20 +DodoEvosAttacks: db EVOLVE_LEVEL, 31, DEX_DODORIO db 0 ; no more evolutions db 1, MOVE_GROWL @@ -1104,7 +1104,7 @@ DodoEvosAttacks: ; 42d20 db 53, MOVE_DRILL_PECK db 0 ; no more level-up moves -DodorioEvosAttacks: ; 42d37 +DodorioEvosAttacks: db 0 ; no more evolutions db 1, MOVE_GROWL db 7, MOVE_PECK @@ -1117,7 +1117,7 @@ DodorioEvosAttacks: ; 42d37 db 61, MOVE_DRILL_PECK db 0 ; no more level-up moves -PawouEvosAttacks: ; 42d4b +PawouEvosAttacks: db EVOLVE_LEVEL, 34, DEX_JUGON db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1132,7 +1132,7 @@ PawouEvosAttacks: ; 42d4b db 56, MOVE_ICE_BEAM db 0 ; no more level-up moves -JugonEvosAttacks: ; 42d64 +JugonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_GROWL @@ -1146,7 +1146,7 @@ JugonEvosAttacks: ; 42d64 db 64, MOVE_ICE_BEAM db 0 ; no more level-up moves -BetbeterEvosAttacks: ; 42d7a +BetbeterEvosAttacks: db EVOLVE_LEVEL, 38, DEX_BETBETON db 0 ; no more evolutions db 1, MOVE_POUND @@ -1162,7 +1162,7 @@ BetbeterEvosAttacks: ; 42d7a db 66, MOVE_SLUDGE_BOMB db 0 ; no more level-up moves -BetbetonEvosAttacks: ; 42d95 +BetbetonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 4, MOVE_POISON_GAS @@ -1177,7 +1177,7 @@ BetbetonEvosAttacks: ; 42d95 db 76, MOVE_SLUDGE_BOMB db 0 ; no more level-up moves -ShellderEvosAttacks: ; 42dad +ShellderEvosAttacks: db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_PARSHEN db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1191,7 +1191,7 @@ ShellderEvosAttacks: ; 42dad db 57, MOVE_ICE_BEAM db 0 ; no more level-up moves -ParshenEvosAttacks: ; 42dc5 +ParshenEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WITHDRAW db 1, MOVE_AURORA_BEAM @@ -1199,7 +1199,7 @@ ParshenEvosAttacks: ; 42dc5 db 57, MOVE_SPIKE_CANNON db 0 ; no more level-up moves -GhosEvosAttacks: ; 42dcf +GhosEvosAttacks: db EVOLVE_LEVEL, 25, DEX_GHOST db 0 ; no more evolutions db 1, MOVE_LICK @@ -1214,7 +1214,7 @@ GhosEvosAttacks: ; 42dcf db 45, MOVE_NIGHTMARE db 0 ; no more level-up moves -GhostEvosAttacks: ; 42de8 +GhostEvosAttacks: db EVOLVE_TRADE, 1, DEX_GANGAR db 0 ; no more evolutions db 1, MOVE_LICK @@ -1229,7 +1229,7 @@ GhostEvosAttacks: ; 42de8 db 63, MOVE_NIGHTMARE db 0 ; no more level-up moves -GangarEvosAttacks: ; 42e01 +GangarEvosAttacks: db 0 ; no more evolutions db 1, MOVE_LICK db 7, MOVE_POISON_GAS @@ -1243,7 +1243,7 @@ GangarEvosAttacks: ; 42e01 db 63, MOVE_NIGHTMARE db 0 ; no more level-up moves -IwarkEvosAttacks: ; 42e17 +IwarkEvosAttacks: db EVOLVE_LEVEL, 38, DEX_HAGANEIL db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1258,7 +1258,7 @@ IwarkEvosAttacks: ; 42e17 db 53, MOVE_IRON_TAIL db 0 ; no more level-up moves -SleepeEvosAttacks: ; 42e30 +SleepeEvosAttacks: db EVOLVE_LEVEL, 26, DEX_SLEEPER db 0 ; no more evolutions db 1, MOVE_POUND @@ -1273,7 +1273,7 @@ SleepeEvosAttacks: ; 42e30 db 46, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -SleeperEvosAttacks: ; 42e49 +SleeperEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 7, MOVE_HYPNOSIS @@ -1287,7 +1287,7 @@ SleeperEvosAttacks: ; 42e49 db 55, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -CrabEvosAttacks: ; 42e5f +CrabEvosAttacks: db EVOLVE_LEVEL, 28, DEX_KINGLER db 0 ; no more evolutions db 1, MOVE_BUBBLE @@ -1302,7 +1302,7 @@ CrabEvosAttacks: ; 42e5f db 55, MOVE_CRABHAMMER db 0 ; no more level-up moves -KinglerEvosAttacks: ; 42e78 +KinglerEvosAttacks: db 0 ; no more evolutions db 1, MOVE_BUBBLE db 4, MOVE_LEER @@ -1316,7 +1316,7 @@ KinglerEvosAttacks: ; 42e78 db 64, MOVE_CRABHAMMER db 0 ; no more level-up moves -BiriridamaEvosAttacks: ; 42e8e +BiriridamaEvosAttacks: db EVOLVE_LEVEL, 30, DEX_MARUMINE db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1329,7 +1329,7 @@ BiriridamaEvosAttacks: ; 42e8e db 57, MOVE_EXPLOSION db 0 ; no more level-up moves -MarumineEvosAttacks: ; 42ea3 +MarumineEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 10, MOVE_THUNDER_WAVE @@ -1341,7 +1341,7 @@ MarumineEvosAttacks: ; 42ea3 db 64, MOVE_EXPLOSION db 0 ; no more level-up moves -TamatamaEvosAttacks: ; 42eb5 +TamatamaEvosAttacks: db EVOLVE_STONE, 1, ITEM_LEAF_STONE, DEX_NASSY db 0 ; no more evolutions db 1, MOVE_BARRAGE @@ -1356,7 +1356,7 @@ TamatamaEvosAttacks: ; 42eb5 db 62, MOVE_SOLARBEAM db 0 ; no more level-up moves -NassyEvosAttacks: ; 42ecf +NassyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_BARRAGE db 1, MOVE_CONFUSION @@ -1365,7 +1365,7 @@ NassyEvosAttacks: ; 42ecf db 62, MOVE_STOMP db 0 ; no more level-up moves -KarakaraEvosAttacks: ; 42edb +KarakaraEvosAttacks: db EVOLVE_LEVEL, 28, DEX_GARAGARA db 0 ; no more evolutions db 1, MOVE_BONE_CLUB @@ -1379,7 +1379,7 @@ KarakaraEvosAttacks: ; 42edb db 49, MOVE_BONE_LOCK db 0 ; no more level-up moves -GaragaraEvosAttacks: ; 42ef2 +GaragaraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_BONE_CLUB db 8, MOVE_GROWL @@ -1392,7 +1392,7 @@ GaragaraEvosAttacks: ; 42ef2 db 57, MOVE_BONE_LOCK db 0 ; no more level-up moves -SawamularEvosAttacks: ; 42f06 +SawamularEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 6, MOVE_ROLLING_KICK @@ -1407,7 +1407,7 @@ SawamularEvosAttacks: ; 42f06 db 71, MOVE_REVERSAL db 0 ; no more level-up moves -EbiwalarEvosAttacks: ; 42f1e +EbiwalarEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_MACH_PUNCH @@ -1422,7 +1422,7 @@ EbiwalarEvosAttacks: ; 42f1e db 69, MOVE_DYNAMICPUNCH db 0 ; no more level-up moves -BeroringaEvosAttacks: ; 42f36 +BeroringaEvosAttacks: db EVOLVE_LEVEL, 32, DEX_NAMEIL db 0 ; no more evolutions db 1, MOVE_LICK @@ -1436,7 +1436,7 @@ BeroringaEvosAttacks: ; 42f36 db 69, MOVE_SCREECH db 0 ; no more level-up moves -DogarsEvosAttacks: ; 42f4d +DogarsEvosAttacks: db EVOLVE_LEVEL, 35, DEX_MATADOGAS db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1449,7 +1449,7 @@ DogarsEvosAttacks: ; 42f4d db 56, MOVE_EXPLOSION db 0 ; no more level-up moves -MatadogasEvosAttacks: ; 42f62 +MatadogasEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 9, MOVE_SMOG @@ -1461,7 +1461,7 @@ MatadogasEvosAttacks: ; 42f62 db 63, MOVE_EXPLOSION db 0 ; no more level-up moves -SihornEvosAttacks: ; 42f74 +SihornEvosAttacks: db EVOLVE_LEVEL, 42, DEX_SIDON db 0 ; no more evolutions db 1, MOVE_HORN_ATTACK @@ -1475,7 +1475,7 @@ SihornEvosAttacks: ; 42f74 db 69, MOVE_TAKE_DOWN db 0 ; no more level-up moves -SidonEvosAttacks: ; 42f8b +SidonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_HORN_ATTACK db 9, MOVE_STOMP @@ -1488,7 +1488,7 @@ SidonEvosAttacks: ; 42f8b db 77, MOVE_TAKE_DOWN db 0 ; no more level-up moves -LuckyEvosAttacks: ; 42f9f +LuckyEvosAttacks: db EVOLVE_LEVEL, 45, DEX_HAPPI db 0 ; no more evolutions db 1, MOVE_POUND @@ -1503,7 +1503,7 @@ LuckyEvosAttacks: ; 42f9f db 73, MOVE_PAIN_SPLIT db 0 ; no more level-up moves -MonjaraEvosAttacks: ; 42fb8 +MonjaraEvosAttacks: db EVOLVE_LEVEL, 44, DEX_JARANRA db 0 ; no more evolutions db 1, MOVE_CONSTRICT @@ -1518,7 +1518,7 @@ MonjaraEvosAttacks: ; 42fb8 db 57, MOVE_SLAM db 0 ; no more level-up moves -GaruraEvosAttacks: ; 42fd1 +GaruraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_BITE db 8, MOVE_TAIL_WHIP @@ -1531,7 +1531,7 @@ GaruraEvosAttacks: ; 42fd1 db 57, MOVE_COMET_PUNCH db 0 ; no more level-up moves -TattuEvosAttacks: ; 42fe5 +TattuEvosAttacks: db EVOLVE_LEVEL, 32, DEX_SEADRA db 0 ; no more evolutions db 1, MOVE_BUBBLE @@ -1545,7 +1545,7 @@ TattuEvosAttacks: ; 42fe5 db 49, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -SeadraEvosAttacks: ; 42ffc +SeadraEvosAttacks: db EVOLVE_ITEM, 1, ITEM_DRAGON_SCALE, DEX_KINGDRA db 0 ; no more evolutions db 1, MOVE_BUBBLE @@ -1560,7 +1560,7 @@ SeadraEvosAttacks: ; 42ffc db 65, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -TosakintoEvosAttacks: ; 43016 +TosakintoEvosAttacks: db EVOLVE_LEVEL, 33, DEX_AZUMAO db 0 ; no more evolutions db 1, MOVE_PECK @@ -1574,7 +1574,7 @@ TosakintoEvosAttacks: ; 43016 db 53, MOVE_AGILITY db 0 ; no more level-up moves -AzumaoEvosAttacks: ; 4302d +AzumaoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 5, MOVE_TAIL_WHIP @@ -1587,7 +1587,7 @@ AzumaoEvosAttacks: ; 4302d db 61, MOVE_AGILITY db 0 ; no more level-up moves -HitodemanEvosAttacks: ; 43041 +HitodemanEvosAttacks: db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_STARMIE db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1603,7 +1603,7 @@ HitodemanEvosAttacks: ; 43041 db 71, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -StarmieEvosAttacks: ; 4305d +StarmieEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WATER_GUN db 1, MOVE_SWIFT @@ -1611,7 +1611,7 @@ StarmieEvosAttacks: ; 4305d db 1, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -BarrierdEvosAttacks: ; 43067 +BarrierdEvosAttacks: db 0 ; no more evolutions db 1, MOVE_CONFUSION db 7, MOVE_BARRIER @@ -1626,7 +1626,7 @@ BarrierdEvosAttacks: ; 43067 db 56, MOVE_SUBSTITUTE db 0 ; no more level-up moves -StrikeEvosAttacks: ; 4307f +StrikeEvosAttacks: db EVOLVE_LEVEL, 41, DEX_SCISSORS db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK @@ -1641,7 +1641,7 @@ StrikeEvosAttacks: ; 4307f db 64, MOVE_AGILITY db 0 ; no more level-up moves -RougelaEvosAttacks: ; 43098 +RougelaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 7, MOVE_SING @@ -1655,7 +1655,7 @@ RougelaEvosAttacks: ; 43098 db 56, MOVE_BLIZZARD db 0 ; no more level-up moves -ElebooEvosAttacks: ; 430ae +ElebooEvosAttacks: db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK db 7, MOVE_LEER @@ -1668,7 +1668,7 @@ ElebooEvosAttacks: ; 430ae db 56, MOVE_THUNDER db 0 ; no more level-up moves -BooberEvosAttacks: ; 430c2 +BooberEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 7, MOVE_LEER @@ -1681,7 +1681,7 @@ BooberEvosAttacks: ; 430c2 db 56, MOVE_FLAMETHROWER db 0 ; no more level-up moves -KailiosEvosAttacks: ; 430d6 +KailiosEvosAttacks: db EVOLVE_LEVEL, 42, DEX_PURAKKUSU db 0 ; no more evolutions db 1, MOVE_VICEGRIP @@ -1695,7 +1695,7 @@ KailiosEvosAttacks: ; 430d6 db 69, MOVE_GUILLOTINE db 0 ; no more level-up moves -KentaurosEvosAttacks: ; 430ed +KentaurosEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_TAIL_WHIP @@ -1707,7 +1707,7 @@ KentaurosEvosAttacks: ; 430ed db 71, MOVE_TAKE_DOWN db 0 ; no more level-up moves -KoikingEvosAttacks: ; 430ff +KoikingEvosAttacks: db EVOLVE_LEVEL, 20, DEX_GYARADOS db 0 ; no more evolutions db 1, MOVE_SPLASH @@ -1715,7 +1715,7 @@ KoikingEvosAttacks: ; 430ff db 30, MOVE_FLAIL db 0 ; no more level-up moves -GyaradosEvosAttacks: ; 4310a +GyaradosEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 15, MOVE_BITE @@ -1727,7 +1727,7 @@ GyaradosEvosAttacks: ; 4310a db 70, MOVE_HYPER_BEAM db 0 ; no more level-up moves -LaplaceEvosAttacks: ; 4311c +LaplaceEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WATER_GUN db 9, MOVE_GROWL @@ -1741,13 +1741,13 @@ LaplaceEvosAttacks: ; 4311c db 65, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -MetamonEvosAttacks: ; 43132 +MetamonEvosAttacks: db EVOLVE_ITEM, 1, ITEM_METAL_COAT, DEX_ANIMON db 0 ; no more evolutions db 1, MOVE_TRANSFORM db 0 ; no more level-up moves -EievuiEvosAttacks: ; 4313a +EievuiEvosAttacks: db EVOLVE_STONE, 1, ITEM_WATER_STONE, DEX_SHOWERS db EVOLVE_STONE, 1, ITEM_THUNDERSTONE, DEX_THUNDERS db EVOLVE_STONE, 1, ITEM_FIRE_STONE, DEX_BOOSTER @@ -1764,7 +1764,7 @@ EievuiEvosAttacks: ; 4313a db 42, MOVE_TAKE_DOWN db 0 ; no more level-up moves -ShowersEvosAttacks: ; 43161 +ShowersEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK @@ -1778,7 +1778,7 @@ ShowersEvosAttacks: ; 43161 db 63, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -ThundersEvosAttacks: ; 43177 +ThundersEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK @@ -1792,7 +1792,7 @@ ThundersEvosAttacks: ; 43177 db 63, MOVE_THUNDER db 0 ; no more level-up moves -BoosterEvosAttacks: ; 4318d +BoosterEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK @@ -1806,7 +1806,7 @@ BoosterEvosAttacks: ; 4318d db 63, MOVE_FLAMETHROWER db 0 ; no more level-up moves -PorygonEvosAttacks: ; 431a3 +PorygonEvosAttacks: db EVOLVE_ITEM, 1, ITEM_UP_GRADE, DEX_PORYGON2 db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -1820,7 +1820,7 @@ PorygonEvosAttacks: ; 431a3 db 50, MOVE_HYPER_BEAM db 0 ; no more level-up moves -OmniteEvosAttacks: ; 431bb +OmniteEvosAttacks: db EVOLVE_LEVEL, 40, DEX_OMSTAR db 0 ; no more evolutions db 1, MOVE_WATER_GUN @@ -1833,7 +1833,7 @@ OmniteEvosAttacks: ; 431bb db 64, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -OmstarEvosAttacks: ; 431d0 +OmstarEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WATER_GUN db 8, MOVE_WITHDRAW @@ -1845,7 +1845,7 @@ OmstarEvosAttacks: ; 431d0 db 71, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -KabutoEvosAttacks: ; 431e2 +KabutoEvosAttacks: db EVOLVE_LEVEL, 40, DEX_KABUTOPS db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -1858,7 +1858,7 @@ KabutoEvosAttacks: ; 431e2 db 64, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -KabutopsEvosAttacks: ; 431f7 +KabutopsEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 8, MOVE_ABSORB @@ -1870,7 +1870,7 @@ KabutopsEvosAttacks: ; 431f7 db 71, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -PteraEvosAttacks: ; 43209 +PteraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_GUST db 8, MOVE_SUPERSONIC @@ -1882,7 +1882,7 @@ PteraEvosAttacks: ; 43209 db 71, MOVE_HYPER_BEAM db 0 ; no more level-up moves -KabigonEvosAttacks: ; 4321b +KabigonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_HARDEN @@ -1898,7 +1898,7 @@ KabigonEvosAttacks: ; 4321b db 71, MOVE_HYPER_BEAM db 0 ; no more level-up moves -FreezerEvosAttacks: ; 43235 +FreezerEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 10, MOVE_LEER @@ -1911,7 +1911,7 @@ FreezerEvosAttacks: ; 43235 db 80, MOVE_BLIZZARD db 0 ; no more level-up moves -ThunderEvosAttacks: ; 43249 +ThunderEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 10, MOVE_THUNDER_WAVE @@ -1924,7 +1924,7 @@ ThunderEvosAttacks: ; 43249 db 80, MOVE_SCARY_FACE db 0 ; no more level-up moves -FireEvosAttacks: ; 4325d +FireEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 10, MOVE_EMBER @@ -1937,7 +1937,7 @@ FireEvosAttacks: ; 4325d db 80, MOVE_SKY_ATTACK db 0 ; no more level-up moves -MiniryuEvosAttacks: ; 43271 +MiniryuEvosAttacks: db EVOLVE_LEVEL, 30, DEX_HAKURYU db 0 ; no more evolutions db 1, MOVE_POUND @@ -1953,7 +1953,7 @@ MiniryuEvosAttacks: ; 43271 db 66, MOVE_HYPER_BEAM db 0 ; no more level-up moves -HakuryuEvosAttacks: ; 4328c +HakuryuEvosAttacks: db EVOLVE_LEVEL, 55, DEX_KAIRYU db 0 ; no more evolutions db 1, MOVE_POUND @@ -1969,7 +1969,7 @@ HakuryuEvosAttacks: ; 4328c db 76, MOVE_HYPER_BEAM db 0 ; no more level-up moves -KairyuEvosAttacks: ; 432a7 +KairyuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 5, MOVE_LEER @@ -1984,7 +1984,7 @@ KairyuEvosAttacks: ; 432a7 db 86, MOVE_HYPER_BEAM db 0 ; no more level-up moves -MewtwoEvosAttacks: ; 432bf +MewtwoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_CONFUSION db 8, MOVE_DISABLE @@ -1998,14 +1998,14 @@ MewtwoEvosAttacks: ; 432bf db 100, MOVE_AMNESIA db 0 ; no more level-up moves -MewEvosAttacks: ; 432d5 +MewEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 1, MOVE_TRANSFORM db 1, MOVE_METRONOME db 0 ; no more level-up moves -HappaEvosAttacks: ; 432dd +HappaEvosAttacks: ; db EVOLVE_LEVEL, 16, DEX_HANAMOGURA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2020,7 +2020,7 @@ HappaEvosAttacks: ; 432dd db 55, MOVE_SOLARBEAM db 0 ; no more level-up moves -HanamoguraEvosAttacks: ; 432f3 +HanamoguraEvosAttacks: db EVOLVE_LEVEL, 32, DEX_HANARYU db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2035,7 +2035,7 @@ HanamoguraEvosAttacks: ; 432f3 db 64, MOVE_SOLARBEAM db 0 ; no more level-up moves -HanaryuEvosAttacks: ; 4330c +HanaryuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 5, MOVE_GROWTH @@ -2049,7 +2049,7 @@ HanaryuEvosAttacks: ; 4330c db 73, MOVE_SOLARBEAM db 0 ; no more level-up moves -HonogumaEvosAttacks: ; 43322 +HonogumaEvosAttacks: ; db EVOLVE_LEVEL, 16, DEX_VOLBEAR db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2064,7 +2064,7 @@ HonogumaEvosAttacks: ; 43322 db 53, MOVE_FLAMETHROWER db 0 ; no more level-up moves -VolbearEvosAttacks: ; 43338 +VolbearEvosAttacks: db EVOLVE_LEVEL, 32, DEX_DYNABEAR db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2079,7 +2079,7 @@ VolbearEvosAttacks: ; 43338 db 62, MOVE_FLAMETHROWER db 0 ; no more level-up moves -DynabearEvosAttacks: ; 43351 +DynabearEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 7, MOVE_LEER @@ -2093,7 +2093,7 @@ DynabearEvosAttacks: ; 43351 db 71, MOVE_FLAMETHROWER db 0 ; no more level-up moves -KurusuEvosAttacks: ; 43367 +KurusuEvosAttacks: ; db EVOLVE_LEVEL, 16, DEX_AQUA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2107,7 +2107,7 @@ KurusuEvosAttacks: ; 43367 db 53, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -AquaEvosAttacks: ; 4337b +AquaEvosAttacks: db EVOLVE_LEVEL, 32, DEX_AQUARIA db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2121,7 +2121,7 @@ AquaEvosAttacks: ; 4337b db 61, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -AquariaEvosAttacks: ; 43392 +AquariaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 6, MOVE_GROWL @@ -2134,7 +2134,7 @@ AquariaEvosAttacks: ; 43392 db 69, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -HohoEvosAttacks: ; 433a6 +HohoEvosAttacks: ; db EVOLVE_LEVEL, 20, DEX_BOBO db 0 ; no more evolutions db 1, MOVE_GROWL @@ -2148,7 +2148,7 @@ HohoEvosAttacks: ; 433a6 db 45, MOVE_STALKER db 0 ; no more level-up moves -BoboEvosAttacks: ; 433ba +BoboEvosAttacks: db 0 ; no more evolutions db 1, MOVE_GROWL db 4, MOVE_TACKLE @@ -2161,7 +2161,7 @@ BoboEvosAttacks: ; 433ba db 59, MOVE_STALKER db 0 ; no more level-up moves -PachimeeEvosAttacks: ; 433ce +PachimeeEvosAttacks: db EVOLVE_LEVEL, 16, DEX_MOKOKO db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK @@ -2175,7 +2175,7 @@ PachimeeEvosAttacks: ; 433ce db 45, MOVE_THUNDERBOLT db 0 ; no more level-up moves -MokokoEvosAttacks: ; 433e5 +MokokoEvosAttacks: db EVOLVE_LEVEL, 32, DEX_DENRYU db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK @@ -2189,7 +2189,7 @@ MokokoEvosAttacks: ; 433e5 db 53, MOVE_THUNDERBOLT db 0 ; no more level-up moves -DenryuEvosAttacks: ; 433fc +DenryuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK db 5, MOVE_GROWL @@ -2203,7 +2203,7 @@ DenryuEvosAttacks: ; 433fc db 61, MOVE_THUNDERBOLT db 0 ; no more level-up moves -MikonEvosAttacks: ; 43412 +MikonEvosAttacks: db EVOLVE_LEVEL, 13, DEX_ROKON db 0 ; no more evolutions db 1, MOVE_TAIL_WHIP @@ -2217,7 +2217,7 @@ MikonEvosAttacks: ; 43412 db 37, MOVE_FLAMETHROWER db 0 ; no more level-up moves -MonjaEvosAttacks: ; 43429 +MonjaEvosAttacks: db EVOLVE_LEVEL, 22, DEX_MONJARA db 0 ; no more evolutions db 1, MOVE_CONSTRICT @@ -2232,7 +2232,7 @@ MonjaEvosAttacks: ; 43429 db 43, MOVE_SLAM db 0 ; no more level-up moves -JaranraEvosAttacks: ; 43442 +JaranraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_CONSTRICT db 7, MOVE_ABSORB @@ -2246,7 +2246,7 @@ JaranraEvosAttacks: ; 43442 db 64, MOVE_SLAM db 0 ; no more level-up moves -HaneeiEvosAttacks: ; 43458 +HaneeiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 10, MOVE_WATER_GUN @@ -2257,7 +2257,7 @@ HaneeiEvosAttacks: ; 43458 db 61, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -PukuEvosAttacks: ; 43468 +PukuEvosAttacks: db EVOLVE_LEVEL, 18, DEX_SHIBIREFUGU db 0 ; no more evolutions db 1, MOVE_POISON_STING @@ -2270,7 +2270,7 @@ PukuEvosAttacks: ; 43468 db 57, MOVE_EXPLOSION db 0 ; no more level-up moves -ShibirefuguEvosAttacks: ; 4347d +ShibirefuguEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POISON_STING db 7, MOVE_TAIL_WHIP @@ -2282,7 +2282,7 @@ ShibirefuguEvosAttacks: ; 4347d db 64, MOVE_EXPLOSION db 0 ; no more level-up moves -PichuEvosAttacks: ; 4348f +PichuEvosAttacks: db EVOLVE_LEVEL, 12, DEX_PIKACHU db 0 ; no more evolutions db 1, MOVE_CHARM @@ -2296,7 +2296,7 @@ PichuEvosAttacks: ; 4348f db 45, MOVE_THUNDER db 0 ; no more level-up moves -PyEvosAttacks: ; 434a6 +PyEvosAttacks: db EVOLVE_LEVEL, 12, DEX_PIPPI db 0 ; no more evolutions db 1, MOVE_CHARM @@ -2311,7 +2311,7 @@ PyEvosAttacks: ; 434a6 db 46, MOVE_MOONLIGHT db 0 ; no more level-up moves -PupurinEvosAttacks: ; 434bf +PupurinEvosAttacks: db EVOLVE_LEVEL, 12, DEX_PURIN db 0 ; no more evolutions db 1, MOVE_CHARM @@ -2327,7 +2327,7 @@ PupurinEvosAttacks: ; 434bf db 40, MOVE_DOUBLE_EDGE db 0 ; no more level-up moves -MizuuoEvosAttacks: ; 434da +MizuuoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 7, MOVE_DEFENSE_CURL @@ -2340,7 +2340,7 @@ MizuuoEvosAttacks: ; 434da db 49, MOVE_SLAM db 0 ; no more level-up moves -NatyEvosAttacks: ; 434ee +NatyEvosAttacks: db EVOLVE_STONE, 1, ITEM_HEART_STONE, DEX_NATIO db 0 ; no more evolutions db 1, MOVE_PECK @@ -2354,7 +2354,7 @@ NatyEvosAttacks: ; 434ee db 48, MOVE_DRILL_PECK db 0 ; no more level-up moves -NatioEvosAttacks: ; 43506 +NatioEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 1, MOVE_STALKER @@ -2362,7 +2362,7 @@ NatioEvosAttacks: ; 43506 db 1, MOVE_PSYBEAM db 0 ; no more level-up moves -GyopinEvosAttacks: ; 43510 +GyopinEvosAttacks: db EVOLVE_LEVEL, 16, DEX_TOSAKINTO db 0 ; no more evolutions db 1, MOVE_PECK @@ -2376,7 +2376,7 @@ GyopinEvosAttacks: ; 43510 db 45, MOVE_AGILITY db 0 ; no more level-up moves -MarilEvosAttacks: ; 43527 +MarilEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 6, MOVE_TAIL_WHIP @@ -2384,7 +2384,7 @@ MarilEvosAttacks: ; 43527 db 19, MOVE_WATER_GUN db 0 ; no more level-up moves -Manbo1EvosAttacks: ; 43531 +Manbo1EvosAttacks: db EVOLVE_LEVEL, 19, DEX_IKARI db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2399,7 +2399,7 @@ Manbo1EvosAttacks: ; 43531 db 45, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -IkariEvosAttacks: ; 4354a +IkariEvosAttacks: db EVOLVE_LEVEL, 38, DEX_GROTESS db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2414,7 +2414,7 @@ IkariEvosAttacks: ; 4354a db 54, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -GrotessEvosAttacks: ; 43563 +GrotessEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_LEER @@ -2428,7 +2428,7 @@ GrotessEvosAttacks: ; 43563 db 63, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -EksingEvosAttacks: ; 43579 +EksingEvosAttacks: db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE db 9, MOVE_SUPERSONIC @@ -2441,7 +2441,7 @@ EksingEvosAttacks: ; 43579 db 63, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -ParaEvosAttacks: ; 4358d +ParaEvosAttacks: db EVOLVE_LEVEL, 12, DEX_PARAS db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2454,7 +2454,7 @@ ParaEvosAttacks: ; 4358d db 36, MOVE_SPORE db 0 ; no more level-up moves -KokumoEvosAttacks: ; 435a2 +KokumoEvosAttacks: db EVOLVE_LEVEL, 23, DEX_TWOHEAD db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE @@ -2468,7 +2468,7 @@ KokumoEvosAttacks: ; 435a2 db 53, MOVE_PSYCHIC db 0 ; no more level-up moves -TwoheadEvosAttacks: ; 435b9 +TwoheadEvosAttacks: db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE db 5, MOVE_STRING_SHOT @@ -2481,7 +2481,7 @@ TwoheadEvosAttacks: ; 435b9 db 61, MOVE_PSYCHIC db 0 ; no more level-up moves -YoroidoriEvosAttacks: ; 435cd +YoroidoriEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 8, MOVE_LEER @@ -2494,12 +2494,12 @@ YoroidoriEvosAttacks: ; 435cd db 57, MOVE_AGILITY db 0 ; no more level-up moves -AnimonEvosAttacks: ; 435e1 +AnimonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TRANSFORM db 0 ; no more level-up moves -HinazuEvosAttacks: ; 435e5 +HinazuEvosAttacks: db EVOLVE_LEVEL, 16, DEX_DODO db 0 ; no more evolutions db 1, MOVE_GROWL @@ -2513,7 +2513,7 @@ HinazuEvosAttacks: ; 435e5 db 45, MOVE_DRILL_PECK db 0 ; no more level-up moves -SunnyEvosAttacks: ; 435fc +SunnyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_ABSORB db 7, MOVE_SING @@ -2526,7 +2526,7 @@ SunnyEvosAttacks: ; 435fc db 61, MOVE_SOLARBEAM db 0 ; no more level-up moves -PaonEvosAttacks: ; 43610 +PaonEvosAttacks: db EVOLVE_LEVEL, 33, DEX_DONPHAN db 0 ; no more evolutions db 1, MOVE_TACKLE @@ -2539,7 +2539,7 @@ PaonEvosAttacks: ; 43610 db 50, MOVE_TAKE_DOWN db 0 ; no more level-up moves -DonphanEvosAttacks: ; 43625 +DonphanEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 9, MOVE_DEFENSE_CURL @@ -2552,7 +2552,7 @@ DonphanEvosAttacks: ; 43625 db 57, MOVE_TAKE_DOWN db 0 ; no more level-up moves -TwinzEvosAttacks: ; 43639 +TwinzEvosAttacks: db EVOLVE_LEVEL, 29, DEX_KIRINRIKI db 0 ; no more evolutions db 1, MOVE_DOUBLE_KICK @@ -2560,14 +2560,14 @@ TwinzEvosAttacks: ; 43639 db 11, MOVE_SAND_ATTACK db 0 ; no more level-up moves -KirinrikiEvosAttacks: ; 43644 +KirinrikiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_DOUBLE_KICK db 6, MOVE_GROWL db 11, MOVE_SAND_ATTACK db 0 ; no more level-up moves -PainterEvosAttacks: ; 4364c +PainterEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SKETCH db 10, MOVE_SKETCH @@ -2582,7 +2582,7 @@ PainterEvosAttacks: ; 4364c db 100, MOVE_SKETCH db 0 ; no more level-up moves -KounyaEvosAttacks: ; 43664 +KounyaEvosAttacks: db EVOLVE_LEVEL, 14, DEX_NYARTH db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2598,7 +2598,7 @@ KounyaEvosAttacks: ; 43664 db 51, MOVE_COIN_HURL db 0 ; no more level-up moves -RinrinEvosAttacks: ; 4367f +RinrinEvosAttacks: db EVOLVE_LEVEL, 28, DEX_BERURUN db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2613,7 +2613,7 @@ RinrinEvosAttacks: ; 4367f db 53, MOVE_ATTRACT db 0 ; no more level-up moves -BerurunEvosAttacks: ; 43698 +BerurunEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 5, MOVE_GROWL @@ -2627,14 +2627,14 @@ BerurunEvosAttacks: ; 43698 db 61, MOVE_ATTRACT db 0 ; no more level-up moves -NyorotonoEvosAttacks: ; 436ae +NyorotonoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_HYPNOSIS db 1, MOVE_WATER_GUN db 1, MOVE_DOUBLESLAP db 0 ; no more level-up moves -YadokingEvosAttacks: ; 436b6 +YadokingEvosAttacks: db 0 ; no more evolutions db 1, MOVE_CONFUSION db 9, MOVE_DISABLE @@ -2647,12 +2647,12 @@ YadokingEvosAttacks: ; 436b6 db 64, MOVE_PSYCHIC db 0 ; no more level-up moves -AnnonEvosAttacks: ; 436ca +AnnonEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PSYWAVE db 0 ; no more level-up moves -RedibaEvosAttacks: ; 436ce +RedibaEvosAttacks: ; db EVOLVE_LEVEL, 18, DEX_MITSUBOSHI db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2665,14 +2665,14 @@ RedibaEvosAttacks: ; 436ce db 56, MOVE_TRI_ATTACK db 0 ; no more level-up moves -MitsuboshiEvosAttacks: ; 436e0 +MitsuboshiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_AGILITY db 1, MOVE_QUICK_ATTACK db 1, MOVE_BITE db 0 ; no more level-up moves -PuchicornEvosAttacks: ; 436e8 +PuchicornEvosAttacks: db EVOLVE_LEVEL, 20, DEX_PONYTA db 0 ; no more evolutions db 1, MOVE_TAIL_WHIP @@ -2686,7 +2686,7 @@ PuchicornEvosAttacks: ; 436e8 db 56, MOVE_TAKE_DOWN db 0 ; no more level-up moves -EifieEvosAttacks: ; 436ff +EifieEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK @@ -2700,7 +2700,7 @@ EifieEvosAttacks: ; 436ff db 63, MOVE_PSYCHIC db 0 ; no more level-up moves -BlackyEvosAttacks: ; 43715 +BlackyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK @@ -2714,14 +2714,14 @@ BlackyEvosAttacks: ; 43715 db 63, MOVE_SLUDGE_BOMB db 0 ; no more level-up moves -TurbanEvosAttacks: ; 4372b +TurbanEvosAttacks: db 0 ; no more evolutions db 1, MOVE_HARDEN db 1, MOVE_BODY_SLAM db 1, MOVE_WATER_GUN db 0 ; no more level-up moves -BetbabyEvosAttacks: ; 43733 +BetbabyEvosAttacks: db EVOLVE_LEVEL, 19, DEX_BETBETER db 0 ; no more evolutions db 1, MOVE_POUND @@ -2737,7 +2737,7 @@ BetbabyEvosAttacks: ; 43733 db 56, MOVE_SLUDGE_BOMB db 0 ; no more level-up moves -TeppouoEvosAttacks: ; 4374e +TeppouoEvosAttacks: db EVOLVE_LEVEL, 34, DEX_OKUTANK db 0 ; no more evolutions db 1, MOVE_WATER_GUN @@ -2749,7 +2749,7 @@ TeppouoEvosAttacks: ; 4374e db 70, MOVE_ZAP_CANNON db 0 ; no more level-up moves -OkutankEvosAttacks: ; 43761 +OkutankEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WATER_GUN db 10, MOVE_FOCUS_ENERGY @@ -2760,7 +2760,7 @@ OkutankEvosAttacks: ; 43761 db 70, MOVE_ZAP_CANNON db 0 ; no more level-up moves -GonguEvosAttacks: ; 43771 +GonguEvosAttacks: db EVOLVE_LEVEL, 15, DEX_SAWAMULAR db EVOLVE_LEVEL, 15, DEX_EBIWALAR db EVOLVE_LEVEL, 15, DEX_KAPOERER @@ -2768,7 +2768,7 @@ GonguEvosAttacks: ; 43771 db 1, MOVE_TACKLE db 0 ; no more level-up moves -KapoererEvosAttacks: ; 4377e +KapoererEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_LEER @@ -2782,7 +2782,7 @@ KapoererEvosAttacks: ; 4377e db 71, MOVE_FOCUS_ENERGY db 0 ; no more level-up moves -PudieEvosAttacks: ; 43794 +PudieEvosAttacks: db EVOLVE_LEVEL, 13, DEX_GARDIE db 0 ; no more evolutions db 1, MOVE_EMBER @@ -2796,7 +2796,7 @@ PudieEvosAttacks: ; 43794 db 45, MOVE_FLAMETHROWER db 0 ; no more level-up moves -HanekoEvosAttacks: ; 437ab +HanekoEvosAttacks: ; db EVOLVE_LEVEL, 18, DEX_POPONEKO db 0 ; no more evolutions db 1, MOVE_ABSORB @@ -2810,7 +2810,7 @@ HanekoEvosAttacks: ; 437ab db 53, MOVE_MEGA_DRAIN db 0 ; no more level-up moves -PoponekoEvosAttacks: ; 437bf +PoponekoEvosAttacks: db EVOLVE_LEVEL, 40, DEX_WATANEKO db 0 ; no more evolutions db 1, MOVE_ABSORB @@ -2824,7 +2824,7 @@ PoponekoEvosAttacks: ; 437bf db 61, MOVE_MEGA_DRAIN db 0 ; no more level-up moves -WatanekoEvosAttacks: ; 437d6 +WatanekoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_ABSORB db 6, MOVE_POUND @@ -2837,7 +2837,7 @@ WatanekoEvosAttacks: ; 437d6 db 69, MOVE_MEGA_DRAIN db 0 ; no more level-up moves -BaririnaEvosAttacks: ; 437ea +BaririnaEvosAttacks: db EVOLVE_LEVEL, 15, DEX_BARRIERD db 0 ; no more evolutions db 1, MOVE_CONFUSION @@ -2853,7 +2853,7 @@ BaririnaEvosAttacks: ; 437ea db 48, MOVE_SUBSTITUTE db 0 ; no more level-up moves -LipEvosAttacks: ; 43805 +LipEvosAttacks: db EVOLVE_LEVEL, 15, DEX_ROUGELA db 0 ; no more evolutions db 1, MOVE_POUND @@ -2868,7 +2868,7 @@ LipEvosAttacks: ; 43805 db 48, MOVE_BLIZZARD db 0 ; no more level-up moves -ElebabyEvosAttacks: ; 4381e +ElebabyEvosAttacks: db EVOLVE_LEVEL, 15, DEX_ELEBOO db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK @@ -2882,7 +2882,7 @@ ElebabyEvosAttacks: ; 4381e db 48, MOVE_THUNDER db 0 ; no more level-up moves -BoobyEvosAttacks: ; 43835 +BoobyEvosAttacks: db EVOLVE_LEVEL, 15, DEX_BOOBER db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -2896,7 +2896,7 @@ BoobyEvosAttacks: ; 43835 db 48, MOVE_FLAMETHROWER db 0 ; no more level-up moves -KireihanaEvosAttacks: ; 4384c +KireihanaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_ABSORB db 1, MOVE_STUN_SPORE @@ -2904,7 +2904,7 @@ KireihanaEvosAttacks: ; 4384c db 1, MOVE_PETAL_DANCE db 0 ; no more level-up moves -TsubomittoEvosAttacks: ; 43856 +TsubomittoEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WRAP db 1, MOVE_POISONPOWDER @@ -2912,7 +2912,7 @@ TsubomittoEvosAttacks: ; 43856 db 1, MOVE_RAZOR_LEAF db 0 ; no more level-up moves -MiltankEvosAttacks: ; 43860 +MiltankEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_TAIL_WHIP @@ -2924,7 +2924,7 @@ MiltankEvosAttacks: ; 43860 db 71, MOVE_TAKE_DOWN db 0 ; no more level-up moves -BombseekerEvosAttacks: ; 43872 +BombseekerEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 9, MOVE_TAIL_WHIP @@ -2936,7 +2936,7 @@ BombseekerEvosAttacks: ; 43872 db 57, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -GiftEvosAttacks: ; 43884 +GiftEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 9, MOVE_GROWL @@ -2947,7 +2947,7 @@ GiftEvosAttacks: ; 43884 db 54, MOVE_BLIZZARD db 0 ; no more level-up moves -KotoraEvosAttacks: ; 43894 +KotoraEvosAttacks: db EVOLVE_LEVEL, 35, DEX_RAITORA db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK @@ -2961,7 +2961,7 @@ KotoraEvosAttacks: ; 43894 db 53, MOVE_AGILITY db 0 ; no more level-up moves -RaitoraEvosAttacks: ; 438ab +RaitoraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_THUNDERSHOCK db 7, MOVE_LEER @@ -2974,7 +2974,7 @@ RaitoraEvosAttacks: ; 438ab db 61, MOVE_AGILITY db 0 ; no more level-up moves -MadameEvosAttacks: ; 438bf +MadameEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 7, MOVE_SAND_ATTACK @@ -2988,7 +2988,7 @@ MadameEvosAttacks: ; 438bf db 55, MOVE_FURY_CUTTER db 0 ; no more level-up moves -NorowaraEvosAttacks: ; 438d5 +NorowaraEvosAttacks: db EVOLVE_LEVEL, 1, DEX_KYONPAN db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE @@ -3003,7 +3003,7 @@ NorowaraEvosAttacks: ; 438d5 db 100, MOVE_NAIL_DOWN db 0 ; no more level-up moves -KyonpanEvosAttacks: ; 438ee +KyonpanEvosAttacks: db 0 ; no more evolutions db 1, MOVE_LEECH_LIFE db 8, MOVE_DISABLE @@ -3017,7 +3017,7 @@ KyonpanEvosAttacks: ; 438ee db 100, MOVE_CONFUSE_RAY db 0 ; no more level-up moves -YamikarasuEvosAttacks: ; 43904 +YamikarasuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 6, MOVE_SAND_ATTACK @@ -3030,7 +3030,7 @@ YamikarasuEvosAttacks: ; 43904 db 69, MOVE_PERISH_SONG db 0 ; no more level-up moves -HappiEvosAttacks: ; 43918 +HappiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_POUND db 6, MOVE_TAIL_WHIP @@ -3044,7 +3044,7 @@ HappiEvosAttacks: ; 43918 db 82, MOVE_PAIN_SPLIT db 0 ; no more level-up moves -ScissorsEvosAttacks: ; 4392e +ScissorsEvosAttacks: db 0 ; no more evolutions db 1, MOVE_QUICK_ATTACK db 5, MOVE_LEER @@ -3058,7 +3058,7 @@ ScissorsEvosAttacks: ; 4392e db 73, MOVE_AGILITY db 0 ; no more level-up moves -PurakkusuEvosAttacks: ; 43944 +PurakkusuEvosAttacks: db 0 ; no more evolutions db 1, MOVE_VICEGRIP db 7, MOVE_FOCUS_ENERGY @@ -3071,7 +3071,7 @@ PurakkusuEvosAttacks: ; 43944 db 77, MOVE_GUILLOTINE db 0 ; no more level-up moves -DevilEvosAttacks: ; 43958 +DevilEvosAttacks: db EVOLVE_LEVEL, 35, DEX_HELGAA db 0 ; no more evolutions db 1, MOVE_EMBER @@ -3085,7 +3085,7 @@ DevilEvosAttacks: ; 43958 db 56, MOVE_FLAMETHROWER db 0 ; no more level-up moves -HelgaaEvosAttacks: ; 4396f +HelgaaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_EMBER db 8, MOVE_LEER @@ -3098,7 +3098,7 @@ HelgaaEvosAttacks: ; 4396f db 64, MOVE_FLAMETHROWER db 0 ; no more level-up moves -WolfmanEvosAttacks: ; 43983 +WolfmanEvosAttacks: db EVOLVE_LEVEL, 35, DEX_WARWOLF db 0 ; no more evolutions db 1, MOVE_SCRATCH @@ -3112,7 +3112,7 @@ WolfmanEvosAttacks: ; 43983 db 56, MOVE_BLIZZARD db 0 ; no more level-up moves -WarwolfEvosAttacks: ; 4399a +WarwolfEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 8, MOVE_POWDER_SNOW @@ -3125,7 +3125,7 @@ WarwolfEvosAttacks: ; 4399a db 64, MOVE_BLIZZARD db 0 ; no more level-up moves -Porygon2EvosAttacks: ; 439ae +Porygon2EvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 8, MOVE_SHARPEN @@ -3138,7 +3138,7 @@ Porygon2EvosAttacks: ; 439ae db 50, MOVE_HYPER_BEAM db 0 ; no more level-up moves -NameilEvosAttacks: ; 439c2 +NameilEvosAttacks: db 0 ; no more evolutions db 1, MOVE_LICK db 7, MOVE_SUPERSONIC @@ -3151,7 +3151,7 @@ NameilEvosAttacks: ; 439c2 db 77, MOVE_SCREECH db 0 ; no more level-up moves -HaganeilEvosAttacks: ; 439d6 +HaganeilEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 6, MOVE_HARDEN @@ -3165,7 +3165,7 @@ HaganeilEvosAttacks: ; 439d6 db 62, MOVE_IRON_TAIL db 0 ; no more level-up moves -KingdraEvosAttacks: ; 439ec +KingdraEvosAttacks: db 0 ; no more evolutions db 1, MOVE_BUBBLE db 9, MOVE_SMOKESCREEN @@ -3179,7 +3179,7 @@ KingdraEvosAttacks: ; 439ec db 65, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -RaiEvosAttacks: ; 43a02 +RaiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 10, MOVE_THUNDERSHOCK @@ -3192,7 +3192,7 @@ RaiEvosAttacks: ; 43a02 db 85, MOVE_THUNDER db 0 ; no more level-up moves -EnEvosAttacks: ; 43a16 +EnEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 10, MOVE_EMBER @@ -3205,7 +3205,7 @@ EnEvosAttacks: ; 43a16 db 85, MOVE_FIRE_BLAST db 0 ; no more level-up moves -SuiEvosAttacks: ; 43a2a +SuiEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 10, MOVE_WATER_GUN @@ -3218,7 +3218,7 @@ SuiEvosAttacks: ; 43a2a db 85, MOVE_HYDRO_PUMP db 0 ; no more level-up moves -NyulaEvosAttacks: ; 43a3e +NyulaEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 6, MOVE_TAIL_WHIP @@ -3231,7 +3231,7 @@ NyulaEvosAttacks: ; 43a3e db 48, MOVE_SLASH db 0 ; no more level-up moves -HououEvosAttacks: ; 43a52 +HououEvosAttacks: db 0 ; no more evolutions db 1, MOVE_WING_ATTACK db 9, MOVE_LEER @@ -3246,7 +3246,7 @@ HououEvosAttacks: ; 43a52 db 93, MOVE_SKY_ATTACK db 0 ; no more level-up moves -TogepyEvosAttacks: ; 43a6a +TogepyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_PECK db 8, MOVE_WITHDRAW @@ -3258,7 +3258,7 @@ TogepyEvosAttacks: ; 43a6a db 50, MOVE_SKULL_BASH db 0 ; no more level-up moves -BuluEvosAttacks: ; 43a7c +BuluEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 6, MOVE_TAIL_WHIP @@ -3271,7 +3271,7 @@ BuluEvosAttacks: ; 43a7c db 53, MOVE_PERISH_SONG db 0 ; no more level-up moves -TailEvosAttacks: ; 43a90 +TailEvosAttacks: db 0 ; no more evolutions db 1, MOVE_SCRATCH db 5, MOVE_LEER @@ -3284,7 +3284,7 @@ TailEvosAttacks: ; 43a90 db 45, MOVE_MIMIC db 0 ; no more level-up moves -LeafyEvosAttacks: ; 43aa4 +LeafyEvosAttacks: db 0 ; no more evolutions db 1, MOVE_TACKLE db 7, MOVE_SAND_ATTACK diff --git a/data/pokemon/evos_attacks_pointers.inc b/data/pokemon/evos_attacks_pointers.inc index e14ddac..5ac22f3 100644 --- a/data/pokemon/evos_attacks_pointers.inc +++ b/data/pokemon/evos_attacks_pointers.inc @@ -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 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 5ef9b63..344317d 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -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 diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc index 1c551fe..cd1e2b2 100644 --- a/data/predef_pointers.inc +++ b/data/predef_pointers.inc @@ -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! diff --git a/data/text/text_input_chars.asm b/data/text/text_input_chars.asm index 4194d06..c7d9607 100644 --- a/data/text/text_input_chars.asm +++ b/data/text/text_input_chars.asm @@ -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 "マミムメモ ヤユヨワン ラりルレロ" diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 5b44258..5091163 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "data/trainers/class_names.asm", ROMX -TrainerClassNames:: ; 38d90 +TrainerClassNames:: db "ハヤト@" ; HAYATO db "アカネ@" ; AKANE db "ツクシ@" ; TSUKISHI diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index cebecfd..59565f6 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -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 diff --git a/data/wild.asm b/data/wild.asm index a451174..9cae23c 100644 --- a/data/wild.asm +++ b/data/wild.asm @@ -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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 031e42c..77a4d6b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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. diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 4a0283b..0ffe425 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -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 diff --git a/engine/bcd.asm b/engine/bcd.asm index 7b7c1b8..6b561df 100755 --- a/engine/bcd.asm +++ b/engine/bcd.asm @@ -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 diff --git a/engine/dumps/bank01.asm b/engine/dumps/bank01.asm index 3495b00..36a2f6c 100755 --- a/engine/dumps/bank01.asm +++ b/engine/dumps/bank01.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank01.asm@Function40fd", ROMX -Function40fd: ; 01:40fd +Function40fd: ld hl, wd41a set 5, [hl] ld hl, wd41a @@ -107,35 +107,35 @@ Table416b: dw Unknown41eb dw Unknown4203 -Unknown41eb: ; 01:41eb +Unknown41eb: db $00, $01, $02, $03 -Unknown41ef: ; 01:41ef +Unknown41ef: db $80, $81, $82, $83 -Unknown41f3: ; 01:41f3 +Unknown41f3: db $04, $05, $06, $07 -Unknown41f7: ; 01:41f7 +Unknown41f7: db $84, $85, $86, $87 -Unknown41fb: ; 01:41fb +Unknown41fb: db $08, $09, $0a, $0b -Unknown41ff: ; 01:41ff +Unknown41ff: db $88, $89, $8a, $8b -Unknown4203: ; 01:4203 +Unknown4203: db $00, $00, $00, $00 db $08, $00, $08, $00 db $02, $08, $08, $03 -Unknown420f: ; 01:420f +Unknown420f: db $00, $08, $20, $00 db $00, $20, $08, $08 db $22, $08, $00, $23 -Table421b: ; 01:421b +Table421b: dw Unknown423b dw Unknown424b dw Unknown423b @@ -153,67 +153,67 @@ Table421b: ; 01:421b dw Unknown42ab dw Unknown42cb -Unknown423b: ; 01:423b +Unknown423b: db $00, $00, $00, $00 db $00, $08, $01, $00 db $08, $00, $02, $02 db $08, $08, $03, $03 -Unknown424b: ; 01:424b +Unknown424b: db $00, $00, $80, $00 db $00, $08, $81, $00 db $08, $00, $82, $02 db $08, $08, $83, $03 -Unknown425b: ; 01:425b +Unknown425b: db $00, $08, $80, $20 db $00, $00, $81, $20 db $08, $08, $82, $22 db $08, $00, $83, $23 -Unknown426b: ; 01:426b +Unknown426b: db $00, $00, $04, $00 db $00, $08, $05, $00 db $08, $00, $06, $02 db $08, $08, $07, $03 -Unknown427b: ; 01:427b +Unknown427b: db $00, $00, $84, $00 db $00, $08, $85, $00 db $08, $00, $86, $02 db $08, $08, $87, $03 -Unknown428b: ; 01:428b +Unknown428b: db $00, $08, $84, $20 db $00, $00, $85, $20 db $08, $08, $86, $22 db $08, $00, $87, $23 -Unknown429b: ; 01:429b +Unknown429b: db $00, $00, $08, $00 db $00, $08, $09, $00 db $08, $00, $0a, $02 db $08, $08, $0b, $03 -Unknown42ab: ; 01:42ab +Unknown42ab: db $00, $08, $08, $20 db $00, $00, $09, $20 db $08, $08, $0a, $22 db $08, $00, $0b, $23 -Unknown42bb: ; 01:42bb +Unknown42bb: db $00, $00, $88, $00 db $00, $08, $89, $00 db $08, $00, $8a, $02 db $08, $08, $8b, $03 -Unknown42cb: ; 01:42cb +Unknown42cb: db $00, $08, $88, $20 db $00, $00, $89, $20 db $08, $08, $8a, $22 db $08, $00, $8b, $23 -Function42db: ; 01:42db +Function42db: ld bc, wCmdQueue ld a, $01 .sub_42e0 @@ -272,13 +272,13 @@ Table4329:: dw Function446c dw Function4495 -Function4333: ; 01:4333 +Function4333: ret -Function4334: ; 01:4334 +Function4334: ret -Function4335: ; 01:4335 +Function4335: push bc ld h, b ld l, c @@ -288,13 +288,13 @@ Function4335: ; 01:4335 pop bc ret -Function4341: ; 01:4341 +Function4341: ld hl, $000a add hl, bc inc [hl] ret -Function4347: ; 01:4347 +Function4347: pop hl ld e, [hl] inc hl @@ -310,7 +310,7 @@ Function4347: ; 01:4347 ld l, a jp hl -Function4358: ; 01:4358 +Function4358: ld hl, $000a add hl, bc ld a, [hl] @@ -323,7 +323,7 @@ Function4358: ; 01:4358 ld l, a jp hl -Function4366: ; 01:4366 +Function4366: push bc ld hl, $0000 add hl, bc @@ -335,15 +335,15 @@ Function4366: ; 01:4366 pop bc ret -Function4374: ; 01:4374 +Function4374: ld de, Table437a jp Function4358 -Table437a: ; 01:437a +Table437a: dw Function437e dw Function439b -Function437e: ; 01:437e +Function437e: call Function4341 ld hl, $000e add hl, bc @@ -361,18 +361,18 @@ Function437e: ; 01:437e add hl, bc ld [hl], a -Function439b: ; 01:439b +Function439b: jp Function4402 -Function439e: ; 01:439e +Function439e: ld de, Table43a4 jp Function4358 -Table43a4: ; 01:43a4 +Table43a4: dw Function43a8 dw Function43c6 -Function43a8: ; 01:43a8 +Function43a8: call Function4341 call Function4366 ld hl, $0009 @@ -390,18 +390,18 @@ Function43a8: ; 01:43a8 add hl, bc ld [hl], $08 -Function43c6: ; 01:43c6 +Function43c6: jp Function4402 -Function43c9: ; 01:43c9 +Function43c9: ld de, Table43cf jp Function4358 -Table43cf: ; 01:43cf +Table43cf: dw Function43d3 dw Function43ff -Function43d3: ; 01:43d3 +Function43d3: call Function4366 ld hl, $0009 add hl, de @@ -428,10 +428,10 @@ Function43d3: ; 01:43d3 ld [hl], a ldh [rOBP1], a -Function43ff: ; 01:43ff +Function43ff: jp Function4402 -Function4402: ; 01:4402 +Function4402: ld hl, $000b add hl, bc ld a, [hl] @@ -461,15 +461,15 @@ Function4402: ; 01:4402 ld [hl], a ret -Function4430: ; 01:4430 +Function4430: ld hl, Table4436 jp Function4358 -Table4436: ; 01:4436 +Table4436: dw Function443a dw Function444f -Function443a: ; 01:443a +Function443a: call Function4341 ld hl, $000b add hl, bc @@ -481,16 +481,16 @@ Function443a: ; 01:443a add hl, bc ld [hl], $f0 -Function444f: ; 01:444f +Function444f: jp Function4402 -Function4452: ; 01:4452 +Function4452: ld hl, $000c add hl, bc ld [hl], $02 ret -Function4459: ; 01:4459 +Function4459: ld hl, $000b add hl, bc ld a, [hl] @@ -504,7 +504,7 @@ Function4459: ; 01:4459 ld [hl], a ret -Function446c: ; 01:446c +Function446c: ld hl, $0009 add hl, bc inc [hl] @@ -533,7 +533,7 @@ Function446c: ; 01:446c ld [hl], a ret -Function4495: ; 01:4495 +Function4495: ld hl, $0009 add hl, bc inc [hl] @@ -550,39 +550,39 @@ Function4495: ; 01:4495 ld [hl], a ret -Table44ab: ; 01:44ab +Table44ab: dw Unknown44b5 dw Unknown44b6 dw Unknown44c7 dw Unknown44d0 dw Unknown44e1 -Unknown44b5: ; 01:44b5 +Unknown44b5: db $00 -Unknown44b6: ; 01:44b6 +Unknown44b6: db $04, $00, $00, $00 db $00, $00, $08, $01 db $00, $08, $00, $02 db $00, $08, $08, $03, $00 -Unknown44c7: ; 01:44c7 +Unknown44c7: db $02, $00, $00, $00 db $00, $00, $08, $00, $20 -Unknown44d0: ; 01:44d0 +Unknown44d0: db $04, $00, $00, $00 db $00, $00, $08, $00 db $00, $08, $00, $00 db $00, $08, $08, $00, $00 -Unknown44e1: ; 01:44e1 +Unknown44e1: db $04, $00, $00, $00 db $40, $00, $08, $00 db $40, $08, $00, $00 db $40, $08, $08, $00, $40 -Function44f2: ; 01:44f2 +Function44f2: ld hl, $0008 add hl, bc ld a, [hl] @@ -628,13 +628,13 @@ Table4516:: dw Function4a8b dw Function4869 -Function453e: ; 01:453e +Function453e: ld hl, $000a add hl, bc ld [hl], $02 ret -Function4545: ; 01:4545 +Function4545: ld hl, $0005 add hl, bc bit 6, [hl] @@ -645,19 +645,19 @@ Function4545: ; 01:4545 ld hl, Table4558 jp CallJumptable -Table4558: ; 01:4558 +Table4558: dw Function4560 dw Function4567 dw Function4593 dw Function45a0 -Function4560: ; 01:4560 +Function4560: ld hl, $000d add hl, bc ld [hl], $ff ret -Function4567: ; 01:4567 +Function4567: ld hl, $0004 add hl, bc bit 3, [hl] @@ -686,7 +686,7 @@ Function4567: ; 01:4567 ld [hl], a ret -Function4593: ; 01:4593 +Function4593: ld hl, $0007 add hl, bc ld a, [hl] @@ -696,7 +696,7 @@ Function4593: ; 01:4593 ld [hl], a ret -Function45a0: ; 01:45a0 +Function45a0: ld hl, $000b add hl, bc ld a, [hl] @@ -730,10 +730,10 @@ Function45a0: ; 01:45a0 ld [hl], a ret -Unknown45d0: ; 01:45d0 +Unknown45d0: db $00, $0C, $04, $08 -Function45d4: ; 01:45d4 +Function45d4: ld hl, $0010 add hl, bc ld a, [hl] @@ -759,7 +759,7 @@ Function45d4: ; 01:45d4 call Function4636 ret -Function45fe: ; 01:45fe +Function45fe: ld hl, $0012 add hl, bc ld a, [hl] @@ -774,7 +774,7 @@ Function45fe: ; 01:45fe ld [hl], a ret -Function4613: ; 01:4613 +Function4613: ld hl, $0005 add hl, bc bit 3, [hl] @@ -796,7 +796,7 @@ Function4613: ; 01:4613 call Function4636 ret -Function4636: ; 01:4636 +Function4636: and $f0 cp $70 nop @@ -807,14 +807,14 @@ Function4636: ; 01:4636 and a ret -Function4644: ; 01:4644 +Function4644: ld hl, $0005 add hl, bc set 7, [hl] scf ret -Function464c: ; 01:464c +Function464c: call .sub_465f jr c, .sub_4658 ld hl, $0005 @@ -848,7 +848,7 @@ Function464c: ; 01:464c scf ret -Function4678: ; 01:4678 +Function4678: xor a ld hl, $000a add hl, bc @@ -861,7 +861,7 @@ Function4678: ; 01:4678 ld [hl], $ff ret -Function468a: ; 01:468a +Function468a: and $0f ld hl, $0006 add hl, bc @@ -877,7 +877,7 @@ Function468a: ; 01:468a and $0c ld [hl], a -Function46a2: ; 01:46a2 +Function46a2: call Function46e5 ld hl, $0009 add hl, bc @@ -908,7 +908,7 @@ Function46a2: ; 01:46a2 ld [hl], a ret -Function46d3: ; 01:46d3 +Function46d3: call Function46e5 ld hl, $0018 add hl, bc @@ -922,7 +922,7 @@ Function46d3: ; 01:46d3 ld [hl], a ret -Function46e5: ; 01:46e5 +Function46e5: ld hl, $0006 add hl, bc ld l, [hl] @@ -939,7 +939,7 @@ Function46e5: ; 01:46e5 ld h, [hl] ret -Function46f9: ; 01:46f9 +Function46f9: ld hl, $0006 add hl, bc ld l, [hl] @@ -951,10 +951,10 @@ Function46f9: ; 01:46f9 ld a, [hl] ret -Table4708: ; 01:4708 +Table4708: db $00, $01, $10 -Table470b: ; 01:470b +Table470b: db $01, $00, $ff db $10, $01, $ff db $00, $10, $01 @@ -977,7 +977,7 @@ Table470b: ; 01:470b db $08, $00, $02 db $08 -Function4748: ; 01:4748 +Function4748: add a ret z ld a, $01 @@ -985,7 +985,7 @@ Function4748: ; 01:4748 ld a, $ff ret -Function4750: ; 01:4750 +Function4750: ld hl, $0006 add hl, bc ld a, [hl] @@ -1000,7 +1000,7 @@ Function4750: ; 01:4750 set 5, [hl] ret -Function476b: ; 01:476b +Function476b: ld a, [wXCoord] ld d, a ld hl, $0010 @@ -1025,31 +1025,31 @@ Function476b: ; 01:476b ld [hl], a ret -Function4792: ; 01:4792 +Function4792: ld hl, $001d add hl, bc ld [hl], $00 ret -Function4799: ; 01:4799 +Function4799: ld hl, $001d add hl, bc inc [hl] ret -Function479f: ; 01:479f +Function479f: ld hl, $001d add hl, bc ld a, [hl] ret -Function47a5: ; 01:47a5 +Function47a5: ld hl, $001d add hl, bc ld [hl], a ret -Function47ab: ; 01:47ab +Function47ab: ld hl, $001d add hl, bc ld l, [hl] @@ -1061,7 +1061,7 @@ Function47ab: ; 01:47ab ld l, a jp hl -Function47b8: ; 01:47b8 +Function47b8: ld hl, $0003 add hl, bc ld a, [hl] @@ -1069,7 +1069,7 @@ Function47b8: ; 01:47b8 ld hl, Table47c5 jp CallJumptable -Table47c5: ; 01:47c5 +Table47c5: dw Function47fb dw Function4812 dw Function481c @@ -1098,29 +1098,29 @@ Table47c5: ; 01:47c5 dw Function4865 dw Function4868 -Function47fb: ; 01:47fb +Function47fb: ret -Function47fc: ; 01:47fc +Function47fc: call Random ldh a, [hRandomAdd] and $01 jp Function48a9 -Function4806: ; 01:4806 +Function4806: call Random ldh a, [hRandomAdd] and $01 or $02 jp Function48a9 -Function4812: ; 01:4812 +Function4812: call Random ldh a, [hRandomAdd] and $03 jp Function48a9 -Function481c: ; 01:481c +Function481c: call Random ldh a, [hRandomAdd] and $0c @@ -1129,22 +1129,22 @@ Function481c: ; 01:481c ld [hl], a jp Function48da -Function482b: ; 01:482b +Function482b: ld a, $00 jr Function4839 -Function482f: ; 01:482f +Function482f: ld a, $04 jr Function4839 -Function4833: ; 01:4833 +Function4833: ld a, $08 jr Function4839 -Function4837: ; 01:4837 +Function4837: ld a, $0c -Function4839: ; 01:4839 +Function4839: ld hl, $0007 add hl, bc ld [hl], a @@ -1155,37 +1155,37 @@ Function4839: ; 01:4839 ld [hl], $04 jp Function4b78 -Function484d: ; 01:484d +Function484d: ld hl, $0008 add hl, bc ld [hl], $07 jp Function4bed -Function4856: ; 01:4856 +Function4856: jp Function4bf9 -Function4859: ; 01:4859 +Function4859: jp Function4c0c -Function485c: ; 01:485c +Function485c: jp Function4fbc -Function485f: ; 01:485f +Function485f: jp Function4bf3 -Function4862: ; 01:4862 +Function4862: jp Function4fbc -Function4865: ; 01:4865 +Function4865: jp Function4c1f -Function4868: ; 01:4868 +Function4868: ret -Function4869: ; 01:4869 +Function4869: ret -Function486a: ; 01:486a +Function486a: ld hl, $0010 add hl, bc ld d, [hl] @@ -1206,7 +1206,7 @@ Function486a: ; 01:486a ld [hl], a ret -Function488c: ; 01:488c +Function488c: call Function468a call Function771e jr c, Function48d4 @@ -1221,7 +1221,7 @@ Function488c: ; 01:488c ld [hl], $02 jp Function4b88 -Function48a9: ; 01:48a9 +Function48a9: call Function468a call Function771e jr c, Function48d4 @@ -1236,7 +1236,7 @@ Function48a9: ; 01:48a9 ld [hl], $06 jp Function4baa -Function48c6: ; 01:48c6 +Function48c6: ld hl, $0008 add hl, bc ld [hl], $05 @@ -1244,11 +1244,11 @@ Function48c6: ; 01:48c6 set 7, [hl] jp Function4bc9 -Function48d4: ; 01:48d4 +Function48d4: call Function4678 call Function45fe -Function48da: ; 01:48da +Function48da: ld hl, $0006 add hl, bc ld [hl], $ff @@ -1263,7 +1263,7 @@ Function48da: ; 01:48da ld [hl], a jp Function4b65 -Function48f5: ; 01:48f5 +Function48f5: ld hl, $0008 add hl, bc ld [hl], $01 @@ -1296,7 +1296,7 @@ Function48f5: ; 01:48f5 call Function45fe ret -Function4930: ; 01:4930 +Function4930: ld a, [wPlayerNextMapX] ld d, a ld a, [wPlayerNextMapY] @@ -1348,10 +1348,10 @@ Function4930: ; 01:4930 cpl ret -Function4979: ; 01:4979 +Function4979: ret -Function497a: ; 01:497a +Function497a: ld hl, $001e add hl, bc inc [hl] @@ -1369,11 +1369,11 @@ Function497a: ; 01:497a ld [hl], a ret -Table4994: ; 01:4994 +Table4994: db $00, $FF, $FE, $FD db $FC, $FD, $FE, $FF -Function499c: ; 01:499c +Function499c: call Function46f9 ld hl, $001f add hl, bc @@ -1412,7 +1412,7 @@ Function499c: ; 01:499c ld [hl], $02 ret -Unknown49dc: ; 01:49dc +Unknown49dc: db $FC, $FB, $FA, $F9 db $F8, $F7, $F6, $F5 db $F5, $F5, $F4, $F4 @@ -1422,23 +1422,23 @@ Unknown49dc: ; 01:49dc db $FA, $FB, $FC, $FE db $FF, $00, $00, $00 -Function49fc: ; 01:49fc +Function49fc: ld hl, $0008 add hl, bc ld [hl], $11 call Function4792 -Function4a05: ; 01:4a05 +Function4a05: ld de, Table4a0b jp Function47ab -Table4a0b: ; 01:4a0b +Table4a0b: dw Function4a13 dw Function4a28 dw Function4a38 dw Function4a53 -Function4a13: ; 01:4a13 +Function4a13: ld hl, $001e add hl, bc ld [hl], $04 @@ -1450,7 +1450,7 @@ Function4a13: ; 01:4a13 ld [hl], $10 call Function4799 -Function4a28: ; 01:4a28 +Function4a28: ld hl, $000a add hl, bc ld [hl], $03 @@ -1461,7 +1461,7 @@ Function4a28: ; 01:4a28 call Function4799 ret -Function4a38: ; 01:4a38 +Function4a38: ld hl, $001e add hl, bc ld [hl], $04 @@ -1476,7 +1476,7 @@ Function4a38: ; 01:4a38 ld [hl], $10 call Function4799 -Function4a53: ; 01:4a53 +Function4a53: ld hl, $000a add hl, bc ld [hl], $03 @@ -1504,17 +1504,17 @@ Function4a53: ; 01:4a53 call Function4792 ret -Function4a82: ; 01:4a82 +Function4a82: ld hl, $0008 add hl, bc ld [hl], $12 call Function4792 -Function4a8b: ; 01:4a8b +Function4a8b: ld de, Table4a91 jp Function47ab -Table4a91: ; 01:4a91 +Table4a91: dw Function4a9f dw Function4aaf dw Function4ab8 @@ -1523,7 +1523,7 @@ Table4a91: ; 01:4a91 dw Function4b00 dw Function4b0c -Function4a9f: ; 01:4a9f +Function4a9f: ld hl, $000a add hl, bc ld [hl], $00 @@ -1533,14 +1533,14 @@ Function4a9f: ; 01:4a9f call Function4799 ret -Function4aaf: ; 01:4aaf +Function4aaf: ld hl, $0009 add hl, bc dec [hl] ret nz call Function4799 -Function4ab8: ; 01:4ab8 +Function4ab8: ld hl, $000b add hl, bc ld [hl], $00 @@ -1556,7 +1556,7 @@ Function4ab8: ; 01:4ab8 call Function4799 ret -Function4ad4: ; 01:4ad4 +Function4ad4: ld hl, $000a add hl, bc ld [hl], $03 @@ -1577,14 +1577,14 @@ Function4ad4: ; 01:4ad4 ret nz call Function4799 -Function4af6: ; 01:4af6 +Function4af6: ld hl, $0009 add hl, bc ld [hl], $10 call Function4799 ret -Function4b00: ; 01:4b00 +Function4b00: ld hl, $000a add hl, bc ld [hl], $03 @@ -1593,7 +1593,7 @@ Function4b00: ; 01:4b00 dec [hl] ret nz -Function4b0c: ; 01:4b0c +Function4b0c: ld hl, $0008 add hl, bc ld [hl], $01 @@ -1606,13 +1606,13 @@ Function4b0c: ; 01:4b0c call Function4792 ret -Function4b22: ; 01:4b22 +Function4b22: call Function4792 -Function4b25: ; 01:4b25 +Function4b25: ret -Function4b26: ; 01:4b26 +Function4b26: ld a, $01 ld [wcb70], a push bc @@ -1631,10 +1631,10 @@ Function4b26: ; 01:4b26 ld [hl], a ret -Unknown4b42: ; 01:4b42 +Unknown4b42: db $01, $01, $FC, $02, $00, $08 -Function4b48: ; 01:4b48 +Function4b48: ld e, a add a add e @@ -1651,10 +1651,10 @@ Function4b48: ; 01:4b48 ld [wcb70], a ret -Unknown4b5f: ; 01:4b5f +Unknown4b5f: db $05, $04, $FC, $02, $02, $08 -Function4b65: ; 01:4b65 +Function4b65: ld hl, $000a add hl, bc ld [hl], $02 @@ -1667,7 +1667,7 @@ Function4b65: ; 01:4b65 ld [hl], $01 ret -Function4b78: ; 01:4b78 +Function4b78: call Function4979 ld hl, $000a add hl, bc @@ -1677,7 +1677,7 @@ Function4b78: ; 01:4b78 ld [hl], $ff ret -Function4b88: ; 01:4b88 +Function4b88: call Function4979 ld hl, $000a add hl, bc @@ -1696,7 +1696,7 @@ Function4b88: ; 01:4b88 ld [hl], $ff ret -Function4baa: ; 01:4baa +Function4baa: ld hl, $000a add hl, bc ld [hl], $01 @@ -1714,7 +1714,7 @@ Function4baa: ; 01:4baa ld [hl], $01 ret -Function4bc9: ; 01:4bc9 +Function4bc9: ld hl, $000a add hl, bc ld [hl], $01 @@ -1734,15 +1734,15 @@ Function4bc9: ; 01:4bc9 ld [hl], $ff ret -Function4bed: ; 01:4bed +Function4bed: ld a, [wPlayerMovement] jp Function4c37 -Function4bf3: ; 01:4bf3 +Function4bf3: ld a, [wMovementObject] jp Function4c37 -Function4bf9: ; 01:4bf9 +Function4bf9: ld hl, $001c add hl, bc ld e, [hl] @@ -1756,7 +1756,7 @@ Function4bf9: ; 01:4bf9 ld a, [hl] jp Function4c37 -Function4c0c: ; 01:4c0c +Function4c0c: ld hl, $001c add hl, bc ld e, [hl] @@ -1770,7 +1770,7 @@ Function4c0c: ; 01:4c0c ld a, [hl] jp Function4c37 -Function4c1f: ; 01:4c1f +Function4c1f: ld hl, $001c add hl, bc ld e, [hl] @@ -1785,7 +1785,7 @@ Function4c1f: ; 01:4c1f call GetFarByte jp Function4c37 -Function4c37: ; 01:4c37 +Function4c37: push af call Function4f86 pop af @@ -1799,7 +1799,7 @@ Function4c37: ; 01:4c37 ld l, a jp hl -Table4c48: ; 01:4c48 +Table4c48: dw Function4d94 dw Function4d98 dw Function4d9c @@ -1857,13 +1857,13 @@ Table4c48: ; 01:4c48 dw Function49fc dw Function4a82 -Function4cb8: ; 01:4cb8 +Function4cb8: ld hl, $001c add hl, bc ld [hl], $00 jp Function47b8 -Function4cc1: ; 01:4cc1 +Function4cc1: ld hl, $0001 add hl, bc ld a, [hl] @@ -1892,7 +1892,7 @@ Function4cc1: ; 01:4cc1 res 7, [hl] ret -Function4cef: ; 01:4cef +Function4cef: push bc ld hl, $0001 add hl, bc @@ -1919,7 +1919,7 @@ Function4cef: ; 01:4cef res 7, [hl] ret -Function4d1a: ; 01:4d1a +Function4d1a: ld hl, $000a add hl, bc ld [hl], $02 @@ -1930,38 +1930,38 @@ Function4d1a: ; 01:4d1a res 7, [hl] ret -Function4d2c: ; 01:4d2c +Function4d2c: ld a, $01 jr Function4d4a -Function4d30: ; 01:4d30 +Function4d30: ld a, $02 jr Function4d4a -Function4d34: ; 01:4d34 +Function4d34: ld a, $03 jr Function4d4a -Function4d38: ; 01:4d38 +Function4d38: ld a, $04 jr Function4d4a -Function4d3c: ; 01:4d3c +Function4d3c: ld a, $05 jr Function4d4a -Function4d40: ; 01:4d40 +Function4d40: ld a, $06 jr Function4d4a -Function4d44: ; 01:4d44 +Function4d44: ld a, $07 jr Function4d4a -Function4d48: ; 01:4d48 +Function4d48: ld a, $08 -Function4d4a: ; 01:4d4a +Function4d4a: ld hl, $0009 add hl, bc ld [hl], a @@ -1973,59 +1973,59 @@ Function4d4a: ; 01:4d4a ld [hl], $ff jp Function4b65 -Function4d5e: ; 01:4d5e +Function4d5e: ld hl, $0004 add hl, bc res 3, [hl] jp Function47b8 -Function4d67: ; 01:4d67 +Function4d67: ld hl, $0004 add hl, bc set 3, [hl] jp Function47b8 -Function4d70: ; 01:4d70 +Function4d70: ld hl, $0004 add hl, bc res 2, [hl] jp Function47b8 -Function4d79: ; 01:4d79 +Function4d79: ld hl, $0004 add hl, bc set 2, [hl] jp Function47b8 -Function4d82: ; 01:4d82 +Function4d82: ld hl, $0005 add hl, bc res 0, [hl] jp Function47b8 -Function4d8b: ; 01:4d8b +Function4d8b: ld hl, $0005 add hl, bc set 0, [hl] jp Function47b8 -Function4d94: ; 01:4d94 +Function4d94: ld a, $00 jr Function4da4 -Function4d98: ; 01:4d98 +Function4d98: ld a, $04 jr Function4da4 -Function4d9c: ; 01:4d9c +Function4d9c: ld a, $08 jr Function4da4 -Function4da0: ; 01:4da0 +Function4da0: ld a, $0c jr Function4da4 -Function4da4: ; 01:4da4 +Function4da4: ld hl, $0007 add hl, bc ld [hl], a @@ -2037,135 +2037,135 @@ Function4da4: ; 01:4da4 ld [hl], $ff ret -Function4db6: ; 01:4db6 +Function4db6: ld a, $00 jp Function4e56 -Function4dbb: ; 01:4dbb +Function4dbb: ld a, $01 jp Function4e56 -Function4dc0: ; 01:4dc0 +Function4dc0: ld a, $02 jp Function4e56 -Function4dc5: ; 01:4dc5 +Function4dc5: ld a, $03 jp Function4e56 -Function4dca: ; 01:4dca +Function4dca: ld a, $04 jp Function4e56 -Function4dcf: ; 01:4dcf +Function4dcf: ld a, $05 jp Function4e56 -Function4dd4: ; 01:4dd4 +Function4dd4: ld a, $06 jp Function4e56 -Function4dd9: ; 01:4dd9 +Function4dd9: ld a, $07 jp Function4e56 -Function4dde: ; 01:4dde +Function4dde: ld a, $08 jp Function4e56 -Function4de3: ; 01:4de3 +Function4de3: ld a, $09 jp Function4e56 -Function4de8: ; 01:4de8 +Function4de8: ld a, $0a jp Function4e56 -Function4ded: ; 01:4ded +Function4ded: ld a, $0b jp Function4e56 -Function4df2: ; 01:4df2 +Function4df2: ld a, $0c jp Function4e56 -Function4df7: ; 01:4df7 +Function4df7: ld a, $0d jp Function4e56 -Function4dfc: ; 01:4dfc +Function4dfc: ld a, $0e jp Function4e56 -Function4e01: ; 01:4e01 +Function4e01: ld a, $0f jp Function4e56 -Function4e06: ; 01:4e06 +Function4e06: ld a, $00 jp Function4e7c -Function4e0b: ; 01:4e0b +Function4e0b: ld a, $01 jp Function4e7c -Function4e10: ; 01:4e10 +Function4e10: ld a, $02 jp Function4e7c -Function4e15: ; 01:4e15 +Function4e15: ld a, $03 jp Function4e7c -Function4e1a: ; 01:4e1a +Function4e1a: ld a, $04 jp Function4e7c -Function4e1f: ; 01:4e1f +Function4e1f: ld a, $05 jp Function4e7c -Function4e24: ; 01:4e24 +Function4e24: ld a, $06 jp Function4e7c -Function4e29: ; 01:4e29 +Function4e29: ld a, $07 jp Function4e7c -Function4e2e: ; 01:4e2e +Function4e2e: ld a, $08 jp Function4e7c -Function4e33: ; 01:4e33 +Function4e33: ld a, $09 jp Function4e7c -Function4e38: ; 01:4e38 +Function4e38: ld a, $0a jp Function4e7c -Function4e3d: ; 01:4e3d +Function4e3d: ld a, $0b jp Function4e7c -Function4e42: ; 01:4e42 +Function4e42: ld a, $0c jp Function4e7c -Function4e47: ; 01:4e47 +Function4e47: ld a, $0d jp Function4e7c -Function4e4c: ; 01:4e4c +Function4e4c: ld a, $0e jp Function4e7c -Function4e51: ; 01:4e51 +Function4e51: ld a, $0f jp Function4e7c -Function4e56: ; 01:4e56 +Function4e56: call Function468a call Function4613 ld a, [wCenteredObject] @@ -2185,7 +2185,7 @@ Function4e56: ; 01:4e56 ld [hl], $05 jp Function4bc9 -Function4e7c: ; 01:4e7c +Function4e7c: call Function468a ld hl, $001f add hl, bc @@ -2215,7 +2215,7 @@ Function4e7c: ; 01:4e7c ld [hl], $10 jp Function4f14 -Function4eb7: ; 01:4eb7 +Function4eb7: call Function468a ld hl, $0008 add hl, bc @@ -2231,15 +2231,15 @@ Function4eb7: ; 01:4eb7 ld [hl], $00 call Function4792 -Function4ed5: ; 01:4ed5 +Function4ed5: ld de, Table4edb jp Function47ab -Table4edb: ; 01:4edb +Table4edb: dw Function4edf dw Function4efb -Function4edf: ; 01:4edf +Function4edf: call Function46d3 call Function499c ld hl, $0009 @@ -2254,7 +2254,7 @@ Function4edf: ; 01:4edf res 3, [hl] ret -Function4efb: ; 01:4efb +Function4efb: call Function46d3 call Function499c ld hl, $0009 @@ -2268,16 +2268,16 @@ Function4efb: ; 01:4efb call Function4792 ret -Function4f14: ; 01:4f14 +Function4f14: ld de, Table4f1a jp Function47ab -Table4f1a: ; 01:4f1a +Table4f1a: dw Function4f20 dw Function4f40 dw Function4f4b -Function4f20: ; 01:4f20 +Function4f20: call Function499c call Function4750 ld hl, $0009 @@ -2294,13 +2294,13 @@ Function4f20: ; 01:4f20 call Function4799 ret -Function4f40: ; 01:4f40 +Function4f40: call Function46a2 ld hl, wcb6e set 7, [hl] call Function4799 -Function4f4b: ; 01:4f4b +Function4f4b: call Function499c call Function4750 ld hl, $0009 @@ -2334,7 +2334,7 @@ Function4f4b: ; 01:4f4b ret z jp Function4b25 -Function4f86: ; 01:4f86 +Function4f86: ld e, a ld a, [wObjectFollow_Follower] and a @@ -2372,7 +2372,7 @@ Function4f86: ; 01:4f86 ld [hl], a ret -Function4fbc: ; 01:4fbc +Function4fbc: call .sub_4fc5 ld hl, Table4c48 jp CallJumptable @@ -2423,7 +2423,7 @@ Function4fbc: ; 01:4fbc scf ret -Function5007: ; 01:5007 +Function5007: ld bc, wObjectStructs xor a .sub_500b @@ -2542,7 +2542,7 @@ Function5007: ; 01:5007 scf ret -Function50b9: ; 01:50b9 +Function50b9: call .sub_50c3 call .sub_50d3 call Function42db @@ -2671,7 +2671,7 @@ Function50b9: ; 01:50b9 pop bc ret -_UpdateSprites: ; 01:5190 +_UpdateSprites: ld a, [wVramState] bit 0, a ret z @@ -2900,7 +2900,7 @@ _UpdateSprites: ; 01:5190 pop af ret -Function52dc: ; 01:52dc +Function52dc: call MenuBoxCoord2Tile push hl ld de, $005a @@ -2919,7 +2919,7 @@ Function52dc: ; 01:52dc SECTION "engine/dumps/bank01.asm@Function5388", ROMX -Function5388: ; 01:5388 +Function5388: ld a, $00 call OpenSRAM ld a, [s0_a600] @@ -2927,7 +2927,7 @@ Function5388: ; 01:5388 call CloseSRAM ret -Function5397: ; 01:5397 +Function5397: ld a, $00 call OpenSRAM ld hl, s0_a600 @@ -2941,7 +2941,7 @@ Function5397: ; 01:5397 call CloseSRAM ret -Function53b0: ; 01:53b0 +Function53b0: ld a, $00 call OpenSRAM ld hl, wDebugFlags @@ -2958,7 +2958,7 @@ Function53b0: ; 01:53b0 SECTION "engine/dumps/bank01.asm@ReanchorBGMap_NoOAMUpdate", ROMX -ReanchorBGMap_NoOAMUpdate: ; 01:63d8 +ReanchorBGMap_NoOAMUpdate: xor a ldh [hLCDCPointer], a ld hl, wMapObjectsEnd @@ -3009,7 +3009,7 @@ ReanchorBGMap_NoOAMUpdate: ; 01:63d8 jr nz, .sub_6422 ret -LoadFonts_NoOAMUpdate: ; 01:6437 +LoadFonts_NoOAMUpdate: call UpdateSprites call LoadFont call LoadFontExtra @@ -3018,7 +3018,7 @@ LoadFonts_NoOAMUpdate: ; 01:6437 ret -Function6445: ; 01:6445 +Function6445: call BackUpTilesToBuffer ld a, [wWhichPokemon] ld hl, wPartyMonNicknames @@ -3183,78 +3183,78 @@ Function6445: ; 01:6445 scf ret -Text658c: ; 01:658c +Text658c: text_from_ram wcd11 text "は あたらしく" line "" text_end -Text6599: ; 01:6599 +Text6599: text_from_ram wStringBuffer2 text "を おぼえた！" text_end -Text65a5: ; 01:65a5 +Text65a5: sound_dex_fanfare_50_79 text_waitbutton text_end -Text65a8: ; 01:65a8 +Text65a8: text "どの わざを" next "わすれさせたい？" done -Text65b9: ; 01:65b9 +Text65b9: text "それでは<⋯⋯> " text_end -Text65c1: ; 01:65c1 +Text65c1: text_from_ram wStringBuffer2 text "を" line "おぼえるのを あきらめますか？" done -Text65d7: ; 01:65d7 +Text65d7: text_from_ram wcd11 text "は " text_end -Text65de: ; 01:65de +Text65de: text_from_ram wStringBuffer2 text "を" line "おぼえずに おわった！" prompt -Text65f0: ; 01:65f0 +Text65f0: text_from_ram wcd11 text "は あたらしく" line "" text_end -Text65fd: ; 01:65fd +Text65fd: text_from_ram wStringBuffer2 text "を おぼえたい<⋯⋯>！" para "しかし " text_end -Text6610: ; 01:6610 +Text6610: text_from_ram wcd11 text "は わざを ４つ" line "おぼえるので せいいっぱいだ！" para "" text_end -Text662e: ; 01:662e +Text662e: text_from_ram wStringBuffer2 text "の かわりに" line "ほかの わざを わすれさせますか？" done -Text664b: ; 01:664b +Text664b: text "１ ２の <⋯⋯>" text_end -Text6653: ; 01:6653 +Text6653: text_exit start_asm push de @@ -3264,34 +3264,34 @@ Text6653: ; 01:6653 ld hl, Text6661 ret -Text6661: ; 01:6661 +Text6661: text " ポカン！" text_end -Text6668: ; 01:6668 +Text6668: text_exit text "" para "" text_end -Text666c: ; 01:666c +Text666c: text_from_ram wcd11 text "は " text_end -Text6673: ; 01:6673 +Text6673: text_from_ram wStringBuffer1 text "の" line "つかいかたを きれいに わすれた！" para "そして<⋯⋯>！" prompt -Text6691: ; 01:6691 +Text6691: text "それは たいせつなわざです" line "わすれさせることは できません！" prompt -Function66b1: ; 01:66b1 +Function66b1: ld hl, wcd74 ld a, [hli] ld h, [hl] @@ -3341,7 +3341,7 @@ Function66b1: ; 01:66b1 ldh [hSpriteOffset], a ret -Table66fa: ; 01:66fa +Table66fa: db $32, $21, $34, $24 db $34, $21, $45, $55 db $32, $32, $55, $52 @@ -3350,7 +3350,7 @@ Table66fa: ; 01:66fa db $22, $52, $24, $34 db $42 -Function6713: ; 01:6713 +Function6713: push hl call LoadStandardMenuHeader ld a, [wBattleMode] @@ -3408,13 +3408,13 @@ Function6713: ; 01:6713 call CloseWindow ret -Text6788: ; 01:6788 +Text6788: text_from_ram wStringBuffer1 text "に" line "ニックネームを つけますか？" done -Function679d: ; 01:679d +Function679d: ld de, wFieldMoveScriptID push de ld hl, NamingScreen @@ -3443,7 +3443,7 @@ Function679d: ; 01:679d scf ret -CorrectNickErrors: ; 01:67d5 +CorrectNickErrors: push bc push de ld b, $06 @@ -3483,14 +3483,14 @@ CorrectNickErrors: ; 01:67d5 pop bc ret -Table6805:: ; 01:6805 +Table6805:: db $00, $05, $14, $19, $1d db $26, $35, $3a, $49, $7f db $ff SECTION "engine/dumps/bank01.asm@Function771e", ROMX -Function771e: ; 01:771e +Function771e: ld hl, $0004 add hl, bc bit 4, [hl] @@ -3525,7 +3525,7 @@ Function771e: ; 01:771e SECTION "engine/dumps/bank01.asm@Function776e", ROMX -Function776e: ; 01:776e +Function776e: call GetFacingTileCoord cp $90 jr z, .sub_7779 @@ -3561,7 +3561,7 @@ Function776e: ; 01:776e scf ret -Function77a1: ; 01:77a1 +Function77a1: ld hl, $0010 add hl, bc ld d, [hl] @@ -3570,7 +3570,7 @@ Function77a1: ; 01:77a1 ld e, [hl] jr _CheckObjectCollision -Function77ad: ; 01:77ad +Function77ad: ldh a, [hConnectionStripLength] call GetObjectStruct call .sub_77b9 @@ -3607,7 +3607,7 @@ Function77ad: ; 01:77ad SECTION "engine/dumps/bank01.asm@Function782c", ROMX -Function782c: ; 01:782c +Function782c: ld hl, $0016 add hl, bc ld a, [hl] @@ -3660,7 +3660,7 @@ Function782c: ; 01:782c scf ret -Function786e: ; 01:786e +Function786e: ld hl, $0010 add hl, bc ld a, [wXCoord] @@ -3689,16 +3689,16 @@ Function786e: ; 01:786e SECTION "engine/dumps/bank01.asm@SettingsScreen", ROMX -SettingsScreen: ; 01:78e5 +SettingsScreen: ld a, [wVramState] push af xor a ld [wVramState], a -Function78ed: ; 01:78ed +Function78ed: call Function7a93 -Function78f0: ; 01:78f0 +Function78f0: call Function7a41 ld [hl], $ed call Function7a55 @@ -3760,7 +3760,7 @@ Function78f0: ; 01:78f0 call LoadFontExtra jr Function78f0 -Function796a: ; 01:796a +Function796a: push af call Function7a41 ld [hl], $7f @@ -3768,7 +3768,7 @@ Function796a: ; 01:796a ld [wTileMapBackup], a jp Function78f0 -Function7977: ; 01:7977 +Function7977: ld a, [wc409] bit 7, b jr nz, .sub_799e @@ -3873,7 +3873,7 @@ Function7977: ; 01:7977 ld [wTileMapBackup], a jp Function78f0 -Function7a41: ; 01:7a41 +Function7a41: ld a, [wc409] ld hl, wTileMap ld bc, $0014 @@ -3884,7 +3884,7 @@ Function7a41: ; 01:7a41 add hl, bc ret -Function7a55: ; 01:7a55 +Function7a55: ld hl, Table7c22 ld a, [wc40a] ld c, a @@ -3927,7 +3927,7 @@ Function7a55: ; 01:7a55 ld [wce5f], a ret -Function7a93: ; 01:7a93 +Function7a93: call ClearBGPalettes call DisableLCD xor a @@ -4049,42 +4049,42 @@ Function7a93: ; 01:7a93 ld [hl], a ret -Text7bad: ; 01:7bad +Text7bad: db "はなしの はやさ" next " はやい ふつう おそい" text_end -Text7bc9: ; 01:7bc9 +Text7bc9: db "せんとう アニメーション" next " じっくり みる とばして みる" text_end -Text7be8: ; 01:7be8 +Text7be8: db "しあいの ルール" next " いれかえタイプ かちぬきタイプ" text_end -Text7c03: ; 01:7c03 +Text7c03: db " モノラル ステレオ" text_end -Text7c12: ; 01:7c12 +Text7c12: db " おわり" text_end -Text7c17: ; 01:7c17 +Text7c17: db " わく を かえる " text_end -Table7c22: ; 01:7c22 +Table7c22: db $0F -Table7c23: ; 01:7c23 +Table7c23: db $05, $08, $03 db $01, $01, $08 db $FF -Unknown7c2a: ; 01:7c2a +Unknown7c2a: rept 491 db $39, $00 endr diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index 5f373b6..94ecb7c 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank02.asm@Function8000", ROMX -Function8000: ; 02:4000 +Function8000: ld a, $00 ld hl, Data8022 call Function1656 @@ -18,11 +18,11 @@ Function8000: ; 02:4000 call Function1908 ret -Data8022: ; 02:4022 +Data8022: db $01, $00, $00, $10, $ee, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -Function8031: ; 02:4031 +Function8031: call Function8047 ld a, [wUsedSprites+1] ld [wMap1ObjectSprite], a @@ -33,7 +33,7 @@ Function8031: ; 02:4031 call StartFollow ret -Function8047: ; 02:4047 +Function8047: ld a, $01 ld hl, Data805d call Function1656 @@ -44,11 +44,11 @@ Function8047: ; 02:4047 ld [wMap1ObjectYCoord], a ret -Data805d: ; 02:405d +Data805d: db $4d, $00, $00, $18, $ff, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -Function806c: ; 02:406c +Function806c: ld a, $01 call Function169f xor a @@ -57,7 +57,7 @@ Function806c: ; 02:406c ld [wObjectFollow_Leader], a ret -Function807b: ; 02:407b +Function807b: ld a, $01 ld hl, Data8089 call Function1656 @@ -65,11 +65,11 @@ Function807b: ; 02:407b call Function1668 ret -Data8089: ; 02:4089 +Data8089: db $01, $00, $00, $17, $ee, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00 -_InitializeVisibleSprites: ; 02:4098 +_InitializeVisibleSprites: ld bc, wMap2Object ld a, $02 .sub_809d @@ -119,10 +119,10 @@ _InitializeVisibleSprites: ; 02:4098 jr nz, .sub_809d ret -Function80ea: ; 02:40ea +Function80ea: ret -Function80eb: ; 02:40eb +Function80eb: call Function811a and a ret nz @@ -153,7 +153,7 @@ Function80eb: ; 02:40eb set 5, [hl] ret -Function811a: ; 02:411a +Function811a: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -162,7 +162,7 @@ Function811a: ; 02:411a ld a, [hl] ret -Function8125: ; 02:4125 +Function8125: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -171,7 +171,7 @@ Function8125: ; 02:4125 ld [hl], $ff ret -Function8131: ; 02:4131 +Function8131: ldh a, [hConnectionStripLength] ld e, a ld d, $00 @@ -180,7 +180,7 @@ Function8131: ; 02:4131 ld [hl], $00 ret -Function813d: ; 02:413d +Function813d: ldh a, [hConnectionStripLength] ld hl, $0001 add hl, de @@ -263,7 +263,7 @@ Function813d: ; 02:413d and a ret -Function81ce: ; 02:41ce +Function81ce: ld hl, $0004 add hl, de ld [hl], $70 @@ -291,7 +291,7 @@ Function81ce: ; 02:41ce set 4, [hl] ret -Function81f8: ; 02:41f8 +Function81f8: push af swap a and $0f @@ -307,7 +307,7 @@ Function81f8: ; 02:41f8 ld [hl], a ret -Function820d: ; 02:420d +Function820d: push af ldh a, [hConnectionStripLength] cp $00 @@ -349,11 +349,11 @@ Function820d: ; 02:420d pop hl ret -Data8242: ; 02:4242 +Data8242: db $18, $24, $30, $3c, $48, $54, $60, $6c db $78, $7c -Function824c: ; 02:424c +Function824c: nop ld a, [wPlayerStepDirection] cp $ff @@ -361,58 +361,58 @@ Function824c: ; 02:424c ld hl, Table8259 jp CallJumptable -Table8259: ; 02:4259 +Table8259: dw Function8299 dw Function8292 dw Function82e6 dw Function82ed -Function8261: ; 02:4261 +Function8261: ret -Function8262: ; 02:4262 +Function8262: ld a, [wPlayerStepDirection] cp $ff ret z ld hl, Table826e jp CallJumptable -Table826e: ; 02:426e +Table826e: dw Function827d dw Function8276 dw Function8284 dw Function828b -Function8276: ; 02:4276 +Function8276: ld a, [wYCoord] sub $02 jr Function829e -Function827d: ; 02:427d +Function827d: ld a, [wYCoord] add $0a jr Function829e -Function8284: ; 02:4284 +Function8284: ld a, [wXCoord] sub $02 jr Function82f2 -Function828b: ; 02:428b +Function828b: ld a, [wXCoord] add $0b jr Function82f2 -Function8292: ; 02:4292 +Function8292: ld a, [wYCoord] sub $01 jr Function829e -Function8299: ; 02:4299 +Function8299: ld a, [wYCoord] add $09 -Function829e: ; 02:429e +Function829e: ld d, a ld a, [wXCoord] ld e, a @@ -459,16 +459,16 @@ Function829e: ; 02:429e jr nz, .sub_82a8 ret -Function82e6: ; 02:42e6 +Function82e6: ld a, [wXCoord] sub $01 jr Function82f2 -Function82ed: ; 02:42ed +Function82ed: ld a, [wXCoord] add $0a -Function82f2: ; 02:42f2 +Function82f2: ld e, a ld a, [wYCoord] ld d, a @@ -515,7 +515,7 @@ Function82f2: ; 02:42f2 jr nz, .sub_82fc ret -Function833a: ; 02:433a +Function833a: ld a, c push af call InitMovementBuffer @@ -555,7 +555,7 @@ Function833a: ; 02:433a xor a ret -Function837c: ; 02:437c +Function837c: call InitMovementBuffer push bc ld a, b @@ -578,7 +578,7 @@ Function837c: ; 02:437c call AppendToMovementBuffer ret -Function83a2: ; 02:43a2 +Function83a2: push de call InitMovementBuffer pop de @@ -587,7 +587,7 @@ Function83a2: ; 02:43a2 call AppendToMovementBuffer ret -Function83b0: ; 02:43b0 +Function83b0: push de push bc ld a, c @@ -623,7 +623,7 @@ Function83b0: ; 02:43b0 call ComputePathToWalkToPlayer ret -Function83e8: ; 02:43e8 +Function83e8: ld hl, wcb70 push hl ld a, [hl] @@ -639,7 +639,7 @@ Function83e8: ; 02:43e8 push de ret -Table83fb: ; 02:43fb +Table83fb: dw Function8432 dw Function844a dw Function8459 @@ -656,7 +656,7 @@ Table83fb: ; 02:43fb dw Function84af dw Function84b8 -Function8419: ; 02:4419 +Function8419: ld a, c ld [wVBCopyFarSrcBank], a ld a, l @@ -664,38 +664,38 @@ Function8419: ; 02:4419 ld a, h ld [wVBCopyFarSrc+1], a -Function8425: ; 02:4425 +Function8425: ld a, e ld [wVBCopyFarDst], a ld a, d ld [wVBCopyFarDst+1], a -Function842d: ; 02:442d +Function842d: ld a, b ld [wVBCopyFarSize], a ret -Function8432: ; 02:4432 +Function8432: ret -Function8433: ; 02:4433 +Function8433: ld hl, ShockEmoteGFX jr Function8440 -Function8438: ; 02:4438 +Function8438: ld hl, QuestionEmoteGFX jr Function8440 -Function843d: ; 02:443d +Function843d: ld hl, HappyEmoteGFX -Function8440: ; 02:4440 +Function8440: ld de, vChars1 + $780 ld b, $04 ld c, BANK(HappyEmoteGFX) jp Function8419 -Function844a: ; 02:444a +Function844a: ld [hl], $00 ld hl, JumpShadowGFX ld de, vChars1 + $7c0 @@ -703,7 +703,7 @@ Function844a: ; 02:444a ld c, BANK(JumpShadowGFX) jp Function8419 -Function8459: ; 02:4459 +Function8459: ld [hl], $00 ld hl, UnknownBouncingOrbGFX ld de, vChars1 + $7c0 @@ -711,7 +711,7 @@ Function8459: ; 02:4459 ld c, BANK(UnknownBouncingOrbGFX) jp Function8419 -Function8468: ; 02:4468 +Function8468: ld [hl], $00 ld hl, UnknownBallGFX ld de, vChars1 + $7c0 @@ -719,7 +719,7 @@ Function8468: ; 02:4468 ld c, BANK(UnknownBallGFX) jp Function8419 -Function8477: ; 02:4477 +Function8477: inc [hl] ld hl, GrampsSpriteGFX ld de, vChars0 @@ -727,23 +727,23 @@ Function8477: ; 02:4477 ld c, BANK(GrampsSpriteGFX) jp Function8419 -Function8485: ; 02:4485 +Function8485: inc [hl] ld b, $06 jp Function842d -Function848b: ; 02:448b +Function848b: inc [hl] ld de, vChars1 ld b, $06 jp Function8425 -Function8494: ; 02:4494 +Function8494: ld [hl], $00 ld b, $06 jp Function842d -Function849b: ; 02:449b +Function849b: inc [hl] ld hl, PippiSpriteGFX ld de, vChars0 @@ -751,25 +751,25 @@ Function849b: ; 02:449b ld c, BANK(PippiSpriteGFX) jp Function8419 -Function84a9: ; 02:44a9 +Function84a9: inc [hl] ld b, $06 jp Function842d -Function84af: ; 02:44af +Function84af: inc [hl] ld de, vChars1 ld b, $06 jp Function8425 -Function84b8: ; 02:44b8 +Function84b8: ld [hl], $00 ld b, $06 jp Function842d SECTION "engine/dumps/bank02.asm@QueueFollowerFirstStep", ROMX -QueueFollowerFirstStep: ; 02:45df +QueueFollowerFirstStep: call Function85f2 jr c, .sub_85ec ld [wFollowMovementQueue], a @@ -781,7 +781,7 @@ QueueFollowerFirstStep: ; 02:45df ld [wFollowerMovementQueueLength], a ret -Function85f2: ; 02:45f2 +Function85f2: ld a, [wObjectFollow_Leader] call GetObjectStruct ld hl, $0010 @@ -823,7 +823,7 @@ Function85f2: ; 02:45f2 scf ret -Function862e: ; 02:462e +Function862e: ld a, e and $3f cp $20 @@ -839,7 +839,7 @@ Function862e: ; 02:462e inc a ret -Function8644: ; 02:4644 +Function8644: ld e, a ld a, d ld d, $00 @@ -861,7 +861,7 @@ Function8644: ; 02:4644 jr nz, .sub_8653 ret -Data8660: ; 02:4660 +Data8660: dw $00 dw $19 dw $32 @@ -895,7 +895,7 @@ Data8660: ; 02:4660 dw $32 dw $19 -Function86a0: ; 02:46a0 +Function86a0: call Function881e ld hl, InitEffectObject ld a, BANK(InitEffectObject) @@ -915,7 +915,7 @@ Function86a0: ; 02:46a0 jr z, .sub_86b4 ret -FlyMap: ; 02:46cb +FlyMap: ld hl, hJoyDebounceSrc ld a, [hl] push af @@ -980,7 +980,7 @@ FlyMap: ; 02:46cb ldh [hJoyDebounceSrc], a ret -Function8747: ; 02:4747 +Function8747: ld a, [wFlyDestination] ld l, a ld h, $00 @@ -1012,10 +1012,10 @@ Function8747: ; 02:4747 ld [wFlyDestination], a ret -Text8776: ; 02:4776 +Text8776: db "とびさき を えらんでください@" -Function8786: ; 02:4786 +Function8786: ld a, [wFlyDestination] push af xor a @@ -1057,10 +1057,10 @@ Function8786: ; 02:4786 ld [wFlyDestination], a ret -Text87e4: ; 02:47e4 +Text87e4: db "の すみか@" -Function87ea: ; 02:47ea +Function87ea: ld a, [wFlyDestination] and $10 jr z, .sub_881a @@ -1099,7 +1099,7 @@ Function87ea: ; 02:47ea call ClearSprites ret -Function881e: ; 02:481e +Function881e: call ClearBGPalettes call ClearTileMap call UpdateSprites @@ -1122,7 +1122,7 @@ Function881e: ; 02:481e call GetSGBLayout ret -DecompTownMapTilemap: ; 02:4856 +DecompTownMapTilemap: ld de, TownMapTilemap .sub_8859 ld a, [de] @@ -1141,7 +1141,7 @@ DecompTownMapTilemap: ; 02:4856 inc de jr .sub_8859 -Function886a: ; 02:486a +Function886a: ld de, GoldSpriteGFX ld hl, vChars0 lb bc, BANK(GoldSpriteGFX), $04 @@ -1179,7 +1179,7 @@ Function886a: ; 02:486a ld [hl], d ret -Function88b3: ; 02:48b3 +Function88b3: ld de, PoppoSpriteGFX ld hl, vChars0 + $80 lb bc, BANK(PoppoSpriteGFX), $04 @@ -1196,7 +1196,7 @@ Function88b3: ; 02:48b3 ld [hl], $08 ret -TownMapTilemap: ; 02:48da +TownMapTilemap: db $04, $05 db $19, $01 db $1a, $08 @@ -1355,7 +1355,7 @@ TownMapTilemap: ; 02:48da SECTION "engine/dumps/bank02.asm@Data8a17", ROMX -Data8a17: ; 02:4a17 +Data8a17: db $0b db $ff @@ -1393,7 +1393,7 @@ Data8a17: ; 02:4a17 db $08, $08 db $ff -Data8a53: ; 02:4a53 +Data8a53: db $00, $00, $1c, $9c, $28, $9c, $34, $9c db $40, $9c, $4c, $9c, $5c, $9c, $6c, $94 db $6c, $84, $6c, $78, $6c, $6c, $64, $6c @@ -1406,7 +1406,7 @@ Data8a53: ; 02:4a53 db $3c, $14, $3c, $20, $48, $14, $54, $1c db $54, $2c, $54, $38, $3c, $44, $48, $2c -OpenTrainerGear: ; 02:4aab +OpenTrainerGear: ld hl, wce5f ld a, [hl] push af @@ -1437,7 +1437,7 @@ OpenTrainerGear: ; 02:4aab call ClearJoypad ret -Function8ae0: ; 02:4ae0 +Function8ae0: call ClearBGPalettes call DisableLCD call ClearSprites @@ -1469,7 +1469,7 @@ Function8ae0: ; 02:4ae0 ldh [rOBP1], a ret -Function8b2a: ; 02:4b2a +Function8b2a: ld hl, wTileMap ld bc, $0168 ld a, $7f @@ -1480,7 +1480,7 @@ Function8b2a: ; 02:4b2a call CopyBytes ret -Data8b42: ; 02:4b42 +Data8b42: db $0d, $1c, $1d, $0b, $1c, $1d, $0b, $1c db $1d, $0c, $01, $05, $05, $05, $05, $05 db $05, $05, $05, $02, $08, $1e, $1f, $0a @@ -1490,7 +1490,7 @@ Data8b42: ; 02:4b42 db $06, $04, $03, $06, $06, $06, $06, $06 db $06, $06, $06, $04 -Function8b7e: ; 02:4b7e +Function8b7e: coord hl, 1, 0 ld a, $10 call Function8b97 @@ -1502,7 +1502,7 @@ Function8b7e: ; 02:4b7e call Function8b97 ret -Function8b97: ; 02:4b97 +Function8b97: ld [hli], a inc a ld [hld], a @@ -1514,7 +1514,7 @@ Function8b97: ; 02:4b97 ld [hld], a ret -Function8ba3: ; 02:4ba3 +Function8ba3: call UpdateTime call GetJoypadDebounced ld a, [wJumptableIndex] @@ -1539,7 +1539,7 @@ Function8ba3: ; 02:4ba3 scf ret -Function8bd5: ; 02:4bd5 +Function8bd5: coord hl, 11, 1 ld a, $7f ld [hli], a @@ -1558,7 +1558,7 @@ Function8bd5: ; 02:4bd5 call PrintNumber ret -Function8bfd: ; 02:4bfd +Function8bfd: ld a, [wJumptableIndex] ld e, a ld d, $00 @@ -1570,7 +1570,7 @@ Function8bfd: ; 02:4bfd ld l, a jp hl -Table8c0c: ; 02:4c0c +Table8c0c: dw Function8c21 dw Function8c49 dw DrawMap @@ -1580,12 +1580,12 @@ Table8c0c: ; 02:4c0c dw Function8e6c dw Function8e9e -Function8c1c: ; 02:4c1c +Function8c1c: ld hl, wJumptableIndex inc [hl] ret -Function8c21: ; 02:4c21 +Function8c21: ld hl, InitEffectObject ld a, BANK(InitEffectObject) call FarCall_hl @@ -1603,7 +1603,7 @@ Function8c21: ; 02:4c21 call Function8c1c ret -Function8c49: ; 02:4c49 +Function8c49: ld hl, hJoySum ld a, [hl] and $02 @@ -1618,7 +1618,7 @@ Function8c49: ; 02:4c49 set 7, [hl] ret -Function8c5f: ; 02:4c5f +Function8c5f: ld a, [wFlyDestination] ld hl, wcb60 cp [hl] @@ -1633,10 +1633,10 @@ Function8c5f: ; 02:4c5f ld [wJumptableIndex], a ret -Unknown8c78: ; 02:4c78 +Unknown8c78: db $02, $04, $06, $02 -DrawMap: ; 02:4c7c +DrawMap: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1657,7 +1657,7 @@ DrawMap: ; 02:4c7c ld [hl], a ret -Function8cab: ; 02:4cab +Function8cab: ld hl, hJoyDown ld a, [hl] and $02 @@ -1666,7 +1666,7 @@ Function8cab: ; 02:4cab ld [wJumptableIndex], a ret -Function8cb7: ; 02:4cb7 +Function8cb7: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1741,7 +1741,7 @@ Function8cb7: ; 02:4cb7 ld [wcb61], a ret -Function8d62: ; 02:4d62 +Function8d62: ld hl, hJoyDown ld a, [hl] and $02 @@ -1750,7 +1750,7 @@ Function8d62: ; 02:4d62 ld [wJumptableIndex], a ret -Function8d6e: ; 02:4d6e +Function8d6e: ld hl, wcb61 ld e, [hl] ld d, $00 @@ -1762,13 +1762,13 @@ Function8d6e: ; 02:4d6e ld l, a jp hl -Table8d7d: ; 02:4d7d +Table8d7d: dw Function8d85 dw Function8d91 dw Function8d85 dw Function8db9 -Function8d85: ; 02:4d85 +Function8d85: ld hl, hJoyDown ld a, [hl] and $01 @@ -1777,7 +1777,7 @@ Function8d85: ; 02:4d85 inc [hl] ret -Function8d91: ; 02:4d91 +Function8d91: ld hl, $000c add hl, bc ld a, [hl] @@ -1803,7 +1803,7 @@ Function8d91: ; 02:4d91 ld [wcb61], a ret -Function8db9: ; 02:4db9 +Function8db9: ld hl, $000c add hl, bc ld a, [hl] @@ -1829,7 +1829,7 @@ Function8db9: ; 02:4db9 ld [wcb61], a ret -Function8de3: ; 02:4de3 +Function8de3: push hl ld hl, $0006 add hl, bc @@ -1849,7 +1849,7 @@ Function8de3: ; 02:4de3 ld [hl], d ret -Function8dfd: ; 02:4dfd +Function8dfd: ld hl, $0006 add hl, bc push bc @@ -1887,12 +1887,12 @@ Function8dfd: ; 02:4dfd ld l, a jp hl -Function8e2c: ; 02:4e2c +Function8e2c: pop bc scf ret -Table8e2f: ; 02:4e2f +Table8e2f: dw Data8e4d dw Data8e4d dw Data8e4d @@ -1909,7 +1909,7 @@ Table8e2f: ; 02:4e2f dw Data8e4d dw Data8e4d -Data8e4d: ; 02:4e4d +Data8e4d: db $10, $02 dw Function8e66 dw Function8e66 @@ -1928,12 +1928,12 @@ Data8e4d: ; 02:4e4d db $00 -Function8e66: ; 02:4e66 +Function8e66: ld d, $00 call PlayMusic ret -Function8e6c: ; 02:4e6c +Function8e6c: call Function8c1c call Function8eaa call WaitForAutoBgMapTransfer @@ -1948,14 +1948,14 @@ Function8e6c: ; 02:4e6c call WaitBGMap ret -Text8e90: ; 02:4e90 +Text8e90: db "けんがい@" -Text8e95: ; 02:4e95 +Text8e95: text "ちぇっ⋯⋯⋯⋯" done -Function8e9e: ; 02:4e9e +Function8e9e: ld hl, hJoyDown ld a, [hl] and $02 @@ -1964,7 +1964,7 @@ Function8e9e: ; 02:4e9e ld [wJumptableIndex], a ret -Function8eaa: ; 02:4eaa +Function8eaa: ld hl, InitEffectObject ld a, BANK(InitEffectObject) call FarCall_hl @@ -1978,7 +1978,7 @@ Function8eaa: ; 02:4eaa call WaitBGMap ret -Function8eca: ; 02:4eca +Function8eca: ld hl, wFlyDestination ld de, hJoySum ld a, [de] @@ -2010,10 +2010,10 @@ Function8eca: ; 02:4eca ld [hl], a ret -Data8ef5: ; 02:4ef5 +Data8ef5: db $00, $18, $30, $00 -Function8ef9: ; 02:4ef9 +Function8ef9: dec c dec c dec b @@ -2063,11 +2063,11 @@ Function8ef9: ; 02:4ef9 SECTION "engine/dumps/bank02.asm@Text91c2", ROMX -Text91c2: ; 02:51c2 +Text91c2: text "エーボタンで チューニング！" done -SetTitleBGDecorationBorder: ; 02:51d2 +SetTitleBGDecorationBorder: ld de, TitleBGDecorationBorder ld hl, vChars2 + $500 lb bc, BANK(TitleBGDecorationBorder), $09 @@ -2080,7 +2080,7 @@ SetTitleBGDecorationBorder: ; 02:51d2 call Function91ef ret -Function91ef: ; 02:51ef +Function91ef: xor a ld c, $14 .sub_91f2 @@ -2094,7 +2094,7 @@ Function91ef: ; 02:51ef SECTION "engine/dumps/bank02.asm@Function928b", ROMX -Function928b: ; 02:528b +Function928b: ld a, b cp $ff jr nz, .sub_9293 @@ -2114,7 +2114,7 @@ Function928b: ; 02:528b push de jp hl -Table92a8: ; 02:52a8 +Table92a8: dw Function92d4 dw Function92db dw Function934b @@ -2138,12 +2138,12 @@ Table92a8: ; 02:52a8 dw Function94ab dw Function94c8 -Function92d4: ; 02:52d4 +Function92d4: ld hl, Data99ec ld de, Data988c ret -Function92db: ; 02:52db +Function92db: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2184,7 +2184,7 @@ Function92db: ; 02:52db ld [wccd0], a ret -Function932b: ; 02:532b +Function932b: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2200,12 +2200,12 @@ Function932b: ; 02:532b ld de, Data98bc ret -Function934b: ; 02:534b +Function934b: ld hl, Data99fc ld de, Data986c ret -Function9352: ; 02:5352 +Function9352: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2225,12 +2225,12 @@ Function9352: ; 02:5352 ld de, Data98ac ret -Function937b: ; 02:537b +Function937b: ld hl, Data99dc ld de, wcce2 ret -Function9382: ; 02:5382 +Function9382: ld hl, Data9a0c ld de, wcce1 ld bc, $0010 @@ -2243,27 +2243,27 @@ Function9382: ; 02:5382 ld de, Data98cc ret -Function939f: ; 02:539f +Function939f: ld hl, Data99bc ld de, Data986c ret -Function93a6: ; 02:53a6 +Function93a6: ld hl, Data9a1c ld de, Data98dc ret -Function93ad: ; 02:53ad +Function93ad: ld hl, Data9a2c ld de, Data993c ret -Function93b4: ; 02:53b4 +Function93b4: ld hl, Data9a3c ld de, Data986c ret -Function93bb: ; 02:53bb +Function93bb: ld b, $00 ld hl, Table93cc add hl, bc @@ -2279,7 +2279,7 @@ Function93bb: ; 02:53bb ld l, a ret -Table93cc: ; 02:53cc +Table93cc: dw Data986c dw Data996c @@ -2289,19 +2289,19 @@ Table93cc: ; 02:53cc dw Data986c dw Data999c -Function93d8: ; 02:53d8 +Function93d8: ld hl, Data9a4c ld de, Data986c ld a, $08 ld [wccd0], a ret -Function93e4: ; 02:53e4 +Function93e4: ld hl, Data99cc ld de, Data986c ret -Function93eb: ; 02:53eb +Function93eb: ld hl, Data986c ld de, wc51a ld bc, $0010 @@ -2310,7 +2310,7 @@ Function93eb: ; 02:53eb ld de, Data986c ret -Function93fe: ; 02:53fe +Function93fe: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2323,7 +2323,7 @@ Function93fe: ; 02:53fe ld [wccd0], a ret -Function941a: ; 02:541a +Function941a: push bc ld hl, Data995c ld de, wcce1 @@ -2343,12 +2343,12 @@ Function941a: ; 02:541a ld de, Data986c ret -Function9441: ; 02:5441 +Function9441: ld hl, Data9a3c ld de, Data986c ret -Function9448: ; 02:5448 +Function9448: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2379,7 +2379,7 @@ Function9448: ; 02:5448 ld de, wccf1 ret -Function948e: ; 02:548e +Function948e: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2392,7 +2392,7 @@ Function948e: ; 02:548e ld de, Data992c ret -Function94ab: ; 02:54ab +Function94ab: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2405,7 +2405,7 @@ Function94ab: ; 02:54ab ld de, Data992c ret -Function94c8: ; 02:54c8 +Function94c8: ld hl, Data995c ld de, wcce1 ld bc, $0010 @@ -2418,7 +2418,7 @@ Function94c8: ; 02:54c8 ld de, Data992c ret -Function94e5: ; 02:54e5 +Function94e5: ld a, [wMapPermissions] cp $02 jr z, .sub_950e @@ -2459,7 +2459,7 @@ Function94e5: ; 02:54e5 ld a, $0d ret -Function9527: ; 02:5527 +Function9527: ld a, [wTimeOfDay] and $03 jr z, .sub_9534 @@ -2471,7 +2471,7 @@ Function9527: ; 02:5527 and a ret -Function9536: ; 02:5536 +Function9536: ld a, [wTimeOfDay] and $03 cp $02 @@ -2482,7 +2482,7 @@ Function9536: ; 02:5536 and a ret -Function9543: ; 02:5543 +Function9543: ld a, [wMapGroup] ld e, a ld d, $00 @@ -2491,23 +2491,23 @@ Function9543: ; 02:5543 ld a, [hl] ret -Data954f: ; 02:554f +Data954f: db $01, $07, $0c, $03, $08, $06, $0b, $04 db $05, $0a, $02, $03, $02, $02, $09, $01 -Function955f: ; 02:555f +Function955f: push de call Function964b pop hl jp Function964b -Function9567: ; 02:5567 +Function9567: bit 3, a ld a, $18 ret nz ld a, [hl] -Function956d: ; 02:556d +Function956d: and a jr z, .sub_957a ld e, a @@ -2522,7 +2522,7 @@ Function956d: ; 02:556d scf ret -Function957e: ; 02:557e +Function957e: push bc push af ld hl, wPartyMon1DVs @@ -2539,7 +2539,7 @@ Function957e: ; 02:557e pop bc ret -Function9599: ; 02:5599 +Function9599: push bc push af ld a, e @@ -2558,7 +2558,7 @@ Function9599: ; 02:5599 pop bc ret -Function95b0: ; 02:55b0 +Function95b0: ld a, [hl] cp $a0 jr c, .sub_95ca @@ -2579,7 +2579,7 @@ Function95b0: ; 02:55b0 and a ret -Function95cc: ; 02:55cc +Function95cc: ld hl, wcddf ldh a, [hBattleTurn] and a @@ -2608,13 +2608,13 @@ Function95cc: ; 02:55cc .sub_95f7 ret -Function95f8: ; 02:55f8 +Function95f8: ld hl, Data98fc ld de, wcce2 ld bc, $0030 jp CopyBytes -Function9604: ; 02:5604 +Function9604: ld hl, wccd3 ld a, [wcce1] ld e, a @@ -2640,27 +2640,27 @@ Function9604: ; 02:5604 ld [hl], e ret -Function962d: ; 02:562d +Function962d: ld hl, Data997c jp Function964b -Function9633: ; 02:5633 +Function9633: ld hl, Data986c jp Function964b -Function9639: ; 02:5639 +Function9639: ld hl, Data99ac jp Function964b -Function963f: ; 02:563f +Function963f: ld hl, Data99bc jp Function964b -Function9645: ; 02:5645 +Function9645: ld hl, wc51a jp Function964b -Function964b: ; 02:564b +Function964b: ld a, [wJoypadFlags] push af set 7, a @@ -2670,7 +2670,7 @@ Function964b: ; 02:564b ld [wJoypadFlags], a ret -Function965c: ; 02:565c +Function965c: ld a, [hl] and $07 ret z @@ -2710,7 +2710,7 @@ Function965c: ; 02:565c jr nz, .sub_9661 ret -CheckSGB: ; 02:5695 +CheckSGB: ld a, [wJoypadFlags] push af set 7, a @@ -2749,7 +2749,7 @@ CheckSGB: ; 02:5695 jr nz, .sub_96ca ret -Table96d9: ; 02:56d9 +Table96d9: dw Data9aac dw Data9acc dw Data9adc @@ -2760,7 +2760,7 @@ Table96d9: ; 02:56d9 dw Data9b2c dw Data9b3c -Function96eb: ; 02:56eb +Function96eb: ld a, [wSGB] ret z di @@ -2774,7 +2774,7 @@ Function96eb: ; 02:56eb ei ret -Function9704: ; 02:5704 +Function9704: call Function9710 push de call Function980a @@ -2782,7 +2782,7 @@ Function9704: ; 02:5704 call Function97be ret -Function9710: ; 02:5710 +Function9710: ld a, [wce5f] bit 3, a jr nz, .sub_971e @@ -2794,14 +2794,14 @@ Function9710: ; 02:5710 ld de, Corrupteda66cGFX ret -Function9725: ; 02:5725 +Function9725: ld hl, vChars0 ld bc, $2000 xor a call ByteFill ret -Function9730: ; 02:5730 +Function9730: ld hl, Data9a7c call Function965c call Function9860 @@ -2852,7 +2852,7 @@ Function9730: ; 02:5730 call Function965c jp Function9860 -Function979a: ; 02:579a +Function979a: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2869,7 +2869,7 @@ Function979a: ; 02:579a ldh [rBGP], a ret -Function97be: ; 02:57be +Function97be: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2903,7 +2903,7 @@ Function97be: ; 02:57be ldh [rBGP], a ret -Function980a: ; 02:580a +Function980a: call DisableLCD ld a, $e4 ldh [rBGP], a @@ -2927,7 +2927,7 @@ Function980a: ; 02:580a ldh [rBGP], a ret -Function9838: ; 02:5838 +Function9838: ld a, [hli] ld [de], a inc de @@ -2937,7 +2937,7 @@ Function9838: ; 02:5838 jr nz, Function9838 ret -Function9841: ; 02:5841 +Function9841: xor a ld [de], a inc de @@ -2947,7 +2947,7 @@ Function9841: ; 02:5841 jr nz, Function9841 ret -Function984a: ; 02:584a +Function984a: ld hl, vBGMap0 ld de, $000c ld a, $80 @@ -2964,7 +2964,7 @@ Function984a: ; 02:584a jr nz, .sub_9854 ret -Function9860: ; 02:5860 +Function9860: ld de, $1b58 .sub_9863 nop @@ -2976,186 +2976,186 @@ Function9860: ; 02:5860 jr nz, .sub_9863 ret -Data986c: ; 02:586c +Data986c: db $21, $01, $03, $00, $00, $00, $13, $11 db $00, $00, $00, $00, $00, $00, $00, $00 -Data987c: ; 02:587c +Data987c: db $21, $01, $07, $05, $00, $0a, $13, $0d db $00, $00, $00, $00, $00, $00, $00, $00 -Data988c: ; 02:588c +Data988c: db $22, $05, $07, $0a, $00, $0c, $13, $11 db $03, $05, $01, $00, $0a, $03, $03, $00 -Data989c: ; 02:589c +Data989c: db $0a, $08, $13, $0a, $03, $0a, $00, $04 db $08, $0b, $03, $0f, $0b, $00, $13, $07 -Data98ac: ; 02:58ac +Data98ac: db $21, $01, $07, $05, $00, $01, $07, $07 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98bc: ; 02:58bc +Data98bc: db $21, $01, $07, $05, $0b, $01, $13, $02 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98cc: ; 02:58cc +Data98cc: db $21, $01, $07, $05, $01, $01, $08, $08 db $00, $00, $00, $00, $00, $00, $00, $00 -Data98dc: ; 02:58dc +Data98dc: db $22, $05, $03, $05, $00, $00, $13, $0b db $03, $0a, $00, $04, $13, $09, $02, $0f -Data98ec: ; 02:58ec +Data98ec: db $00, $06, $13, $07, $03, $00, $04, $04 db $0f, $09, $03, $00, $00, $0c, $13, $11 -Data98fc: ; 02:58fc +Data98fc: db $23, $07, $07, $10, $00, $00, $02, $0c db $02, $00, $0c, $00, $12, $01, $02, $00 -Data990c: ; 02:590c +Data990c: db $0c, $02, $12, $03, $02, $00, $0c, $04 db $12, $05, $02, $00, $0c, $06, $12, $07 -Data991c: ; 02:591c +Data991c: db $02, $00, $0c, $08, $12, $09, $02, $00 db $0c, $0a, $12, $0b, $00, $00, $00, $00 -Data992c: ; 02:592c +Data992c: db $21, $01, $07, $10, $00, $00, $13, $02 db $00, $00, $00, $00, $00, $00, $00, $00 -Data993c: ; 02:593c +Data993c: db $21, $01, $07, $10, $00, $00, $13, $05 db $00, $00, $00, $00, $00, $00, $00, $00 -Data994c: ; 02:594c +Data994c: db $51, $35, $00, $36, $00, $37, $00, $38 db $00, $00, $00, $00, $00, $00, $00, $00 -Data995c: ; 02:595c +Data995c: db $51, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data996c: ; 02:596c +Data996c: db $51, $2a, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data997c: ; 02:597c +Data997c: db $51, $2b, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data998c: ; 02:598c +Data998c: db $51, $2c, $00, $2d, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data999c: ; 02:599c +Data999c: db $51, $2e, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99ac: ; 02:59ac +Data99ac: db $51, $2f, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99bc: ; 02:59bc +Data99bc: db $51, $30, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99cc: ; 02:59cc +Data99cc: db $51, $2d, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99dc: ; 02:59dc +Data99dc: db $51, $22, $00, $23, $00, $24, $00, $25 db $00, $00, $00, $00, $00, $00, $00, $00 -Data99ec: ; 02:59ec +Data99ec: db $51, $0e, $00, $0e, $00, $0e, $00, $0e db $00, $00, $00, $00, $00, $00, $00, $00 -Data99fc: ; 02:59fc +Data99fc: db $51, $26, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a0c: ; 02:5a0c +Data9a0c: db $51, $30, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a1c: ; 02:5a1c +Data9a1c: db $51, $31, $00, $32, $00, $33, $00, $34 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a2c: ; 02:5a2c +Data9a2c: db $51, $27, $00, $28, $00, $0f, $00, $13 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a3c: ; 02:5a3c +Data9a3c: db $51, $0f, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a4c: ; 02:5a4c +Data9a4c: db $51, $29, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a5c: ; 02:5a5c +Data9a5c: db $59, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a6c: ; 02:5a6c +Data9a6c: db $89, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a7c: ; 02:5a7c +Data9a7c: db $89, $01, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a8c: ; 02:5a8c +Data9a8c: db $99, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9a9c: ; 02:5a9c +Data9a9c: db $a1, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9aac: ; 02:5aac +Data9aac: db $b9, $01, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9abc: ; 02:5abc +Data9abc: db $b9, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -Data9acc: ; 02:5acc +Data9acc: db $79, $5d, $08, $00, $0b, $8c, $d0, $f4 db $60, $00, $00, $00, $00, $00, $00, $00 -Data9adc: ; 02:5adc +Data9adc: db $79, $52, $08, $00, $0b, $a9, $e7, $9f db $01, $c0, $7e, $e8, $e8, $e8, $e8, $e0 -Data9aec: ; 02:5aec +Data9aec: db $79, $47, $08, $00, $0b, $c4, $d0, $16 db $a5, $cb, $c9, $05, $d0, $10, $a2, $28 -Data9afc: ; 02:5afc +Data9afc: db $79, $3c, $08, $00, $0b, $f0, $12, $a5 db $c9, $c9, $c8, $d0, $1c, $a5, $ca, $c9 -Data9b0c: ; 02:5b0c +Data9b0c: db $79, $31, $08, $00, $0b, $0c, $a5, $ca db $c9, $7e, $d0, $06, $a5, $cb, $c9, $7e -Data9b1c: ; 02:5b1c +Data9b1c: db $79, $26, $08, $00, $0b, $39, $cd, $48 db $0c, $d0, $34, $a5, $c9, $c9, $80, $d0 -Data9b2c: ; 02:5b2c +Data9b2c: db $79, $1b, $08, $00, $0b, $ea, $ea, $ea db $ea, $ea, $a9, $01, $cd, $4f, $0c, $d0 -Data9b3c: ; 02:5b3c +Data9b3c: db $79, $10, $08, $00, $0b, $4c, $20, $08 db $ea, $ea, $ea, $ea, $ea, $60, $ea, $ea diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 456c903..bef8017 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "engine/dumps/bank03.asm@Functionc77d", ROMX -Functionc77d: ; 03:477d +Functionc77d: ld a, [wFlyDestination] ld l, a ld h, $00 @@ -21,7 +21,7 @@ Functionc77d: ; 03:477d SECTION "engine/dumps/bank03.asm@SpawnPoints", ROMX ; Map, Warp ID -SpawnPoints: ; 03:47d5 +SpawnPoints: db $01, $04 db $05, $05 db $02, $02 @@ -120,7 +120,7 @@ SpawnPoints: ; 03:47d5 SECTION "engine/dumps/bank03.asm@Functionc9c1", ROMX -Functionc9c1: ; 03:49c1 +Functionc9c1: xor a ld bc, $0020 ld hl, wCurrMapInlineTrainers @@ -155,7 +155,7 @@ Functionc9c1: ; 03:49c1 .sub_c9f5 jp CheckInlineTrainer -Functionc9f8: ; 03:49f8 +Functionc9f8: ld a, [wItemQuantity] push af push bc @@ -239,7 +239,7 @@ Functionc9f8: ; 03:49f8 ld [wItemQuantity], a ret -Functionca68: ; 03:4a68 +Functionca68: push hl inc hl ld a, [wItemIndex] @@ -285,7 +285,7 @@ Functionca68: ; 03:4a68 SECTION "engine/dumps/bank03.asm@Functiond41d", ROMX -Functiond41d: ; 03:541d +Functiond41d: push hl call Functiond4b2 ld a, [wItemAttributeParamBuffer] @@ -321,24 +321,24 @@ Functiond41d: ; 03:541d scf ret -Textd46b: ; 03:546b +Textd46b: text_from_ram wStringBuffer1 text "を" line "すてました！" prompt -Textd478: ; 03:5478 +Textd478: text_from_ram wStringBuffer2 text "を すてます" line "ほんとに よろしいですか？" prompt -Textd491: ; 03:5491 +Textd491: text "それは とても たいせつなモノです" line "すてることは できません！" prompt -Functiond4b2: ; 03:54b2 +Functiond4b2: push hl push bc ld a, $01 @@ -372,7 +372,7 @@ Functiond4b2: ; 03:54b2 pop hl ret -Functiond4e6: ; 03:54e6 +Functiond4e6: ld a, [wcb6e] and a ret z @@ -386,13 +386,13 @@ Functiond4e6: ; 03:54e6 .sub_d4f8 jr Functiond505 -Functiond4fa: ; 03:54fa +Functiond4fa: call Functiond51e ld hl, Function8261 ld a, BANK(Function8261) call FarCall_hl -Functiond505: ; 03:5505 +Functiond505: ld a, $04 ld [wcdb2], a ldh a, [hOverworldFlashlightEffect] @@ -404,11 +404,11 @@ Functiond505: ; 03:5505 call Functiond708 jr Functiond543 -Functiond519: ; 03:5519 +Functiond519: call Functiond51e jr Functiond543 -Functiond51e: ; 03:551e +Functiond51e: ld a, [wPlayerStepDirection] and a jr nz, .sub_d529 @@ -434,7 +434,7 @@ Functiond51e: ; 03:551e inc [hl] ret -Functiond543: ; 03:5543 +Functiond543: call .sub_d5bf ld a, [wcb6c] ld d, a @@ -531,7 +531,7 @@ Functiond543: ; 03:5543 ld l, a jp hl -Tabled5d3: ; 03:55d3 +Tabled5d3: dw RefreshTiles dw Functiond5ea dw BufferScreen @@ -544,16 +544,16 @@ Tabled5d3: ; 03:55d3 dw Functiond5e9 dw Functiond5e9 -Functiond5e9: ; 03:55e9 +Functiond5e9: ret -Functiond5ea: ; 03:55ea +Functiond5ea: ld hl, Functionc9c1 ld a, BANK(Functionc9c1) call FarCall_hl ret -Functiond5f3: ; 03:55f3 +Functiond5f3: ld a, [wPlayerStepDirection] and a jr z, .sub_d606 @@ -585,7 +585,7 @@ Functiond5f3: ; 03:55f3 call ScheduleEastColumnRedraw ret -Functiond62e: ; 03:562e +Functiond62e: ld a, [wBGMapAnchor] add $40 ld [wBGMapAnchor], a @@ -615,7 +615,7 @@ Functiond62e: ; 03:562e inc [hl] ret -Functiond65f: ; 03:565f +Functiond65f: ld a, [wBGMapAnchor] sub $40 ld [wBGMapAnchor], a @@ -647,7 +647,7 @@ Functiond65f: ; 03:565f dec [hl] ret -Functiond692: ; 03:5692 +Functiond692: ld a, [wBGMapAnchor] ld e, a and $e0 @@ -675,7 +675,7 @@ Functiond692: ; 03:5692 dec [hl] ret -Functiond6bb: ; 03:56bb +Functiond6bb: ld a, [wBGMapAnchor] ld e, a and $e0 @@ -703,7 +703,7 @@ Functiond6bb: ; 03:56bb inc [hl] ret -Functiond6e4: ; 03:56e4 +Functiond6e4: ld a, [wcb6e] and a ret z @@ -723,7 +723,7 @@ Functiond6e4: ; 03:56e4 call Functiond51e jp Functiond543 -Functiond708: ; 03:5708 +Functiond708: ld a, [wPlayerStepDirection] and a jr z, .sub_d71b @@ -814,7 +814,7 @@ Functiond708: ; 03:5708 ld [wRedrawFlashlightBlackDst1+1], a ret -Datad7b1: ; 03:57b1 +Datad7b1: db $02, $03, $02, $11, $02, $02, $02, $10 db $02, $0e, $02, $00, $02, $0f, $02, $01 db $03, $02, $11, $02, $02, $02, $10, $02 @@ -832,7 +832,7 @@ Datad7b1: ; 03:57b1 db $09, $08, $0b, $08, $08, $08, $0a, $08 db $08, $08, $06, $08, $09, $08, $07, $08 -Functiond831: ; 03:5831 +Functiond831: ld c, [hl] inc hl ld b, [hl] @@ -871,7 +871,7 @@ Functiond831: ; 03:5831 pop hl ret -Functiond85f: ; 03:585f +Functiond85f: push hl ld hl, wTileMap ld de, $0014 @@ -889,7 +889,7 @@ Functiond85f: ; 03:585f pop hl ret -Functiond873: ; 03:5873 +Functiond873: ldh a, [hOverworldFlashlightEffect] dec a ld l, a @@ -900,10 +900,10 @@ Functiond873: ; 03:5873 ld [wRedrawFlashlightWidthHeight], a ret -Datad882: ; 03:5882 +Datad882: db $07, $05, $03, $01 -Functiond886: ; 03:5886 +Functiond886: ld de, wPartyCount ld a, [wMonType] and $0f @@ -933,7 +933,7 @@ Functiond886: ; 03:5886 jr z, Functiond8b6 ld hl, wOTPartyMonOT -Functiond8b6: ; 03:58b6 +Functiond8b6: ldh a, [hMoveMon] dec a call SkipNames @@ -1160,7 +1160,7 @@ Functiond8b6: ; 03:58b6 scf ret -FillPP: ; 03:5a28 +FillPP: ld b, $04 .sub_da2a ld a, [hli] @@ -1188,7 +1188,7 @@ FillPP: ; 03:5a28 ret -Functionda4f: ; 03:5a4f +Functionda4f: ld hl, wPartyCount ld a, [hl] cp $06 @@ -1247,7 +1247,7 @@ Functionda4f: ; 03:5a4f and a ret -Functiondac8: ; 03:5ac8 +Functiondac8: ld a, [wcd7c] and a jr z, .sub_dae3 @@ -1426,7 +1426,7 @@ Functiondac8: ; 03:5ac8 and a ret -Functiondc16: ; 03:5c16 +Functiondc16: ld hl, wPartyCount ld a, [hl] cp $06 @@ -1554,7 +1554,7 @@ Functiondc16: ; 03:5c16 and a ret -Functiondcfc: ; 03:5cfc +Functiondcfc: ld a, [wcd7c] ld de, wd876 and a @@ -1590,7 +1590,7 @@ Functiondcfc: ; 03:5cfc ld bc, $0020 jp CopyBytes -Functiondd5c: ; 03:5d5c +Functiondd5c: ld de, wBoxListLength ld a, [de] cp $1e @@ -1765,7 +1765,7 @@ Functiondd5c: ; 03:5d5c scf ret -Functionde79: ; 03:5e79 +Functionde79: ld a, [wPartyCount] cp $06 jr z, .sub_de8b @@ -1812,7 +1812,7 @@ Functionde79: ; 03:5e79 and a ret -Functiondecd: ; 03:5ecd +Functiondecd: ld hl, wPartyCount ld a, [wcd7c] and a @@ -1908,7 +1908,7 @@ Functiondecd: ; 03:5ecd .sub_df7a jp CopyDataUntil -Functiondf7d: ; 03:5f7d +Functiondf7d: ld c, $00 .sub_df7f inc c @@ -1924,7 +1924,7 @@ Functiondf7d: ; 03:5f7d jr nz, .sub_df7f ret -Functiondf91: ; 03:5f91 +Functiondf91: push hl push de push bc @@ -2111,7 +2111,7 @@ Functiondf91: ; 03:5f91 pop hl ret -Function60a0: ; 03:60a0 +Function60a0: ld a, [wMonDexIndex] dec a ld c, a @@ -2211,36 +2211,36 @@ Function60a0: ; 03:60a0 ld b, $02 ret -Texte168: ; 03:6168 +Texte168: text_from_ram wStringBuffer1 text "は マサキの ところへ" line "てんそうされた！" prompt -Texte181: ; 03:6181 +Texte181: text_from_ram wStringBuffer1 text "は だれかの <PC>に" line "てんそうされた！" prompt -Texte198: ; 03:6198 +Texte198: text_from_ram wStringBuffer1 text "の データが あたらしく" line "#ずかんに セーブされます！@" -Texte1b8: ; 03:61b8 +Texte1b8: db "ドギ@" -Texte1bb: ; 03:61bb +Texte1bb: text "ゲットした @" -Texte1c3: ; 03:61c3 +Texte1c3: text_from_ram wStringBuffer1 text "に" line "なまえを つけますか？" done -Functione1d5: ; 03:61d5 +Functione1d5: call Functione284 ret c call LoadStandardMenuHeader @@ -2273,40 +2273,40 @@ Functione1d5: ; 03:61d5 call CloseWindow ret -Texte224: ; 03:6224 +Texte224: text "なんに するん？" done -Datae22e: ; 03:622e +Datae22e: db $40, $00, $00, $11, $0e dw Datae236 db $01 -Datae236: ; 03:6236 +Datae236: db $80, $00 dw Datae27c db $8a, $1f dw Texte23e -Texte23e: ; 03:623e +Texte23e: db "#の ようすをみる@" -Texte248: ; 03:6248 +Texte248: db "#を つれていく@" -Texte251: ; 03:6251 +Texte251: db "#を あずける@" -Texte259: ; 03:6259 +Texte259: db "#を にがす@" -Texte260: ; 03:6260 +Texte260: db "ボックスを かえる@" -Texte26a: ; 03:626a +Texte26a: db "さようなら@" -Tablee270: ; 03:6270 +Tablee270: dw Functione5c5 dw Functione31b dw Functione2a6 @@ -2314,10 +2314,10 @@ Tablee270: ; 03:6270 dw Functione3c3 dw Functione2a4 -Datae27c: ; 03:627c +Datae27c: db $05, $00, $01, $02, $03, $04, $05, $ff -Functione284: ; 03:6284 +Functione284: ld a, [wPartyCount] and a ret nz @@ -2326,16 +2326,16 @@ Functione284: ; 03:6284 scf ret -Texte291: ; 03:6291 +Texte291: text "#もってへんやつは" line "おことわりや！" prompt -Functione2a4: ; 03:62a4 +Functione2a4: scf ret -Functione2a6: ; 03:62a6 +Functione2a6: call Functione2b0 jr c, .sub_e2ae call Functione2f0 @@ -2343,7 +2343,7 @@ Functione2a6: ; 03:62a6 and a ret -Functione2b0: ; 03:72b0 +Functione2b0: ld a, [wPartyCount] and a jr z, .sub_e2bc @@ -2362,16 +2362,16 @@ Functione2b0: ; 03:72b0 scf ret -Texte2cc: ; 03:62cc +Texte2cc: text "１ぴきも もってへんやんか！" prompt -Texte2dc: ; 03:62dc +Texte2dc: text "それ あずけたら" line "こまるんとちゃう？" prompt -Functione2f0: ; 03:62f0 +Functione2f0: call LoadStandardMenuHeader ld hl, Tablee6da call Functione6a4 @@ -2390,7 +2390,7 @@ Functione2f0: ; 03:62f0 call Functiondecd ret -Functione31b: ; 03:631b +Functione31b: call .sub_e325 jr c, .sub_e323 call Functione350 @@ -2409,12 +2409,12 @@ Functione31b: ; 03:631b scf ret -Texte336: ; 03:6336 +Texte336: text "それいじょう よくばったって" line "# もたれへんで！" prompt -Functione350: ; 03:6350 +Functione350: call LoadStandardMenuHeader ld hl, Datae6f8 call Functione6a4 @@ -2433,7 +2433,7 @@ Functione350: ; 03:6350 call Functiondecd ret -Functione37b: ; 03:637b +Functione37b: call .sub_e380 and a ret @@ -2457,18 +2457,18 @@ Functione37b: ; 03:637b call Functiondecd ret -Texte3af: ; 03:63af +Texte3af: text_from_ram wStringBuffer1 text " をほんとうに" next "にがしますか？" done -Functione3c3: ; 03:63c3 +Functione3c3: call Functione3c8 and a ret -Functione3c8: ; 03:63c8 +Functione3c8: call Functione3ed call LoadStandardMenuHeader call ClearPalettes @@ -2486,7 +2486,7 @@ Functione3c8: ; 03:63c8 call CloseWindow ret -Functione3ed: ; 03:63ed +Functione3ed: ld hl, wd4b9 ld c, $00 .sub_e3f2 @@ -2507,17 +2507,17 @@ Functione3ed: ; 03:63ed jr c, .sub_e3f2 ret -Texte40c: ; 03:640c +Texte40c: db "ダミーボックス@" -Datae414: ; 03:6414 +Datae414: db $40, $00, $00, $0c, $13, $1c, $64, $01 db $20, $04, $00, $01, $03, $2c, $64, $03 db $38, $64, $00, $00, $00, $03, $9d, $64 db $0a, $01, $02, $03, $04, $05, $06, $07 db $08, $09, $0a, $ff -Functione438: ; 03:6438 +Functione438: push de ld a, [wMenuSelection] dec a @@ -2540,7 +2540,7 @@ Functione438: ; 03:6438 call PlaceString ret -Texte461: ; 03:6461 +Texte461: db "・.０１ @" db "・.０２ @" db "・.０３ @" @@ -2552,7 +2552,7 @@ Texte461: ; 03:6461 db "・.０９ @" db "・.１０ @" -Functione49d: ; 03:649d +Functione49d: ld h, d ld l, e ld de, Texte4bf @@ -2570,14 +2570,14 @@ Functione49d: ; 03:649d call PlaceString ret -Texte4bf: ; 03:64bf +Texte4bf: db "あずかっている#" next " @" -Texte4ca: ; 03:64ca +Texte4ca: db "/３０@" -Functione4ce: ; 03:64ce +Functione4ce: ld a, [wMenuSelection] dec a ld c, a @@ -2595,7 +2595,7 @@ Functione4ce: ; 03:64ce call CloseSRAM ret -Datae4e7: ; 03:64e7 +Datae4e7: db $02, $00, $a0 db $02, $48, $a5 db $02, $90, $aa @@ -2607,7 +2607,7 @@ Datae4e7: ; 03:64e7 db $03, $d8, $af db $03, $20, $b5 -Functione505: ; 03:6505 +Functione505: ld hl, Datae5a5 call LoadMenuHeader call VerticalMenu @@ -2621,18 +2621,18 @@ Functione505: ; 03:6505 and a ret -Functione51f: ; 03:651f +Functione51f: ld hl, Texte529 call MenuTextBox call CloseWindow ret -Texte529: ; 03:6529 +Texte529: text "バンクチェンジは" next "かいはつちゅうです！" prompt -Functione53e: ; 03:653e +Functione53e: ld hl, Texte551 call MenuTextBox call YesNoBox @@ -2640,17 +2640,17 @@ Functione53e: ; 03:653e ret c jr Functione51f -Functione54d: ; 03:654d +Functione54d: ld a, [wMenuSelection] ret -Texte551: ; 03:6551 +Texte551: text "# ボックスを かえると" line "どうじに レポートが かかれます" para "<⋯⋯> それでも いいですか？" done -Functione57e: ; 03:657e +Functione57e: ld b, $04 ld de, wMovementBufferCount ld a, BANK(NamingScreen) @@ -2668,18 +2668,18 @@ Functione57e: ; 03:657e call CopyString ret -Datae5a5: ; 03:65a5 +Datae5a5: db $40, $06, $00, $0e, $0e dw Datae5ad db $01 -Datae5ad: ; 03:65ad +Datae5ad: db $80, $03 db "ボックスきりかえ@" db "なまえを かえる@" db "やめる@" -Functione5c5: ; 03:65c5 +Functione5c5: call LoadStandardMenuHeader call Functione5d3 call ClearPalettes @@ -2687,7 +2687,7 @@ Functione5c5: ; 03:65c5 and a ret -Functione5d3: ; 03:65d3 +Functione5d3: call ClearBGPalettes call .sub_e62a call SetPalettes @@ -2763,17 +2763,17 @@ Functione5d3: ; 03:65d3 ld [wce5f], a ret -Texte679: ; 03:6679 +Texte679: db "ボックス/いまの ボックス@" -Texte687: ; 03:6687 +Texte687: db "しゅるい なまえ レべル@" -Texte697: ; 03:6697 +Texte697: text "どの#が みたいねん？" done -Functione6a4: ; 03:66a4 +Functione6a4: ld a, l ld [wcd70], a ld a, h @@ -2798,52 +2798,52 @@ Functione6a4: ; 03:66a4 scf ret -Texte6d0: ; 03:66d0 +Texte6d0: text "#を えらんだ！" prompt -Tablee6da: ; 03:66da +Tablee6da: dw Datae6e0 dw wcd3c dw wcd46 -Datae6e0: ; 03:66e0 +Datae6e0: db $40, $03, $05, $0b, $12 dw Datae6e8 db $01 -Datae6e8: ; 03:e6e8 +Datae6e8: db $00, $04 -Datae6ea: ; 03:66ea +Datae6ea: db $08, $01, $00, $aa, $d6, $09, $a6 db $47, $09, $ba, $47, $00, $00, $00 -Datae6f8: ; 03:66f8 +Datae6f8: dw Datae6fe dw wcd3c dw wcd46 -Datae6fe: ; 03:66fe +Datae6fe: db $40, $03, $05, $0b, $12 dw Datae706 db $01 -Datae706: ; 03:6706 +Datae706: db $00, $04, $08, $01, $00, $83, $da, $09 db $ab, $47, $09, $c1, $47, $00, $00, $00 -Datae716: ; 03:6716 +Datae716: dw Datae71c dw wcd3c dw wcd46 -Datae71c: ; 03:671c +Datae71c: db $40, $04, $01, $0b, $13, $24, $67, $01 db $00, $04, $00, $01, $00, $83, $da, $09 db $d8, $47, $00, $00, $00, $00, $00, $00 -Function6734: ; 03:6734 +Function6734: call RefreshScreen call LowVolume ldh a, [hMapAnims] @@ -2875,7 +2875,7 @@ Function6734: ; 03:6734 call Function1fea ret -_UseItem: ; 03:677f +_UseItem: ld a, [wCurItem] ld [wce37], a call GetItemName @@ -2896,7 +2896,7 @@ _UseItem: ; 03:677f ld l, a jp hl -Tablee7a5: ; 03:67a5 +Tablee7a5: dw Functione8f9 dw Functione8f9 dw Functionf66f @@ -3068,7 +3068,7 @@ Tablee7a5: ; 03:67a5 dw Functionf672 dw Functionf672 -Functione8f9: ; 03:68f9 +Functione8f9: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -3394,81 +3394,81 @@ Functione8f9: ; 03:68f9 ld [wItemQuantity], a jp TossItem -Texteb6e: ; 03:6b6e +Texteb6e: text "よけられた！" line "こいつは つかまりそうにないぞ！" prompt -Texteb87: ; 03:6b87 +Texteb87: text "#に" line "うまく あたらなかった！" prompt -Texteb98: ; 03:6b98 +Texteb98: text "だめだ！ #が" line "ボールから でてしまった！" prompt -Textebaf: ; 03:6baf +Textebaf: text "ああ！" line "つかまえたと おもったのに！" prompt -Textebc3: ; 03:6bc3 +Textebc3: text "ざんねん！" line "もうすこしで つかまえられたのに！" prompt -Textebdc: ; 03:6bdc +Textebdc: text "おしい！" line "あと ちょっとの ところだったのに！" prompt -Textebf5: ; 03:6bf5 +Textebf5: text "やったー！" line "@" -Textebfd: ; 03:6bfd +Textebfd: text_from_ram wBattleMonNickname text "を つかまえたぞ！@" -Textec0b: ; 03:6c0b +Textec0b: sound_caught_mon text_waitbutton text_end -Textec0e: ; 03:6c0e +Textec0e: text_from_ram wdf17 text "は マサキの ところへ" line "てんそうされた！" prompt -Textec27: ; 03:6c27 +Textec27: text_from_ram wdf17 text "は だれかの <PC>に" line "てんそうされた！" prompt -Textec3e: ; 03:6c3e +Textec3e: text_from_ram wBattleMonNickname text "の データが あたらしく" line "#ずかんに セーブされます！@" -Textec5e: ; 03:6c5e +Textec5e: sound_slot_machine_start text_waitbutton text_end -Textec61: ; 03:6c61 +Textec61: text "つかまえた @" -Textec69: ; 03:6c69 +Textec69: text_from_ram wStringBuffer1 text "に" line "なまえを つけますか" done -Functionec7a: ; 03:6c7a +Functionec7a: call ClearPalettes ld hl, Function3e39f ld a, BANK(Function3e39f) @@ -3480,7 +3480,7 @@ Functionec7a: ; 03:6c7a call SetPalettes ret -Functionec95: ; 03:6c95 +Functionec95: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3488,7 +3488,7 @@ Functionec95: ; 03:6c95 ld hl, Function86a0 jp FarCall_hl -Functioneca4: ; 03:6ca4 +Functioneca4: xor a ld [wFieldMoveSucceeded], a call .sub_ecba @@ -3518,7 +3518,7 @@ Functioneca4: ; 03:6ca4 scf ret -Functionecd5: ; 03:6cd5 +Functionecd5: call RefreshScreen ld a, [wPlayerState] cp $01 @@ -3539,7 +3539,7 @@ Functionecd5: ; 03:6cd5 call Function1fea ret -Functioned00: ; 03:6d00 +Functioned00: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3567,7 +3567,7 @@ Functioned00: ; 03:6d00 ld [wFieldMoveSucceeded], a ret -Functioned37: ; 03:6d37 +Functioned37: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3616,13 +3616,13 @@ Functioned37: ; 03:6d37 call PrintText jp Functionf7a2 -Functioneda1: ; 03:6da1 +Functioneda1: pop hl ld hl, Textede7 call PrintText jp ClearPalettes -Functionedab: ; 03:6dab +Functionedab: push hl ld bc, $0024 add hl, bc @@ -3635,18 +3635,18 @@ Functionedab: ; 03:6dab ld a, $18 jp Predef -Functionedbe: ; 03:6dbe +Functionedbe: xor a ld [wFieldMoveSucceeded], a call ClearPalettes call z, GetMemSGBLayout jp ReloadFontAndTileset -Textedcb: ; 03:6dcb +Textedcb: text_from_ram wStringBuffer1 text "の @" -Textedd2: ; 03:6dd2 +Textedd2: text_from_ram wStringBuffer2 text "の" line "きそ ポイントが あがった！" @@ -3654,33 +3654,33 @@ Textedd2: ; 03:6dd2 -Textede7: ; 03:6de7 +Textede7: text "つかっても こうかが ないよ" prompt -Tableedf7: ; 03:6df7 +Tableedf7: dw Textee01 dw Textee07 dw Textee0f dw Textee17 dw Textee1c -Textee01: ; 03:6e01 +Textee01: db "たいりょく@" -Textee07: ; 03:6e07 +Textee07: db "こうげきりょく@" -Textee0f: ; 03:6e0f +Textee0f: db "ぼうぎょりょく@" -Textee17: ; 03:6e17 +Textee17: db "すばやさ@" -Textee1c: ; 03:6e1c +Textee1c: db "とくしゅのうりょく@" -Functionee26: ; 03:6e26 +Functionee26: ld a, [wCurItem] ld hl, Dataee38 .sub_ee2c @@ -3695,14 +3695,14 @@ Functionee26: ; 03:6e26 ld b, $00 ret -Dataee38: ; 03:6e38 +Dataee38: db $1a, $00 db $1b, $02 db $1c, $04 db $1d, $06 db $1f, $08 -Functionee42: ; 03:6e42 +Functionee42: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -3804,7 +3804,7 @@ Functionee42: ; 03:6e42 call FarCall_hl jp Functionf7a2 -Functionef02: ; 03:6f02 +Functionef02: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3814,7 +3814,7 @@ Functionef02: ; 03:6f02 ld a, [wMonDexIndex] ld [wCurSpecies], a -Functionef17: ; 03:6f17 +Functionef17: call .sub_ef61 ld a, $20 call GetPartyParamLocation @@ -3866,7 +3866,7 @@ Functionef17: ; 03:6f17 pop hl ret -Dataef77: ; 03:6f77 +Dataef77: db $09, $f0, $08 db $0a, $f1, $10 db $0b, $f2, $20 @@ -3875,7 +3875,7 @@ Dataef77: ; 03:6f77 db $26, $f6, $ff db $ff, $00, $00 -Functionef8c: ; 03:6f8c +Functionef8c: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3921,10 +3921,10 @@ Functionef8c: ; 03:6f8c call Functionf7a2 jp Functionf104 -Functionefed: ; 03:6fed +Functionefed: ret -Functionefee: ; 03:6fee +Functionefee: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -3974,10 +3974,10 @@ Functionefee: ; 03:6fee call Functionf7a2 jp Functionf104 -Functionf05a: ; 03:705a +Functionf05a: ret -Functionf05b: ; 03:705b +Functionf05b: ld a, [wPartyCount] and a jp z, Functionf7dd @@ -4015,10 +4015,10 @@ Functionf05b: ; 03:705b call Functionf7a2 jp Functionf104 -Functionf0af: ; 03:70af +Functionf0af: ret -Functionf0b0: ; 03:70b0 +Functionf0b0: push de ld de, $0001 call WaitPlaySFX @@ -4033,13 +4033,13 @@ Functionf0b0: ; 03:70b0 call Predef ret -Functionf0cf: ; 03:70cf +Functionf0cf: ld [wcdb9], a ld a, $36 call Predef ret -Functionf0d8: ; 03:70d8 +Functionf0d8: xor a ldh [hBGMapMode], a ld hl, wTileMap @@ -4056,15 +4056,15 @@ Functionf0d8: ; 03:70d8 call TextboxWaitPressAorB_BlinkCursor ret -Functionf0fb: ; 03:70fb +Functionf0fb: call Functionf7e2 jr Functionf104 -Functionf100: ; 03:7100 +Functionf100: xor a ld [wFieldMoveSucceeded], a -Functionf104: ; 03:7104 +Functionf104: call ClearPalettes call z, GetMemSGBLayout ld a, [wBattleMode] @@ -4073,7 +4073,7 @@ Functionf104: ; 03:7104 call ReloadFontAndTileset ret -Functionf113: ; 03:7113 +Functionf113: ld a, [wBattleMode] and a ret z @@ -4089,16 +4089,16 @@ Functionf113: ; 03:7113 xor a ret -Functionf127: ; 03:7127 +Functionf127: call Functionf1c5 srl d rr e jr Functionf133 -Functionf130: ; 03:7130 +Functionf130: call Functionf1c5 -Functionf133: ; 03:7133 +Functionf133: ld a, $22 call GetPartyParamLocation ld [hl], d @@ -4107,7 +4107,7 @@ Functionf133: ; 03:7133 call Functionf17e ret -Functionf13f: ; 03:713f +Functionf13f: ld a, $23 call GetPartyParamLocation ld a, [hl] @@ -4134,7 +4134,7 @@ Functionf13f: ; 03:713f .sub_f164 ret -Functionf165: ; 03:7165 +Functionf165: call Functionf1b5 call Functionf19e call Functionf1ac @@ -4142,7 +4142,7 @@ Functionf165: ; 03:7165 or e ret -Functionf171: ; 03:7171 +Functionf171: call Functionf1ac ld h, d ld l, e @@ -4153,7 +4153,7 @@ Functionf171: ; 03:7171 sbc d ret -Functionf17e: ; 03:717e +Functionf17e: ld a, $22 call GetPartyParamLocation ld a, [hli] @@ -4162,21 +4162,21 @@ Functionf17e: ; 03:717e ld [wHPBarNewHP], a ret -Functionf18c: ; 03:718c +Functionf18c: ld a, d ld [wHPBarNewHP+1], a ld a, e ld [wHPBarNewHP], a ret -Functionf195: ; 03:7195 +Functionf195: ld a, [wHPBarNewHP+1] ld d, a ld a, [wHPBarNewHP] ld e, a ret -Functionf19e: ; 03:719e +Functionf19e: ld a, $22 call GetPartyParamLocation ld a, [hli] @@ -4185,14 +4185,14 @@ Functionf19e: ; 03:719e ld [wHPBarOldHP], a ret -Functionf1ac: ; 03:71ac +Functionf1ac: ld a, [wReplacementBlock] ld d, a ld a, [wHPBarOldHP] ld e, a ret -Functionf1b5: ; 03:71b5 +Functionf1b5: push hl ld a, $24 call GetPartyParamLocation @@ -4203,14 +4203,14 @@ Functionf1b5: ; 03:71b5 pop hl ret -Functionf1c5: ; 03:71c5 +Functionf1c5: ld a, [wMapBlocksAddress] ld d, a ld a, [wFieldMoveScriptID] ld e, a ret -Functionf1ce: ; 03:71ce +Functionf1ce: ld a, $24 call GetPartyParamLocation ld a, [hli] @@ -4227,7 +4227,7 @@ Functionf1ce: ; 03:71ce ld e, a ret -Functionf1e9: ; 03:71e9 +Functionf1e9: push hl ld a, [wCurItem] ld hl, Dataf203 @@ -4250,7 +4250,7 @@ Functionf1e9: ; 03:71e9 pop hl ret -Dataf203: ; 03:7203 +Dataf203: db $2e, $32, $00 db $2f, $3c, $00 db $30, $50, $00 @@ -4259,7 +4259,7 @@ Dataf203: ; 03:7203 db $12, $14, $00 db $ff, $00, $00 -Functionf218: ; 03:7218 +Functionf218: ld a, [wcd3c] dec a ld b, a @@ -4339,12 +4339,12 @@ Functionf218: ; 03:7218 pop bc jp .sub_f21d -Textf2a6: ; 03:72a6 +Textf2a6: text "その#には " line "つかえません" done -Functionf2b5: ; 03:72b5 +Functionf2b5: xor a ld [wFieldMoveSucceeded], a ld hl, DigFunction @@ -4352,18 +4352,18 @@ Functionf2b5: ; 03:72b5 call FarCall_hl ret -Functionf2c2: ; 03:72c2 +Functionf2c2: ld b, $c8 jp Functionf2ce -Functionf2c7: ; 03:72c7 +Functionf2c7: ld b, $fa jp Functionf2ce -Functionf2cc: ; 03:72cc +Functionf2cc: ld b, $64 -Functionf2ce: ; 03:72ce +Functionf2ce: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4371,7 +4371,7 @@ Functionf2ce: ; 03:72ce ld [wce2d], a jp Functionf793 -Functionf2dc: ; 03:72dc +Functionf2dc: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4379,7 +4379,7 @@ Functionf2dc: ; 03:72dc set 0, [hl] jp Functionf793 -Functionf2eb: ; 03:72eb +Functionf2eb: ld a, [wBattleMode] dec a jp nz, Functionf7dd @@ -4387,7 +4387,7 @@ Functionf2eb: ; 03:72eb ld [wce06], a jp Functionf793 -Functionf2fa: ; 03:72fa +Functionf2fa: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4395,7 +4395,7 @@ Functionf2fa: ; 03:72fa set 1, [hl] jp Functionf793 -Functionf309: ; 03:7309 +Functionf309: ld a, [wBattleMode] and a jp z, Functionf7dd @@ -4403,7 +4403,7 @@ Functionf309: ; 03:7309 set 2, [hl] jp Functionf793 -Functionf318: ; 03:7318 +Functionf318: ld a, [wBattleMode] and a jr nz, .sub_f327 @@ -4438,10 +4438,10 @@ Functionf318: ; 03:7318 ld [hl], a ret -Functionf354: ; 03:7354 +Functionf354: ret -Functionf355: ; 03:7355 +Functionf355: xor a ld [wMovementBufferCount], a ld b, $f8 @@ -4474,7 +4474,7 @@ Functionf355: ; 03:7355 ld hl, Textf3da jp PrintText -Functionf397: ; 03:7397 +Functionf397: ld de, $0030 ld c, $06 .sub_f39c @@ -4493,34 +4493,34 @@ Functionf397: ; 03:7397 jr nz, .sub_f39c ret -Dataf3af: ; 03:73af +Dataf3af: db $3e, $09 db $3d, $0a db $3f, $0a db $3e, $0b db $ff -Dataf3b8: ; 03:73b8 +Dataf3b8: db $0a, $1b db $0a, $19 db $ff -Textf3bd: ; 03:73bd +Textf3bd: text "#のふえを ふいた！" para "うーん！" line "すばらしい ねいろだ！" prompt -Textf3da: ; 03:73da +Textf3da: text "すべての #が" line "めを さました！" prompt -Textf3ec: ; 03:73ec +Textf3ec: text "<PLAYER>は" line "#のふえを ふいてみた！@" -Functionf3fd: ; 03:73fd +Functionf3fd: ld b, $08 ld a, [wBattleMode] and a @@ -4533,7 +4533,7 @@ Functionf3fd: ; 03:73fd .sub_f410 jp Function32d0 -Functionf413: ; 03:7413 +Functionf413: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4542,23 +4542,23 @@ Functionf413: ; 03:7413 call CloseWindow ret -Textf424: ; 03:7424 +Textf424: text "あなたの コイン" line "@" -Textf42f: ; 03:742f +Textf42f: deciram wd15b, 2, 4 text "まい" prompt -Functionf437: ; 03:7437 +Functionf437: call Functionf49f jp c, Functionf7dd ld bc, $0585 ld a, $01 jr Functionf478 -Functionf444: ; 03:7444 +Functionf444: call Functionf49f jp c, Functionf7dd .sub_f44a @@ -4583,16 +4583,16 @@ Functionf444: ; 03:7444 xor $01 jr Functionf478 -Dataf46a: ; 03:746a +Dataf46a: db $0a, $9d, $0a, $47 -Functionf46e: ; 03:746e +Functionf46e: call Functionf49f jp c, Functionf7dd call Functionf9d9 ld a, e -Functionf478: ; 03:7478 +Functionf478: ld [wMovementBufferCount], a dec a jr nz, .sub_f48b @@ -4616,7 +4616,7 @@ Functionf478: ; 03:7478 ld [hl], a ret -Functionf49f: ; 03:749f +Functionf49f: ld a, [wBattleMode] and a jr z, .sub_f4a7 @@ -4641,12 +4641,12 @@ Functionf49f: ; 03:749f scf ret -Functionf4ca: ; 03:74ca +Functionf4ca: ld a, [wBattleMode] and a jp nz, Functionf7dd -Functionf4d1: ; 03:74d1 +Functionf4d1: ld a, [wCurItem] ld [wMovementBufferCount], a .sub_f4d7 @@ -4701,12 +4701,12 @@ Functionf4d1: ; 03:74d1 ld hl, Textf639 call PrintText -Functionf547: ; 03:7547 +Functionf547: call ClearPalettes call GetMemSGBLayout jp Functionf7a2 -Functionf550: ; 03:7550 +Functionf550: ld a, [wBattleMode] and a jr z, .sub_f572 @@ -4728,12 +4728,12 @@ Functionf550: ; 03:7550 call PrintText jr Functionf547 -Functionf580: ; 03:7580 +Functionf580: call Functionf588 jr nz, Functionf550 jp Functionf5f0 -Functionf588: ; 03:7588 +Functionf588: xor a ld [wMonType], a call Functionf960 @@ -4767,7 +4767,7 @@ Functionf588: ; 03:7588 ret z jr .sub_f5b2 -Functionf5bd: ; 03:75bd +Functionf5bd: ld hl, wMovementBufferCount dec [hl] dec [hl] @@ -4798,10 +4798,10 @@ Functionf5bd: ; 03:75bd and a jp nz, Functionf550 -Functionf5f0: ; 03:75f0 +Functionf5f0: call Functionf7e2 -Functionf5f3: ; 03:75f3 +Functionf5f3: call ClearPalettes call GetMemSGBLayout pop af @@ -4809,34 +4809,34 @@ Functionf5f3: ; 03:75f3 ld [wFieldMoveSucceeded], a ret -Textf5ff: ; 03:75ff +Textf5ff: text "どのわざの" line "ポイントをふやす？" done -Textf610: ; 03:7610 +Textf610: text "どのわざを" line "かいふくする？" done -Textf61f: ; 03:761f +Textf61f: text_from_ram wStringBuffer2 text "は これいじょう" line "ふやすことが できません" prompt -Textf639: ; 03:7639 +Textf639: text_from_ram wStringBuffer2 text "の" line "わざポイントが ふえた！" prompt -Textf64c: ; 03:764c +Textf64c: text "わざポイントが" line "かいふくした！" prompt -Functionf65d: ; 03:765d +Functionf65d: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4844,19 +4844,19 @@ Functionf65d: ; 03:765d ld a, $0b jp FarCall_hl -Functionf66c: ; 03:766c +Functionf66c: jp Functionf7dd -Functionf66f: ; 03:766f +Functionf66f: jp Functionf7dd -Functionf672: ; 03:7672 +Functionf672: jp Functionf7dd -Functionf675: ; 03:7675 +Functionf675: jp Functionfaba -Functionf678: ; 03:7678 +Functionf678: ld a, [wBattleMode] and a jp nz, Functionf7dd @@ -4936,58 +4936,58 @@ Functionf678: ; 03:7678 ret c jp Functionf7a2 -Textf723: ; 03:7723 +Textf723: text "<TM>を きどうした！" prompt -Textf72e: ; 03:772e +Textf72e: text "ひでんマシンを きどうした！" -Textf73d: ; 03:773d +Textf73d: text "なかには @" -Textf744: ; 03:7744 +Textf744: text_from_ram wStringBuffer2 text "が" line "きろくされていた！" para "@" -Textf755: ; 03:7755 +Textf755: text_from_ram wStringBuffer2 text "を" line "#に おぼえさせますか？" done -Textf768: ; 03:7768 +Textf768: text_from_ram wStringBuffer1 text "と @" -Textf76f: ; 03:776f +Textf76f: text_from_ram wStringBuffer2 text "は" line "あいしょうが わるかった！" para "@" -Textf784: ; 03:7784 +Textf784: text_from_ram wStringBuffer2 text "は おぼえられない！" prompt -Functionf793: ; 03:7793 +Functionf793: ld hl, Textf8c6 call PrintText ld de, $0002 call WaitPlaySFX call TextboxWaitPressAorB_BlinkCursor -Functionf7a2: ; 03:77a2 +Functionf7a2: ld hl, wItems ld a, $01 ld [wItemQuantity], a call TossItem ret -Functionf7ae: ; 03:77ae +Functionf7ae: call Functionec7a ld de, $0100 ld a, e @@ -5006,101 +5006,101 @@ Functionf7ae: ; 03:77ae call PrintText jr Functionf7a2 -Functionf7d8: ; 03:77d8 +Functionf7d8: ld hl, Textf8a5 jr Functionf7f4 -Functionf7dd: ; 03:77dd +Functionf7dd: ld hl, Textf7fb jr Functionf7f4 -Functionf7e2: ; 03:77e2 +Functionf7e2: ld hl, Textf841 jr Functionf7f4 -Functionf7e7: ; 03:77e7 +Functionf7e7: ld hl, Textf822 jr Functionf7f4 -Functionf7ec: ; 03:77ec +Functionf7ec: ld hl, Textf874 jr Functionf7f4 -Functionf7f1: ; 03:77f1 +Functionf7f1: ld hl, Textf88d -Functionf7f4: ; 03:77f4 +Functionf7f4: xor a ld [wFieldMoveSucceeded], a jp PrintText -Textf7fb: ; 03:77fb +Textf7fb: text "オーキドの ことば<⋯⋯>" line "<PLAYER>よ！ こういうものには" cont "つかいどきが あるのじゃ！" prompt -Textf822: ; 03:7822 +Textf822: text "たいせつな あずかりものです！" -Textf832: ; 03:7832 +Textf832: db "" next "つかうことは できません！" prompt -Textf841: ; 03:7841 +Textf841: text "つかっても こうかがないよ" prompt -Textf850: ; 03:7850 +Textf850: text "<TRAINER>に ボールを はじかれた！" prompt -Textf860: ; 03:7860 +Textf860: text "ひとの ものを とったら どろぼう！" prompt -Textf874: ; 03:7874 +Textf874: text "ここでは じてんしゃに" next "のることは できません" prompt -Textf88d: ; 03:788d +Textf88d: text "ここでは@" -Textf893: ; 03:7893 +Textf893: text_from_ram wStringBuffer1 text "に" line "のることは できません" prompt -Textf8a5: ; 03:78a5 +Textf8a5: text "ボックスに あずけている #が" line "いっぱいなので つかえません！" prompt -Textf8c6: ; 03:78c6 +Textf8c6: text "<PLAYER>は@" -Textf8ca: ; 03:78ca +Textf8ca: text_low text_from_ram wStringBuffer2 text "を つかった！" done -Textf8d7: ; 03:78d7 +Textf8d7: text "<PLAYER>は@" -Textf8db: ; 03:78db +Textf8db: text_low text_from_ram wStringBuffer2 text "に のった" prompt -Textf8e6: ; 03:78e6 +Textf8e6: text "<PLAYER>は@" -Textf8ea: ; 03:78ea +Textf8ea: text_low text_from_ram wStringBuffer2 text "から おりた" @@ -5108,7 +5108,7 @@ Textf8ea: ; 03:78ea SECTION "engine/dumps/bank03.asm@Functionf960", ROMX -Functionf960: ; 03:7960 +Functionf960: ld a, [wMonType] and a ld hl, wPartyMon1Moves @@ -5165,22 +5165,22 @@ Functionf960: ; 03:7960 ld [wce37], a ret -Functionf9c9: ; 03:79c9 +Functionf9c9: ld a, [wWhichPokemon] call AddNTimes -Functionf9cf: ; 03:79cf +Functionf9cf: ld a, [w2DMenuDataEnd] ld c, a ld b, $00 add hl, bc ret -Functionf9d7: ; 03:79d7 +Functionf9d7: scf ret -Functionf9d9: ; 03:79d9 +Functionf9d9: ld a, [wMapId] ld de, $0003 ld hl, Datafa08 @@ -5213,7 +5213,7 @@ Functionf9d9: ; 03:79d9 ld e, $01 ret -Datafa08: ; 03:7a08 +Datafa08: dbw $00, Datafa6c dbw $01, Datafa6c dbw $03, Datafa76 @@ -5249,41 +5249,41 @@ Datafa08: ; 03:7a08 dbw $e4, Datafaa2 db $ff -Datafa6c: ; 03:7a6c +Datafa6c: db $02, $0f, $18, $0f, $47 -Datafa71: ; 03:7a71 +Datafa71: db $02, $0f, $9d, $0f, $47 -Datafa76: ; 03:7a76 +Datafa76: db $03, $0f, $2f, $0f, $9d, $0f, $4e -Datafa7d: ; 03:7a7d +Datafa7d: db $02, $0f, $4e, $0f, $17 -Datafa82: ; 03:7a82 +Datafa82: db $02, $17, $6e, $0f, $25 -Datafa87: ; 03:7a87 +Datafa87: db $04, $0f, $58, $0f, $4e, $0f, $2f, $0f, $25 -Datafa90: ; 03:7a90 +Datafa90: db $04, $05, $18, $0f, $4e, $0f, $9d, $0f, $85 -Datafa99: ; 03:7a99 +Datafa99: db $04, $0f, $1b, $0f, $5c, $0f, $17, $0f, $9d -Datafaa2: ; 03:7aa2 +Datafaa2: db $04, $17, $08, $17, $9e, $17, $8a, $17, $5d -Datafaab: ; 03:7aab +Datafaab: db $04, $17, $9e, $0f, $4e, $0f, $9d, $0f, $85 -Functionfab4: ; 03:7ab4 +Functionfab4: call LoadMapPart jp UpdateSprites -Functionfaba: ; 03:7aba +Functionfaba: ld a, [wd8a2] cp $02 jr c, .sub_fade @@ -5406,17 +5406,17 @@ Functionfaba: ; 03:7aba call PrintText jr Functionfbde -Functionfbde: ; 03:7bde +Functionfbde: call ClearBGPalettes call Function360b call GetMemSGBLayout jp ReloadFontAndTileset -Functionfbea: ; 03:7bea +Functionfbea: ld hl, Textfc91 jp PrintText -Functionfbf0: ; 03:7bf0 +Functionfbf0: ld a, [wd8fd] ld b, a srl b @@ -5441,75 +5441,75 @@ Functionfbf0: ; 03:7bf0 ld [wce37], a ret -Textfc19: ; 03:7c19 +Textfc19: text "わたしは こずくりやさん" line "さて どうする？" done -Datafc30: ; 03:7c30 +Datafc30: db $40, $04, $0d, $0b, $13 dw Datafc38 db $01 -Datafc38: ; 03:7c38 +Datafc38: db $80, $03 db "あずける@" -Textfc3f: ; 03:7c3f +Textfc3f: db "ひきとる@" -Textfc44: ; 03:7c44 +Textfc44: db "やめる@" -Textfc48: ; 03:7c48 +Textfc48: text "あずけた！" prompt -Textfc4f: ; 03:7c4f +Textfc4f: text "すでに ２ひきの#を" line "あずかっています" prompt -Textfc64: ; 03:7c64 +Textfc64: text "こずくりを ちゅうししますか？" done -Textfc75: ; 03:7c75 +Textfc75: text "#は いっぴきも" line "あずかってませんが" prompt -Textfc89: ; 03:7c89 +Textfc89: text "ひきとった！" prompt -Textfc91: ; 03:7c91 +Textfc91: text "てもちも マサキの <PC>も" line "#で いっぱいのようです" prompt -Textfcac: ; 03:7cac +Textfcac: text "それでは こづくりします！" prompt -Textfcbb: ; 03:7cbb +Textfcbb: text "あいしょうが いいようです" prompt -Textfcca: ; 03:7cca +Textfcca: text "あいしょうが わるいようです" prompt -Textfcda: ; 03:7cda +Textfcda: text "せいべつが あわないようです" prompt -Textfcea: ; 03:7cea +Textfcea: text "ざんねんながら まだ うまれて" line "こないようです" prompt -Functionfd03: ; 03:7d03 +Functionfd03: ld hl, Textfd2e call PrintText call YesNoBox @@ -5527,15 +5527,15 @@ Functionfd03: ; 03:7d03 call Predef jp Functionfbde -Textfd2e: ; 03:7d2e +Textfd2e: text "タマゴが うまれました！" line "ひきとりますか？" done -Functionfd45: ; 03:7d45 +Functionfd45: ret -Functionfd46: ; 03:7d46 +Functionfd46: ld a, [wMapBlocksAddress] inc a ld [wMapBlocksAddress], a @@ -5570,7 +5570,7 @@ Functionfd46: ; 03:7d46 ld c, $02 ret -Datafd7b: ; 03:7d7b +Datafd7b: db $01, $3f db $02, $4b db $03, $54 @@ -5596,7 +5596,7 @@ Datafd7b: ; 03:7d7b db $fe, $fd db $ff, $ff -Functionfdab: ; 03:7dab +Functionfdab: ld a, $02 call GetPartyParamLocation ld a, [wce32] @@ -5616,30 +5616,30 @@ Functionfdab: ; 03:7dab scf ret -Textfdc7: ; 03:7dc7 +Textfdc7: text_from_ram wStringBuffer1 text "は すでに" line "@" -Textfdd2: ; 03:7dd2 +Textfdd2: text_from_ram wStringBuffer2 text "を おぼえています" prompt -Textfde0: ; 03:7de0 +Textfde0: db "います" prompt ; NOTE: This is missing the preceeding "text_from_ram" byte -Textfde4: ; 03:7de4 +Textfde4: dw wStringBuffer2 text "を おぼえています" prompt -Datafdf1: ; 03:7df1 +Datafdf1: db $28, $3c -Functionfdf3: ; 03:7df3 +Functionfdf3: ld a, [wce32] ld b, a ld c, $04 @@ -5657,17 +5657,17 @@ Functionfdf3: ; 03:7df3 scf ret -Textfe0a: ; 03:7e0a +Textfe0a: text_from_ram wStringBuffer1 text "は すでに" line "@" -Textfe15: ; 03:7e15 +Textfe15: text_from_ram wStringBuffer2 text "を おぼえています" prompt -Datafe23: ; 03:7e23 +Datafe23: db $e0, $22, $47, $24, $80, $a3, $01, $50 db $02, $85, $b0, $09, $35, $51, $2c, $08 db $24, $25, $0b, $84, $84, $00, $4e, $3b diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 64d1c29..ca96442 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -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 diff --git a/engine/gfx.asm b/engine/gfx.asm index d5eec1a..3bddfed 100644 --- a/engine/gfx.asm +++ b/engine/gfx.asm @@ -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) diff --git a/engine/intro.asm b/engine/intro.asm index 8b88859..c7e5494 100644 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -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 diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 33b5e4d..78417e2 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index afd2ce3..a165473 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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] diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index f3290fe..b49b929 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -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 diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 955072d..0d33b5a 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -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 diff --git a/engine/math/math.asm b/engine/math/math.asm index 02d8040..750ada8 100644 --- a/engine/math/math.asm +++ b/engine/math/math.asm @@ -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 diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index 9289084..b9b3081 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -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 diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 02ec29d..c5c19d0 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -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 diff --git a/engine/menu/reset_dialog.asm b/engine/menu/reset_dialog.asm index 6e2b99b..8384ee6 100644 --- a/engine/menu/reset_dialog.asm +++ b/engine/menu/reset_dialog.asm @@ -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 diff --git a/engine/menu/set_time.asm b/engine/menu/set_time.asm index c7c4aa3..15e40dc 100644 --- a/engine/menu/set_time.asm +++ b/engine/menu/set_time.asm @@ -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 "@" diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 6a8f433..5b91246 100644 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/menu/start_menu.asm", ROMX -DisplayStartMenu: ; 04:5DBE +DisplayStartMenu: call RefreshScreen ld de, $0003 call PlaySFX @@ -26,7 +26,7 @@ DisplayStartMenu: ; 04:5DBE ld hl, .StartMenuEntriesReturnTable jp CallJumptable -.StartMenuEntriesReturnTable: ; 04:5DFC +.StartMenuEntriesReturnTable: dw .RefreshStartDisplay dw .MainReturn dw .exit @@ -43,7 +43,7 @@ DisplayStartMenu: ; 04:5DBE call UpdateTimePals ret -.unused ; 04:5E16 +.unused call .WaitForARelease call LoadFontExtra call CloseWindow @@ -56,26 +56,26 @@ DisplayStartMenu: ; 04:5DBE jr nz, .WaitForARelease ret -.ExitAndHookFF: ; 04:5E2B +.ExitAndHookFF: call ExitMenu ld a, $FF ldh [hStartmenuCloseAndSelectHookEnable], a jr .UpdateTime -.StartMenuHeader: ; 04:5E34 +.StartMenuHeader: db MENU_BACKUP_TILES menu_coords $0C, 00, $13, $11 dw .MenuData db 1 ; default option -.MenuData: ; 04:5E3C +.MenuData: db $A8 ; flags db 0 ; items dw StartMenuItems db $8A, $1F dw .Strings -.Strings: ; 04:5E44 +.Strings: db "ずかん@" db "ポケモン@" db "りュック@" @@ -86,7 +86,7 @@ DisplayStartMenu: ; 04:5DBE db "わくせん@" db "りセット@" -StartMenuJumpTable: ; 04:5E6C +StartMenuJumpTable: dw StartMenu_Pokedex dw StartMenu_Party dw StartMenu_Backpack @@ -97,7 +97,7 @@ StartMenuJumpTable: ; 04:5E6C dw StartMenu_TrainerGear dw StartMenu_Reset -StartMenuItems: ; 04:5E7E +StartMenuItems: db 4 db START_SAVE db START_OPTIONS @@ -141,7 +141,7 @@ StartMenuItems: ; 04:5E7E db START_EXIT db -1 -GetStartMenuState: ; 04:5EA4 +GetStartMenuState: ; Stores one of four values to wActiveBackpackPocket ; based on story flags and debug mode. ; 4 = debug, 3 = starting, 2 = rival beat in lab @@ -168,30 +168,30 @@ GetStartMenuState: ; 04:5EA4 ld [wActiveBackpackPocket], a ret -StartMenu_Exit: ; 04:5ECF +StartMenu_Exit: ; Exits the menu ld a, 1 ret -StartMenu_TrainerGear: ; 04:5ED2 +StartMenu_TrainerGear: callab TrainerGear ld a, 0 ret -StartMenu_Reset: ; 04:5EDD +StartMenu_Reset: ld hl, DisplayResetDialog ld a, BANK(DisplayResetDialog) call DisplayResetDialog ; should be farcall ld a, 0 ret -StartMenu_Save: ; 04:5EE8 +StartMenu_Save: predef Function143e0 call UpdateSprites ld a, 0 ret -StartMenu_Settings: ; 04:5EF3 +StartMenu_Settings: call LoadStandardMenuHeader xor a ldh [hBGMapMode], a @@ -208,12 +208,12 @@ StartMenu_Settings: ; 04:5EF3 ld a, 0 ret -StartMenu_TrainerCard: ; 04:5F1F +StartMenu_TrainerCard: call _TrainerCard ld a, 0 ret -_TrainerCard: ; 04:5F25 +_TrainerCard: call LoadStandardMenuHeader ldh a, [hMapAnims] push af @@ -231,7 +231,7 @@ _TrainerCard: ; 04:5F25 ldh [hMapAnims], a ret -StartMenu_Pokedex: ; 04:5F4F +StartMenu_Pokedex: call LoadStandardMenuHeader predef Function40000 call ClearPalettes @@ -244,18 +244,18 @@ StartMenu_Pokedex: ; 04:5F4F ld a, 0 ret -UnusedToolPocketData: ; 04:5F6F +UnusedToolPocketData: dw ToolsPocketHeader dw wRegularItemsCursor dw wRegularItemsScrollPosition -ToolsPocketHeader: ; 04:5F75 +ToolsPocketHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .ToolsPocketData db 1 -.ToolsPocketData ; 04:5F7D +.ToolsPocketData db $AD db 4, 9, 2, 0 dw wNumBagItems @@ -268,13 +268,13 @@ ToolsPocketHeader: ; 04:5F75 dw wBackpackAndKeyItemsCursor dw wBackpackAndKeyItemsScrollPosition -KeyItemsPocketHeader: ; 04:5F93 +KeyItemsPocketHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .KeyPocketData db 1 -.KeyPocketData ; 04:5F9B +.KeyPocketData db $AD db 4, 9, 1, 0 dw wNumKeyItems @@ -283,13 +283,13 @@ KeyItemsPocketHeader: ; 04:5F93 dba Function24783 dba Function241ef -BackpackMenuHeader: ; 04:5FAB +BackpackMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 03, 03, $11, $0A dw .BackpackData db 01 -.BackpackData ; 04:5FB3 +.BackpackData db $A1 db 4, 9, 2, 0 dw wNumBagItems @@ -298,7 +298,7 @@ BackpackMenuHeader: ; 04:5FAB dba Function24783 dba Function241ef -GetPocket2Status: ; 04:5FC3 +GetPocket2Status: ; puts 2 in wActiveBackpackPocket if pocket 2 has items ; otherwise puts 1 in ld a, 2 @@ -310,7 +310,7 @@ GetPocket2Status: ; 04:5FC3 ld [wActiveBackpackPocket], a ret -FlipPocket2Status: ; 04:5FD3 +FlipPocket2Status: ; stores 1 in wactivebackpocket if it's currently 2 ; and vice versa ld a, [wActiveBackpackPocket] @@ -322,7 +322,7 @@ FlipPocket2Status: ; 04:5FD3 ld [wActiveBackpackPocket], a ret -CheckItemsQuantity: ; 04:5FE2 +CheckItemsQuantity: ; sets clear flag if you have no items ld a, [wNumBagItems] and a @@ -333,7 +333,7 @@ CheckItemsQuantity: ; 04:5FE2 scf ret -DrawBackpack: ; 04:5FEE +DrawBackpack: ld hl, wVramState res 0, [hl] call ClearSprites @@ -351,7 +351,7 @@ DrawBackpack: ; 04:5FEE call ExitMenu ret -StartMenu_Backpack: ; 04:6015 +StartMenu_Backpack: call CheckItemsQuantity jr c, .NoItems call LoadStandardMenuHeader @@ -382,12 +382,12 @@ StartMenu_Backpack: ; 04:6015 ret .NoItems - call DrawNoItemsText ; 6371 + call DrawNoItemsText scf ld a, 0 ret -DebugBackpackLoop: ; 04:6056 +DebugBackpackLoop: ; checks the field debug flag, if set this runs ; otherwise NondebugBackpackLoop runs ; if wactivebackpackpocket is 1 (doesn't have key items) then jumps below @@ -413,7 +413,7 @@ DebugBackpackLoop: ; 04:6056 ld [wRegularItemsCursor], a jp HandleBackpackInput -.ToolsPocketText ; 04:608F +.ToolsPocketText db " ふつうの どうぐ @" .NoTools @@ -433,10 +433,10 @@ DebugBackpackLoop: ; 04:6056 ld [wBackpackAndKeyItemsCursor], a jr HandleBackpackInput -KeyItemsPocketText: ; 04:60CD +KeyItemsPocketText: db " だいじな もの @" -NondebugBackpackLoop: ; 04:60E2 +NondebugBackpackLoop: ld hl, BackpackMenuHeader call CopyMenuHeader ld de, BackpackHeaderText @@ -453,10 +453,10 @@ NondebugBackpackLoop: ; 04:60E2 ld [wBackpackAndKeyItemsCursor], a jr HandleBackpackInput -BackpackHeaderText: ; 04:610B +BackpackHeaderText: db " りュックの なか @" -HandleBackpackInput: ; 04:611F +HandleBackpackInput: ld a, [wMenuJoypad] cp A_BUTTON jp z, .BackpackA @@ -470,33 +470,33 @@ HandleBackpackInput: ; 04:611F jp z, .BackpackSelect jp .exit -.BackpackSwapPocket ; 04:613E +.BackpackSwapPocket call FlipPocket2Status xor a ld [wSelectedSwapPosition], a jp .exit -.BackpackSelect ; 04:6148 +.BackpackSelect callab Function245c5 jp .exit -.exit ; 04:6153 +.exit jp DebugBackpackLoop -.UnusedNoItems ; 04:6156 +.UnusedNoItems call DrawNoItemsText scf ret -.BackpackBack ; 04:615B +.BackpackBack scf ret -.BackpackA ; 04:615D +.BackpackA and a ret -BackpackSelected: ; 04:615F +BackpackSelected: callab Function243af call PlaceHollowCursor call LoadItemData @@ -505,7 +505,7 @@ BackpackSelected: ; 04:615F ld hl, .BagSelectJumptable jp CallJumptable -.BagSelectJumptable: ; 04:617E +.BagSelectJumptable: dw SelectItem dw .UnknownSelection dw BallPocketLoop @@ -514,14 +514,14 @@ BackpackSelected: ; 04:615F dw SelectItem dw SelectItem -.SwapPocket ; 04:618C +.SwapPocket call FlipPocket2Status xor a ld [wSelectedSwapPosition], a and a ret -.UnknownSelection ; 04:6195 +.UnknownSelection call LoadStandardMenuHeader callab Function2d2fc call ExitMenu @@ -529,7 +529,7 @@ BackpackSelected: ; 04:615F and a ret -BallPocketLoop: ; 04:61A8 +BallPocketLoop: call BallPocket jr c, .exit call SelectItem @@ -539,7 +539,7 @@ BallPocketLoop: ; 04:61A8 and a ret -SelectItem: ; 04:61B5 +SelectItem: call ItemUseMenu jr c, .skip1 ld a, [wMenuCursorY] @@ -553,7 +553,7 @@ SelectItem: ; 04:61B5 and a ret -ItemUseMenu: ; 04:61CE +ItemUseMenu: ; loads SelectedItemMenu if not debug, ; DebugSelectedItemMenu if debug ld a, [wDebugFlags] @@ -571,7 +571,7 @@ ItemUseMenu: ; 04:61CE call CloseWindow ret -DebugSelectedItemMenu: ; 04:61EF +DebugSelectedItemMenu: db MENU_BACKUP_TILES menu_coords $0D, $0A, $13, $10 dw .DebugSelectedItemMenuText @@ -584,7 +584,7 @@ DebugSelectedItemMenu: ; 04:61EF db "すてる@" ; toss db "とうろく@" ; register -SelectedItemMenu: ; 04:6206 +SelectedItemMenu: db MENU_BACKUP_TILES menu_coords $0E, $0A, $13, $0E dw .SelectedItemMenuText @@ -596,24 +596,24 @@ SelectedItemMenu: ; 04:6206 db "つかう@" ; use db "すてる@" ; toss -TossItemSelection: ; 04:6218 +TossItemSelection: ld de, wNumBagItems call TryTossItem and a ret -RegisterItemSelection: ; 04:6220 +RegisterItemSelection: call TryRegisterItem and a ret -UseItemSelection: ; 04:6225 +UseItemSelection: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .UseItemJumptable jp CallJumptable -.UseItemJumptable: ; 04:6236 ; jumptable +.UseItemJumptable: ; jumptable dw .FailedMove dw .unusable dw .unusable @@ -622,17 +622,17 @@ UseItemSelection: ; 04:6225 dw .SpriteItem dw .FieldMove -.unusable ; 04:6244 +.unusable call PrintCantUseText and a ret -.SimpleItem: ; 04:6249 +.SimpleItem: call UseItem and a ret -.SpriteItem: ; 04:624E +.SpriteItem: ; might be a better name for this once ; bank 5 gets sorted out call UseItem @@ -642,7 +642,7 @@ UseItemSelection: ; 04:6225 and a ret -.FieldMove: ; 04:625C +.FieldMove: call UseItem ld a, [wFieldMoveSucceeded] and a @@ -651,12 +651,12 @@ UseItemSelection: ; 04:6225 ld a, 4 ret -.FailedMove ; 04:6269 +.FailedMove call PrintCantUseText and a ret -TryTossItem: ; 04:626E +TryTossItem: push de call LoadItemData callab _CheckTossableItem @@ -688,21 +688,21 @@ TryTossItem: ; 04:626E and a ret -.TossFail ; 04:62BD ;25 +.TossFail ;25 call CantDropItem .TossReturn pop hl scf ret -.TossedText: ; 04:62C3 +.TossedText: db 1 dw wStringBuffer2 text "を " line "いくつ すてますか？" done -.TossVerifyText: ; 04:62D5 +.TossVerifyText: db 1 dw wStringBuffer2 text "を @" @@ -713,49 +713,49 @@ TryTossItem: ; 04:626E line "すててもよろしいですか？" done -.TossedTextCopy: ; 04:62F0 +.TossedTextCopy: db 1 dw wStringBuffer1 text "を" line "すてました！<PROMPT>" -CantDropItem: ; 04:62FD +CantDropItem: ld hl, .CantDropItemText call MenuTextBoxBackup ret -.CantDropItemText: ; 04:6304 +.CantDropItemText: text "それは とても たいせつなモノです" line "すてることは できません！<PROMPT>" -PrintCantUseHM: ; 04:6325 +PrintCantUseHM: ld hl, .CantUseHMText call MenuTextBoxBackup ret -.CantUseHMText: ; 04:632C +.CantUseHMText: text "かいはつちゅう です" line "いまは つかえません<PROMPT>" -PrintCantUseText: ; 04:6343 +PrintCantUseText: ld hl, .CantUseHereText call MenuTextBoxBackup ret -.CantUseHereText: ; 04:634A +.CantUseHereText: text "オーキドの ことば<⋯⋯>" line "<PLAYER>よ！ こういうものには" cont "つかいどきが あるのじゃ！<PROMPT>" -DrawNoItemsText: ; 04:6371 +DrawNoItemsText: ld hl, .NoItemsText call MenuTextBoxBackup ret -.NoItemsText: ; 04:6378 +.NoItemsText: text "どうぐ をひとつも<NEXT>もっていません！<PROMPT>" -BallPocket: ; 04:638C +BallPocket: xor a ldh [hBGMapMode], a ld hl, .BallPocketHeader @@ -780,16 +780,16 @@ BallPocket: ; 04:638C scf ret -.BallHolderText: ; 04:63B9 +.BallHolderText: db " ボール ホルダ @" -.BallPocketHeader: ; 04:63CC +.BallPocketHeader: db MENU_BACKUP_TILES menu_coords 03, 03, $11, $0A dw .MenuData db 1 -.MenuData: ; 04:63D4 +.MenuData: db SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db $80 ; horizontal spacing? @@ -800,7 +800,7 @@ BallPocket: ; 04:638C dba Function24783 dba Function241ef -DrawBackpackTitleRow: ; 04:63E4 +DrawBackpackTitleRow: push de hlcoord 0, 0 ld de, .BlankLine @@ -810,17 +810,17 @@ DrawBackpackTitleRow: ; 04:63E4 call PlaceString ret -.BlankLine: ; 04:63F6 +.BlankLine: db " @" -LoadItemData: ; 04:640B +LoadItemData: ld a, [wCurItem] ld [wce37], a call GetItemName call CopyStringToStringBuffer2 ret -StartMenuLoadSprites: ; 04:6418 +StartMenuLoadSprites: call DisableLCD ld a, 6 call UpdateSoundNTimes @@ -835,13 +835,13 @@ StartMenuLoadSprites: ; 04:6418 call GetMemSGBLayout ret -TryRegisterItem: ; 04:6440 +TryRegisterItem: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .RegisterItemJumptable jp CallJumptable -.RegisterItemJumptable ; 04:6451 +.RegisterItemJumptable dw PrintCantRegisterToolText dw PrintCantRegisterToolText dw PrintCantRegisterToolText @@ -850,7 +850,7 @@ TryRegisterItem: ; 04:6440 dw RegisterItem dw RegisterItem -RegisterItem: ; 04:645F +RegisterItem: ld a, [wItemIndex] inc a ld b, a @@ -870,22 +870,22 @@ RegisterItem: ; 04:645F call MenuTextBoxBackup ret -.RegisteredItemText: ; 04:6487 +.RegisteredItemText: db 1 dw wStringBuffer2 text "を " line "べんりボタンに とうろくした！<PROMPT>" -PrintCantRegisterToolText: ; 04:649E +PrintCantRegisterToolText: ld hl, .CantRegisterToolText call MenuTextBoxBackup ret -.CantRegisterToolText: ; 04:64A5 +.CantRegisterToolText: text "そのどうぐは " line "とうろくできません！<PROMPT>" -StartMenu_Party: ; 04:64B9 +StartMenu_Party: ld a, [wPartyCount] and a jr nz, .partynonzero @@ -895,14 +895,14 @@ StartMenu_Party: ; 04:64B9 call LoadStandardMenuHeader callab Function50756 -HandleSelectedPokemon: ; 04:64CD +HandleSelectedPokemon: xor a ld [wcdb9], a ld [wSelectedSwapPosition], a predef Function50774 jr PartyPrompt.partypromptreturn -PartyPrompt: ; 04:64DB +PartyPrompt: ld a, [wWhichPokemon] inc a ld [wSelectedSwapPosition], a @@ -915,7 +915,7 @@ PartyPrompt: ; 04:64DB jp SelectedPokemonSubmenu .return ld a, 0 -PartyPromptExit: ; 04:64FB +PartyPromptExit: push af call ClearBGPalettes call StartMenuLoadSprites @@ -929,7 +929,7 @@ PartyPromptExit: ; 04:64FB pop af ret -SelectedPokemonSubmenu: ; 04:6513 +SelectedPokemonSubmenu: hlcoord 1, 13 lb bc, 4, $12 call ClearBox @@ -947,7 +947,7 @@ SelectedPokemonSubmenu: ; 04:6513 ld a, [wd163] jp hl -PartyJumpTable: ; 04:653E +PartyJumpTable: dbw 1, PartyTryCut dbw 2, PartyTryFly dbw 3, PartyTrySurf @@ -965,14 +965,14 @@ PartyJumpTable: ; 04:653E dbw 15, PartyPokemonSummary2 dbw 16, PartyMailMenu -PartyCheckLessThanTwo: ; 04:656E +PartyCheckLessThanTwo: ; might have to do with switch? ld a, [wPartyCount] cp 2 jp c, HandleSelectedPokemon jp PartyPrompt -PartyHeldItem: ; 04:6579 +PartyHeldItem: callab Function_8f1cb ld hl, .HoldItemMenu call LoadMenuHeader @@ -998,7 +998,7 @@ PartyHeldItem: ; 04:6579 .jump jp HandleSelectedPokemon -.PartyGiveHeldItem ; 04:65B9 +.PartyGiveHeldItem call LoadStandardMenuHeader call ClearPalettes call GetPocket2Status @@ -1058,7 +1058,7 @@ PartyHeldItem: ; 04:6579 call z, PartyGiveMail jr .ExitGiveItem -.GiveItem ; 04:664B +.GiveItem ld a, [wce37] ld [wCurItem], a call PartyRecieveItem @@ -1066,16 +1066,16 @@ PartyHeldItem: ; 04:6579 call MenuTextBoxBackup jr .ExitGiveItem -.CantGive ; 04:665C +.CantGive ld hl, .CantBeEquippedText call MenuTextBoxBackup -.ExitGiveItem ;04:6662 +.ExitGiveItem call ClearPalettes call LoadFontsBattleExtra call ExitMenu ret -.PartyTryRecieveItem ; 04:666C +.PartyTryRecieveItem call SpeechTextBox call GetPartyItemOffset ld a, [hl] @@ -1102,75 +1102,75 @@ PartyHeldItem: ; 04:6579 .escape ret -.HoldItemMenu ; 04:66A1 ; verticalmenu +.HoldItemMenu ; verticalmenu db STATICMENU_NO_TOP_SPACING | STATICMENU_PLACE_TITLE menu_coords 4, 4, $e, 9 dw .HoldItemMenuText db 1 -.HoldItemMenuText ;04:66A9 +.HoldItemMenuText db $80 db 2 db "そうびを する@" db "そうびを はずす@" -.CantBeEquippedText ; 04:66BC +.CantBeEquippedText db 1 dw wStringBuffer1 text "を そうびすることは" line "できません<PROMPT>" -ItemWasEquippedText: ; 04:66D1 +ItemWasEquippedText: db 1 dw wcd11 text "は そうび していた" line "@" -.UnusedText1 ; 04:66E1 +.UnusedText1 db 1 dw wStringBuffer1 text "を はずして" para "@" -.UnusedText2 ; 04:66ED +.UnusedText2 db 1 dw wStringBuffer2 text "を そうびした！<PROMPT>" -ItemPrompt66FA: ; 04:66FA +ItemPrompt66FA: db 1 dw wcd11 text "は @" -.UnusedText3 ; 04:6701 +.UnusedText3 db 1 dw wStringBuffer2 text "を" line "そうびした！<PROMPT>" -PartyNoItemToRecieveText: ; 04:670E +PartyNoItemToRecieveText: db 1 dw wcd11 text "は なにも" line "そうび していません！<PROMPT>" -PartyItemRecieveBagFullText: ; 04:6724 +PartyItemRecieveBagFullText: text "どうぐが いっぱいで" line "そうびを はずせません！<PROMPT>" -ItemPrompt673D: ; 04:673D +ItemPrompt673D: db 1 dw wcd11 text "から @" -.UnusedText4 ; 04:6745 +.UnusedText4 db 1 dw wStringBuffer1 text "を" line "はずしました！<PROMPT>" -ItemPrompt6753: ; 04:6753 +ItemPrompt6753: db 1 dw wcd11 text "は @" @@ -1184,27 +1184,27 @@ ItemPrompt6753: ; 04:6753 line "とりかえますか？" done -GetPartyItemOffset: ; 04:6784 +GetPartyItemOffset: push af ld a, 1 call GetPartyParamLocation pop af ret -PartyRecieveItem: ; 04:678C +PartyRecieveItem: ld a, 1 ld [wItemQuantity], a ld hl, wNumBagItems call ReceiveItem ret -UnusedHandleItemJumptable: ; 04:6798 +UnusedHandleItemJumptable: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, UnusedItemJumptable jp CallJumptable -UnusedItemJumptable: ; 04:67A9 +UnusedItemJumptable: dw EmptyFunction127b7 dw PartyGiveMail dw PartyBallPocket @@ -1213,16 +1213,16 @@ UnusedItemJumptable: ; 04:67A9 dw EmptyFunction127b7 dw EmptyFunction127b7 -EmptyFunction127b7: ; 04:67B7 +EmptyFunction127b7: ret -ChangeBackpackPocket: ; 04:67B8 +ChangeBackpackPocket: call FlipPocket2Status xor a ld [wSelectedSwapPosition], a ret -PartyBallPocket: ; 04:67C0 +PartyBallPocket: call BallPocket jr c, .exit call SelectItem @@ -1231,7 +1231,7 @@ PartyBallPocket: ; 04:67C0 .exit ret -PartyGiveMail: ; 04:67CC +PartyGiveMail: call LoadStandardMenuHeader ld de, wMovementBufferCount callab ComposeMailMessage @@ -1254,7 +1254,7 @@ PartyGiveMail: ; 04:67CC call CloseSRAM ret -PartyMailMenu: ; 04:6806 +PartyMailMenu: ld hl, .MailMenu call LoadMenuHeader call VerticalMenu @@ -1316,18 +1316,18 @@ PartyMailMenu: ; 04:6806 call CloseWindow jp HandleSelectedPokemon -.MailFull ; 04:689D +.MailFull ld hl, .MailFullText call MenuTextBoxBackup jr .exit -.MailMenu ; 04:68A5 +.MailMenu db MENU_BACKUP_TILES menu_coords 04, 04, $0E, $0B dw .MailMenuStrings db 01 -.MailMenuStrings ; 04:68AD +.MailMenuStrings db $80 db 3 @@ -1335,25 +1335,25 @@ PartyMailMenu: ; 04:6806 db "メールを はずす@" db "やめる@" -.MessageRemoveMail ; 04:68C4 +.MessageRemoveMail text "メールを はずすと メッセージが" line "きえてしまいますが いいですか？" done -.DrawNick ; 04:68E7 +.DrawNick db 1 dw wStringBuffer1 text "から @" -.DeleteMailText ; 04:68EF +.DeleteMailText text "メールを" line "はずしました！<PROMPT>" -.MailFullText ; 04:68FD +.MailFullText text "どうぐが いっぱいで" line "メールを はずせません！<PROMPT>" -PartyPokemonSummary: ; 04:6916 +PartyPokemonSummary: call LoadStandardMenuHeader call ClearSprites xor a @@ -1365,7 +1365,7 @@ PartyPokemonSummary: ; 04:6916 call Call_ExitMenu jp HandleSelectedPokemon -PartyTryCut: ; 04:6934 +PartyTryCut: callab CutFunction ld a, [wFieldMoveSucceeded] cp $F @@ -1373,7 +1373,7 @@ PartyTryCut: ; 04:6934 ld a, 4 jp PartyPromptExit -PartyTryFly: ; 04:6949 +PartyTryFly: bit 2, a jp z, PrintNeedNewBadgeText callab FlyFunction @@ -1383,11 +1383,11 @@ PartyTryFly: ; 04:6949 ld a, 4 jp PartyPromptExit -PartyCantUseMove: ; 04:6963 +PartyCantUseMove: call PrintCantUseHM jp HandleSelectedPokemon -PartyTryTeleport: ; 04:6969 +PartyTryTeleport: callab TeleportFunction ld a, [wFieldMoveSucceeded] and a @@ -1395,7 +1395,7 @@ PartyTryTeleport: ; 04:6969 ld a, 4 jp PartyPromptExit -PartyTrySurf: ; 04:697D +PartyTrySurf: bit 4, a jp z, PrintNeedNewBadgeText callab SurfFunction @@ -1405,7 +1405,7 @@ PartyTrySurf: ; 04:697D ld a, 4 jp PartyPromptExit -PartyTryDig: ; 04:6996 +PartyTryDig: callab DigFunction ld a, [wFieldMoveSucceeded] cp $F @@ -1413,7 +1413,7 @@ PartyTryDig: ; 04:6996 ld a, 4 jp PartyPromptExit -PartyCalculateHealth: ; 04:69AB +PartyCalculateHealth: ld a, MON_MAXHP ; might be wrong, was $24 call GetPartyParamLocation ld a, [hli] @@ -1435,24 +1435,24 @@ PartyCalculateHealth: ; 04:69AB callab Functionf218 jp HandleSelectedPokemon -PrintNotHealthyEnoughText: ; 04:69D9 +PrintNotHealthyEnoughText: ld hl, NotHealthyEnoughText call PrintText jp HandleSelectedPokemon -NotHealthyEnoughText: ; 04:69E2 +NotHealthyEnoughText: text "たいりょくが たりません！<PROMPT>" -PrintNeedNewBadgeText: ; 04:69F1 +PrintNeedNewBadgeText: ld hl, NeedNewBadgeText call PrintText jp HandleSelectedPokemon -NeedNewBadgeText: ; 04:69FA +NeedNewBadgeText: text "あたらしい バッジを てにするまで" line "まだ つかえません！<PROMPT>" -PartyPokemonSummary2: ; 04:6A18 +PartyPokemonSummary2: ld hl, wce5f ld a, [hl] push af @@ -1463,7 +1463,7 @@ PartyPokemonSummary2: ; 04:6A18 call ClearBGPalettes jp HandleSelectedPokemon -PokeSummary: ; 04:6A2C +PokeSummary: call ClearBGPalettes call ClearTileMap call ClearSprites @@ -1515,7 +1515,7 @@ PokeSummary: ; 04:6A2C .LastPokeChosen ld de, PartyMenuAttributes call SetMenuAttributes -SummaryDrawPoke: ; 04:6AAC +SummaryDrawPoke: xor a ldh [hBGMapMode], a ld [wSelectedSwapPosition], a @@ -1543,7 +1543,7 @@ SummaryDrawPoke: ; 04:6AAC ld hl, w2DMenuFlags set 6, [hl] jr PartySelectionInputs.PartySelectSkipInputs -PartySelectionInputs: ; 04:6AF9 +PartySelectionInputs: call Get2DMenuJoypad + 3 bit B_BUTTON_F, a jp nz, PartySelectionBackOut @@ -1601,7 +1601,7 @@ PartySelectionInputs: ; 04:6AF9 predef Function2d663 jp PartySelectionInputs -.DrawMovePokeText ; 04:6B84 +.DrawMovePokeText hlcoord 1, 11 lb bc, 6, $12 call ClearBox @@ -1610,7 +1610,7 @@ PartySelectionInputs: ; 04:6AF9 call PlaceString jp PartySelectionInputs -.PartyPokeDetailsAdvancePage ; 04:6B99 +.PartyPokeDetailsAdvancePage ld hl, wWhichPokemon inc [hl] ld a, [wPartyCount] @@ -1619,7 +1619,7 @@ PartySelectionInputs: ; 04:6AF9 dec [hl] jp PartySelectionInputs -.PartyPokeDetailsBackPage ; 04:6BA8 +.PartyPokeDetailsBackPage ld hl, wWhichPokemon ld a, [hl] and a @@ -1627,7 +1627,7 @@ PartySelectionInputs: ; 04:6AF9 dec [hl] jp PokeSummary -.PartyPokeSelect ; 04:6BB4 +.PartyPokeSelect ld a, [wSelectedSwapPosition] and a jr nz, .swap @@ -1664,7 +1664,7 @@ PartySelectionInputs: ; 04:6AF9 call ClearBox jp SummaryDrawPoke -SwapEntries: ; 04:6C06 +SwapEntries: ; values at (hl + [cursor place]-1) ; and (hl + [wSelectedSwapPosition] -1) get swapped push hl ; saves hl @@ -1688,7 +1688,7 @@ SwapEntries: ; 04:6C06 ld [de], a ret -PartySelectionBackOut: ; 04:6C20 +PartySelectionBackOut: xor a ld [wSelectedSwapPosition], a ld hl, w2DMenuFlags @@ -1697,7 +1697,7 @@ PartySelectionBackOut: ; 04:6C20 call ClearTileMap ret -PartyMenuAttributes: ; 04:6C30 +PartyMenuAttributes: ; cursor y ; cursor y ; num rows @@ -1712,37 +1712,37 @@ PartyMenuAttributes: ; 04:6C30 dn 2, 0 db $F3 -PartyTypeText: ; 04:6C38 +PartyTypeText: db "タイプ/ いりょく/@" -PartyPokeDivider: ; 04:6C47 +PartyPokeDivider: db "ーーー@" -PartyMoveText: ; 04:6C4B +PartyMoveText: db "どこに いどうしますか？@" -CheckRegisteredItem: ; 04:6C58 +CheckRegisteredItem: call .RegisteredItem ret -.RegisteredItem ; 04:6C5C +.RegisteredItem call GetRegisteredItemID jr c, .NotRegistered call UseRegisteredItem ret -.NotRegistered ; 04:6C65 +.NotRegistered call RefreshScreen ld hl, .NothingRegisteredText call MenuTextBoxBackup call Function1fea ret -.NothingRegisteredText: ; 04:6C72 +.NothingRegisteredText: text "べんりボタンを おした！" line "⋯しかしなにもおきない！<PROMPT>" -GetRegisteredItemID: ; 04:6C8D +GetRegisteredItemID: ; if you can use the registered item, sets the ID to a ; otherwise sets 0 to a and sets the carry flag ld a, [wRegisteredItem] @@ -1792,13 +1792,13 @@ GetRegisteredItemID: ; 04:6C8D scf ret -UseRegisteredItem: ; 04:6CD9 +UseRegisteredItem: callab CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .RegisteredItemJumptable jp CallJumptable -.RegisteredItemJumptable ; 04:6CEA +.RegisteredItemJumptable dw .CantUse2 dw .CantUse dw .CantUse @@ -1806,21 +1806,21 @@ UseRegisteredItem: ; 04:6CD9 dw .overworld dw .FieldMove -.CantUse ; 04:6CF6 +.CantUse call RefreshScreen call PrintCantUseText call Function1fea and a ret -.UnusedSimpleUse ; 04:6D01 +.UnusedSimpleUse call RefreshScreen call UseItem call Function1fea and a ret -.overworld ; 04:6D0C +.overworld call RefreshScreen ld hl, wVramState res 0, [hl] @@ -1832,7 +1832,7 @@ UseRegisteredItem: ; 04:6CD9 and a ret -.FieldMove ; 04:6D25 +.FieldMove call UseItem ld a, [wFieldMoveSucceeded] and a @@ -1850,7 +1850,7 @@ UseRegisteredItem: ; 04:6CD9 and a ret -TrainerCardLoop: ; 04:6D41 +TrainerCardLoop: ld a, [wVramState] push af xor a @@ -1867,7 +1867,7 @@ TrainerCardLoop: ; 04:6D41 ld [wVramState], a ret -ClearTrainerCardJumptable: ; 04:6D5E +ClearTrainerCardJumptable: ; sets four bytes at wJumpTableIndex to 0 call ClearPalettes ld hl, wJumptableIndex @@ -1882,7 +1882,7 @@ ClearTrainerCardJumptable: ; 04:6D5E call GetSGBLayout ret -HandleTrainerCardJumptable: ; 04:6D75 +HandleTrainerCardJumptable: ld a, [wJumptableIndex] ld e, a ld d, 0 @@ -1894,7 +1894,7 @@ HandleTrainerCardJumptable: ; 04:6D75 ld l, a jp hl -.TrainerCardJumptable: ; 04:6D84 +.TrainerCardJumptable: dw TrainerCardMainPage dw .IncreaseJumpTableIndex dw .IncreaseJumpTableIndex @@ -1914,15 +1914,15 @@ HandleTrainerCardJumptable: ; 04:6D75 dw TrainerCardBadgeInput dw TrainerCardSetClearFlag -.SetPalAndIncJumpTable: ; 04:6DA8 +.SetPalAndIncJumpTable: call SetPalettes -.IncreaseJumpTableIndex: ; 04:6DAB +.IncreaseJumpTableIndex: ld a, [wJumptableIndex] inc a ld [wJumptableIndex], a ret -TrainerCardMainPage: ; 04:6DB3 +TrainerCardMainPage: call ClearPalettes call ClearTileMap call TrainerCardDrawProtag @@ -1943,7 +1943,7 @@ TrainerCardMainPage: ; 04:6DB3 and a ret -TrainerCardMainInputs: ; 04:6DE3 +TrainerCardMainInputs: call EmptyFunction12e37 call GetJoypad ld hl, hJoyDown @@ -1993,10 +1993,10 @@ TrainerCardMainInputs: ; 04:6DE3 and a ret -EmptyFunction12e37: ; 04:6E37 +EmptyFunction12e37: ret -TrainerCardScroll: ; 04:6E38 +TrainerCardScroll: ld a, $90 ldh [hWY], a ld a, $9C @@ -2007,7 +2007,7 @@ TrainerCardScroll: ; 04:6E38 and a ret -TrainerCardClearTileMap: ; 04:6E49 +TrainerCardClearTileMap: xor a ldh [hWY], a ld a, $98 @@ -2019,7 +2019,7 @@ TrainerCardClearTileMap: ; 04:6E49 and a ret -TrainerCardSetWindowY: ; 04:6E5C +TrainerCardSetWindowY: ldh a, [hWY] cp $90 jr nc, TrainerCardClearPals @@ -2028,7 +2028,7 @@ TrainerCardSetWindowY: ; 04:6E5C and a ret -TrainerCardClearPals: ; 04:6E68 +TrainerCardClearPals: call ClearPalettes ld a, $90 ldh [hWY], a @@ -2038,7 +2038,7 @@ TrainerCardClearPals: ; 04:6E68 and a ret -TrainerCardBadgePage: ; 04:6E78 +TrainerCardBadgePage: call ClearPalettes call DisableLCD ld hl, TrainerCardLeadersGFX @@ -2055,7 +2055,7 @@ TrainerCardBadgePage: ; 04:6E78 and a ret -TrainerCardBadgeInput: ; 04:6E9E +TrainerCardBadgeInput: call GetJoypad ld hl, hJoyDown ld a, [hl] @@ -2067,11 +2067,11 @@ TrainerCardBadgeInput: ; 04:6E9E and a ret -TrainerCardSetClearFlag: ; 04:6EB0 +TrainerCardSetClearFlag: scf ret -TrainerCardDrawProtag: ; 04:6EB2 +TrainerCardDrawProtag: ld de, ProtagonistPic ld a, BANK(ProtagonistPic) call UncompressSpriteFromDE @@ -2086,7 +2086,7 @@ TrainerCardDrawProtag: ; 04:6EB2 call InterlaceMergeSpriteBuffers ret -PlaceMiscTilesTrainerCard: ; 04:6ED5 +PlaceMiscTilesTrainerCard: ld a, $30 ldh [hGraphicStartTile], a hlcoord 13, 1 @@ -2094,7 +2094,7 @@ PlaceMiscTilesTrainerCard: ; 04:6ED5 predef PlaceGraphic ret -DrawTrainerCardMainPage: ; 04:6EE5 +DrawTrainerCardMainPage: hlcoord 0, 0 ld d, 5 call PlaceTrainerCardBGTile @@ -2148,31 +2148,31 @@ DrawTrainerCardMainPage: ; 04:6EE5 ld [hl], "▶" ret -TrainerCardText: ; 04:6F7A +TrainerCardText: db "なまえ/<NEXT><NEXT>おこづかい<NEXT><NEXT>#ずかん@" -TrainerCardDexEntriesText: ; 04:6F8C +TrainerCardDexEntriesText: db "ひき@" -TrainerCardNameTiles: ; 04:6F8F +TrainerCardNameTiles: db $0A, $0C, $0D, $0E, $0F, $FF -TrainerCardIDNoTiles: ; 04:6F95 +TrainerCardIDNoTiles: db $22, $23, $FF -TrainerCardNameUnderlineTiles: ; 04:6F98 +TrainerCardNameUnderlineTiles: db $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $0B, $FF -TrainerCardStatusTiles: ; 04:6FA6 +TrainerCardStatusTiles: db $0A, $10, $11, $12, $13, $FF -TrainerCardBadgesOutlineTiles: ; 04:6FAC +TrainerCardBadgesOutlineTiles: db $03, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $7F, $14, $15, $16, $17, $18, $19, $1A, $1B, $1C, $1D, $7F, $7F, $7F, $FE, $BA, $7F, $7F, $7F, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $FF -TrainerCardBadgesTextTiles: ; 04:6FE9 +TrainerCardBadgesTextTiles: db $1E, $1F, $20, $7F, $7F, $7F, $7F, $1B, $1C, $1D, $FF -DrawTrainerCaseBadgePage: ; 04:6FF4 +DrawTrainerCaseBadgePage: hlcoord 0, 0 ld d, $0E call PlaceTrainerCardBGTile @@ -2187,16 +2187,16 @@ DrawTrainerCaseBadgePage: ; 04:6FF4 call PlaceTrainerCardTiles ret -TrainerCardLeagueBadgesTextTiles: ; 04:7018 +TrainerCardLeagueBadgesTextTiles: db "#りーグバッジ@" -TrainerCardBadgesTiles: ; 04:7020 +TrainerCardBadgesTiles: db $0A, $0B, $0C, $0D, $0E, $FF -TrainerCardBadgeSilhouettesTiles: ; 04:7026 +TrainerCardBadgeSilhouettesTiles: db $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $07, $07, $02, $18, $58, $59, $5A, $19, $5B, $5C, $5D, $1A, $6B, $6C, $6D, $1B, $78, $79, $7A, $7F, $07, $07, $02, $7F, $20, $21, $22, $7F, $23, $24, $25, $7F, $26, $27, $28, $7F, $29, $2A, $2B, $7F, $07, $07, $02, $7F, $30, $31, $32, $7F, $33, $34, $35, $7F, $36, $37, $38, $7F, $39, $3A, $3B, $7F, $07, $07, $02, $7F, $40, $41, $42, $7F, $43, $44, $45, $7F, $46, $47, $48, $7F, $49, $4A, $4B, $7F, $07, $07, $05, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $04, $07, $07, $7F, $1C, $68, $69, $6A, $1D, $7E, $6F, $6F, $1E, $5E, $5F, $6E, $1F, $7B, $7C, $7D, $02, $07, $07, $7F, $7F, $2C, $2D, $2E, $7F, $2F, $50, $51, $7F, $52, $53, $54, $7F, $55, $56, $57, $02, $07, $07, $7F, $7F, $3C, $3D, $3E, $7F, $3F, $60, $61, $7F, $62, $63, $64, $7F, $65, $66, $67, $02, $07, $07, $7F, $7F, $4C, $4D, $4E, $7F, $4F, $70, $71, $7F, $72, $73, $74, $7F, $75, $76, $77, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $02, $07, $7F, $7F, $10, $7F, $11, $7F, $12, $7F, $13, $7F, $14, $7F, $15, $7F, $16, $7F, $17, $7F, $02, $07, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $01, $06, $07, $FF -PlaceTrainerCardTiles: ; 04:712B +PlaceTrainerCardTiles: ; takes the tiles from de and places them at hl until FF is found. ld a, [de] cp $FF @@ -2205,7 +2205,7 @@ PlaceTrainerCardTiles: ; 04:712B inc de jr PlaceTrainerCardTiles -PlaceTrainerCardBGTile: ; 04:7133 +PlaceTrainerCardBGTile: ; puts tile $07 (chequered background) at coord hl. ; d controls how many times biggerloop loops. ld e, $14 diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 609e711..4f4b9ee 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -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 "？！１２３４５ ６７８９０ー円" diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 31f43a8..1e1cc51 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -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] diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index c2975c2..8a36294 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -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 diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 77da684..e19eb54 100755 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -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 diff --git a/engine/palettes.asm b/engine/palettes.asm index 1f8f4df..39c38d6 100644 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -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 diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index 929af05..0bb3536 100755 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm @@ -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] diff --git a/engine/predef.asm b/engine/predef.asm index a47d25c..cf2ec8c 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -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 diff --git a/engine/smallflag.asm b/engine/smallflag.asm index c170851..5b5153e 100755 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -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. diff --git a/engine/sprites/sprites.asm b/engine/sprites/sprites.asm index 6d96690..9f9e4e5 100644 --- a/engine/sprites/sprites.asm +++ b/engine/sprites/sprites.asm @@ -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 diff --git a/engine/unknown11d32.asm b/engine/unknown11d32.asm index a4bb40b..0a806e4 100644 --- a/engine/unknown11d32.asm +++ b/engine/unknown11d32.asm @@ -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 diff --git a/engine/unknown_boxes.asm b/engine/unknown_boxes.asm index 378cfdf..d2a6ede 100644 --- a/engine/unknown_boxes.asm +++ b/engine/unknown_boxes.asm @@ -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 "てんそうできません！" @@ -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: diff --git a/home/audio.asm b/home/audio.asm index b2d07c5..508a729 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -240,12 +240,12 @@ SpecialMapMusic:: scf ret -.state2 ; 3e14 +.state2 ld de, MUSIC_NONE scf ret -.normal ; 3e19 +.normal and a ret diff --git a/home/map.asm b/home/map.asm index daaa49b..5bbface 100644 --- a/home/map.asm +++ b/home/map.asm @@ -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 diff --git a/home/map_objects.asm b/home/map_objects.asm index 1dd875e..d567318 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -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 diff --git a/home/menu.asm b/home/menu.asm index e9d41bb..d4b6039 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -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 diff --git a/home/menu_window.asm b/home/menu_window.asm index 5f8465e..4bb44d7 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -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 diff --git a/home/misc_32c8.asm b/home/misc_32c8.asm index 3fafade..a12b81d 100644 --- a/home/misc_32c8.asm +++ b/home/misc_32c8.asm @@ -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 diff --git a/home/pic.asm b/home/pic.asm index 96c013b..b883093 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -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 diff --git a/home/text.asm b/home/text.asm index 4996c99..18722b0 100644 --- a/home/text.asm +++ b/home/text.asm @@ -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 diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm index 798dedb..16fa16c 100644 --- a/home/unknown_388f.asm +++ b/home/unknown_388f.asm @@ -83,7 +83,7 @@ Function3920:: call WriteIntod637 ret -.asm_392d: ; 00:392d +.asm_392d: ld hl, wJoypadFlags res 4, [hl] ld hl, .text diff --git a/home/vcopy.asm b/home/vcopy.asm index aae4a2f..e3d4be8 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -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. @@ -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 diff --git a/macros/wram.asm b/macros/wram.asm index 4433267..094223d 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -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 diff --git a/maps/OldCityPokecenter2F.asm b/maps/OldCityPokecenter2F.asm index b2ed2c7..bc689a1 100644 --- a/maps/OldCityPokecenter2F.asm +++ b/maps/OldCityPokecenter2F.asm @@ -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 diff --git a/maps/OldCityPokecenterBattle.asm b/maps/OldCityPokecenterBattle.asm index a2a1bb0..cd2fadd 100644 --- a/maps/OldCityPokecenterBattle.asm +++ b/maps/OldCityPokecenterBattle.asm @@ -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 "@" diff --git a/maps/OldCityPokecenterTimeMachine.asm b/maps/OldCityPokecenterTimeMachine.asm index 5694775..5e82121 100644 --- a/maps/OldCityPokecenterTimeMachine.asm +++ b/maps/OldCityPokecenterTimeMachine.asm @@ -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 diff --git a/maps/OldCityPokecenterTrade.asm b/maps/OldCityPokecenterTrade.asm index e131339..9c9c7ca 100644 --- a/maps/OldCityPokecenterTrade.asm +++ b/maps/OldCityPokecenterTrade.asm @@ -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 diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm index b4481a0..9626e28 100644 --- a/maps/PlayerHouse1F.asm +++ b/maps/PlayerHouse1F.asm @@ -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 "ポケモンずかんを つくってくれって" diff --git a/maps/PlayerHouse2F.asm b/maps/PlayerHouse2F.asm index 783598f..f684b98 100644 --- a/maps/PlayerHouse2F.asm +++ b/maps/PlayerHouse2F.asm @@ -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 "ラジオのスイッチを おした！" diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm index dcc6f1f..9aca3ce 100644 --- a/maps/Route1Gate1F.asm +++ b/maps/Route1Gate1F.asm @@ -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 "ごじゅうのとう が あるの" diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm index 73c827e..e6d4a20 100644 --- a/maps/Route1Gate2F.asm +++ b/maps/Route1Gate2F.asm @@ -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 "ぼうえんきょうを のぞいた！" diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm index 667d7b0..04a84c5 100644 --- a/maps/Route1P1.asm +++ b/maps/Route1P1.asm @@ -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 diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm index 7427c10..f60fce1 100644 --- a/maps/Route1P2.asm +++ b/maps/Route1P2.asm @@ -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 diff --git a/maps/ShizukanaOka.asm b/maps/ShizukanaOka.asm index 0ade95c..2996c82 100644 --- a/maps/ShizukanaOka.asm +++ b/maps/ShizukanaOka.asm @@ -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 - -ShizukanaOkaTextPointers: ;5664 - dw ShizukanaOkaText1 ;567a - dw ShizukanaOkaTrainer2 ;5681 - dw ShizukanaOkaTrainer3 ;56A8 - dw ShizukanaOkaTrainer4 ;56cf - dw ShizukanaOkaTrainer5 ;56f6 - dw ShizukanaOkaTrainer6 ;571d - -ShizukanaOkaScript: ;5670 + dw ShizukanaOkaSignpost1 + dw ShizukanaOkaSignpost2 + +ShizukanaOkaTextPointers: + dw ShizukanaOkaText1 + dw ShizukanaOkaTrainer2 + dw ShizukanaOkaTrainer3 + dw ShizukanaOkaTrainer4 + dw ShizukanaOkaTrainer5 + dw ShizukanaOkaTrainer6 + +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 diff --git a/maps/SilentHill.asm b/maps/SilentHill.asm index 3cefcc1..804bd4b 100644 --- a/maps/SilentHill.asm +++ b/maps/SilentHill.asm @@ -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 diff --git a/maps/SilentHillHouse.asm b/maps/SilentHillHouse.asm index 7df6b18..fafdf3b 100644 --- a/maps/SilentHillHouse.asm +++ b/maps/SilentHillHouse.asm @@ -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 "ポケモンずかんを つくるんだって？" diff --git a/maps/SilentHillLabBack.asm b/maps/SilentHillLabBack.asm index b23c816..cd28b02 100644 --- a/maps/SilentHillLabBack.asm +++ b/maps/SilentHillLabBack.asm @@ -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 diff --git a/maps/SilentHillLabFront.asm b/maps/SilentHillLabFront.asm index 6c0f84f..6b17838 100644 --- a/maps/SilentHillLabFront.asm +++ b/maps/SilentHillLabFront.asm @@ -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 "はかせの じょしゅ です" diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm index da78335..914e80b 100644 --- a/maps/SilentHillPokecenter.asm +++ b/maps/SilentHillPokecenter.asm @@ -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 diff --git a/maps/UnusedMap13.asm b/maps/UnusedMap13.asm index 4d6488f..22f2b01 100644 --- a/maps/UnusedMap13.asm +++ b/maps/UnusedMap13.asm @@ -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 diff --git a/maps/placeholder/Baadon.asm b/maps/placeholder/Baadon.asm index a80f4d4..ec28632 100644 --- a/maps/placeholder/Baadon.asm +++ b/maps/placeholder/Baadon.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Baadon.asm", ROMX -BaadonScriptLoader:: ; d89f7 (36:49f7) +BaadonScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonHouse1.asm b/maps/placeholder/BaadonHouse1.asm index e84fb66..d4cc840 100644 --- a/maps/placeholder/BaadonHouse1.asm +++ b/maps/placeholder/BaadonHouse1.asm @@ -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 diff --git a/maps/placeholder/BaadonHouse2.asm b/maps/placeholder/BaadonHouse2.asm index 7d1ad92..c2c0280 100644 --- a/maps/placeholder/BaadonHouse2.asm +++ b/maps/placeholder/BaadonHouse2.asm @@ -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 diff --git a/maps/placeholder/BaadonLeague1F.asm b/maps/placeholder/BaadonLeague1F.asm index ecef9ad..3f24f0a 100644 --- a/maps/placeholder/BaadonLeague1F.asm +++ b/maps/placeholder/BaadonLeague1F.asm @@ -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 diff --git a/maps/placeholder/BaadonLeague2F.asm b/maps/placeholder/BaadonLeague2F.asm index 612856c..e18cf6e 100644 --- a/maps/placeholder/BaadonLeague2F.asm +++ b/maps/placeholder/BaadonLeague2F.asm @@ -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 diff --git a/maps/placeholder/BaadonMart.asm b/maps/placeholder/BaadonMart.asm index ba9474e..9bda0fc 100644 --- a/maps/placeholder/BaadonMart.asm +++ b/maps/placeholder/BaadonMart.asm @@ -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 diff --git a/maps/placeholder/BaadonPokecenter1F.asm b/maps/placeholder/BaadonPokecenter1F.asm index 6168062..8dbe247 100644 --- a/maps/placeholder/BaadonPokecenter1F.asm +++ b/maps/placeholder/BaadonPokecenter1F.asm @@ -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 diff --git a/maps/placeholder/BaadonPokecenter2F.asm b/maps/placeholder/BaadonPokecenter2F.asm index 425c391..3827617 100644 --- a/maps/placeholder/BaadonPokecenter2F.asm +++ b/maps/placeholder/BaadonPokecenter2F.asm @@ -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 diff --git a/maps/placeholder/BaadonRoute1.asm b/maps/placeholder/BaadonRoute1.asm index 70e22a7..8df30f7 100644 --- a/maps/placeholder/BaadonRoute1.asm +++ b/maps/placeholder/BaadonRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute1.asm", ROMX -BaadonRoute1ScriptLoader:: ; da601 (36:6601) +BaadonRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRoute2.asm b/maps/placeholder/BaadonRoute2.asm index 1c64254..6a133b4 100644 --- a/maps/placeholder/BaadonRoute2.asm +++ b/maps/placeholder/BaadonRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute2.asm", ROMX -BaadonRoute2ScriptLoader:: ; da7ed (36:67ed) +BaadonRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRoute3.asm b/maps/placeholder/BaadonRoute3.asm index 0687dca..a20f29d 100644 --- a/maps/placeholder/BaadonRoute3.asm +++ b/maps/placeholder/BaadonRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonRoute3.asm", ROMX -BaadonRoute3ScriptLoader:: ; da8d9 (36:68d9) +BaadonRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BaadonRouteGateNewtype.asm b/maps/placeholder/BaadonRouteGateNewtype.asm index b195d03..26e0dd7 100644 --- a/maps/placeholder/BaadonRouteGateNewtype.asm +++ b/maps/placeholder/BaadonRouteGateNewtype.asm @@ -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 diff --git a/maps/placeholder/BaadonRouteGateWest.asm b/maps/placeholder/BaadonRouteGateWest.asm index 0696eae..4fd4b9f 100644 --- a/maps/placeholder/BaadonRouteGateWest.asm +++ b/maps/placeholder/BaadonRouteGateWest.asm @@ -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 diff --git a/maps/placeholder/BaadonWallpaperHouse.asm b/maps/placeholder/BaadonWallpaperHouse.asm index 47e1c45..67fa772 100644 --- a/maps/placeholder/BaadonWallpaperHouse.asm +++ b/maps/placeholder/BaadonWallpaperHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BaadonWallpaperHouse.asm", ROMX -BaadonWallpaperHouseScriptLoader:: ; 9cb27 (27:4b27) +BaadonWallpaperHouseScriptLoader:: ret -BaadonWallpaperHouseTextPointers:: ; 9cb28 (27:4b28) +BaadonWallpaperHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullForest.asm b/maps/placeholder/BullForest.asm index 50ee99d..82e0475 100644 --- a/maps/placeholder/BullForest.asm +++ b/maps/placeholder/BullForest.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForest.asm", ROMX -BullForestScriptLoader:: ; d8f26 (36:4f26) +BullForestScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute1.asm b/maps/placeholder/BullForestRoute1.asm index 9958454..459d42f 100644 --- a/maps/placeholder/BullForestRoute1.asm +++ b/maps/placeholder/BullForestRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute1.asm", ROMX -BullForestRoute1ScriptLoader:: ; dad8d (36:6d8d) +BullForestRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute1House.asm b/maps/placeholder/BullForestRoute1House.asm index 51f2c34..1d4e46e 100644 --- a/maps/placeholder/BullForestRoute1House.asm +++ b/maps/placeholder/BullForestRoute1House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute1House.asm", ROMX -BullForestRoute1HouseScriptLoader:: ; 9d804 (27:5804) +BullForestRoute1HouseScriptLoader:: ret -BullForestRoute1HouseTextPointers:: ; 9d805 (27:5805) +BullForestRoute1HouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullForestRoute2.asm b/maps/placeholder/BullForestRoute2.asm index c02d627..17305bd 100644 --- a/maps/placeholder/BullForestRoute2.asm +++ b/maps/placeholder/BullForestRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute2.asm", ROMX -BullForestRoute2ScriptLoader:: ; db019 (36:7019) +BullForestRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRoute3.asm b/maps/placeholder/BullForestRoute3.asm index 17830a8..a465c21 100644 --- a/maps/placeholder/BullForestRoute3.asm +++ b/maps/placeholder/BullForestRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRoute3.asm", ROMX -BullForestRoute3ScriptLoader:: ; db666 (36:7666) +BullForestRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/BullForestRouteGateStand.asm b/maps/placeholder/BullForestRouteGateStand.asm index c22aee9..94b630e 100644 --- a/maps/placeholder/BullForestRouteGateStand.asm +++ b/maps/placeholder/BullForestRouteGateStand.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullForestRouteGateStand.asm", ROMX -BullForestRouteGateStandScriptLoader:: ; 9d85f (27:585f) +BullForestRouteGateStandScriptLoader:: ret -BullForestRouteGateStandTextPointers:: ; 9d860 (27:5860) +BullForestRouteGateStandTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse1.asm b/maps/placeholder/BullHouse1.asm index 4d501aa..cbaf78a 100644 --- a/maps/placeholder/BullHouse1.asm +++ b/maps/placeholder/BullHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse1.asm", ROMX -BullHouse1ScriptLoader:: ; 9d935 (27:5935) +BullHouse1ScriptLoader:: ret -BullHouse1TextPointers:: ; 9d936 (27:5936) +BullHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse2.asm b/maps/placeholder/BullHouse2.asm index 59494b9..856071e 100644 --- a/maps/placeholder/BullHouse2.asm +++ b/maps/placeholder/BullHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse2.asm", ROMX -BullHouse2ScriptLoader:: ; 9d98f (27:598f) +BullHouse2ScriptLoader:: ret -BullHouse2TextPointers:: ; 9d990 (27:5990) +BullHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse3.asm b/maps/placeholder/BullHouse3.asm index adb18be..56c6913 100644 --- a/maps/placeholder/BullHouse3.asm +++ b/maps/placeholder/BullHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse3.asm", ROMX -BullHouse3ScriptLoader:: ; 9d9e9 (27:59e9) +BullHouse3ScriptLoader:: ret -BullHouse3TextPointers:: ; 9d9ea (27:59ea) +BullHouse3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullHouse4.asm b/maps/placeholder/BullHouse4.asm index 458128e..ebc2ff5 100644 --- a/maps/placeholder/BullHouse4.asm +++ b/maps/placeholder/BullHouse4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullHouse4.asm", ROMX -BullHouse4ScriptLoader:: ; 9dc84 (27:5c84) +BullHouse4ScriptLoader:: ret -BullHouse4TextPointers:: ; 9dc85 (27:5c85) +BullHouse4TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullLeague1F.asm b/maps/placeholder/BullLeague1F.asm index c024114..972d912 100644 --- a/maps/placeholder/BullLeague1F.asm +++ b/maps/placeholder/BullLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullLeague1F.asm", ROMX -BullLeague1FScriptLoader:: ; 9db97 (27:5b97) +BullLeague1FScriptLoader:: ret -BullLeague1FTextPointers:: ; 9db98 (27:5b98) +BullLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullLeague2F.asm b/maps/placeholder/BullLeague2F.asm index 33bccae..b1fd12d 100644 --- a/maps/placeholder/BullLeague2F.asm +++ b/maps/placeholder/BullLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullLeague2F.asm", ROMX -BullLeague2FScriptLoader:: ; 9dc37 (27:5c37) +BullLeague2FScriptLoader:: ret -BullLeague2FTextPointers:: ; 9dc38 (27:5c38) +BullLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullMart.asm b/maps/placeholder/BullMart.asm index 976d80b..7f4578b 100644 --- a/maps/placeholder/BullMart.asm +++ b/maps/placeholder/BullMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullMart.asm", ROMX -BullMartScriptLoader:: ; 9d8df (27:58df) +BullMartScriptLoader:: ret -BullMartTextPointers:: ; 9d8e0 (27:58e0) +BullMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter1F.asm b/maps/placeholder/BullPokecenter1F.asm index ffcd820..8c802d4 100644 --- a/maps/placeholder/BullPokecenter1F.asm +++ b/maps/placeholder/BullPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullPokecenter1F.asm", ROMX -BullPokecenter1FScriptLoader:: ; 9da7d (27:5a7d) +BullPokecenter1FScriptLoader:: ret -BullPokecenter1FTextPointers:: ; 9da7e (27:5a7e) +BullPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/BullPokecenter2F.asm b/maps/placeholder/BullPokecenter2F.asm index 396c634..805df5b 100644 --- a/maps/placeholder/BullPokecenter2F.asm +++ b/maps/placeholder/BullPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/BullPokecenter2F.asm", ROMX -BullPokecenter2FScriptLoader:: ; 9daf6 (27:5af6) +BullPokecenter2FScriptLoader:: ret -BullPokecenter2FTextPointers:: ; 9daf7 (27:5af7) +BullPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/CaveMinecarts1.asm b/maps/placeholder/CaveMinecarts1.asm index f018887..bac37be 100644 --- a/maps/placeholder/CaveMinecarts1.asm +++ b/maps/placeholder/CaveMinecarts1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts1.asm", ROMX -CaveMinecarts1ScriptLoader:: ; bc817 (2f:4817) +CaveMinecarts1ScriptLoader:: ret -CaveMinecarts1TextPointers:: ; bc818 (2f:4818) +CaveMinecarts1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts2.asm b/maps/placeholder/CaveMinecarts2.asm index 8b3fa71..cb37e7f 100644 --- a/maps/placeholder/CaveMinecarts2.asm +++ b/maps/placeholder/CaveMinecarts2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts2.asm", ROMX -CaveMinecarts2ScriptLoader:: ; bc9a2 (2f:49a2) +CaveMinecarts2ScriptLoader:: ret -CaveMinecarts2TextPointers:: ; bc9a3 (2f:49a3) +CaveMinecarts2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts3.asm b/maps/placeholder/CaveMinecarts3.asm index 4c70aff..ac7c5b1 100644 --- a/maps/placeholder/CaveMinecarts3.asm +++ b/maps/placeholder/CaveMinecarts3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts3.asm", ROMX -CaveMinecarts3ScriptLoader:: ; bcb2d (2f:4b2d) +CaveMinecarts3ScriptLoader:: ret -CaveMinecarts3TextPointers:: ; bcb2e (2f:4b2e) +CaveMinecarts3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts4.asm b/maps/placeholder/CaveMinecarts4.asm index 372929c..fa8873f 100644 --- a/maps/placeholder/CaveMinecarts4.asm +++ b/maps/placeholder/CaveMinecarts4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts4.asm", ROMX -CaveMinecarts4ScriptLoader:: ; bccb8 (2f:4cb8) +CaveMinecarts4ScriptLoader:: ret -CaveMinecarts4TextPointers:: ; bccb9 (2f:4cb9) +CaveMinecarts4TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts5.asm b/maps/placeholder/CaveMinecarts5.asm index 9e5c97e..836f478 100644 --- a/maps/placeholder/CaveMinecarts5.asm +++ b/maps/placeholder/CaveMinecarts5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts5.asm", ROMX -CaveMinecarts5ScriptLoader:: ; bce43 (2f:4e43) +CaveMinecarts5ScriptLoader:: ret -CaveMinecarts5TextPointers:: ; bce44 (2f:4e44) +CaveMinecarts5TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts6.asm b/maps/placeholder/CaveMinecarts6.asm index 744a154..32dd57d 100644 --- a/maps/placeholder/CaveMinecarts6.asm +++ b/maps/placeholder/CaveMinecarts6.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts6.asm", ROMX -CaveMinecarts6ScriptLoader:: ; bcf1a (2f:4f1a) +CaveMinecarts6ScriptLoader:: ret -CaveMinecarts6TextPointers:: ; bcf1b (2f:4f1b) +CaveMinecarts6TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/CaveMinecarts7.asm b/maps/placeholder/CaveMinecarts7.asm index 82867d8..c536912 100644 --- a/maps/placeholder/CaveMinecarts7.asm +++ b/maps/placeholder/CaveMinecarts7.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/CaveMinecarts7.asm", ROMX -CaveMinecarts7ScriptLoader:: ; bcff1 (2f:4ff1) +CaveMinecarts7ScriptLoader:: ret -CaveMinecarts7TextPointers:: ; bcff2 (2f:4ff2) +CaveMinecarts7TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Fonto.asm b/maps/placeholder/Fonto.asm index b0f8d5d..29d0143 100644 --- a/maps/placeholder/Fonto.asm +++ b/maps/placeholder/Fonto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Fonto.asm", ROMX -FontoScriptLoader:: ; d88f1 (36:48f1) +FontoScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoHouse.asm b/maps/placeholder/FontoHouse.asm index d46ac7c..d09827e 100644 --- a/maps/placeholder/FontoHouse.asm +++ b/maps/placeholder/FontoHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoHouse.asm", ROMX -FontoHouseScriptLoader:: ; 9c794 (27:4794) +FontoHouseScriptLoader:: ret -FontoHouseTextPointers:: ; 9c795 (27:4795) +FontoHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoLab.asm b/maps/placeholder/FontoLab.asm index 61d9614..1ed547a 100644 --- a/maps/placeholder/FontoLab.asm +++ b/maps/placeholder/FontoLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoLab.asm", ROMX -FontoLabScriptLoader:: ; 9c908 (27:4908) +FontoLabScriptLoader:: ret -FontoLabTextPointers:: ; 9c909 (27:4909) +FontoLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoMart.asm b/maps/placeholder/FontoMart.asm index 288f5ec..7438847 100644 --- a/maps/placeholder/FontoMart.asm +++ b/maps/placeholder/FontoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoMart.asm", ROMX -FontoMartScriptLoader:: ; 9c73a (27:473a) +FontoMartScriptLoader:: ret -FontoMartTextPointers:: ; 9c73b (27:473b) +FontoMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter1F.asm b/maps/placeholder/FontoPokecenter1F.asm index 293e01c..d164e2c 100644 --- a/maps/placeholder/FontoPokecenter1F.asm +++ b/maps/placeholder/FontoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoPokecenter1F.asm", ROMX -FontoPokecenter1FScriptLoader:: ; 9c828 (27:4828) +FontoPokecenter1FScriptLoader:: ret -FontoPokecenter1FTextPointers:: ; 9c829 (27:4829) +FontoPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoPokecenter2F.asm b/maps/placeholder/FontoPokecenter2F.asm index 5026fa9..5ed4416 100644 --- a/maps/placeholder/FontoPokecenter2F.asm +++ b/maps/placeholder/FontoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoPokecenter2F.asm", ROMX -FontoPokecenter2FScriptLoader:: ; 9c8a1 (27:48a1) +FontoPokecenter2FScriptLoader:: ret -FontoPokecenter2FTextPointers:: ; 9c8a2 (27:48a2) +FontoPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRocketHouse.asm b/maps/placeholder/FontoRocketHouse.asm index 3e17893..3d66098 100644 --- a/maps/placeholder/FontoRocketHouse.asm +++ b/maps/placeholder/FontoRocketHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRocketHouse.asm", ROMX -FontoRocketHouseScriptLoader:: ; 9c6ba (27:46ba) +FontoRocketHouseScriptLoader:: ret -FontoRocketHouseTextPointers:: ; 9c6bb (27:46bb) +FontoRocketHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRoute1.asm b/maps/placeholder/FontoRoute1.asm index 63014d4..aa12d5d 100644 --- a/maps/placeholder/FontoRoute1.asm +++ b/maps/placeholder/FontoRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute1.asm", ROMX -FontoRoute1ScriptLoader:: ; da081 (36:6081) +FontoRoute1ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute2.asm b/maps/placeholder/FontoRoute2.asm index f5412f8..3acce58 100644 --- a/maps/placeholder/FontoRoute2.asm +++ b/maps/placeholder/FontoRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute2.asm", ROMX -FontoRoute2ScriptLoader:: ; da2c4 (36:62c4) +FontoRoute2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute3.asm b/maps/placeholder/FontoRoute3.asm index 2786b0b..e609cbf 100644 --- a/maps/placeholder/FontoRoute3.asm +++ b/maps/placeholder/FontoRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute3.asm", ROMX -FontoRoute3ScriptLoader:: ; da4bb (36:64bb) +FontoRoute3ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute4.asm b/maps/placeholder/FontoRoute4.asm index 7427bc0..a0f8eef 100644 --- a/maps/placeholder/FontoRoute4.asm +++ b/maps/placeholder/FontoRoute4.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute4.asm", ROMX -FontoRoute4ScriptLoader:: ; da3b0 (36:63b0) +FontoRoute4ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute5.asm b/maps/placeholder/FontoRoute5.asm index 127fb8f..319bb5e 100644 --- a/maps/placeholder/FontoRoute5.asm +++ b/maps/placeholder/FontoRoute5.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute5.asm", ROMX -FontoRoute5ScriptLoader:: ; db52e (36:752e) +FontoRoute5ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRoute6.asm b/maps/placeholder/FontoRoute6.asm index 36f8506..ebe7575 100644 --- a/maps/placeholder/FontoRoute6.asm +++ b/maps/placeholder/FontoRoute6.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRoute6.asm", ROMX -FontoRoute6ScriptLoader:: ; da1e6 (36:61e6) +FontoRoute6ScriptLoader:: ret db "@" diff --git a/maps/placeholder/FontoRouteGate1.asm b/maps/placeholder/FontoRouteGate1.asm index 596766e..0c812c9 100644 --- a/maps/placeholder/FontoRouteGate1.asm +++ b/maps/placeholder/FontoRouteGate1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate1.asm", ROMX -FontoRouteGate1ScriptLoader:: ; 9c577 (27:4577) +FontoRouteGate1ScriptLoader:: ret -FontoRouteGate1TextPointers:: ; 9c578 (27:4578) +FontoRouteGate1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate2.asm b/maps/placeholder/FontoRouteGate2.asm index a322586..42e4b33 100644 --- a/maps/placeholder/FontoRouteGate2.asm +++ b/maps/placeholder/FontoRouteGate2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate2.asm", ROMX -FontoRouteGate2ScriptLoader:: ; 9c5d2 (27:45d2) +FontoRouteGate2ScriptLoader:: ret -FontoRouteGate2TextPointers:: ; 9c5d3 (27:45d3) +FontoRouteGate2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/FontoRouteGate3.asm b/maps/placeholder/FontoRouteGate3.asm index 1f6f77e..06c58f9 100644 --- a/maps/placeholder/FontoRouteGate3.asm +++ b/maps/placeholder/FontoRouteGate3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/FontoRouteGate3.asm", ROMX -FontoRouteGate3ScriptLoader:: ; 9c62d (27:462d) +FontoRouteGate3ScriptLoader:: ret -FontoRouteGate3TextPointers:: ; 9c62e (27:462e) +FontoRouteGate3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Haiteku.asm b/maps/placeholder/Haiteku.asm index c76361c..7e050f2 100644 --- a/maps/placeholder/Haiteku.asm +++ b/maps/placeholder/Haiteku.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Haiteku.asm", ROMX -HaitekuScriptLoader:: ; d87f6 (36:47f6) +HaitekuScriptLoader:: ret db "@" diff --git a/maps/placeholder/HaitekuAquarium1F.asm b/maps/placeholder/HaitekuAquarium1F.asm index 7841830..f97f03b 100644 --- a/maps/placeholder/HaitekuAquarium1F.asm +++ b/maps/placeholder/HaitekuAquarium1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuAquarium1F.asm", ROMX -HaitekuAquarium1FScriptLoader:: ; 9c4b0 (27:44b0) +HaitekuAquarium1FScriptLoader:: ret -HaitekuAquarium1FTextPointers:: ; 9c4b1 (27:44b1) +HaitekuAquarium1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuAquarium2F.asm b/maps/placeholder/HaitekuAquarium2F.asm index bcb9f99..a3d01ae 100644 --- a/maps/placeholder/HaitekuAquarium2F.asm +++ b/maps/placeholder/HaitekuAquarium2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuAquarium2F.asm", ROMX -HaitekuAquarium2FScriptLoader:: ; 9c51c (27:451c) +HaitekuAquarium2FScriptLoader:: ret -HaitekuAquarium2FTextPointers:: ; 9c51d (27:451d) +HaitekuAquarium2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse1.asm b/maps/placeholder/HaitekuHouse1.asm index 06cddb9..45a58fe 100644 --- a/maps/placeholder/HaitekuHouse1.asm +++ b/maps/placeholder/HaitekuHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuHouse1.asm", ROMX -HaitekuHouse1ScriptLoader:: ; 9c368 (27:4368) +HaitekuHouse1ScriptLoader:: ret -HaitekuHouse1TextPointers:: ; 9c369 (27:4369) +HaitekuHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuHouse2.asm b/maps/placeholder/HaitekuHouse2.asm index 62ed4d8..a51ceec 100644 --- a/maps/placeholder/HaitekuHouse2.asm +++ b/maps/placeholder/HaitekuHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuHouse2.asm", ROMX -HaitekuHouse2ScriptLoader:: ; 9c3c2 (27:43c2) +HaitekuHouse2ScriptLoader:: ret -HaitekuHouse2TextPointers:: ; 9c3c3 (27:43c3) +HaitekuHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuImposterOakHouse.asm b/maps/placeholder/HaitekuImposterOakHouse.asm index 083ce81..856e827 100644 --- a/maps/placeholder/HaitekuImposterOakHouse.asm +++ b/maps/placeholder/HaitekuImposterOakHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuImposterOakHouse.asm", ROMX -HaitekuImposterOakHouseScriptLoader:: ; 9c429 (27:4429) +HaitekuImposterOakHouseScriptLoader:: ret -HaitekuImposterOakHouseTextPointers:: ; 9c42a (27:442a) +HaitekuImposterOakHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague1F.asm b/maps/placeholder/HaitekuLeague1F.asm index cdf39dd..a7f1787 100644 --- a/maps/placeholder/HaitekuLeague1F.asm +++ b/maps/placeholder/HaitekuLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuLeague1F.asm", ROMX -HaitekuLeague1FScriptLoader:: ; 9c1ee (27:41ee) +HaitekuLeague1FScriptLoader:: ret -HaitekuLeague1FTextPointers:: ; 9c1ef (27:41ef) +HaitekuLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuLeague2F.asm b/maps/placeholder/HaitekuLeague2F.asm index 1110f3d..85acc1c 100644 --- a/maps/placeholder/HaitekuLeague2F.asm +++ b/maps/placeholder/HaitekuLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuLeague2F.asm", ROMX -HaitekuLeague2FScriptLoader:: ; 9c28e (27:428e) +HaitekuLeague2FScriptLoader:: ret -HaitekuLeague2FTextPointers:: ; 9c28f (27:428f) +HaitekuLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuMart.asm b/maps/placeholder/HaitekuMart.asm index 94a8e3b..6591b58 100644 --- a/maps/placeholder/HaitekuMart.asm +++ b/maps/placeholder/HaitekuMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuMart.asm", ROMX -HaitekuMartScriptLoader:: ; 9c30e (27:430e) +HaitekuMartScriptLoader:: ret -HaitekuMartTextPointers:: ; 9c30f (27:430f) +HaitekuMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter1F.asm b/maps/placeholder/HaitekuPokecenter1F.asm index cc97c3f..91408d3 100644 --- a/maps/placeholder/HaitekuPokecenter1F.asm +++ b/maps/placeholder/HaitekuPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuPokecenter1F.asm", ROMX -HaitekuPokecenter1FScriptLoader:: ; 9c0d4 (27:40d4) +HaitekuPokecenter1FScriptLoader:: ret -HaitekuPokecenter1FTextPointers:: ; 9c0d5 (27:40d5) +HaitekuPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuPokecenter2F.asm b/maps/placeholder/HaitekuPokecenter2F.asm index 6389551..ea67d63 100644 --- a/maps/placeholder/HaitekuPokecenter2F.asm +++ b/maps/placeholder/HaitekuPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuPokecenter2F.asm", ROMX -HaitekuPokecenter2FScriptLoader:: ; 9c14d (27:414d) +HaitekuPokecenter2FScriptLoader:: ret -HaitekuPokecenter2FTextPointers:: ; 9c14e (27:414e) +HaitekuPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRoute.asm b/maps/placeholder/HaitekuWestRoute.asm index 34c8a9d..51ebdc5 100644 --- a/maps/placeholder/HaitekuWestRoute.asm +++ b/maps/placeholder/HaitekuWestRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRoute.asm", ROMX -HaitekuWestRouteScriptLoader:: ; d9dcf (36:5dcf) +HaitekuWestRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/HaitekuWestRouteGate.asm b/maps/placeholder/HaitekuWestRouteGate.asm index 8a0dcb1..460f3a6 100644 --- a/maps/placeholder/HaitekuWestRouteGate.asm +++ b/maps/placeholder/HaitekuWestRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRouteGate.asm", ROMX -HaitekuWestRouteGateScriptLoader:: ; 9c040 (27:4040) +HaitekuWestRouteGateScriptLoader:: ret -HaitekuWestRouteGateTextPointers:: ; 9c041 (27:4041) +HaitekuWestRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/HaitekuWestRouteOcean.asm b/maps/placeholder/HaitekuWestRouteOcean.asm index e2a6351..ec4fff3 100644 --- a/maps/placeholder/HaitekuWestRouteOcean.asm +++ b/maps/placeholder/HaitekuWestRouteOcean.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/HaitekuWestRouteOcean.asm", ROMX -HaitekuWestRouteOceanScriptLoader:: ; d9f15 (36:5f15) +HaitekuWestRouteOceanScriptLoader:: ret db "@" diff --git a/maps/placeholder/Kanto.asm b/maps/placeholder/Kanto.asm index 1aa686a..90d57b6 100644 --- a/maps/placeholder/Kanto.asm +++ b/maps/placeholder/Kanto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Kanto.asm", ROMX -KantoScriptLoader:: ; d95f1 (36:55f1) +KantoScriptLoader:: ret db "@" diff --git a/maps/placeholder/KantoCeladonElevator.asm b/maps/placeholder/KantoCeladonElevator.asm index 8e94a2f..3978310 100644 --- a/maps/placeholder/KantoCeladonElevator.asm +++ b/maps/placeholder/KantoCeladonElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonElevator.asm", ROMX -KantoCeladonElevatorScriptLoader:: ; 9e764 (27:6764) +KantoCeladonElevatorScriptLoader:: ret -KantoCeladonElevatorTextPointers:: ; 9e765 (27:6765) +KantoCeladonElevatorTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart1F.asm b/maps/placeholder/KantoCeladonMart1F.asm index 96cc18f..fcba348 100644 --- a/maps/placeholder/KantoCeladonMart1F.asm +++ b/maps/placeholder/KantoCeladonMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart1F.asm", ROMX -KantoCeladonMart1FScriptLoader:: ; 9e52c (27:652c) +KantoCeladonMart1FScriptLoader:: ret -KantoCeladonMart1FTextPointers:: ; 9e52d (27:652d) +KantoCeladonMart1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart2F.asm b/maps/placeholder/KantoCeladonMart2F.asm index ff41e85..f540b05 100644 --- a/maps/placeholder/KantoCeladonMart2F.asm +++ b/maps/placeholder/KantoCeladonMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart2F.asm", ROMX -KantoCeladonMart2FScriptLoader:: ; 9e5a6 (27:65a6) +KantoCeladonMart2FScriptLoader:: ret -KantoCeladonMart2FTextPointers:: ; 9e5a7 (27:65a7) +KantoCeladonMart2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart3F.asm b/maps/placeholder/KantoCeladonMart3F.asm index adbdb10..1576c0d 100644 --- a/maps/placeholder/KantoCeladonMart3F.asm +++ b/maps/placeholder/KantoCeladonMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart3F.asm", ROMX -KantoCeladonMart3FScriptLoader:: ; 9e620 (27:6620) +KantoCeladonMart3FScriptLoader:: ret -KantoCeladonMart3FTextPointers:: ; 9e621 (27:6621) +KantoCeladonMart3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart4F.asm b/maps/placeholder/KantoCeladonMart4F.asm index fb39f9b..b26853e 100644 --- a/maps/placeholder/KantoCeladonMart4F.asm +++ b/maps/placeholder/KantoCeladonMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart4F.asm", ROMX -KantoCeladonMart4FScriptLoader:: ; 9e6a7 (27:66a7) +KantoCeladonMart4FScriptLoader:: ret -KantoCeladonMart4FTextPointers:: ; 9e6a8 (27:66a8) +KantoCeladonMart4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeladonMart5F.asm b/maps/placeholder/KantoCeladonMart5F.asm index 10f1613..fd3cf58 100644 --- a/maps/placeholder/KantoCeladonMart5F.asm +++ b/maps/placeholder/KantoCeladonMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeladonMart5F.asm", ROMX -KantoCeladonMart5FScriptLoader:: ; 9e727 (27:6727) +KantoCeladonMart5FScriptLoader:: ret -KantoCeladonMart5FTextPointers:: ; 9e728 (27:6728) +KantoCeladonMart5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoCeruleanHouse.asm b/maps/placeholder/KantoCeruleanHouse.asm index a2d626a..ac4db75 100644 --- a/maps/placeholder/KantoCeruleanHouse.asm +++ b/maps/placeholder/KantoCeruleanHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoCeruleanHouse.asm", ROMX -KantoCeruleanHouseScriptLoader:: ; 9e203 (27:6203) +KantoCeruleanHouseScriptLoader:: ret -KantoCeruleanHouseTextPointers:: ; 9e204 (27:6204) +KantoCeruleanHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoDiner.asm b/maps/placeholder/KantoDiner.asm index bc458f9..573ef52 100644 --- a/maps/placeholder/KantoDiner.asm +++ b/maps/placeholder/KantoDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoDiner.asm", ROMX -KantoDinerScriptLoader:: ; 9ed36 (27:6d36) +KantoDinerScriptLoader:: ret -KantoDinerTextPointers:: ; 9ed37 (27:6d37) +KantoDinerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoEastRoute.asm b/maps/placeholder/KantoEastRoute.asm index 17775ea..370dbb3 100644 --- a/maps/placeholder/KantoEastRoute.asm +++ b/maps/placeholder/KantoEastRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoEastRoute.asm", ROMX -KantoEastRouteScriptLoader:: ; db24b (36:724b) +KantoEastRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/KantoEldersHouse.asm b/maps/placeholder/KantoEldersHouse.asm index cac2c7e..29fbbaf 100644 --- a/maps/placeholder/KantoEldersHouse.asm +++ b/maps/placeholder/KantoEldersHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoEldersHouse.asm", ROMX -KantoEldersHouseScriptLoader:: ; 9f0ca (27:70ca) +KantoEldersHouseScriptLoader:: ret -KantoEldersHouseTextPointers:: ; 9f0cb (27:70cb) +KantoEldersHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoFishingGuru.asm b/maps/placeholder/KantoFishingGuru.asm index 38e5f67..a75885c 100644 --- a/maps/placeholder/KantoFishingGuru.asm +++ b/maps/placeholder/KantoFishingGuru.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoFishingGuru.asm", ROMX -KantoFishingGuruScriptLoader:: ; 9f2bb (27:72bb) +KantoFishingGuruScriptLoader:: ret -KantoFishingGuruTextPointers:: ; 9f2bc (27:72bc) +KantoFishingGuruTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGameCorner.asm b/maps/placeholder/KantoGameCorner.asm index 78ad406..23b2357 100644 --- a/maps/placeholder/KantoGameCorner.asm +++ b/maps/placeholder/KantoGameCorner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGameCorner.asm", ROMX -KantoGameCornerScriptLoader:: ; 9ec3a (27:6c3a) +KantoGameCornerScriptLoader:: ret -KantoGameCornerTextPointers:: ; 9ec3b (27:6c3b) +KantoGameCornerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGameCornerPrizes.asm b/maps/placeholder/KantoGameCornerPrizes.asm index f636120..d4a580a 100644 --- a/maps/placeholder/KantoGameCornerPrizes.asm +++ b/maps/placeholder/KantoGameCornerPrizes.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGameCornerPrizes.asm", ROMX -KantoGameCornerPrizesScriptLoader:: ; 9ece9 (27:6ce9) +KantoGameCornerPrizesScriptLoader:: ret -KantoGameCornerPrizesTextPointers:: ; 9ecea (27:6cea) +KantoGameCornerPrizesTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ1.asm b/maps/placeholder/KantoGamefreakHQ1.asm index 941f59c..329b6c0 100644 --- a/maps/placeholder/KantoGamefreakHQ1.asm +++ b/maps/placeholder/KantoGamefreakHQ1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ1.asm", ROMX -KantoGamefreakHQ1ScriptLoader:: ; 9e87e (27:687e) +KantoGamefreakHQ1ScriptLoader:: ret -KantoGamefreakHQ1TextPointers:: ; 9e87f (27:687f) +KantoGamefreakHQ1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ2.asm b/maps/placeholder/KantoGamefreakHQ2.asm index faa65eb..6f4617d 100644 --- a/maps/placeholder/KantoGamefreakHQ2.asm +++ b/maps/placeholder/KantoGamefreakHQ2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ2.asm", ROMX -KantoGamefreakHQ2ScriptLoader:: ; 9e8ea (27:68ea) +KantoGamefreakHQ2ScriptLoader:: ret -KantoGamefreakHQ2TextPointers:: ; 9e8eb (27:68eb) +KantoGamefreakHQ2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ3.asm b/maps/placeholder/KantoGamefreakHQ3.asm index 2fac35b..2307240 100644 --- a/maps/placeholder/KantoGamefreakHQ3.asm +++ b/maps/placeholder/KantoGamefreakHQ3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ3.asm", ROMX -KantoGamefreakHQ3ScriptLoader:: ; 9e970 (27:6970) +KantoGamefreakHQ3ScriptLoader:: ret -KantoGamefreakHQ3TextPointers:: ; 9e971 (27:6971) +KantoGamefreakHQ3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ4.asm b/maps/placeholder/KantoGamefreakHQ4.asm index 3f70570..ff2b22e 100644 --- a/maps/placeholder/KantoGamefreakHQ4.asm +++ b/maps/placeholder/KantoGamefreakHQ4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ4.asm", ROMX -KantoGamefreakHQ4ScriptLoader:: ; 9e9c8 (27:69c8) +KantoGamefreakHQ4ScriptLoader:: ret -KantoGamefreakHQ4TextPointers:: ; 9e9c9 (27:69c9) +KantoGamefreakHQ4TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGamefreakHQ5.asm b/maps/placeholder/KantoGamefreakHQ5.asm index aaafd57..fc2e11e 100644 --- a/maps/placeholder/KantoGamefreakHQ5.asm +++ b/maps/placeholder/KantoGamefreakHQ5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGamefreakHQ5.asm", ROMX -KantoGamefreakHQ5ScriptLoader:: ; 9ea11 (27:6a11) +KantoGamefreakHQ5ScriptLoader:: ret -KantoGamefreakHQ5TextPointers:: ; 9ea12 (27:6a12) +KantoGamefreakHQ5TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse1F.asm b/maps/placeholder/KantoGreensHouse1F.asm index 83616bb..eaf5171 100644 --- a/maps/placeholder/KantoGreensHouse1F.asm +++ b/maps/placeholder/KantoGreensHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGreensHouse1F.asm", ROMX -KantoGreensHouse1FScriptLoader:: ; 9f021 (27:7021) +KantoGreensHouse1FScriptLoader:: ret -KantoGreensHouse1FTextPointers:: ; 9f022 (27:7022) +KantoGreensHouse1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoGreensHouse2F.asm b/maps/placeholder/KantoGreensHouse2F.asm index 94a7d81..67715fe 100644 --- a/maps/placeholder/KantoGreensHouse2F.asm +++ b/maps/placeholder/KantoGreensHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoGreensHouse2F.asm", ROMX -KantoGreensHouse2FScriptLoader:: ; 9f063 (27:7063) +KantoGreensHouse2FScriptLoader:: ret -KantoGreensHouse2FTextPointers:: ; 9f064 (27:7064) +KantoGreensHouse2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoHospital.asm b/maps/placeholder/KantoHospital.asm index ec711de..9b8f8f4 100644 --- a/maps/placeholder/KantoHospital.asm +++ b/maps/placeholder/KantoHospital.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoHospital.asm", ROMX -KantoHospitalScriptLoader:: ; 9ee50 (27:6e50) +KantoHospitalScriptLoader:: ret -KantoHospitalTextPointers:: ; 9ee51 (27:6e51) +KantoHospitalTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLavenderHouse.asm b/maps/placeholder/KantoLavenderHouse.asm index f616024..c440b6e 100644 --- a/maps/placeholder/KantoLavenderHouse.asm +++ b/maps/placeholder/KantoLavenderHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLavenderHouse.asm", ROMX -KantoLavenderHouseScriptLoader:: ; 9e4b8 (27:64b8) +KantoLavenderHouseScriptLoader:: ret -KantoLavenderHouseTextPointers:: ; 9e4b9 (27:64b9) +KantoLavenderHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague1F.asm b/maps/placeholder/KantoLeague1F.asm index b051d2b..98208e4 100644 --- a/maps/placeholder/KantoLeague1F.asm +++ b/maps/placeholder/KantoLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague1F.asm", ROMX -KantoLeague1FScriptLoader:: ; 9e3b1 (27:63b1) +KantoLeague1FScriptLoader:: ret -KantoLeague1FTextPointers:: ; 9e3b2 (27:63b2) +KantoLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague21F.asm b/maps/placeholder/KantoLeague21F.asm index 0162f5e..65d8379 100644 --- a/maps/placeholder/KantoLeague21F.asm +++ b/maps/placeholder/KantoLeague21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague21F.asm", ROMX -KantoLeague21FScriptLoader:: ; 9f1c1 (27:71c1) +KantoLeague21FScriptLoader:: ret -KantoLeague21FTextPointers:: ; 9f1c2 (27:71c2) +KantoLeague21FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague22F.asm b/maps/placeholder/KantoLeague22F.asm index 520e800..2b1ef47 100644 --- a/maps/placeholder/KantoLeague22F.asm +++ b/maps/placeholder/KantoLeague22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague22F.asm", ROMX -KantoLeague22FScriptLoader:: ; 9f261 (27:7261) +KantoLeague22FScriptLoader:: ret -KantoLeague22FTextPointers:: ; 9f262 (27:7262) +KantoLeague22FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoLeague2F.asm b/maps/placeholder/KantoLeague2F.asm index 72dfd5d..ea2b121 100644 --- a/maps/placeholder/KantoLeague2F.asm +++ b/maps/placeholder/KantoLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoLeague2F.asm", ROMX -KantoLeague2FScriptLoader:: ; 9e451 (27:6451) +KantoLeague2FScriptLoader:: ret -KantoLeague2FTextPointers:: ; 9e452 (27:6452) +KantoLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoMart.asm b/maps/placeholder/KantoMart.asm index d004b04..8878e4a 100644 --- a/maps/placeholder/KantoMart.asm +++ b/maps/placeholder/KantoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoMart.asm", ROMX -KantoMartScriptLoader:: ; 9e7e4 (27:67e4) +KantoMartScriptLoader:: ret -KantoMartTextPointers:: ; 9e7e5 (27:67e5) +KantoMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoOaksLab.asm b/maps/placeholder/KantoOaksLab.asm index 077e4b0..a57ac46 100644 --- a/maps/placeholder/KantoOaksLab.asm +++ b/maps/placeholder/KantoOaksLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoOaksLab.asm", ROMX -KantoOaksLabScriptLoader:: ; 9f120 (27:7120) +KantoOaksLabScriptLoader:: ret -KantoOaksLabTextPointers:: ; 9f121 (27:7121) +KantoOaksLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter1F.asm b/maps/placeholder/KantoPokecenter1F.asm index 961fe67..58c73ef 100644 --- a/maps/placeholder/KantoPokecenter1F.asm +++ b/maps/placeholder/KantoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter1F.asm", ROMX -KantoPokecenter1FScriptLoader:: ; 9e297 (27:6297) +KantoPokecenter1FScriptLoader:: ret -KantoPokecenter1FTextPointers:: ; 9e298 (27:6298) +KantoPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter21F.asm b/maps/placeholder/KantoPokecenter21F.asm index 9f776e3..542cbe4 100644 --- a/maps/placeholder/KantoPokecenter21F.asm +++ b/maps/placeholder/KantoPokecenter21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter21F.asm", ROMX -KantoPokecenter21FScriptLoader:: ; 9eee4 (27:6ee4) +KantoPokecenter21FScriptLoader:: ret -KantoPokecenter21FTextPointers:: ; 9eee5 (27:6ee5) +KantoPokecenter21FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter22F.asm b/maps/placeholder/KantoPokecenter22F.asm index 4220aee..d29357a 100644 --- a/maps/placeholder/KantoPokecenter22F.asm +++ b/maps/placeholder/KantoPokecenter22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter22F.asm", ROMX -KantoPokecenter22FScriptLoader:: ; 9ef5d (27:6f5d) +KantoPokecenter22FScriptLoader:: ret -KantoPokecenter22FTextPointers:: ; 9ef5e (27:6f5e) +KantoPokecenter22FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoPokecenter2F.asm b/maps/placeholder/KantoPokecenter2F.asm index d9f03d0..9800129 100644 --- a/maps/placeholder/KantoPokecenter2F.asm +++ b/maps/placeholder/KantoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoPokecenter2F.asm", ROMX -KantoPokecenter2FScriptLoader:: ; 9e310 (27:6310) +KantoPokecenter2FScriptLoader:: ret -KantoPokecenter2FTextPointers:: ; 9e311 (27:6311) +KantoPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoRedsHouse.asm b/maps/placeholder/KantoRedsHouse.asm index 1aec64d..13c479c 100644 --- a/maps/placeholder/KantoRedsHouse.asm +++ b/maps/placeholder/KantoRedsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoRedsHouse.asm", ROMX -KantoRedsHouseScriptLoader:: ; 9efc4 (27:6fc4) +KantoRedsHouseScriptLoader:: ret -KantoRedsHouseTextPointers:: ; 9efc5 (27:6fc5) +KantoRedsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoSchool.asm b/maps/placeholder/KantoSchool.asm index 9053e21..3477b1e 100644 --- a/maps/placeholder/KantoSchool.asm +++ b/maps/placeholder/KantoSchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoSchool.asm", ROMX -KantoSchoolScriptLoader:: ; 9edd0 (27:6dd0) +KantoSchoolScriptLoader:: ret -KantoSchoolTextPointers:: ; 9edd1 (27:6dd1) +KantoSchoolTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoSilphCo.asm b/maps/placeholder/KantoSilphCo.asm index 4cbe780..3d19d1e 100644 --- a/maps/placeholder/KantoSilphCo.asm +++ b/maps/placeholder/KantoSilphCo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoSilphCo.asm", ROMX -KantoSilphCoScriptLoader:: ; 9eac4 (27:6ac4) +KantoSilphCoScriptLoader:: ret -KantoSilphCoTextPointers:: ; 9eac5 (27:6ac5) +KantoSilphCoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoUnusedArea.asm b/maps/placeholder/KantoUnusedArea.asm index 7b5a07e..c69df11 100644 --- a/maps/placeholder/KantoUnusedArea.asm +++ b/maps/placeholder/KantoUnusedArea.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoUnusedArea.asm", ROMX -KantoUnusedAreaScriptLoader:: ; 9ec75 (27:6c75) +KantoUnusedAreaScriptLoader:: ret -KantoUnusedAreaTextPointers:: ; 9ec76 (27:6c76) +KantoUnusedAreaTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/KantoViridianHouse.asm b/maps/placeholder/KantoViridianHouse.asm index 5d70660..381042d 100644 --- a/maps/placeholder/KantoViridianHouse.asm +++ b/maps/placeholder/KantoViridianHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/KantoViridianHouse.asm", ROMX -KantoViridianHouseScriptLoader:: ; 9eb2b (27:6b2b) +KantoViridianHouseScriptLoader:: ret -KantoViridianHouseTextPointers:: ; 9eb2c (27:6b2c) +KantoViridianHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/MtFuji.asm b/maps/placeholder/MtFuji.asm index 0998279..adc354a 100644 --- a/maps/placeholder/MtFuji.asm +++ b/maps/placeholder/MtFuji.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/MtFuji.asm", ROMX -MtFujiScriptLoader:: ; d96ed (36:56ed) +MtFujiScriptLoader:: ret db "@" diff --git a/maps/placeholder/MtFujiRoute.asm b/maps/placeholder/MtFujiRoute.asm index 53f5031..2103337 100644 --- a/maps/placeholder/MtFujiRoute.asm +++ b/maps/placeholder/MtFujiRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/MtFujiRoute.asm", ROMX -MtFujiRouteScriptLoader:: ; db442 (36:7442) +MtFujiRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/Newtype.asm b/maps/placeholder/Newtype.asm index 8befb80..f13018d 100644 --- a/maps/placeholder/Newtype.asm +++ b/maps/placeholder/Newtype.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Newtype.asm", ROMX -NewtypeScriptLoader:: ; d8c38 (36:4c38) +NewtypeScriptLoader:: ret db "@" diff --git a/maps/placeholder/NewtypeDiner.asm b/maps/placeholder/NewtypeDiner.asm index 0be3f5d..783a718 100644 --- a/maps/placeholder/NewtypeDiner.asm +++ b/maps/placeholder/NewtypeDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeDiner.asm", ROMX -NewtypeDinerScriptLoader:: ; 9d211 (27:5211) +NewtypeDinerScriptLoader:: ret -NewtypeDinerTextPointers:: ; 9d212 (27:5212) +NewtypeDinerTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeDojo.asm b/maps/placeholder/NewtypeDojo.asm index 165e210..6ce2743 100644 --- a/maps/placeholder/NewtypeDojo.asm +++ b/maps/placeholder/NewtypeDojo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeDojo.asm", ROMX -NewtypeDojoScriptLoader:: ; 9d13a (27:513a) +NewtypeDojoScriptLoader:: ret -NewtypeDojoTextPointers:: ; 9d13b (27:513b) +NewtypeDojoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse1.asm b/maps/placeholder/NewtypeHouse1.asm index 3c0be72..4dc930f 100644 --- a/maps/placeholder/NewtypeHouse1.asm +++ b/maps/placeholder/NewtypeHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse1.asm", ROMX -NewtypeHouse1ScriptLoader:: ; 9d194 (27:5194) +NewtypeHouse1ScriptLoader:: ret -NewtypeHouse1TextPointers:: ; 9d195 (27:5195) +NewtypeHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse2.asm b/maps/placeholder/NewtypeHouse2.asm index e9bdc91..e348e28 100644 --- a/maps/placeholder/NewtypeHouse2.asm +++ b/maps/placeholder/NewtypeHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse2.asm", ROMX -NewtypeHouse2ScriptLoader:: ; 9d26b (27:526b) +NewtypeHouse2ScriptLoader:: ret -NewtypeHouse2TextPointers:: ; 9d26c (27:526c) +NewtypeHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeHouse3.asm b/maps/placeholder/NewtypeHouse3.asm index f10260f..1ac4b19 100644 --- a/maps/placeholder/NewtypeHouse3.asm +++ b/maps/placeholder/NewtypeHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeHouse3.asm", ROMX -NewtypeHouse3ScriptLoader:: ; 9d2c5 (27:52c5) +NewtypeHouse3ScriptLoader:: ret -NewtypeHouse3TextPointers:: ; 9d2c6 (27:52c6) +NewtypeHouse3TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague1F.asm b/maps/placeholder/NewtypeLeague1F.asm index 3660e32..fc9bfa5 100644 --- a/maps/placeholder/NewtypeLeague1F.asm +++ b/maps/placeholder/NewtypeLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeLeague1F.asm", ROMX -NewtypeLeague1FScriptLoader:: ; 9cf26 (27:4f26) +NewtypeLeague1FScriptLoader:: ret -NewtypeLeague1FTextPointers:: ; 9cf27 (27:4f27) +NewtypeLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeLeague2F.asm b/maps/placeholder/NewtypeLeague2F.asm index cd27b73..0fc1764 100644 --- a/maps/placeholder/NewtypeLeague2F.asm +++ b/maps/placeholder/NewtypeLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeLeague2F.asm", ROMX -NewtypeLeague2FScriptLoader:: ; 9cfc6 (27:4fc6) +NewtypeLeague2FScriptLoader:: ret -NewtypeLeague2FTextPointers:: ; 9cfc7 (27:4fc7) +NewtypeLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeMart.asm b/maps/placeholder/NewtypeMart.asm index 400628d..00d7ab1 100644 --- a/maps/placeholder/NewtypeMart.asm +++ b/maps/placeholder/NewtypeMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeMart.asm", ROMX -NewtypeMartScriptLoader:: ; 9d0a0 (27:50a0) +NewtypeMartScriptLoader:: ret -NewtypeMartTextPointers:: ; 9d0a1 (27:50a1) +NewtypeMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter1F.asm b/maps/placeholder/NewtypePokecenter1F.asm index 2964b15..172a8dc 100644 --- a/maps/placeholder/NewtypePokecenter1F.asm +++ b/maps/placeholder/NewtypePokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypePokecenter1F.asm", ROMX -NewtypePokecenter1FScriptLoader:: ; 9ce0c (27:4e0c) +NewtypePokecenter1FScriptLoader:: ret -NewtypePokecenter1FTextPointers:: ; 9ce0d (27:4e0d) +NewtypePokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypePokecenter2F.asm b/maps/placeholder/NewtypePokecenter2F.asm index e79a350..50f8b74 100644 --- a/maps/placeholder/NewtypePokecenter2F.asm +++ b/maps/placeholder/NewtypePokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypePokecenter2F.asm", ROMX -NewtypePokecenter2FScriptLoader:: ; 9ce85 (27:4e85) +NewtypePokecenter2FScriptLoader:: ret -NewtypePokecenter2FTextPointers:: ; 9ce86 (27:4e86) +NewtypePokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeRoute.asm b/maps/placeholder/NewtypeRoute.asm index e9e6eeb..5e49dd4 100644 --- a/maps/placeholder/NewtypeRoute.asm +++ b/maps/placeholder/NewtypeRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeRoute.asm", ROMX -NewtypeRouteScriptLoader:: ; daa6c (36:6a6c) +NewtypeRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/NewtypeRouteGate.asm b/maps/placeholder/NewtypeRouteGate.asm index 209213d..506003c 100644 --- a/maps/placeholder/NewtypeRouteGate.asm +++ b/maps/placeholder/NewtypeRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeRouteGate.asm", ROMX -NewtypeRouteGateScriptLoader:: ; 9d406 (27:5406) +NewtypeRouteGateScriptLoader:: ret -NewtypeRouteGateTextPointers:: ; 9d407 (27:5407) +NewtypeRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NewtypeSailorHouse.asm b/maps/placeholder/NewtypeSailorHouse.asm index a1052a9..25464fd 100644 --- a/maps/placeholder/NewtypeSailorHouse.asm +++ b/maps/placeholder/NewtypeSailorHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NewtypeSailorHouse.asm", ROMX -NewtypeSailorHouseScriptLoader:: ; 9d020 (27:5020) +NewtypeSailorHouseScriptLoader:: ret -NewtypeSailorHouseTextPointers:: ; 9d021 (27:5021) +NewtypeSailorHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/North.asm b/maps/placeholder/North.asm index e5d56a2..6ed8795 100644 --- a/maps/placeholder/North.asm +++ b/maps/placeholder/North.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/North.asm", ROMX -NorthScriptLoader:: ; d99dd (36:59dd) +NorthScriptLoader:: ret db "@" diff --git a/maps/placeholder/NorthHouse1.asm b/maps/placeholder/NorthHouse1.asm index c03412c..5533904 100644 --- a/maps/placeholder/NorthHouse1.asm +++ b/maps/placeholder/NorthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthHouse1.asm", ROMX -NorthHouse1ScriptLoader:: ; 9f556 (27:7556) +NorthHouse1ScriptLoader:: ret -NorthHouse1TextPointers:: ; 9f557 (27:7557) +NorthHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthHouse2.asm b/maps/placeholder/NorthHouse2.asm index 72c576a..de016ba 100644 --- a/maps/placeholder/NorthHouse2.asm +++ b/maps/placeholder/NorthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthHouse2.asm", ROMX -NorthHouse2ScriptLoader:: ; 9f630 (27:7630) +NorthHouse2ScriptLoader:: ret -NorthHouse2TextPointers:: ; 9f631 (27:7631) +NorthHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthMart.asm b/maps/placeholder/NorthMart.asm index b650193..383c905 100644 --- a/maps/placeholder/NorthMart.asm +++ b/maps/placeholder/NorthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthMart.asm", ROMX -NorthMartScriptLoader:: ; 9f5d6 (27:75d6) +NorthMartScriptLoader:: ret -NorthMartTextPointers:: ; 9f5d7 (27:75d7) +NorthMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter1F.asm b/maps/placeholder/NorthPokecenter1F.asm index 85f6bd7..d8352a5 100644 --- a/maps/placeholder/NorthPokecenter1F.asm +++ b/maps/placeholder/NorthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthPokecenter1F.asm", ROMX -NorthPokecenter1FScriptLoader:: ; 9f6c4 (27:76c4) +NorthPokecenter1FScriptLoader:: ret -NorthPokecenter1FTextPointers:: ; 9f6c5 (27:76c5) +NorthPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/NorthPokecenter2F.asm b/maps/placeholder/NorthPokecenter2F.asm index add721e..968a288 100644 --- a/maps/placeholder/NorthPokecenter2F.asm +++ b/maps/placeholder/NorthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/NorthPokecenter2F.asm", ROMX -NorthPokecenter2FScriptLoader:: ; 9f73d (27:773d) +NorthPokecenter2FScriptLoader:: ret -NorthPokecenter2FTextPointers:: ; 9f73e (27:773e) +NorthPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Office1.asm b/maps/placeholder/Office1.asm index e3b1cf0..2ff6830 100644 --- a/maps/placeholder/Office1.asm +++ b/maps/placeholder/Office1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office1.asm", ROMX -Office1ScriptLoader:: ; bd06e (2f:506e) +Office1ScriptLoader:: ret -Office1TextPointers:: ; bd06f (2f:506f) +Office1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Office2.asm b/maps/placeholder/Office2.asm index 492d897..59cc8e3 100644 --- a/maps/placeholder/Office2.asm +++ b/maps/placeholder/Office2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office2.asm", ROMX -Office2ScriptLoader:: ; bd19f (2f:519f) +Office2ScriptLoader:: ret -Office2TextPointers:: ; bd1a0 (2f:51a0) +Office2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Office3.asm b/maps/placeholder/Office3.asm index 88af96b..62a014e 100644 --- a/maps/placeholder/Office3.asm +++ b/maps/placeholder/Office3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Office3.asm", ROMX -Office3ScriptLoader:: ; bd276 (2f:5276) +Office3ScriptLoader:: ret -Office3TextPointers:: ; bd277 (2f:5277) +Office3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/OldCity.asm b/maps/placeholder/OldCity.asm index 4584065..dfe8f1d 100644 --- a/maps/placeholder/OldCity.asm +++ b/maps/placeholder/OldCity.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCity.asm", ROMX -OldCityScriptLoader:: ; d8370 (36:4370) +OldCityScriptLoader:: ret db "@" diff --git a/maps/placeholder/OldCityBillsHouse.asm b/maps/placeholder/OldCityBillsHouse.asm index 239ea58..61d4b41 100644 --- a/maps/placeholder/OldCityBillsHouse.asm +++ b/maps/placeholder/OldCityBillsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityBillsHouse.asm", ROMX -OldCityBillsHouseScriptLoader:: ; 9454f (25:454f) +OldCityBillsHouseScriptLoader:: ret -OldCityBillsHouseTextPointers:: ; 94550 (25:4550) +OldCityBillsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityGym.asm b/maps/placeholder/OldCityGym.asm index 18e3c0b..d34f8a5 100644 --- a/maps/placeholder/OldCityGym.asm +++ b/maps/placeholder/OldCityGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityGym.asm", ROMX -OldCityGymScriptLoader:: ; 9426e (25:426e) +OldCityGymScriptLoader:: ret -OldCityGymTextPointers:: ; 9426f (25:426f) +OldCityGymTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityHouse.asm b/maps/placeholder/OldCityHouse.asm index 0f1c9c8..d723f61 100644 --- a/maps/placeholder/OldCityHouse.asm +++ b/maps/placeholder/OldCityHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityHouse.asm", ROMX -OldCityHouseScriptLoader:: ; 94653 (25:4653) +OldCityHouseScriptLoader:: ret -OldCityHouseTextPointers:: ; 94654 (25:4654) +OldCityHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityKurtsHouse.asm b/maps/placeholder/OldCityKurtsHouse.asm index 9291c8c..0609384 100644 --- a/maps/placeholder/OldCityKurtsHouse.asm +++ b/maps/placeholder/OldCityKurtsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityKurtsHouse.asm", ROMX -OldCityKurtsHouseScriptLoader:: ; 94a0b (25:4a0b) +OldCityKurtsHouseScriptLoader:: ret -OldCityKurtsHouseTextPointers:: ; 94a0c (25:4a0c) +OldCityKurtsHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityMart.asm b/maps/placeholder/OldCityMart.asm index 9770dd0..3472f8b 100644 --- a/maps/placeholder/OldCityMart.asm +++ b/maps/placeholder/OldCityMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityMart.asm", ROMX -OldCityMartScriptLoader:: ; 945d3 (25:45d3) +OldCityMartScriptLoader:: ret -OldCityMartTextPointers:: ; 945d4 (25:45d4) +OldCityMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityMuseum.asm b/maps/placeholder/OldCityMuseum.asm index f344580..e4222ff 100644 --- a/maps/placeholder/OldCityMuseum.asm +++ b/maps/placeholder/OldCityMuseum.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityMuseum.asm", ROMX -OldCityMuseumScriptLoader:: ; 941b2 (25:41b2) +OldCityMuseumScriptLoader:: ret -OldCityMuseumTextPointers:: ; 941b3 (25:41b3) +OldCityMuseumTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityPokecenter1F.asm b/maps/placeholder/OldCityPokecenter1F.asm index 95d8795..541b975 100644 --- a/maps/placeholder/OldCityPokecenter1F.asm +++ b/maps/placeholder/OldCityPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityPokecenter1F.asm", ROMX -OldCityPokecenter1FScriptLoader:: ; 946eb (25:46eb) +OldCityPokecenter1FScriptLoader:: ret -OldCityPokecenter1FTextPointers:: ; 946ec (25:46ec) +OldCityPokecenter1FTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/OldCitySchool.asm b/maps/placeholder/OldCitySchool.asm index e5a09b4..dc6bae1 100644 --- a/maps/placeholder/OldCitySchool.asm +++ b/maps/placeholder/OldCitySchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCitySchool.asm", ROMX -OldCitySchoolScriptLoader:: ; 94ac2 (25:4ac2) +OldCitySchoolScriptLoader:: ret -OldCitySchoolTextPointers:: ; 94ac3 (25:4ac3) +OldCitySchoolTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower1F.asm b/maps/placeholder/OldCityTower1F.asm index c627a23..2c149ab 100644 --- a/maps/placeholder/OldCityTower1F.asm +++ b/maps/placeholder/OldCityTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower1F.asm", ROMX -OldCityTower1FScriptLoader:: ; 942fe (25:42fe) +OldCityTower1FScriptLoader:: ret -OldCityTower1FTextPointers:: ; 942ff (25:42ff) +OldCityTower1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower2F.asm b/maps/placeholder/OldCityTower2F.asm index 21e4ada..c18dc79 100644 --- a/maps/placeholder/OldCityTower2F.asm +++ b/maps/placeholder/OldCityTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower2F.asm", ROMX -OldCityTower2FScriptLoader:: ; 94383 (25:4383) +OldCityTower2FScriptLoader:: ret -OldCityTower2FTextPointers:: ; 94384 (25:4384) +OldCityTower2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower3F.asm b/maps/placeholder/OldCityTower3F.asm index 473ee38..4045ed1 100644 --- a/maps/placeholder/OldCityTower3F.asm +++ b/maps/placeholder/OldCityTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower3F.asm", ROMX -OldCityTower3FScriptLoader:: ; 94408 (25:4408) +OldCityTower3FScriptLoader:: ret -OldCityTower3FTextPointers:: ; 94409 (25:4409) +OldCityTower3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower4F.asm b/maps/placeholder/OldCityTower4F.asm index 7a67ac0..4419576 100644 --- a/maps/placeholder/OldCityTower4F.asm +++ b/maps/placeholder/OldCityTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower4F.asm", ROMX -OldCityTower4FScriptLoader:: ; 9448d (25:448d) +OldCityTower4FScriptLoader:: ret -OldCityTower4FTextPointers:: ; 9448e (25:448e) +OldCityTower4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/OldCityTower5F.asm b/maps/placeholder/OldCityTower5F.asm index 607ebf0..dc682dc 100644 --- a/maps/placeholder/OldCityTower5F.asm +++ b/maps/placeholder/OldCityTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/OldCityTower5F.asm", ROMX -OldCityTower5FScriptLoader:: ; 944e1 (25:44e1) +OldCityTower5FScriptLoader:: ret -OldCityTower5FTextPointers:: ; 944e2 (25:44e2) +OldCityTower5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/PowerPlant1.asm b/maps/placeholder/PowerPlant1.asm index 9344c72..5ce600c 100644 --- a/maps/placeholder/PowerPlant1.asm +++ b/maps/placeholder/PowerPlant1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant1.asm", ROMX -PowerPlant1ScriptLoader:: ; bc06a (2f:406a) +PowerPlant1ScriptLoader:: ret -PowerPlant1TextPointers:: ; bc06b (2f:406b) +PowerPlant1TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant2.asm b/maps/placeholder/PowerPlant2.asm index 91e7fa1..d3df908 100644 --- a/maps/placeholder/PowerPlant2.asm +++ b/maps/placeholder/PowerPlant2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant2.asm", ROMX -PowerPlant2ScriptLoader:: ; bc0e7 (2f:40e7) +PowerPlant2ScriptLoader:: ret -PowerPlant2TextPointers:: ; bc0e8 (2f:40e8) +PowerPlant2TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant3.asm b/maps/placeholder/PowerPlant3.asm index ee99c69..9b0b2c9 100644 --- a/maps/placeholder/PowerPlant3.asm +++ b/maps/placeholder/PowerPlant3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant3.asm", ROMX -PowerPlant3ScriptLoader:: ; bc218 (2f:4218) +PowerPlant3ScriptLoader:: ret -PowerPlant3TextPointers:: ; bc219 (2f:4219) +PowerPlant3TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/PowerPlant4.asm b/maps/placeholder/PowerPlant4.asm index b63ba7d..694d930 100644 --- a/maps/placeholder/PowerPlant4.asm +++ b/maps/placeholder/PowerPlant4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PowerPlant4.asm", ROMX -PowerPlant4ScriptLoader:: ; bc349 (2f:4349) +PowerPlant4ScriptLoader:: ret -PowerPlant4TextPointers:: ; bc34a (2f:434a) +PowerPlant4TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/Prince.asm b/maps/placeholder/Prince.asm index 549b093..6992faf 100644 --- a/maps/placeholder/Prince.asm +++ b/maps/placeholder/Prince.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Prince.asm", ROMX -PrinceScriptLoader:: ; d9675 (36:5675) +PrinceScriptLoader:: ret db "@" diff --git a/maps/placeholder/PrinceRoute.asm b/maps/placeholder/PrinceRoute.asm index 08d6c3b..6bc474a 100644 --- a/maps/placeholder/PrinceRoute.asm +++ b/maps/placeholder/PrinceRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/PrinceRoute.asm", ROMX -PrinceRouteScriptLoader:: ; db3e6 (36:73e6) +PrinceRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route15.asm b/maps/placeholder/Route15.asm index 92cf6f2..dcd7f79 100644 --- a/maps/placeholder/Route15.asm +++ b/maps/placeholder/Route15.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15.asm", ROMX -Route15ScriptLoader:: ; da9bb (36:69bb) +Route15ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route15Pokecenter1F.asm b/maps/placeholder/Route15Pokecenter1F.asm index da370e0..5937ecd 100644 --- a/maps/placeholder/Route15Pokecenter1F.asm +++ b/maps/placeholder/Route15Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15Pokecenter1F.asm", ROMX -Route15Pokecenter1FScriptLoader:: ; 9d359 (27:5359) +Route15Pokecenter1FScriptLoader:: ret -Route15Pokecenter1FTextPointers:: ; 9d35a (27:535a) +Route15Pokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route15Pokecenter2F.asm b/maps/placeholder/Route15Pokecenter2F.asm index bc2e299..5fca638 100644 --- a/maps/placeholder/Route15Pokecenter2F.asm +++ b/maps/placeholder/Route15Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route15Pokecenter2F.asm", ROMX -Route15Pokecenter2FScriptLoader:: ; 9d3ab (27:53ab) +Route15Pokecenter2FScriptLoader:: ret -Route15Pokecenter2FTextPointers:: ; 9d3ac (27:53ac) +Route15Pokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route18.asm b/maps/placeholder/Route18.asm index aad03a2..aed82e5 100644 --- a/maps/placeholder/Route18.asm +++ b/maps/placeholder/Route18.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18.asm", ROMX -Route18ScriptLoader:: ; dac6d (36:6c6d) +Route18ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route18Pokecenter1F.asm b/maps/placeholder/Route18Pokecenter1F.asm index f81be4b..667ba35 100644 --- a/maps/placeholder/Route18Pokecenter1F.asm +++ b/maps/placeholder/Route18Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18Pokecenter1F.asm", ROMX -Route18Pokecenter1FScriptLoader:: ; 9d49a (27:549a) +Route18Pokecenter1FScriptLoader:: ret -Route18Pokecenter1FTextPointers:: ; 9d49b (27:549b) +Route18Pokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route18Pokecenter2F.asm b/maps/placeholder/Route18Pokecenter2F.asm index fdc5399..8194fa3 100644 --- a/maps/placeholder/Route18Pokecenter2F.asm +++ b/maps/placeholder/Route18Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route18Pokecenter2F.asm", ROMX -Route18Pokecenter2FScriptLoader:: ; 9d4ec (27:54ec) +Route18Pokecenter2FScriptLoader:: ret -Route18Pokecenter2FTextPointers:: ; 9d4ed (27:54ed) +Route18Pokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2.asm b/maps/placeholder/Route2.asm index ad6914d..50fecb6 100644 --- a/maps/placeholder/Route2.asm +++ b/maps/placeholder/Route2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2.asm", ROMX -Route2ScriptLoader:: ; d9cc4 (36:5cc4) +Route2ScriptLoader:: ret db "@" diff --git a/maps/placeholder/Route2Gate1F.asm b/maps/placeholder/Route2Gate1F.asm index e03b7a2..cd878e3 100644 --- a/maps/placeholder/Route2Gate1F.asm +++ b/maps/placeholder/Route2Gate1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2Gate1F.asm", ROMX -Route2Gate1FScriptLoader:: ; 94061 (25:4061) +Route2Gate1FScriptLoader:: ret -Route2Gate1FTextPointers:: ; 94062 (25:4062) +Route2Gate1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2Gate2F.asm b/maps/placeholder/Route2Gate2F.asm index b5cbd23..08fe259 100644 --- a/maps/placeholder/Route2Gate2F.asm +++ b/maps/placeholder/Route2Gate2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2Gate2F.asm", ROMX -Route2Gate2FScriptLoader:: ; 940c1 (25:40c1) +Route2Gate2FScriptLoader:: ret -Route2Gate2FTextPointers:: ; 940c2 (25:40c2) +Route2Gate2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Route2House.asm b/maps/placeholder/Route2House.asm index d4c1fd9..447aa1b 100644 --- a/maps/placeholder/Route2House.asm +++ b/maps/placeholder/Route2House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Route2House.asm", ROMX -Route2HouseScriptLoader:: ; 9412f (25:412f) +Route2HouseScriptLoader:: ret -Route2HouseTextPointers:: ; 94130 (25:4130) +Route2HouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/RouteSilentEast.asm b/maps/placeholder/RouteSilentEast.asm index b2acf96..0619bb3 100644 --- a/maps/placeholder/RouteSilentEast.asm +++ b/maps/placeholder/RouteSilentEast.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RouteSilentEast.asm", ROMX -RouteSilentEastScriptLoader:: ; db38a (36:738a) +RouteSilentEastScriptLoader:: ret db "@" diff --git a/maps/placeholder/RouteSilentEastGate.asm b/maps/placeholder/RouteSilentEastGate.asm index 52914ba..7b08936 100644 --- a/maps/placeholder/RouteSilentEastGate.asm +++ b/maps/placeholder/RouteSilentEastGate.asm @@ -2,8 +2,8 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RouteSilentEastGate.asm", ROMX -RouteSilentEastGateScriptLoader:: ; d0040 (34:4040) +RouteSilentEastGateScriptLoader:: ret -RouteSilentEastGateTextPointers:: ; d0041 (34:4041) +RouteSilentEastGateTextPointers:: db "@" diff --git a/maps/placeholder/RuinsOfAlphEntrance.asm b/maps/placeholder/RuinsOfAlphEntrance.asm index a2d9ba3..c8f0262 100644 --- a/maps/placeholder/RuinsOfAlphEntrance.asm +++ b/maps/placeholder/RuinsOfAlphEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RuinsOfAlphEntrance.asm", ROMX -RuinsOfAlphEntranceScriptLoader:: ; bc3c6 (2f:43c6) +RuinsOfAlphEntranceScriptLoader:: ret -RuinsOfAlphEntranceTextPointers:: ; bc3c7 (2f:43c7) +RuinsOfAlphEntranceTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/RuinsOfAlphMain.asm b/maps/placeholder/RuinsOfAlphMain.asm index 40c7161..fc2ec97 100644 --- a/maps/placeholder/RuinsOfAlphMain.asm +++ b/maps/placeholder/RuinsOfAlphMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/RuinsOfAlphMain.asm", ROMX -RuinsOfAlphMainScriptLoader:: ; bc68c (2f:468c) +RuinsOfAlphMainScriptLoader:: ret -RuinsOfAlphMainTextPointers:: ; bc68d (2f:468d) +RuinsOfAlphMainTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/SlowpokeWellEntrance.asm b/maps/placeholder/SlowpokeWellEntrance.asm index a59c886..2cec405 100644 --- a/maps/placeholder/SlowpokeWellEntrance.asm +++ b/maps/placeholder/SlowpokeWellEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SlowpokeWellEntrance.asm", ROMX -SlowpokeWellEntranceScriptLoader:: ; bd2f3 (2f:52f3) +SlowpokeWellEntranceScriptLoader:: ret -SlowpokeWellEntranceTextPointers:: ; bd2f4 (2f:52f4) +SlowpokeWellEntranceTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/SlowpokeWellMain.asm b/maps/placeholder/SlowpokeWellMain.asm index 88d913a..c660806 100644 --- a/maps/placeholder/SlowpokeWellMain.asm +++ b/maps/placeholder/SlowpokeWellMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SlowpokeWellMain.asm", ROMX -SlowpokeWellMainScriptLoader:: ; bd3ca (2f:53ca) +SlowpokeWellMainScriptLoader:: ret -SlowpokeWellMainTextPointers:: ; bd3cb (2f:53cb) +SlowpokeWellMainTextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/maps/placeholder/South.asm b/maps/placeholder/South.asm index fdd841d..b10b4d6 100644 --- a/maps/placeholder/South.asm +++ b/maps/placeholder/South.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/South.asm", ROMX -SouthScriptLoader:: ; d9912 (36:5912) +SouthScriptLoader:: ret db "@" diff --git a/maps/placeholder/SouthHouse1.asm b/maps/placeholder/SouthHouse1.asm index ac331ed..28b1fc5 100644 --- a/maps/placeholder/SouthHouse1.asm +++ b/maps/placeholder/SouthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthHouse1.asm", ROMX -SouthHouse1ScriptLoader:: ; 9f315 (27:7315) +SouthHouse1ScriptLoader:: ret -SouthHouse1TextPointers:: ; 9f316 (27:7316) +SouthHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthHouse2.asm b/maps/placeholder/SouthHouse2.asm index d53c009..d61d59f 100644 --- a/maps/placeholder/SouthHouse2.asm +++ b/maps/placeholder/SouthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthHouse2.asm", ROMX -SouthHouse2ScriptLoader:: ; 9f4fc (27:74fc) +SouthHouse2ScriptLoader:: ret -SouthHouse2TextPointers:: ; 9f4fd (27:74fd) +SouthHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthMart.asm b/maps/placeholder/SouthMart.asm index 4211890..0f291e3 100644 --- a/maps/placeholder/SouthMart.asm +++ b/maps/placeholder/SouthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthMart.asm", ROMX -SouthMartScriptLoader:: ; 9f4a2 (27:74a2) +SouthMartScriptLoader:: ret -SouthMartTextPointers:: ; 9f4a3 (27:74a3) +SouthMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter1F.asm b/maps/placeholder/SouthPokecenter1F.asm index 6ec73c9..1d00af3 100644 --- a/maps/placeholder/SouthPokecenter1F.asm +++ b/maps/placeholder/SouthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthPokecenter1F.asm", ROMX -SouthPokecenter1FScriptLoader:: ; 9f3a9 (27:73a9) +SouthPokecenter1FScriptLoader:: ret -SouthPokecenter1FTextPointers:: ; 9f3aa (27:73aa) +SouthPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SouthPokecenter2F.asm b/maps/placeholder/SouthPokecenter2F.asm index 3016edf..0f70709 100644 --- a/maps/placeholder/SouthPokecenter2F.asm +++ b/maps/placeholder/SouthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SouthPokecenter2F.asm", ROMX -SouthPokecenter2FScriptLoader:: ; 9f422 (27:7422) +SouthPokecenter2FScriptLoader:: ret -SouthPokecenter2FTextPointers:: ; 9f423 (27:7423) +SouthPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Stand.asm b/maps/placeholder/Stand.asm index cda74ae..35e23fb 100644 --- a/maps/placeholder/Stand.asm +++ b/maps/placeholder/Stand.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Stand.asm", ROMX -StandScriptLoader:: ; d919b (36:519b) +StandScriptLoader:: ret db "@" diff --git a/maps/placeholder/StandHouse.asm b/maps/placeholder/StandHouse.asm index d42599e..0935bed 100644 --- a/maps/placeholder/StandHouse.asm +++ b/maps/placeholder/StandHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandHouse.asm", ROMX -StandHouseScriptLoader:: ; 9df9c (27:5f9c) +StandHouseScriptLoader:: ret -StandHouseTextPointers:: ; 9df9d (27:5f9d) +StandHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLab.asm b/maps/placeholder/StandLab.asm index 8a169ac..757d33f 100644 --- a/maps/placeholder/StandLab.asm +++ b/maps/placeholder/StandLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLab.asm", ROMX -StandLabScriptLoader:: ; 9dd35 (27:5d35) +StandLabScriptLoader:: ret -StandLabTextPointers:: ; 9dd36 (27:5d36) +StandLabTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLeague1F.asm b/maps/placeholder/StandLeague1F.asm index ffc3622..1ca2713 100644 --- a/maps/placeholder/StandLeague1F.asm +++ b/maps/placeholder/StandLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLeague1F.asm", ROMX -StandLeague1FScriptLoader:: ; 9e109 (27:6109) +StandLeague1FScriptLoader:: ret -StandLeague1FTextPointers:: ; 9e10a (27:610a) +StandLeague1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandLeague2F.asm b/maps/placeholder/StandLeague2F.asm index d910c0e..a361c1a 100644 --- a/maps/placeholder/StandLeague2F.asm +++ b/maps/placeholder/StandLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandLeague2F.asm", ROMX -StandLeague2FScriptLoader:: ; 9e1a9 (27:61a9) +StandLeague2FScriptLoader:: ret -StandLeague2FTextPointers:: ; 9e1aa (27:61aa) +StandLeague2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandMart.asm b/maps/placeholder/StandMart.asm index e042540..3e56cf0 100644 --- a/maps/placeholder/StandMart.asm +++ b/maps/placeholder/StandMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandMart.asm", ROMX -StandMartScriptLoader:: ; 9df42 (27:5f42) +StandMartScriptLoader:: ret -StandMartTextPointers:: ; 9df43 (27:5f43) +StandMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandOffice.asm b/maps/placeholder/StandOffice.asm index 3b7b334..fa7f28f 100644 --- a/maps/placeholder/StandOffice.asm +++ b/maps/placeholder/StandOffice.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandOffice.asm", ROMX -StandOfficeScriptLoader:: ; 9dec2 (27:5ec2) +StandOfficeScriptLoader:: ret -StandOfficeTextPointers:: ; 9dec3 (27:5ec3) +StandOfficeTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter1F.asm b/maps/placeholder/StandPokecenter1F.asm index 0601293..ea0e71b 100644 --- a/maps/placeholder/StandPokecenter1F.asm +++ b/maps/placeholder/StandPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandPokecenter1F.asm", ROMX -StandPokecenter1FScriptLoader:: ; 9ddc9 (27:5dc9) +StandPokecenter1FScriptLoader:: ret -StandPokecenter1FTextPointers:: ; 9ddca (27:5dca) +StandPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandPokecenter2F.asm b/maps/placeholder/StandPokecenter2F.asm index 350995b..9914a00 100644 --- a/maps/placeholder/StandPokecenter2F.asm +++ b/maps/placeholder/StandPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandPokecenter2F.asm", ROMX -StandPokecenter2FScriptLoader:: ; 9de42 (27:5e42) +StandPokecenter2FScriptLoader:: ret -StandPokecenter2FTextPointers:: ; 9de43 (27:5e43) +StandPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse1F.asm b/maps/placeholder/StandRocketHouse1F.asm index 094f417..c8463ab 100644 --- a/maps/placeholder/StandRocketHouse1F.asm +++ b/maps/placeholder/StandRocketHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRocketHouse1F.asm", ROMX -StandRocketHouse1FScriptLoader:: ; 9e009 (27:6009) +StandRocketHouse1FScriptLoader:: ret -StandRocketHouse1FTextPointers:: ; 9e00a (27:600a) +StandRocketHouse1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRocketHouse2F.asm b/maps/placeholder/StandRocketHouse2F.asm index a285fec..65e7163 100644 --- a/maps/placeholder/StandRocketHouse2F.asm +++ b/maps/placeholder/StandRocketHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRocketHouse2F.asm", ROMX -StandRocketHouse2FScriptLoader:: ; 9e068 (27:6068) +StandRocketHouse2FScriptLoader:: ret -StandRocketHouse2FTextPointers:: ; 9e069 (27:6069) +StandRocketHouse2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/StandRoute.asm b/maps/placeholder/StandRoute.asm index 23704d9..1bee368 100644 --- a/maps/placeholder/StandRoute.asm +++ b/maps/placeholder/StandRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRoute.asm", ROMX -StandRouteScriptLoader:: ; db15f (36:715f) +StandRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/StandRouteGateKanto.asm b/maps/placeholder/StandRouteGateKanto.asm index 2b407bf..2458e38 100644 --- a/maps/placeholder/StandRouteGateKanto.asm +++ b/maps/placeholder/StandRouteGateKanto.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/StandRouteGateKanto.asm", ROMX -StandRouteGateKantoScriptLoader:: ; 9dcdf (27:5cdf) +StandRouteGateKantoScriptLoader:: ret -StandRouteGateKantoTextPointers:: ; 9dce0 (27:5ce0) +StandRouteGateKantoTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/Sugar.asm b/maps/placeholder/Sugar.asm index 9ef42ad..d191b39 100644 --- a/maps/placeholder/Sugar.asm +++ b/maps/placeholder/Sugar.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/Sugar.asm", ROMX -SugarScriptLoader:: ; d8d03 (36:4d03) +SugarScriptLoader:: ret db "@" diff --git a/maps/placeholder/SugarHouse.asm b/maps/placeholder/SugarHouse.asm index 5646c4c..d85a5ad 100644 --- a/maps/placeholder/SugarHouse.asm +++ b/maps/placeholder/SugarHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarHouse.asm", ROMX -SugarHouseScriptLoader:: ; 9d5c7 (27:55c7) +SugarHouseScriptLoader:: ret -SugarHouseTextPointers:: ; 9d5c8 (27:55c8) +SugarHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarHouse2.asm b/maps/placeholder/SugarHouse2.asm index 172475e..b6cfde5 100644 --- a/maps/placeholder/SugarHouse2.asm +++ b/maps/placeholder/SugarHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarHouse2.asm", ROMX -SugarHouse2ScriptLoader:: ; 9d61d (27:561d) +SugarHouse2ScriptLoader:: ret -SugarHouse2TextPointers:: ; 9d61e (27:561e) +SugarHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarMart.asm b/maps/placeholder/SugarMart.asm index 148d7c8..8e78179 100644 --- a/maps/placeholder/SugarMart.asm +++ b/maps/placeholder/SugarMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarMart.asm", ROMX -SugarMartScriptLoader:: ; 9d69d (27:569d) +SugarMartScriptLoader:: ret -SugarMartTextPointers:: ; 9d69e (27:569e) +SugarMartTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter1F.asm b/maps/placeholder/SugarPokecenter1F.asm index bb252d9..0e84e9b 100644 --- a/maps/placeholder/SugarPokecenter1F.asm +++ b/maps/placeholder/SugarPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarPokecenter1F.asm", ROMX -SugarPokecenter1FScriptLoader:: ; 9d731 (27:5731) +SugarPokecenter1FScriptLoader:: ret -SugarPokecenter1FTextPointers:: ; 9d732 (27:5732) +SugarPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarPokecenter2F.asm b/maps/placeholder/SugarPokecenter2F.asm index 8c1c352..56af19e 100644 --- a/maps/placeholder/SugarPokecenter2F.asm +++ b/maps/placeholder/SugarPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarPokecenter2F.asm", ROMX -SugarPokecenter2FScriptLoader:: ; 9d7aa (27:57aa) +SugarPokecenter2FScriptLoader:: ret -SugarPokecenter2FTextPointers:: ; 9d7ab (27:57ab) +SugarPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/SugarRoute.asm b/maps/placeholder/SugarRoute.asm index fd1f4ed..4263c39 100644 --- a/maps/placeholder/SugarRoute.asm +++ b/maps/placeholder/SugarRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarRoute.asm", ROMX -SugarRouteScriptLoader:: ; daed3 (36:6ed3) +SugarRouteScriptLoader:: ret db "@" diff --git a/maps/placeholder/SugarRouteGate.asm b/maps/placeholder/SugarRouteGate.asm index 0273915..b2c5ac1 100644 --- a/maps/placeholder/SugarRouteGate.asm +++ b/maps/placeholder/SugarRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/SugarRouteGate.asm", ROMX -SugarRouteGateScriptLoader:: ; 9d547 (27:5547) +SugarRouteGateScriptLoader:: ret -SugarRouteGateTextPointers:: ; 9d548 (27:5548) +SugarRouteGateTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/West.asm b/maps/placeholder/West.asm index e11aa0c..3e68abb 100644 --- a/maps/placeholder/West.asm +++ b/maps/placeholder/West.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/West.asm", ROMX -WestScriptLoader:: ; d85d0 (36:45d0) +WestScriptLoader:: ret db "@" diff --git a/maps/placeholder/WestGym.asm b/maps/placeholder/WestGym.asm index 42ed936..9304b95 100644 --- a/maps/placeholder/WestGym.asm +++ b/maps/placeholder/WestGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestGym.asm", ROMX -WestGymScriptLoader:: ; 98bff (26:4bff) +WestGymScriptLoader:: ret -WestGymTextPointers:: ; 98c00 (26:4c00) +WestGymTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestHouse1.asm b/maps/placeholder/WestHouse1.asm index 55bd778..51076bb 100644 --- a/maps/placeholder/WestHouse1.asm +++ b/maps/placeholder/WestHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestHouse1.asm", ROMX -WestHouse1ScriptLoader:: ; 98c83 (26:4c83) +WestHouse1ScriptLoader:: ret -WestHouse1TextPointers:: ; 98c84 (26:4c84) +WestHouse1TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestHouse2.asm b/maps/placeholder/WestHouse2.asm index 7dbc478..ec744e0 100644 --- a/maps/placeholder/WestHouse2.asm +++ b/maps/placeholder/WestHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestHouse2.asm", ROMX -WestHouse2ScriptLoader:: ; 98d07 (26:4d07) +WestHouse2ScriptLoader:: ret -WestHouse2TextPointers:: ; 98d08 (26:4d08) +WestHouse2TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart1F.asm b/maps/placeholder/WestMart1F.asm index 0a6b9fa..67bdecc 100644 --- a/maps/placeholder/WestMart1F.asm +++ b/maps/placeholder/WestMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart1F.asm", ROMX -WestMart1FScriptLoader:: ; 98285 (26:4285) +WestMart1FScriptLoader:: ret -WestMart1FTextPointers:: ; 98286 (26:4286) +WestMart1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart2F.asm b/maps/placeholder/WestMart2F.asm index 0b82f67..1b3f4f2 100644 --- a/maps/placeholder/WestMart2F.asm +++ b/maps/placeholder/WestMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart2F.asm", ROMX -WestMart2FScriptLoader:: ; 98359 (26:4359) +WestMart2FScriptLoader:: ret -WestMart2FTextPointers:: ; 9835a (26:435a) +WestMart2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart3F.asm b/maps/placeholder/WestMart3F.asm index dfcc913..59c9db0 100644 --- a/maps/placeholder/WestMart3F.asm +++ b/maps/placeholder/WestMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart3F.asm", ROMX -WestMart3FScriptLoader:: ; 98418 (26:4418) +WestMart3FScriptLoader:: ret -WestMart3FTextPointers:: ; 98419 (26:4419) +WestMart3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart4F.asm b/maps/placeholder/WestMart4F.asm index 9e4397a..774c4bc 100644 --- a/maps/placeholder/WestMart4F.asm +++ b/maps/placeholder/WestMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart4F.asm", ROMX -WestMart4FScriptLoader:: ; 984d7 (26:44d7) +WestMart4FScriptLoader:: ret -WestMart4FTextPointers:: ; 984d8 (26:44d8) +WestMart4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart5F.asm b/maps/placeholder/WestMart5F.asm index eecf821..dd7ef9d 100644 --- a/maps/placeholder/WestMart5F.asm +++ b/maps/placeholder/WestMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart5F.asm", ROMX -WestMart5FScriptLoader:: ; 98566 (26:4566) +WestMart5FScriptLoader:: ret -WestMart5FTextPointers:: ; 98567 (26:4567) +WestMart5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMart6F.asm b/maps/placeholder/WestMart6F.asm index 5c07dbe..639cdee 100644 --- a/maps/placeholder/WestMart6F.asm +++ b/maps/placeholder/WestMart6F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMart6F.asm", ROMX -WestMart6FScriptLoader:: ; 985f3 (26:45f3) +WestMart6FScriptLoader:: ret -WestMart6FTextPointers:: ; 985f4 (26:45f4) +WestMart6FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestMartElevator.asm b/maps/placeholder/WestMartElevator.asm index df838e1..934b0ab 100644 --- a/maps/placeholder/WestMartElevator.asm +++ b/maps/placeholder/WestMartElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestMartElevator.asm", ROMX -WestMartElevatorScriptLoader:: ; 98630 (26:4630) +WestMartElevatorScriptLoader:: ret -WestMartElevatorTextPointers:: ; 98631 (26:4631) +WestMartElevatorTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter1F.asm b/maps/placeholder/WestPokecenter1F.asm index 4909508..73d450c 100644 --- a/maps/placeholder/WestPokecenter1F.asm +++ b/maps/placeholder/WestPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestPokecenter1F.asm", ROMX -WestPokecenter1FScriptLoader:: ; 98ac6 (26:4ac6) +WestPokecenter1FScriptLoader:: ret -WestPokecenter1FTextPointers:: ; 98ac7 (26:4ac7) +WestPokecenter1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestPokecenter2F.asm b/maps/placeholder/WestPokecenter2F.asm index b218dbc..4e75832 100644 --- a/maps/placeholder/WestPokecenter2F.asm +++ b/maps/placeholder/WestPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestPokecenter2F.asm", ROMX -WestPokecenter2FScriptLoader:: ; 98b43 (26:4b43) +WestPokecenter2FScriptLoader:: ret -WestPokecenter2FTextPointers:: ; 98b44 (26:4b44) +WestPokecenter2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower1F.asm b/maps/placeholder/WestRadioTower1F.asm index 032723c..f5c8f44 100644 --- a/maps/placeholder/WestRadioTower1F.asm +++ b/maps/placeholder/WestRadioTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower1F.asm", ROMX -WestRadioTower1FScriptLoader:: ; 986af (26:46af) +WestRadioTower1FScriptLoader:: ret -WestRadioTower1FTextPointers:: ; 986b0 (26:46b0) +WestRadioTower1FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower2F.asm b/maps/placeholder/WestRadioTower2F.asm index 336b600..033e158 100644 --- a/maps/placeholder/WestRadioTower2F.asm +++ b/maps/placeholder/WestRadioTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower2F.asm", ROMX -WestRadioTower2FScriptLoader:: ; 98757 (26:4757) +WestRadioTower2FScriptLoader:: ret -WestRadioTower2FTextPointers:: ; 98758 (26:4758) +WestRadioTower2FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower3F.asm b/maps/placeholder/WestRadioTower3F.asm index b5277f9..fb10e52 100644 --- a/maps/placeholder/WestRadioTower3F.asm +++ b/maps/placeholder/WestRadioTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower3F.asm", ROMX -WestRadioTower3FScriptLoader:: ; 9880c (26:480c) +WestRadioTower3FScriptLoader:: ret -WestRadioTower3FTextPointers:: ; 9880d (26:480d) +WestRadioTower3FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower4F.asm b/maps/placeholder/WestRadioTower4F.asm index 706d738..19bb085 100644 --- a/maps/placeholder/WestRadioTower4F.asm +++ b/maps/placeholder/WestRadioTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower4F.asm", ROMX -WestRadioTower4FScriptLoader:: ; 988ce (26:48ce) +WestRadioTower4FScriptLoader:: ret -WestRadioTower4FTextPointers:: ; 988cf (26:48cf) +WestRadioTower4FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRadioTower5F.asm b/maps/placeholder/WestRadioTower5F.asm index b3686dc..09f8cc7 100644 --- a/maps/placeholder/WestRadioTower5F.asm +++ b/maps/placeholder/WestRadioTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRadioTower5F.asm", ROMX -WestRadioTower5FScriptLoader:: ; 98984 (26:4984) +WestRadioTower5FScriptLoader:: ret -WestRadioTower5FTextPointers:: ; 98985 (26:4985) +WestRadioTower5FTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/maps/placeholder/WestRocketRaidedHouse.asm b/maps/placeholder/WestRocketRaidedHouse.asm index a05c0ae..06f2ec2 100644 --- a/maps/placeholder/WestRocketRaidedHouse.asm +++ b/maps/placeholder/WestRocketRaidedHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "maps/placeholder/WestRocketRaidedHouse.asm", ROMX -WestRocketRaidedHouseScriptLoader:: ; 98a2e (26:4a2e) +WestRocketRaidedHouseScriptLoader:: ret -WestRocketRaidedHouseTextPointers:: ; 98a2f (26:4a2f) +WestRocketRaidedHouseTextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText @@ -2,9 +2,9 @@ INCLUDE "constants.asm" SECTION "Sprite Buffers", SRAM -sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 -sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 -sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 +sSpriteBuffer0:: ds SPRITEBUFFERSIZE +sSpriteBuffer1:: ds SPRITEBUFFERSIZE +sSpriteBuffer2:: ds SPRITEBUFFERSIZE SECTION "Unknown, bank 0", SRAM @@ -4,61 +4,61 @@ SECTION "VRAM", VRAM UNION -vChars0:: ; 8000 +vChars0:: ds $80 tiles -vChars1:: ; 8800 +vChars1:: ds $80 tiles -vChars2:: ; 9000 +vChars2:: ds $80 tiles NEXTU ; Battle/menu -vSprites:: ; 8000 +vSprites:: ds $80 tiles -vFont:: ; 8800 +vFont:: ds $80 tiles -vFrontPic:: ; 9000 +vFrontPic:: ds 7 * 7 tiles NEXTU -vNPCSprites:: ; 8000 +vNPCSprites:: ds $80 tiles -vNPCSprites2:: ; 8800 +vNPCSprites2:: ds $80 tiles -vTileset:: ; 9000 +vTileset:: ; ds $60 tiles ds $20 tiles -vExteriorTileset:: ; 9200 +vExteriorTileset:: ds $40 tiles -vTilesetEnd:: ; 9600 +vTilesetEnd:: NEXTU ds $80 tiles -vTitleLogo:: ; 8800 +vTitleLogo:: ds $80 tiles -;vFrontPic:: ; 9000 +;vFrontPic:: ds 7 * 7 tiles -vTitleLogo2:: ; 9310 +vTitleLogo2:: ; TODO: what size? ENDU -vBGMap0:: ; 9800 +vBGMap0:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT -vBGMap1:: ; 9c00 +vBGMap1:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT @@ -3,32 +3,32 @@ INCLUDE "constants.asm" SECTION "Music engine RAM", WRAM0 -wMusic:: ; c000 +wMusic:: wChannels:: -wChannel1:: channel_struct wChannel1 ; c000 -wChannel2:: channel_struct wChannel2 ; c032 -wChannel3:: channel_struct wChannel3 ; c064 -wChannel4:: channel_struct wChannel4 ; c096 +wChannel1:: channel_struct wChannel1 +wChannel2:: channel_struct wChannel2 +wChannel3:: channel_struct wChannel3 +wChannel4:: channel_struct wChannel4 wSFXChannels:: -wChannel5:: channel_struct wChannel5 ; c0c8 -wChannel6:: channel_struct wChannel6 ; c0fa -wChannel7:: channel_struct wChannel7 ; c12c -wChannel8:: channel_struct wChannel8 ; c15e +wChannel5:: channel_struct wChannel5 +wChannel6:: channel_struct wChannel6 +wChannel7:: channel_struct wChannel7 +wChannel8:: channel_struct wChannel8 - ds 1 ; c190 + ds 1 -wCurTrackDuty:: db ; c191 -wCurTrackIntensity:: db ; c192 -wCurTrackFrequency:: dw ; c193 -wc195:: db ; c195 +wCurTrackDuty:: db +wCurTrackIntensity:: db +wCurTrackFrequency:: dw +wc195:: db ds 2 ; TODO -wCurChannel:: db ; c198 -wVolume:: db ; c199 -wSoundOutput:: ; c19a +wCurChannel:: db +wVolume:: db +wSoundOutput:: ; corresponds to $ff25 ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off @@ -36,103 +36,103 @@ wSoundOutput:: ; c19a ds 1 ; TODO -wMusicID:: dw ; c19c -wMusicBank:: db ; c19e +wMusicID:: dw +wMusicBank:: db ds 5 ; TODO -wLowHealthAlarm:: ; c1a4 +wLowHealthAlarm:: ; bit 7: on/off ; bit 4: pitch ; bit 0-3: counter db -wMusicFade:: ; c1a5 +wMusicFade:: ; fades volume over x frames ; bit 7: fade in/out ; bit 0-6: number of frames for each volume level ; $00 = none (default) db -wMusicFadeCount:: db ; c1a6 +wMusicFadeCount:: db wMusicFadeID:: -wMusicFadeIDLow:: db ; c1a7 -wMusicFadeIDHigh:: db ; c1a8 +wMusicFadeIDLow:: db +wMusicFadeIDHigh:: db ds 2 ; TODO -wIncrementTempo: dw ; c1ab -wMapMusic:: db ; c1ad -wCryPitch:: dw ; c1ae -wCryLength:: dw ; c1b0 +wIncrementTempo: dw +wMapMusic:: db +wCryPitch:: dw +wCryLength:: dw ; c1b2 ds 7 ; TODO -wc1b9:: db ; c1b9 -wc1ba:: db ; c1ba +wc1b9:: db +wc1ba:: db ; either wChannelsEnd or wMusicEnd, unsure ds 1 ; TODO -wMusicInitEnd:: ; c1bc +wMusicInitEnd:: SECTION "OAM Buffer", WRAM0 -wVirtualOAM:: ; c200 +wVirtualOAM:: ds SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS wVirtualOAMEnd:: -wTileMap:: ; c2a0 +wTileMap:: ds SCREEN_HEIGHT * SCREEN_WIDTH UNION -wTileMapBackup:: ; c408 +wTileMapBackup:: ds SCREEN_HEIGHT * SCREEN_WIDTH NEXTU ds 1 -wc409:: ds 1 ; c409 -wc40a:: ds 1 ; c40a +wc409:: ds 1 +wc40a:: ds 1 ; Monster or Trainer test? -wWhichPicTest:: ; c40b +wWhichPicTest:: db -wc40c:: ds 1 ; c40c -wc40d:: ds 1 ; c40d -wc40e:: ds 1 ; c40e +wc40c:: ds 1 +wc40d:: ds 1 +wc40e:: ds 1 ds 11 -wc41a:: db ; c41a +wc41a:: db ds 165 -wSpriteAnimIDBuffer:: db ; c4c0 +wSpriteAnimIDBuffer:: db ds 6 -wc4c7:: db ; c4c7 -wc4c8:: db ; c4c8 +wc4c7:: db +wc4c8:: db ds 7 -wNamingScreenDestinationPointer:: dw ; c4d0 -wNamingScreenCurNameLength:: db ; c4d2 -wNamingScreenMaxNameLength:: db ; c4d3 -wNamingScreenType:: db ; c4d4 -wNamingScreenCursorObjectPointer:: dw ; c4d5 -wNamingScreenLastCharacter:: db ; c4d7 -wNamingScreenStringEntryCoordY:: db ; c4d8 -wNamingScreenStringEntryCoordX:: db ; c4d9 +wNamingScreenDestinationPointer:: dw +wNamingScreenCurNameLength:: db +wNamingScreenMaxNameLength:: db +wNamingScreenType:: db +wNamingScreenCursorObjectPointer:: dw +wNamingScreenLastCharacter:: db +wNamingScreenStringEntryCoordY:: db +wNamingScreenStringEntryCoordX:: db ds 64 -wc51a:: ds 1 ; c51a +wc51a:: ds 1 ENDU @@ -140,26 +140,26 @@ ENDU SECTION "Map Buffer", WRAM0 wMapBuffer:: -wMapScriptNumber:: db ; c5e8 -wMapScriptNumberLocation:: dw ; c5e9 -wUnknownMapPointer:: dw ; c5eb ; TODO -wc5ed:: db ; c5ed +wMapScriptNumber:: db +wMapScriptNumberLocation:: dw +wUnknownMapPointer:: dw ; TODO +wc5ed:: db ds 18 -wMapBufferEnd:: ; c600 +wMapBufferEnd:: UNION -wOverworldMapBlocks:: ds 1300 ; c600 -wOverworldMapBlocksEnd:: ; cb14 +wOverworldMapBlocks:: ds 1300 +wOverworldMapBlocksEnd:: NEXTU -wLYOverrides:: ; c600 +wLYOverrides:: ds SCREEN_HEIGHT_PX ; c690 ds $10 -wLYOverrides2:: ; c6a0 +wLYOverrides2:: NEXTU ; Battle-related @@ -167,7 +167,7 @@ NEXTU ds $1ea ; c7ea -wActiveBGEffects:: ; c7ea +wActiveBGEffects:: wBGEffect1:: battle_bg_effect wBGEffect1 wBGEffect2:: battle_bg_effect wBGEffect2 wBGEffect3:: battle_bg_effect wBGEffect3 @@ -175,26 +175,26 @@ wBGEffect4:: battle_bg_effect wBGEffect4 wBGEffect5:: battle_bg_effect wBGEffect5 wActiveBGEffectsEnd:: -wNumActiveBattleAnims:: db ; c7fe +wNumActiveBattleAnims:: db -wBattleAnimFlags:: db ; c7ff -wBattleAnimAddress:: dw ; c800 -wBattleAnimDuration:: db ; c802 -wBattleAnimParent:: dw ; c803 -wBattleAnimLoops:: db ; c805 -wBattleAnimVar:: db ; c806 -wBattleAnimByte:: db ; c807 -wBattleAnimOAMPointerLo:: db ; c808 +wBattleAnimFlags:: db +wBattleAnimAddress:: dw +wBattleAnimDuration:: db +wBattleAnimParent:: dw +wBattleAnimLoops:: db +wBattleAnimVar:: db +wBattleAnimByte:: db +wBattleAnimOAMPointerLo:: db db -UNION ; c80a +UNION ; unidentified wBattleAnimTemp0:: db wBattleAnimTemp1:: db wBattleAnimTemp2:: db wBattleAnimTemp3:: db -NEXTU ; c80a +NEXTU wBattleAnimTempOAMFlags:: db wBattleAnimTempField02:: db wBattleAnimTempTileID:: db @@ -204,7 +204,7 @@ wBattleAnimTempXOffset:: db wBattleAnimTempYOffset:: db wBattleAnimTempAddSubFlags:: db wBattleAnimTempPalette:: db -ENDU ; c813 +ENDU ds $32 wBattleAnimEnd:: @@ -213,85 +213,85 @@ wBattleAnimEnd:: ds $1aa ; TODO -wc9ef:: ds 1 ; c9ef +wc9ef:: ds 1 ds 6 -wBattleMonNickname:: ds 6 ; c9f6 -wEnemyMonNickname:: ds 6 ; c9fc +wBattleMonNickname:: ds 6 +wEnemyMonNickname:: ds 6 -wca02:: ds 1 ; ca02 -wca03:: ds 1 ; ca03 -wca04:: ds 1 ; ca04 +wca02:: ds 1 +wca03:: ds 1 +wca04:: ds 1 ds 3 -wca08:: ds 1 ; ca08 -wca09:: ds 1 ; ca09 -wca0a:: ds 1 ; ca0a +wca08:: ds 1 +wca09:: ds 1 +wca0a:: ds 1 ds 5 ; TODO -wca10:: ds 1 ; ca10 -wca11:: ds 1 ; ca11 -wca12:: ds 1 ; ca12 -wca13:: ds 1 ; ca13 -wca14:: ds 1 ; ca14 +wca10:: ds 1 +wca11:: ds 1 +wca12:: ds 1 +wca13:: ds 1 +wca14:: ds 1 ds $22 ; TODO -wca37:: ds 1 ; ca37 -wca38:: ds 1 ; ca38 -wca39:: ds 1 ; ca39 -wca3a:: ds 1 ; ca3a -wca3b:: ds 1 ; ca3b -wca3c:: ds 1 ; ca3c -wPlayerSubStatus3:: db ; ca3d +wca37:: ds 1 +wca38:: ds 1 +wca39:: ds 1 +wca3a:: ds 1 +wca3b:: ds 1 +wca3c:: ds 1 +wPlayerSubStatus3:: db -wca3e:: ds 1 ; ca3e -wca3f:: ds 1 ; ca3f -wca40:: ds 1 ; ca40 -wca41:: ds 1 ; ca41 +wca3e:: ds 1 +wca3f:: ds 1 +wca40:: ds 1 +wca41:: ds 1 -wEnemySubStatus3:: db ; ca42 +wEnemySubStatus3:: db -wca43:: db ; ca43 +wca43:: db -wca44:: db ; ca44 +wca44:: db ds $12 -wTrainerClass:: ; ca57 +wTrainerClass:: db -wca58:: ds 1 ; ca58 -wca59:: ds 1 ; ca59 -wca5a:: ds 1 ; ca5a -wca5b:: ds 1 ; ca5b -wca5c:: ds 1 ; ca5c +wca58:: ds 1 +wca59:: ds 1 +wca5a:: ds 1 +wca5b:: ds 1 +wca5c:: ds 1 ds $5c -wcab9:: ds 1 ; cab9 +wcab9:: ds 1 ds 6 -wcac0:: ds 1 ; cac0 -wcac1:: ds 1 ; cac1 -wcac2:: ds 1 ; cac2 +wcac0:: ds 1 +wcac1:: ds 1 +wcac2:: ds 1 -wLinkBattleRNCount:: db ; cac3 +wLinkBattleRNCount:: db ds 12 -wcad0:: ds 1 ; cad0 +wcad0:: ds 1 ds 9 -wcada:: ds 1 ;cada +wcada:: ds 1 ds 6 -wcae1:: ds 1 ; cae1 +wcae1:: ds 1 ENDU @@ -301,505 +301,505 @@ ENDU SECTION "CB14", WRAM0[$CB14] UNION -wRedrawRowOrColumnSrcTiles:: ; cb14 +wRedrawRowOrColumnSrcTiles:: ; the tiles of the row or column to be redrawn by RedrawRowOrColumn ds SCREEN_WIDTH * 2 NEXTU -wRedrawFlashlightDst0:: dw ; cb14 -wRedrawFlashlightSrc0:: dw ; cb16 -wRedrawFlashlightBlackDst0:: dw ; cb18 -wRedrawFlashlightDst1:: dw ; cb1a -wRedrawFlashlightSrc1:: dw ; cb1c -wRedrawFlashlightBlackDst1:: dw ; cb1e -wRedrawFlashlightWidthHeight:: db ; cb20 +wRedrawFlashlightDst0:: dw +wRedrawFlashlightSrc0:: dw +wRedrawFlashlightBlackDst0:: dw +wRedrawFlashlightDst1:: dw +wRedrawFlashlightSrc1:: dw +wRedrawFlashlightBlackDst1:: dw +wRedrawFlashlightWidthHeight:: db ; width or height of flashlight redraw region ; in units of two tiles (people event meta tile) ENDU SECTION "CB56", WRAM0[$CB4C] -wOtherPlayerLinkMode:: db ; cb4c -wOtherPlayerLinkAction:: db ; cb4d +wOtherPlayerLinkMode:: db +wOtherPlayerLinkAction:: db ds 3 ; TODO -wPlayerLinkAction:: db ; cb51 +wPlayerLinkAction:: db ds 4 ; TODO -wLinkTimeoutFrames:: dw ; cb56 -wcb58:: ds 2 ; cb58 -wMonType:: db ; cb5a -wCurSpecies:: db ; cb5b -wNamedObjectTypeBuffer:: db ; cb5c +wLinkTimeoutFrames:: dw +wcb58:: ds 2 +wMonType:: db +wCurSpecies:: db +wNamedObjectTypeBuffer:: db SECTION "CB5E", WRAM0[$CB5E] -wJumptableIndex:: db ; cb5e -wFlyDestination:: db ; cb5f - -wcb60:: ds 1 ; cb60 -wcb61:: ds 1 ; cb61 - -wVBCopySize:: ds 1 ; cb62 -wVBCopySrc:: ds 2 ; cb63 -wVBCopyDst:: ds 2 ; cb65 -wVBCopyDoubleSize:: ds 1 ; cb67 -wVBCopyDoubleSrc:: ds 2 ; cb68 -wVBCopyDoubleDst:: ds 2 ; cb6a -wcb6c:: db ; cb6c -wcb6d:: db ; cb6d -wcb6e:: db ; cb6e -wPlayerStepDirection:: db ; cb6f +wJumptableIndex:: db +wFlyDestination:: db + +wcb60:: ds 1 +wcb61:: ds 1 + +wVBCopySize:: ds 1 +wVBCopySrc:: ds 2 +wVBCopyDst:: ds 2 +wVBCopyDoubleSize:: ds 1 +wVBCopyDoubleSrc:: ds 2 +wVBCopyDoubleDst:: ds 2 +wcb6c:: db +wcb6d:: db +wcb6e:: db +wPlayerStepDirection:: db SECTION "CB71", WRAM0[$CB70] wcb70:: db -wVBCopyFarSize:: ds 1 ; cb71 -wVBCopyFarSrc:: ds 2 ; cb72 -wVBCopyFarDst:: ds 2 ; cb74 -wVBCopyFarSrcBank:: ds 1 ; cb76 -wPlayerMovement:: db ; cb77 -wMovementObject:: db ; cb78 - ptrba wMovementData ; cb79 +wVBCopyFarSize:: ds 1 +wVBCopyFarSrc:: ds 2 +wVBCopyFarDst:: ds 2 +wVBCopyFarSrcBank:: ds 1 +wPlayerMovement:: db +wMovementObject:: db + ptrba wMovementData -wcb7c:: ds 1 ; cb7c +wcb7c:: ds 1 SECTION "Collision buffer", WRAM0[$CB90] -wTileDown:: db ; cb90 -wTileUp:: db ; cb91 -wTileLeft:: db ; cb92 -wTileRight:: db ; cb93 +wTileDown:: db +wTileUp:: db +wTileLeft:: db +wTileRight:: db -wScreenSave:: ; cb94 +wScreenSave:: ds 6 * 5 SECTION "CBB2", WRAM0[$CBB2] -wToolgearBuffer:: ; cbb2 +wToolgearBuffer:: ds $40 ; cbe2 SECTION "CBF2", WRAM0[$CBF2] wWindowData:: -wWindowStackPointer:: dw ; cbf2 -wMenuJoypad:: db ; cbf4 -wMenuSelection:: db ; cbf5 -wMenuSelectionQuantity:: db ; cbf6 +wWindowStackPointer:: dw +wMenuJoypad:: db +wMenuSelection:: db +wMenuSelectionQuantity:: db wWhichIndexSet:: -wActiveBackpackPocket:: db ; cbf7 -wScrollingMenuCursorPosition:: db ; cbf8 -wWindowStackSize:: db ; cbf9 +wActiveBackpackPocket:: db +wScrollingMenuCursorPosition:: db +wWindowStackSize:: db SECTION "CC09", WRAM0[$CC02] wMenuDataHeader:: - db ; cc02 -wMenuBorderTopCoord:: db ; cc03 -wMenuBorderLeftCoord:: db ; cc04 -wMenuBorderBottomCoord:: db ; cc05 -wMenuBorderRightCoord:: db ; cc06 -wMenuDataPointer:: dw ; cc07 -wMenuCursorBuffer:: db ; cc09 + db +wMenuBorderTopCoord:: db +wMenuBorderLeftCoord:: db +wMenuBorderBottomCoord:: db +wMenuBorderRightCoord:: db +wMenuDataPointer:: dw +wMenuCursorBuffer:: db ; cc0a ds 8 ; TODO wMenuDataHeaderEnd:: wMenuData2:: -wMenuDataFlags:: db ; cc12 -wMenuDataItems:: db ; cc13 -wMenuDataIndicesPointer:: dw ; cc14 -wMenuDataDisplayFunctionPointer:: dw ; cc16 -wMenuDataPointerTableAddr:: dw ; cc18 +wMenuDataFlags:: db +wMenuDataItems:: db +wMenuDataIndicesPointer:: dw +wMenuDataDisplayFunctionPointer:: dw +wMenuDataPointerTableAddr:: dw SECTION "MenuData3", WRAM0[$CC22] -wMenuData3:: ; cc22 - -w2DMenuCursorInitY:: db ; cc22 -w2DMenuCursorInitX:: db ; cc23 -w2DMenuNumRows:: db ; cc24 -w2DMenuNumCols:: db ; cc25 -w2DMenuFlags:: dw ; cc26 -w2DMenuCursorOffsets:: db ; cc28 -wMenuJoypadFilter:: db ; cc29 +wMenuData3:: + +w2DMenuCursorInitY:: db +w2DMenuCursorInitX:: db +w2DMenuNumRows:: db +w2DMenuNumCols:: db +w2DMenuFlags:: dw +w2DMenuCursorOffsets:: db +wMenuJoypadFilter:: db w2DMenuDataEnd:: -wMenuCursorY:: db ; cc2a -wMenuCursorX:: db ; cc2b -wCursorOffCharacter:: db ; cc2c -wCursorCurrentTile:: dw ; cc2d +wMenuCursorY:: db +wMenuCursorX:: db +wCursorOffCharacter:: db +wCursorCurrentTile:: dw SECTION "CC32", WRAM0[$CC32] ; Please merge when more is disassembled -wVBlankJoyFrameCounter: db ; cc32 +wVBlankJoyFrameCounter: db -wVBlankOccurred: db ; cc33 -wLastSpawnMapGroup: db ;cc34 -wLastSpawnMapNumber: db ; cc35 +wVBlankOccurred: db +wLastSpawnMapGroup: db +wLastSpawnMapNumber: db ds 2 ;Controls what type of opening (fire/notes) you get. wcc38:: -wTitleSequenceOpeningType:: ; cc38 +wTitleSequenceOpeningType:: db -wDefaultSpawnPoint:: ; cc39 +wDefaultSpawnPoint:: db -wMovementBufferCount:: db ; cc3a -wMovementBufferObject:: db ; cc3b - ptrba wMovementBufferPointer ; cc3c -wMovementBuffer:: ; cc3f +wMovementBufferCount:: db +wMovementBufferObject:: db + ptrba wMovementBufferPointer +wMovementBuffer:: ds 55 SECTION "CC9A", WRAM0[$CC9A] -wSkatingDirection:: db ; cc9a -wCompanionCollisionFrameCounter:: db ; cc9b +wSkatingDirection:: db +wCompanionCollisionFrameCounter:: db -wUnknownWordcc9c:: ; cc9c +wUnknownWordcc9c:: dw -wUnknownBuffercc9e:: ; cc9e +wUnknownBuffercc9e:: ds 14 -wSpriteCurPosX : ds 1 ; ccac -wSpriteCurPosY : ds 1 ; ccad -wSpriteWidth : ds 1 ; ccae -wSpriteHeight : ds 1 ; ccaf -wSpriteInputCurByte : ds 1 ; ccb0 -wSpriteInputBitCounter : ds 1 ; ccb1 -wSpriteOutputBitOffset : ds 1 ; ccb2 -wSpriteLoadFlags : ds 1 ; ccb3 -wSpriteUnpackMode : ds 1 ; ccb4 -wSpriteFlipped : ds 1 ; ccb5 -wSpriteInputPtr : ds 2 ; ccb6 -wSpriteOutputPtr : ds 2 ; ccb8 -wSpriteOutputPtrCached : ds 2 ; ccba -wSpriteDecodeTable0Ptr : ds 2 ; ccbc -wSpriteDecodeTable1Ptr : ds 2 ; ccbe - -wccc0:: ds 1 ; ccc0 -wccc1:: ds 1 ; ccc1 -wccc2:: ds 1 ; ccc2 -wccc3:: ds 1 ; ccc3 -wccc4:: ds 1 ; ccc4 +wSpriteCurPosX : ds 1 +wSpriteCurPosY : ds 1 +wSpriteWidth : ds 1 +wSpriteHeight : ds 1 +wSpriteInputCurByte : ds 1 +wSpriteInputBitCounter : ds 1 +wSpriteOutputBitOffset : ds 1 +wSpriteLoadFlags : ds 1 +wSpriteUnpackMode : ds 1 +wSpriteFlipped : ds 1 +wSpriteInputPtr : ds 2 +wSpriteOutputPtr : ds 2 +wSpriteOutputPtrCached : ds 2 +wSpriteDecodeTable0Ptr : ds 2 +wSpriteDecodeTable1Ptr : ds 2 + +wccc0:: ds 1 +wccc1:: ds 1 +wccc2:: ds 1 +wccc3:: ds 1 +wccc4:: ds 1 SECTION "CCC7", WRAM0[$CCC7] -wDisableVBlankOAMUpdate:: db ; ccc7 +wDisableVBlankOAMUpdate:: db SECTION "CCCA", WRAM0[$CCCA] -wBGP:: db ; ccca -wOBP0:: db ; cccb -wOBP1:: db ; cccc +wBGP:: db +wOBP0:: db +wOBP1:: db -wcccd:: ds 1 ; cccd +wcccd:: ds 1 -wDisableVBlankWYUpdate:: db ; ccce +wDisableVBlankWYUpdate:: db wSGB:: db SECTION "CCD0", WRAM0[$CCD0] -wccd0:: ds 1 ; ccd0 -wccd1:: ds 1 ; ccd1 -wccd2:: ds 1 ; ccd2 -wccd3:: ds 1 ; ccd3 +wccd0:: ds 1 +wccd1:: ds 1 +wccd2:: ds 1 +wccd3:: ds 1 ds 5 -wccd9:: ds 1 ; ccd9 +wccd9:: ds 1 SECTION "CCE1", WRAM0[$CCE1] -wcce1:: ds 1 ; cce1 -wcce2:: ds 1 ; cce2 -wcce3:: ds 1 ; cce3 -wcce4:: ds 1 ; cce4 +wcce1:: ds 1 +wcce2:: ds 1 +wcce3:: ds 1 +wcce4:: ds 1 ds 6 -wcceb:: ds 1 ; cceb +wcceb:: ds 1 ds 5 -wccf1:: ds 1 ; ccf1 -wccf2:: ds 1 ; ccf2 -wccf3:: ds 1 ; ccf3 -wccf4:: ds 1 ; ccf4 +wccf1:: ds 1 +wccf2:: ds 1 +wccf3:: ds 1 +wccf4:: ds 1 SECTION "CD11", WRAM0[$CD11] -wcd11:: ds 1 ; cd11 +wcd11:: ds 1 ds 20 -wStringBuffer1:: ds 1 ; How long is this? ; cd26 +wStringBuffer1:: ds 1 ; How long is this? wcd27:: ds 1 SECTION "CD31", WRAM0[$CD31] UNION -wStartDay:: db ;cd31 -wStartHour:: db ;cd32 -wStartMinute:: db ;cd33 +wStartDay:: db +wStartHour:: db +wStartMinute:: db NEXTU -wHPBarTempHP:: dw ; cd31 +wHPBarTempHP:: dw NEXTU -wStringBuffer2:: db ; How long is this? ; cd31 +wStringBuffer2:: db ; How long is this? ENDU SECTION "CD3C", WRAM0[$CD3C] -wcd3c:: db ; cd3c -wRegularItemsCursor:: db ; cd3d -wBackpackAndKeyItemsCursor:: db ;cd3e -wStartmenuCursor:: db ; cd3f -wcd40:: db ; cd40 -wcd41:: db ; cd41 -wcd42:: db ; cd42 -wcd43:: db ; cd43 -wRegularItemsScrollPosition:: db ; cd44 -wBackpackAndKeyItemsScrollPosition:: db ; cd45 -wcd46:: ds 1 ; cd46 -wcd47:: ds 1 ; cd47 -wSelectedSwapPosition:: db ; cd48 -wMenuScrollPosition:: db ; cd49 +wcd3c:: db +wRegularItemsCursor:: db +wBackpackAndKeyItemsCursor:: db +wStartmenuCursor:: db +wcd40:: db +wcd41:: db +wcd42:: db +wcd43:: db +wRegularItemsScrollPosition:: db +wBackpackAndKeyItemsScrollPosition:: db +wcd46:: ds 1 +wcd47:: ds 1 +wSelectedSwapPosition:: db +wMenuScrollPosition:: db wTextDest:: ds 2; cd4a -wQueuedScriptBank:: db ; cd4c -wQueuedScriptAddr:: dw ; cd4d +wQueuedScriptBank:: db +wQueuedScriptAddr:: dw -wPredefID:: ; cd4f +wPredefID:: db -wPredefHL:: ; cd50 +wPredefHL:: dw -wPredefDE:: ; cd52 +wPredefDE:: dw -wPredefBC:: ; cd54 +wPredefBC:: -wFarCallBCBuffer:: ; cd54 +wFarCallBCBuffer:: dw -wcd56:: ds 1 ; cd56 -wcd57:: ds 1 ; cd57 -wFieldMoveSucceeded:: db ; cd58 -wVramState:: db ; cd59 +wcd56:: ds 1 +wcd57:: ds 1 +wFieldMoveSucceeded:: db +wVramState:: db ds 3 ; TODO -wcd5d:: db ; cd5d +wcd5d:: db db -wChosenStarter:: db ; cd5f +wChosenStarter:: db SECTION "CD70", WRAM0[$CD70] -wcd70:: ds 1 ; cd70 -wcd71:: ds 1 ; cd71 -wcd72:: dw ; cd72 -wcd74:: db ; cd74 -wcd75:: db ; cd75 +wcd70:: ds 1 +wcd71:: ds 1 +wcd72:: dw +wcd74:: db +wcd75:: db -wCurItem:: db ; cd76 -wItemIndex:: db ;cd77 -wMonDexIndex: db ; cd78 -wWhichPokemon: db ; cd79 +wCurItem:: db +wItemIndex:: db +wMonDexIndex: db +wWhichPokemon: db SECTION "CD7B", WRAM0[$CD7B] -wHPBarType:: db ; cd7b -wcd7c:: ds 1 ; cd7c +wHPBarType:: db +wcd7c:: ds 1 -wItemQuantity:: db ; cd7d -wItemQuantityBuffer:: db ; cd7e -wcd7f:: db ; cd7f -wcd80:: db ; cd80 -wcd81:: db ; cd81 +wItemQuantity:: db +wItemQuantityBuffer:: db +wcd7f:: db +wcd80:: db +wcd81:: db SECTION "CD9E", WRAM0 [$CD9E] -wLoadedMonLevel:: db ; cd9e +wLoadedMonLevel:: db SECTION "CDAF", WRAM0 [$CDAF] -wcdaf:: db ; cdaf +wcdaf:: db SECTION "CDB0", WRAM0 [$CDB0] -wTalkingTargetType:: db ; cdb0 +wTalkingTargetType:: db ;bit 0 = has engaged NPC in dialogue ;bit 1 = has engaged sign in dialogue -wcdb1:: ds 1 ; cdb1 -wcdb2:: ds 1 ; cdb2 +wcdb1:: ds 1 +wcdb2:: ds 1 SECTION "CDB9", WRAM0[$CDB9] -wcdb9:: ds 1 ; cdb9 +wcdb9:: ds 1 -wItemAttributeParamBuffer:: db ; cdba -wCurPartyLevel:: db ; cdbb +wItemAttributeParamBuffer:: db +wCurPartyLevel:: db SECTION "CDBD", WRAM0[$CDBD] -wLinkMode:: db ; cdbd +wLinkMode:: db ; 00 - ; 01 - ; 02 - ; 03 - -wNextWarp:: db ; cdbe -wNextMapGroup:: db ; cdbf -wNextMapId:: db ; cdc0 -wPrevWarp:: db ; cdc1 +wNextWarp:: db +wNextMapGroup:: db +wNextMapId:: db +wPrevWarp:: db ds 1 UNION wFieldMoveScriptID:: db; cdc3 -wMapBlocksAddress:: dw ; cdc4 -wReplacementBlock:: db ; cdc6 +wMapBlocksAddress:: dw +wReplacementBlock:: db NEXTU -wHPBarMaxHP:: dw ; cdc3 -wHPBarOldHP:: dw ; cdc5 +wHPBarMaxHP:: dw +wHPBarOldHP:: dw ENDU -wHPBarNewHP:: dw ; cdc7 -wHPBarDelta:: db ; cdc9 -wcdca:: db ; cdca -wHPBarHPDifference:: dw ; cdcb - -wLinkBattleRNs:: ds 10 ; cdcd - -wcdd7:: ds 1 ; cdd7 -wcdd8:: ds 1 ; cdd8 -wcdd9:: ds 1 ; cdd9 -wcdda:: ds 1 ; cdda -wcddb:: ds 1 ; cddb -wcddc:: ds 1 ; cddc -wcddd:: ds 1 ; cddd -wcdde:: ds 1 ; cdde -wcddf:: ds 1 ; cddf -wcde0:: ds 1 ; cde0 -wcde1:: ds 1 ; cde1 -wcde2:: ds 1 ; cde2 -wcde3:: ds 1 ; cde3 -wcde4:: ds 1 ; cde4 -wcde5:: ds 1 ; cde5 -wcde6:: ds 1 ; cde6 -wcde7:: ds 1 ; cde7 -wcde8:: ds 1 ; cde8 -wcde9:: ds 1 ; cde9 -wcdea:: ds 1 ; cdea -wcdeb:: ds 1 ; cdeb +wHPBarNewHP:: dw +wHPBarDelta:: db +wcdca:: db +wHPBarHPDifference:: dw + +wLinkBattleRNs:: ds 10 + +wcdd7:: ds 1 +wcdd8:: ds 1 +wcdd9:: ds 1 +wcdda:: ds 1 +wcddb:: ds 1 +wcddc:: ds 1 +wcddd:: ds 1 +wcdde:: ds 1 +wcddf:: ds 1 +wcde0:: ds 1 +wcde1:: ds 1 +wcde2:: ds 1 +wcde3:: ds 1 +wcde4:: ds 1 +wcde5:: ds 1 +wcde6:: ds 1 +wcde7:: ds 1 +wcde8:: ds 1 +wcde9:: ds 1 +wcdea:: ds 1 +wcdeb:: ds 1 SECTION "CDFE", WRAM0[$CDFE] -wcdfe:: ds 1 ; cdfe -wcdff:: ds 1 ; cdff -wBattleMode:: db ; ce00 -wce01:: ds 1 ; ce01 -wce02:: ds 1 ; ce02 -wce03:: ds 1 ; ce03 -wce04:: ds 1 ; ce04 -wce05:: ds 1 ; ce05 -wce06:: ds 1 ; ce06 +wcdfe:: ds 1 +wcdff:: ds 1 +wBattleMode:: db +wce01:: ds 1 +wce02:: ds 1 +wce03:: ds 1 +wce04:: ds 1 +wce05:: ds 1 +wce06:: ds 1 wMonHeader:: -wMonHIndex:: ; ce07 +wMonHIndex:: ; In the ROM base stats data structure, this is the dex number, but it is ; overwritten with the dex number after the header is copied to WRAM. ds 1 -wMonHBaseStats:: ; ce08 -wMonHBaseHP:: ; ce08 +wMonHBaseStats:: +wMonHBaseHP:: ds 1 -wMonHBaseAttack:: ; ce09 +wMonHBaseAttack:: ds 1 -wMonHBaseDefense:: ; ce0a +wMonHBaseDefense:: ds 1 -wMonHBaseSpeed:: ; ce0b +wMonHBaseSpeed:: ds 1 -wMonHBaseSpecialAtt:: ; ce0c +wMonHBaseSpecialAtt:: ds 1 -wMonHBaseSpecialDef:: ; ce0d +wMonHBaseSpecialDef:: ds 1 -wMonHTypes:: ; ce0e -wMonHType1:: ; ce0e +wMonHTypes:: +wMonHType1:: ds 1 -wMonHType2:: ; ce0f +wMonHType2:: ds 1 -wMonHCatchRate:: ; ce10 +wMonHCatchRate:: ds 1 -wMonHBaseEXP:: ; ce11 +wMonHBaseEXP:: ds 1 -wMonHItems:: ; ce12 -wMonHItem1:: ; ce12 +wMonHItems:: +wMonHItem1:: ds 1 -wMonHItem2:: ; ce13 +wMonHItem2:: ds 1 -wMonHGenderRatio:: ; ce14 +wMonHGenderRatio:: ds 1 -wMonHUnk0:: ; ce15 +wMonHUnk0:: ds 1 -wMonHUnk1:: ; ce16 +wMonHUnk1:: ds 1 -wMonHUnk2:: ; ce17 +wMonHUnk2:: ds 1 -wMonHSpriteDim:: ; ce18 +wMonHSpriteDim:: ds 1 -wMonHFrontSprite:: ; ce19 +wMonHFrontSprite:: ds 2 -wMonHBackSprite:: ; ce1b +wMonHBackSprite:: ds 2 -wMonHGrowthRate:: ; ce1d +wMonHGrowthRate:: ds 1 -wMonHLearnset:: ; ce1e +wMonHLearnset:: ; bit field flag_array 50 + 5 ; size = 7 ds 1 SECTION "CE2D", WRAM0[$CE2D] -wce2d:: ds 1 ; ce2d -wce2e:: ds 1 ; ce2e -wce2f:: ds 1 ; ce2f -wce30:: ds 1 ; ce30 -wce31:: ds 1 ; ce31 -wce32:: ds 1 ; ce32 -wce33:: ds 1 ; ce33 -wce34:: ds 1 ; ce34 -wce35:: ds 1 ; ce35 -wce36:: ds 1 ; ce36 +wce2d:: ds 1 +wce2e:: ds 1 +wce2f:: ds 1 +wce30:: ds 1 +wce31:: ds 1 +wce32:: ds 1 +wce33:: ds 1 +wce34:: ds 1 +wce35:: ds 1 +wce36:: ds 1 wNamedObjectIndexBuffer:: wCountSetBitsResult:: -wce37:: ; ce37 +wce37:: db SECTION "CE3A", WRAM0[$CE3A] -wce3a:: ds 1 ; ce3a +wce3a:: ds 1 -wVBlankSavedROMBank:: ; ce3b +wVBlankSavedROMBank:: db -wBuffer:: ; ce3c +wBuffer:: db -wTimeOfDay:: db ; ce3d +wTimeOfDay:: db ; based on RTC ; Time of Day Regular Debug ; 00 - Day 09--15h 00--30s @@ -811,68 +811,68 @@ wcd3f: ds 1 SECTION "CE5F", WRAM0[$CE5F] -wce5f:: ; ce5f ; debug menu writes $41 to it +wce5f:: ; debug menu writes $41 to it db -wce60:: ; ce60 +wce60:: db ; main menu checks this, maybe states if there's a save present? -wActiveFrame:: db ; ce61 +wActiveFrame:: db -wTextBoxFlags:: db ; ce62 +wTextBoxFlags:: db -wDebugFlags:: db ; ce63 +wDebugFlags:: db ; Bit 0: Debug battle indicator ; Bit 1: Debug field indicator ; Bit 2-3: Game is continued (set when selecting continue on the main menu) -wce64:: ds 1 ; ce64 -wce65:: ds 1 ; ce65 -wce66:: ds 1 ; ce66 +wce64:: ds 1 +wce65:: ds 1 +wce66:: ds 1 -wPlayerName:: ds 6 ; ce67 +wPlayerName:: ds 6 -wMomsName:: ds 6 ; ce6d +wMomsName:: ds 6 SECTION "CE73", WRAM0[$CE73] -wce73: ds 1 ; ce73 -wce74: ds 1 ; ce74 -wce75: ds 1 ; ce75 +wce73: ds 1 +wce74: ds 1 +wce75: ds 1 -wObjectFollow_Leader:: ; ce76 +wObjectFollow_Leader:: db -wObjectFollow_Follower:: ; ce77 +wObjectFollow_Follower:: db -wCenteredObject:: ; ce78 +wCenteredObject:: db -wFollowerMovementQueueLength:: ; ce79 +wFollowerMovementQueueLength:: db -wFollowMovementQueue:: ; ce7a +wFollowMovementQueue:: ds 5 -wObjectStructs:: ; ce7f +wObjectStructs:: ; Note: this might actually not be an object. TODO: Investigate (if indexing starts at 1, then this isn't an object) ; It might just be unused/a leftover. -wUnkObjectStruct:: object_struct wUnkObject ; ce7f -wPlayerStruct:: object_struct wPlayer ; cea7 -wObject1Struct:: object_struct wObject1 ; cecf -wObject2Struct:: object_struct wObject2 ; cef7 -wObject3Struct:: object_struct wObject3 ; cf1f -wObject4Struct:: object_struct wObject4 ; cf47 -wObject5Struct:: object_struct wObject5 ; cf6f -wObject6Struct:: object_struct wObject6 ; cf97 -wObject7Struct:: object_struct wObject7 ; cfbf -wObject8Struct:: object_struct wObject8 ; cfe7 -wObjectStructsEnd:: ; d00f - -wCmdQueue:: ; d00f +wUnkObjectStruct:: object_struct wUnkObject +wPlayerStruct:: object_struct wPlayer +wObject1Struct:: object_struct wObject1 +wObject2Struct:: object_struct wObject2 +wObject3Struct:: object_struct wObject3 +wObject4Struct:: object_struct wObject4 +wObject5Struct:: object_struct wObject5 +wObject6Struct:: object_struct wObject6 +wObject7Struct:: object_struct wObject7 +wObject8Struct:: object_struct wObject8 +wObjectStructsEnd:: + +wCmdQueue:: wCmdQueueEntry1:: ds 16 wCmdQueueEntry2:: ds 16 wCmdQueueEntry3:: ds 16 wCmdQueueEntry4:: ds 16 -wMapObjects:: ; d04f +wMapObjects:: wPlayerObject:: map_object wPlayer wMap1Object:: map_object wMap1 wMap2Object:: map_object wMap2 @@ -889,9 +889,9 @@ wMap12Object:: map_object wMap12 wMap13Object:: map_object wMap13 wMap14Object:: map_object wMap14 wMap15Object:: map_object wMap15 -wMapObjectsEnd:: ; d14f +wMapObjectsEnd:: -wToolgearFlags:: db ; d14f +wToolgearFlags:: db ; 76543210 ; | | \- show toolgear ; | | @@ -900,20 +900,20 @@ wToolgearFlags:: db ; d14f ds 2 ; TODO -wTimeOfDayPal:: db ; d152 +wTimeOfDayPal:: db ; Applied according to wCurTimeOfDay from wTimeOfDayPalset -wd153:: db ; d153 +wd153:: db ; 76543210 ; | \- show player coords in toolgear instead of time ; \-------- switch overworld palettes according to seconds not hours ds 3 ; TODO -wTimeOfDayPalFlags:: db ; d157 +wTimeOfDayPalFlags:: db ; 76543210 ; \-------- disable overworld palette switch -wTimeOfDayPalset:: db ; d158 +wTimeOfDayPalset:: db ; 76543210 ; \/\/\/\/ ; | | | \- Map Palette for TimeOfDay 0x00 @@ -921,75 +921,75 @@ wTimeOfDayPalset:: db ; d158 ; | \----- Map Palette for TimeOfDay 0x02 ; \------- Map Palette for TimeOfDay 0x03 -wCurTimeOfDay:: db ; d159 +wCurTimeOfDay:: db SECTION "D15B", WRAM0[$D15B] -wd15b:: db ; d15b +wd15b:: db -wd15c:: db ; d15c +wd15c:: db -wd15d:: db ; d15d +wd15d:: db -wd15e:: db ; d15e +wd15e:: db -wd15f:: db ; d15f +wd15f:: db SECTION "D163", WRAM0[$D163] -wd163:: db ; d163 +wd163:: db -wd164:: db ; d164 +wd164:: db -wTMsHMs:: db ; d165 +wTMsHMs:: db SECTION "D19E", WRAM0[$D19E] wItems:: -wNumBagItems:: db ; d19e +wNumBagItems:: db SECTION "D1C8", WRAM0[$D1C8] -wNumKeyItems:: db ; d1c8 -wKeyItems:: db ; d1c9 +wNumKeyItems:: db +wKeyItems:: db SECTION "D1DE", WRAM0[$D1DE] -wNumBallItems:: db ; d1de -wBallQuantities:: db ; d1df +wNumBallItems:: db +wBallQuantities:: db ds 10 -wUnknownListLengthd1ea:: db ; d1ea -wUnknownListd1eb:: db ; d1eb +wUnknownListLengthd1ea:: db +wUnknownListd1eb:: db SECTION "Rival's Name", WRAM0[$D256] -wRegisteredItem:: db ; d256 -wRegisteredItemQuantity:: db ; d257 -wRivalName:: ds 6 ; d258 +wRegisteredItem:: db +wRegisteredItemQuantity:: db +wRivalName:: ds 6 ds 6 -wPlayerState:: db ; d264 +wPlayerState:: db ; 00 - walking ; 01 - bicycle ; 02 - skateboard ; 04 - surfing -wd265:: db ; d265 -wd266:: db ; d266 +wd265:: db +wd266:: db ;The starting house's map script number is stored at d29a. Others are probably nearby. SECTION "D29A", WRAM0[$D29A] -wd29a:: db ; d29a -wd29b:: db ; d29b -wd29c:: db ; d29c -wd29d:: db ; d29d -wd29e:: db ; d29e +wd29a:: db +wd29b:: db +wd29c:: db +wd29d:: db +wd29e:: db db -wd2a0:: db ; d2a0 +wd2a0:: db SECTION "D35F", WRAM0[$D35F] -wOptions:: db ; d35f +wOptions:: db SECTION "D39D", WRAM0[$D39D] wd39d:: db @@ -1016,9 +1016,9 @@ wd41e:: db SECTION "D4A9", WRAM0[$D4A9] -wd4a9:: db ; d4a9 +wd4a9:: db ds 1 ; TODO -wJoypadFlags:: db ; d4ab +wJoypadFlags:: db ; 76543210 ; ||||\__/ ; |||| \-- unkn @@ -1029,260 +1029,260 @@ wJoypadFlags:: db ; d4ab SECTION "wDigWarpNumber", WRAM0[$D4B2] -wDigWarpNumber:: db ; d4b2 -wd4b3:: ds 1 ; d4b3 -wd4b4:: ds 1 ; d4b4 -wd4b5:: ds 1 ; d4b5 -wd4b6:: ds 1 ; d4b6 -wd4b7:: ds 1 ; d4b7 -wd4b8:: ds 1 ; d4b8 -wd4b9:: ds 1 ; d4b9 +wDigWarpNumber:: db +wd4b3:: ds 1 +wd4b4:: ds 1 +wd4b5:: ds 1 +wd4b6:: ds 1 +wd4b7:: ds 1 +wd4b8:: ds 1 +wd4b9:: ds 1 SECTION "Warp data", WRAM0[$D513] -wWarpNumber:: db ; d513 +wWarpNumber:: db -wCurrMapWarpCount:: ; d514 +wCurrMapWarpCount:: db -wCurrMapWarps:: ; d515 +wCurrMapWarps:: REPT 32 ; TODO: confirm this ds 5 ENDR -wCurrMapSignCount:: ; d5b5 +wCurrMapSignCount:: db -wCurrMapSigns:: ; d5b6 +wCurrMapSigns:: REPT 16 ; TODO: confirm this ds 4 ENDR -wCurrMapObjectCount:: ; d5f6 +wCurrMapObjectCount:: db -wCurrMapInlineTrainers:: ; d5f7 +wCurrMapInlineTrainers:: REPT 32 ; TODO: confirm this ds 2 ; inline trainers. each pair of bytes is direction, distance ENDR SECTION "D637", WRAM0[$D637] -wd637:: db ; d637 ;OW battle state? $3 wild battle, $8 is trainer battle $4 is left battle, $B is load overworld? $0 is in overworld -wd638:: db ; d638 ;wd637's last written-to value +wd637:: db ;OW battle state? $3 wild battle, $8 is trainer battle $4 is left battle, $B is load overworld? $0 is in overworld +wd638:: db ;wd637's last written-to value SECTION "Used sprites", WRAM0[$D643] -wBGMapAnchor:: ; d643 +wBGMapAnchor:: dw -wUsedSprites:: ; d645 +wUsedSprites:: dw ; This is for the player -wUsedNPCSprites:: ;d647 +wUsedNPCSprites:: ds 2 * 5 ; This is for the NPCs -wUsedSpritesEnd:: ; d651 +wUsedSpritesEnd:: SECTION "Map header", WRAM0[$D656] -wMapGroup:: db ; d656 -wMapId:: db ; d657 +wMapGroup:: db +wMapId:: db -wOverworldMapAnchor:: ; d658 +wOverworldMapAnchor:: dw -wYCoord:: db ; d65a -wXCoord:: db ; d65b +wYCoord:: db +wXCoord:: db -wMetatileNextY:: db ; d65c -wMetatileNextX:: db ; d65d +wMetatileNextY:: db +wMetatileNextX:: db -wd65e:: ; d65e +wd65e:: db -wMapPartial:: ; d65f -wMapAttributesBank:: ; d65f +wMapPartial:: +wMapAttributesBank:: db -wMapTileset:: ; d660 +wMapTileset:: db -wMapPermissions:: ; d661 +wMapPermissions:: db -wMapAttributesPtr:: ; d662 +wMapAttributesPtr:: dw -wMapPartialEnd:: ; d664 +wMapPartialEnd:: -wMapAttributes:: ; d664 -wMapHeight:: ; d664 +wMapAttributes:: +wMapHeight:: db -wMapWidth:: ; d665 +wMapWidth:: db -wMapBlocksPointer:: ; d666 +wMapBlocksPointer:: dw wMapTextPtr:: dw -wMapScriptPtr:: ; d66a +wMapScriptPtr:: dw -wMapObjectsPtr:: ; d66c +wMapObjectsPtr:: dw -wMapConnections:: ; d66e +wMapConnections:: db -wMapAttributesEnd:: ; d66f +wMapAttributesEnd:: -wNorthMapConnection:: map_connection_struct wNorth ; d66f -wSouthMapConnection:: map_connection_struct wSouth ; d67b -wWestMapConnection:: map_connection_struct wWest ; d687 -wEastMapConnection:: map_connection_struct wEast ; d693 +wNorthMapConnection:: map_connection_struct wNorth +wSouthMapConnection:: map_connection_struct wSouth +wWestMapConnection:: map_connection_struct wWest +wEastMapConnection:: map_connection_struct wEast -wTileset:: ; d69f -wTilesetBank:: ; d69f +wTileset:: +wTilesetBank:: db -wTilesetBlocksAddress:: ; d6a0 +wTilesetBlocksAddress:: dw -wTilesetTilesAddress:: ; d6a2 +wTilesetTilesAddress:: dw -wTilesetCollisionAddress:: ; d6a4 +wTilesetCollisionAddress:: dw ds 4 ; TODO -wTilesetEnd:: ; d6aa +wTilesetEnd:: wPartyCount:: db -wPartySpecies:: ds PARTY_LENGTH ; d6ab - d6b0 -wPartyEnd:: db ; d6b1 +wPartySpecies:: ds PARTY_LENGTH +wPartyEnd:: db wPartyMons:: -wPartyMon1:: party_struct wPartyMon1 ; d6b2 -wPartyMon2:: party_struct wPartyMon2 ; d6e2 -wPartyMon3:: party_struct wPartyMon3 ; d712 -wPartyMon4:: party_struct wPartyMon4 ; d742 -wPartyMon5:: party_struct wPartyMon5 ; d772 -wPartyMon6:: party_struct wPartyMon6 ; d7a2 -wPlayerPartyEnd:: ; d7d2 - -wPartyMonOT:: ; d7d2 +wPartyMon1:: party_struct wPartyMon1 +wPartyMon2:: party_struct wPartyMon2 +wPartyMon3:: party_struct wPartyMon3 +wPartyMon4:: party_struct wPartyMon4 +wPartyMon5:: party_struct wPartyMon5 +wPartyMon6:: party_struct wPartyMon6 +wPlayerPartyEnd:: + +wPartyMonOT:: ds PARTY_LENGTH * 6 -wPartyMonOTEnd:: ; d7f6 +wPartyMonOTEnd:: -wPartyMonNicknames:: ; d7f6 +wPartyMonNicknames:: ds PARTY_LENGTH * MON_NAME_LENGTH ; = $24 -wPartyMonNicknamesEnd:: ; d81a +wPartyMonNicknamesEnd:: -wPokedexOwned:: ; d81a +wPokedexOwned:: flag_array NUM_POKEMON -wPokedexOwnedEnd:: ; d839 +wPokedexOwnedEnd:: -wPokedexSeen:: ; d83a +wPokedexSeen:: flag_array NUM_POKEMON -wPokedexSeenEnd:: ; d859 +wPokedexSeenEnd:: -wAnnonDex:: ds 26 ; d85a +wAnnonDex:: ds 26 -wAnnonID:: ds 1 ; d874 +wAnnonID:: ds 1 -wd875:: ds 1 ; d875 -wd876:: ds 1 ; d876 +wd875:: ds 1 +wd876:: ds 1 ds 5 -wd87c:: ds 1 ; d87c +wd87c:: ds 1 ds 5 -wd882:: ds 1 ; d882 -wd883:: ds 1 ; d883 -wd884:: ds 1 ; d884 +wd882:: ds 1 +wd883:: ds 1 +wd884:: ds 1 SECTION "D8A2", WRAM0[$D8A2] -wd8a2:: ds 1 ; d8a2 -wd8a3:: ds 1 ; d8a3 -wd8a4:: ds 1 ; d8a4 -wd8a5:: ds 1 ; d8a5 +wd8a2:: ds 1 +wd8a3:: ds 1 +wd8a4:: ds 1 +wd8a5:: ds 1 ds 5 -wd8ab:: ds 1 ; d8ab +wd8ab:: ds 1 SECTION "wd8b1", WRAM0[$D8B1] -wd8b1:: ds 1 ; d8b1 +wd8b1:: ds 1 ds 5 -wd8b7:: ds 1 ; d8b7 -wd8b8:: ds 1 ; d8b8 +wd8b7:: ds 1 +wd8b8:: ds 1 SECTION "D8D1", WRAM0[$D8D1] -wd8d1:: ds 1 ; d8d1 +wd8d1:: ds 1 ds 5 -wd8d7:: ds 1 ; d8d7 +wd8d7:: ds 1 ds 5 -wd8dd:: ds 1 ; d8dd +wd8dd:: ds 1 SECTION "D8E3", WRAM0[$D8E3] -wd8e3:: ds 1 ; d8e3 -wd8e4:: ds 1 ; d8e4 +wd8e3:: ds 1 +wd8e4:: ds 1 SECTION "D8FD", WRAM0[$D8FD] -wd8fd:: ds 1 ; d8fd +wd8fd:: ds 1 SECTION "D913", WRAM0[$D913] -wd913:: ds 1 ; d913 +wd913:: ds 1 SECTION "Wild mon buffer", WRAM0[$D91B] UNION -wWildMons:: ; d91b +wWildMons:: ds 41 NEXTU ds 2 -wd91d:: ds 1 ; d91d +wd91d:: ds 1 ds 29 -wd93b:: ds 1 ; d93b +wd93b:: ds 1 ENDU SECTION "DA3B", WRAM0[$DA3B] -wOTPartyMonOT:: db ; da3b +wOTPartyMonOT:: db SECTION "DA5F", WRAM0[$DA5F] -wda5f:: db ; da5f +wda5f:: db SECTION "DA83", WRAM0[$DA83] -wBoxListLength:: db ; da83 -wBoxList:: ds MONS_PER_BOX ; da84 +wBoxListLength:: db +wBoxList:: ds MONS_PER_BOX SECTION "DAA3", WRAM0[$DAA3] -wdaa3:: db ; daa3 -wdaa4:: db ; daa4 -wdaa5:: db ; daa5 +wdaa3:: db +wdaa4:: db +wdaa5:: db SECTION "DE63", WRAM0[$DE63] -wde63:: db ; de63 +wde63:: db SECTION "DF17", WRAM0[$DF17] -wdf17:: ds 1 ; df17 +wdf17:: ds 1 SECTION "DFCB", WRAM0[$DFCB] -wdfcb:: ds 1 ; dfcb +wdfcb:: ds 1 SECTION "Stack Bottom", WRAM0 ; Where SP is set at game init -wStackBottom:: ; dfff +wStackBottom:: ; Due to the way the stack works (`push` first decrements, then writes), the byte at $DFFF is actually wasted |