From 90336d902707b28094ac832fbf7ee309e59457c8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 14 Nov 2020 18:42:31 -0600 Subject: Clean up white space --- src/data/deck_ai_pointers.asm | 110 +++++++++++++++++++++--------------------- src/data/map_objects.asm | 28 +++++------ src/data/move_animations.asm | 2 +- src/data/npc_map_data.asm | 1 - 4 files changed, 69 insertions(+), 72 deletions(-) (limited to 'src/data') diff --git a/src/data/deck_ai_pointers.asm b/src/data/deck_ai_pointers.asm index 4f00299..ba8fab7 100644 --- a/src/data/deck_ai_pointers.asm +++ b/src/data/deck_ai_pointers.asm @@ -1,55 +1,55 @@ -DeckAIPointerTable: ; 14000 (05:4000) - dw AIActionTable_SamPractice ; SAMS_PRACTICE_DECK - dw AIActionTable_GeneralDecks ; PRACTICE_PLAYER_DECK - dw AIActionTable_GeneralDecks ; SAMS_NORMAL_DECK - dw AIActionTable_GeneralDecks ; CHARMANDER_AND_FRIENDS_DECK - dw AIActionTable_GeneralDecks ; CHARMANDER_EXTRA_DECK - dw AIActionTable_GeneralDecks ; SQUIRTLE_AND_FRIENDS_DECK - dw AIActionTable_GeneralDecks ; SQUIRTLE_EXTRA_DECK - dw AIActionTable_GeneralDecks ; BULBASAUR_AND_FRIENDS_DECK - dw AIActionTable_GeneralDecks ; BULBASAUR_EXTRA_DECK - dw AIActionTable_GeneralDecks ; LIGHTNING_AND_FIRE_DECK - dw AIActionTable_GeneralDecks ; WATER_AND_FIGHTING_DECK - dw AIActionTable_GeneralDecks ; GRASS_AND_PSYCHIC_DECK - dw AIActionTable_LegendaryMoltres ; LEGENDARY_MOLTRES_DECK - dw AIActionTable_LegendaryZapdos ; LEGENDARY_ZAPDOS_DECK - dw AIActionTable_LegendaryArticuno ; LEGENDARY_ARTICUNO_DECK - dw AIActionTable_LegendaryDragonite ; LEGENDARY_DRAGONITE_DECK - dw AIActionTable_FirstStrike ; FIRST_STRIKE_DECK - dw AIActionTable_RockCrusher ; ROCK_CRUSHER_DECK - dw AIActionTable_GoGoRainDance ; GO_GO_RAIN_DANCE_DECK - dw AIActionTable_ZappingSelfdestruct ; ZAPPING_SELFDESTRUCT_DECK - dw AIActionTable_FlowerPower ; FLOWER_POWER_DECK - dw AIActionTable_StrangePsyshock ; STRANGE_PSYSHOCK_DECK - dw AIActionTable_WondersOfScience ; WONDERS_OF_SCIENCE_DECK - dw AIActionTable_FireCharge ; FIRE_CHARGE_DECK - dw AIActionTable_ImRonald ; IM_RONALD_DECK - dw AIActionTable_PowerfulRonald ; POWERFUL_RONALD_DECK - dw AIActionTable_InvincibleRonald ; INVINCIBLE_RONALD_DECK - dw AIActionTable_LegendaryRonald ; LEGENDARY_RONALD_DECK - dw AIActionTable_GeneralNoRetreat ; MUSCLES_FOR_BRAINS_DECK - dw AIActionTable_GeneralDecks ; HEATED_BATTLE_DECK - dw AIActionTable_GeneralDecks ; LOVE_TO_BATTLE_DECK - dw AIActionTable_GeneralDecks ; EXCAVATION_DECK - dw AIActionTable_GeneralDecks ; BLISTERING_POKEMON_DECK - dw AIActionTable_GeneralDecks ; HARD_POKEMON_DECK - dw AIActionTable_GeneralDecks ; WATERFRONT_POKEMON_DECK - dw AIActionTable_GeneralDecks ; LONELY_FRIENDS_DECK - dw AIActionTable_GeneralDecks ; SOUND_OF_THE_WAVES_DECK - dw AIActionTable_GeneralDecks ; PIKACHU_DECK - dw AIActionTable_GeneralDecks ; BOOM_BOOM_SELFDESTRUCT_DECK - dw AIActionTable_GeneralDecks ; POWER_GENERATOR_DECK - dw AIActionTable_GeneralDecks ; ETCETERA_DECK - dw AIActionTable_GeneralDecks ; FLOWER_GARDEN_DECK - dw AIActionTable_GeneralDecks ; KALEIDOSCOPE_DECK - dw AIActionTable_GeneralDecks ; GHOST_DECK - dw AIActionTable_GeneralDecks ; NAP_TIME_DECK - dw AIActionTable_GeneralDecks ; STRANGE_POWER_DECK - dw AIActionTable_GeneralDecks ; FLYIN_POKEMON_DECK - dw AIActionTable_GeneralDecks ; LOVELY_NIDORAN_DECK - dw AIActionTable_GeneralDecks ; POISON_DECK - dw AIActionTable_GeneralDecks ; ANGER_DECK - dw AIActionTable_GeneralDecks ; FLAMETHROWER_DECK - dw AIActionTable_GeneralDecks ; RESHUFFLE_DECK - dw AIActionTable_GeneralNoRetreat ; IMAKUNI_DECK -; 1406a +DeckAIPointerTable: ; 14000 (05:4000) + dw AIActionTable_SamPractice ; SAMS_PRACTICE_DECK + dw AIActionTable_GeneralDecks ; PRACTICE_PLAYER_DECK + dw AIActionTable_GeneralDecks ; SAMS_NORMAL_DECK + dw AIActionTable_GeneralDecks ; CHARMANDER_AND_FRIENDS_DECK + dw AIActionTable_GeneralDecks ; CHARMANDER_EXTRA_DECK + dw AIActionTable_GeneralDecks ; SQUIRTLE_AND_FRIENDS_DECK + dw AIActionTable_GeneralDecks ; SQUIRTLE_EXTRA_DECK + dw AIActionTable_GeneralDecks ; BULBASAUR_AND_FRIENDS_DECK + dw AIActionTable_GeneralDecks ; BULBASAUR_EXTRA_DECK + dw AIActionTable_GeneralDecks ; LIGHTNING_AND_FIRE_DECK + dw AIActionTable_GeneralDecks ; WATER_AND_FIGHTING_DECK + dw AIActionTable_GeneralDecks ; GRASS_AND_PSYCHIC_DECK + dw AIActionTable_LegendaryMoltres ; LEGENDARY_MOLTRES_DECK + dw AIActionTable_LegendaryZapdos ; LEGENDARY_ZAPDOS_DECK + dw AIActionTable_LegendaryArticuno ; LEGENDARY_ARTICUNO_DECK + dw AIActionTable_LegendaryDragonite ; LEGENDARY_DRAGONITE_DECK + dw AIActionTable_FirstStrike ; FIRST_STRIKE_DECK + dw AIActionTable_RockCrusher ; ROCK_CRUSHER_DECK + dw AIActionTable_GoGoRainDance ; GO_GO_RAIN_DANCE_DECK + dw AIActionTable_ZappingSelfdestruct ; ZAPPING_SELFDESTRUCT_DECK + dw AIActionTable_FlowerPower ; FLOWER_POWER_DECK + dw AIActionTable_StrangePsyshock ; STRANGE_PSYSHOCK_DECK + dw AIActionTable_WondersOfScience ; WONDERS_OF_SCIENCE_DECK + dw AIActionTable_FireCharge ; FIRE_CHARGE_DECK + dw AIActionTable_ImRonald ; IM_RONALD_DECK + dw AIActionTable_PowerfulRonald ; POWERFUL_RONALD_DECK + dw AIActionTable_InvincibleRonald ; INVINCIBLE_RONALD_DECK + dw AIActionTable_LegendaryRonald ; LEGENDARY_RONALD_DECK + dw AIActionTable_GeneralNoRetreat ; MUSCLES_FOR_BRAINS_DECK + dw AIActionTable_GeneralDecks ; HEATED_BATTLE_DECK + dw AIActionTable_GeneralDecks ; LOVE_TO_BATTLE_DECK + dw AIActionTable_GeneralDecks ; EXCAVATION_DECK + dw AIActionTable_GeneralDecks ; BLISTERING_POKEMON_DECK + dw AIActionTable_GeneralDecks ; HARD_POKEMON_DECK + dw AIActionTable_GeneralDecks ; WATERFRONT_POKEMON_DECK + dw AIActionTable_GeneralDecks ; LONELY_FRIENDS_DECK + dw AIActionTable_GeneralDecks ; SOUND_OF_THE_WAVES_DECK + dw AIActionTable_GeneralDecks ; PIKACHU_DECK + dw AIActionTable_GeneralDecks ; BOOM_BOOM_SELFDESTRUCT_DECK + dw AIActionTable_GeneralDecks ; POWER_GENERATOR_DECK + dw AIActionTable_GeneralDecks ; ETCETERA_DECK + dw AIActionTable_GeneralDecks ; FLOWER_GARDEN_DECK + dw AIActionTable_GeneralDecks ; KALEIDOSCOPE_DECK + dw AIActionTable_GeneralDecks ; GHOST_DECK + dw AIActionTable_GeneralDecks ; NAP_TIME_DECK + dw AIActionTable_GeneralDecks ; STRANGE_POWER_DECK + dw AIActionTable_GeneralDecks ; FLYIN_POKEMON_DECK + dw AIActionTable_GeneralDecks ; LOVELY_NIDORAN_DECK + dw AIActionTable_GeneralDecks ; POISON_DECK + dw AIActionTable_GeneralDecks ; ANGER_DECK + dw AIActionTable_GeneralDecks ; FLAMETHROWER_DECK + dw AIActionTable_GeneralDecks ; RESHUFFLE_DECK + dw AIActionTable_GeneralNoRetreat ; IMAKUNI_DECK +; 1406a diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm index 1ac73fa..2331125 100644 --- a/src/data/map_objects.asm +++ b/src/data/map_objects.asm @@ -47,7 +47,7 @@ MasonLabObjects: ; 13b04 (3:7b04) db $ff - + DeckMachineRoomObjects: ; 13b4d (3:7b4d) db NORTH, 2, 2 dw Script_d932 @@ -151,7 +151,7 @@ DeckMachineRoomObjects: ; 13b4d (3:7b4d) db $ff - + IshiharasHouseObjects: ; 13c02 (3:7c02) db NORTH, 6, 2 dw PrintInteractableObjectText @@ -215,7 +215,7 @@ IshiharasHouseObjects: ; 13c02 (3:7c02) db $ff - + FightingClubLobbyObjects: ; 13c6f (3:7c6f) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -249,7 +249,7 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f) db $ff - + RockClubLobbyObjects: ; 13ca6 (3:7ca6) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -283,7 +283,7 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6) db $ff - + WaterClubLobbyObjects: ; 13cdd (3:7cdd) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -317,7 +317,7 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd) db $ff - + LightningClubLobbyObjects: ; 13d14 (3:7d14) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -351,7 +351,7 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14) db $ff - + GrassClubLobbyObjects: ; 13d4b (3:7d4b) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -385,7 +385,7 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b) db $ff - + PsychicClubLobbyObjects: ; 13d82 (3:7d82) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -419,7 +419,7 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82) db $ff - + ScienceClubLobbyObjects: ; 13db9 (3:7db9) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -453,7 +453,7 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9) db $ff - + FireClubLobbyObjects: ; 13df0 (3:7df0) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -487,7 +487,7 @@ FireClubLobbyObjects: ; 13df0 (3:7df0) db $ff - + ChallengeHallLobbyObjects: ; 13e27 (3:7e27) db NORTH, 20, 2 dw PrintInteractableObjectText @@ -521,7 +521,7 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27) db $ff - + PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) db NORTH, 2, 2 dw PrintInteractableObjectText @@ -581,7 +581,7 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) db $ff - + HallOfHonorObjects: ; 13ec2 (3:7ec2) ; Legendary Cards db NORTH, 10, 10 @@ -606,5 +606,3 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2) tx Text041a db $ff - - diff --git a/src/data/move_animations.asm b/src/data/move_animations.asm index c384cd8..f774afa 100644 --- a/src/data/move_animations.asm +++ b/src/data/move_animations.asm @@ -911,4 +911,4 @@ MoveAnimation_5668: anim_end MoveAnimation_5673: - anim_end \ No newline at end of file + anim_end diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index bc09d07..7c01e72 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -416,4 +416,3 @@ HallOfHonorNPCS: ; 7adf (4:13adf) db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH dw $0000 db $00 - -- cgit v1.2.3