diff options
35 files changed, 183 insertions, 179 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 645c121a..a2e14eaf 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -19,7 +19,7 @@ _InitSound:: ld [hli], a ; rNR50 ; volume/vin ld [hli], a ; rNR51 ; sfx channels ld a, $80 ; all channels on - ld [hli], a ; ff26 ; music channels + ld [hli], a ; rNR52 ; music channels ld hl, rNR10 ; sound channel registers ld e, NUM_MUSIC_CHANS @@ -1165,7 +1165,7 @@ ParseMusic: ld a, [wCurMusicByte] swap a and $f - jr z, .rest ; pitch 0-> rest + jr z, .rest ; pitch 0 -> rest ; update pitch ld hl, CHANNEL_PITCH add hl, bc diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 2e23a342..a09427df 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -23,7 +23,7 @@ const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP ; wStatusFlags2 - const ENGINE_BUG_CONTEST_TIMER ; 10 + const ENGINE_BUG_CONTEST_TIMER const ENGINE_SAFARI_ZONE const ENGINE_ROCKETS_IN_RADIO_TOWER const ENGINE_BIKE_SHOP_CALL_ENABLED @@ -41,7 +41,7 @@ const ENGINE_FOGBADGE const ENGINE_MINERALBADGE const ENGINE_STORMBADGE - const ENGINE_GLACIERBADGE ; 20 + const ENGINE_GLACIERBADGE const ENGINE_RISINGBADGE ; wKantoBadges const ENGINE_BOULDERBADGE @@ -59,7 +59,7 @@ const ENGINE_UNLOCKED_UNOWNS_X_TO_Z const ENGINE_UNLOCKED_UNOWNS_UNUSED_4 const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 - const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 ; 30 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns const ENGINE_FLYPOINT_PLAYERS_HOUSE @@ -76,7 +76,7 @@ const ENGINE_FLYPOINT_FUCHSIA const ENGINE_FLYPOINT_CINNABAR const ENGINE_FLYPOINT_INDIGO_PLATEAU - const ENGINE_FLYPOINT_NEW_BARK ; 40 + const ENGINE_FLYPOINT_NEW_BARK const ENGINE_FLYPOINT_CHERRYGROVE const ENGINE_FLYPOINT_VIOLET const ENGINE_FLYPOINT_AZALEA @@ -95,7 +95,7 @@ const ENGINE_4E ; wDailyFlags1 const ENGINE_KURT_MAKING_BALLS - const ENGINE_DAILY_BUG_CONTEST ; 50 + const ENGINE_DAILY_BUG_CONTEST const ENGINE_SWARM const ENGINE_TIME_CAPSULE const ENGINE_ALL_FRUIT_TREES diff --git a/constants/event_flags.asm b/constants/event_flags.asm index ab6652e8..2b75974e 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -19,7 +19,7 @@ const EVENT_GOT_TM16_ICY_WIND const EVENT_GOT_TM24_DRAGONBREATH ; HMs (EVENT_GOT_HM07_WATERFALL is with the Johto itemballs) - const EVENT_GOT_HM01_CUT ; 010 + const EVENT_GOT_HM01_CUT const EVENT_GOT_HM02_FLY const EVENT_GOT_HM03_SURF const EVENT_GOT_HM04_STRENGTH @@ -37,7 +37,7 @@ const EVENT_GOT_CHIKORITA_FROM_ELM const EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON const EVENT_GAVE_MYSTERY_EGG_TO_ELM - const EVENT_JASMINE_RETURNED_TO_GYM ; 020 + const EVENT_JASMINE_RETURNED_TO_GYM const EVENT_CLEARED_RADIO_TOWER const EVENT_CLEARED_ROCKET_HIDEOUT const EVENT_GOT_SECRETPOTION_FROM_PHARMACY @@ -53,7 +53,7 @@ const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE const EVENT_MADE_UNOWN_APPEAR_IN_RUINS const EVENT_FAST_SHIP_DESTINATION_OLIVINE - const EVENT_FAST_SHIP_FIRST_TIME ; 030 + const EVENT_FAST_SHIP_FIRST_TIME const EVENT_FAST_SHIP_HAS_ARRIVED const EVENT_FAST_SHIP_FOUND_GIRL const EVENT_FAST_SHIP_LAZY_SAILOR @@ -69,7 +69,7 @@ const EVENT_HEALED_MOOMOO const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO - const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040 + const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST const EVENT_DUDE_TALKED_TO_YOU const EVENT_LEARNED_TO_CATCH_POKEMON const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON @@ -85,7 +85,7 @@ const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE const EVENT_GOT_TM05_ROAR const EVENT_GOT_EEVEE - const EVENT_GOT_KENYA ; 050 + const EVENT_GOT_KENYA const EVENT_GAVE_KENYA const EVENT_GOT_HP_UP_FROM_RANDY const EVENT_GOT_TM50_NIGHTMARE @@ -101,7 +101,7 @@ const EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 const EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN const EVENT_GOT_TM02_HEADBUTT - const EVENT_DECIDED_TO_HELP_LANCE ; 060 + const EVENT_DECIDED_TO_HELP_LANCE const EVENT_GOT_TYROGUE_FROM_KIYO const EVENT_MET_FRIEDA_OF_FRIDAY const EVENT_GOT_POISON_BARB_FROM_FRIEDA @@ -117,7 +117,7 @@ const EVENT_GOT_SPELL_TAG_FROM_SANTOS const EVENT_MET_MONICA_OF_MONDAY const EVENT_GOT_SHARP_BEAK_FROM_MONICA - const EVENT_GOT_SOFT_SAND_FROM_KATE ; 070 + const EVENT_GOT_SOFT_SAND_FROM_KATE const EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA const EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE const EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL @@ -134,7 +134,7 @@ const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS - const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER ; 080 + const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER const EVENT_BURNED_TOWER_B1F_HIDDEN_ULTRA_BALL const EVENT_BURNED_TOWER_B1F_HIDDEN_BURN_HEAL const EVENT_BURNED_TOWER_B1F_HIDDEN_NUGGET @@ -150,7 +150,7 @@ const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE - const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION ; 090 + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE const EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE @@ -166,7 +166,7 @@ const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER const EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION const EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL - const EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE ; 0a0 + const EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER const EVENT_ROUTE_28_HIDDEN_RARE_CANDY @@ -182,7 +182,7 @@ const EVENT_ROUTE_42_HIDDEN_MAX_POTION const EVENT_ROUTE_44_HIDDEN_ELIXER const EVENT_ROUTE_45_HIDDEN_PP_UP - const EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION ; 0b0 + const EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION const EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL const EVENT_CIANWOOD_CITY_HIDDEN_REVIVE const EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER @@ -199,7 +199,7 @@ const EVENT_0BD const EVENT_0BE const EVENT_0BF - const EVENT_0C0 ; 0c0 + const EVENT_0C0 const EVENT_0C1 const EVENT_0C2 const EVENT_0C3 @@ -216,7 +216,7 @@ const EVENT_RESTORED_POWER_TO_KANTO const EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON const EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM - const EVENT_RETURNED_LOST_ITEM_TO_COPYCAT ; 0d0 + const EVENT_RETURNED_LOST_ITEM_TO_COPYCAT const EVENT_GOT_PASS_FROM_COPYCAT const EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL @@ -232,7 +232,7 @@ const EVENT_GOT_TM06_TOXIC const EVENT_GOT_UP_GRADE const EVENT_GOT_TM07_ZAP_CANNON - const EVENT_GOT_TM42_DREAM_EATER ; 0e0 + const EVENT_GOT_TM42_DREAM_EATER const EVENT_TALKED_TO_OAK_IN_KANTO const EVENT_GOT_HP_UP_FROM_VERMILION_GUY const EVENT_GOT_TM29_PSYCHIC @@ -249,7 +249,7 @@ const EVENT_ROUTE_2_HIDDEN_MAX_ETHER const EVENT_ROUTE_2_HIDDEN_FULL_HEAL const EVENT_ROUTE_2_HIDDEN_FULL_RESTORE - const EVENT_ROUTE_2_HIDDEN_REVIVE ; 0f0 + const EVENT_ROUTE_2_HIDDEN_REVIVE const EVENT_ROUTE_4_HIDDEN_ULTRA_BALL const EVENT_ROUTE_9_HIDDEN_ETHER const EVENT_ROUTE_12_HIDDEN_ELIXER @@ -265,7 +265,7 @@ const EVENT_CELADON_CITY_HIDDEN_PP_UP const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL - const EVENT_GINA_GAVE_LEAF_STONE ; 100 + const EVENT_GINA_GAVE_LEAF_STONE const EVENT_ALAN_GAVE_FIRE_STONE const EVENT_DANA_GAVE_THUNDERSTONE const EVENT_TULLY_GAVE_WATER_STONE @@ -620,7 +620,7 @@ const EVENT_GAVE_KURT_PNK_APRICORN ; Phone events const EVENT_JACK_ASKED_FOR_PHONE_NUMBER - const EVENT_JACK_READY_FOR_REMATCH ; 260 + const EVENT_JACK_READY_FOR_REMATCH const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER const EVENT_BEVERLY_READY_FOR_REMATCH const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER @@ -636,7 +636,7 @@ const EVENT_BETH_ASKED_FOR_PHONE_NUMBER const EVENT_BETH_READY_FOR_REMATCH const EVENT_JOSE_ASKED_FOR_PHONE_NUMBER - const EVENT_JOSE_READY_FOR_REMATCH ; 270 + const EVENT_JOSE_READY_FOR_REMATCH const EVENT_REENA_ASKED_FOR_PHONE_NUMBER const EVENT_REENA_READY_FOR_REMATCH const EVENT_JOEY_ASKED_FOR_PHONE_NUMBER @@ -652,7 +652,7 @@ const EVENT_TODD_ASKED_FOR_PHONE_NUMBER const EVENT_TODD_READY_FOR_REMATCH const EVENT_GINA_ASKED_FOR_PHONE_NUMBER - const EVENT_GINA_READY_FOR_REMATCH ; 280 + const EVENT_GINA_READY_FOR_REMATCH const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER const EVENT_IRWIN_READY_FOR_REMATCH const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER @@ -668,7 +668,7 @@ const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER const EVENT_DEREK_READY_FOR_REMATCH const EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER - const EVENT_CHRIS_READY_FOR_REMATCH ; 290 + const EVENT_CHRIS_READY_FOR_REMATCH const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER const EVENT_BRENT_READY_FOR_REMATCH const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER @@ -685,7 +685,7 @@ const EVENT_ERIN_READY_FOR_REMATCH const EVENT_29F ; unused ; Ruins of Alph puzzles - const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0 + const EVENT_SOLVED_HO_OH_PUZZLE const EVENT_SOLVED_KABUTO_PUZZLE const EVENT_SOLVED_OMANYTE_PUZZLE const EVENT_SOLVED_AERODACTYL_PUZZLE @@ -702,7 +702,7 @@ const EVENT_DECO_PLANT_2 const EVENT_DECO_PLANT_3 const EVENT_DECO_POSTER_1 - const EVENT_DECO_POSTER_2 ; 2b0 + const EVENT_DECO_POSTER_2 const EVENT_DECO_POSTER_3 const EVENT_DECO_POSTER_4 const EVENT_DECO_FAMICOM @@ -718,7 +718,7 @@ const EVENT_DECO_SQUIRTLE_DOLL const EVENT_DECO_POLIWAG_DOLL const EVENT_DECO_DIGLETT_DOLL - const EVENT_DECO_STARMIE_DOLL ; 2c0 + const EVENT_DECO_STARMIE_DOLL const EVENT_DECO_MAGIKARP_DOLL const EVENT_DECO_ODDISH_DOLL const EVENT_DECO_GENGAR_DOLL @@ -734,7 +734,7 @@ const EVENT_DECO_GOLD_TROPHY const EVENT_DECO_SILVER_TROPHY const EVENT_DECO_BIG_SNORLAX_DOLL - const EVENT_DECO_BIG_ONIX_DOLL ; 2d0 + const EVENT_DECO_BIG_ONIX_DOLL const EVENT_DECO_BIG_LAPRAS_DOLL ; More Johto story events const EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE @@ -751,7 +751,7 @@ const EVENT_SWITCH_10 const EVENT_SWITCH_11 const EVENT_SWITCH_12 - const EVENT_SWITCH_13 ; 2e0 + const EVENT_SWITCH_13 const EVENT_SWITCH_14 const EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART const EVENT_TURNED_OFF_SECURITY_CAMERAS @@ -767,7 +767,7 @@ const EVENT_EXPLODING_TRAP_5 const EVENT_EXPLODING_TRAP_6 const EVENT_EXPLODING_TRAP_7 - const EVENT_EXPLODING_TRAP_8 ; 2f0 + const EVENT_EXPLODING_TRAP_8 const EVENT_EXPLODING_TRAP_9 const EVENT_EXPLODING_TRAP_10 const EVENT_EXPLODING_TRAP_11 @@ -783,7 +783,7 @@ const EVENT_EXPLODING_TRAP_21 const EVENT_EXPLODING_TRAP_22 const EVENT_LEARNED_HAIL_GIOVANNI - const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER ; 300 + const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER const EVENT_LEARNED_SLOWPOKETAIL const EVENT_LEARNED_RATICATE_TAIL const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE @@ -799,7 +799,7 @@ const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED const EVENT_BRUNOS_ROOM_EXIT_OPEN const EVENT_KARENS_ROOM_ENTRANCE_CLOSED - const EVENT_KARENS_ROOM_EXIT_OPEN ; 310 + const EVENT_KARENS_ROOM_EXIT_OPEN const EVENT_LANCES_ROOM_ENTRANCE_CLOSED const EVENT_LANCES_ROOM_EXIT_OPEN const EVENT_CONTEST_OFFICER_HAS_SUN_STONE @@ -815,7 +815,7 @@ const EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA const EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA const EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA - const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA ; 320 + const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA const EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA @@ -1666,7 +1666,7 @@ ; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. ; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. ; Johto itemballs - const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB ; 640 + const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB const EVENT_VIOLET_CITY_PP_UP @@ -1682,7 +1682,7 @@ const EVENT_TIN_TOWER_4F_SUPER_POTION const EVENT_TIN_TOWER_4F_ESCAPE_ROPE const EVENT_TIN_TOWER_5F_RARE_CANDY - const EVENT_TIN_TOWER_7F_MAX_REVIVE ; 650 + const EVENT_TIN_TOWER_7F_MAX_REVIVE const EVENT_TIN_TOWER_8F_NUGGET const EVENT_TIN_TOWER_8F_MAX_ELIXER const EVENT_TIN_TOWER_8F_FULL_RESTORE @@ -1698,7 +1698,7 @@ const EVENT_UNION_CAVE_1F_AWAKENING const EVENT_UNION_CAVE_B1F_TM_SWIFT const EVENT_UNION_CAVE_B1F_X_DEFEND - const EVENT_UNION_CAVE_B2F_ELIXER ; 660 + const EVENT_UNION_CAVE_B2F_ELIXER const EVENT_UNION_CAVE_B2F_HYPER_POTION const EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION const EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE @@ -1714,7 +1714,7 @@ const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL const EVENT_TEAM_ROCKET_BASE_B3F_DIRE_HIT const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL ; 670 + const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL const EVENT_ILEX_FOREST_REVIVE const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL @@ -1730,7 +1730,7 @@ const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE const EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION ; 680 + const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION const EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY const EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL const EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE @@ -1746,7 +1746,7 @@ const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST const EVENT_ICE_PATH_B3F_NEVERMELTICE const EVENT_WHIRL_ISLAND_NE_ULTRA_BALL - const EVENT_WHIRL_ISLAND_SW_GUARD_SPEC ; 690 + const EVENT_WHIRL_ISLAND_SW_GUARD_SPEC const EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE const EVENT_WHIRL_ISLAND_B1F_CARBOS const EVENT_WHIRL_ISLAND_B1F_CALCIUM @@ -1762,7 +1762,7 @@ const EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE const EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION const EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION ; 6a0 + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE const EVENT_VICTORY_ROAD_TM_EARTHQUAKE @@ -1778,7 +1778,7 @@ const EVENT_ROUTE_29_POTION const EVENT_ROUTE_31_ANTIDOTE const EVENT_ROUTE_31_POKE_BALL - const EVENT_ROUTE_32_GREAT_BALL ; 6b0 + const EVENT_ROUTE_32_GREAT_BALL const EVENT_ROUTE_32_POTION const EVENT_ROUTE_35_TM_ROLLOUT const EVENT_ROUTE_42_ULTRA_BALL @@ -1795,7 +1795,7 @@ const EVENT_RIVAL_NEW_BARK_TOWN const EVENT_RIVAL_CHERRYGROVE_CITY const EVENT_RIVAL_AZALEA_TOWN - const EVENT_RIVAL_TEAM_ROCKET_BASE ; 6c0 + const EVENT_RIVAL_TEAM_ROCKET_BASE const EVENT_RIVAL_GOLDENROD_UNDERGROUND const EVENT_RIVAL_VICTORY_ROAD const EVENT_RIVAL_OLIVINE_CITY @@ -1811,7 +1811,7 @@ const EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER const EVENT_RADIO_TOWER_ROCKET_TAKEOVER const EVENT_GOLDENROD_CITY_CIVILIANS - const EVENT_RADIO_TOWER_CIVILIANS_AFTER ; 6d0 + const EVENT_RADIO_TOWER_CIVILIANS_AFTER const EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS const EVENT_OLIVINE_LIGHTHOUSE_JASMINE const EVENT_OLIVINE_GYM_JASMINE @@ -1827,7 +1827,7 @@ const EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE const EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE const EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 ; 6e0 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM @@ -1843,7 +1843,7 @@ const EVENT_ILEX_FOREST_FARFETCHD5 const EVENT_ILEX_FOREST_FARFETCHD6 const EVENT_ILEX_FOREST_FARFETCHD7 - const EVENT_ILEX_FOREST_FARFETCHD8 ; 6f0 + const EVENT_ILEX_FOREST_FARFETCHD8 const EVENT_ILEX_FOREST_FARFETCHD9 const EVENT_ILEX_FOREST_FARFETCHD10 const EVENT_ILEX_FOREST_APPRENTICE @@ -1859,7 +1859,7 @@ const EVENT_KURTS_HOUSE_SLOWPOKE const EVENT_GUIDE_GENT_IN_HIS_HOUSE const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE - const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER ; 700 + const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER const EVENT_ELMS_AIDE_IN_LAB const EVENT_COP_IN_ELMS_LAB const EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST @@ -1875,7 +1875,7 @@ const EVENT_BOULDER_IN_ICE_PATH_1A const EVENT_BOULDER_IN_ICE_PATH_2A const EVENT_BOULDER_IN_ICE_PATH_3A - const EVENT_BOULDER_IN_ICE_PATH_4A ; 710 + const EVENT_BOULDER_IN_ICE_PATH_4A const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL const EVENT_ECRUTEAK_POKE_CENTER_BILL @@ -1891,7 +1891,7 @@ const EVENT_BUG_CATCHING_CONTESTANT_8A const EVENT_BUG_CATCHING_CONTESTANT_9A const EVENT_BUG_CATCHING_CONTESTANT_10A - const EVENT_BUG_CATCHING_CONTESTANT_1B ; 720 + const EVENT_BUG_CATCHING_CONTESTANT_1B const EVENT_BUG_CATCHING_CONTESTANT_2B const EVENT_BUG_CATCHING_CONTESTANT_3B const EVENT_BUG_CATCHING_CONTESTANT_4B @@ -1907,7 +1907,7 @@ const EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR const EVENT_FAST_SHIP_B1F_SAILOR_LEFT const EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN ; 730 + const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M @@ -1923,7 +1923,7 @@ const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA const EVENT_KURTS_HOUSE_KURT_1 const EVENT_KURTS_HOUSE_KURT_2 - const EVENT_SLOWPOKE_WELL_KURT ; 740 + const EVENT_SLOWPOKE_WELL_KURT const EVENT_PLAYERS_HOUSE_2F_CONSOLE const EVENT_PLAYERS_HOUSE_2F_DOLL_1 const EVENT_PLAYERS_HOUSE_2F_DOLL_2 @@ -1939,7 +1939,7 @@ const EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN const EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST const EVENT_OPENED_MT_SILVER - const EVENT_FOUGHT_SNORLAX ; 750 + const EVENT_FOUGHT_SNORLAX const EVENT_LAKE_OF_RAGE_RED_GYARADOS const EVENT_GOLDENROD_UNDERGROUND_GRANNY const EVENT_GOLDENROD_UNDERGROUND_GRAMPS @@ -1955,7 +1955,7 @@ const EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY const EVENT_ROUTE_40_MONICA_OF_MONDAY const EVENT_LANCES_ROOM_OAK_AND_MARY - const EVENT_UNION_CAVE_B2F_LAPRAS ; 760 + const EVENT_UNION_CAVE_B2F_LAPRAS const EVENT_TEAM_ROCKET_DISBANDED const EVENT_RED_IN_MT_SILVER const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY @@ -1972,7 +1972,7 @@ const EVENT_CERULEAN_GYM_ROCKET const EVENT_ROUTE_25_MISTY_BOYFRIEND const EVENT_TRAINERS_IN_CERULEAN_GYM - const EVENT_VERMILION_CITY_SNORLAX ; 770 + const EVENT_VERMILION_CITY_SNORLAX const EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH const EVENT_SAFFRON_TRAIN_STATION_POPULATION const EVENT_COPYCATS_HOUSE_2F_DOLL @@ -1989,7 +1989,7 @@ const EVENT_PICKED_UP_FOCUS_BAND const EVENT_ROCK_TUNNEL_1F_ELIXER const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING - const EVENT_ROCK_TUNNEL_B1F_IRON ; 780 + const EVENT_ROCK_TUNNEL_B1F_IRON const EVENT_ROCK_TUNNEL_B1F_PP_UP const EVENT_ROCK_TUNNEL_B1F_REVIVE const EVENT_ROUTE_2_DIRE_HIT diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 87e15afb..bd135f36 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -8,7 +8,7 @@ EngineFlags: ; entries correspond to ENGINE_* constants ; pokegear - engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 + engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F engine_flag wPokegearFlags, POKEGEAR_MAP_CARD_F engine_flag wPokegearFlags, POKEGEAR_PHONE_CARD_F engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F @@ -19,7 +19,7 @@ EngineFlags: engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8 + engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F engine_flag wMomSavingMoney, MOM_ACTIVE_F engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer @@ -30,7 +30,7 @@ EngineFlags: engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F - engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F ; $10 + engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F @@ -39,7 +39,7 @@ EngineFlags: engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F - engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F engine_flag wJohtoBadges, ZEPHYRBADGE @@ -48,7 +48,7 @@ EngineFlags: engine_flag wJohtoBadges, FOGBADGE engine_flag wJohtoBadges, MINERALBADGE engine_flag wJohtoBadges, STORMBADGE - engine_flag wJohtoBadges, GLACIERBADGE ; $20 + engine_flag wJohtoBadges, GLACIERBADGE engine_flag wJohtoBadges, RISINGBADGE engine_flag wKantoBadges, BOULDERBADGE @@ -57,7 +57,7 @@ EngineFlags: engine_flag wKantoBadges, RAINBOWBADGE engine_flag wKantoBadges, SOULBADGE engine_flag wKantoBadges, MARSHBADGE - engine_flag wKantoBadges, VOLCANOBADGE ; $28 + engine_flag wKantoBadges, VOLCANOBADGE engine_flag wKantoBadges, EARTHBADGE ; unown sets (see data/wild/unlocked_unowns.asm) @@ -67,7 +67,7 @@ EngineFlags: engine_flag wUnlockedUnowns, 3 ; X-Z engine_flag wUnlockedUnowns, 4 ; unused engine_flag wUnlockedUnowns, 5 ; unused - engine_flag wUnlockedUnowns, 6 ; unused ; $30 + engine_flag wUnlockedUnowns, 6 ; unused engine_flag wUnlockedUnowns, 7 ; unused ; fly @@ -77,7 +77,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_VIRIDIAN engine_flag wVisitedSpawns, SPAWN_PEWTER engine_flag wVisitedSpawns, SPAWN_CERULEAN - engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL ; $38 + engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL engine_flag wVisitedSpawns, SPAWN_VERMILION engine_flag wVisitedSpawns, SPAWN_LAVENDER engine_flag wVisitedSpawns, SPAWN_SAFFRON @@ -85,7 +85,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_FUCHSIA engine_flag wVisitedSpawns, SPAWN_CINNABAR engine_flag wVisitedSpawns, SPAWN_INDIGO - engine_flag wVisitedSpawns, SPAWN_NEW_BARK ; $40 + engine_flag wVisitedSpawns, SPAWN_NEW_BARK engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE engine_flag wVisitedSpawns, SPAWN_VIOLET engine_flag wVisitedSpawns, SPAWN_AZALEA @@ -93,7 +93,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_GOLDENROD engine_flag wVisitedSpawns, SPAWN_OLIVINE engine_flag wVisitedSpawns, SPAWN_ECRUTEAK - engine_flag wVisitedSpawns, SPAWN_MAHOGANY ; $48 + engine_flag wVisitedSpawns, SPAWN_MAHOGANY engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE engine_flag wVisitedSpawns, SPAWN_BLACKTHORN engine_flag wVisitedSpawns, SPAWN_MT_SILVER @@ -104,7 +104,7 @@ EngineFlags: engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F - engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F ; $50 + engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F engine_flag wDailyFlags1, DAILYFLAGS1_SWARM_F engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F engine_flag wDailyFlags1, DAILYFLAGS1_ALL_FRUIT_TREES_F @@ -113,7 +113,7 @@ EngineFlags: engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F - engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F ; $58 + engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F engine_flag wDailyFlags2, DAILYFLAGS2_DAISYS_GROOMING_F diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 8f7fd669..f36f8307 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -7,7 +7,7 @@ add_predef: MACRO ENDM PredefPointers:: - add_predef LearnMove ; $0 + add_predef LearnMove add_predef DummyPredef1 add_predef HealParty ; this is both a special and a predef add_predef SmallFarFlagAction @@ -23,15 +23,15 @@ PredefPointers:: add_predef CalcMonStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove - add_predef LinkTextboxAtHL ; $ 10 - add_predef PrintMoveDesc + add_predef LinkTextboxAtHL + add_predef PrintMoveDescription add_predef UpdatePlayerHUD add_predef PlaceGraphic add_predef CheckPlayerPartyForFitMon add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar - add_predef GetBattleMonBackpic ; $18 + add_predef GetBattleMonBackpic add_predef GetEnemyMonFrontpic add_predef LearnLevelMoves add_predef FillMoves @@ -39,7 +39,7 @@ PredefPointers:: add_predef TradeAnimationPlayer2 add_predef TradeAnimation add_predef CopyMonToTempMon - add_predef ListMoves ; $20 + add_predef ListMoves add_predef PlaceNonFaintStatus add_predef Unused_PlaceEnemyHPLevel add_predef ListMovePP @@ -47,7 +47,7 @@ PredefPointers:: add_predef StatsScreenInit add_predef DrawPlayerHP add_predef DrawEnemyHP - add_predef PrintTempMonStats ; $28 + add_predef PrintTempMonStats add_predef GetTypeName add_predef PrintMoveType add_predef PrintType @@ -55,7 +55,7 @@ PredefPointers:: add_predef GetUnownLetter add_predef LoadPoisonBGPals add_predef DummyPredef2F - add_predef InitSGBBorder ; $30 + add_predef InitSGBBorder add_predef LoadSGBLayout add_predef Pokedex_GetArea add_predef Unused_CheckShininess @@ -63,7 +63,7 @@ PredefPointers:: add_predef DummyPredef35 add_predef DummyPredef36 add_predef PlayBattleAnim - add_predef DummyPredef38 ; $38 + add_predef DummyPredef38 add_predef DummyPredef39 add_predef DummyPredef3A add_predef PartyMonItemName @@ -71,7 +71,7 @@ PredefPointers:: add_predef GetMonBackpic add_predef GetTrainerPic add_predef DecompressGet2bpp - add_predef CheckTypeMatchup ; $40 + add_predef CheckTypeMatchup add_predef ConvertMon_1to2 add_predef NewPokedexEntry add_predef UnusedFrontpicPredef diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 03492518..39207e73 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -12,7 +12,7 @@ ENDC ENDM SpecialsPointers:: - add_special WarpToSpawnPoint ; $0 + add_special WarpToSpawnPoint ; Communications add_special SetBitsForLinkTradeRequest @@ -22,7 +22,7 @@ SpecialsPointers:: add_special CheckBothSelectedSameRoom add_special FailedLinkToPast add_special CloseLink - add_special WaitForOtherPlayerToExit ; $8 + add_special WaitForOtherPlayerToExit add_special SetBitsForBattleRequest add_special SetBitsForTimeCapsuleRequest add_special CheckTimeCapsuleCompatibility @@ -30,7 +30,7 @@ SpecialsPointers:: add_special TradeCenter add_special Colosseum add_special TimeCapsule - add_special CableClubCheckWhichChris ; $10 + add_special CableClubCheckWhichChris add_special CheckMysteryGift add_special GetMysteryGiftItem add_special UnlockMysteryGift @@ -40,7 +40,7 @@ SpecialsPointers:: add_special CheckPartyFullAfterContest add_special ContestDropOffMons add_special ContestReturnMons - add_special GiveParkBalls ; $18 + add_special GiveParkBalls add_special CheckMagikarpLength add_special MagikarpHouseSign add_special HealParty ; this is both a special and a predef @@ -48,7 +48,7 @@ SpecialsPointers:: add_special PlayersHousePC add_special DayCareMan add_special DayCareLady - add_special DayCareManOutside ; $20 + add_special DayCareManOutside add_special MoveDeletion add_special BankOfMom add_special MagnetTrain @@ -56,7 +56,7 @@ SpecialsPointers:: add_special SetDayOfWeek add_special OverworldTownMap add_special UnownPrinter - add_special MapRadio ; $28 + add_special MapRadio add_special UnownPuzzle add_special SlotMachine add_special CardFlip @@ -64,7 +64,7 @@ SpecialsPointers:: add_special ClearBGPalettesBufferScreen add_special FadeOutPalettes add_special FadeBlackQuickly - add_special FadeInPalettes ; $30 + add_special FadeInPalettes add_special FadeInQuickly add_special ReloadSpritesNoPalettes, 2 add_special ClearBGPalettes @@ -72,7 +72,7 @@ SpecialsPointers:: add_special ClearTilemap add_special UpdateSprites add_special ReplaceChrisSprite - add_special GameCornerPrizeMonCheckDex ; $38 + add_special GameCornerPrizeMonCheckDex add_special UnusedSetSeenMon add_special WaitSFX, 3 add_special PlayMapMusic @@ -80,7 +80,7 @@ SpecialsPointers:: add_special HealMachineAnim add_special SurfStartStep add_special FindPartyMonAboveLevel - add_special FindPartyMonAtLeastThatHappy ; $40 + add_special FindPartyMonAtLeastThatHappy add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID add_special UnusedCheckUnusedTwoDayTimer @@ -88,7 +88,7 @@ SpecialsPointers:: add_special DayCareMon2 add_special SelectRandomBugContestContestants add_special ActivateFishingSwarm - add_special ToggleMaptileDecorations ; $48 + add_special ToggleMaptileDecorations add_special ToggleDecorationsVisibility add_special GiveShuckle add_special ReturnShuckle @@ -96,7 +96,7 @@ SpecialsPointers:: add_special CheckPokerus add_special DisplayCoinCaseBalance add_special DisplayMoneyAndCoinBalance - add_special PlaceMoneyTopRight ; $50 + add_special PlaceMoneyTopRight add_special CheckForLuckyNumberWinners add_special CheckLuckyNumberShowFlag add_special ResetLuckyNumberShowFlag @@ -104,7 +104,7 @@ SpecialsPointers:: add_special SelectApricornForKurt add_special NameRater add_special DisplayLinkRecord - add_special GetFirstPokemonHappiness ; $58 + add_special GetFirstPokemonHappiness add_special CheckFirstMonIsEgg add_special RandomUnseenWildMon add_special RandomPhoneWildMon @@ -112,7 +112,7 @@ SpecialsPointers:: add_special LoadUsedSpritesGFX add_special PlaySlowCry add_special SnorlaxAwake - add_special OlderHaircutBrother ; $60 + add_special OlderHaircutBrother add_special YoungerHaircutBrother add_special DaisysGrooming add_special PlayCurMonCry @@ -120,7 +120,7 @@ SpecialsPointers:: add_special GameboyCheck add_special TrainerHouse add_special PhotoStudio - add_special InitRoamMons ; $68 + add_special InitRoamMons add_special FadeOutMusic add_special Diploma add_special PrintDiploma diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 815cc17d..07717114 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1110,7 +1110,7 @@ CheckMimicUsed: call GetBattleVar cp MIMIC jr z, .mimic -; + ld b, 0 add hl, bc ld a, [hl] @@ -1545,7 +1545,7 @@ BattleCommand_DamageVariation: call Multiply ; ...divide by 100%... - ld a, $ff ; 100% + ld a, 100 percent ldh [hDivisor], a ld b, $4 call Divide diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index e2f810e6..64d66ad6 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -14,7 +14,7 @@ BattleCommand_CheckCurl: bit SUBSTATUS_ROLLOUT, a jr z, .reset - ld b, $4 ; doturn + ld b, doturn_command jp SkipToBattleCommand .reset diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 5b148ab5..afc735f9 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -5,9 +5,9 @@ BattleCommand_UsedMoveText: jp WaitBGMap UsedMoveText: -; this is a stream of text and asm from 105db9 to 105ef6 text_far _ActorNameText text_asm + ldh a, [hBattleTurn] and a jr nz, .start diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 2c20b40d..de9d0306 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1475,10 +1475,10 @@ Tackle_BGEffect25_2d_two: Functionc886e: push af - ld a, [wFXAnimID + 1] ; FXAnimID + 1 + ld a, [wFXAnimID + 1] or a jr nz, .not_rollout - ld a, [wFXAnimID] ; FXAnimID + ld a, [wFXAnimID] cp ROLLOUT jr z, .rollout .not_rollout diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index d7998019..f8fcffc2 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -247,13 +247,13 @@ Unreferenced_Function91b4: ldh a, [hCGB] and a jr nz, .cgb - ld hl, wc602 + ld hl, wBetaPokerSGBPals jp PushSGBPals .cgb - ld a, [wc606] ; col + ld a, [wBetaPokerSGBCol] ld c, a - ld a, [wc607] ; row + ld a, [wBetaPokerSGBRow] hlcoord 0, 0, wAttrmap ld de, SCREEN_WIDTH .loop @@ -267,7 +267,7 @@ Unreferenced_Function91b4: ld b, $0 add hl, bc lb bc, 6, 4 - ld a, [wc605] ; value + ld a, [wBetaPokerSGBAttr] and $3 call FillBoxCGB call CopyTilemapAtOnce @@ -1236,6 +1236,9 @@ INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: INCLUDE "gfx/stats/party_menu_ob.pal" +UnusedBattleObjectPals: +INCLUDE "gfx/battle_anims/unused_battle_anims.pal" + GSTitleBGPals: IF DEF(_GOLD) INCLUDE "gfx/title/title_bg_gold.pal" diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index db4e929f..561d6063 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -339,7 +339,7 @@ endr .SGB_BetaPoker: ld hl, BlkPacket_9ee5 - ld de, wc602 + ld de, wBetaPokerSGBPals ld bc, PALPACKET_LENGTH call CopyBytes ld hl, PalPacket_BetaPoker diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm index 89a949ad..8ac6f816 100644 --- a/engine/items/print_item_description.asm +++ b/engine/items/print_item_description.asm @@ -11,7 +11,7 @@ PrintItemDescription: pop hl ld a, [wTempTMHM] ld [wCurSpecies], a - call PrintMoveDesc + call PrintMoveDescription ret .not_a_tm diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index f5261123..1d71f695 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -251,7 +251,7 @@ TMHM_ShowTMMoveDescription: ld a, [wTempTMHM] ld [wCurSpecies], a hlcoord 1, 14 - call PrintMoveDesc + call PrintMoveDescription jp TMHM_JoypadLoop TMHM_ChooseTMorHM: @@ -416,7 +416,7 @@ TMHM_DisplayPocketItems: inc hl inc hl push de - ld de, TMHM_String_Cancel + ld de, TMHM_CancelString call PlaceString pop de .done @@ -448,7 +448,7 @@ Unreferenced_Function2c89a: pop hl ret -TMHM_String_Cancel: +TMHM_CancelString: db "CANCEL@" TMHM_GetCurrentPocketPosition: @@ -471,7 +471,7 @@ TMHM_GetCurrentPocketPosition: Tutorial_TMHMPocket: hlcoord 9, 3 push de - ld de, TMHM_String_Cancel + ld de, TMHM_CancelString call PlaceString pop de ret diff --git a/engine/link/link.asm b/engine/link/link.asm index 11657f4e..79571fa4 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1427,10 +1427,10 @@ Function28a16: ld bc, SCREEN_WIDTH - 2 call ByteFill hlcoord 2, 16 - ld de, .Cancel + ld de, .CancelString jp PlaceString -.Cancel: +.CancelString: db "CANCEL@" Function28a3c: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 55a35982..92f67093 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -979,7 +979,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ld d, $0 ld b, CHECK_FLAG ld hl, sMysteryGiftDecorationsReceived - predef_id SmallFarFlagAction + lda_predef SmallFarFlagAction push hl push bc call Predef diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 2fd65e2b..ed7221e8 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -110,8 +110,7 @@ CoinString: ShowMoney_TerminatorString: db "@@" -Unreferenced_Function24ab8: -; related to safari? +Unreferenced_StartMenu_PrintSafariGameStatus: ld hl, wOptions ld a, [hl] push af diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index f051e71c..0574bc73 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -401,11 +401,11 @@ ScrollingMenu_UpdateDisplay: ld a, [wMenuDataFlags] bit 0, a ; call function on cancel jr nz, .call_function - ld de, .string_24787 + ld de, .CancelString call PlaceString ret -.string_24787 +.CancelString db "CANCEL@" .call_function diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 7061d4bd..7144c0d9 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -367,7 +367,7 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + ld e, SCREEN_WIDTH - 3 ld a, " " .loop2 ld [hli], a @@ -378,11 +378,12 @@ TrainerCard_InitBorder: ld [hli], a ld a, $23 ld [hli], a + .loop3 ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT + ld e, SCREEN_WIDTH - 2 ld a, " " .loop4 ld [hli], a @@ -391,6 +392,7 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a + dec d jr nz, .loop3 @@ -399,14 +401,16 @@ TrainerCard_InitBorder: ld a, $24 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + ld e, SCREEN_WIDTH - 3 ld a, " " .loop5 ld [hli], a dec e jr nz, .loop5 + ld a, $23 ld [hli], a + ld e, SCREEN_WIDTH .loop6 ld a, $23 diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index aa211ae1..3bf31474 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -1213,7 +1213,7 @@ PlaceMoveData: .description hlcoord 1, 14 - predef PrintMoveDesc + predef PrintMoveDescription ld a, $1 ldh [hBGMapMode], a ret diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 93f9b93b..c899b5cb 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -104,11 +104,11 @@ PlacePartyNicknames: .end dec hl dec hl - ld de, .CANCEL + ld de, .CancelString call PlaceString ret -.CANCEL: +.CancelString: db "CANCEL@" PlacePartyHPBar: diff --git a/engine/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm index e002e3d1..fd12f82b 100644 --- a/engine/pokemon/print_move_description.asm +++ b/engine/pokemon/print_move_description.asm @@ -1,4 +1,4 @@ -PrintMoveDesc: +PrintMoveDescription: push hl ld hl, MoveDescriptions ld a, [wCurSpecies] diff --git a/gfx/battle_anims/unused_battle_anims.pal b/gfx/battle_anims/unused_battle_anims.pal new file mode 100644 index 00000000..4ef48dd0 --- /dev/null +++ b/gfx/battle_anims/unused_battle_anims.pal @@ -0,0 +1,30 @@ +; gray + RGB 31, 31, 31 + RGB 21, 21, 21 + RGB 13, 13, 13 + RGB 07, 07, 07 +; yellow + RGB 31, 31, 31 + RGB 31, 31, 07 + RGB 31, 16, 01 + RGB 07, 07, 07 +; red + RGB 31, 31, 31 + RGB 31, 19, 24 + RGB 30, 10, 06 + RGB 07, 07, 07 +; green + RGB 31, 31, 31 + RGB 12, 25, 01 + RGB 05, 14, 00 + RGB 07, 07, 07 +; blue + RGB 31, 31, 31 + RGB 08, 12, 31 + RGB 01, 04, 31 + RGB 07, 07, 07 +; brown + RGB 31, 31, 31 + RGB 24, 18, 07 + RGB 20, 15, 03 + RGB 07, 07, 07 diff --git a/gfx/stats/party_menu_ob.pal b/gfx/stats/party_menu_ob.pal index 70af517b..6acec536 100644 --- a/gfx/stats/party_menu_ob.pal +++ b/gfx/stats/party_menu_ob.pal @@ -37,33 +37,3 @@ RGB 31, 19, 10 RGB 31, 07, 04 RGB 00, 00, 00 - - RGB 31, 31, 31 - RGB 21, 21, 21 - RGB 13, 13, 13 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 31, 07 - RGB 31, 16, 01 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 31, 19, 24 - RGB 30, 10, 06 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 08, 12, 31 - RGB 01, 04, 31 - RGB 07, 07, 07 - - RGB 31, 31, 31 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 diff --git a/home/map_objects.asm b/home/map_objects.asm index 39bc915a..913b0db8 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -574,12 +574,12 @@ _GetMovementByte:: ld a, h ret -SetVramState_Bit0:: +UnreferencedSetVramState_Bit0:: ld hl, wVramState set 0, [hl] ret -ResetVramState_Bit0:: +UnreferencedResetVramState_Bit0:: ld hl, wVramState res 0, [hl] ret diff --git a/home/math.asm b/home/math.asm index 3042cc61..c99214cc 100644 --- a/home/math.asm +++ b/home/math.asm @@ -48,8 +48,8 @@ Divide:: pop hl ret -SubtractSigned:: -; Return a - b, sign in carry. +UnreferencedSubtractAbsolute:: +; Return |a - b|, sign in carry. sub b ret nc cpl diff --git a/home/menu.asm b/home/menu.asm index d8dd353d..9efb2414 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -381,7 +381,7 @@ YesNoBox:: PlaceYesNoBox:: jr _YesNoBox -PlaceGenericTwoOptionBox:: +UnreferencedPlaceGenericTwoOptionBox:: call LoadMenuHeader jr InterpretTwoOptionMenu diff --git a/home/text.asm b/home/text.asm index 61cc371e..c12bcdd6 100644 --- a/home/text.asm +++ b/home/text.asm @@ -128,7 +128,7 @@ SpeechTextbox:: ld c, TEXTBOX_INNERW jp Textbox -TestText:: +UnreferencedTestText:: text "ゲームフりーク！" done diff --git a/home/time.asm b/home/time.asm index 73bd0576..e49a5765 100644 --- a/home/time.asm +++ b/home/time.asm @@ -249,7 +249,7 @@ SetClock:: call CloseSRAM ; unlatch clock, disable clock r/w ret -ClearRTCStatus:: +UnreferencedClearRTCStatus:: ; clear sRTCStatusFlags xor a push af diff --git a/home/trainers.asm b/home/trainers.asm index 04f74f2f..0f9a1c9b 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -203,7 +203,7 @@ FacingPlayerDistance:: and a ret -CheckTrainerFlag:: +UnreferencedCheckTrainerFlag:: push bc ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc diff --git a/home/video.asm b/home/video.asm index 51dbf018..242584cb 100644 --- a/home/video.asm +++ b/home/video.asm @@ -7,7 +7,7 @@ UpdateBGMapBuffer:: ; Return carry on success. ldh a, [hBGMapUpdate] - and a + and a ; 0 ret z ld [hSPBuffer], sp @@ -103,7 +103,7 @@ UpdateBGMap:: jr z, .Attr ; BG Map 1 - dec a + dec a ; useless ldh a, [hBGMapAddress] ld l, a @@ -208,7 +208,7 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3 ldh [hBGMapThird], a ; Rows of tiles in a third - ld a, SCREEN_HEIGHT / 3 + ld a, THIRD_HEIGHT ; Discrepancy between wTilemap and BGMap ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1) diff --git a/macros/predef.asm b/macros/predef.asm index 7850350a..a1c43bb5 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,15 +1,15 @@ -predef_id: MACRO +lda_predef: MACRO ; Some functions load the predef id ; without immediately calling Predef. ld a, (\1Predef - PredefPointers) / 3 ENDM predef: MACRO - predef_id \1 + lda_predef \1 call Predef ENDM predef_jump: MACRO - predef_id \1 + lda_predef \1 jp Predef ENDM diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 6fe55945..da937325 100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm @@ -1,4 +1,4 @@ -; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm) +; DoTradeAnimation.JumpTable indexes (see engine/movies/trade_animation.asm) enum_start enum tradeanim_next_command ; $00 diff --git a/maps/Route36.asm b/maps/Route36.asm index 47a0ef7e..7d01b05f 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -258,7 +258,7 @@ Route36FruitTree: fruittree FRUITTREE_ROUTE_36 SudowoodoShakeMovement: - tree_shake ; shake + tree_shake step_end WeirdTreeMovement_Flee: @@ -230,7 +230,7 @@ wBoxPartialDataEnd:: NEXTU ; c508 ; 20x18 grid of 8x8 tiles wTempTilemap:: - ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360 + ds SCREEN_WIDTH * SCREEN_HEIGHT NEXTU ; c508 ; unown puzzle @@ -428,15 +428,13 @@ wDummyGameNumCardsMatched:: db ; c609 wDummyGameEnd:: NEXTU ; c5d0 -; unused (engine/gfx/color.asm) +; beta poker game ds 50 - -wc602:: db ; c602 +wBetaPokerSGBPals:: db ; c602 ds 2 - -wc605:: db ; c605 -wc606:: db ; c606 -wc607:: db ; c607 +wBetaPokerSGBAttr:: db ; c605 +wBetaPokerSGBCol:: db ; c606 +wBetaPokerSGBRow:: db ; c607 ENDU ; c6e8 ENDU ; c6e8 @@ -2432,9 +2430,9 @@ wParkBallsRemaining:: wSafariBallsRemaining:: db ; d9c3 wSafariTimeRemaining:: dw ; d9c4 -wPhoneList:: ds CONTACT_LIST_SIZE ; d9c6 -; d9d0 - ds 23 +wPhoneList:: ds CONTACT_LIST_SIZE + 1 ; d9c6 + + ds 22 wLuckyNumberShowFlag:: db ; d9e7 ds 1 |