From 31287c6aaa71f863a282ccf8ebf43479adff2296 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 22 Jul 2020 20:23:19 -0400 Subject: Revert "Factor out tables into data/overworld/" This reverts commit 3f392c279248562068a80ceaf2884f62a18f6e17. --- data/collision_permissions.asm | 258 +++++++++++++++++++++++++++++++ data/engine_flags.asm | 120 ++++++++++++++ data/events/engine_flags.asm | 120 -------------- data/events/special_pointers.asm | 130 ---------------- data/events/std_scripts.asm | 52 ------- data/overworld/collision_permissions.asm | 258 ------------------------------- data/overworld/scripting.asm | 164 -------------------- data/overworld/tilesets.asm | 43 ------ data/overworld/variables.asm | 27 ---- data/special_pointers.asm | 130 ++++++++++++++++ data/tilesets.asm | 43 ++++++ 11 files changed, 551 insertions(+), 794 deletions(-) create mode 100644 data/collision_permissions.asm create mode 100644 data/engine_flags.asm delete mode 100644 data/events/engine_flags.asm delete mode 100644 data/events/special_pointers.asm delete mode 100644 data/events/std_scripts.asm delete mode 100644 data/overworld/collision_permissions.asm delete mode 100644 data/overworld/scripting.asm delete mode 100644 data/overworld/tilesets.asm delete mode 100644 data/overworld/variables.asm create mode 100644 data/special_pointers.asm create mode 100644 data/tilesets.asm (limited to 'data') diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm new file mode 100644 index 00000000..57172ca5 --- /dev/null +++ b/data/collision_permissions.asm @@ -0,0 +1,258 @@ +TileCollisionTable:: +; entries correspond to COLL_* constants + db LAND_TILE ; COLL_FLOOR + db LAND_TILE ; COLL_01 + db LAND_TILE ; 02 + db LAND_TILE ; COLL_03 + db LAND_TILE ; COLL_04 + db LAND_TILE ; 05 + db LAND_TILE ; 06 + db WALL_TILE ; COLL_WALL + db LAND_TILE ; COLL_CUT_08 + db LAND_TILE ; 09 + db LAND_TILE ; 0a + db LAND_TILE ; 0b + db LAND_TILE ; 0c + db LAND_TILE ; 0d + db LAND_TILE ; 0e + db WALL_TILE ; 0f + db LAND_TILE ; COLL_TALL_GRASS_10 + db LAND_TILE ; 11 + db WALL_TILE | TALK ; COLL_CUT_TREE + db LAND_TILE ; 13 + db LAND_TILE ; COLL_LONG_GRASS + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE + db LAND_TILE ; 16 + db LAND_TILE ; 17 + db LAND_TILE ; COLL_TALL_GRASS + db LAND_TILE ; 19 + db WALL_TILE | TALK ; COLL_CUT_TREE_1A + db LAND_TILE ; 1b + db LAND_TILE ; COLL_LONG_GRASS_1C + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D + db LAND_TILE ; 1e + db LAND_TILE ; 1f + db WATER_TILE ; 20 + db WATER_TILE ; COLL_WATER_21 + db WATER_TILE | TALK ; 22 + db LAND_TILE ; COLL_ICE + db WATER_TILE | TALK ; COLL_WHIRLPOOL + db WATER_TILE ; 25 + db WATER_TILE ; 26 + db WALL_TILE ; COLL_BUOY + db WATER_TILE ; COLL_CUT_28 + db WATER_TILE ; COLL_WATER + db WATER_TILE | TALK ; 2a + db LAND_TILE ; COLL_ICE_2B + db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C + db WATER_TILE ; 2d + db WATER_TILE ; 2e + db WALL_TILE ; 2f + db WATER_TILE ; COLL_WATERFALL_RIGHT + db WATER_TILE ; COLL_WATERFALL_LEFT + db WATER_TILE ; COLL_WATERFALL_UP + db WATER_TILE ; COLL_WATERFALL + db WATER_TILE ; 34 + db WATER_TILE ; 35 + db WATER_TILE ; 36 + db WATER_TILE ; 37 + db WATER_TILE ; COLL_CURRENT_RIGHT + db WATER_TILE ; COLL_CURRENT_LEFT + db WATER_TILE ; COLL_CURRENT_UP + db WATER_TILE ; COLL_CURRENT_DOWN + db WATER_TILE ; 3c + db WATER_TILE ; 3d + db WATER_TILE ; 3e + db WATER_TILE ; 3f + db LAND_TILE ; COLL_BRAKE + db LAND_TILE ; COLL_WALK_RIGHT + db LAND_TILE ; COLL_WALK_LEFT + db LAND_TILE ; COLL_WALK_UP + db LAND_TILE ; COLL_WALK_DOWN + db LAND_TILE ; COLL_BRAKE_45 + db LAND_TILE ; COLL_BRAKE_46 + db LAND_TILE ; COLL_BRAKE_47 + db LAND_TILE ; COLL_GRASS_48 + db LAND_TILE ; COLL_GRASS_49 + db LAND_TILE ; COLL_GRASS_4A + db LAND_TILE ; COLL_GRASS_4B + db LAND_TILE ; COLL_GRASS_4C + db LAND_TILE ; 4d + db LAND_TILE ; 4e + db LAND_TILE ; 4f + db LAND_TILE ; COLL_WALK_RIGHT_ALT + db LAND_TILE ; COLL_WALK_LEFT_ALT + db LAND_TILE ; COLL_WALK_UP_ALT + db LAND_TILE ; COLL_WALK_DOWN_ALT + db LAND_TILE ; COLL_BRAKE_ALT + db LAND_TILE ; COLL_BRAKE_55 + db LAND_TILE ; COLL_BRAKE_56 + db LAND_TILE ; COLL_BRAKE_57 + db LAND_TILE ; 58 + db LAND_TILE ; 59 + db LAND_TILE ; 5a + db LAND_TILE ; COLL_5B + db LAND_TILE ; 5c + db LAND_TILE ; 5d + db LAND_TILE ; 5e + db LAND_TILE ; 5f + db LAND_TILE ; COLL_PIT + db LAND_TILE ; COLL_VIRTUAL_BOY + db WALL_TILE ; 62 + db LAND_TILE ; 63 + db LAND_TILE ; COLL_64 + db LAND_TILE ; COLL_65 + db LAND_TILE ; 66 + db LAND_TILE ; 67 + db LAND_TILE ; COLL_PIT_68 + db LAND_TILE ; 69 + db WALL_TILE ; 6a + db LAND_TILE ; 6b + db LAND_TILE ; 6c + db LAND_TILE ; 6d + db LAND_TILE ; 6e + db LAND_TILE ; 6f + db LAND_TILE ; COLL_WARP_CARPET_DOWN + db LAND_TILE ; COLL_DOOR + db LAND_TILE ; COLL_LADDER + db LAND_TILE ; COLL_STAIRCASE_73 + db LAND_TILE ; COLL_CAVE_74 + db LAND_TILE ; COLL_DOOR_75 + db LAND_TILE ; COLL_WARP_CARPET_LEFT + db LAND_TILE ; COLL_WARP_77 + db LAND_TILE ; COLL_WARP_CARPET_UP + db LAND_TILE ; COLL_DOOR_79 + db LAND_TILE ; COLL_STAIRCASE + db LAND_TILE ; COLL_CAVE + db LAND_TILE ; COLL_WARP_PANEL + db LAND_TILE ; COLL_DOOR_7D + db LAND_TILE ; COLL_WARP_CARPET_RIGHT + db LAND_TILE ; COLL_WARP_7F + db WALL_TILE ; 80 + db WALL_TILE ; 81 + db WALL_TILE ; 82 + db WALL_TILE ; 83 + db WALL_TILE ; 84 + db LAND_TILE ; 85 + db LAND_TILE ; 86 + db LAND_TILE ; 87 + db WALL_TILE ; 88 + db WALL_TILE ; 89 + db WALL_TILE ; 8a + db WALL_TILE ; 8b + db WALL_TILE ; 8c + db LAND_TILE ; 8d + db LAND_TILE ; 8e + db LAND_TILE ; 8f + db WALL_TILE ; COLL_COUNTER + db WALL_TILE ; COLL_BOOKSHELF + db WALL_TILE ; 92 + db WALL_TILE ; COLL_PC + db WALL_TILE ; COLL_RADIO + db WALL_TILE ; COLL_TOWN_MAP + db WALL_TILE ; COLL_MART_SHELF + db WALL_TILE ; COLL_TV + db WALL_TILE ; COLL_COUNTER_98 + db WALL_TILE ; 99 + db WALL_TILE ; 9a + db WALL_TILE ; 9b + db WALL_TILE ; COLL_9C + db WALL_TILE ; COLL_WINDOW + db WALL_TILE ; 9e + db WALL_TILE ; COLL_INCENSE_BURNER + db LAND_TILE ; COLL_HOP_RIGHT + db LAND_TILE ; COLL_HOP_LEFT + db LAND_TILE ; COLL_HOP_UP + db LAND_TILE ; COLL_HOP_DOWN + db LAND_TILE ; COLL_HOP_DOWN_RIGHT + db LAND_TILE ; COLL_HOP_DOWN_LEFT + db LAND_TILE ; COLL_HOP_UP_RIGHT + db LAND_TILE ; COLL_HOP_UP_LEFT + db LAND_TILE ; a8 + db LAND_TILE ; a9 + db LAND_TILE ; aa + db LAND_TILE ; ab + db LAND_TILE ; ac + db LAND_TILE ; ad + db LAND_TILE ; ae + db LAND_TILE ; af + db LAND_TILE ; COLL_RIGHT_WALL + db LAND_TILE ; COLL_LEFT_WALL + db LAND_TILE ; COLL_UP_WALL + db LAND_TILE ; COLL_DOWN_WALL + db LAND_TILE ; COLL_DOWN_RIGHT_WALL + db LAND_TILE ; COLL_DOWN_LEFT_WALL + db LAND_TILE ; COLL_UP_RIGHT_WALL + db LAND_TILE ; COLL_UP_LEFT_WALL + db LAND_TILE ; b8 + db LAND_TILE ; b9 + db LAND_TILE ; ba + db LAND_TILE ; bb + db LAND_TILE ; bc + db LAND_TILE ; bd + db LAND_TILE ; be + db LAND_TILE ; bf + db WATER_TILE ; COLL_RIGHT_BUOY + db WATER_TILE ; COLL_LEFT_BUOY + db WATER_TILE ; COLL_UP_BUOY + db WATER_TILE ; COLL_DOWN_BUOY + db WATER_TILE ; COLL_DOWN_RIGHT_BUOY + db WATER_TILE ; COLL_DOWN_LEFT_BUOY + db WATER_TILE ; COLL_UP_RIGHT_BUOY + db WATER_TILE ; COLL_UP_LEFT_BUOY + db WATER_TILE ; c8 + db WATER_TILE ; c9 + db WATER_TILE ; ca + db WATER_TILE ; cb + db WATER_TILE ; cc + db WATER_TILE ; cd + db WATER_TILE ; ce + db WATER_TILE ; cf + db LAND_TILE ; d0 + db LAND_TILE ; d1 + db LAND_TILE ; d2 + db LAND_TILE ; d3 + db LAND_TILE ; d4 + db LAND_TILE ; d5 + db LAND_TILE ; d6 + db LAND_TILE ; d7 + db LAND_TILE ; d8 + db LAND_TILE ; d9 + db LAND_TILE ; da + db LAND_TILE ; db + db LAND_TILE ; dc + db LAND_TILE ; dd + db LAND_TILE ; de + db LAND_TILE ; df + db LAND_TILE ; e0 + db LAND_TILE ; e1 + db LAND_TILE ; e2 + db LAND_TILE ; e3 + db LAND_TILE ; e4 + db LAND_TILE ; e5 + db LAND_TILE ; e6 + db LAND_TILE ; e7 + db LAND_TILE ; e8 + db LAND_TILE ; e9 + db LAND_TILE ; ea + db LAND_TILE ; eb + db LAND_TILE ; ec + db LAND_TILE ; ed + db LAND_TILE ; ee + db LAND_TILE ; ef + db LAND_TILE ; f0 + db LAND_TILE ; f1 + db LAND_TILE ; f2 + db LAND_TILE ; f3 + db LAND_TILE ; f4 + db LAND_TILE ; f5 + db LAND_TILE ; f6 + db LAND_TILE ; f7 + db LAND_TILE ; f8 + db LAND_TILE ; f9 + db LAND_TILE ; fa + db LAND_TILE ; fb + db LAND_TILE ; fc + db LAND_TILE ; fd + db LAND_TILE ; fe + db WALL_TILE ; COLL_FF diff --git a/data/engine_flags.asm b/data/engine_flags.asm new file mode 100644 index 00000000..bd135f36 --- /dev/null +++ b/data/engine_flags.asm @@ -0,0 +1,120 @@ +engine_flag: MACRO +; location, bit +; (all locations are in WRAM bank 1) + dwb \1 + (\2 / 8), 1 << (\2 % 8) +ENDM + +EngineFlags: +; entries correspond to ENGINE_* constants + + ; pokegear + 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 + engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F + + ; day-care + engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F + engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F + engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F + + 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 + + engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F + engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F + engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F + engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F + engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F + + 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 + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F + engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F + + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F + engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F + + engine_flag wJohtoBadges, ZEPHYRBADGE + engine_flag wJohtoBadges, HIVEBADGE + engine_flag wJohtoBadges, PLAINBADGE + engine_flag wJohtoBadges, FOGBADGE + engine_flag wJohtoBadges, MINERALBADGE + engine_flag wJohtoBadges, STORMBADGE + engine_flag wJohtoBadges, GLACIERBADGE + engine_flag wJohtoBadges, RISINGBADGE + + engine_flag wKantoBadges, BOULDERBADGE + engine_flag wKantoBadges, CASCADEBADGE + engine_flag wKantoBadges, THUNDERBADGE + engine_flag wKantoBadges, RAINBOWBADGE + engine_flag wKantoBadges, SOULBADGE + engine_flag wKantoBadges, MARSHBADGE + engine_flag wKantoBadges, VOLCANOBADGE + engine_flag wKantoBadges, EARTHBADGE + + ; unown sets (see data/wild/unlocked_unowns.asm) + engine_flag wUnlockedUnowns, 0 ; A-K + engine_flag wUnlockedUnowns, 1 ; L-R + engine_flag wUnlockedUnowns, 2 ; S-W + engine_flag wUnlockedUnowns, 3 ; X-Z + engine_flag wUnlockedUnowns, 4 ; unused + engine_flag wUnlockedUnowns, 5 ; unused + engine_flag wUnlockedUnowns, 6 ; unused + engine_flag wUnlockedUnowns, 7 ; unused + + ; fly + engine_flag wVisitedSpawns, SPAWN_HOME + engine_flag wVisitedSpawns, SPAWN_DEBUG + engine_flag wVisitedSpawns, SPAWN_PALLET + engine_flag wVisitedSpawns, SPAWN_VIRIDIAN + engine_flag wVisitedSpawns, SPAWN_PEWTER + engine_flag wVisitedSpawns, SPAWN_CERULEAN + engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL + engine_flag wVisitedSpawns, SPAWN_VERMILION + engine_flag wVisitedSpawns, SPAWN_LAVENDER + engine_flag wVisitedSpawns, SPAWN_SAFFRON + engine_flag wVisitedSpawns, SPAWN_CELADON + engine_flag wVisitedSpawns, SPAWN_FUCHSIA + engine_flag wVisitedSpawns, SPAWN_CINNABAR + engine_flag wVisitedSpawns, SPAWN_INDIGO + engine_flag wVisitedSpawns, SPAWN_NEW_BARK + engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE + engine_flag wVisitedSpawns, SPAWN_VIOLET + engine_flag wVisitedSpawns, SPAWN_AZALEA + engine_flag wVisitedSpawns, SPAWN_CIANWOOD + engine_flag wVisitedSpawns, SPAWN_GOLDENROD + engine_flag wVisitedSpawns, SPAWN_OLIVINE + engine_flag wVisitedSpawns, SPAWN_ECRUTEAK + engine_flag wVisitedSpawns, SPAWN_MAHOGANY + engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE + engine_flag wVisitedSpawns, SPAWN_BLACKTHORN + engine_flag wVisitedSpawns, SPAWN_MT_SILVER + engine_flag wVisitedSpawns, NUM_SPAWNS ; unused + + engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F + + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F + + engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F + 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 + engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F + engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F + engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F + + engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F + 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 + engine_flag wDailyFlags2, DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm deleted file mode 100644 index bd135f36..00000000 --- a/data/events/engine_flags.asm +++ /dev/null @@ -1,120 +0,0 @@ -engine_flag: MACRO -; location, bit -; (all locations are in WRAM bank 1) - dwb \1 + (\2 / 8), 1 << (\2 % 8) -ENDM - -EngineFlags: -; entries correspond to ENGINE_* constants - - ; pokegear - 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 - engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F - - ; day-care - engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F - engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F - engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - - 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 - - engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F - engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F - engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F - engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F - engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F - - 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 - engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F - engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F - engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F - - engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F - engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F - engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F - - engine_flag wJohtoBadges, ZEPHYRBADGE - engine_flag wJohtoBadges, HIVEBADGE - engine_flag wJohtoBadges, PLAINBADGE - engine_flag wJohtoBadges, FOGBADGE - engine_flag wJohtoBadges, MINERALBADGE - engine_flag wJohtoBadges, STORMBADGE - engine_flag wJohtoBadges, GLACIERBADGE - engine_flag wJohtoBadges, RISINGBADGE - - engine_flag wKantoBadges, BOULDERBADGE - engine_flag wKantoBadges, CASCADEBADGE - engine_flag wKantoBadges, THUNDERBADGE - engine_flag wKantoBadges, RAINBOWBADGE - engine_flag wKantoBadges, SOULBADGE - engine_flag wKantoBadges, MARSHBADGE - engine_flag wKantoBadges, VOLCANOBADGE - engine_flag wKantoBadges, EARTHBADGE - - ; unown sets (see data/wild/unlocked_unowns.asm) - engine_flag wUnlockedUnowns, 0 ; A-K - engine_flag wUnlockedUnowns, 1 ; L-R - engine_flag wUnlockedUnowns, 2 ; S-W - engine_flag wUnlockedUnowns, 3 ; X-Z - engine_flag wUnlockedUnowns, 4 ; unused - engine_flag wUnlockedUnowns, 5 ; unused - engine_flag wUnlockedUnowns, 6 ; unused - engine_flag wUnlockedUnowns, 7 ; unused - - ; fly - engine_flag wVisitedSpawns, SPAWN_HOME - engine_flag wVisitedSpawns, SPAWN_DEBUG - engine_flag wVisitedSpawns, SPAWN_PALLET - engine_flag wVisitedSpawns, SPAWN_VIRIDIAN - engine_flag wVisitedSpawns, SPAWN_PEWTER - engine_flag wVisitedSpawns, SPAWN_CERULEAN - engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL - engine_flag wVisitedSpawns, SPAWN_VERMILION - engine_flag wVisitedSpawns, SPAWN_LAVENDER - engine_flag wVisitedSpawns, SPAWN_SAFFRON - engine_flag wVisitedSpawns, SPAWN_CELADON - engine_flag wVisitedSpawns, SPAWN_FUCHSIA - engine_flag wVisitedSpawns, SPAWN_CINNABAR - engine_flag wVisitedSpawns, SPAWN_INDIGO - engine_flag wVisitedSpawns, SPAWN_NEW_BARK - engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE - engine_flag wVisitedSpawns, SPAWN_VIOLET - engine_flag wVisitedSpawns, SPAWN_AZALEA - engine_flag wVisitedSpawns, SPAWN_CIANWOOD - engine_flag wVisitedSpawns, SPAWN_GOLDENROD - engine_flag wVisitedSpawns, SPAWN_OLIVINE - engine_flag wVisitedSpawns, SPAWN_ECRUTEAK - engine_flag wVisitedSpawns, SPAWN_MAHOGANY - engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE - engine_flag wVisitedSpawns, SPAWN_BLACKTHORN - engine_flag wVisitedSpawns, SPAWN_MT_SILVER - engine_flag wVisitedSpawns, NUM_SPAWNS ; unused - - engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F - - engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F - - engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F - 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 - engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F - engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F - engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F - - engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F - 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 - engine_flag wDailyFlags2, DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm deleted file mode 100644 index b7e4d213..00000000 --- a/data/events/special_pointers.asm +++ /dev/null @@ -1,130 +0,0 @@ -; Special routines can be used with the "special" map script command. -; They often use wScriptVar for arguments and return values. - -add_special: MACRO -; Some ROM0 specials have a nonzero bank. -\1Special:: -IF _NARG == 1 - dba \1 -ELSE - dbw \2, \1 -ENDC -ENDM - -SpecialsPointers:: - add_special WarpToSpawnPoint - -; Communications - add_special SetBitsForLinkTradeRequest - add_special WaitForLinkedFriend - add_special CheckLinkTimeout - add_special TryQuickSave - add_special CheckBothSelectedSameRoom - add_special FailedLinkToPast - add_special CloseLink - add_special WaitForOtherPlayerToExit - add_special SetBitsForBattleRequest - add_special SetBitsForTimeCapsuleRequest - add_special CheckTimeCapsuleCompatibility - add_special EnterTimeCapsule - add_special TradeCenter - add_special Colosseum - add_special TimeCapsule - add_special CableClubCheckWhichChris - add_special CheckMysteryGift - add_special GetMysteryGiftItem - add_special UnlockMysteryGift - -; Map events - add_special BugContestJudging - add_special CheckPartyFullAfterContest - add_special ContestDropOffMons - add_special ContestReturnMons - add_special GiveParkBalls - add_special CheckMagikarpLength - add_special MagikarpHouseSign - add_special HealParty ; this is both a special and a predef - add_special PokemonCenterPC - add_special PlayersHousePC - add_special DayCareMan - add_special DayCareLady - add_special DayCareManOutside - add_special MoveDeletion - add_special BankOfMom - add_special MagnetTrain - add_special NameRival - add_special SetDayOfWeek - add_special OverworldTownMap - add_special UnownPrinter - add_special MapRadio - add_special UnownPuzzle - add_special SlotMachine - add_special CardFlip - add_special DummyNonfunctionalGameCornerGame - add_special ClearBGPalettesBufferScreen - add_special FadeOutPalettes - add_special FadeBlackQuickly - add_special FadeInPalettes - add_special FadeInQuickly - add_special ReloadSpritesNoPalettes, 2 - add_special ClearBGPalettes - add_special UpdateTimePals - add_special ClearTilemap - add_special UpdateSprites - add_special UpdatePlayerSprite - add_special GameCornerPrizeMonCheckDex - add_special UnusedSetSeenMon - add_special WaitSFX, 3 - add_special PlayMapMusic - add_special RestartMapMusic - add_special HealMachineAnim - add_special SurfStartStep - add_special FindPartyMonAboveLevel - add_special FindPartyMonAtLeastThatHappy - add_special FindPartyMonThatSpecies - add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedCheckUnusedTwoDayTimer - add_special DayCareMon1 - add_special DayCareMon2 - add_special SelectRandomBugContestContestants - add_special ActivateFishingSwarm - add_special ToggleMaptileDecorations - add_special ToggleDecorationsVisibility - add_special GiveShuckle - add_special ReturnShuckle - add_special BillsGrandfather - add_special CheckPokerus - add_special DisplayCoinCaseBalance - add_special DisplayMoneyAndCoinBalance - add_special PlaceMoneyTopRight - add_special CheckForLuckyNumberWinners - add_special CheckLuckyNumberShowFlag - add_special ResetLuckyNumberShowFlag - add_special PrintTodaysLuckyNumber - add_special SelectApricornForKurt - add_special NameRater - add_special DisplayLinkRecord - add_special GetFirstPokemonHappiness - add_special CheckFirstMonIsEgg - add_special RandomUnseenWildMon - add_special RandomPhoneWildMon - add_special RandomPhoneMon - add_special LoadUsedSpritesGFX - add_special PlaySlowCry - add_special SnorlaxAwake - add_special OlderHaircutBrother - add_special YoungerHaircutBrother - add_special DaisysGrooming - add_special PlayCurMonCry - add_special ProfOaksPCBoot - add_special GameboyCheck - add_special TrainerHouse - add_special PhotoStudio - add_special InitRoamMons - add_special FadeOutMusic - add_special Diploma - add_special PrintDiploma - add_special InitialSetDSTFlag - add_special InitialClearDSTFlag - add_special MrChrono - add_special DummySpecial_c389 diff --git a/data/events/std_scripts.asm b/data/events/std_scripts.asm deleted file mode 100644 index 2a7b48b9..00000000 --- a/data/events/std_scripts.asm +++ /dev/null @@ -1,52 +0,0 @@ -add_stdscript: MACRO -\1StdScript:: - dba \1 -ENDM - -StdScripts:: - add_stdscript PokecenterNurseScript - add_stdscript DifficultBookshelfScript - add_stdscript PictureBookshelfScript - add_stdscript MagazineBookshelfScript - add_stdscript TeamRocketOathScript - add_stdscript IncenseBurnerScript - add_stdscript MerchandiseShelfScript - add_stdscript TownMapScript - add_stdscript WindowScript - add_stdscript TVScript - add_stdscript HomepageScript ; unused - add_stdscript Radio1Script - add_stdscript Radio2Script - add_stdscript TrashCanScript - add_stdscript StrengthBoulderScript - add_stdscript SmashRockScript - add_stdscript PokecenterSignScript - add_stdscript MartSignScript - add_stdscript GoldenrodRocketsScript - add_stdscript RadioTowerRocketsScript - add_stdscript ElevatorButtonScript - add_stdscript DayToTextScript - add_stdscript BugContestResultsWarpScript - add_stdscript BugContestResultsScript - add_stdscript InitializeEventsScript - add_stdscript AskNumber1MScript - add_stdscript AskNumber2MScript - add_stdscript RegisteredNumberMScript - add_stdscript NumberAcceptedMScript - add_stdscript NumberDeclinedMScript - add_stdscript PhoneFullMScript - add_stdscript RematchMScript - add_stdscript AskNumber1FScript - add_stdscript AskNumber2FScript - add_stdscript RegisteredNumberFScript - add_stdscript NumberAcceptedFScript - add_stdscript NumberDeclinedFScript - add_stdscript PhoneFullFScript - add_stdscript RematchFScript - add_stdscript GymStatue1Script - add_stdscript GymStatue2Script - add_stdscript ReceiveItemScript - add_stdscript ReceiveTogepiEggScript - add_stdscript PCScript - add_stdscript GameCornerCoinVendorScript - add_stdscript HappinessCheckScript diff --git a/data/overworld/collision_permissions.asm b/data/overworld/collision_permissions.asm deleted file mode 100644 index 57172ca5..00000000 --- a/data/overworld/collision_permissions.asm +++ /dev/null @@ -1,258 +0,0 @@ -TileCollisionTable:: -; entries correspond to COLL_* constants - db LAND_TILE ; COLL_FLOOR - db LAND_TILE ; COLL_01 - db LAND_TILE ; 02 - db LAND_TILE ; COLL_03 - db LAND_TILE ; COLL_04 - db LAND_TILE ; 05 - db LAND_TILE ; 06 - db WALL_TILE ; COLL_WALL - db LAND_TILE ; COLL_CUT_08 - db LAND_TILE ; 09 - db LAND_TILE ; 0a - db LAND_TILE ; 0b - db LAND_TILE ; 0c - db LAND_TILE ; 0d - db LAND_TILE ; 0e - db WALL_TILE ; 0f - db LAND_TILE ; COLL_TALL_GRASS_10 - db LAND_TILE ; 11 - db WALL_TILE | TALK ; COLL_CUT_TREE - db LAND_TILE ; 13 - db LAND_TILE ; COLL_LONG_GRASS - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE - db LAND_TILE ; 16 - db LAND_TILE ; 17 - db LAND_TILE ; COLL_TALL_GRASS - db LAND_TILE ; 19 - db WALL_TILE | TALK ; COLL_CUT_TREE_1A - db LAND_TILE ; 1b - db LAND_TILE ; COLL_LONG_GRASS_1C - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D - db LAND_TILE ; 1e - db LAND_TILE ; 1f - db WATER_TILE ; 20 - db WATER_TILE ; COLL_WATER_21 - db WATER_TILE | TALK ; 22 - db LAND_TILE ; COLL_ICE - db WATER_TILE | TALK ; COLL_WHIRLPOOL - db WATER_TILE ; 25 - db WATER_TILE ; 26 - db WALL_TILE ; COLL_BUOY - db WATER_TILE ; COLL_CUT_28 - db WATER_TILE ; COLL_WATER - db WATER_TILE | TALK ; 2a - db LAND_TILE ; COLL_ICE_2B - db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C - db WATER_TILE ; 2d - db WATER_TILE ; 2e - db WALL_TILE ; 2f - db WATER_TILE ; COLL_WATERFALL_RIGHT - db WATER_TILE ; COLL_WATERFALL_LEFT - db WATER_TILE ; COLL_WATERFALL_UP - db WATER_TILE ; COLL_WATERFALL - db WATER_TILE ; 34 - db WATER_TILE ; 35 - db WATER_TILE ; 36 - db WATER_TILE ; 37 - db WATER_TILE ; COLL_CURRENT_RIGHT - db WATER_TILE ; COLL_CURRENT_LEFT - db WATER_TILE ; COLL_CURRENT_UP - db WATER_TILE ; COLL_CURRENT_DOWN - db WATER_TILE ; 3c - db WATER_TILE ; 3d - db WATER_TILE ; 3e - db WATER_TILE ; 3f - db LAND_TILE ; COLL_BRAKE - db LAND_TILE ; COLL_WALK_RIGHT - db LAND_TILE ; COLL_WALK_LEFT - db LAND_TILE ; COLL_WALK_UP - db LAND_TILE ; COLL_WALK_DOWN - db LAND_TILE ; COLL_BRAKE_45 - db LAND_TILE ; COLL_BRAKE_46 - db LAND_TILE ; COLL_BRAKE_47 - db LAND_TILE ; COLL_GRASS_48 - db LAND_TILE ; COLL_GRASS_49 - db LAND_TILE ; COLL_GRASS_4A - db LAND_TILE ; COLL_GRASS_4B - db LAND_TILE ; COLL_GRASS_4C - db LAND_TILE ; 4d - db LAND_TILE ; 4e - db LAND_TILE ; 4f - db LAND_TILE ; COLL_WALK_RIGHT_ALT - db LAND_TILE ; COLL_WALK_LEFT_ALT - db LAND_TILE ; COLL_WALK_UP_ALT - db LAND_TILE ; COLL_WALK_DOWN_ALT - db LAND_TILE ; COLL_BRAKE_ALT - db LAND_TILE ; COLL_BRAKE_55 - db LAND_TILE ; COLL_BRAKE_56 - db LAND_TILE ; COLL_BRAKE_57 - db LAND_TILE ; 58 - db LAND_TILE ; 59 - db LAND_TILE ; 5a - db LAND_TILE ; COLL_5B - db LAND_TILE ; 5c - db LAND_TILE ; 5d - db LAND_TILE ; 5e - db LAND_TILE ; 5f - db LAND_TILE ; COLL_PIT - db LAND_TILE ; COLL_VIRTUAL_BOY - db WALL_TILE ; 62 - db LAND_TILE ; 63 - db LAND_TILE ; COLL_64 - db LAND_TILE ; COLL_65 - db LAND_TILE ; 66 - db LAND_TILE ; 67 - db LAND_TILE ; COLL_PIT_68 - db LAND_TILE ; 69 - db WALL_TILE ; 6a - db LAND_TILE ; 6b - db LAND_TILE ; 6c - db LAND_TILE ; 6d - db LAND_TILE ; 6e - db LAND_TILE ; 6f - db LAND_TILE ; COLL_WARP_CARPET_DOWN - db LAND_TILE ; COLL_DOOR - db LAND_TILE ; COLL_LADDER - db LAND_TILE ; COLL_STAIRCASE_73 - db LAND_TILE ; COLL_CAVE_74 - db LAND_TILE ; COLL_DOOR_75 - db LAND_TILE ; COLL_WARP_CARPET_LEFT - db LAND_TILE ; COLL_WARP_77 - db LAND_TILE ; COLL_WARP_CARPET_UP - db LAND_TILE ; COLL_DOOR_79 - db LAND_TILE ; COLL_STAIRCASE - db LAND_TILE ; COLL_CAVE - db LAND_TILE ; COLL_WARP_PANEL - db LAND_TILE ; COLL_DOOR_7D - db LAND_TILE ; COLL_WARP_CARPET_RIGHT - db LAND_TILE ; COLL_WARP_7F - db WALL_TILE ; 80 - db WALL_TILE ; 81 - db WALL_TILE ; 82 - db WALL_TILE ; 83 - db WALL_TILE ; 84 - db LAND_TILE ; 85 - db LAND_TILE ; 86 - db LAND_TILE ; 87 - db WALL_TILE ; 88 - db WALL_TILE ; 89 - db WALL_TILE ; 8a - db WALL_TILE ; 8b - db WALL_TILE ; 8c - db LAND_TILE ; 8d - db LAND_TILE ; 8e - db LAND_TILE ; 8f - db WALL_TILE ; COLL_COUNTER - db WALL_TILE ; COLL_BOOKSHELF - db WALL_TILE ; 92 - db WALL_TILE ; COLL_PC - db WALL_TILE ; COLL_RADIO - db WALL_TILE ; COLL_TOWN_MAP - db WALL_TILE ; COLL_MART_SHELF - db WALL_TILE ; COLL_TV - db WALL_TILE ; COLL_COUNTER_98 - db WALL_TILE ; 99 - db WALL_TILE ; 9a - db WALL_TILE ; 9b - db WALL_TILE ; COLL_9C - db WALL_TILE ; COLL_WINDOW - db WALL_TILE ; 9e - db WALL_TILE ; COLL_INCENSE_BURNER - db LAND_TILE ; COLL_HOP_RIGHT - db LAND_TILE ; COLL_HOP_LEFT - db LAND_TILE ; COLL_HOP_UP - db LAND_TILE ; COLL_HOP_DOWN - db LAND_TILE ; COLL_HOP_DOWN_RIGHT - db LAND_TILE ; COLL_HOP_DOWN_LEFT - db LAND_TILE ; COLL_HOP_UP_RIGHT - db LAND_TILE ; COLL_HOP_UP_LEFT - db LAND_TILE ; a8 - db LAND_TILE ; a9 - db LAND_TILE ; aa - db LAND_TILE ; ab - db LAND_TILE ; ac - db LAND_TILE ; ad - db LAND_TILE ; ae - db LAND_TILE ; af - db LAND_TILE ; COLL_RIGHT_WALL - db LAND_TILE ; COLL_LEFT_WALL - db LAND_TILE ; COLL_UP_WALL - db LAND_TILE ; COLL_DOWN_WALL - db LAND_TILE ; COLL_DOWN_RIGHT_WALL - db LAND_TILE ; COLL_DOWN_LEFT_WALL - db LAND_TILE ; COLL_UP_RIGHT_WALL - db LAND_TILE ; COLL_UP_LEFT_WALL - db LAND_TILE ; b8 - db LAND_TILE ; b9 - db LAND_TILE ; ba - db LAND_TILE ; bb - db LAND_TILE ; bc - db LAND_TILE ; bd - db LAND_TILE ; be - db LAND_TILE ; bf - db WATER_TILE ; COLL_RIGHT_BUOY - db WATER_TILE ; COLL_LEFT_BUOY - db WATER_TILE ; COLL_UP_BUOY - db WATER_TILE ; COLL_DOWN_BUOY - db WATER_TILE ; COLL_DOWN_RIGHT_BUOY - db WATER_TILE ; COLL_DOWN_LEFT_BUOY - db WATER_TILE ; COLL_UP_RIGHT_BUOY - db WATER_TILE ; COLL_UP_LEFT_BUOY - db WATER_TILE ; c8 - db WATER_TILE ; c9 - db WATER_TILE ; ca - db WATER_TILE ; cb - db WATER_TILE ; cc - db WATER_TILE ; cd - db WATER_TILE ; ce - db WATER_TILE ; cf - db LAND_TILE ; d0 - db LAND_TILE ; d1 - db LAND_TILE ; d2 - db LAND_TILE ; d3 - db LAND_TILE ; d4 - db LAND_TILE ; d5 - db LAND_TILE ; d6 - db LAND_TILE ; d7 - db LAND_TILE ; d8 - db LAND_TILE ; d9 - db LAND_TILE ; da - db LAND_TILE ; db - db LAND_TILE ; dc - db LAND_TILE ; dd - db LAND_TILE ; de - db LAND_TILE ; df - db LAND_TILE ; e0 - db LAND_TILE ; e1 - db LAND_TILE ; e2 - db LAND_TILE ; e3 - db LAND_TILE ; e4 - db LAND_TILE ; e5 - db LAND_TILE ; e6 - db LAND_TILE ; e7 - db LAND_TILE ; e8 - db LAND_TILE ; e9 - db LAND_TILE ; ea - db LAND_TILE ; eb - db LAND_TILE ; ec - db LAND_TILE ; ed - db LAND_TILE ; ee - db LAND_TILE ; ef - db LAND_TILE ; f0 - db LAND_TILE ; f1 - db LAND_TILE ; f2 - db LAND_TILE ; f3 - db LAND_TILE ; f4 - db LAND_TILE ; f5 - db LAND_TILE ; f6 - db LAND_TILE ; f7 - db LAND_TILE ; f8 - db LAND_TILE ; f9 - db LAND_TILE ; fa - db LAND_TILE ; fb - db LAND_TILE ; fc - db LAND_TILE ; fd - db LAND_TILE ; fe - db WALL_TILE ; COLL_FF diff --git a/data/overworld/scripting.asm b/data/overworld/scripting.asm deleted file mode 100644 index 984a9bb7..00000000 --- a/data/overworld/scripting.asm +++ /dev/null @@ -1,164 +0,0 @@ -ScriptCommandTable: -; entries correspond to *_command constants (see macros/scripts/events.asm) - dw Script_scall ; 00 - dw Script_farscall ; 01 - dw Script_memcall ; 02 - dw Script_sjump ; 03 - dw Script_farsjump ; 04 - dw Script_memjump ; 05 - dw Script_ifequal ; 06 - dw Script_ifnotequal ; 07 - dw Script_iffalse ; 08 - dw Script_iftrue ; 09 - dw Script_ifgreater ; 0a - dw Script_ifless ; 0b - dw Script_jumpstd ; 0c - dw Script_callstd ; 0d - dw Script_callasm ; 0e - dw Script_special ; 0f - dw Script_memcallasm ; 10 - dw Script_checkmapscene ; 11 - dw Script_setmapscene ; 12 - dw Script_checkscene ; 13 - dw Script_setscene ; 14 - dw Script_setval ; 15 - dw Script_addval ; 16 - dw Script_random ; 17 - dw Script_checkver ; 18 - dw Script_readmem ; 19 - dw Script_writemem ; 1a - dw Script_loadmem ; 1b - dw Script_readvar ; 1c - dw Script_writevar ; 1d - dw Script_loadvar ; 1e - dw Script_giveitem ; 1f - dw Script_takeitem ; 20 - dw Script_checkitem ; 21 - dw Script_givemoney ; 22 - dw Script_takemoney ; 23 - dw Script_checkmoney ; 24 - dw Script_givecoins ; 25 - dw Script_takecoins ; 26 - dw Script_checkcoins ; 27 - dw Script_addcellnum ; 28 - dw Script_delcellnum ; 29 - dw Script_checkcellnum ; 2a - dw Script_checktime ; 2b - dw Script_checkpoke ; 2c - dw Script_givepoke ; 2d - dw Script_giveegg ; 2e - dw Script_givepokemail ; 2f - dw Script_checkpokemail ; 30 - dw Script_checkevent ; 31 - dw Script_clearevent ; 32 - dw Script_setevent ; 33 - dw Script_checkflag ; 34 - dw Script_clearflag ; 35 - dw Script_setflag ; 36 - dw Script_wildon ; 37 - dw Script_wildoff ; 38 - dw Script_xycompare ; 39 - dw Script_warpmod ; 3a - dw Script_blackoutmod ; 3b - dw Script_warp ; 3c - dw Script_getmoney ; 3d - dw Script_getcoins ; 3e - dw Script_getnum ; 3f - dw Script_getmonname ; 40 - dw Script_getitemname ; 41 - dw Script_getcurlandmarkname ; 42 - dw Script_gettrainername ; 43 - dw Script_getstring ; 44 - dw Script_itemnotify ; 45 - dw Script_pocketisfull ; 46 - dw Script_opentext ; 47 - dw Script_refreshscreen ; 48 - dw Script_closetext ; 49 - dw Script_writeunusedbytebuffer ; 4a - dw Script_farwritetext ; 4b - dw Script_writetext ; 4c - dw Script_repeattext ; 4d - dw Script_yesorno ; 4e - dw Script_loadmenu ; 4f - dw Script_closewindow ; 50 - dw Script_jumptextfaceplayer ; 51 - dw Script_jumptext ; 52 - dw Script_waitbutton ; 53 - dw Script_promptbutton ; 54 - dw Script_pokepic ; 55 - dw Script_closepokepic ; 56 - dw Script__2dmenu ; 57 - dw Script_verticalmenu ; 58 - dw Script_loadpikachudata ; 59 - dw Script_randomwildmon ; 5a - dw Script_loadtemptrainer ; 5b - dw Script_loadwildmon ; 5c - dw Script_loadtrainer ; 5d - dw Script_startbattle ; 5e - dw Script_reloadmapafterbattle ; 5f - dw Script_catchtutorial ; 60 - dw Script_trainertext ; 61 - dw Script_trainerflagaction ; 62 - dw Script_winlosstext ; 63 - dw Script_scripttalkafter ; 64 - dw Script_endifjustbattled ; 65 - dw Script_checkjustbattled ; 66 - dw Script_setlasttalked ; 67 - dw Script_applymovement ; 68 - dw Script_applymovementlasttalked ; 69 - dw Script_faceplayer ; 6a - dw Script_faceobject ; 6b - dw Script_variablesprite ; 6c - dw Script_disappear ; 6d - dw Script_appear ; 6e - dw Script_follow ; 6f - dw Script_stopfollow ; 70 - dw Script_moveobject ; 71 - dw Script_writeobjectxy ; 72 - dw Script_loademote ; 73 - dw Script_showemote ; 74 - dw Script_turnobject ; 75 - dw Script_follownotexact ; 76 - dw Script_earthquake ; 77 - dw Script_changemapblocks ; 78 - dw Script_changeblock ; 79 - dw Script_reloadmap ; 7a - dw Script_reloadmappart ; 7b - dw Script_writecmdqueue ; 7c - dw Script_delcmdqueue ; 7d - dw Script_playmusic ; 7e - dw Script_encountermusic ; 7f - dw Script_musicfadeout ; 80 - dw Script_playmapmusic ; 81 - dw Script_dontrestartmapmusic ; 82 - dw Script_cry ; 83 - dw Script_playsound ; 84 - dw Script_waitsfx ; 85 - dw Script_warpsound ; 86 - dw Script_specialsound ; 87 - dw Script_autoinput ; 88 - dw Script_newloadmap ; 89 - dw Script_pause ; 8a - dw Script_deactivatefacing ; 8b - dw Script_prioritysjump ; 8c - dw Script_warpcheck ; 8d - dw Script_stopandsjump ; 8e - dw Script_endcallback ; 8f - dw Script_end ; 90 - dw Script_reloadend ; 91 - dw Script_endall ; 92 - dw Script_pokemart ; 93 - dw Script_elevator ; 94 - dw Script_trade ; 95 - dw Script_askforphonenumber ; 96 - dw Script_phonecall ; 97 - dw Script_hangup ; 98 - dw Script_describedecoration ; 99 - dw Script_fruittree ; 9a - dw Script_specialphonecall ; 9b - dw Script_checkphonecall ; 9c - dw Script_verbosegiveitem ; 9d - dw Script_swarm ; 9e - dw Script_halloffame ; 9f - dw Script_credits ; a0 - dw Script_warpfacing ; a1 diff --git a/data/overworld/tilesets.asm b/data/overworld/tilesets.asm deleted file mode 100644 index bc1f1b2f..00000000 --- a/data/overworld/tilesets.asm +++ /dev/null @@ -1,43 +0,0 @@ -tileset: MACRO - dba \1GFX, \1Meta, \1Coll - dw \1Anim - dw NULL - dw \1PalMap -ENDM - -; Associated data: -; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm -; - The *PalMap are defined in gfx/tileset_palette_maps.asm -; - The *Anim are defined in engine/tilesets/tileset_anims.asm - -Tilesets:: -; entries correspond to TILESET_* constants - tileset Tileset0 - tileset TilesetJohto - tileset TilesetJohtoModern - tileset TilesetKanto - tileset TilesetHouse - tileset TilesetPlayersHouse - tileset TilesetPokecenter - tileset TilesetGate - tileset TilesetPort - tileset TilesetLab - tileset TilesetFacility - tileset TilesetMart - tileset TilesetMansion - tileset TilesetGameCorner - tileset TilesetEliteFourRoom - tileset TilesetTraditionalHouse - tileset TilesetTrainStation - tileset TilesetChampionsRoom - tileset TilesetLighthouse - tileset TilesetPlayersRoom - tileset TilesetTower - tileset TilesetCave - tileset TilesetPark - tileset TilesetRuinsOfAlph - tileset TilesetRadioTower - tileset TilesetUnderground - tileset TilesetIcePath - tileset TilesetDarkCave - tileset TilesetForest diff --git a/data/overworld/variables.asm b/data/overworld/variables.asm deleted file mode 100644 index 39cd35fc..00000000 --- a/data/overworld/variables.asm +++ /dev/null @@ -1,27 +0,0 @@ -VarActionTable: -; entries correspond to VAR_* constants - ; RETVAR_STRBUF2: copy [de] to wStringBuffer2 - ; RETVAR_ADDR_DE: return address in de - ; RETVAR_EXECUTE: call function - dwb wStringBuffer2, RETVAR_STRBUF2 - dwb wPartyCount, RETVAR_STRBUF2 - dwb Var_BattleResult, RETVAR_EXECUTE - dwb wBattleType, RETVAR_ADDR_DE - dwb wTimeOfDay, RETVAR_STRBUF2 - dwb Var_CountCaughtMons, RETVAR_EXECUTE - dwb Var_CountSeenMons, RETVAR_EXECUTE - dwb Var_CountBadges, RETVAR_EXECUTE - dwb wPlayerState, RETVAR_ADDR_DE - dwb Var_PlayerFacing, RETVAR_EXECUTE - dwb hHours, RETVAR_STRBUF2 - dwb Var_DayOfWeek, RETVAR_EXECUTE - dwb wMapGroup, RETVAR_STRBUF2 - dwb wMapNumber, RETVAR_STRBUF2 - dwb Var_UnownCaught, RETVAR_EXECUTE - dwb wEnvironment, RETVAR_STRBUF2 - dwb Var_BoxFreeSpace, RETVAR_EXECUTE - dwb wBugContestMinsRemaining, RETVAR_STRBUF2 - dwb wXCoord, RETVAR_STRBUF2 - dwb wYCoord, RETVAR_STRBUF2 - dwb wSpecialPhoneCallID, RETVAR_STRBUF2 - dwb NULL, RETVAR_STRBUF2 diff --git a/data/special_pointers.asm b/data/special_pointers.asm new file mode 100644 index 00000000..b7e4d213 --- /dev/null +++ b/data/special_pointers.asm @@ -0,0 +1,130 @@ +; Special routines can be used with the "special" map script command. +; They often use wScriptVar for arguments and return values. + +add_special: MACRO +; Some ROM0 specials have a nonzero bank. +\1Special:: +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC +ENDM + +SpecialsPointers:: + add_special WarpToSpawnPoint + +; Communications + add_special SetBitsForLinkTradeRequest + add_special WaitForLinkedFriend + add_special CheckLinkTimeout + add_special TryQuickSave + add_special CheckBothSelectedSameRoom + add_special FailedLinkToPast + add_special CloseLink + add_special WaitForOtherPlayerToExit + add_special SetBitsForBattleRequest + add_special SetBitsForTimeCapsuleRequest + add_special CheckTimeCapsuleCompatibility + add_special EnterTimeCapsule + add_special TradeCenter + add_special Colosseum + add_special TimeCapsule + add_special CableClubCheckWhichChris + add_special CheckMysteryGift + add_special GetMysteryGiftItem + add_special UnlockMysteryGift + +; Map events + add_special BugContestJudging + add_special CheckPartyFullAfterContest + add_special ContestDropOffMons + add_special ContestReturnMons + add_special GiveParkBalls + add_special CheckMagikarpLength + add_special MagikarpHouseSign + add_special HealParty ; this is both a special and a predef + add_special PokemonCenterPC + add_special PlayersHousePC + add_special DayCareMan + add_special DayCareLady + add_special DayCareManOutside + add_special MoveDeletion + add_special BankOfMom + add_special MagnetTrain + add_special NameRival + add_special SetDayOfWeek + add_special OverworldTownMap + add_special UnownPrinter + add_special MapRadio + add_special UnownPuzzle + add_special SlotMachine + add_special CardFlip + add_special DummyNonfunctionalGameCornerGame + add_special ClearBGPalettesBufferScreen + add_special FadeOutPalettes + add_special FadeBlackQuickly + add_special FadeInPalettes + add_special FadeInQuickly + add_special ReloadSpritesNoPalettes, 2 + add_special ClearBGPalettes + add_special UpdateTimePals + add_special ClearTilemap + add_special UpdateSprites + add_special UpdatePlayerSprite + add_special GameCornerPrizeMonCheckDex + add_special UnusedSetSeenMon + add_special WaitSFX, 3 + add_special PlayMapMusic + add_special RestartMapMusic + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonAboveLevel + add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID + add_special UnusedCheckUnusedTwoDayTimer + add_special DayCareMon1 + add_special DayCareMon2 + add_special SelectRandomBugContestContestants + add_special ActivateFishingSwarm + add_special ToggleMaptileDecorations + add_special ToggleDecorationsVisibility + add_special GiveShuckle + add_special ReturnShuckle + add_special BillsGrandfather + add_special CheckPokerus + add_special DisplayCoinCaseBalance + add_special DisplayMoneyAndCoinBalance + add_special PlaceMoneyTopRight + add_special CheckForLuckyNumberWinners + add_special CheckLuckyNumberShowFlag + add_special ResetLuckyNumberShowFlag + add_special PrintTodaysLuckyNumber + add_special SelectApricornForKurt + add_special NameRater + add_special DisplayLinkRecord + add_special GetFirstPokemonHappiness + add_special CheckFirstMonIsEgg + add_special RandomUnseenWildMon + add_special RandomPhoneWildMon + add_special RandomPhoneMon + add_special LoadUsedSpritesGFX + add_special PlaySlowCry + add_special SnorlaxAwake + add_special OlderHaircutBrother + add_special YoungerHaircutBrother + add_special DaisysGrooming + add_special PlayCurMonCry + add_special ProfOaksPCBoot + add_special GameboyCheck + add_special TrainerHouse + add_special PhotoStudio + add_special InitRoamMons + add_special FadeOutMusic + add_special Diploma + add_special PrintDiploma + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag + add_special MrChrono + add_special DummySpecial_c389 diff --git a/data/tilesets.asm b/data/tilesets.asm new file mode 100644 index 00000000..bc1f1b2f --- /dev/null +++ b/data/tilesets.asm @@ -0,0 +1,43 @@ +tileset: MACRO + dba \1GFX, \1Meta, \1Coll + dw \1Anim + dw NULL + dw \1PalMap +ENDM + +; Associated data: +; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm +; - The *PalMap are defined in gfx/tileset_palette_maps.asm +; - The *Anim are defined in engine/tilesets/tileset_anims.asm + +Tilesets:: +; entries correspond to TILESET_* constants + tileset Tileset0 + tileset TilesetJohto + tileset TilesetJohtoModern + tileset TilesetKanto + tileset TilesetHouse + tileset TilesetPlayersHouse + tileset TilesetPokecenter + tileset TilesetGate + tileset TilesetPort + tileset TilesetLab + tileset TilesetFacility + tileset TilesetMart + tileset TilesetMansion + tileset TilesetGameCorner + tileset TilesetEliteFourRoom + tileset TilesetTraditionalHouse + tileset TilesetTrainStation + tileset TilesetChampionsRoom + tileset TilesetLighthouse + tileset TilesetPlayersRoom + tileset TilesetTower + tileset TilesetCave + tileset TilesetPark + tileset TilesetRuinsOfAlph + tileset TilesetRadioTower + tileset TilesetUnderground + tileset TilesetIcePath + tileset TilesetDarkCave + tileset TilesetForest -- cgit v1.2.3