diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/hidden_objects.asm | 4 | ||||
| -rwxr-xr-x | data/hide_show_data.asm | 2 | ||||
| -rw-r--r-- | data/mapObjects/beach_house.asm | 2 | ||||
| -rwxr-xr-x | data/mon_palettes.asm | 1 | ||||
| -rwxr-xr-x | data/sgb_packets.asm | 12 |
5 files changed, 9 insertions, 12 deletions
diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 7ba90bd3..190c03e9 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -539,9 +539,7 @@ CinnabarLab4HiddenObjects: hidden_object 4, 2, SPRITE_FACING_UP, OpenPokemonCenterPC db $ff -CinnabarPokecenterHiddenObjects: ; 6cc3 +CinnabarPokecenterHiddenObjects: hidden_object 4, 0, SPRITE_FACING_UP, PrintBenchGuyText hidden_object 3, 13, SPRITE_FACING_UP, OpenPokemonCenterPC db $ff - -; 6cd0 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 72822a40..d4f9190e 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -342,7 +342,7 @@ MapHS2D: db VIRIDIAN_GYM, $0B, Show MapHS34: db MUSEUM_1F, $05, Show -MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house +MapHS3F: ; bulbasaur adoption house db CERULEAN_HOUSE_1, $02, Show MapHSE4: db UNKNOWN_DUNGEON_1, $01, Show diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index 847883d1..71b4b7df 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -1,4 +1,4 @@ -BeachHouseObjects: ; 0xf23a4 +BeachHouseObjects: db $a ; border block db 2 ; warps diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm index 065db93e..8c4d0bc0 100755 --- a/data/mon_palettes.asm +++ b/data/mon_palettes.asm @@ -151,4 +151,3 @@ MonsterPalettes: db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEW -; 1c:69b9 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index b2cb6e9b..a29de819 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -175,13 +175,13 @@ MaskEnCancelPacket: ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. -DataSnd_728a1: DATA_SND $85d, $0, 11 ; 728a1 (1c:68a1) +DataSnd_728a1: DATA_SND $85d, $0, 11 db $8C ; cpx #$8c (2) db $D0, $F4 ; bne -$0c db $60 ; rts ds 7 -DataSnd_728b1: DATA_SND $852, $0, 11 ; 728b1 (1c:68b1) +DataSnd_728b1: DATA_SND $852, $0, 11 db $A9, $E7 ; lda #$e7 db $9F, $01, $C0, $7E ; sta $7ec001, x db $E8 ; inx @@ -209,7 +209,7 @@ DataSnd_728d1: DATA_SND $83c, $0, 11 ; 728d1 (1c:68d1) db $CA ; dex db $C9 ; cmp #$c4 (1) -DataSnd_728e1: DATA_SND $831, $0, 11 ; 728e1 (1c:68e1) +DataSnd_728e1: DATA_SND $831, $0, 11 dbw $0C, $CAA5 ; tsb $caa5 db $C9, $7E ; cmp #$7e db $D0, $06 ; bne +$06 @@ -217,7 +217,7 @@ DataSnd_728e1: DATA_SND $831, $0, 11 ; 728e1 (1c:68e1) db $CB ; wai db $C9, $7E ; cmp #$7e -DataSnd_728f1: DATA_SND $826, $0, 11 ; 728f1 (1c:68f1) +DataSnd_728f1: DATA_SND $826, $0, 11 db $39 ; bne +$39 (2) dbw $CD, $C48 ; cmp $c48 db $D0, $34 ; bne +$34 @@ -225,7 +225,7 @@ DataSnd_728f1: DATA_SND $826, $0, 11 ; 728f1 (1c:68f1) db $C9, $C9 ; cmp #$c9 db $80, $D0 ; bra -$30 -DataSnd_72901: DATA_SND $81b, $0, 11 ; 72901 (1c:6901) +DataSnd_72901: DATA_SND $81b, $0, 11 db $EA ; nop db $EA ; nop db $EA ; nop @@ -236,7 +236,7 @@ DataSnd_72901: DATA_SND $81b, $0, 11 ; 72901 (1c:6901) dbw $CD,$C4F ; cmp $c4f db $D0 ; bne +$39 (1) -DataSnd_72911: DATA_SND $810, $0, 11 ; 72911 (1c:6911) +DataSnd_72911: DATA_SND $810, $0, 11 dbw $4C, $820 ; jmp $820 db $EA ; nop db $EA ; nop |