From a070bdcb21310c7d17b4fd057852f788fdfd61ca Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 6 Jun 2016 01:22:22 -0500 Subject: Clean up white space --- data/facing.asm | 20 ++++++++++---------- data/hide_show_data.asm | 4 ++-- data/mapObjects/route19.asm | 2 +- data/sgb_packets.asm | 26 +++++++++++++------------- data/sprite_sets.asm | 20 ++++++++++---------- data/tileset_headers.asm | 2 +- data/trainer_types.asm | 2 +- data/warp_tile_ids.asm | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) (limited to 'data') diff --git a/data/facing.asm b/data/facing.asm index 138a0162..7a3dfacd 100644 --- a/data/facing.asm +++ b/data/facing.asm @@ -13,12 +13,12 @@ SpriteFacingAndAnimationTable: ; 4000 (1:4000) dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 1 dw SpriteFacingLeftAndStanding ; facing left, walk animation frame 2 dw SpriteFacingLeftAndWalking ; facing left, walk animation frame 3 - + dw SpriteFacingRightAndStanding ; facing right, walk animation frame 0 dw SpriteFacingRightAndWalking ; facing right, walk animation frame 1 dw SpriteFacingRightAndStanding ; facing right, walk animation frame 2 dw SpriteFacingRightAndWalking ; facing right, walk animation frame 3 - + dw SpriteFacingDownAndStanding ; --- dw SpriteFacingDownAndStanding ; This table is used for sprites $a and $b. dw SpriteFacingDownAndStanding ; All orientation and animation parameters @@ -69,7 +69,7 @@ SpriteFacingUpAndStanding: ; 4075 (1:4075) 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 - + SpriteFacingUpAndWalking: ; 4086 (1:4086) db $04 ; Sprite OAM Parameters @@ -85,7 +85,7 @@ SpriteFacingUpAndWalking2: ; 4097 (1:4097) db $00,$00,$85,OAMFLAG_VFLIPPED ; top right db $08,$08,$86,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$87,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteFacingLeftAndStanding: ; 40a8 (1:40a8) db $04 ; Sprite OAM Parameters @@ -109,7 +109,7 @@ SpriteFacingRightAndStanding: ; 40ca (1:40ca) db $00,$00,$09,OAMFLAG_VFLIPPED ; top right db $08,$08,$0a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$0b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteFacingRightAndWalking: ; 40db (1:40db) db $04 ; Sprite OAM Parameters @@ -117,14 +117,14 @@ SpriteFacingRightAndWalking: ; 40db (1:40db) db $00,$00,$89,OAMFLAG_VFLIPPED ; top right db $08,$08,$8a,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left db $08,$00,$8b,OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right - + SpriteSpecialCase ; 40ec (1:40ec) db $09 ; Sprite OAM Parameters - db -$4,-$4,$00,$00 - db -$4,$04,$01,$00 - db -$4,$0c,$00,OAMFLAG_VFLIPPED - db $04,-$4,$01,$00 + db -$4,-$4,$00,$00 + db -$4,$04,$01,$00 + db -$4,$0c,$00,OAMFLAG_VFLIPPED + db $04,-$4,$01,$00 db $04,$04,$02,$00 db $04,$0c,$01,$00 db $0c,-$4,$00,OAM_VFLIP | OAMFLAG_CANBEMASKED diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 2387218b..5b522f8e 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -1,7 +1,7 @@ ; data for default hidden/shown ; objects for each map ($00-$F8) -; Table of 2-Byte pointers, one pointer per map, +; Table of 2-Byte pointers, one pointer per map, ; goes up to Map_F7, ends with $FFFF. ; points to table listing all missable object in the area MapHSPointers: ; c69b (3:469b) @@ -589,5 +589,5 @@ MapHS27Copy: ; cb56 (3:4b56) db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show - + db $FF, $01, Show \ No newline at end of file diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index ec2b8774..151cc4a8 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -8,7 +8,7 @@ Route19Object: ; 0x54e9a (size=87) db $b,$b,$b db $a ; objects - + object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2 object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3 object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 diff --git a/data/sgb_packets.asm b/data/sgb_packets.asm index a0af4a44..c00a7f58 100755 --- a/data/sgb_packets.asm +++ b/data/sgb_packets.asm @@ -118,41 +118,41 @@ UnknownPacket_72751: ; 72751 (1c:6751) PalPacket_Empty: ; 72761 (1c:6761) PAL_SET 0, 0, 0, 0 - + PalPacket_PartyMenu: ; 72771 (1c:6771) PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR - + PalPacket_Black: ; 72781 (1c:6781) PAL_SET PAL_BLACK, PAL_BLACK, PAL_BLACK, PAL_BLACK - + PalPacket_TownMap: ; 72791 (1c:6791) PAL_SET PAL_TOWNMAP, 0, 0, 0 - + PalPacket_Pokedex: ; 727a1 (1c:67a1) PAL_SET PAL_BROWNMON, 0, 0, 0 - + PalPacket_Slots: ; 727b1 (1c:67b1) PAL_SET PAL_SLOTS1, PAL_SLOTS2, PAL_SLOTS3, PAL_SLOTS4 - + PalPacket_Titlescreen: ; 727c1 (1c:67c1) PAL_SET PAL_LOGO2, PAL_LOGO1, PAL_MEWMON, PAL_PURPLEMON - + PalPacket_TrainerCard: ; 727d1 (1c:67d1) PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWMON - + PalPacket_Generic: ; 727e1 (1c:67e1) PAL_SET PAL_MEWMON, 0, 0, 0 - + PalPacket_NidorinoIntro: ; 727f1 (1c:67f1) PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 - + PalPacket_GameFreakIntro: ; 72801 (1c:6801) PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON - + UnknownPalPacket_72811: ; 72811 (1c:6811) db $51,$25,$0,$25,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 - -UnknownPalPacket_72821: ; 72821 (1c:6821) + +UnknownPalPacket_72821: ; 72821 (1c:6821) db $51,$25,$0,$27,$0,$25,$0,$25,$0,$0,$0,$0,$0,$0,$0,$0 PalTrnPacket: ; 72831 (1c:6831) diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm index e529b506..50e50e07 100755 --- a/data/sprite_sets.asm +++ b/data/sprite_sets.asm @@ -494,52 +494,52 @@ SpriteSheetPointerTable: ; 142a9 (5:42a9) dw PikachuSprite db $c0 db BANK(PikachuSprite) - + ; SPRITE_OFFICER_JENNY dw OfficerJennySprite db $c0 db BANK(OfficerJennySprite) - + ; SPRITE_SANDSHREW dw SandshrewSprite db $c0 db BANK(SandshrewSprite) - + ; SPRITE_ODDISH dw OddishSprite db $c0 db BANK(OddishSprite) - + ; SPRITE_BULBASAUR dw BulbasaurSprite db $c0 db BANK(BulbasaurSprite) - + ; SPRITE_JIGGLYPUFF dw JigglypuffSprite db $c0 db BANK(JigglypuffSprite) - + ; SPRITE_CLEFAIRY_2 dw Clefairy2Sprite db $c0 db BANK(Clefairy2Sprite) - + ; SPRITE_CHANSEY dw ChanseySprite db $c0 db BANK(ChanseySprite) - + ; SPRITE_JESSIE dw JessieSprite db $c0 db BANK(JessieSprite) - + ; SPRITE_JAMES dw JamesSprite db $c0 db BANK(JamesSprite) - + ; SPRITE_BALL dw BallSprite db $40 ; byte count diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index d6c6a2c9..e81d11ff 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,6 +1,6 @@ Tilesets: ; c558 (3:4558) ; dr $c558,$c684 - + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR diff --git a/data/trainer_types.asm b/data/trainer_types.asm index 24cb3a8c..bb8bd0ec 100755 --- a/data/trainer_types.asm +++ b/data/trainer_types.asm @@ -14,5 +14,5 @@ EvilTrainerList:: ; 33c8 (0:33c8) db OPP_SCIENTIST db OPP_GIOVANNI db OPP_ROCKET - + db $ff diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm index 1e40c9ce..672d7382 100755 --- a/data/warp_tile_ids.asm +++ b/data/warp_tile_ids.asm @@ -24,7 +24,7 @@ WarpTileIDPointers: ; c215 (3:4215) dw FacilityWarpTileIDs dw PlateauWarpTileIDs dw BeachHouseWarpTileIDs - + OverworldWarpTileIDs: ; c247 (3:4247) db $1B,$58,$FF -- cgit v1.3.1-sl0p From a33f356461e29559950f51dbef2e2d83235ea98f Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 6 Jun 2016 03:22:40 -0500 Subject: Remove unused source files --- audio.asm | 2 +- audio/headers/musicheaders4.asm | 8 +- audio/music/jessieandjames.asm | 303 ------------------------ audio/sfx/unknown_80e71.asm | 45 ---- audio/unknown_832b9.bin | Bin 3399 -> 3398 bytes constants/music_constants.asm | 2 +- data/title_mons.asm | 18 -- engine/evolve_trade.asm | 44 ---- engine/overworld/is_player_just_outside_map.asm | 2 +- engine/predefs17.asm | 22 +- engine/predefs17_2.asm | 15 -- engine/turn_sprite.asm | 25 -- gfx/redgreenversion.png | Bin 126 -> 0 bytes gfx/sgbborder.png | Bin 1048 -> 0 bytes gfx/unknown_ea563.png | Bin 82 -> 0 bytes main.asm | 32 +-- scripts/mtmoon3.asm | 8 +- scripts/pokemontower7.asm | 8 +- scripts/rockethideout4.asm | 8 +- scripts/safarizoneentrance-yellow.asm | 255 -------------------- scripts/safarizoneentrance2.asm | 6 +- scripts/silphco11.asm | 8 +- text/maps/fuchsia_gym_1.asm | 27 --- 23 files changed, 43 insertions(+), 795 deletions(-) delete mode 100755 audio/music/jessieandjames.asm delete mode 100644 audio/sfx/unknown_80e71.asm delete mode 100755 data/title_mons.asm delete mode 100755 engine/evolve_trade.asm delete mode 100755 engine/predefs17_2.asm delete mode 100755 engine/turn_sprite.asm delete mode 100644 gfx/redgreenversion.png delete mode 100644 gfx/sgbborder.png delete mode 100644 gfx/unknown_ea563.png delete mode 100644 scripts/safarizoneentrance-yellow.asm delete mode 100644 text/maps/fuchsia_gym_1.asm (limited to 'data') diff --git a/audio.asm b/audio.asm index 16d2f64d..a9eed760 100644 --- a/audio.asm +++ b/audio.asm @@ -746,7 +746,7 @@ INCLUDE "audio/music/yellowintro.asm" SECTION "Music 4", ROMX, BANK[AUDIO_4] INCLUDE "audio/music/surfingpikachu.asm" INCLUDE "audio/music/yellowunusedsong.asm" -INCLUDE "audio/music/jessieandjames.asm" +INCLUDE "audio/music/meetjessiejames.asm" INCBIN "audio/unknown_832b9.bin" diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index 7f26601e..be5d822a 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -3,10 +3,10 @@ Music_SurfingPikachu:: dbw CH1, Music_SurfingPikachu_Ch2 dbw CH2, Music_SurfingPikachu_Ch3 -Music_JessieAndJames:: - dbw ((3 - 1) << 6) | CH0, Music_JessieAndJames_Ch1 - dbw CH1, Music_JessieAndJames_Ch2 - dbw CH2, Music_JessieAndJames_Ch3 +Music_MeetJessieJames:: + dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1 + dbw CH1, Music_MeetJessieJames_Ch2 + dbw CH2, Music_MeetJessieJames_Ch3 Music_YellowUnusedSong:: dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 diff --git a/audio/music/jessieandjames.asm b/audio/music/jessieandjames.asm deleted file mode 100755 index 0d349ddb..00000000 --- a/audio/music/jessieandjames.asm +++ /dev/null @@ -1,303 +0,0 @@ -Music_JessieAndJames_Ch1: - tempo 144 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 -.loop - notetype 12, 11, 2 - octave 4 - D_ 16 - rest 12 - notetype 12, 11, 4 - octave 3 - A# 4 - rest 16 - rest 8 - notetype 12, 11, 2 - octave 2 - A_ 2 - octave 3 - A# 2 - A_ 4 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 4 - notetype 12, 11, 4 - octave 3 - B_ 4 - notetype 12, 11, 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 2 - octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, .loop - -Music_JessieAndJames_Ch2: - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - C_ 2 - octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 - octave 4 - C# 4 -.loop - notetype 12, 12, 2 - octave 3 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - octave 2 - A_ 4 - notetype 12, 12, 5 - octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 - octave 3 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - notetype 12, 12, 6 - octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, .loop - -Music_JessieAndJames_Ch3: - notetype 12, 1, 0 - rest 16 - rest 8 - octave 4 - D_ 2 - octave 3 - A_ 2 - octave 4 - C_ 2 - D# 2 -.loop - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - octave 3 - A_ 2 - octave 4 - C_ 2 - D_ 2 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - loopchannel 0, .loop diff --git a/audio/sfx/unknown_80e71.asm b/audio/sfx/unknown_80e71.asm deleted file mode 100644 index 1b8241fb..00000000 --- a/audio/sfx/unknown_80e71.asm +++ /dev/null @@ -1,45 +0,0 @@ -SFX_80e91_4_Ch4: - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - -SFX_80ea8_4_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - -SFX_80eb8_4_Ch6: - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/unknown_832b9.bin b/audio/unknown_832b9.bin index 96a64283..1c14816a 100755 Binary files a/audio/unknown_832b9.bin and b/audio/unknown_832b9.bin differ diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 6e34bc0d..c0ff2b8b 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -96,7 +96,7 @@ ENDM ; AUDIO_4 music_const MUSIC_SURFING_PIKACHU, Music_SurfingPikachu - music_const MUSIC_JESSIE_AND_JAMES, Music_JessieAndJames + music_const MUSIC_MEET_JESSIE_JAMES, Music_MeetJessieJames music_const MUSIC_YELLOW_UNUSED_SONG, Music_YellowUnusedSong music_const MUSIC_GB_PRINTER, Music_GBPrinter diff --git a/data/title_mons.asm b/data/title_mons.asm deleted file mode 100755 index e27742af..00000000 --- a/data/title_mons.asm +++ /dev/null @@ -1,18 +0,0 @@ -TitleMons: ; 4588 (1:4588) -; mons on the title screen are randomly chosen from here - db CHARMANDER - db SQUIRTLE - db BULBASAUR - db WEEDLE - db NIDORAN_M - db SCYTHER - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm deleted file mode 100755 index 81e41166..00000000 --- a/engine/evolve_trade.asm +++ /dev/null @@ -1,44 +0,0 @@ -EvolveTradeMon: ; 17d7d (5:7d7d) -; Verify the TradeMon's species name before -; attempting to initiate a trade evolution. - -; The names of the trade evolutions in Blue (JP) -; are checked. In that version, TradeMons that -; can evolve are Graveler and Haunter. - -; In localization, this check was translated -; before monster names were finalized. -; Then, Haunter's name was "Spectre". -; Since its name no longer starts with -; "SP", it is prevented from evolving. - -; This may have been why Red/Green's trades -; were used instead, where none can evolve. - -; This was fixed in Yellow. - - ld a, [wInGameTradeReceiveMonName] - - ; GRAVELER - cp "G" - jr z, .ok - - ; "SPECTRE" (HAUNTER) - cp "S" - ret nz - ld a, [wInGameTradeReceiveMonName + 1] - cp "P" - ret nz - -.ok - ld a, [wPartyCount] - dec a - ld [wWhichPokemon], a - ld a, $1 - ld [wForceEvolution], a - ld a, LINK_STATE_TRADING - ld [wLinkState], a - callab TryEvolvingMon - xor a ; LINK_STATE_NONE - ld [wLinkState], a - jp PlayDefaultMusic diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm index e9ba204a..19823c53 100644 --- a/engine/overworld/is_player_just_outside_map.asm +++ b/engine/overworld/is_player_just_outside_map.asm @@ -1,5 +1,5 @@ ; returns whether the player is one tile outside the map in Z -IsPlayerJustOutsideMap: ; 128d8 (4:68d8) +IsPlayerJustOutsideMap: ; e876c (3a:476c) ld a, [wYCoord] ld b, a ld a, [wCurMapHeight] diff --git a/engine/predefs17.asm b/engine/predefs17.asm index a674b45a..49818543 100755 --- a/engine/predefs17.asm +++ b/engine/predefs17.asm @@ -1,9 +1,15 @@ -; this function temporarily makes the starters (and Ivysaur) seen -; so that the full Pokedex information gets displayed in Oak's lab -StarterDex: ; 5c0dc (17:40dc) - ld a, %01001011 ; set starter flags - ld [wPokedexOwned], a - predef ShowPokedexData - xor a ; unset starter flags - ld [wPokedexOwned], a +; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e +SetPartyMonTypes: ; 5db93 (17:5b93) + call GetPredefRegisters + ld bc, wPartyMon1Type - wPartyMon1 ; $5 + add hl, bc + ld a, [wd11e] + ld [wd0b5], a + push hl + call GetMonHeader + pop hl + ld a, [wMonHType1] + ld [hli], a + ld a, [wMonHType2] + ld [hl], a ret diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm deleted file mode 100755 index c0df7d0a..00000000 --- a/engine/predefs17_2.asm +++ /dev/null @@ -1,15 +0,0 @@ -; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e -SetPartyMonTypes: ; 5db5e (17:5b5e) - call GetPredefRegisters - ld bc, wPartyMon1Type - wPartyMon1 ; $5 - add hl, bc - ld a, [wd11e] - ld [wd0b5], a - push hl - call GetMonHeader - pop hl - ld a, [wMonHType1] - ld [hli], a - ld a, [wMonHType2] - ld [hl], a - ret diff --git a/engine/turn_sprite.asm b/engine/turn_sprite.asm deleted file mode 100755 index 84037cfe..00000000 --- a/engine/turn_sprite.asm +++ /dev/null @@ -1,25 +0,0 @@ -UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074) - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] - add $8 - ld l, a - ld a, $7f ; maximum movement delay - ld [hl], a ; c2x8 (movement delay) - dec h - ld a, [H_CURRENTSPRITEOFFSET] - add $9 - ld l, a - ld a, [hld] ; c1x9 (facing direction) - ld b, a - xor a - ld [hld], a - ld [hl], a ; c1x8 (walk animation frame) - ld a, [H_CURRENTSPRITEOFFSET] - add $2 - ld l, a - ld a, [hl] ; c1x2 (facing and animation table offset) - or b ; or in the facing direction - ld [hld], a - ld a, $2 ; delayed movement status - ld [hl], a ; c1x1 (movement status) - ret diff --git a/gfx/redgreenversion.png b/gfx/redgreenversion.png deleted file mode 100644 index e41b4295..00000000 Binary files a/gfx/redgreenversion.png and /dev/null differ diff --git a/gfx/sgbborder.png b/gfx/sgbborder.png deleted file mode 100644 index 7549bb47..00000000 Binary files a/gfx/sgbborder.png and /dev/null differ diff --git a/gfx/unknown_ea563.png b/gfx/unknown_ea563.png deleted file mode 100644 index adf086ca..00000000 Binary files a/gfx/unknown_ea563.png and /dev/null differ diff --git a/main.asm b/main.asm index cc67186d..f263f4be 100755 --- a/main.asm +++ b/main.asm @@ -1665,20 +1665,7 @@ VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk" INCLUDE "engine/evolution.asm" -SetPartyMonTypes:: - call GetPredefRegisters - ld bc, 5 - add hl, bc - ld a, [wd11e] - ld [wd0b5], a - push hl - call GetMonHeader - pop hl - ld a, [wMonHType1] - ld [hli], a - ld a, [wMonHType2] - ld [hl], a - ret +INCLUDE "engine/predefs17.asm" INCLUDE "engine/hidden_object_functions17.asm" @@ -2154,21 +2141,8 @@ INCBIN "gfx/pikachu/unknown_e7d13.2bpp" SECTION "bank3A",ROMX,BANK[$3A] INCLUDE "text/monster_names.asm" -IsPlayerJustOutsideMap: ; e876c (3a:476c) - ld a, [wYCoord] - ld b, a - ld a, [wCurMapHeight] - call Func_e877e - ret z - ld a, [wXCoord] - ld b, a - ld a, [wCurMapWidth] -Func_e877e: - add a - cp b - ret z - inc b - ret + +INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/printer.asm" INCLUDE "engine/diploma_3a.asm" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 1de3445d..8aee239c 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -225,8 +225,8 @@ MtMoon3Script_49e15: cp $5 ret nz call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic xor a ld [hJoyHeld], a @@ -361,8 +361,8 @@ MtMoon3Script13: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index abf6104d..58e6d327 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -45,8 +45,8 @@ PokemonTower7Script_60d2a: SetEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 .asm_60d47 call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic xor a ld [hJoyHeld], a @@ -182,8 +182,8 @@ PokemonTower7Script8: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 75cb7912..30ed3f24 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -93,8 +93,8 @@ RocketHideout4Script_455a5: ld a, $fc ld [wJoyIgnore], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic call UpdateSprites call Delay3 @@ -237,8 +237,8 @@ RocketHideout4Script11: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm deleted file mode 100644 index da9a068e..00000000 --- a/scripts/safarizoneentrance-yellow.asm +++ /dev/null @@ -1,255 +0,0 @@ -.xf1f77 - ld hl,.ForJust500Text - call PrintText - ld a,MONEY_BOX - ld [wTextBoxID],a - call DisplayTextBoxID - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - jp nz,.PleaseComeAgain - ld hl,$d346 ; yellow d346 - ld a,[hli] - or [hl] - inc hl - or [hl] - jr nz,.xf1f9f -.xf1f98 - call .xf20ce - jr c,.CantPayWalkDown - jr .xf1ff2 - -.xf1f9f - xor a - ld [hMoney],a - ld a,$05 - ld [hMoney + 1],a - ld a,$00 - ld [hMoney + 2],a - call HasEnoughMoney - jr nc,.success - ld hl,.NotEnoughMoneyText - call PrintText - call .xf2077 - jr c,.CantPayWalkDown - jr .xf1ff2 - -.success - xor a - ld [wPriceTemp],a - ld a,$05 - ld [wPriceTemp + 1],a - ld a,$00 - ld [wPriceTemp + 2],a - ld hl,wPriceTemp + 2 - ld de,wPlayerMoney + 2 - ld c,3 - predef SubBCDPredef - ld a,$b2 - call $3736 - call $373e - ld a,MONEY_BOX - ld [wTextBoxID],a - call DisplayTextBoxID - ld hl,.MakePaymentText - call PrintText - ld a,30 - lb hl, (502 / $100), (502 % $100) -.xf1ff2 - ld [wNumSafariBalls],a - ld a,h - ld [wSafariSteps],a - ld a,l - ld [wSafariSteps + 1],a - ld a,D_UP - ld c,3 - call SafariZoneEntranceAutoWalk - SetEvent EVENT_IN_SAFARI_ZONE - ResetEventReuseHL EVENT_SAFARI_GAME_OVER - ld a,3 - ld [wSafariZoneEntranceCurScript],a - jr .done - -.PleaseComeAgain - ld hl,.PleaseComeAgainText - call PrintText -.CantPayWalkDown - ld a,D_DOWN - ld c,1 - call SafariZoneEntranceAutoWalk - ld a,4 - ld [wSafariZoneEntranceCurScript],a -.done - ret - -.ForJust500Text - TX_FAR SafariZoneEntranceText_9e6e4 - db "@" - -.MakePaymentText - TX_FAR SafariZoneEntranceText_9e747 - db $b - TX_FAR _SafariZoneEntranceText_75360 - db "@" - -.PleaseComeAgainText - TX_FAR _SafariZoneEntranceText_75365 - db "@" - -.NotEnoughMoneyText - TX_FAR _SafariZoneEntranceText_7536a - db "@" - -.SafariZoneEntranceText2 - ld hl,.FirstTimeQuestionText - call PrintText - call YesNoChoice - ld a,[wCurrentMenuItem] - and a - ld hl,.RegularText - jr nz,.Explanation - ld hl,.ExplanationText -.Explanation - call PrintText - ret - -.FirstTimeQuestionText - TX_FAR _SafariZoneEntranceText_753e6 - db "@" - -.ExplanationText - TX_FAR _SafariZoneEntranceText_753eb - db "@" - -.RegularText - TX_FAR _SafariZoneEntranceText_753f0 - db "@" - -SafariZoneEntranceAutoWalk: - push af - ld b,0 - ld a,c - ld [wSimulatedJoypadStatesIndex],a - ld hl,wSimulatedJoypadStatesEnd - pop af - call FillMemory - jp StartSimulatingJoypadStates - -.xf2077 - ld hl,wPlayerMoney - ld de,$ff9f - ld bc,3 - call $b1 ; yellow $00b1 - xor a - ld [$ffa2],a - ld [$ffa3],a - ld a,$17 ; ¥17 per safari ball - ld [$ffa4],a - predef DivideBCDPredef3 - ld a,[$ffa4] - call .xf211e - pop af - ld hl,$d346 - xor a - ld bc,3 - call FillMemory - ld hl,.OhAllRightText - call PrintText_NoCreatingTextBox - ld a,MONEY_BOX - ld a,[$d124] - call DisplayTextBoxID - ld hl,.CantGive30BallsText - call PrintText - pop af - inc a - jr z,.xf20bd - cp 29 - jr c,.xf20bf -.xf20bd - ld a,29 -.xf20bf - ld hl,$1f6 - and a - ret - -.OhAllRightText - TX_FAR _SafariZoneLowCostText1 - db "@" - -.CantGive30BallsText - TX_FAR _SafariZoneLowCostText2 - db "@" - -.xf20ce - ld hl,$d70c - ld a,[hl] - push af - inc [hl] - ld e,a - ld d,0 - ld hl,.lowcosttextpointers - add hl,de - add hl,de - ld a,[hli] - ld h,[hl] - ld l,a - call PrintText - pop af - cp 3 - jr z,.next - scf - ret - -.next - ld hl,.xf20f6 - call $3c46 - ld a,1 - ld hl,$01f6 - and a - ret - -.xf20f6 - TX_FAR _SafariZoneLowCostText3 - db $b - TX_FAR _SafariZoneLowCostText4 - db "@" - -.lowcosttextpointers - dw .xf210a - dw .xf210f - dw .xf2114 - dw .xf2119 - dw .xf2119 - -.xf210a - TX_FAR _SafariZoneLowCostText5 - db "@" - -.xf210f - TX_FAR _SafariZoneLowCostText6 - db "@" - -.xf2114 - TX_FAR _SafariZoneLowCostText7 - db "@" - -.xf2119 - TX_FAR _SafariZoneLowCostText8 - db "@" - -.xf211e - push hl - ld c,a - and $f - ld l,a - ld h,0 - ld a,c - and $f0 - swap a - ld bc,$a - call $3a74 - ld a,l - pop hl - ret - -.xf2133 diff --git a/scripts/safarizoneentrance2.asm b/scripts/safarizoneentrance2.asm index 0eb50790..4a6c23e6 100755 --- a/scripts/safarizoneentrance2.asm +++ b/scripts/safarizoneentrance2.asm @@ -62,7 +62,7 @@ Func_f1f77: ld [wSafariSteps + 1], a ld a, D_UP ld c, 3 - call SafariZoneEntranceStartSimulatiingJoypadStates + call SafariZoneEntranceStartSimulatingJoypadStates SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a, $3 @@ -74,7 +74,7 @@ Func_f1f77: .deny_entry ld a, D_DOWN ld c, 1 - call SafariZoneEntranceStartSimulatiingJoypadStates + call SafariZoneEntranceStartSimulatingJoypadStates ld a, $4 ld [wSafariZoneEntranceCurScript], a .asm_f2024 @@ -123,7 +123,7 @@ Func_f203e: TX_FAR _SafariZoneEntranceText_753f0 db "@" -SafariZoneEntranceStartSimulatiingJoypadStates: +SafariZoneEntranceStartSimulatingJoypadStates: push af ld b, $0 ld a, c diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index a2354a69..42e8d574 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -229,8 +229,8 @@ SilphCo11Script_6229c: SetEventReuseHL EVENT_781 .asm_622c3 call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic xor a ld [hJoyHeld], a @@ -417,8 +417,8 @@ SilphCo11Script12: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic ld a, $ff ld [wJoyIgnore], a diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm deleted file mode 100644 index a877c0a1..00000000 --- a/text/maps/fuchsia_gym_1.asm +++ /dev/null @@ -1,27 +0,0 @@ -_KogaBeforeBattleText:: ; 9e9b1 (27:69b1) - text "KOGA: Fwahahaha!" - - para "A mere child like" - line "you dares to" - cont "challenge me?" - - para "Very well, I" - line "shall show you" - cont "true terror as a" - cont "ninja master!" - - para "You shall feel" - line "the despair of" - cont "poison and sleep" - cont "techniques!" - done - -_KogaAfterBattleText:: ; 9ea66 (27:6a66) - text "Humph!" - line "You have proven" - cont "your worth!" - - para "Here! Take the" - line "SOULBADGE!" - prompt - -- cgit v1.3.1-sl0p