diff options
Diffstat (limited to 'data')
27 files changed, 421 insertions, 405 deletions
diff --git a/data/bg_map_attributes.asm b/data/cgb/bg_map_attributes.asm index 81535e72..81535e72 100644 --- a/data/bg_map_attributes.asm +++ b/data/cgb/bg_map_attributes.asm diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index 15212048..4dd69409 100755 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -15,6 +15,6 @@ CreditsMons: db NIDOKING db PARASECT -rept 9 +REPT 9 db GENGAR -endr +ENDR diff --git a/data/maps/bit_5_maps.asm b/data/maps/bit_5_maps.asm new file mode 100644 index 00000000..c32bb114 --- /dev/null +++ b/data/maps/bit_5_maps.asm @@ -0,0 +1,30 @@ +; SetMapSpecificScriptFlagsOnMapReload sets bit 5 +; of wCurrentMapScriptFlags for these maps. + +Bit5Maps: + db SILPH_CO_2F + db SILPH_CO_3F + db SILPH_CO_4F + db SILPH_CO_5F + db SILPH_CO_6F + db SILPH_CO_7F + db SILPH_CO_8F + db SILPH_CO_9F + db SILPH_CO_10F + db SILPH_CO_11F + db POKEMON_MANSION_2F + db POKEMON_MANSION_3F + db POKEMON_MANSION_B1F + db POKEMON_MANSION_1F + db CINNABAR_GYM + db GAME_CORNER + db ROCKET_HIDEOUT_B1F + db ROCKET_HIDEOUT_B4F + db VICTORY_ROAD_3F + db VICTORY_ROAD_1F + db VICTORY_ROAD_2F + db LANCES_ROOM + db LORELEIS_ROOM + db BRUNOS_ROOM + db AGATHAS_ROOM + db -1 ; end diff --git a/data/maps/headers/BeachHouse.asm b/data/maps/headers/BeachHouse.asm deleted file mode 100644 index b1b69e5a..00000000 --- a/data/maps/headers/BeachHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -BeachHouse_h: - db BEACH_HOUSE_TILESET - db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x) - dw BeachHouse_Blocks ; blocks - dw BeachHouse_TextPointers ; texts - dw BeachHouse_Script ; scripts - db 0 ; connections - dw BeachHouse_Object ; objects diff --git a/data/maps/headers/SummerBeachHouse.asm b/data/maps/headers/SummerBeachHouse.asm new file mode 100644 index 00000000..64f55acc --- /dev/null +++ b/data/maps/headers/SummerBeachHouse.asm @@ -0,0 +1,3 @@ + + map_header SummerBeachHouse, SUMMER_BEACH_HOUSE, BEACH_HOUSE, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 0e26900f..74251978 100755 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -571,11 +571,8 @@ SeafoamIslandsB4FHS: db SEAFOAM_ISLANDS_B4F, $01, HIDE db SEAFOAM_ISLANDS_B4F, $02, HIDE db SEAFOAM_ISLANDS_B4F, $03, SHOW - -BluesHouseHSCopy: -; doesn't seem to be referenced +BluesHouseHSCopy: ; unreferenced db BLUES_HOUSE, $01, SHOW db BLUES_HOUSE, $02, HIDE db BLUES_HOUSE, $03, SHOW - - db $FF, $01, SHOW + db $FF, $01, SHOW ; end diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 98e5b5f5..bbc7e13c 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -248,4 +248,4 @@ MapHeaderBanks:: db BANK(LoreleisRoom_h) db BANK(BrunosRoom_h) db BANK(AgathasRoom_h) - db BANK(BeachHouse_h) + db BANK(SummerBeachHouse_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 6ea31795..25a814cf 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -248,4 +248,4 @@ MapHeaderPointers:: dw LoreleisRoom_h dw BrunosRoom_h dw AgathasRoom_h ;247 - dw BeachHouse_h + dw SummerBeachHouse_h diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 340c48f0..55511b21 100755 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -2,7 +2,7 @@ Route19_Object: db $43 ; border block def_warps - warp 5, 9, 0, BEACH_HOUSE + warp 5, 9, 0, SUMMER_BEACH_HOUSE def_signs sign 11, 11, 11 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index e939b0dd..6977133b 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -22,8 +22,7 @@ Route2_Object: ; unused warp_to 2, 7, 4 - dw $c712 - db $9, $7 + db $12, $c7, $9, $7 warp_to 2, 7, 4 warp_to 2, 7, 4 warp_to 2, 7, 4 diff --git a/data/maps/objects/BeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm index 1ba99f87..c503b8a7 100644 --- a/data/maps/objects/BeachHouse.asm +++ b/data/maps/objects/SummerBeachHouse.asm @@ -1,4 +1,4 @@ -BeachHouse_Object: +SummerBeachHouse_Object: db $a ; border block def_warps @@ -15,4 +15,4 @@ BeachHouse_Object: object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu - def_warps_to BEACH_HOUSE + def_warps_to SUMMER_BEACH_HOUSE diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 1b043bfa..afafe3b3 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -247,4 +247,4 @@ MapSongBanks:: db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM - db MUSIC_ROUTES3, BANK(Music_Routes3) ; BEACH_HOUSE + db MUSIC_ROUTES3, BANK(Music_Routes3) ; SUMMER_BEACH_HOUSE diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 6e754558..8ad4bc28 100755 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -114,5 +114,5 @@ InternalMapEntries: internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName - internal_map BEACH_HOUSE, 6, 15, Route19Name + internal_map SUMMER_BEACH_HOUSE, 6, 15, Route19Name db -1 ; end diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index 5855c98c..e44b1abc 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -1,6 +1,4 @@ ExclamationPointMoveSets: -; a grammar mistake was fixed (only concerning japanese) -; BIDE is in category 3, moved from category 2 ; set 0 db SWORDS_DANCE db GROWTH @@ -18,7 +16,7 @@ ExclamationPointMoveSets: db TELEPORT db MIMIC db DOUBLE_TEAM - db BIDE + db BIDE ; corrected JP grammar: moved from set 1 in pokered db BARRAGE db 0 ; end set diff --git a/data/pikachu_emotions.asm b/data/pikachu/pikachu_emotions.asm index f72beaa4..f72beaa4 100755 --- a/data/pikachu_emotions.asm +++ b/data/pikachu/pikachu_emotions.asm diff --git a/data/pikachu_pic_animation.asm b/data/pikachu/pikachu_pic_animation.asm index d10f65dd..a9e3c5e7 100755 --- a/data/pikachu_pic_animation.asm +++ b/data/pikachu/pikachu_pic_animation.asm @@ -19,7 +19,7 @@ PikaPicAnimThunderboltPals: db 4, %11100100 db 4, %11000000 db 4, %11100100 - db $ff + db -1 ; end Data_fe26b: pikapic_loadgfx Pic_e4000 @@ -326,15 +326,18 @@ PikaPicAnimScript28: pikapic_cry pikapic_looptofinish -PikaPicAnimGFXHeaders: pikapicanimgfx: MACRO +IF _NARG == 2 \2_id:: db \1 ; size (-1 if compressed) dba \2 ; pointer - endm +ELSE + dbbw \1, \2, \3 ; size, bank, address +ENDC +ENDM -PikaPicAnimGFX_Null_id:: - dbbw 1, $39,$0000 ; 00 +PikaPicAnimGFXHeaders: + pikapicanimgfx 1, $39, NULL ; 00 pikapicanimgfx -1, Pic_e4000 ; 01 pikapicanimgfx 5, GFX_e40cc ; 02 pikapicanimgfx -1, Pic_e411c ; 03 diff --git a/data/pikachu_pic_objects.asm b/data/pikachu/pikachu_pic_objects.asm index 940c1141..c3a44bc9 100755 --- a/data/pikachu_pic_objects.asm +++ b/data/pikachu/pikachu_pic_objects.asm @@ -1,8 +1,9 @@ -PikaPicAnimBGFramesPointers: -pikaanim_def: macro -\1_id: dw \1 - endm +pikaanim_def: MACRO +\1_id: + dw \1 +ENDM +PikaPicAnimBGFramesPointers: pikaanim_def PikaPicAnimBGFrames_0 ; 00 pikaanim_def PikaPicAnimBGFrames_1 ; 01 pikaanim_def PikaPicAnimBGFrames_2 ; 02 @@ -40,6 +41,13 @@ pikaanim_def: macro pikaanim_def PikaPicAnimBGFrames_34 ; 22 pikaanim_def PikaPicAnimBGFrames_35 ; 23 +pikaframe: MACRO + db (\1_id - PikaPicTilemapPointers) / 2, \2 +ENDM + +pikaframedelay EQUS "db 0," +pikaframeend EQUS "db $e0" + PikaPicAnimBGFrames_0: PikaPicAnimBGFrames_1: ; Tilemap idx, duration diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu/pikachu_pic_tilemaps.asm index 95882711..d11ba04e 100755 --- a/data/pikachu_pic_tilemaps.asm +++ b/data/pikachu/pikachu_pic_tilemaps.asm @@ -1,8 +1,9 @@ -PikaPicTilemapPointers: -pikatilemap_def: macro -\1_id: dw \1 - endm +pikatilemap_def: MACRO +\1_id: + dw \1 +ENDM +PikaPicTilemapPointers: pikatilemap_def PikaAnimTilemap_0 pikatilemap_def PikaAnimTilemap_1 pikatilemap_def PikaAnimTilemap_2 @@ -48,10 +49,10 @@ pikatilemap_def: macro pikatilemap_def PikaAnimTilemap_42 PikaAnimTilemap_0: - db $ff ; unused + db -1 ; unused +; $ff inhibits overwriting that tile - ; $ff inhibits overwriting that tile PikaAnimTilemap_1: PikaAnimTilemap_42: db 5, 5 diff --git a/data/sprite_anims/intro_frames.asm b/data/sprite_anims/intro_frames.asm new file mode 100644 index 00000000..bed2aa6f --- /dev/null +++ b/data/sprite_anims/intro_frames.asm @@ -0,0 +1,70 @@ +YellowIntro_AnimatedObjectFramesData: + dw Unkn_fa100 + dw Unkn_fa103 + dw Unkn_fa10a + dw Unkn_fa111 + dw Unkn_fa118 + dw Unkn_fa11b + dw Unkn_fa11e + dw Unkn_fa121 + dw Unkn_fa124 + dw Unkn_fa127 + dw Unkn_fa138 + +Unkn_fa100: + frame $00, 32 + endanim + +Unkn_fa103: + frame $01, 4 + frame $02, 4 + frame $03, 4 + dorestart + +Unkn_fa10a: + frame $04, 4 + frame $05, 4 + frame $06, 4 + dorestart + +Unkn_fa111: + frame $07, 4 + frame $08, 4 + frame $09, 4 + dorestart + +Unkn_fa118: + frame $0a, 32 + endanim + +Unkn_fa11b: + frame $0b, 32 + endanim + +Unkn_fa11e: + frame $0c, 32 + endanim + +Unkn_fa121: + frame $0d, 32 + endanim + +Unkn_fa124: + frame $0e, 32 + endanim + +Unkn_fa127: + frame $0f, 31 + frame $11, 2 + frame $0f, 2 + frame $11, 2 + frame $0f, 31 + frame $11, 2 + frame $0f, 23 + frame $10, 32 + endanim + +Unkn_fa138: + frame $12, 4 + frame $13, 4 + dorestart diff --git a/data/animated_objects_3e_2.asm b/data/sprite_anims/intro_oam.asm index 4e9f5b3c..f966d082 100755..100644 --- a/data/animated_objects_3e_2.asm +++ b/data/sprite_anims/intro_oam.asm @@ -1,74 +1,3 @@ -YellowIntro_AnimatedObjectFramesData: - dw Unkn_fa100 - dw Unkn_fa103 - dw Unkn_fa10a - dw Unkn_fa111 - dw Unkn_fa118 - dw Unkn_fa11b - dw Unkn_fa11e - dw Unkn_fa121 - dw Unkn_fa124 - dw Unkn_fa127 - dw Unkn_fa138 - -Unkn_fa100: - frame $00, 32 - endanim - -Unkn_fa103: - frame $01, 4 - frame $02, 4 - frame $03, 4 - dorestart - -Unkn_fa10a: - frame $04, 4 - frame $05, 4 - frame $06, 4 - dorestart - -Unkn_fa111: - frame $07, 4 - frame $08, 4 - frame $09, 4 - dorestart - -Unkn_fa118: - frame $0a, 32 - endanim - -Unkn_fa11b: - frame $0b, 32 - endanim - -Unkn_fa11e: - frame $0c, 32 - endanim - -Unkn_fa121: - frame $0d, 32 - endanim - -Unkn_fa124: - frame $0e, 32 - endanim - -Unkn_fa127: - frame $0f, 31 - frame $11, 2 - frame $0f, 2 - frame $11, 2 - frame $0f, 31 - frame $11, 2 - frame $0f, 23 - frame $10, 32 - endanim - -Unkn_fa138: - frame $12, 4 - frame $13, 4 - dorestart - YellowIntro_AnimatedObjectOAMData: dbw $00, Unkn_fa179 dbw $96, Unkn_fa17e diff --git a/data/sprite_anims/surfing_pikachu_frames.asm b/data/sprite_anims/surfing_pikachu_frames.asm new file mode 100755 index 00000000..cf3463a3 --- /dev/null +++ b/data/sprite_anims/surfing_pikachu_frames.asm @@ -0,0 +1,200 @@ +SurfingPikachuFrames: + dw Unkn_f943d ; 00 + dw Unkn_f9440 ; 01 + dw Unkn_f9445 ; 02 + dw Unkn_f944a ; 03 + dw Unkn_f944f ; 04 + dw Unkn_f9454 ; 05 + dw Unkn_f9459 ; 06 + dw Unkn_f945e ; 07 + dw Unkn_f9463 ; 08 + dw Unkn_f9468 ; 09 + dw Unkn_f946d ; 0a + dw Unkn_f9472 ; 0b + dw Unkn_f9477 ; 0c + dw Unkn_f947c ; 0d + dw Unkn_f9481 ; 0e + dw Unkn_f9486 ; 0f + dw Unkn_f948b ; 10 + dw Unkn_f9494 ; 11 + dw Unkn_f9499 ; 12 + dw Unkn_f949e ; 13 + dw Unkn_f94fb ; 14 + dw Unkn_f94a1 ; 15 + dw Unkn_f94b0 ; 16 + dw Unkn_f94bf ; 17 + dw Unkn_f94ce ; 18 + dw Unkn_f94dd ; 19 + dw Unkn_f94ec ; 1a + dw Unkn_f94fe ; 1b + +Unkn_f943d: + frame $00, 32 + endanim + +Unkn_f9440: + frame $01, 8 + frame $02, 8 + dorestart + +Unkn_f9445: + frame $03, 8 + frame $04, 8 + dorestart + +Unkn_f944a: + frame $05, 8 + frame $06, 8 + dorestart + +Unkn_f944f: + frame $07, 8 + frame $08, 8 + dorestart + +Unkn_f9454: + frame $09, 8 + frame $0a, 8 + dorestart + +Unkn_f9459: + frame $0b, 8 + frame $0c, 8 + dorestart + +Unkn_f945e: + frame $0d, 8 + frame $0e, 8 + dorestart + +Unkn_f9463: + frame $01, 8, OAM_HFLIP, OAM_VFLIP + frame $02, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9468: + frame $03, 8, OAM_HFLIP, OAM_VFLIP + frame $04, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f946d: + frame $05, 8, OAM_HFLIP, OAM_VFLIP + frame $06, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9472: + frame $07, 8, OAM_HFLIP, OAM_VFLIP + frame $08, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9477: + frame $09, 8, OAM_HFLIP, OAM_VFLIP + frame $0a, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f947c: + frame $0b, 8, OAM_HFLIP, OAM_VFLIP + frame $0c, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9481: + frame $0d, 8, OAM_HFLIP, OAM_VFLIP + frame $0e, 8, OAM_HFLIP, OAM_VFLIP + dorestart + +Unkn_f9486: + frame $11, 7 + frame $12, 7 + dorestart + +Unkn_f948b: + frame $13, 2 + frame $14, 2 + dorepeat 8 + frame $15, 2 + endanim + +Unkn_f9494: + frame $16, 32 + frame $16, 32 + delanim + +Unkn_f9499: + frame $17, 32 + frame $17, 32 + delanim + +Unkn_f949e: + frame $18, 32 + endanim + +Unkn_f94a1: + frame $1a, 4 + dorepeat 1 + frame $1a, 3 + dorepeat 1 + frame $1a, 2 + dorepeat 1 + frame $1a, 1 + delanim + +Unkn_f94b0: + frame $1b, 4 + dorepeat 1 + frame $1b, 3 + dorepeat 1 + frame $1b, 2 + dorepeat 1 + frame $1b, 1 + delanim + +Unkn_f94bf: + frame $1c, 4 + dorepeat 1 + frame $1c, 3 + dorepeat 1 + frame $1c, 2 + dorepeat 1 + frame $1c, 1 + delanim + +Unkn_f94ce: + frame $1d, 4 + dorepeat 1 + frame $1d, 3 + dorepeat 1 + frame $1d, 2 + dorepeat 1 + frame $1d, 1 + delanim + +Unkn_f94dd: + frame $1e, 4 + dorepeat 1 + frame $1e, 3 + dorepeat 1 + frame $1e, 2 + dorepeat 1 + frame $1e, 1 + delanim + +Unkn_f94ec: + frame $1f, 4 + dorepeat 1 + frame $1f, 3 + dorepeat 1 + frame $1f, 2 + dorepeat 1 + frame $1f, 1 + delanim + +Unkn_f94fb: + frame $19, 1 + delanim + +Unkn_f94fe: + frame $20, 7 + frame $21, 7 + frame $22, 7 + frame $23, 7 + dorestart diff --git a/data/animated_objects_3e_1.asm b/data/sprite_anims/surfing_pikachu_oam.asm index 07b17ce5..d3aa441f 100755..100644 --- a/data/animated_objects_3e_1.asm +++ b/data/sprite_anims/surfing_pikachu_oam.asm @@ -1,204 +1,3 @@ -SurfingPikachuFrames: - dw Unkn_f943d ; 00 - dw Unkn_f9440 ; 01 - dw Unkn_f9445 ; 02 - dw Unkn_f944a ; 03 - dw Unkn_f944f ; 04 - dw Unkn_f9454 ; 05 - dw Unkn_f9459 ; 06 - dw Unkn_f945e ; 07 - dw Unkn_f9463 ; 08 - dw Unkn_f9468 ; 09 - dw Unkn_f946d ; 0a - dw Unkn_f9472 ; 0b - dw Unkn_f9477 ; 0c - dw Unkn_f947c ; 0d - dw Unkn_f9481 ; 0e - dw Unkn_f9486 ; 0f - dw Unkn_f948b ; 10 - dw Unkn_f9494 ; 11 - dw Unkn_f9499 ; 12 - dw Unkn_f949e ; 13 - dw Unkn_f94fb ; 14 - dw Unkn_f94a1 ; 15 - dw Unkn_f94b0 ; 16 - dw Unkn_f94bf ; 17 - dw Unkn_f94ce ; 18 - dw Unkn_f94dd ; 19 - dw Unkn_f94ec ; 1a - dw Unkn_f94fe ; 1b - -Unkn_f943d: - frame $00, 32 - endanim - -Unkn_f9440: - frame $01, 8 - frame $02, 8 - dorestart - -Unkn_f9445: - frame $03, 8 - frame $04, 8 - dorestart - -Unkn_f944a: - frame $05, 8 - frame $06, 8 - dorestart - -Unkn_f944f: - frame $07, 8 - frame $08, 8 - dorestart - -Unkn_f9454: - frame $09, 8 - frame $0a, 8 - dorestart - -Unkn_f9459: - frame $0b, 8 - frame $0c, 8 - dorestart - -Unkn_f945e: - frame $0d, 8 - frame $0e, 8 - dorestart - -Unkn_f9463: - frame $01, 8, OAM_HFLIP, OAM_VFLIP - frame $02, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f9468: - frame $03, 8, OAM_HFLIP, OAM_VFLIP - frame $04, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f946d: - frame $05, 8, OAM_HFLIP, OAM_VFLIP - frame $06, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f9472: - frame $07, 8, OAM_HFLIP, OAM_VFLIP - frame $08, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f9477: - frame $09, 8, OAM_HFLIP, OAM_VFLIP - frame $0a, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f947c: - frame $0b, 8, OAM_HFLIP, OAM_VFLIP - frame $0c, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f9481: - frame $0d, 8, OAM_HFLIP, OAM_VFLIP - frame $0e, 8, OAM_HFLIP, OAM_VFLIP - dorestart - -Unkn_f9486: - frame $11, 7 - frame $12, 7 - dorestart - -Unkn_f948b: - frame $13, 2 - frame $14, 2 - dorepeat 8 - frame $15, 2 - endanim - -Unkn_f9494: - frame $16, 32 - frame $16, 32 - delanim - -Unkn_f9499: - frame $17, 32 - frame $17, 32 - delanim - -Unkn_f949e: - frame $18, 32 - endanim - -Unkn_f94a1: - frame $1a, 4 - dorepeat 1 - frame $1a, 3 - dorepeat 1 - frame $1a, 2 - dorepeat 1 - frame $1a, 1 - delanim - -Unkn_f94b0: - frame $1b, 4 - dorepeat 1 - frame $1b, 3 - dorepeat 1 - frame $1b, 2 - dorepeat 1 - frame $1b, 1 - delanim - -Unkn_f94bf: - frame $1c, 4 - dorepeat 1 - frame $1c, 3 - dorepeat 1 - frame $1c, 2 - dorepeat 1 - frame $1c, 1 - delanim - -Unkn_f94ce: - frame $1d, 4 - dorepeat 1 - frame $1d, 3 - dorepeat 1 - frame $1d, 2 - dorepeat 1 - frame $1d, 1 - delanim - -Unkn_f94dd: - frame $1e, 4 - dorepeat 1 - frame $1e, 3 - dorepeat 1 - frame $1e, 2 - dorepeat 1 - frame $1e, 1 - delanim - -Unkn_f94ec: - frame $1f, 4 - dorepeat 1 - frame $1f, 3 - dorepeat 1 - frame $1f, 2 - dorepeat 1 - frame $1f, 1 - delanim - -Unkn_f94fb: - frame $19, 1 - delanim - -Unkn_f94fe: - frame $20, 7 - frame $21, 7 - frame $22, 7 - frame $23, 7 - dorestart - SurfingPikachuOAMData: dbw $00, .Frame0 dbw $00, .Frame1 diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index e87a9627..d3455d74 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -1,4 +1,5 @@ SpriteFacingAndAnimationTable: +; This table is used for overworld sprites $1-$9. dw .StandingDown ; facing down, walk animation frame 0 dw .WalkingDown ; facing down, walk animation frame 1 dw .StandingDown ; facing down, walk animation frame 2 @@ -35,97 +36,91 @@ SpriteFacingAndAnimationTable: dw .StandingDown dw .StandingDown ; special case - dw SpriteSpecialCase ; pikachu maybe? + dw .SpecialCase ; pikachu maybe? + +; Tables used as a reference to transform OAM data. + +; Format: +; db y, x, attributes, tile index .StandingDown: - db $04 -; Sprite OAM Parameters - db $00, $00, $00, $00 ; top left - db $00, $08, $01, $00 ; top right - db $08, $00, $02, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $03, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $00, 0 + db 0, 8, $01, 0 + db 8, 0, $02, OAMFLAG_CANBEMASKED + db 8, 8, $03, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingDown: - db $04 -; Sprite OAM Parameters - db $00, $00, $80, $00 ; top left - db $00, $08, $81, $00 ; top right - db $08, $00, $82, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $83, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $80, 0 + db 0, 8, $81, 0 + db 8, 0, $82, OAMFLAG_CANBEMASKED + db 8, 8, $83, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingDown2: - db $04 -; Sprite OAM Parameters - db $00, $08, $80, OAM_HFLIP ; top left - db $00, $00, $81, OAM_HFLIP ; top right - db $08, $08, $82, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left - db $08, $00, $83, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 8, $80, OAM_HFLIP + db 0, 0, $81, OAM_HFLIP + db 8, 8, $82, OAM_HFLIP | OAMFLAG_CANBEMASKED + db 8, 0, $83, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .StandingUp: - db $04 -; Sprite OAM Parameters - db $00, $00, $04, $00 ; top left - db $00, $08, $05, $00 ; top right - db $08, $00, $06, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $07, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $04, 0 + db 0, 8, $05, 0 + db 8, 0, $06, OAMFLAG_CANBEMASKED + db 8, 8, $07, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingUp: - db $04 -; Sprite OAM Parameters - db $00, $00, $84, $00 ; top left - db $00, $08, $85, $00 ; top right - db $08, $00, $86, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $87, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $84, 0 + db 0, 8, $85, 0 + db 8, 0, $86, OAMFLAG_CANBEMASKED + db 8, 8, $87, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingUp2: - db $04 -; Sprite OAM Parameters - db $00, $08, $84, OAM_HFLIP ; top left - db $00, $00, $85, OAM_HFLIP ; top right - db $08, $08, $86, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left - db $08, $00, $87, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 8, $84, OAM_HFLIP + db 0, 0, $85, OAM_HFLIP + db 8, 8, $86, OAM_HFLIP | OAMFLAG_CANBEMASKED + db 8, 0, $87, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .StandingLeft: - db $04 -; Sprite OAM Parameters - db $00, $00, $08, $00 ; top left - db $00, $08, $09, $00 ; top right - db $08, $00, $0a, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $0b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $08, 0 + db 0, 8, $09, 0 + db 8, 0, $0a, OAMFLAG_CANBEMASKED + db 8, 8, $0b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingLeft: - db $04 -; Sprite OAM Parameters - db $00, $00, $88, $00 ; top left - db $00, $08, $89, $00 ; top right - db $08, $00, $8a, OAMFLAG_CANBEMASKED ; bottom left - db $08, $08, $8b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 0, $88, 0 + db 0, 8, $89, 0 + db 8, 0, $8a, OAMFLAG_CANBEMASKED + db 8, 8, $8b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .StandingRight: - db $04 -; Sprite OAM Parameters - db $00, $08, $08, OAM_HFLIP ; top left - db $00, $00, $09, OAM_HFLIP ; top right - db $08, $08, $0a, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left - db $08, $00, $0b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 8, $08, OAM_HFLIP + db 0, 0, $09, OAM_HFLIP + db 8, 8, $0a, OAM_HFLIP | OAMFLAG_CANBEMASKED + db 8, 0, $0b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA .WalkingRight: - db $04 -; Sprite OAM Parameters - db $00, $08, $88, OAM_HFLIP ; top left - db $00, $00, $89, OAM_HFLIP ; top right - db $08, $08, $8a, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left - db $08, $00, $8b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + db 4 ; # + db 0, 8, $88, OAM_HFLIP + db 0, 0, $89, OAM_HFLIP + db 8, 8, $8a, OAM_HFLIP | OAMFLAG_CANBEMASKED + db 8, 0, $8b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA -SpriteSpecialCase: - db $09 -; Sprite OAM Parameters - db -$4, -$4, $00, $00 - db -$4, $04, $01, $00 - db -$4, $0c, $00, OAM_HFLIP - db $04, -$4, $01, $00 - db $04, $04, $02, $00 - db $04, $0c, $01, $00 - db $0c, -$4, $00, OAM_VFLIP | OAMFLAG_CANBEMASKED - db $0c, $04, $01, OAMFLAG_CANBEMASKED - db $0c, $0c, $00, OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA +.SpecialCase: + db 9 ; # + db -4, -4, $00, 0 + db -4, 4, $01, 0 + db -4, 12, $00, OAM_HFLIP + db 4, -4, $01, 0 + db 4, 4, $02, 0 + db 4, 12, $01, 0 + db 12, -4, $00, OAM_VFLIP | OAMFLAG_CANBEMASKED + db 12, 4, $01, OAMFLAG_CANBEMASKED + db 12, 12, $00, OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index b7bee609..217ad864 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -36,7 +36,7 @@ SpriteSheetPointerTable: overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL overworld_sprite LanceSprite, 12 ; SPRITE_LANCE - overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_SCIENTIST + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_1 overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER @@ -55,11 +55,11 @@ SpriteSheetPointerTable: overworld_sprite FisherSprite, 12 ; SPRITE_FISHER overworld_sprite KogaSprite, 12 ; SPRITE_KOGA overworld_sprite GuardSprite, 12 ; SPRITE_GUARD - overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_GUARD + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_2 overworld_sprite MomSprite, 12 ; SPRITE_MOM overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY - overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID + overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_3 overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID overworld_sprite FairySprite, 12 ; SPRITE_FAIRY overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index af33a273..766a1713 100755 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -272,14 +272,6 @@ BikerData: db 33, WEEZING, 0 db 26, GRIMER, GRIMER, GRIMER, GRIMER, 0 ; Route 17 - ; From https://www.smogon.com/smog/issue27/glitch: - ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. - ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; - ; that's the formula from GetMonHeader for the base stats of mon #000. - ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) - ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. - ; The result is that this data gets interpreted as the base stats - ; for MissingNo: 0, 33, MUK, 0, 29, VOLTORB, VOLTORB, 0, ..., 28, GRIMER, GRIMER. db 28, WEEZING, KOFFING, WEEZING, 0 db 33, MUK, 0 db 29, VOLTORB, VOLTORB, 0 @@ -600,12 +592,12 @@ RocketData: ; Silph Co. 11F db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0 db 32, CUBONE, DROWZEE, MAROWAK, 0 -;JessieJamesData: +; Jessie & James db 14, EKANS, MEOWTH, KOFFING, 0 db 25, KOFFING, MEOWTH, EKANS, 0 db 27, MEOWTH, ARBOK, WEEZING, 0 db 31, WEEZING, ARBOK, MEOWTH, 0 -; unused JessieJames trainers +; Unused db 16, KOFFING, 0 db 27, KOFFING, 0 db 29, WEEZING, 0 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index f858fa57..d9c6b893 100755 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1,7 +1,7 @@ -; yellow has its own format. - -; entry = trainerclass, trainerid, moveset+, 0 -; moveset = partymon location, partymon's move, moveid +; Yellow entry format: +; db trainerclass, trainerid +; repeat { db partymon location, partymon move, move id } +; db 0 SpecialTrainerMoves: db BUG_CATCHER, 15 diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 154980cc..7b3b6407 100755 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -1,4 +1,4 @@ -FishingSlots:: +SuperRodFishingSlots:: db PALLET_TOWN, STARYU, 10, TENTACOOL, 10, STARYU, 5, TENTACOOL, 20 db VIRIDIAN_CITY, POLIWAG, 5, POLIWAG, 10, POLIWAG, 15, POLIWAG, 10 db CERULEAN_CITY, GOLDEEN, 25, GOLDEEN, 30, SEAKING, 30, SEAKING, 40 |